@amcharts/amcharts5 5.5.1 → 5.5.3

package/.internal/charts/stock/PanelControls.js.map

@@ -1 +1 @@
-{"version":3,"file":"PanelControls.js","sourceRoot":"","sources":["../../../../../src/.internal/charts/stock/PanelControls.ts"],"names":[],"mappings":"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","sourcesContent":["import type { StockChart } from \"./StockChart\";\r\nimport type { StockPanel } from \"./StockPanel\";\r\n\r\nimport { Container, IContainerPrivate, IContainerSettings } from \"../../core/render/Container\";\r\nimport { Button } from \"../../core/render/Button\";\r\nimport { Graphics } from \"../../core/render/Graphics\";\r\n\r\nexport interface IPanelControlsSettings extends IContainerSettings {\r\n\r\n\t/**\r\n\t * A target [[StockChart]].\r\n\t */\r\n\tstockChart: StockChart;\r\n\r\n\t/**\r\n\t * A target [[StockPanel]].\r\n\t */\r\n\tstockPanel: StockPanel\r\n\r\n}\r\n\r\nexport interface IPanelControlsPrivate extends IContainerPrivate {\r\n\r\n}\r\n\r\n/**\r\n * Creates a button set for [[StockChart]] panels (move up/down, close, etc.)\r\n *\r\n * @see {@link https://www.amcharts.com/docs/v5/charts/stock/panels/#Panel_controls} for more info\r\n */\r\nexport class PanelControls extends Container {\r\n\r\n\tdeclare public _settings: IPanelControlsSettings;\r\n\tdeclare public _privateSettings: IPanelControlsPrivate;\r\n\r\n\tpublic static className: string = \"PanelControls\";\r\n\tpublic static classNames: Array<string> = Container.classNames.concat([PanelControls.className]);\r\n\r\n\t/**\r\n\t * A [[Button]] which moves panel up.\r\n\t *\r\n\t * @default Button.new()\r\n\t */\r\n\tpublic upButton = this.children.push(Button.new(this._root, {\r\n\t\tthemeTags: [\"up\", \"control\", \"panel\"],\r\n\t\ticon: Graphics.new(this._root, {\r\n\t\t\tthemeTags: [\"icon\", \"button\"]\r\n\t\t})\r\n\t}))\r\n\r\n\t/**\r\n\t * A [[Button]] which moves panel down.\r\n\t *\r\n\t * @default Button.new()\r\n\t */\r\n\tpublic downButton = this.children.push(Button.new(this._root, {\r\n\t\tthemeTags: [\"down\", \"control\", \"panel\"],\r\n\t\ticon: Graphics.new(this._root, {\r\n\t\t\tthemeTags: [\"icon\", \"button\"]\r\n\t\t})\r\n\t}))\r\n\r\n\t/**\r\n\t * A [[Button]] which expands/collapses the panel.\r\n\t *\r\n\t * @default Button.new()\r\n\t */\r\n\tpublic expandButton = this.children.push(Button.new(this._root, {\r\n\t\tthemeTags: [\"expand\", \"control\", \"panel\"],\r\n\t\ticon: Graphics.new(this._root, {\r\n\t\t\tthemeTags: [\"icon\", \"button\"]\r\n\t\t})\r\n\t}))\r\n\r\n\t/**\r\n\t * A [[Button]] which closes the panel.\r\n\t *\r\n\t * @default Button.new()\r\n\t */\r\n\tpublic closeButton = this.children.push(Button.new(this._root, {\r\n\t\tthemeTags: [\"close\", \"control\", \"panel\"],\r\n\t\ticon: Graphics.new(this._root, {\r\n\t\t\tthemeTags: [\"icon\", \"button\"]\r\n\t\t})\r\n\t}))\r\n\r\n\tprotected _afterNew() {\r\n\t\tsuper._afterNew();\r\n\r\n\r\n\t\tconst upButton = this.upButton;\r\n\t\tconst downButton = this.downButton;\r\n\r\n\t\tdownButton.events.on(\"click\", () => {\r\n\t\t\tconst stockPanel = this.get(\"stockPanel\");\r\n\t\t\tstockPanel.moveDown();\r\n\t\t});\r\n\r\n\t\tupButton.events.on(\"click\", () => {\r\n\t\t\tconst stockPanel = this.get(\"stockPanel\");\r\n\t\t\tstockPanel.moveUp();\r\n\t\t});\r\n\r\n\t\tthis.closeButton.events.on(\"click\", () => {\r\n\t\t\tconst stockPanel = this.get(\"stockPanel\");\r\n\t\t\tstockPanel.close();\r\n\t\t});\r\n\r\n\t\tthis.expandButton.events.on(\"click\", () => {\r\n\t\t\tconst stockPanel = this.get(\"stockPanel\");\r\n\t\t\tstockPanel.expand();\r\n\t\t});\r\n\r\n\t}\r\n}\r\n"]}
+{"version":3,"file":"PanelControls.js","sourceRoot":"","sources":["../../../../../src/.internal/charts/stock/PanelControls.ts"],"names":[],"mappings":"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","sourcesContent":["import type { StockChart } from \"./StockChart\";\r\nimport type { StockPanel } from \"./StockPanel\";\r\n\r\nimport { Container, IContainerPrivate, IContainerSettings } from \"../../core/render/Container\";\r\nimport { Button } from \"../../core/render/Button\";\r\nimport { Graphics } from \"../../core/render/Graphics\";\r\n\r\nexport interface IPanelControlsSettings extends IContainerSettings {\r\n\r\n\t/**\r\n\t * A target [[StockChart]].\r\n\t */\r\n\tstockChart: StockChart;\r\n\r\n\t/**\r\n\t * A target [[StockPanel]].\r\n\t */\r\n\tstockPanel: StockPanel\r\n\r\n}\r\n\r\nexport interface IPanelControlsPrivate extends IContainerPrivate {\r\n\r\n}\r\n\r\n/**\r\n * Creates a button set for [[StockChart]] panels (move up/down, close, etc.)\r\n *\r\n * @see {@link https://www.amcharts.com/docs/v5/charts/stock/panels/#Panel_controls} for more info\r\n */\r\nexport class PanelControls extends Container {\r\n\r\n\tdeclare public _settings: IPanelControlsSettings;\r\n\tdeclare public _privateSettings: IPanelControlsPrivate;\r\n\r\n\tpublic static className: string = \"PanelControls\";\r\n\tpublic static classNames: Array<string> = Container.classNames.concat([PanelControls.className]);\r\n\r\n\t/**\r\n\t * A [[Button]] which moves panel up.\r\n\t *\r\n\t * @default Button.new()\r\n\t */\r\n\tpublic upButton = this.children.push(Button.new(this._root, {\r\n\t\tthemeTags: [\"up\", \"control\", \"panel\"],\r\n\t\ticon: Graphics.new(this._root, {\r\n\t\t\tthemeTags: [\"icon\", \"button\"]\r\n\t\t})\r\n\t}))\r\n\r\n\t/**\r\n\t * A [[Button]] which moves panel down.\r\n\t *\r\n\t * @default Button.new()\r\n\t */\r\n\tpublic downButton = this.children.push(Button.new(this._root, {\r\n\t\tthemeTags: [\"down\", \"control\", \"panel\"],\r\n\t\ticon: Graphics.new(this._root, {\r\n\t\t\tthemeTags: [\"icon\", \"button\"]\r\n\t\t})\r\n\t}))\r\n\r\n\t/**\r\n\t * A [[Button]] which expands/collapses the panel.\r\n\t *\r\n\t * @default Button.new()\r\n\t */\r\n\tpublic expandButton = this.children.push(Button.new(this._root, {\r\n\t\tthemeTags: [\"expand\", \"control\", \"panel\"],\r\n\t\ticon: Graphics.new(this._root, {\r\n\t\t\tthemeTags: [\"icon\", \"button\"]\r\n\t\t})\r\n\t}))\r\n\r\n\t/**\r\n\t * A [[Button]] which closes the panel.\r\n\t *\r\n\t * @default Button.new()\r\n\t */\r\n\tpublic closeButton = this.children.push(Button.new(this._root, {\r\n\t\tthemeTags: [\"close\", \"control\", \"panel\"],\r\n\t\ticon: Graphics.new(this._root, {\r\n\t\t\tthemeTags: [\"icon\", \"button\"]\r\n\t\t})\r\n\t}))\r\n\r\n\tprotected _afterNew() {\r\n\t\tsuper._afterNew();\r\n\r\n\r\n\t\tconst upButton = this.upButton;\r\n\t\tconst downButton = this.downButton;\r\n\r\n\t\tdownButton.events.on(\"click\", () => {\r\n\t\t\tconst stockPanel = this.get(\"stockPanel\");\r\n\t\t\tstockPanel.moveDown();\r\n\t\t});\r\n\r\n\t\tupButton.events.on(\"click\", () => {\r\n\t\t\tconst stockPanel = this.get(\"stockPanel\");\r\n\t\t\tstockPanel.moveUp();\r\n\t\t});\r\n\r\n\t\tthis.closeButton.events.on(\"click\", () => {\r\n\t\t\tconst stockPanel = this.get(\"stockPanel\");\r\n\t\t\tstockPanel.close();\r\n\t\t});\t\t\r\n\r\n\t\tthis.expandButton.events.on(\"click\", () => {\r\n\t\t\tconst stockPanel = this.get(\"stockPanel\");\r\n\t\t\tstockPanel.expand();\r\n\t\t});\r\n\r\n\t}\r\n}\r\n"]}

