diff --git a/lib/python/qtvcp/qt_istat.py b/lib/python/qtvcp/qt_istat.py index 6b10096cf..50c7177f9 100644 --- a/lib/python/qtvcp/qt_istat.py +++ b/lib/python/qtvcp/qt_istat.py @@ -380,6 +380,7 @@ class _IStat(object): self.ZIPPED_TABS = None self.MDI_COMMAND_LIST = (self.INI.findall("MDI_COMMAND_LIST", "MDI_COMMAND")) or None + self.MACRO_LABELS = (self.INI.findall("MACRO_LABELS", "MACRO_LABEL")) or None self.TOOL_FILE_PATH = self.get_error_safe_setting("EMCIO", "TOOL_TABLE") self.POSTGUI_HALFILE_PATH = (self.INI.findall("HAL", "POSTGUI_HALFILE")) or None self.POSTGUI_HAL_COMMANDS = (self.INI.findall("HAL", "POSTGUI_HALCMD")) or None diff --git a/lib/python/qtvcp/widgets/origin_offsetview.py b/lib/python/qtvcp/widgets/origin_offsetview.py index 4c5d79e77..c709c216d 100644 --- a/lib/python/qtvcp/widgets/origin_offsetview.py +++ b/lib/python/qtvcp/widgets/origin_offsetview.py @@ -435,7 +435,7 @@ class MyTableModel(QAbstractTableModel): self.arraydata = datain self.headerdata = headerdata self.Vheaderdata = vheaderdata - self._highlightcolor = '#00ffff' + self._highlightcolor = '#00c000' def rowCount(self, parent): return len(self.arraydata) diff --git a/lib/python/qtvcp/widgets/tool_offsetview.py b/lib/python/qtvcp/widgets/tool_offsetview.py index 07c1aa5cb..47bd301dd 100644 --- a/lib/python/qtvcp/widgets/tool_offsetview.py +++ b/lib/python/qtvcp/widgets/tool_offsetview.py @@ -365,8 +365,8 @@ class MyTableModel(QAbstractTableModel): self.degree_text_template = '%10.1f' self.metric_display = False self.diameter_display = False - self._highlightcolor = '#00ffff' - self._selectedcolor = '#00ff00' + self._highlightcolor = '#00c000' + self._selectedcolor = '#006000' self.headerdata = ['','tool','pocket','X','X Wear', 'Y', 'Y Wear', 'Z', 'Z Wear', 'A', 'B', 'C', 'U', 'V', 'W', 'Diameter', 'Front Angle', 'Back Angle','Orient','Comment'] if INFO.MACHINE_IS_LATHE: self.headerdata[2] = 'Stn'