diff --git a/gui/UILogger.py b/gui/UILogger.py index d794a6c1d26b327217ccc7d8dd1273599fc7df8f..37866106d98cf804e751cce7b44d2a27eaaf8433 100644 --- a/gui/UILogger.py +++ b/gui/UILogger.py @@ -41,7 +41,7 @@ class Ui_Form(object): self.gridLayout_10.addWidget(self.chkbx_rel_changes, 3, 0, 1, 1) self.chkbx_XGM_integral = QtWidgets.QCheckBox(self.groupBox_5) palette = QtGui.QPalette() - brush = QtGui.QBrush(QtGui.QColor(255, 170, 0)) + brush = QtGui.QBrush(QtGui.QColor(128, 0, 128)) brush.setStyle(QtCore.Qt.SolidPattern) palette.setBrush(QtGui.QPalette.Active, QtGui.QPalette.WindowText, brush) brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) @@ -56,7 +56,7 @@ class Ui_Form(object): brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) brush.setStyle(QtCore.Qt.SolidPattern) palette.setBrush(QtGui.QPalette.Active, QtGui.QPalette.Window, brush) - brush = QtGui.QBrush(QtGui.QColor(255, 170, 0)) + brush = QtGui.QBrush(QtGui.QColor(128, 0, 128)) brush.setStyle(QtCore.Qt.SolidPattern) palette.setBrush(QtGui.QPalette.Inactive, QtGui.QPalette.WindowText, brush) brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) @@ -267,7 +267,7 @@ class Ui_Form(object): self.gridLayout_10.addWidget(self.chkbx_spec_pos, 6, 1, 1, 1) self.chkbx_spec_integral = QtWidgets.QCheckBox(self.groupBox_5) palette = QtGui.QPalette() - brush = QtGui.QBrush(QtGui.QColor(128, 0, 128)) + brush = QtGui.QBrush(QtGui.QColor(255, 165, 0)) brush.setStyle(QtCore.Qt.SolidPattern) palette.setBrush(QtGui.QPalette.Active, QtGui.QPalette.WindowText, brush) brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) @@ -279,7 +279,7 @@ class Ui_Form(object): brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) brush.setStyle(QtCore.Qt.SolidPattern) palette.setBrush(QtGui.QPalette.Active, QtGui.QPalette.Window, brush) - brush = QtGui.QBrush(QtGui.QColor(128, 0, 128)) + brush = QtGui.QBrush(QtGui.QColor(255, 165, 0)) brush.setStyle(QtCore.Qt.SolidPattern) palette.setBrush(QtGui.QPalette.Inactive, QtGui.QPalette.WindowText, brush) brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) diff --git a/gui/UILogger.ui b/gui/UILogger.ui index adf51585767edfbe6c6e7b298383a9ead46aa243..bc7bafe1bb09c8e367ec936bf4b5684717a239a5 100644 --- a/gui/UILogger.ui +++ b/gui/UILogger.ui @@ -93,9 +93,9 @@ <colorrole role="WindowText"> <brush brushstyle="SolidPattern"> <color alpha="255"> - <red>255</red> - <green>170</green> - <blue>0</blue> + <red>128</red> + <green>0</green> + <blue>128</blue> </color> </brush> </colorrole> @@ -140,9 +140,9 @@ <colorrole role="WindowText"> <brush brushstyle="SolidPattern"> <color alpha="255"> - <red>255</red> - <green>170</green> - <blue>0</blue> + <red>128</red> + <green>0</green> + <blue>128</blue> </color> </brush> </colorrole> @@ -755,9 +755,9 @@ <colorrole role="WindowText"> <brush brushstyle="SolidPattern"> <color alpha="255"> - <red>128</red> - <green>0</green> - <blue>128</blue> + <red>255</red> + <green>165</green> + <blue>0</blue> </color> </brush> </colorrole> @@ -793,9 +793,9 @@ <colorrole role="WindowText"> <brush brushstyle="SolidPattern"> <color alpha="255"> - <red>128</red> - <green>0</green> - <blue>128</blue> + <red>255</red> + <green>165</green> + <blue>0</blue> </color> </brush> </colorrole> diff --git a/logger.py b/logger.py index d20d330b9a94c9dccb32e9fb9216643dad4abc75..32b505cfc5b5274f5f98469bead942268dd7dd26 100644 --- a/logger.py +++ b/logger.py @@ -384,7 +384,7 @@ class UILogger(QWidget): a3.setLabel('FWHM, eV', color='#008000') a4.setLabel('Peak position, eV', color='#0000ff') - a5.setLabel('XGM, mJ', color='#ffa500') + a5.setLabel('XGM, mJ', color='#800080') # slot: update view when resized def updateViews(): @@ -403,10 +403,11 @@ class UILogger(QWidget): pen3 = pg.mkPen('#0000ff', width=2) self.peak_ev_pos = pg.PlotCurveItem(pen=pen3, name='peak_pos') - pen4 = pg.mkPen('#ffa500', width=2) + + pen4 = pg.mkPen('#800080', width=2) self.XGM = pg.PlotCurveItem(pen=pen4, name='XGM') - - pen5 = pg.mkPen('#800080', width=2) + + pen5 = pg.mkPen('#ffa500', width=2) self.spec_integral = pg.PlotCurveItem(pen=pen5, name='spec_integral') v1.addItem(self.maxspec_plot)