Skip to content
This repository has been archived by the owner on Nov 7, 2024. It is now read-only.

Commit

Permalink
simplify colour defintion and make consistent
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobias Richter authored and zjttoefs committed Jul 31, 2023
1 parent dbec413 commit 3caf194
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
9 changes: 0 additions & 9 deletions nexus_constructor/instrument_view/axis_colors.py

This file was deleted.

6 changes: 2 additions & 4 deletions nexus_constructor/instrument_view/gnomon.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from PySide6.QtCore import QPropertyAnimation
from PySide6.QtGui import QColor, QFont, QMatrix4x4, QVector3D, QVector4D

from nexus_constructor.instrument_view.axis_colors import AxisColors
from nexus_constructor.instrument_view.neutron_animation_controller import (
NeutronAnimationController,
)
Expand Down Expand Up @@ -174,10 +173,9 @@ def create_gnomon_text(self):
x_axis_text = Qt3DExtras.QText2DEntity(self.gnomon_root_entity)
y_axis_text = Qt3DExtras.QText2DEntity(self.gnomon_root_entity)
z_axis_text = Qt3DExtras.QText2DEntity(self.gnomon_root_entity)
self.set_axis_label_text(x_axis_text, "X", AxisColors.X.value)
# Pass "green" rather than the Y axis enum value because otherwise the text is too bright
self.set_axis_label_text(x_axis_text, "X", QColor("red"))
self.set_axis_label_text(y_axis_text, "Y", QColor("green"))
self.set_axis_label_text(z_axis_text, "Z", AxisColors.Z.value)
self.set_axis_label_text(z_axis_text, "Z", QColor("blue"))
(
x_label_matrix,
y_label_matrix,
Expand Down

0 comments on commit 3caf194

Please sign in to comment.