@millistream/millistream-widgets 1.0.38 → 1.0.39

package/millistream-widgets.js

@@ -1145,7 +1145,6 @@ function Milli_Chart(settings) {
         var count = 0;
         for (;;) {
             if (count++ > 10) {
-                console.log('break out');
                 break;
             }
             var v;
@@ -1206,7 +1205,7 @@ function Milli_Chart(settings) {
         si.valuePerPixel = (si.maxValue - si.minValue) / si.lineLength;
 
         if (isNaN(si.valuePerPixel) || !isFinite(si.valuePerPixel)) {
-            console.log('cant draw valuePerPixel', si.valuePerPixel, si.lineLength, si.maxValue, si.minValue);
+            console.log('cant draw valuePerPixel', si.valuePerPixel, si.lineLength, si.maxValue, si.minValue,si.highValue,si.lowValue,m_yLegendCss,v);
             return false;
         }
         var textpos;
@@ -3193,7 +3192,6 @@ function Milli_Chart(settings) {
                 continue;
             }
             if (timestamp > _this.scaleinfoX.endTimeStamp) {
-                console.log('to big', data[i].timestamp, _this.scaleinfoX.endTimeStamp);
                 break;
             }
 
@@ -3389,29 +3387,56 @@ function Milli_Chart(settings) {
         m_ctx.strokeStyle = method.color;
         m_ctx.lineWidth = method.lineWidth | 1;
         m_ctx.save();
+
+        // draw upper
         m_ctx.beginPath();
+        m_ctx.closePath();
         let num = calcAnalyzisLine(data, 0, undefined, m_chartspaces.chart, scaleinfoY);
+        m_ctx.moveTo(data[data.length - 1].pos.x, data[data.length - 1].pos.y);
         for (let i = data.length - 1; i >= data.length - num; i--) {
             m_ctx.lineTo(data[i].pos.x, data[i].pos.y);
         }
-        num = calcAnalyzisLine(data, 1, undefined, m_chartspaces.chart, scaleinfoY);
-        m_ctx.lineTo(data[data.length - num].pos.x, data[data.length - num].pos.y);
-        for (let i = data.length - num; i < data.length; i++) {
-            m_ctx.lineTo(data[i].pos.x, data[i].pos.y);
-        }
-        m_ctx.closePath();
+        m_ctx.stroke();
+
+        // draw the fill area
         if (method.fill) {
+            m_ctx.beginPath();
+            m_ctx.moveTo(data[data.length - 1].pos.x, data[data.length - 1].pos.y);
+            for (let i = data.length - 1; i >= data.length - num; i--) {
+                m_ctx.lineTo(data[i].pos.x, data[i].pos.y);
+            }
+
+            num = calcAnalyzisLine(data, 1, undefined, m_chartspaces.chart, scaleinfoY);
+
+            m_ctx.lineTo(data[data.length - num].pos.x, data[data.length - num].pos.y); // behöver döljas...
+            for (let i = data.length - num +1; i < data.length; i++) {
+                m_ctx.lineTo(data[i].pos.x, data[i].pos.y);
+            }
+
+            m_ctx.closePath();
+
             m_ctx.fillStyle = method.fill;
             m_ctx.fill();
         }
-        num = calcAnalyzisLine(data, 2, undefined, m_chartspaces.chart, scaleinfoY);
+        // draw Lower
         m_ctx.beginPath();
-        m_ctx.closePath(); // clear path
+        m_ctx.closePath();
+        m_ctx.moveTo(data[data.length - num].pos.x, data[data.length - num].pos.y); // behöver döljas...
+        for (let i = data.length - num; i < data.length; i++) {
+            m_ctx.lineTo(data[i].pos.x, data[i].pos.y);
+        }
+        m_ctx.stroke();
+
+        // draw middle
+        m_ctx.beginPath();
+        m_ctx.closePath();
+        num = calcAnalyzisLine(data, 2, undefined, m_chartspaces.chart, scaleinfoY);
         m_ctx.moveTo(data[data.length - num].x, data[data.length - num].y);
         for (let i = data.length - num; i < data.length; i++) {
             m_ctx.lineTo(data[i].pos.x, data[i].pos.y);
         }
         m_ctx.stroke();
+
         m_ctx.restore();
         return;
     }
@@ -3958,7 +3983,6 @@ function Milli_Chart(settings) {
                 rsi.push({ timestamp: p[i].timestamp, datapoints: [100 - 100 / (1 + rs)] });
             }
         }
-        console.log('RSI',rsi[rsi.length-1]);
         return rsi;
     }
     _this.removeAllIndicators = function(j) {
@@ -4215,8 +4239,6 @@ function Milli_Chart(settings) {
         }
         _this.settings.target.style.height = (_this.settings.target.parentNode.offsetHeight - offset) + 'px';
         _this.settings.target.style.width = _this.settings.target.parentNode.offsetWidth + 'px';
-        //_this.settings.target.style.height = (_this.settings.target.parentNode.offsetHeight - offset) * 1 + 'px';
-        //_this.settings.target.style.width = _this.settings.target.parentNode.offsetWidth * 1 + 'px';
         m_canvas.setRect(_this.settings.target.offsetHeight, _this.settings.target.offsetWidth);
     }
 
@@ -4877,19 +4899,29 @@ function Milli_Chart(settings) {
         _this.drawChart();
     })();
 
-    window.addEventListener('resize', function() {
+    window.addEventListener('resize', function(a) {
         if (m_canvas != null) {
             setChartSize();
+            //console.log("windowresize",m_chartspaces);
             _this.drawChart();
         }
     });
+    
+/*    function parentResize(a) {
+        console.log('a',a);
+        if(m_canvas != null) {
+            setChartSize();
+            console.log(m_chartspaces);
+            _this.drawChart();
+        }
+    };
 
     if(_this.settings.target.parentNode) {
-        const observer = new MutationObserver(_this.resizeEnd);
+        const observer = new MutationObserver(parentResize);
         const observerConfig = { attributes: true };
         observer.observe(_this.settings.target.parentNode, observerConfig);
     }
-
+*/
 };
 
 function Milli_OptionsList(settings) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@millistream/millistream-widgets",
-	"version": "1.0.38",
+	"version": "1.0.39",
 	"description": "Millistream widgets node package",
 	"main": "millistream-widgets.js",
 	"scripts": {