Commit a14732c2 authored by Guillaume Seguin's avatar Guillaume Seguin

Make temp gauges aware of background color

parent ea6eec47
...@@ -213,9 +213,9 @@ def add_extra_controls(self, root, parentpanel, extra_buttons = None, mini_mode ...@@ -213,9 +213,9 @@ def add_extra_controls(self, root, parentpanel, extra_buttons = None, mini_mode
## Temperature gauges ## Temperature gauges
if root.display_gauges: if root.display_gauges:
root.hottgauge = TempGauge(parentpanel, size = (-1, 24), title = _("Heater:"), maxval = 300) root.hottgauge = TempGauge(parentpanel, size = (-1, 24), title = _("Heater:"), maxval = 300, bgcolor = root.bgcolor)
add("htemp_gauge", root.hottgauge, flag = wx.EXPAND) add("htemp_gauge", root.hottgauge, flag = wx.EXPAND)
root.bedtgauge = TempGauge(parentpanel, size = (-1, 24), title = _("Bed:"), maxval = 150) root.bedtgauge = TempGauge(parentpanel, size = (-1, 24), title = _("Bed:"), maxval = 150, bgcolor = root.bgcolor)
add("btemp_gauge", root.bedtgauge, flag = wx.EXPAND) add("btemp_gauge", root.bedtgauge, flag = wx.EXPAND)
def hotendgauge_scroll_setpoint(e): def hotendgauge_scroll_setpoint(e):
......
...@@ -246,10 +246,12 @@ class ButtonEdit(wx.Dialog): ...@@ -246,10 +246,12 @@ class ButtonEdit(wx.Dialog):
class TempGauge(wx.Panel): class TempGauge(wx.Panel):
def __init__(self, parent, size = (200, 22), title = "", def __init__(self, parent, size = (200, 22), title = "",
maxval = 240, gaugeColour = None): maxval = 240, gaugeColour = None, bgcolor = "#FFFFFF"):
wx.Panel.__init__(self, parent, -1, size = size) wx.Panel.__init__(self, parent, -1, size = size)
self.Bind(wx.EVT_PAINT, self.paint) self.Bind(wx.EVT_PAINT, self.paint)
self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM) self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
self.bgcolor = wx.Colour()
self.bgcolor.SetFromName(bgcolor)
self.width, self.height = size self.width, self.height = size
self.title = title self.title = title
self.max = maxval self.max = maxval
...@@ -288,11 +290,11 @@ class TempGauge(wx.Panel): ...@@ -288,11 +290,11 @@ class TempGauge(wx.Panel):
self.recalc() self.recalc()
x0, y0, x1, y1, xE, yE = 1, 1, self.ypt + 1, 1, self.width + 1 - 2, 20 x0, y0, x1, y1, xE, yE = 1, 1, self.ypt + 1, 1, self.width + 1 - 2, 20
dc = wx.PaintDC(self) dc = wx.PaintDC(self)
dc.SetBackground(wx.Brush((255, 255, 255))) dc.SetBackground(wx.Brush(self.bgcolor))
dc.Clear() dc.Clear()
cold, medium, hot = wx.Colour(0, 167, 223), wx.Colour(239, 233, 119), wx.Colour(210, 50.100) cold, medium, hot = wx.Colour(0, 167, 223), wx.Colour(239, 233, 119), wx.Colour(210, 50.100)
gauge1, gauge2 = wx.Colour(255, 255, 210), (self.gaugeColour or wx.Colour(234, 82, 0)) gauge1, gauge2 = wx.Colour(255, 255, 210), (self.gaugeColour or wx.Colour(234, 82, 0))
shadow1, shadow2 = wx.Colour(110, 110, 110), wx.Colour(255, 255, 255) shadow1, shadow2 = wx.Colour(110, 110, 110), self.bgcolor
gc = wx.GraphicsContext.Create(dc) gc = wx.GraphicsContext.Create(dc)
# draw shadow first # draw shadow first
# corners # corners
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment