Display / hide indicators

Skinok · Skinok · commit cd168db9b050 · 2021-12-03T09:19:47.000+01:00
diff --git a/finplotWindow.py b/finplotWindow.py
@@ -57,7 +57,7 @@ def createPlotWidgets(self):
     def drawCandles(self):
 
         fplt.candlestick_ochl(self.data['Open Close High Low'.split()], ax=self.ax0)
-
+        
         #self.hover_label = fplt.add_legend('', ax=self.ax0)
         #fplt.set_time_inspector(self.update_legend_text, ax=self.ax0, when='hover', data=data)
         #fplt.add_crosshair_info(self.update_crosshair_text, ax=self.ax0)
@@ -66,6 +66,22 @@ def drawCandles(self):
         #self.createControlPanel(self.ax0.ax_widget)
         pass
 
+    def drawExternalsIndicators(self):
+
+        #if self.IndRsiActivated:
+        self.rsi_indicator = rsi.Rsi(self.data)
+        self.rsi_indicator.draw(self.ax_rsi)
+
+        #if self.IndStochasticActivated:
+        self.stochastic_indicator = stochastic.Stochastic(self.data)
+        self.stochastic_indicator.draw(self.ax_stochastic)
+
+        #if self.IndStochasticRsiActivated:
+        self.stochasticRsi_indicator = stochasticRsi.StochasticRsi(self.data)
+        self.stochasticRsi_indicator.draw(self.ax_stochasticRsi)
+
+        pass
+
     #########
     #  Draw orders on charts (with arrows)
     #########
@@ -305,6 +321,9 @@ def refreshChart(self):
 
     def setChartData(self, data):
         self.data = data
+
+        # Calculate indicators only one time when setting chart data
+        self.drawExternalsIndicators()
         pass
 
     def resetChart(self):
@@ -326,24 +345,9 @@ def updateChart(self):
                 self.ichimoku_indicator = ichimoku.Ichimoku(self.data)
                 self.ichimoku_indicator.draw(self.ax0)
 
-            if self.IndRsiActivated:
-                self.rsi_indicator = rsi.Rsi(self.data)
-                self.rsi_indicator.draw(self.ax_rsi)
-
-            if self.IndStochasticActivated:
-                self.stochastic_indicator = stochastic.Stochastic(self.data)
-                self.stochastic_indicator.draw(self.ax_stochastic)
-                pass
-
-            if self.IndStochasticRsiActivated:
-                self.stochasticRsi_indicator = stochasticRsi.StochasticRsi(self.data)
-                self.stochasticRsi_indicator.draw(self.ax_stochasticRsi)
-                pass
-
             if self.IndVolumesActivated:
                 fplt.volume_ocv(self.data['Open Close Volume'.split()], ax=self.ax0.overlay())
 
-
             # Finally draw candles
             self.drawCandles()
 
@@ -355,28 +359,19 @@ def updateChart(self):
 
         pass
 
-
+    
     def setIndicator(self, indicatorName, activated):
 
-        if (indicatorName == "Rsi"):
-            self.IndRsiActivated = activated
-
-        if (indicatorName == "Stochastic"):
-            self.IndStochasticActivated = activated
-
-        if (indicatorName == "StochasticRsi"):
-            self.IndStochasticRsiActivated = activated
-
         if (indicatorName == "Ichimoku"):
             self.IndIchimokuActivated = activated
-
+        
         if (indicatorName == "Volumes"):
             self.IndVolumesActivated = activated
 
         self.updateChart()
 
         pass
-
+  
     #############
     #  Show finplot Window
     #############
diff --git a/userInterface.py b/userInterface.py
@@ -556,24 +556,24 @@ def resetChart(self):
         self.fpltWindow.updateChart()
         pass
 
+    # indicators in external windows
     def addRsi(self):
-        self.fpltWindow.setIndicator("Rsi", self.RsiPB.isChecked() )
         self.dock_rsi.show() if self.RsiPB.isChecked() else self.dock_rsi.hide()
         pass
 
     def addStochastic(self):
-        self.fpltWindow.setIndicator("Stochastic", self.StochasticPB.isChecked() )
         self.dock_stochastic.show() if self.StochasticPB.isChecked() else self.dock_stochastic.hide()
         pass
 
     def addStochasticRsi(self):
-        self.fpltWindow.setIndicator("StochasticRsi", self.StochasticRsiPB.isChecked() )
         self.dock_stochasticRsi.show() if self.StochasticRsiPB.isChecked() else self.dock_stochasticRsi.hide()
         pass
 
+    # On chart indicators
     def addIchimoku(self):
         self.fpltWindow.setIndicator("Ichimoku", self.IchimokuPB.isChecked() )
         pass
+
     def volumes_toggle(self):
         self.fpltWindow.setIndicator("Volumes", self.volumesCB.isChecked())
         pass