package/.internal/charts/stock/StockChartDefaultTheme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StockChartDefaultTheme.d.ts","sourceRoot":"","sources":["../../../../../src/.internal/charts/stock/StockChartDefaultTheme.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AASzC;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,KAAK;IAChD,SAAS,CAAC,iBAAiB;CA65C3B"}
+{"version":3,"file":"StockChartDefaultTheme.d.ts","sourceRoot":"","sources":["../../../../../src/.internal/charts/stock/StockChartDefaultTheme.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AASzC;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,KAAK;IAChD,SAAS,CAAC,iBAAiB;CAy7C3B"}

package/.internal/charts/stock/StockChartDefaultTheme.js

@@ -43,6 +43,9 @@ export class StockChartDefaultTheme extends Theme {
             autoSetPercentScale: true
         });
         r("StockPanel").setAll({
+            panY: true,
+            wheelY: "zoomX",
+            panX: true,
             minHeight: 1
         });
         r("StockPanel").states.create("hidden", {
@@ -83,6 +86,11 @@ export class StockChartDefaultTheme extends Theme {
         r("ColumnSeries").setAll({
             useLastColorForLegendMarker: true
         });
+        r("Grid", ["middlegrid"]).setAll({
+            forceHidden: false,
+            strokeOpacity: .4,
+            strokeDasharray: [2, 2]
+        });
         {
             const rule = r("RoundedRectangle", ["legend", "itemcontainer", "background", "stocklegend"]);
             rule.setAll({
@@ -120,7 +128,8 @@ export class StockChartDefaultTheme extends Theme {
             forceHidden: true
         });
         r("AxisRendererY", ["y"]).setAll({
-            opposite: true
+            opposite: true,
+            pan: "zoom"
         });
         r("Container", ["legend", "item"]).setAll({});
         {
@@ -181,16 +190,10 @@ export class StockChartDefaultTheme extends Theme {
         }
         {
             const rule = r("Graphics", ["control", "button", "icon"]).states.create("hover", {
-                fillOpacity: 0.5
+                fillOpacity: 0.3
             });
             setColor(rule, "fill", ic, "secondaryButtonHover");
         }
-        {
-            const rule = r("Graphics", ["control", "button", "icon"]).states.create("down", {
-                fillOpacity: 0.5
-            });
-            setColor(rule, "fill", ic, "primaryButtonDown");
-        }
         /**
          * ------------------------------------------------------------------------
          * PanelControls Button
@@ -340,6 +343,9 @@ export class StockChartDefaultTheme extends Theme {
          * Drawing related
          * ------------------------------------------------------------------------
          */
+        r("DrawingSeries").setAll({
+            field: "value"
+        });
         // bullet of all drawing series
         {
             const rule = r("Container", ["drawing", "grip"]);
@@ -436,6 +442,19 @@ export class StockChartDefaultTheme extends Theme {
             });
             rule.states.create("hover", { fillOpacity: 0 });
         }
+        {
+            const rule = r("Graphics", ["series", "stroke", "drawing", "measure"]);
+            rule.setAll({
+                strokeOpacity: 0
+            });
+        }
+        r("Line", ["drawing", "measure"]).setAll({
+            strokeDasharray: [],
+            strokeWidth: 1,
+            crisp: true,
+            strokeOpacity: 0.7,
+            draggable: false
+        });
         {
             const rule = r("Graphics", ["line", "series", "stroke", "drawing"]);
             rule.setAll({
@@ -460,6 +479,17 @@ export class StockChartDefaultTheme extends Theme {
             centerX: p0,
             centerY: p50
         });
+        r("Label", ["drawing", "measure"]).setAll({
+            centerX: p50,
+            centerY: p50,
+            fill: ic.get("alternativeText"),
+            textAlign: "center"
+        });
+        r("RoundedRectangle", ["background", "drawing", "measure"]).setAll({
+            centerX: p50,
+            centerY: p50,
+            fillOpacity: 0.7
+        });
         r("PointedRectangle", ["drawing", "callout"]).setAll({
             fillOpacity: 1,
             strokeOpacity: 0
@@ -495,9 +525,6 @@ export class StockChartDefaultTheme extends Theme {
                 color(0xe22465)
             ]
         });
-        r("IconSeries").setAll({
-            snapToData: true
-        });
         r("Graphics", ["line", "series", "stroke", "drawing", "fibonacci"]).setAll({
             forceInactive: true,
             strokeWidth: 0.5,
@@ -517,14 +544,15 @@ export class StockChartDefaultTheme extends Theme {
         });
         r("Label", ["fibonaccitimezone"]).setAll({
             populateText: true,
-            text: "{value}",
-            centerX: p50,
+            text: "{value.formatNumber('#')}",
+            centerX: 0,
             centerY: p100,
             paddingBottom: 2,
+            paddingLeft: 3,
             fontSize: "0.8em"
         });
         r("FibonacciTimezoneSeries").setAll({
-            sequence: [1, 2, 3, 5, 8, 13, 21, 34, 55, 89],
+            sequence: [0, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89],
             colors: []
         });
         r("Graphics", ["line", "series", "fill", "drawing", "fibonaccitimezone"]).setAll({
@@ -538,37 +566,18 @@ export class StockChartDefaultTheme extends Theme {
             strokeOpacity: 1
         });
         r("Grid", ["overbought"]).setAll({
-            strokeOpacity: 0.3
+            strokeOpacity: 0.4
         });
         r("Grid", ["oversold"]).setAll({
-            strokeOpacity: 0.3,
-        });
-        // series fill below oversold
-        r("Graphics", ["rsi", "oversold", "fill"]).setAll({
-            visible: true,
-            fillOpacity: 0.2
+            strokeOpacity: 0.4,
         });
         // series fill below oversold
-        r("Graphics", ["williamsr", "oversold", "fill"]).setAll({
-            visible: true,
-            fillOpacity: 0.2
-        });
-        // series fill below oversold
-        r("Graphics", ["commoditychannelindex", "oversold", "fill"]).setAll({
+        r("Graphics", ["overboughtoversold", "oversold", "fill"]).setAll({
             visible: true,
             fillOpacity: 0.2
         });
         // series fill above oversold
-        r("Graphics", ["rsi", "overbought", "fill"]).setAll({
-            visible: true,
-            fillOpacity: 0.2
-        });
-        // series fill above oversold
-        r("Graphics", ["williamsr", "overbought", "fill"]).setAll({
-            visible: true,
-            fillOpacity: 0.2
-        });
-        r("Graphics", ["commoditychannelindex", "overbought", "fill"]).setAll({
+        r("Graphics", ["overboughtoversold", "overbought", "fill"]).setAll({
             visible: true,
             fillOpacity: 0.2
         });
@@ -592,103 +601,109 @@ export class StockChartDefaultTheme extends Theme {
         r("XYSeries", ["indicator"]).setAll({
             legendLabelText: "{name}"
         });
-        r("LineSeries", ["rsi"]).setAll({
-            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/]",
-            legendLabelText: "{shortName} ({period.formatNumber('#.')},{field})"
-        });
-        r("LineSeries", ["momentum"]).setAll({
+        /// LEGEND LABELS
+        r("LineSeries", ["accumulationdistribution"]).setAll({
             legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/]",
-            legendLabelText: "{shortName} ({period.formatNumber('#.')},{field})"
+            legendLabelText: "{shortName} ({useVolume})"
         });
-        r("LineSeries", ["williamsr"]).setAll({
-            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/]",
-            legendLabelText: "{shortName} ({period.formatNumber('#.')})"
+        r("LineSeries", ["accumulativeswingindex"]).setAll({
+            legendValueText: "[{swingColor} bold]{valueY.formatNumber('#.0000')}[/]",
+            legendLabelText: "{shortName} ({limitMoveValue})"
         });
-        r("LineSeries", ["commoditychannelindex"]).setAll({
-            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/]",
+        r("LineSeries", ["aroon"]).setAll({
+            legendValueText: "[{upColor} bold]{up.formatNumber('#.00')}%[/] [{downColor} bold]{down.formatNumber('#.00')}%[/]",
             legendLabelText: "{shortName} ({period.formatNumber('#.')})"
         });
-        r("LineSeries", ["stochastic"]).setAll({
-            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/] [{slowColor} bold]{slow.formatNumber('#.000a')}[/]",
-            legendLabelText: "{shortName} ({period.formatNumber('#.')},{field})"
+        r("ColumnSeries", ["awesomeoscillator"]).setAll({
+            legendValueText: "[{oscillatorColor}; bold]{valueY.formatNumber('#.00')}[/]",
         });
         r("LineSeries", ["indicator", "bollingerbands"]).setAll({
-            legendValueText: "[{lowerColor} bold]{lower.formatNumber('#.000a')}[/] [{seriesColor} bold]{valueY.formatNumber('#.000a')}[/] [{upperColor} bold]{upper.formatNumber('#.000a')}[/]",
+            legendValueText: "[{lowerColor} bold]{lower.formatNumber('#.00')}[/] [{seriesColor} bold]{valueY.formatNumber('#.00')}[/] [{upperColor} bold]{upper.formatNumber('#.00')}[/]",
             legendLabelText: "{shortName} ({period.formatNumber('#.')},{field},{standardDeviations.formatNumber('#.')},{type})"
         });
-        r("LineSeries", ["movingaverage"]).setAll({
-            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/]",
-            legendLabelText: "{shortName} ({period.formatNumber('#.')},{field},{type},{offset.formatNumber('#.')})"
-        });
-        r("LineSeries", ["zigzag"]).setAll({
-            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/]",
-            legendLabelText: "{shortName} ({deviation.formatNumber('#.')}, {depth.formatNumber('#.')})"
-        });
-        r("LineSeries", ["indicator", "movingaverageenvelope"]).setAll({
-            legendValueText: "[{lowerColor} bold]{lower.formatNumber('#.000a')}[/] [{seriesColor} bold]{valueY.formatNumber('#.000a')}[/] [{upperColor} bold]{upper.formatNumber('#.000a')}[/]",
-            legendLabelText: "{shortName} ({period.formatNumber('#.')},{field},{shiftType},{shift.formatNumber('#.')},{type})"
+        r("LineSeries", ["chaikinmoneyflow"]).setAll({
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/]",
+            legendLabelText: "{shortName} ({period.formatNumber('#.')})"
         });
-        r("LineSeries", ["vwap"]).setAll({
+        r("LineSeries", ["chaikinoscillator"]).setAll({
             legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/]",
-            legendLabelText: "{shortName} ({period.formatNumber('#.')},{field})"
+            legendLabelText: "{shortName} ({period.formatNumber('#.')},{slowPeriod.formatNumber('#.')})"
         });
-        r("LineSeries", ["accumulationdistribution"]).setAll({
-            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/]",
-            legendLabelText: "{shortName} ({useVolume})"
+        r("LineSeries", ["commoditychannelindex"]).setAll({
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/]",
+            legendLabelText: "{shortName} ({period.formatNumber('#.')})"
         });
         r("LineSeries", ["disparityindex"]).setAll({
-            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/]",
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/]",
             legendLabelText: "{shortName} ({period.formatNumber('#.')},{field},{movingAverageType})"
         });
-        r("LineSeries", ["chaikinmoneyflow"]).setAll({
-            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/]",
+        r("LineSeries", ["macd"]).setAll({
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/] [{signalColor} bold]{signal.formatNumber('#.00')}[/] [bold {differenceColor}]{difference.formatNumber('#.00')}[/b]",
+            legendLabelText: "{shortName} ({fastPeriod.formatNumber('#.')},{slowPeriod.formatNumber('#.')},{signalPeriod.formatNumber('#.')})"
+        });
+        r("LineSeries", ["medianprice"]).setAll({
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/]",
             legendLabelText: "{shortName} ({period.formatNumber('#.')})"
         });
-        r("LineSeries", ["chaikinoscillator"]).setAll({
-            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/]",
-            legendLabelText: "{shortName} ({period.formatNumber('#.')},{slowPeriod.formatNumber('#.')})"
+        r("LineSeries", ["momentum"]).setAll({
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/]",
+            legendLabelText: "{shortName} ({period.formatNumber('#.')},{field})"
+        });
+        r("LineSeries", ["movingaverage"]).setAll({
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/]",
+            legendLabelText: "{shortName} ({period.formatNumber('#.')},{field},{type},{offset.formatNumber('#.')})"
+        });
+        r("ColumnSeries", ["movingaveragedeviation"]).setAll({
+            legendValueText: "[{deviationColor}; bold]{valueY.formatNumber('#.00')}[/]",
+        });
+        r("LineSeries", ["indicator", "movingaverageenvelope"]).setAll({
+            legendValueText: "[{lowerColor} bold]{lower.formatNumber('#.00')}[/] [{seriesColor} bold]{valueY.formatNumber('#.00')}[/] [{upperColor} bold]{upper.formatNumber('#.00')}[/]",
+            legendLabelText: "{shortName} ({period.formatNumber('#.')},{field},{shiftType},{shift.formatNumber('#.')},{type})"
         });
         r("LineSeries", ["onbalancevolume"]).setAll({
             legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/]",
             legendLabelText: "{shortName}"
         });
-        r("LineSeries", ["accumulativeswingindex"]).setAll({
-            legendValueText: "[{swingColor} bold]{valueY.formatNumber('#.000a')}[/]",
-            legendLabelText: "{shortName} ({limitMoveValue})"
-        });
-        r("LineSeries", ["aroon"]).setAll({
-            legendValueText: "[{upColor} bold]{up.formatNumber('#.000a')}[/] [{downColor} bold]{down.formatNumber('#.000a')}[/]",
-            legendLabelText: "{shortName} ({period.formatNumber('#.')})"
+        r("LineSeries", ["rsi"]).setAll({
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/]",
+            legendLabelText: "{shortName} ({period.formatNumber('#.')},{field})"
         });
-        r("ColumnSeries", ["awesomeoscillator"]).setAll({
-            legendValueText: "[{oscillatorColor}; bold]{valueY.formatNumber('#.000a')}[/]",
+        r("LineSeries", ["standarddeviation"]).setAll({
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/]",
+            legendLabelText: "{shortName} ({period.formatNumber('#.')},{field})"
         });
-        r("ColumnSeries", ["volume"]).setAll({
-            legendValueText: "[{volumeColor}; bold]{valueY.formatNumber('#.000a')}[/]",
+        r("LineSeries", ["stochasticmomentum"]).setAll({
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/] [{emaColor} bold]{ema.formatNumber('#.00')}[/]",
+            legendLabelText: "{shortName} ({period.formatNumber('#.')},{dPeriod.formatNumber('#.')},{emaPeriod.formatNumber('#.')})"
         });
-        r("ColumnSeries", ["movingaveragedeviation"]).setAll({
-            legendValueText: "[{deviationColor}; bold]{valueY.formatNumber('#.000a')}[/]",
+        r("LineSeries", ["stochastic"]).setAll({
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/] [{slowColor} bold]{slow.formatNumber('#.00')}[/]",
+            legendLabelText: "{shortName} ({period.formatNumber('#.')},{kSmoothing.formatNumber('#.')},{dSmoothing.formatNumber('#.')})"
         });
-        r("LineSeries", ["standarddeviation"]).setAll({
-            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/]",
-            legendLabelText: "{shortName} ({period.formatNumber('#.')},{field})"
+        r("LineSeries", ["trix"]).setAll({
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/] [{signalColor} bold]{signal.formatNumber('#.00')}[/]",
+            legendLabelText: "{shortName} ({period.formatNumber('#.')})"
         });
         r("LineSeries", ["typicalprice"]).setAll({
-            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/]",
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/]",
             legendLabelText: "{shortName} ({period.formatNumber('#.')})"
         });
-        r("LineSeries", ["trix"]).setAll({
-            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/] [{signalColor} bold]{signal.formatNumber('#.000')}[/]",
-            legendLabelText: "{shortName} ({period.formatNumber('#.')})"
+        r("ColumnSeries", ["volume"]).setAll({
+            legendValueText: "[{volumeColor}; bold]{valueY.formatNumber('#.000a')}[/]",
         });
-        r("LineSeries", ["medianprice"]).setAll({
-            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000a')}[/]",
+        r("LineSeries", ["vwap"]).setAll({
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/]",
+            legendLabelText: "{shortName} ({period.formatNumber('#.')},{field})"
+        });
+        r("LineSeries", ["williamsr"]).setAll({
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/]",
             legendLabelText: "{shortName} ({period.formatNumber('#.')})"
         });
-        r("LineSeries", ["macd"]).setAll({
-            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.000')}[/] [{signalColor} bold]{signal.formatNumber('#.000')}[/] [bold {differenceColor}]{difference.formatNumber('#.000')}[/b]",
-            legendLabelText: "{shortName} ({fastPeriod.formatNumber('#.')},{slowPeriod.formatNumber('#.')},{signalPeriod.formatNumber('#.')})"
+        r("LineSeries", ["zigzag"]).setAll({
+            legendValueText: "[{seriesColor} bold]{valueY.formatNumber('#.00')}[/]",
+            legendLabelText: "{shortName} ({deviation.formatNumber('#.')}, {depth.formatNumber('#.')})"
         });
+        // end of legend labels
         r("RoundedRectangle", ["macd", "difference"]).setAll({
             fillOpacity: 0.5,
             strokeOpacity: 0
@@ -719,30 +734,15 @@ export class StockChartDefaultTheme extends Theme {
             fillOpacity: 0.5,
             strokeOpacity: 0
         });
-        // Y Axis of indicators
-        r("Grid", ["renderer", "y", "rsi"]).setAll({
-            forceHidden: true
-        });
-        r("AxisLabel", ["renderer", "y", "rsi"]).setAll({
+        // Y Axis of overbought/oversold indicators
+        r("Grid", ["renderer", "y", "overboughtoversold"]).setAll({
             forceHidden: true
         });
         // Y Axis of indicators
-        r("Grid", ["renderer", "y", "williamsr"]).setAll({
+        r("Grid", ["renderer", "y", "overboughtoversold"]).setAll({
             forceHidden: true
         });
-        r("AxisLabel", ["renderer", "y", "williamsr"]).setAll({
-            forceHidden: true
-        });
-        r("Grid", ["renderer", "y", "commoditychannelindex"]).setAll({
-            forceHidden: true
-        });
-        r("AxisLabel", ["renderer", "y", "commoditychannelindex"]).setAll({
-            forceHidden: true
-        });
-        r("Grid", ["renderer", "y", "stochastic"]).setAll({
-            forceHidden: true
-        });
-        r("AxisLabel", ["renderer", "y", "stochastic"]).setAll({
+        r("AxisLabel", ["renderer", "y", "overboughtoversold"]).setAll({
             forceHidden: true
         });
         r("MovingAverage").setAll({
@@ -902,15 +902,31 @@ export class StockChartDefaultTheme extends Theme {
         });
         r("StochasticOscillator").setAll({
             name: "Stochastic Oscillator",
-            shortName: "Stochastic",
+            shortName: "Stochastic Osc",
             period: 14,
             kSmoothing: 1,
             dSmoothing: 3,
             field: "close",
             overSold: 20,
             overBought: 80,
-            seriesColor: color(0x707070),
-            slowColor: ic.get("negative")
+            overSoldColor: color(0xe40000),
+            overBoughtColor: color(0x67b7dc),
+            seriesColor: color(0xab82da),
+            slowColor: color(0xff903f)
+        });
+        r("StochasticMomentumIndex").setAll({
+            name: "Stochastic Momentum Index",
+            shortName: "Stochastic MI",
+            period: 10,
+            dPeriod: 3,
+            emaPeriod: 3,
+            field: "close",
+            overSold: -40,
+            overBought: 40,
+            overSoldColor: color(0xe40000),
+            overBoughtColor: color(0x67b7dc),
+            seriesColor: color(0xab82da),
+            emaColor: color(0xff903f)
         });
         r("AccumulativeSwingIndex").setAll({
             name: "Accumulative Swing Index",
@@ -962,7 +978,9 @@ export class StockChartDefaultTheme extends Theme {
         });
         r("IndicatorControl").setAll({
             name: l.translateAny("Indicators"),
-            indicators: ["Aroon", "Accumulation Distribution", "Accumulative Swing Index", "Awesome Oscillator", "Bollinger Bands", "Chaikin Money Flow", "Chaikin Oscillator", "Commodity Channel Index", "Disparity Index", "MACD", "Median Price", "Momentum", "Moving Average", "Moving Average Deviation", "Moving Average Envelope", "On Balance Volume", "Relative Strength Index", "Standard Deviation", "Stochastic Oscillator", "Trix", "Typical Price", "Volume", "VWAP", "Williams R", "ZigZag"]
+            scrollable: true,
+            fixedLabel: true,
+            indicators: ["Accumulation Distribution", "Accumulative Swing Index", "Aroon", "Awesome Oscillator", "Bollinger Bands", "Chaikin Money Flow", "Chaikin Oscillator", "Commodity Channel Index", "Disparity Index", "MACD", "Median Price", "Momentum", "Moving Average", "Moving Average Deviation", "Moving Average Envelope", "On Balance Volume", "Relative Strength Index", "Standard Deviation", "Stochastic Momentum Index", "Stochastic Oscillator", "Trix", "Typical Price", "Volume", "VWAP", "Williams R", "ZigZag"]
         });
         r("ComparisonControl").setAll({
             name: l.translateAny("Comparison")
@@ -1078,7 +1096,7 @@ export class StockChartDefaultTheme extends Theme {
         r("DrawingControl").setAll({
             name: l.translateAny("Draw"),
             tool: "Line",
-            tools: ["Average", "Callout", "Doodle", "Ellipse", "Fibonacci", "Fibonacci Timezone", "Horizontal Line", "Horizontal Ray", "Arrows & Icons", "Label", "Line", "Polyline", "Quadrant Line", "Rectangle", "Regression", "Trend Line", "Vertical Line"],
+            tools: ["Arrows & Icons", "Average", "Callout", "Doodle", "Ellipse", "Fibonacci", "Fibonacci Timezone", "Horizontal Line", "Horizontal Ray", "Label", "Line", "Measure", "Polyline", "Quadrant Line", "Rectangle", "Regression", "Trend Line", "Vertical Line"],
             togglable: true,
             strokeColor: color(0x882dff),
             strokeWidth: 2,
@@ -1088,7 +1106,7 @@ export class StockChartDefaultTheme extends Theme {
             strokeOpacity: 1,
             showExtension: true,
             fillColor: color(0xad6eff),
-            fillOpacity: 0.5,
+            fillOpacity: 0.2,
             labelFill: color(0x000000),
             labelFontSize: "12px",
             labelFontSizes: ["8px", "10px", "11px", "12px", "14px", "16px", "20px", "24px", "36px", "48px"],
@@ -1098,7 +1116,7 @@ export class StockChartDefaultTheme extends Theme {
             labelFontFamilies: ["Arial", "Courier New", "Garamond", "Georgia", "Times New Roman"],
             drawingIcon: drawingIcons[0],
             drawingIcons: drawingIcons,
-            snapToData: true
+            snapToData: false
         });
         r("ColorControl").setAll({
             useOpacity: true
@@ -1224,6 +1242,10 @@ export class StockChartDefaultTheme extends Theme {
                     label: l.translateAny("Logarithmic")
                 }]
         });
+        r("Measure").setAll({
+            labelText: "{value} ({percent})\n{count.formatNumber('#,###.')} " + l.translateAny("bars") + " {intervalCount.formatNumber('#,###.')} {intervalUnit}",
+            labelVolumeText: "\nVolume: {volume.formatNumber('#.##a')}",
+        });
     }
 }
 //# sourceMappingURL=StockChartDefaultTheme.js.map