Revert to transparent line colors and gray color

when timer stopped.
KC4VZT · Jul 31, 2021 · b4d9cd4 · b4d9cd4
1 parent 8a2beac
commit b4d9cd4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/printrun/gui/graph.py b/printrun/gui/graph.py
@@ -208,7 +208,8 @@ def _calculate_spacing(self):
 
     def drawtemperature(self, dc, gc, temperature_list,
                         text, text_xoffset, color):
-        dc.SetPen(wx.Pen(wx.Colour(color), 1))
+        rgba = wx.Colour(color if self.timer.IsRunning() else '#80808080')
+        dc.SetPen(wx.Pen(rgba, 1))
 
         x_add = float(self.width) / self.xsteps
         x_pos = 0.0
@@ -227,9 +228,8 @@ def drawtemperature(self, dc, gc, temperature_list,
         if text:
             font = wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD)
             # font = wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL)
-            gc.SetFont(font, wx.Colour(color))
+            gc.SetFont(font, wx.Colour(rgba.RGB))
 
-            text_size = len(text) * text_xoffset + 1
             pos = self.layoutText(text, lastxvalue, lastyvalue, gc)
             gc.DrawText(text, pos.x, pos.y)
 

diff --git a/printrun/pronterface.py b/printrun/pronterface.py
@@ -994,13 +994,13 @@ def _add_settings(self, size):
         self.settings._add(ColorSetting("graph_color_background", "#FAFAC7", _("Graph background color"), _("Color of the temperature graph background"), "Colors", isRGBA=False), self.reload_ui)
         self.settings._add(ColorSetting("graph_color_text", "#172C2C", _("Graph text color"), _("Color of the temperature graph text"), "Colors", isRGBA=False), self.reload_ui)
         self.settings._add(ColorSetting("graph_color_grid", "#5A5A5A", _("Graph grid color"), _("Color of the temperature graph grid"), "Colors", isRGBA=False), self.reload_ui)
-        self.settings._add(ColorSetting("graph_color_fan", "#000000", _("Graph fan line color"), _("Color of the temperature graph fan speed line"), "Colors", isRGBA=False), self.reload_ui)
-        self.settings._add(ColorSetting("graph_color_bedtemp", "#FF0000", _("Graph bed line color"), _("Color of the temperature graph bed temperature line"), "Colors", isRGBA=False), self.reload_ui)
-        self.settings._add(ColorSetting("graph_color_bedtarget", "#FF7800", _("Graph bed target line color"), _("Color of the temperature graph bed temperature target line"), "Colors", isRGBA=False), self.reload_ui)
-        self.settings._add(ColorSetting("graph_color_ex0temp", "#009BFF", _("Graph ex0 line color"), _("Color of the temperature graph extruder 0 temperature line"), "Colors", isRGBA=False), self.reload_ui)
-        self.settings._add(ColorSetting("graph_color_ex0target", "#0005FF", _("Graph ex0 target line color"), _("Color of the temperature graph extruder 0 target temperature line"), "Colors", isRGBA=False), self.reload_ui)
-        self.settings._add(ColorSetting("graph_color_ex1temp", "#373700", _("Graph ex1 line color color"), _("Color of the temperature graph extruder 1 temperature line"), "Colors", isRGBA=False), self.reload_ui)
-        self.settings._add(ColorSetting("graph_color_ex1target", "#373700", _("Graph ex1 target line color"), _("Color of the temperature graph extruder 1 temperature target line"), "Colors", isRGBA=False), self.reload_ui)
+        self.settings._add(ColorSetting("graph_color_fan", "#00000080", _("Graph fan line color"), _("Color of the temperature graph fan speed line"), "Colors"), self.reload_ui)
+        self.settings._add(ColorSetting("graph_color_bedtemp", "#FF000080", _("Graph bed line color"), _("Color of the temperature graph bed temperature line"), "Colors"), self.reload_ui)
+        self.settings._add(ColorSetting("graph_color_bedtarget", "#FF780080", _("Graph bed target line color"), _("Color of the temperature graph bed temperature target line"), "Colors"), self.reload_ui)
+        self.settings._add(ColorSetting("graph_color_ex0temp", "#009BFF80", _("Graph ex0 line color"), _("Color of the temperature graph extruder 0 temperature line"), "Colors"), self.reload_ui)
+        self.settings._add(ColorSetting("graph_color_ex0target", "#0005FF80", _("Graph ex0 target line color"), _("Color of the temperature graph extruder 0 target temperature line"), "Colors"), self.reload_ui)
+        self.settings._add(ColorSetting("graph_color_ex1temp", "#37370080", _("Graph ex1 line color color"), _("Color of the temperature graph extruder 1 temperature line"), "Colors"), self.reload_ui)
+        self.settings._add(ColorSetting("graph_color_ex1target", "#37370080", _("Graph ex1 target line color"), _("Color of the temperature graph extruder 1 temperature target line"), "Colors"), self.reload_ui)
         self.settings._add(ColorSetting("gcview_color_background", "#FAFAC7FF", _("3D view background color"), _("Color of the 3D view background"), "Colors"), self.update_gcview_colors)
         self.settings._add(ColorSetting("gcview_color_travel", "#99999999", _("3D view travel moves color"), _("Color of travel moves in 3D view"), "Colors"), self.update_gcview_colors)
         self.settings._add(ColorSetting("gcview_color_tool0", "#FF000099", _("3D view print moves color"), _("Color of print moves with tool 0 in 3D view"), "Colors"), self.update_gcview_colors)