Implemented button for undefined region plotting

Author: viktormai

openmc_plotter/main_window.py

@@ -952,26 +952,14 @@ def editOverlapColor(self, apply=False):
         if apply:
             self.applyChanges()
 
-    def editUndefinedInternalColor(self, apply=False):
-        current_color = self.model.activeView.undefined_internal_color
+    def editUndefinedColor(self, apply=False):
+        current_color = self.model.activeView.undefined_color
         dlg = QColorDialog(self)
         dlg.setCurrentColor(QtGui.QColor.fromRgb(*current_color))
         if dlg.exec():
             new_color = dlg.currentColor().getRgb()[:3]
-            self.model.activeView.undefined_internal_color = new_color
-            self.colorDialog.updateUndefinedColors()
-
-        if apply:
-            self.applyChanges()
-
-    def editUndefinedExternalColor(self, apply=False):
-        current_color = self.model.activeView.undefined_external_color
-        dlg = QColorDialog(self)
-        dlg.setCurrentColor(QtGui.QColor.fromRgb(*current_color))
-        if dlg.exec():
-            new_color = dlg.currentColor().getRgb()[:3]
-            self.model.activeView.undefined_external_color = new_color
-            self.colorDialog.updateUndefinedColors()
+            self.model.activeView.undefined_color = new_color
+            self.colorDialog.updateUndefinedColor()
 
         if apply:
             self.applyChanges()

openmc_plotter/plotgui.py

@@ -371,8 +371,6 @@ def _undefinedInfo(self, event):
             return ""
         if self.model.undefined_internal[yPos, xPos]:
             return "WARNING: undefined internal region"
-        if self.model.undefined_external[yPos, xPos]:
-            return "Safe external undefined region"
         return ""
 
     def mouseDoubleClickEvent(self, event):
@@ -1144,21 +1142,13 @@ def createGeneralTab(self):
         undefined_connector = partial(main_window.toggleUndefined)
         self.undefinedCheck.stateChanged.connect(undefined_connector)
 
