Skip to content

Replace full-widget background coloring with color indicator button #84

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

Merged
lachlangrose merged 3 commits into from
Feb 19, 2026
Merged

Replace full-widget background coloring with color indicator button #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ead0e8
Initial plan
Copilot Feb 19, 2026
305b36d
Replace full widget background color with color button indicator
Copilot Feb 19, 2026
1a1e195
refactor: streamline colour conversion logic and enhance documentation
lachlangrose Feb 19, 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
83 changes: 56 additions & 27 deletions loopstructural/gui/modelling/stratigraphic_column/stratigraphic_unit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,52 @@ def __init__(
uic.loadUi(os.path.join(os.path.dirname(__file__), "stratigraphic_unit.ui"), self)
self.uuid = uuid
self._name = name if name is not None else ""
# Convert colour from RGB tuple or string to Qt-compatible hex string
if colour is not None:
if (
isinstance(colour, tuple)
or isinstance(colour, list)
or isinstance(colour, np.ndarray)
) and len(colour) == 3:
# Convert (r, g, b) to "#RRGGBB"
if all(isinstance(c, float) and 0.0 <= c <= 1.0 for c in colour):
rgb = [int(c * 255) for c in colour]
else:
rgb = [int(c) for c in colour]
self.colour = "#{:02x}{:02x}{:02x}".format(*rgb)
else:
self.colour = str(colour)
else:
self.colour = ""
# Convert colour using helper method
self.colour = self._convert_colour(colour)
self.thickness = thickness # Optional thickness attribute
# Add delete button
# Connect buttons
self.buttonDelete.clicked.connect(self.request_delete)
self.buttonColour.clicked.connect(self.onColourSelectClicked)
self.lineEditName.editingFinished.connect(self.onNameChanged)
self.spinBoxThickness.valueChanged.connect(self.onThicknessChanged)
self.setStyleSheet(f"background-color: {self.colour};" if self.colour else "")
# Initialize UI widgets with the provided values
self.lineEditName.setText(self._name)
self.spinBoxThickness.setValue(self.thickness)
# Set color button style instead of widget background
self._update_colour_button()

def _convert_colour(self, colour):
"""Convert colour from various formats to Qt-compatible hex string.

Parameters
----------
colour : str, tuple, list, np.ndarray, or None
Colour in various formats: hex string, RGB tuple/list/array

Returns
-------
str
Hex color string in format "#RRGGBB", or empty string if None
"""
if colour is None:
return ""

# If it's already a string, return it
if isinstance(colour, str):
return colour

# Handle tuple, list, or numpy array of RGB values
if (isinstance(colour, (tuple, list)) or isinstance(colour, np.ndarray)) and len(colour) >= 3:
# Convert (r, g, b) to "#RRGGBB"
# Check if values are normalized floats (0.0-1.0) or integers (0-255)
if all(isinstance(c, float) and 0.0 <= c <= 1.0 for c in colour[:3]):
rgb = [int(c * 255) for c in colour[:3]]
else:
rgb = [int(c) for c in colour[:3]]
return "#{:02x}{:02x}{:02x}".format(*rgb)

# Fallback: try to convert to string
return str(colour)

@property
def name(self):
Expand All @@ -69,14 +92,23 @@ def set_thickness(self, thickness: float):
self.spinBoxThickness.setValue(thickness)
self.validateFields()

def _update_colour_button(self):
"""Update the color button's appearance to show the current color."""
if self.colour:
self.buttonColour.setStyleSheet(
f"background-color: {self.colour}; border: 1px solid #999;"
)
else:
self.buttonColour.setStyleSheet("background-color: #cccccc; border: 1px solid #999;")

def onColourSelectClicked(self):
"""Open a color dialog to select a color for the stratigraphic unit."""
from PyQt5.QtWidgets import QColorDialog

color = QColorDialog.getColor()
if color.isValid():
self.colour = color.name()
self.setStyleSheet(f"background-color: {self.colour};")
self._update_colour_button()
self.colourChanged.emit(self.colour)

def onThicknessChanged(self, thickness: float):
Expand All @@ -103,10 +135,6 @@ def request_delete(self):

self.deleteRequested.emit(self)

def mouseDoubleClickEvent(self, event):
"""Handle double-click event to open color selection dialog."""
self.onColourSelectClicked()

def validateFields(self):
"""Validate the widget fields and update UI hints."""
# Reset all styles first
Expand All @@ -133,7 +161,8 @@ def setData(self, data: Optional[dict] = None):
# Safely update internal state first
if data:
self.name = str(data.get("name", ""))
self.colour = data.get("colour", "")
# Convert colour using helper method to handle various formats
self.colour = self._convert_colour(data.get("colour"))
# If a thickness value is provided, update the widget's thickness
if 'thickness' in data and data.get('thickness') is not None:
try:
Expand Down Expand Up @@ -161,7 +190,7 @@ def setData(self, data: Optional[dict] = None):
# Widget has been deleted; abort GUI updates
return
try:
self.setStyleSheet(f"background-color: {self.colour};" if self.colour else "")
self._update_colour_button()
except RuntimeError:
return
else:
Expand All @@ -171,7 +200,7 @@ def setData(self, data: Optional[dict] = None):
except RuntimeError:
return
try:
self.setStyleSheet("")
self._update_colour_button()
except RuntimeError:
return

Expand Down
44 changes: 33 additions & 11 deletions loopstructural/gui/modelling/stratigraphic_column/stratigraphic_unit.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,39 @@
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QPushButton" name="buttonColour">
<property name="toolTip">
<string>Click to change color</string>
</property>
<property name="text">
<string/>
</property>
<property name="minimumSize">
<size>
<width>40</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>40</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEditName"/>
</item>
<item row="0" column="2">
<widget class="QLabel" name="labelThickness">
<property name="text">
<string>Thickness:</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QDoubleSpinBox" name="spinBoxThickness">
<property name="suffix">
<string> m</string>
Expand All @@ -27,17 +59,7 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLineEdit" name="lineEditName"/>
</item>
<item row="0" column="1">
<widget class="QLabel" name="labelThickness">
<property name="text">
<string>Thickness:</string>
</property>
</widget>
</item>
<item row="0" column="3">
<item row="0" column="4">
<widget class="QPushButton" name="buttonDelete">
<property name="toolTip">
<string>Delete this unit</string>
Expand Down
Loading