Skip to content
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

Jump to bottom

Fix cell/material tab in color options dialog #143

Merged
merged 2 commits into from
Jun 5, 2024
Merged

Fix cell/material tab in color options dialog #143

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2002a91
Fix outdated use of Qt API
paulromano May 4, 2024
aaf8245
Fix cell/material table in color options dialog
paulromano May 4, 2024
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
58 changes: 32 additions & 26 deletions openmc_plotter/plotmodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import itertools
import pickle
import threading
from typing import Literal, Tuple, Optional
from typing import Literal, Tuple, Optional, Dict

from PySide6.QtWidgets import QItemDelegate, QColorDialog, QLineEdit, QMessageBox
from PySide6.QtCore import QAbstractTableModel, QModelIndex, Qt, QSize, QEvent
Expand Down Expand Up @@ -1025,7 +1025,7 @@ def __hash__(self):
return hash(self.__dict__.__str__() + self.__str__())

@staticmethod
def getDomains(domain_type, rng):
def getDomains(domain_type, rng) -> DomainViewDict:
""" Return dictionary of domain settings.

Retrieve cell or material ID numbers and names from .xml files
Expand Down Expand Up @@ -1109,7 +1109,7 @@ class DomainViewDict(dict):
the defaults dictionary.

"""
def __init__(self, defaults: dict):
def __init__(self, defaults: Dict[int, DomainView]):
self.defaults = defaults

def __getitem__(self, key) -> DomainView:
Expand All @@ -1129,6 +1129,10 @@ def __deepcopy__(self, memo):
obj.defaults = self.defaults
return obj

def set_name(self, key: int, name: Optional[str]):
domain = self[key]
self[key] = DomainView(domain.id, name, domain.color, domain.masked, domain.highlight)

def set_color(self, key: int, color):
domain = self[key]
self[key] = DomainView(domain.id, domain.name, color, domain.masked, domain.highlight)
Expand Down Expand Up @@ -1186,22 +1190,24 @@ def __eq__(self, other):
class DomainTableModel(QAbstractTableModel):
""" Abstract Table Model of cell/material view attributes """

def __init__(self, domains):
def __init__(self, domains: DomainViewDict):
super().__init__()
self.domains = [dom for dom in domains.values()]
self.domains = domains
self.keys = dict(enumerate(self.domains.defaults))

def rowCount(self, index=QModelIndex()):
return len(self.domains)
return len(self.keys)

def columnCount(self, index=QModelIndex()):
return 6

def data(self, index, role=Qt.DisplayRole):

if not index.isValid() or not (0 <= index.row() < len(self.domains)):
if not index.isValid() or not (0 <= index.row() < self.rowCount()):
return None

domain = self.domains[index.row()]
key = self.keys[index.row()]
domain = self.domains[key]
column = index.column()

if role == Qt.DisplayRole:
Expand All @@ -1212,7 +1218,7 @@ def data(self, index, role=Qt.DisplayRole):
elif column == COLOR:
return '' if domain.color is not None else '+'
elif column == COLORLABEL:
return str(domain.color) if domain.color is not None else '--'
return str(tuple(domain.color)) if domain.color is not None else '--'
elif column == MASK:
return None
elif column == HIGHLIGHT:
Expand All @@ -1235,10 +1241,10 @@ def data(self, index, role=Qt.DisplayRole):
elif role == Qt.BackgroundRole:
color = domain.color
if column == COLOR:
if isinstance(color, tuple):
return QColor.fromRgb(*color)
elif isinstance(color, str):
if isinstance(color, str):
return QColor.fromRgb(*openmc.plots._SVG_COLORS[color])
else:
return QColor.fromRgb(*color)

elif role == Qt.CheckStateRole:
if column == MASK:
Expand Down Expand Up @@ -1282,24 +1288,24 @@ def flags(self, index):

def setData(self, index, value, role=Qt.EditRole):

if not index.isValid() or not (0 <= index.row() < len(self.domains)):
if not index.isValid() or not (0 <= index.row() < self.rowCount()):
return False

domain = self.domains[index.row()]
key = self.keys[index.row()]
column = index.column()

if column == NAME:
domain.name = value if value else None
self.domains.set_name(key, value if value else None)
elif column == COLOR:
domain.color = value
self.domains.set_color(key, value)
elif column == COLORLABEL:
domain.color = value
self.domains.set_color(key, value)
elif column == MASK:
if role == Qt.CheckStateRole:
domain.masked = True if value == Qt.Checked else False
self.domains.set_masked(key, value == Qt.Checked)
elif column == HIGHLIGHT:
if role == Qt.CheckStateRole:
domain.highlight = True if value == Qt.Checked else False
self.domains.set_highlight(value == Qt.Checked)

self.dataChanged.emit(index, index)
return True
Expand Down Expand Up @@ -1338,7 +1344,7 @@ def createEditor(self, parent, option, index):
def setEditorData(self, editor, index):

if index.column() == COLOR:
color = index.data(Qt.BackgroundColorRole)
color = index.data(Qt.BackgroundRole)
color = 'white' if color is None else color
editor.setCurrentColor(color)
elif index.column() in (NAME, COLORLABEL):
Expand All @@ -1349,7 +1355,7 @@ def setEditorData(self, editor, index):
def editorEvent(self, event, model, option, index):

if index.column() in (COLOR, COLORLABEL):
if not int(index.flags() & Qt.ItemIsEditable) > 0:
if not (index.flags() & Qt.ItemIsEditable).value > 0:
return False
if event.type() == QEvent.MouseButtonRelease \
and event.button() == Qt.RightButton:
Expand All @@ -1365,28 +1371,28 @@ def setModelData(self, editor, model, index):
column = index.column()

if column == COLOR and editor is None:
model.setData(index, None, Qt.BackgroundColorRole)
model.setData(index, None, Qt.BackgroundRole)
model.setData(model.index(row, column+1), None, Qt.DisplayRole)
elif column == COLOR:
color = editor.currentColor()
if color != QColor():
color = color.getRgb()[:3]
model.setData(index, color, Qt.BackgroundColorRole)
model.setData(index, color, Qt.BackgroundRole)
model.setData(model.index(row, column+1),
color,
Qt.DisplayRole)
elif column == COLORLABEL:
if editor is None:
model.setData(model.index(row, column-1),
None,
Qt.BackgroundColorRole)
Qt.BackgroundRole)
model.setData(index, None, Qt.DisplayRole)
elif editor.text().lower() in openmc.plots._SVG_COLORS:
svg = editor.text().lower()
color = openmc.plots._SVG_COLORS[svg]
model.setData(model.index(row, column-1),
color,
Qt.BackgroundColorRole)
Qt.BackgroundRole)
model.setData(index, svg, Qt.DisplayRole)
else:
try:
Expand All @@ -1400,7 +1406,7 @@ def setModelData(self, editor, model, index):
return None
model.setData(model.index(row, column-1),
input,
Qt.BackgroundColorRole)
Qt.BackgroundRole)
model.setData(index, input, Qt.DisplayRole)
else:
QItemDelegate.setModelData(self, editor, model, index)