Skip to content

Reorganize layout to use tabbed panels instead of docks #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paulromano wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Reorganize layout to use tabbed panels instead of docks #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
29cdca3
Change docks to tabs
paulromano Jan 23, 2026
f87939a
Rename Mesh Annotations -> Meshes
paulromano Jan 23, 2026
992a8a2
Make apply changes button green
paulromano Jan 23, 2026
3167f68
Rename a few methods for consistency
paulromano Jan 23, 2026
7f8a4a4
Fix warning about MaskedConstant
paulromano Jan 23, 2026
d2f5211
Use geometryPanel and tallyPanel attributes
paulromano Jan 23, 2026
590440e
Avoid converting MaskedConstant to nan
paulromano Jan 23, 2026
870e144
Make sure panels are resizable so that full GUI window can be resized
paulromano Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
180 changes: 95 additions & 85 deletions openmc_plotter/docks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
QGroupBox, QFormLayout, QLabel, QLineEdit,
QComboBox, QSpinBox, QDoubleSpinBox, QSizePolicy,
QCheckBox, QDockWidget, QScrollArea, QListWidget,
QListWidgetItem, QTreeWidget, QTreeWidgetItem)
QListWidgetItem, QTreeWidget, QTreeWidgetItem,
QTabWidget)
import matplotlib.pyplot as plt
import numpy as np
import openmc
Expand All @@ -18,26 +19,26 @@
_REACTION_UNITS, _SPATIAL_FILTERS)


class PlotterDock(QDockWidget):
class PlotterPanel(QWidget):
"""
Dock widget with common settings for the plotting application
Base panel widget with common settings for the plotting application
"""

def __init__(self, model, font_metric, parent=None):
def __init__(self, model, font_metric, main_window, parent=None):
super().__init__(parent)

self.model = model
self.font_metric = font_metric
self.main_window = parent
self.main_window = main_window

self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Expanding)


class MeshAnnotationDock(PlotterDock):
"""Dock for mesh annotation options"""
class MeshPanel(PlotterPanel):
"""Panel for mesh options"""

def __init__(self, model, font_metric, parent=None):
super().__init__(model, font_metric, parent)
def __init__(self, model, font_metric, main_window, parent=None):
super().__init__(model, font_metric, main_window, parent)

self.treeLayout = QVBoxLayout()
self.meshTree = QTreeWidget()
Expand All @@ -56,55 +57,94 @@ def __init__(self, model, font_metric, parent=None):

self.meshTree.setHeaderHidden(True)

# Create submit button
self.applyButton = QPushButton("Apply Changes")
# Mac bug fix
self.applyButton.setMinimumHeight(self.font_metric.height() * 1.6)
self.applyButton.clicked.connect(self.main_window.applyChanges)

label = QLabel("Mesh Annotations")
self.treeLayout.addWidget(label)
self.treeLayout.addWidget(self.meshTree)
self.treeLayout.addWidget(HorizontalLine())
self.treeLayout.addWidget(self.applyButton)

self.optionsWidget = QWidget()
self.optionsWidget.setLayout(self.treeLayout)
self.setWidget(self.optionsWidget)
self.setLayout(self.treeLayout)

def get_checked_meshes(self):
return [id for id, item in self.mesh_items if item.checkState(0) == QtCore.Qt.Checked]

def update(self):
pass


class TabbedDock(QDockWidget):
"""
Dock widget containing tabbed panels for Geometry, Tallies, and Meshes
"""

def __init__(self, model, font_metric, parent=None):
super().__init__(parent)

self.model = model
self.font_metric = font_metric
self.main_window = parent

self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Expanding)
self.setAllowedAreas(QtCore.Qt.LeftDockWidgetArea)

# Create the tab widget
self.tabWidget = QTabWidget()

# Create the three panels
self.geometryPanel = GeometryPanel(model, font_metric, parent, self)
self.tallyPanel = TallyPanel(model, font_metric, parent, self)
self.meshAnnotationPanel = MeshPanel(model, font_metric, parent, self)

# Wrap panels in scroll areas
geometryScroll = QScrollArea()
geometryScroll.setWidget(self.geometryPanel)
geometryScroll.setWidgetResizable(True)

tallyScroll = QScrollArea()
tallyScroll.setWidget(self.tallyPanel)
tallyScroll.setWidgetResizable(True)

meshScroll = QScrollArea()
meshScroll.setWidget(self.meshAnnotationPanel)
meshScroll.setWidgetResizable(True)

# Add panels as tabs
self.tabWidget.addTab(geometryScroll, "Geometry")
self.tabWidget.addTab(tallyScroll, "Tallies")
self.tabWidget.addTab(meshScroll, "Meshes")

# Create Apply Changes button
self.applyButton = QPushButton("Apply Changes")
self.applyButton.setMinimumHeight(self.font_metric.height() * 1.6)
self.applyButton.setStyleSheet("QPushButton { background-color: #4CAF50; color: white; }")
self.applyButton.clicked.connect(self.main_window.applyChanges)

# Main layout with tabs and apply button
self.mainLayout = QVBoxLayout()
self.mainLayout.addWidget(self.tabWidget)
self.mainLayout.addWidget(HorizontalLine())
self.mainLayout.addWidget(self.applyButton)

# Create container widget
self.containerWidget = QWidget()
self.containerWidget.setLayout(self.mainLayout)
self.setWidget(self.containerWidget)

def resizeEvent(self, event):
self.main_window.resizeEvent(event)