-        self.undefinedInternalColorButton = QPushButton()
-        self.undefinedInternalColorButton.setCursor(QtCore.Qt.PointingHandCursor)
-        self.undefinedInternalColorButton.setFixedWidth(button_width)
-        self.undefinedInternalColorButton.setFixedHeight(
+        self.undefinedColorButton = QPushButton()
+        self.undefinedColorButton.setCursor(QtCore.Qt.PointingHandCursor)
+        self.undefinedColorButton.setFixedWidth(button_width)
+        self.undefinedColorButton.setFixedHeight(
             self.font_metric.height() * 1.5)
-        self.undefinedInternalColorButton.clicked.connect(
-            main_window.editUndefinedInternalColor)
-
-        self.undefinedExternalColorButton = QPushButton()
-        self.undefinedExternalColorButton.setCursor(QtCore.Qt.PointingHandCursor)
-        self.undefinedExternalColorButton.setFixedWidth(button_width)
-        self.undefinedExternalColorButton.setFixedHeight(
-            self.font_metric.height() * 1.5)
-        self.undefinedExternalColorButton.clicked.connect(
-            main_window.editUndefinedExternalColor)
+        self.undefinedColorButton.clicked.connect(
+            main_window.editUndefinedColor)
 
         self.colorResetButton = QPushButton("&Reset Colors")
         self.colorResetButton.setCursor(QtCore.Qt.PointingHandCursor)
@@ -1183,10 +1173,7 @@ def createGeneralTab(self):
         formLayout.addRow('Overlap Color:', self.overlapColorButton)
         formLayout.addRow(HorizontalLine())
         formLayout.addRow('Show Undefined:', self.undefinedCheck)
-        formLayout.addRow('Undefined Internal (warning):',
-                          self.undefinedInternalColorButton)
-        formLayout.addRow('Undefined External (safe):',
-                          self.undefinedExternalColorButton)
+        formLayout.addRow('Undefined Color:', self.undefinedColorButton)
         formLayout.addRow(HorizontalLine())
         formLayout.addRow('Color Plot By:', self.colorbyBox)
         formLayout.addRow('Universe Level:', self.universeLevelBox)
@@ -1356,7 +1343,7 @@ def updateDialogValues(self):
         self.updateOverlap()
         self.updateOverlapColor()
         self.updateUndefined()
-        self.updateUndefinedColors()
+        self.updateUndefinedColor()
 
     def updateMasking(self):
         masking = self.model.activeView.masking
@@ -1426,12 +1413,10 @@ def updateOverlap(self):
         if colorby in ('cell', 'material'):
             self.overlapCheck.setChecked(overlap_val)
 
-    def updateUndefinedColors(self):
-        internal = self.model.activeView.undefined_internal_color
-        external = self.model.activeView.undefined_external_color
+    def updateUndefinedColor(self):
+        color = self.model.activeView.undefined_color
         style = "border-radius: 8px;background-color: rgb%s"
-        self.undefinedInternalColorButton.setStyleSheet(style % str(internal))
-        self.undefinedExternalColorButton.setStyleSheet(style % str(external))
+        self.undefinedColorButton.setStyleSheet(style % str(color))
 
     def updateUndefined(self):
         colorby = self.model.activeView.colorby

openmc_plotter/plotmodel.py

@@ -327,12 +327,11 @@ def __init__(self, use_settings_pkl, model_path, default_res):
         # Map to be populated by overlap functions
         self.overlap_info = None
 
-        # Boolean masks of undefined (not-found) regions, populated by
+        # Boolean mask of internal undefined (not-found) regions, populated by
         # makePlot when undefined-region coloring is enabled. Internal regions
         # are enclosed by defined geometry (potentially unsafe); external
-        # regions connect to the slice boundary.
+        # (boundary-connected) undefined regions are intentionally ignored.
         self.undefined_internal = None
-        self.undefined_external = None
 
         self.version = __version__
 
@@ -592,20 +591,17 @@ def makePlot(self, view: Optional["PlotView"] = None,
                 if dom.highlight:
                     image[self.ids == int(id)] = cv.highlightBackground
 
-        # Classify and color undefined (not-found) regions. Internal regions
-        # are holes enclosed by defined geometry (flagged as a warning);
-        # external regions connect to the slice boundary and are considered
-        # safe.
+        # Classify and color undefined (not-found) regions. Only internal
+        # regions (holes enclosed by defined geometry) are flagged as a
+        # warning; external regions connect to the slice boundary and are
+        # left untouched.
         self.undefined_internal = None
-        self.undefined_external = None
         if cv.color_undefined:
-            _, external, internal = \
+            _, _, internal = \
                 openmc.Model._classify_undefined_regions(self.cell_ids)
             if internal is not None:
                 self.undefined_internal = internal
-                self.undefined_external = external
-                image[external] = cv.undefined_external_color
-                image[internal] = cv.undefined_internal_color
+                image[internal] = cv.undefined_color
 
         # set model image
         self.image = image
@@ -1251,11 +1247,10 @@ class PlotViewIndependent:
     overlap_color : 3-tuple of int
         RGB color to apply for cell overlap regions
     color_undefined : bool
-        Indicator of whether or not undefined (not-found) regions will be shown
-    undefined_internal_color : 3-tuple of int
+        Indicator of whether or not internal undefined (not-found) regions
+        will be shown
+    undefined_color : 3-tuple of int
         RGB color to apply for internal (enclosed) undefined regions
-    undefined_external_color : 3-tuple of int
-        RGB color to apply for external (boundary-connected) undefined regions
     domainAlpha : float between 0 and 1
         Alpha value of the geometry plot
     plotVisibile : bool
@@ -1305,10 +1300,9 @@ def __init__(self):
         self.highlightSeed = 1
         self.domainBackground = (50, 50, 50)
         self.overlap_color = (255, 0, 0)
-        # Undefined (not-found) region coloring
+        # Undefined (not-found) region coloring (internal regions only)
         self.color_undefined = False
-        self.undefined_internal_color = (255, 0, 255)
-        self.undefined_external_color = (0, 170, 255)
+        self.undefined_color = (255, 0, 255)
         self.domainAlpha = 1.0
         self.domainVisible = True
         self.outlinesCell = False
@@ -1349,10 +1343,8 @@ def __setstate__(self, state):
         # Undefined region coloring (added in a later version)
         if not hasattr(self, 'color_undefined'):
             self.color_undefined = False
-        if not hasattr(self, 'undefined_internal_color'):
-            self.undefined_internal_color = (255, 0, 255)
-        if not hasattr(self, 'undefined_external_color'):
-            self.undefined_external_color = (0, 170, 255)
+        if not hasattr(self, 'undefined_color'):
+            self.undefined_color = (255, 0, 255)
         # Migrate old boolean attributes to new tallyDataMinMaxType
         if not hasattr(self, 'tallyDataMinMaxType'):
             if getattr(self, 'tallyDataUserMinMax', False):