Add a universe level box to the color dialog as well.

Author: pshriwise

openmc_plotter/docks.py

@@ -145,9 +145,9 @@ def _createOptionsBox(self):
         self.colorbyBox.currentTextChanged[str].connect(
             self.main_window.editColorBy)
 
-        # Universe level (applies to cell coloring)
+        # Universe level (applies to cell coloring only)
         self.universeLevelBox = QComboBox(self)
-        self.universeLevelBox.addItem('lowest')
+        self.universeLevelBox.addItem('all')
         for i in range(self.model.max_universe_levels):
             self.universeLevelBox.addItem(str(i))
         self.universeLevelBox.currentTextChanged[str].connect(
@@ -188,7 +188,7 @@ def _createOptionsBox(self):
         self.opLayout.addRow('Height:', self.heightBox)
         self.opLayout.addRow('Basis:', self.basisBox)
         self.opLayout.addRow('Color By:', self.colorbyBox)
-        self.opLayout.addRow('Universe Level', self.universeLevelBox)
+        self.opLayout.addRow('Universe Level:', self.universeLevelBox)
         self.opLayout.addRow('Plot alpha:', self.domainAlphaBox)
         self.opLayout.addRow('Visible:', self.visibilityBox)
         self.opLayout.addRow('Outlines:', self.outlinesBox)

openmc_plotter/main_window.py

@@ -628,11 +628,12 @@ def editColorBy(self, domain_kind, apply=False):
             self.applyChanges()
 
     def editUniverseLevel(self, level, apply=False):
-        if level == 'lowest':
+        if level == 'all':
             self.model.activeView.level = -1
         else:
             self.model.activeView.level = int(level)
         self.dock.updateUniverseLevel()
+        self.colorDialog.updateUniverseLevel()
         if apply:
             self.applyChanges()
 

openmc_plotter/plotgui.py

@@ -776,6 +776,13 @@ def createGeneralTab(self):
         self.colorbyBox.addItem("cell")
         self.colorbyBox.addItem("temperature")
         self.colorbyBox.addItem("density")
+        self.colorbyBox.currentTextChanged[str].connect(main_window.editColorBy)
+
+        self.universeLevelBox = QComboBox(self)
+        self.universeLevelBox.addItem('all')
+        for i in range(self.model.max_universe_levels):
+            self.universeLevelBox.addItem(str(i))
+        self.universeLevelBox.currentTextChanged[str].connect(main_window.editUniverseLevel)
 
         # Overlap plotting
         self.overlapCheck = QCheckBox('', self)
@@ -788,8 +795,6 @@ def createGeneralTab(self):
         self.overlapColorButton.setFixedHeight(self.font_metric.height() * 1.5)
         self.overlapColorButton.clicked.connect(main_window.editOverlapColor)
 
-        self.colorbyBox.currentTextChanged[str].connect(main_window.editColorBy)
-
         self.colorResetButton = QPushButton("&Reset Colors")
         self.colorResetButton.setCursor(QtCore.Qt.PointingHandCursor)
         self.colorResetButton.clicked.connect(main_window.resetColors)
@@ -813,6 +818,7 @@ def createGeneralTab(self):
         formLayout.addRow('OVerlap Color:', self.overlapColorButton)
         formLayout.addRow(HorizontalLine())
         formLayout.addRow('Color Plot By:', self.colorbyBox)
+        formLayout.addRow('Universe Level:', self.universeLevelBox)
         formLayout.addRow(self.colorResetButton, None)
 
         generalLayout = QHBoxLayout()
@@ -1049,6 +1055,11 @@ def updateColorBy(self):
         colorby = self.model.activeView.colorby
         self.colorbyBox.setCurrentText(colorby)
         self.overlapCheck.setEnabled(colorby in ("cell", "material"))
+        self.universeLevelBox.setEnabled(colorby == 'cell')
+
+    def updateUniverseLevel(self):
+        level = self.model.activeView.level
+        self.universeLevelBox.setCurrentText(level)
 
     def updateDomainTabs(self):
         self.cellTable.setModel(self.main_window.cellsModel)