vislite 0.4.1-alpha.0 → 0.4.1-alpha.2

package/lib/getWebGLContext/index.umd.js

@@ -1,12 +1,12 @@
 /*!
-* VISLite JavaScript Library v0.4.1-alpha.0
+* VISLite JavaScript Library v0.4.1-alpha.2
 * git+https://github.com/oi-contrib/VISLite.git
 *
 * Copyright zxl20070701
 * Released under the MIT license
 * https://zxl20070701.github.io/notebook/home.html
 * 
-* Publish Date:  Mon Jul 31 2023 22:52:35 GMT+0800 (中国标准时间)
+* Publish Date:  Sat Aug 12 2023 23:34:54 GMT+0800 (中国标准时间)
 */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :

package/lib/getWebGLContext/index.umd.min.js

@@ -1,11 +1,11 @@
 /*!
-* VISLite JavaScript Library v0.4.1-alpha.0
+* VISLite JavaScript Library v0.4.1-alpha.2
 * git+https://github.com/oi-contrib/VISLite.git
 *
 * Copyright zxl20070701
 * Released under the MIT license
 * https://zxl20070701.github.io/notebook/home.html
 * 
-* Publish Date:  Mon Jul 31 2023 22:52:35 GMT+0800 (中国标准时间)
+* Publish Date:  Sat Aug 12 2023 23:34:54 GMT+0800 (中国标准时间)
 */
 var e,t;e=this,t=function(){"use strict";return function(e,t){if(void 0===t&&(t=1),!e)throw new Error("VISLite getWebGLContext:The mount point requires an HTMLElement type but encountered null.");var n,i=e.clientWidth,o=e.clientHeight,r=e;return r._vislite_canvas_?n=r._vislite_canvas_:(n=document.createElement("canvas"),e.appendChild(n),r._vislite_canvas_=n,e.setAttribute("vislite","WebGL")),n.style.width=i+"px",n.setAttribute("width",i+""),n.style.height=o+"px",n.setAttribute("height",o+""),function(e,t,n){void 0===n&&(n={});for(var i=["webgl","experimental-webgl","webkit-3d","moz-webgl"],o=null,r=0;r<i.length;r++){try{o=e.getContext(i[r],n)}catch(e){}if(o)break}if(!o)throw new Error("Non canvas or browser does not support webgl.");var l=o.canvas.width,a=o.canvas.height,s=l*t,u=a*t;return o.viewport(.5*(l-s),.5*(a-u),s,u),o.depthFunc(o.LEQUAL),o.enable(o.DEPTH_TEST),o}(n,t)}},"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).VISLite_getWebGLContext=t();

package/lib/index.umd.js

@@ -1,12 +1,12 @@
 /*!
-* VISLite JavaScript Library v0.4.1-alpha.0
+* VISLite JavaScript Library v0.4.1-alpha.2
 * git+https://github.com/oi-contrib/VISLite.git
 *
 * Copyright zxl20070701
 * Released under the MIT license
 * https://zxl20070701.github.io/notebook/home.html
 * 
-* Publish Date:  Mon Jul 31 2023 22:52:35 GMT+0800 (中国标准时间)
+* Publish Date:  Sat Aug 12 2023 23:34:54 GMT+0800 (中国标准时间)
 */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -350,7 +350,7 @@
         };
     }
 
-    function ruler (maxValue, minValue, num) {
+    function ruler (maxValue, minValue, num, option) {
         if (maxValue < minValue) {
             var temp = minValue;
             minValue = maxValue;
@@ -380,35 +380,98 @@
                 return +(temp + "1");
             }
         })(maxValue - minValue);
