updates

ShahmBarmada · Dec 2, 2021 · 5d0b4ea · 5d0b4ea
1 parent d2fdf4f
commit 5d0b4ea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/App.py b/App.py
@@ -107,14 +107,14 @@ def UpdateDataType(self):
         if self.rb_AnnualVal.isEnabled and self.rb_AnnualVal.isChecked():
             if self.rb_Selective.isChecked():
                 self.cb_Trace.clear()
-                self.cb_Trace.addItems(['Bar Chart', 'Pie Chart', 'Box Plot'])
+                self.cb_Trace.addItems(['Bar Chart', 'Pie Chart'])
                 self.cb_Trace.setCurrentIndex(0)
                 self.rb_Xdata.setChecked(True)
                 self.rb_Xtime.setEnabled(False)
                 self.cb_Xstart.setEnabled(False)
                 self.cb_Xend.setEnabled(False)
                 self.cb_Ydata.clear()
-                self.cb_Ydata.setEnabled(True)
+                self.cb_Ydata.setEnabled(False)
                 self.cb_Ydata.addItems(dataList.keys())
                 self.cb_Ydata.insertSeparator(23)
                 self.cb_Xdata.clear()
@@ -147,7 +147,7 @@ def UpdateTrace(self):
             self.cb_StatMedian.setEnabled(True)
             self.cb_OnlyStats.setEnabled(True)
             self.cb_StackLines.setChecked(False)
-            self.cb_StackLines.setEnabled(True)
+            self.cb_StackLines.setEnabled(False)
 
         elif self.cb_Trace.currentText() == 'Bar Chart':
             self.cb_Style.clear()
@@ -497,15 +497,15 @@ def AddPlot(self):
                 xTick = 'auto'
                 xStep = 0
             else:
-                xTick = 'fixed'
-                xStep = int(self.txt_TicksX.text()) -1
+                xTick = 'linear'
+                xStep = int(self.txt_TicksX.text())
 
             if self.cb_TicksY.isChecked():
                 yTick = 'auto'
                 yStep = 0
             else:
-                yTick = 'fixed'
-                yStep = int(self.txt_TicksX.text()) -1
+                yTick = 'linear'
+                yStep = int(self.txt_TicksX.text())
 
             xTimeStart = self.cb_Xstart.currentText()
             xTimeEnd = self.cb_Xend.currentText()

diff --git a/Plotter.py b/Plotter.py
@@ -572,9 +572,8 @@ def PlotterSelective (srcFig= dict, srcPlt= list, visibleLegend= bool, visibleTi
                 ))
 
         ### update layout & axes
-
-        figure.update_xaxes({'title_text': xTitle, 'tickmode': 'auto', 'tick0': 0, 'tickangle': -45}, row= posRow, col= posCol)
-        figure.update_yaxes({'title_text': yTitle, 'tickmode': 'auto', 'tick0': 0, 'tickangle': 0}, row= posRow, col= posCol)
+        figure.update_xaxes({'title_text': xTitle, 'tickmode': sumDF.loc['xtick'].values.tolist()[0], 'tick0': 0, 'dtick': sumDF.loc['xstep'].values.tolist()[0], 'tickangle': -45}, row= posRow, col= posCol)
+        figure.update_yaxes({'title_text': yTitle, 'tickmode': sumDF.loc['ytick'].values.tolist()[0], 'tick0': 0, 'dtick': sumDF.loc['ystep'].values.tolist()[0], 'tickangle': 0}, row= posRow, col= posCol)
 
     figure.update_layout(
         uniformtext_minsize=18, 

diff --git a/UI_Main.py b/UI_Main.py
@@ -444,6 +444,7 @@ def setupUi(self, MainWindow):
         self.cb_StudiesNames.setEnabled(True)
         self.cb_StudiesNames.setGeometry(QtCore.QRect(160, 145, 110, 24))
         self.cb_StudiesNames.setObjectName("cb_StudiesNames")
+        self.cb_StudiesNames.setVisible(False)
         self.gb_Info = QtWidgets.QGroupBox(self.page_2)
         self.gb_Info.setGeometry(QtCore.QRect(0, 460, 295, 120))
         self.gb_Info.setObjectName("gb_Info")