hideEvent = showEvent = moveEvent = resizeEvent


class DomainDock(PlotterDock):
class GeometryPanel(PlotterPanel):
"""
Domain options dock
Geometry options panel
"""

def __init__(self, model, font_metric, parent=None):
super().__init__(model, font_metric, parent)

self.setAllowedAreas(QtCore.Qt.LeftDockWidgetArea)
def __init__(self, model, font_metric, main_window, parent=None):
super().__init__(model, font_metric, main_window, parent)

# Create Controls
self._createOriginBox()
self._createOptionsBox()
self._createResolutionBox()

# Create submit button
self.applyButton = QPushButton("Apply Changes")
# Mac bug fix
self.applyButton.setMinimumHeight(self.font_metric.height() * 1.6)
self.applyButton.clicked.connect(self.main_window.applyChanges)

# Create Zoom box
self.zoomBox = QSpinBox()
self.zoomBox.setSuffix(' %')
Expand All @@ -120,22 +160,15 @@ def __init__(self, model, font_metric, parent=None):
self.zoomWidget.setLayout(self.zoomLayout)

# Create Layout
self.dockLayout = QVBoxLayout()
self.dockLayout.addWidget(QLabel("Geometry/Properties"))
self.dockLayout.addWidget(HorizontalLine())
self.dockLayout.addWidget(self.originGroupBox)
self.dockLayout.addWidget(self.optionsGroupBox)
self.dockLayout.addWidget(self.resGroupBox)
self.dockLayout.addWidget(HorizontalLine())
self.dockLayout.addWidget(self.zoomWidget)
self.dockLayout.addWidget(HorizontalLine())
self.dockLayout.addStretch()
self.dockLayout.addWidget(self.applyButton)
self.dockLayout.addWidget(HorizontalLine())

self.optionsWidget = QWidget()
self.optionsWidget.setLayout(self.dockLayout)
self.setWidget(self.optionsWidget)
self.panelLayout = QVBoxLayout()
self.panelLayout.addWidget(self.originGroupBox)
self.panelLayout.addWidget(self.optionsGroupBox)
self.panelLayout.addWidget(self.resGroupBox)
self.panelLayout.addWidget(HorizontalLine())
self.panelLayout.addWidget(self.zoomWidget)
self.panelLayout.addStretch()

self.setLayout(self.panelLayout)

def _createOriginBox(self):

Expand Down Expand Up @@ -292,7 +325,7 @@ def _createResolutionBox(self):
self.resGroupBox = QGroupBox("Resolution")
self.resGroupBox.setLayout(self.resLayout)

def updateDock(self):
def update(self):
self.updateOrigin()
self.updateWidth()
self.updateHeight()
Expand Down Expand Up @@ -362,20 +395,12 @@ def revertToCurrent(self):
self.widthBox.setValue(cv.width)
self.heightBox.setValue(cv.height)

def resizeEvent(self, event):
self.main_window.resizeEvent(event)

hideEvent = showEvent = moveEvent = resizeEvent


class TallyDock(PlotterDock):
class TallyPanel(PlotterPanel):

def __init__(self, model, font_metric, parent=None):
super().__init__(model, font_metric, parent)

self.setAllowedAreas(QtCore.Qt.RightDockWidgetArea)
def __init__(self, model, font_metric, main_window, parent=None):
super().__init__(model, font_metric, main_window, parent)

# Dock maps for tally information
# Panel maps for tally information
self.tally_map = {}
self.filter_map = {}
self.score_map = {}
Expand All @@ -395,11 +420,6 @@ def __init__(self, model, font_metric, parent=None):
self.tallyGroupBox = QGroupBox('Selected Tally')
self.tallyGroupBox.setLayout(self.tallySelectorLayout)

# Create submit button
self.applyButton = QPushButton("Apply Changes")
self.applyButton.setMinimumHeight(self.font_metric.height() * 1.6)
self.applyButton.clicked.connect(self.main_window.applyChanges)

# Color options section
self.tallyColorForm = ColorForm(self.model, self.main_window, 'tally')
self.scoresGroupBox = Expander(title="Scores:")
Expand All @@ -408,23 +428,13 @@ def __init__(self, model, font_metric, parent=None):
self.nuclidesListWidget = QListWidget()

# Main layout
self.dockLayout = QVBoxLayout()
self.dockLayout.addWidget(QLabel("Tallies"))
self.dockLayout.addWidget(HorizontalLine())
self.dockLayout.addWidget(self.tallyGroupBox)
self.dockLayout.addStretch()
self.dockLayout.addWidget(HorizontalLine())
self.dockLayout.addWidget(self.tallyColorForm)
self.dockLayout.addWidget(HorizontalLine())
self.dockLayout.addWidget(self.applyButton)

# Create widget for dock and apply main layout
self.scroll = QScrollArea()
self.scroll.setWidgetResizable(True)
self.widget = QWidget()
self.widget.setLayout(self.dockLayout)
self.scroll.setWidget(self.widget)
self.setWidget(self.scroll)
self.panelLayout = QVBoxLayout()
self.panelLayout.addWidget(self.tallyGroupBox)
self.panelLayout.addStretch()
self.panelLayout.addWidget(HorizontalLine())
self.panelLayout.addWidget(self.tallyColorForm)

self.setLayout(self.panelLayout)

def _createFilterTree(self, spatial_filters):
av = self.model.activeView
Expand Down
Loading