-        var distance100 = Math.ceil((maxValue - minValue) * times100 / num);
-        distance100 = {
-            3: 2,
-            4: 5,
-            6: 5,
-            7: 5,
-            8: 10,
-            9: 10,
-            11: 10,
-            12: 10,
-            13: 15,
-            14: 15,
-            16: 15,
-            17: 15,
-            18: 20,
-            19: 20,
-            21: 20,
-            22: 20,
-            23: 25,
-            24: 25,
-            26: 25,
-            27: 25
-        }[distance100] || distance100;
-        var distance = distance100 / times100;
-        var begin = Math.floor(minValue / distance) * distance;
-        var rulerArray = [];
-        rulerArray.push(begin);
-        for (var index = 1; rulerArray[rulerArray.length - 1] < maxValue; index++) {
-            rulerArray.push(begin + distance * index);
+        var distance100_oral = Math.ceil((maxValue - minValue) * times100 / num);
+        var getResult = function (changValue) {
+            var distance100 = {
+                3: 2,
+                4: 5,
+                6: 5,
+                7: 5,
+                8: 10,
+                9: 10,
+                11: 10,
+                12: 10,
+                13: 15,
+                14: 15,
+                16: 15,
+                17: 15,
+                18: 20,
+                19: 20,
+                21: 20,
+                22: 20,
+                23: 25,
+                24: 25,
+                26: 25,
+                27: 25
+            }[distance100_oral + changValue] || (distance100_oral + changValue);
+            var distance = distance100 / times100;
+            var begin = Math.floor(minValue / distance) * distance;
+            var rulerArray = [];
+            rulerArray.push(begin);
+            for (var index = 1; rulerArray[rulerArray.length - 1] < maxValue; index++) {
+                rulerArray.push(begin + distance * index);
+            }
+            return rulerArray;
+        };
+        var rulerArray = getResult(0);
+        var balanceMax = function () {
+            var rulerArray_temp = [];
+            var changeDist = rulerArray[rulerArray.length - 1] - option.max;
+            for (var index = 0; index < rulerArray.length; index++) {
+                if (index + 1 < rulerArray.length && rulerArray[index + 1] - changeDist < minValue) ;
+                else {
+                    rulerArray_temp.push(rulerArray[index] - changeDist);
+                }
+            }
+            return rulerArray_temp;
+        };
+        var balanceMin = function () {
+            var rulerArray_temp = [];
+            var changeDist = rulerArray[0] - option.min;
+            for (var index = 0; index < rulerArray.length; index++) {
+                rulerArray_temp[index] = rulerArray[index] - changeDist;
+                if (maxValue <= rulerArray_temp[index])
+                    break;
+            }
+            return rulerArray_temp;
+        };
+        if (option) {
+            if ('max' in option && 'min' in option && option.max >= maxValue && option.min <= minValue) {
+                var isAnswer = function () {
+                    if (rulerArray[0] >= option.min && rulerArray[rulerArray.length - 1] <= option.max)
+                        return true;
+                    var rulerArray_max = balanceMax();
+                    if (rulerArray_max[0] >= option.min && rulerArray_max[rulerArray_max.length - 1] <= option.max) {
+                        rulerArray = rulerArray_max;
+                        return true;
+                    }
+                    var rulerArray_min = balanceMin();
+                    if (rulerArray_min[0] >= option.min && rulerArray_min[rulerArray_max.length - 1] <= option.max) {
+                        rulerArray = rulerArray_min;
+                        return true;
+                    }
+                };
+                if (isAnswer())
+                    return rulerArray;
+                for (var changValue = 1; changValue < 100; changValue++) {
+                    rulerArray = getResult(changValue);
+                    if (isAnswer())
+                        return rulerArray;
+                    rulerArray = getResult(-changValue);
+                    if (isAnswer())
+                        return rulerArray;
+                }
+            }
+            if ('max' in option && option.max >= maxValue) {
+                if (option.max < rulerArray[rulerArray.length - 1]) {
+                    rulerArray = balanceMax();
+                }
+            }
+            else if ('min' in option && option.min <= minValue) {
+                if (option.min > rulerArray[0]) {
+                    rulerArray = balanceMin();
+                }
+            }
         }
         return rulerArray;
     }
