refactor

mcellteam · Mar 30, 2023 · f6e4127 · f6e4127
1 parent 7664c52
commit f6e4127
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 19 deletions.
diff --git a/src/ui/snr_plot.py b/src/ui/snr_plot.py
@@ -38,7 +38,8 @@ def __init__(self, **kwargs):
         self.plot = self.view.addPlot()
         # self.label_value = pg.InfLineLabel('test', **{'color': '#FFF'})
         self._curLayerLine = pg.InfiniteLine(
-            pen='w',
+            # pen='w',
+            pen=pg.mkPen('w', width=3),
             movable=False,
             angle=90,
             label='Section #{value:.0f}',

diff --git a/src/ui/tab_project.py b/src/ui/tab_project.py
@@ -704,7 +704,7 @@ def fn():
         self.MA_refNextColorTxt.setStyleSheet('font-size: 11px; font-family: Tahoma, sans-serif;')
         self.MA_refNextColorLab = QLabel()
         # self.MA_refNextColorLab.setMaximumHeight(12)
-        self.MA_refNextColorLab.setFixedSize(60, 18)
+        self.MA_refNextColorLab.setFixedSize(20, 20)
 
 
         self.MA_ptsListWidget_base = QListWidget()
@@ -722,7 +722,7 @@ def fn():
         self.MA_baseNextColorTxt.setStyleSheet('font-size: 11px; font-family: Tahoma, sans-serif;')
         self.MA_baseNextColorLab = QLabel()
         # self.MA_baseNextColorLab.setMaximumHeight(12)
-        self.MA_baseNextColorLab.setFixedSize(60, 18)
+        self.MA_baseNextColorLab.setFixedSize(20, 20)
 
         self.baseNextColorWidget = HWidget(self.MA_baseNextColorTxt, self.MA_baseNextColorLab)
         self.baseNextColorWidget.setMaximumHeight(14)
@@ -1441,6 +1441,9 @@ def fn():
         #     self.labNgLayout,
         #     self.comboNgLayout,
         # )
+
+        # test = QPushButton()
+
         self.w_ng_extended_toolbar.addWidget(self.labShowHide)
         self.w_ng_extended_toolbar.addAction(cfg.main_window.ngShowUiControlsAction)
         self.w_ng_extended_toolbar.addAction(cfg.main_window.ngShowScaleBarAction)
@@ -1518,24 +1521,28 @@ def fn():
         self.ng_browser_container_outer.layout.setSpacing(0)
 
     def hideSecondaryNgTools(self):
-        self.labShowHide.setVisible(False)
-        cfg.main_window.ngShowUiControlsAction.setVisible(False)
-        cfg.main_window.ngShowScaleBarAction.setVisible(False)
-        cfg.main_window.ngShowYellowFrameAction.setVisible(False)
-        cfg.main_window.ngShowAxisLinesAction.setVisible(False)
-        self.showHudOverlayAction.setVisible(False)
-        self.labNgLayout.setVisible(False)
-        self.comboNgLayout.setVisible(False)
+        for i in range(0,12):
+            self.w_ng_extended_toolbar.actions()[i].setVisible(False)
+        # self.labShowHide.setVisible(False)
+        # cfg.main_window.ngShowUiControlsAction.setVisible(False)
+        # cfg.main_window.ngShowScaleBarAction.setVisible(False)
+        # cfg.main_window.ngShowYellowFrameAction.setVisible(False)
+        # cfg.main_window.ngShowAxisLinesAction.setVisible(False)
+        # self.showHudOverlayAction.setVisible(False)
+        # self.labNgLayout.setVisible(False)
+        # self.comboNgLayout.setVisible(False)
 
     def showSecondaryNgTools(self):
-        self.labShowHide.setVisible(True)
-        cfg.main_window.ngShowUiControlsAction.setVisible(True)
-        cfg.main_window.ngShowScaleBarAction.setVisible(True)
-        cfg.main_window.ngShowYellowFrameAction.setVisible(True)
-        cfg.main_window.ngShowAxisLinesAction.setVisible(True)
-        self.showHudOverlayAction.setVisible(True)
-        self.labNgLayout.setVisible(True)
-        self.comboNgLayout.setVisible(True)
+        for i in range(0,12):
+            self.w_ng_extended_toolbar.actions()[i].setVisible(True)
+        # self.labShowHide.setVisible(True)
+        # cfg.main_window.ngShowUiControlsAction.setVisible(True)
+        # cfg.main_window.ngShowScaleBarAction.setVisible(True)
+        # cfg.main_window.ngShowYellowFrameAction.setVisible(True)
+        # cfg.main_window.ngShowAxisLinesAction.setVisible(True)
+        # self.showHudOverlayAction.setVisible(True)
+        # self.labNgLayout.setVisible(True)
+        # self.comboNgLayout.setVisible(True)
 
 
     def onTranslate(self):