Rename drawing functions for indicators enable / disable

Skinok · Skinok · commit ed485848a1d6 · 2021-11-18T14:16:41.000+01:00
diff --git a/finplotWindow.py b/finplotWindow.py
@@ -15,28 +15,31 @@ def __init__(self, dockArea, dockChart):
         self.dockArea = dockArea
         self.dockChart = dockChart
 
+        self.IndIchimokuActivated = False
+        self.IndRSIActivated = False
+        self.IndStochasticActivated = False
+        self.IndMAActivated = False
+
+        self.IndVolumesActivated = False
+
         pass
 
     #########
-    #  Draw chart
+    #  Prepare the plot widgets
     #########
-    def drawFinPlots(self, data):
+    def createPlotWidgets(self):
 
-        # Rest previous draws
-        if hasattr(self, 'axo'):
-            self.ax0.reset()
-        if hasattr(self, 'ax1'):
-            self.ax1.reset()
 
-        self.data = data
 
         # fin plot
         self.ax0, self.ax1, self.ax2, self.ax3 = fplt.create_plot_widget(master=self.dockArea, rows=4, init_zoom_periods=100)
         self.dockArea.axs = [self.ax0, self.ax1, self.ax2, self.ax3]
         self.dockChart.addWidget(self.ax0.ax_widget, 1, 0, 1, 1)
+        pass
 
-        fplt.candlestick_ochl(data['Open Close High Low'.split()], ax=self.ax0)
-        #fplt.volume_ocv(data['Open Close Volume'.split()], ax=self.ax0.overlay())
+    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)
@@ -251,38 +254,58 @@ def activateDarkMode(self, activated):
     #############
     #  Indicators
     #############
-    def setIndicator(self, indicatorName, activated):
 
-        if (indicatorName == "Ichimoku"):
+    def resetPlots(self):
+        # Entirely reset graph
+        if (hasattr(self,"ax0")):
+            self.ax0.reset()
+        if (hasattr(self,"ax1")):
+            self.ax1.reset()
+        if (hasattr(self,"ax2")):
+            self.ax2.reset()
+        if (hasattr(self,"ax3")):
+            self.ax3.reset()
 
-            if activated:
+        pass
+
+    def setChartData(self, data):
+        self.data = data
+        pass
+
+    def updateChart(self):
+
+        # Entirely reset graph
+        self.resetPlots()
+
+        if (hasattr(self,"data")):
+
+            # Start plotting indicators
+            if self.IndIchimokuActivated:
                 self.ichimoku_indicator = ichimoku.Ichimoku(self.data)
                 self.ichimoku_indicator.draw(self.ax0)
-            else:
 
-                for item in list(self.ax0.items):
-                    self.ax0.removeItem(item)
+            if self.IndVolumesActivated:
+                fplt.volume_ocv(self.data['Open Close Volume'.split()], ax=self.ax0.overlay())
+
+            # Finally draw candles
+            self.drawCandles()
 
-                self.drawFinPlots(self.data)
+            # Refresh view : auto zoom
+            fplt.refresh()
 
-        # Refresh view
-        self.ax0.vb.refresh_all_y_zoom()
         pass
 
-    def activate_volumes(self, activated):
-        
-        if activated:
-            fplt.volume_ocv(self.data['Open Close Volume'.split()], ax=self.ax0.overlay())
-        else:
-            #self.ax0.vb.reset()
-            for item in list(self.ax0.items):
-                self.ax0.removeItem(item)
 
-            self.drawFinPlots(self.data)
-            #self.ax0.overlay().reset()
+    def setIndicator(self, indicatorName, activated):
+
+        if (indicatorName == "Ichimoku"):
+            self.IndIchimokuActivated = activated
+
+        if (indicatorName == "Volumes"):
+            self.IndVolumesActivated = activated
+
+        self.updateChart()
 
-        # Refresh view
-        self.ax0.vb.refresh_all_y_zoom()
         pass
 
     #############
diff --git a/userInterface.py b/userInterface.py
@@ -110,6 +110,7 @@ def createUIs(self):
 
         # Create finplot Window
         self.createFinplotWindow()
+        self.createControlPanel()
 
         pass
 
@@ -361,6 +362,7 @@ def fillSummaryUI(self, brokerCash, brokerValue, tradeAnalysis):
     def createFinplotWindow(self):
 
         self.fpltWindow = finplotWindow.FinplotWindow(self.dockArea, self.dock_chart)
+        self.fpltWindow.createPlotWidgets()
 
         pass
 
@@ -385,19 +387,16 @@ def getProgressBar(self):
     # Draw chart
     #########
     def drawChart(self, data):
-        self.fpltWindow.drawFinPlots(data)
-        self.createControlPanel()
-
+        self.fpltWindow.setChartData(data)
+        self.fpltWindow.updateChart()
         pass
 
     #########
     # Draw orders on chart
     #########
     def setOrders(self, orders):
-
         #self.fillOrdersUI(self.myOrders)
         self.fpltWindow.drawOrders(orders)
-
         pass
 
 
@@ -466,16 +465,15 @@ def dark_mode_toggle(self):
         self.fpltWindow.activateDarkMode(self.darkmodeCB.isChecked())
         pass
 
-    def volumes_toggle(self):
-        self.fpltWindow.activate_volumes(self.volumesCB.isChecked())
-        pass
-    
 
     ##########
     # INDICATORS
     ##########
     def addIchimoku(self):
-        self.fpltWindow.setIndicator( "Ichimoku", self.IchimokuPB.isChecked() )
+        self.fpltWindow.setIndicator("Ichimoku", self.IchimokuPB.isChecked() )
+        pass
+    def volumes_toggle(self):
+        self.fpltWindow.setIndicator("Volumes", self.volumesCB.isChecked())
         pass
 
     #########