@@ -931,7 +994,7 @@
     function texts (painter, contents, width, height, doback) {
         var lineNumber = 0, content = "";
         for (var i = 0; i < contents.length; i++) {
-            if (painter.measureText(content + contents[i]).width > width) {
+            if (painter.measureText(content + contents[i]).width > width || /\n$/.test(content)) {
                 lineNumber += 1;
                 doback(content, (lineNumber - 0.5) * height);
                 content = contents[i];
@@ -1274,9 +1337,9 @@
     var Canvas$1 = (function (_super) {
         __extends(Canvas, _super);
         function Canvas(ViewCanvas, RegionCanvas) {
-            var _this = _super.call(this, ViewCanvas, {}, new Painter(RegionCanvas, {
+            var _this = _super.call(this, ViewCanvas, {}, RegionCanvas ? new Painter(RegionCanvas, {
                 willReadFrequently: true,
-            })) || this;
+            }) : null) || this;
             _this.name = "Canvas";
             _this.__regionList = {};
             _this.__regionAssemble = assemble(0, 255, 10, 3);
@@ -1291,38 +1354,44 @@
             return this;
         };
         Canvas.prototype.setRegion = function (regionName) {
-            if (regionName) {
-                if (this.__regionList[regionName] == undefined) {
-                    var tempColor = this.__regionAssemble();
-                    this.__regionList[regionName] =
-                        "rgb(" + tempColor[0] + "," + tempColor[1] + "," + tempColor[2] + ")";
+            if (this.__region) {
+                if (regionName) {
+                    if (this.__regionList[regionName] == undefined) {
+                        var tempColor = this.__regionAssemble();
+                        this.__regionList[regionName] =
+                            "rgb(" + tempColor[0] + "," + tempColor[1] + "," + tempColor[2] + ")";
+                    }
+                    this.__region.useConfig("fillStyle", this.__regionList[regionName]) &&
+                        this.__region.useConfig("strokeStyle", this.__regionList[regionName]);
+                }
+                else {
+                    this.__region.useConfig("fillStyle", "#000000") &&
+                        this.__region.useConfig("strokeStyle", "#000000");
                 }
-                this.__region.useConfig("fillStyle", this.__regionList[regionName]) &&
-                    this.__region.useConfig("strokeStyle", this.__regionList[regionName]);
-            }
-            else {
-                this.__region.useConfig("fillStyle", "#000000") &&
-                    this.__region.useConfig("strokeStyle", "#000000");
             }
             return this;
         };
         Canvas.prototype.getRegion = function (x, y) {
             var _this = this;
             return new Promise(function (resolve, reject) {
-                var imgData = _this.__region.painter.getImageData(x - 0.5, y - 0.5, 1, 1);
+                var imgData = _this.__region ? _this.__region.painter.getImageData(x - 0.5, y - 0.5, 1, 1) : {
+                    data: [0, 0, 0, 0]
+                };
                 var currentRGBA = imgData.data;
                 var doit = function () {
-                    for (var key in _this.__regionList) {
-                        if ("rgb(" +
-                            currentRGBA[0] +
-                            "," +
-                            currentRGBA[1] +
-                            "," +
-                            currentRGBA[2] +
-                            ")" ==
-                            _this.__regionList[key]) {
-                            resolve(key);
-                            break;
+                    if (_this.__region) {
+                        for (var key in _this.__regionList) {
+                            if ("rgb(" +
+                                currentRGBA[0] +
+                                "," +
+                                currentRGBA[1] +
+                                "," +
+                                currentRGBA[2] +
+                                ")" ==
+                                _this.__regionList[key]) {
+                                resolve(key);
+                                break;
+                            }
                         }
                     }
                     resolve("");
@@ -1347,7 +1416,7 @@
         };
         Canvas.prototype.getContext = function (isRegion) {
             if (isRegion === void 0) { isRegion = false; }
-            return isRegion ? this.__region.painter : this.painter;
+            return isRegion ? (this.__region ? this.__region.painter : null) : this.painter;
         };
         Canvas.prototype.createLinearGradient = function (x0, y0, x1, y1) {
             return linearGradient(this.painter, x0, y0, x1, y1);
@@ -1372,11 +1441,14 @@
 
     var Canvas = (function (_super) {
         __extends(Canvas, _super);
-        function Canvas(el) {
+        function Canvas(el, option) {
+            if (option === void 0) { option = {}; }
             var _this = this;
             if (!el) {
                 throw new Error("VISLite Canvas:The mount point requires an HTMLElement type but encountered null.");
             }
+            if (!('region' in option))
+                option.region = true;
             var width = el.clientWidth, height = el.clientHeight;
             var ViewCanvas, RegionCanvas;
             var _el = el;
@@ -1387,16 +1459,20 @@
             else {
                 ViewCanvas = document.createElement('canvas');
                 el.appendChild(ViewCanvas);
-                RegionCanvas = document.createElement('canvas');
+                if (option.region) {
+                    RegionCanvas = document.createElement('canvas');
+                }
                 _el._vislite_canvas_ = [ViewCanvas, RegionCanvas];
                 el.setAttribute('vislite', 'Canvas');
             }
             for (var _i = 0, _a = [ViewCanvas, RegionCanvas]; _i < _a.length; _i++) {
                 var canvas = _a[_i];
-                canvas.style.width = width + "px";
-                canvas.setAttribute('width', width + "");
-                canvas.style.height = height + "px";
-                canvas.setAttribute('height', height + "");
+                if (canvas) {
+                    canvas.style.width = width + "px";
+                    canvas.setAttribute('width', width + "");
+                    canvas.style.height = height + "px";
+                    canvas.setAttribute('height', height + "");
+                }
             }
             _this = _super.call(this, ViewCanvas, RegionCanvas) || this;
             _this.__canvas = ViewCanvas;
@@ -1670,7 +1746,9 @@
             };
             this.__unique = new Date().valueOf();
             this.painter = getWebGLContext$1(ViewCanvas, scale);
-            this.__regionPainter = getWebGLContext$1(RegionCanvas, scale, {});
+            if (RegionCanvas) {
+                this.__regionPainter = getWebGLContext$1(RegionCanvas, scale, {});
+            }
             var proportion = this.painter.canvas.width / this.painter.canvas.height;
             var xProportion = 1;
             var yProportion = 1;
@@ -1700,8 +1778,10 @@
         WebGL.prototype.review = function (isUpdateRegion) {
             if (isUpdateRegion === void 0) { isUpdateRegion = false; }
             if (isUpdateRegion) {
-                this.__regionPainter.clearColor(1, 1, 1, 1);
-                this.__regionPainter.clear(this.__regionPainter.COLOR_BUFFER_BIT);
+                if (this.__regionPainter) {
+                    this.__regionPainter.clearColor(1, 1, 1, 1);
+                    this.__regionPainter.clear(this.__regionPainter.COLOR_BUFFER_BIT);
+                }
             }
             else {
                 this.painter.clearColor(1, 1, 1, 1);
@@ -1726,18 +1806,20 @@
             this.setRegion(object3D.region);
             for (var index = 0; index < object3D.mesh.length; index++) {
                 if (isUpdateRegion) {
-                    doDraw("painter" + this.__unique, this.__regionPainter, {
-                        geometry: object3D.mesh[index].geometry,
-                        material: {
-                            color: {
-                                r: this.__regionColor[0],
-                                g: this.__regionColor[1],
-                                b: this.__regionColor[2],
-                                alpha: this.__regionColor[3]
+                    if (this.__regionPainter) {
+                        doDraw("painter" + this.__unique, this.__regionPainter, {
+                            geometry: object3D.mesh[index].geometry,
+                            material: {
+                                color: {
+                                    r: this.__regionColor[0],
+                                    g: this.__regionColor[1],
+                                    b: this.__regionColor[2],
+                                    alpha: this.__regionColor[3]
+                                }
                             }
-                        }
-                    }, meshWorld, globalWorld);
-                    this.__getColor = getColorFactory(this.__regionPainter);
+                        }, meshWorld, globalWorld);
+                        this.__getColor = getColorFactory(this.__regionPainter);
+                    }
                 }
                 else {
                     doDraw("region" + this.__unique, this.painter, object3D.mesh[index], meshWorld, globalWorld);
@@ -1805,10 +1887,13 @@
 
     var WebGL = (function (_super) {
         __extends(WebGL, _super);
-        function WebGL(el) {
+        function WebGL(el, option) {
+            if (option === void 0) { option = {}; }
             if (!el) {
                 throw new Error("VISLite WebGL:The mount point requires an HTMLElement type but encountered null.");
             }
+            if (!('region' in option))
+                option.region = true;
             var width = el.clientWidth, height = el.clientHeight;
             var ViewCanvas, RegionCanvas;
             var _el = el;
@@ -1817,11 +1902,13 @@
                 RegionCanvas = _el._vislite_canvas_[1];
             }
             else {
-                RegionCanvas = document.createElement('canvas');
-                el.appendChild(RegionCanvas);
-                RegionCanvas.style.position = 'absolute';
-                RegionCanvas.style.zIndex = "-1";
-                RegionCanvas.style.opacity = "0";
+                if (option.region) {
+                    RegionCanvas = document.createElement('canvas');
+                    el.appendChild(RegionCanvas);
+                    RegionCanvas.style.position = 'absolute';
+                    RegionCanvas.style.zIndex = "-1";
+                    RegionCanvas.style.opacity = "0";
+                }
                 ViewCanvas = document.createElement('canvas');
                 el.appendChild(ViewCanvas);
                 _el._vislite_canvas_ = [ViewCanvas, RegionCanvas];
@@ -1829,10 +1916,12 @@
             }
             for (var _i = 0, _a = [ViewCanvas, RegionCanvas]; _i < _a.length; _i++) {
                 var canvas = _a[_i];
-                canvas.style.width = width + "px";
-                canvas.setAttribute('width', width + "");
-                canvas.style.height = height + "px";
-                canvas.setAttribute('height', height + "");
+                if (canvas) {
+                    canvas.style.width = width + "px";
+                    canvas.setAttribute('width', width + "");
+                    canvas.style.height = height + "px";
+                    canvas.setAttribute('height', height + "");
+                }
             }
             return _super.call(this, ViewCanvas, RegionCanvas) || this;
         }