fix #304 loop twice for updating series

Tucsky · May 12, 2023 · c2a2d2d · c2a2d2d
1 parent 51d2fc1
commit c2a2d2d
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 80 deletions.
diff --git a/src/components/chart/IndicatorDialog.vue b/src/components/chart/IndicatorDialog.vue
@@ -250,7 +250,7 @@
           <div class="d-flex">
             <dropdown-button
               :value="priceFormat"
-              :options="['price', 'volume']"
+              :options="['price', 'volume', 'percent']"
               class="mr8 -outline form-control -arrow"
               @input="setPriceFormat($event, precision)"
               v-tippy

diff --git a/src/components/chart/chart.ts b/src/components/chart/chart.ts
@@ -111,13 +111,11 @@ export interface LoadedIndicator {
   script: string
   model: IndicatorTranspilationResult
   adapter: IndicatorRealtimeAdapter
-  silentAdapter: IndicatorRealtimeAdapter
   apis: IndicatorApi[]
 }
 
 export interface IndicatorTranspilationResult {
   output: string
-  silentOutput: string
   variables: IndicatorVariable[]
   functions: IndicatorFunction[]
   plots: IndicatorPlot[]
@@ -163,6 +161,7 @@ export interface Renderer {
 interface RendererIndicatorData {
   canRender: boolean
   series: {
+    rendered?: boolean
     time: number
     value?: number
     open?: number
@@ -684,7 +683,6 @@ export default class Chart {
       script: indicatorSettings.script,
       model: null,
       adapter: null,
-      silentAdapter: null,
       apis: []
     }
 
@@ -846,9 +844,6 @@ export default class Chart {
       // create function ready to calculate (& render) everything for this indicator
       try {
         indicator.adapter = this.serieBuilder.getAdapter(indicator.model.output)
-        indicator.silentAdapter = this.serieBuilder.getAdapter(
-          indicator.model.silentOutput
-        )
       } catch (error) {
         this.unbindIndicator(indicator, renderer)
 
@@ -1910,6 +1905,8 @@ export default class Chart {
   updateBar(renderer: Renderer) {
     this.preventPan()
 
+    const toUpdate = []
+
     for (let i = 0; i < this.loadedIndicators.length; i++) {
       if (this.loadedIndicators[i].options.visible === false) {
         continue
@@ -1918,26 +1915,42 @@ export default class Chart {
       const indicator = this.loadedIndicators[i]
       const serieData = renderer.indicators[indicator.id]
 
+      this.loadedIndicators[i].adapter(
+        renderer,
+        serieData.functions,
+        serieData.variables,
+        indicator.apis,
+        indicator.options,
+        seriesUtils
+      )
+
       if (serieData.canRender) {
-        this.loadedIndicators[i].adapter(
-          renderer,
-          serieData.functions,
-          serieData.variables,
-          indicator.apis,
-          indicator.options,
-          seriesUtils
-        )
-      } else {
-        this.loadedIndicators[i].silentAdapter(
-          renderer,
-          serieData.functions,
-          serieData.variables,
-          indicator.apis,
-          indicator.options,
-          seriesUtils
-        )
+        for (let j = 0; j < indicator.apis.length; j++) {
+          if (serieData.series[j] && !serieData.series[j].rendered) {
+            if (
+              (indicator.model.plots[j].type === 'line' &&
+                !serieData.series[j].value) ||
+              (indicator.model.plots[j].type === 'histogram' &&
+                !serieData.series[j].value) ||
+              ((indicator.model.plots[j].type === 'cloudarea' ||
+                indicator.model.plots[j].type === 'brokenarea') &&
+                serieData.series[j].lowerValue === null) ||
+              (indicator.model.plots[j].type === 'histogram' &&
+                !serieData.series[j].value)
+            ) {
+              continue
+            }
+
+            toUpdate.push([indicator.apis[j], serieData.series[j]])
+          }
+        }
       }
     }
+
+    for (let i = 0; i < toUpdate.length; i++) {
+      toUpdate[i][0].update(toUpdate[i][1])
+      toUpdate[i][1].rendered = true
+    }
   }
 
   /**
@@ -1968,7 +1981,7 @@ export default class Chart {
       serieData.series = []
 
       try {
-        indicator.silentAdapter(
+        indicator.adapter(
           renderer,
           serieData.functions,
           serieData.variables,

diff --git a/src/components/chart/serieBuilder.ts b/src/components/chart/serieBuilder.ts
@@ -18,7 +18,6 @@ import {
   uniqueName
 } from '@/utils/helpers'
 import { plotTypesMap } from './options'
-const SERIE_UPDATE_REGEX = /series\[[a-zA-Z0-9+\-$ ]+\]\.update\(/
 const VARIABLES_VAR_NAME = 'vars'
 const FUNCTIONS_VAR_NAME = 'fns'
 const SERIE_TYPES = {
@@ -75,7 +74,6 @@ export default class SerieBuilder {
 
     return {
       output: result.output,
-      silentOutput: result.silentOutput,
       functions: result.functions,
       variables: result.variables,
       references: result.references,
@@ -205,34 +203,6 @@ export default class SerieBuilder {
     }
   }
 
-  getSilentOutput(originalOutput) {
-    let silentOutput = originalOutput
-
-    let instructionMatch = null
-    let iterations = 0
-
-    do {
-      if ((instructionMatch = SERIE_UPDATE_REGEX.exec(silentOutput))) {
-        const openingParenthesisIndex =
-          instructionMatch.index + instructionMatch[0].length - 1
-        const closingParenthesisIndex = findClosingBracketMatchIndex(
-          silentOutput,
-          openingParenthesisIndex
-        )
-        silentOutput = silentOutput.replace(
-          instructionMatch[0] +
-            silentOutput.slice(
-              openingParenthesisIndex + 1,
-              closingParenthesisIndex + 1
-            ),
-          1
-        )
-      }
-    } while (instructionMatch && ++iterations < 1000)
-
-    return silentOutput
-  }
-
   /**
    * parse variable, functions referenced sources and external indicators used in it
    * @param input
@@ -264,11 +234,8 @@ export default class SerieBuilder {
 
     output = this.formatOutput(output)
 
-    const silentOutput = this.getSilentOutput(output)
-
     return {
       output,
-      silentOutput,
       functions,
       variables,
       plots,
@@ -491,26 +458,7 @@ export default class SerieBuilder {
       }
     }
 
-    // this line will paint the point
-    const serieUpdate = `series[${plots.length}].update(renderer.indicators['${this.indicatorId}'].series[${plots.length}])`
-
-    // put everything together
-    let finalInstruction = seriePoint + ','
-
-    if (serieType === 'histogram') {
-      // only update point if there is a value to avoid long histogram * base line * at zero
-      finalInstruction += pointVariable + '.value&&'
-    } else if (serieType === 'line') {
-      // prevent null
-      finalInstruction += pointVariable + '.value !== null&&'
-    } else if (serieType === 'cloudarea' || serieType === 'brokenarea') {
-      // prevent null
-      finalInstruction += pointVariable + '.lowerValue !== null&&'
-    }
-
-    finalInstruction += serieUpdate
-
-    output = output.replace(rawFunctionInstruction, finalInstruction)
+    output = output.replace(rawFunctionInstruction, seriePoint)
 
     let id: string
 

diff --git a/src/components/framework/picker/ColorPickerDialog.vue b/src/components/framework/picker/ColorPickerDialog.vue
@@ -56,7 +56,7 @@
     </div>
     <div class="color-picker-dialog-controls">
       <button
-        class="btn -text"
+        class="btn -text -small"
         @click="switchFormat"
         type="button"
         title="Rotate"
@@ -70,7 +70,7 @@
         @input="setColorFromProp($event)"
       ></editable>
       <button
-        class="btn -text"
+        class="btn -text -small"
         @click="submitColor"
         type="button"
         title="Save color"