Stochastic & Stochastic Rsi Parameters

Skinok · Skinok · commit e232a4649085 · 2021-12-03T21:29:52.000+01:00
diff --git a/finplotWindow.py b/finplotWindow.py
@@ -71,13 +71,13 @@ def drawRsi(self, period):
         self.rsi_indicator.draw(self.ax_rsi)
         pass
 
-    def drawStochastic(self, period_k, period_d):
-        self.stochastic_indicator = stochastic.Stochastic(self.data, period_k, period_d)
+    def drawStochastic(self, period, smooth_k, smooth_d):
+        self.stochastic_indicator = stochastic.Stochastic(self.data, period, smooth_k, smooth_d)
         self.stochastic_indicator.draw(self.ax_stochastic)
         pass
 
-    def drawStochasticRsi(self, period, period_k, period_d, period_):
-        self.stochasticRsi_indicator = stochasticRsi.StochasticRsi(self.data)
+    def drawStochasticRsi(self, period, smooth_k, smooth_d):
+        self.stochasticRsi_indicator = stochasticRsi.StochasticRsi(self.data, period, smooth_k, smooth_d)
         self.stochasticRsi_indicator.draw(self.ax_stochasticRsi)
         pass
 
diff --git a/indicators/stochastic.py b/indicators/stochastic.py
@@ -8,15 +8,11 @@
 
 class Stochastic():
 
-    def __init__(self, dataFrames, stochastic_periods=14, stochastic_quick=3, stochastic_smooth = 3):
-        self.stochastic_df, self.stochastic_quick_df = calc_stochastic_oscillator(dataFrames, stochastic_periods, stochastic_quick, stochastic_smooth)
+    def __init__(self, dataFrames, stochastic_periods=14, stochastic_k_smooth=1, stochastic_d_smooth = 3):
+        self.stochastic_k_df, self.stochastic_d_df = calc_stochastic_oscillator(dataFrames, stochastic_periods, stochastic_k_smooth, stochastic_d_smooth)
         pass
 
     def draw(self, ax, stochasticColor = "magenta", stochastic_quick_color="yellow"):
-        self.stochastic_plot = fplt.plot(self.stochastic_df, ax = ax, color=stochasticColor, width=1 )
-        self.stochastic_quick_plot = fplt.plot(self.stochastic_quick_df, ax = ax, color=stochastic_quick_color, width=1 )
-        pass
-
-    def clear(self):
-
+        self.stochastic_k_plot = fplt.plot(self.stochastic_k_df, ax = ax, color=stochasticColor, width=1 )
+        self.stochastic_d_plot = fplt.plot(self.stochastic_d_df, ax = ax, color=stochastic_quick_color, width=1 )
         pass
diff --git a/indicators/stochasticRsi.py b/indicators/stochasticRsi.py
@@ -12,11 +12,8 @@ def __init__(self, dataFrames, period=14, smoothK=3, smoothD = 3):
         self.stochrsi, self.stochrsi_K, self.stochrsi_D = StochRSI(dataFrames, period, smoothK, smoothD)
         pass
 
-    def draw(self, ax, stochasticRsi_color = "red", stochasticRsi_quick_color="green"):
-        self.stochrsi_K_plot = fplt.plot(self.stochrsi_K, ax = ax, color=stochasticRsi_color, width=1 )
-        self.stochrsi_D_plot = fplt.plot(self.stochrsi_D, ax = ax, color=stochasticRsi_quick_color, width=1 )
+    def draw(self, ax, stochasticRsi_k_color = "red", stochasticRsi_d_color="green"):
+        self.stochrsi_K_plot = fplt.plot(self.stochrsi_K, ax = ax, color=stochasticRsi_k_color, width=1 )
+        self.stochrsi_D_plot = fplt.plot(self.stochrsi_D, ax = ax, color=stochasticRsi_d_color, width=1 )
         pass
 
-    def clear(self):
-
-        pass
diff --git a/userInterface.py b/userInterface.py
@@ -577,7 +577,6 @@ def toogleRsi(self):
             paramDialog.setWindowFlags(QtCore.Qt.CustomizeWindowHint)
             paramDialog.setTitle("RSI Indicator parameters")
             paramDialog.addParameter("RSI Period", 14)
-            #paramDialog.setStyleSheet("QDialog{ border: 1px solid green; }")
             paramDialog.adjustSize()
 
             if (paramDialog.exec() == QtWidgets.QDialog.Accepted ):
@@ -596,11 +595,61 @@ def toogleRsi(self):
         pass
 
     def toogleStochastic(self):
-        self.dock_stochastic.show() if self.StochasticPB.isChecked() else self.dock_stochastic.hide()
+
+        if self.StochasticPB.isChecked():
+            # Show indicator parameter dialog
+            paramDialog = indicatorParametersUI.IndicatorParametersUI(self.dock_chart)
+            paramDialog.setWindowFlags(QtCore.Qt.CustomizeWindowHint)
+            paramDialog.setTitle("Stochastic Indicator parameters")
+            paramDialog.addParameter("Stochastic Period K", 14)
+            paramDialog.addParameter("Stochastic Smooth K", 3)
+            paramDialog.addParameter("Stochastic Smooth D", 3)
+            paramDialog.adjustSize()
+
+            if (paramDialog.exec() == QtWidgets.QDialog.Accepted ):
+                period = paramDialog.getValue("Stochastic Period K")
+                smooth_k = paramDialog.getValue("Stochastic Smooth K")
+                smooth_d = paramDialog.getValue("Stochastic Smooth D")
+
+                self.fpltWindow.drawStochastic( period, smooth_k, smooth_d )
+                self.dock_stochastic.show()
+            else:
+                # Cancel
+                self.RsiPB.setChecked(False)
+                self.dock_stochastic.hide()
+                
+        else:
+            self.dock_stochastic.hide()
+
         pass
 
     def toogleStochasticRsi(self):
-        self.dock_stochasticRsi.show() if self.StochasticRsiPB.isChecked() else self.dock_stochasticRsi.hide()
+
+        if self.StochasticRsiPB.isChecked():
+            # Show indicator parameter dialog
+            paramDialog = indicatorParametersUI.IndicatorParametersUI(self.dock_chart)
+            paramDialog.setWindowFlags(QtCore.Qt.CustomizeWindowHint)
+            paramDialog.setTitle("Stochastic Indicator parameters")
+            paramDialog.addParameter("Stochastic Rsi Period K", 14)
+            paramDialog.addParameter("Stochastic Rsi Smooth K", 3)
+            paramDialog.addParameter("Stochastic Rsi Smooth D", 3)
+            paramDialog.adjustSize()
+
+            if (paramDialog.exec() == QtWidgets.QDialog.Accepted ):
+                period = paramDialog.getValue("Stochastic Rsi Period K")
+                smooth_k = paramDialog.getValue("Stochastic Rsi Smooth K")
+                smooth_d = paramDialog.getValue("Stochastic Rsi Smooth D")
+
+                self.fpltWindow.drawStochasticRsi( period, smooth_k, smooth_d)
+                self.dock_stochasticRsi.show()
+            else:
+                # Cancel
+                self.RsiPB.setChecked(False)
+                self.dock_stochasticRsi.hide()
+                
+        else:
+            self.dock_stochasticRsi.hide()
+
         pass
 
     # On chart indicators
