|
|
7d3fbc1 |
diff -up printrun/gui/controls.py.gtk3 printrun/gui/controls.py
|
|
|
7d3fbc1 |
--- printrun/gui/controls.py.gtk3 2015-03-09 07:22:14.000000000 -0400
|
|
|
7d3fbc1 |
+++ printrun/gui/controls.py 2015-08-11 23:43:27.444624125 -0400
|
|
|
7d3fbc1 |
@@ -136,7 +136,7 @@ def add_extra_controls(self, root, paren
|
|
|
7d3fbc1 |
if root.settings.last_temperature not in map(float, root.temps.values()):
|
|
|
7d3fbc1 |
htemp_choices = [str(root.settings.last_temperature)] + htemp_choices
|
|
|
7d3fbc1 |
root.htemp = wx.ComboBox(parentpanel, -1, choices = htemp_choices,
|
|
|
7d3fbc1 |
- style = wx.CB_DROPDOWN, size = (80, -1))
|
|
|
7d3fbc1 |
+ style = wx.CB_DROPDOWN, size = (115, -1))
|
|
|
7d3fbc1 |
root.htemp.SetToolTip(wx.ToolTip(_("Select Temperature for Hotend")))
|
|
|
7d3fbc1 |
root.htemp.Bind(wx.EVT_COMBOBOX, root.htemp_change)
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
@@ -156,7 +156,7 @@ def add_extra_controls(self, root, paren
|
|
|
7d3fbc1 |
if root.settings.last_bed_temperature not in map(float, root.bedtemps.values()):
|
|
|
7d3fbc1 |
btemp_choices = [str(root.settings.last_bed_temperature)] + btemp_choices
|
|
|
7d3fbc1 |
root.btemp = wx.ComboBox(parentpanel, -1, choices = btemp_choices,
|
|
|
7d3fbc1 |
- style = wx.CB_DROPDOWN, size = (80, -1))
|
|
|
7d3fbc1 |
+ style = wx.CB_DROPDOWN, size = (115, -1))
|
|
|
7d3fbc1 |
root.btemp.SetToolTip(wx.ToolTip(_("Select Temperature for Heated Bed")))
|
|
|
7d3fbc1 |
root.btemp.Bind(wx.EVT_COMBOBOX, root.btemp_change)
|
|
|
7d3fbc1 |
add("btemp_val", root.btemp)
|
|
|
7d3fbc1 |
@@ -192,7 +192,11 @@ def add_extra_controls(self, root, paren
|
|
|
7d3fbc1 |
root.speed_slider = wx.Slider(speedpanel, -1, 100, 1, 300)
|
|
|
7d3fbc1 |
speedsizer.Add(root.speed_slider, 1, flag = wx.EXPAND)
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
- root.speed_spin = FloatSpin(speedpanel, -1, value = 100, min_val = 1, max_val = 300, digits = 0, style = wx.ALIGN_LEFT, size = (80, -1))
|
|
|
7d3fbc1 |
+ if wx.VERSION < (3, 0):
|
|
|
7d3fbc1 |
+ root.speed_spin = FloatSpin(speedpanel, -1, value = 100, min_val = 1, max_val = 300, digits = 0, style = wx.ALIGN_LEFT, size = (80, -1))
|
|
|
7d3fbc1 |
+ else:
|
|
|
7d3fbc1 |
+ root.speed_spin = wx.SpinCtrlDouble(speedpanel, -1, initial = 100, min = 1, max = 300, style = wx.ALIGN_LEFT, size = (115, -1))
|
|
|
7d3fbc1 |
+ root.speed_spin.SetDigits(0)
|
|
|
7d3fbc1 |
speedsizer.Add(root.speed_spin, 0, flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
root.speed_label = wx.StaticText(speedpanel, -1, _("%"))
|
|
|
7d3fbc1 |
speedsizer.Add(root.speed_label, flag = wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT)
|
|
|
7d3fbc1 |
@@ -210,7 +214,10 @@ def add_extra_controls(self, root, paren
|
|
|
7d3fbc1 |
value = root.speed_spin.GetValue()
|
|
|
7d3fbc1 |
root.speed_setbtn.SetBackgroundColour("red")
|
|
|
7d3fbc1 |
root.speed_slider.SetValue(value)
|
|
|
7d3fbc1 |
- root.speed_spin.Bind(wx.EVT_SPINCTRL, speedslider_spin)
|
|
|
7d3fbc1 |
+ if wx.VERSION < (3, 0):
|
|
|
7d3fbc1 |
+ root.speed_spin.Bind(wx.EVT_SPINCTRL, speedslider_spin)
|
|
|
7d3fbc1 |
+ else:
|
|
|
7d3fbc1 |
+ root.speed_spin.Bind(wx.EVT_SPINCTRLDOUBLE, speedslider_spin)
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
def speedslider_scroll(event):
|
|
|
7d3fbc1 |
value = root.speed_slider.GetValue()
|
|
|
7d3fbc1 |
@@ -269,10 +276,15 @@ def add_extra_controls(self, root, paren
|
|
|
7d3fbc1 |
esettingspanel = root.newPanel(parentpanel)
|
|
|
7d3fbc1 |
esettingssizer = wx.GridBagSizer()
|
|
|
7d3fbc1 |
esettingssizer.SetEmptyCellSize((0, 0))
|
|
|
7d3fbc1 |
- root.edist = FloatSpin(esettingspanel, -1, value = root.settings.last_extrusion, min_val = 0, max_val = 1000, size = (90, -1), digits = 1)
|
|
|
7d3fbc1 |
+ if wx.VERSION < (3, 0):
|
|
|
7d3fbc1 |
+ root.edist = FloatSpin(esettingspanel, -1, value = root.settings.last_extrusion, min_val = 0, max_val = 1000, size = (90, -1), digits = 1)
|
|
|
7d3fbc1 |
+ root.edist.Bind(wx.EVT_SPINCTRL, root.setfeeds)
|
|
|
7d3fbc1 |
+ else:
|
|
|
7d3fbc1 |
+ root.edist = wx.SpinCtrlDouble(esettingspanel, -1, initial = root.settings.last_extrusion, min = 0, max = 1000, size = (135, -1))
|
|
|
7d3fbc1 |
+ root.edist.SetDigits(1)
|
|
|
7d3fbc1 |
+ root.edist.Bind(wx.EVT_SPINCTRLDOUBLE, root.setfeeds)
|
|
|
7d3fbc1 |
root.edist.SetBackgroundColour((225, 200, 200))
|
|
|
7d3fbc1 |
root.edist.SetForegroundColour("black")
|
|
|
7d3fbc1 |
- root.edist.Bind(wx.EVT_SPINCTRL, root.setfeeds)
|
|
|
7d3fbc1 |
root.edist.Bind(wx.EVT_TEXT, root.setfeeds)
|
|
|
7d3fbc1 |
add("edist_label", wx.StaticText(esettingspanel, -1, _("Length:")), container = esettingssizer, flag = wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_LEFT | wx.RIGHT | wx.LEFT, border = 5)
|
|
|
7d3fbc1 |
add("edist_val", root.edist, container = esettingssizer, flag = wx.ALIGN_CENTER | wx.RIGHT, border = 5)
|
|
|
7d3fbc1 |
@@ -280,11 +292,16 @@ def add_extra_controls(self, root, paren
|
|
|
7d3fbc1 |
add("edist_unit", wx.StaticText(esettingspanel, -1, unit_label), container = esettingssizer, flag = wx.ALIGN_CENTER | wx.RIGHT, border = 5)
|
|
|
7d3fbc1 |
root.edist.SetToolTip(wx.ToolTip(_("Amount to Extrude or Retract (mm)")))
|
|
|
7d3fbc1 |
if not mini_mode:
|
|
|
7d3fbc1 |
- root.efeedc = FloatSpin(esettingspanel, -1, value = root.settings.e_feedrate, min_val = 0, max_val = 50000, size = (90, -1), digits = 1)
|
|
|
7d3fbc1 |
+ if wx.VERSION < (3, 0):
|
|
|
7d3fbc1 |
+ root.efeedc = FloatSpin(esettingspanel, -1, value = root.settings.e_feedrate, min_val = 0, max_val = 50000, size = (90, -1), digits = 1)
|
|
|
7d3fbc1 |
+ root.efeedc.Bind(wx.EVT_SPINCTRL, root.setfeeds)
|
|
|
7d3fbc1 |
+ else:
|
|
|
7d3fbc1 |
+ root.efeedc = wx.SpinCtrlDouble(esettingspanel, -1, initial = root.settings.e_feedrate, min = 0, max = 50000, size = (145, -1))
|
|
|
7d3fbc1 |
+ root.efeedc.SetDigits(1)
|
|
|
7d3fbc1 |
+ root.efeedc.Bind(wx.EVT_SPINCTRLDOUBLE, root.setfeeds)
|
|
|
7d3fbc1 |
root.efeedc.SetToolTip(wx.ToolTip(_("Extrude / Retract speed (mm/min)")))
|
|
|
7d3fbc1 |
root.efeedc.SetBackgroundColour((225, 200, 200))
|
|
|
7d3fbc1 |
root.efeedc.SetForegroundColour("black")
|
|
|
7d3fbc1 |
- root.efeedc.Bind(wx.EVT_SPINCTRL, root.setfeeds)
|
|
|
7d3fbc1 |
root.efeedc.Bind(wx.EVT_TEXT, root.setfeeds)
|
|
|
7d3fbc1 |
add("efeed_val", root.efeedc, container = esettingssizer, flag = wx.ALIGN_CENTER | wx.RIGHT, border = 5)
|
|
|
7d3fbc1 |
add("efeed_label", wx.StaticText(esettingspanel, -1, _("Speed:")), container = esettingssizer, flag = wx.ALIGN_LEFT)
|
|
|
7d3fbc1 |
@@ -379,12 +396,12 @@ class ControlsSizer(wx.GridBagSizer):
|
|
|
7d3fbc1 |
else:
|
|
|
7d3fbc1 |
self.extra_buttons[key] = btn
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
- root.xyfeedc = wx.SpinCtrl(lltspanel, -1, str(root.settings.xy_feedrate), min = 0, max = 50000, size = (97, -1))
|
|
|
7d3fbc1 |
+ root.xyfeedc = wx.SpinCtrl(lltspanel, -1, str(root.settings.xy_feedrate), min = 0, max = 50000, size = (130, -1))
|
|
|
7d3fbc1 |
root.xyfeedc.SetToolTip(wx.ToolTip(_("Set Maximum Speed for X & Y axes (mm/min)")))
|
|
|
7d3fbc1 |
llts.Add(wx.StaticText(lltspanel, -1, _("XY:")), flag = wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
llts.Add(root.xyfeedc)
|
|
|
7d3fbc1 |
llts.Add(wx.StaticText(lltspanel, -1, _("mm/min Z:")), flag = wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
- root.zfeedc = wx.SpinCtrl(lltspanel, -1, str(root.settings.z_feedrate), min = 0, max = 50000, size = (90, -1))
|
|
|
7d3fbc1 |
+ root.zfeedc = wx.SpinCtrl(lltspanel, -1, str(root.settings.z_feedrate), min = 0, max = 50000, size = (130, -1))
|
|
|
7d3fbc1 |
root.zfeedc.SetToolTip(wx.ToolTip(_("Set Maximum Speed for Z axis (mm/min)")))
|
|
|
7d3fbc1 |
llts.Add(root.zfeedc,)
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
diff -up printrun/gui/toolbar.py.gtk3 printrun/gui/toolbar.py
|
|
|
7d3fbc1 |
--- printrun/gui/toolbar.py.gtk3 2015-03-09 07:22:14.000000000 -0400
|
|
|
7d3fbc1 |
+++ printrun/gui/toolbar.py 2015-06-29 23:43:30.700768952 -0400
|
|
|
7d3fbc1 |
@@ -42,7 +42,7 @@ def MainToolbar(root, parentpanel = None
|
|
|
7d3fbc1 |
root.baud = wx.ComboBox(parentpanel, -1,
|
|
|
7d3fbc1 |
choices = ["2400", "9600", "19200", "38400",
|
|
|
7d3fbc1 |
"57600", "115200", "250000"],
|
|
|
7d3fbc1 |
- style = wx.CB_DROPDOWN, size = (100, -1))
|
|
|
7d3fbc1 |
+ style = wx.CB_DROPDOWN, size = (110, -1))
|
|
|
7d3fbc1 |
root.baud.SetToolTip(wx.ToolTip(_("Select Baud rate for printer communication")))
|
|
|
7d3fbc1 |
try:
|
|
|
7d3fbc1 |
root.baud.SetValue("115200")
|
|
|
7d3fbc1 |
diff -up printrun/projectlayer.py.gtk3 printrun/projectlayer.py
|
|
|
7d3fbc1 |
--- printrun/projectlayer.py.gtk3 2015-03-09 07:22:14.000000000 -0400
|
|
|
7d3fbc1 |
+++ printrun/projectlayer.py 2015-08-11 23:24:05.729359412 -0400
|
|
|
7d3fbc1 |
@@ -278,38 +278,48 @@ class SettingsFrame(wx.Frame):
|
|
|
7d3fbc1 |
# Left Column
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
fieldsizer.Add(wx.StaticText(self.panel, -1, "Layer (mm):"), pos = (0, 0), flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
- self.thickness = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_layer", "0.1")), size = (80, -1))
|
|
|
7d3fbc1 |
+ self.thickness = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_layer", "0.1")), size = (125, -1))
|
|
|
7d3fbc1 |
self.thickness.Bind(wx.EVT_TEXT, self.update_thickness)
|
|
|
7d3fbc1 |
self.thickness.SetHelpText("The thickness of each slice. Should match the value used to slice the model. SVG files update this value automatically, 3dlp.zip files have to be manually entered.")
|
|
|
7d3fbc1 |
fieldsizer.Add(self.thickness, pos = (0, 1))
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
fieldsizer.Add(wx.StaticText(self.panel, -1, "Exposure (s):"), pos = (1, 0), flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
- self.interval = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_interval", "0.5")), size = (80, -1))
|
|
|
7d3fbc1 |
+ self.interval = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_interval", "0.5")), size = (125, -1))
|
|
|
7d3fbc1 |
self.interval.Bind(wx.EVT_TEXT, self.update_interval)
|
|
|
7d3fbc1 |
self.interval.SetHelpText("How long each slice should be displayed.")
|
|
|
7d3fbc1 |
fieldsizer.Add(self.interval, pos = (1, 1))
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
fieldsizer.Add(wx.StaticText(self.panel, -1, "Blank (s):"), pos = (2, 0), flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
- self.pause = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_pause", "0.5")), size = (80, -1))
|
|
|
7d3fbc1 |
+ self.pause = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_pause", "0.5")), size = (125, -1))
|
|
|
7d3fbc1 |
self.pause.Bind(wx.EVT_TEXT, self.update_pause)
|
|
|
7d3fbc1 |
self.pause.SetHelpText("The pause length between slices. This should take into account any movement of the Z axis, plus time to prepare the resin surface (sliding, tilting, sweeping, etc).")
|
|
|
7d3fbc1 |
fieldsizer.Add(self.pause, pos = (2, 1))
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
fieldsizer.Add(wx.StaticText(self.panel, -1, "Scale:"), pos = (3, 0), flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
- self.scale = floatspin.FloatSpin(self.panel, -1, value = self._get_setting('project_scale', 1.0), increment = 0.1, digits = 3, size = (80, -1))
|
|
|
7d3fbc1 |
- self.scale.Bind(floatspin.EVT_FLOATSPIN, self.update_scale)
|
|
|
7d3fbc1 |
+ if wx.VERSION < (3, 0):
|
|
|
7d3fbc1 |
+ self.scale = floatspin.FloatSpin(self.panel, -1, value = self._get_setting('project_scale', 1.0), increment = 0.1, digits = 3, size = (80, -1))
|
|
|
7d3fbc1 |
+ self.scale.Bind(floatspin.EVT_FLOATSPIN, self.update_scale)
|
|
|
7d3fbc1 |
+ else:
|
|
|
7d3fbc1 |
+ self.scale = wx.SpinCtrlDouble(self.panel, -1, initial = self._get_setting('project_scale', 1.0), inc = 0.1, size = (125, -1))
|
|
|
7d3fbc1 |
+ self.scale.SetDigits(3)
|
|
|
7d3fbc1 |
+ self.scale.Bind(wx.EVT_SPINCTRLDOUBLE, self.update_scale)
|
|
|
7d3fbc1 |
self.scale.SetHelpText("The additional scaling of each slice.")
|
|
|
7d3fbc1 |
fieldsizer.Add(self.scale, pos = (3, 1))
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
fieldsizer.Add(wx.StaticText(self.panel, -1, "Direction:"), pos = (4, 0), flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
- self.direction = wx.ComboBox(self.panel, -1, choices = ["Top Down", "Bottom Up"], value = self._get_setting('project_direction', "Top Down"), size = (80, -1))
|
|
|
7d3fbc1 |
+ self.direction = wx.ComboBox(self.panel, -1, choices = ["Top Down", "Bottom Up"], value = self._get_setting('project_direction', "Top Down"), size = (125, -1))
|
|
|
7d3fbc1 |
self.direction.Bind(wx.EVT_COMBOBOX, self.update_direction)
|
|
|
7d3fbc1 |
self.direction.SetHelpText("The direction the Z axis should move. Top Down is where the projector is above the model, Bottom up is where the projector is below the model.")
|
|
|
7d3fbc1 |
fieldsizer.Add(self.direction, pos = (4, 1), flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
fieldsizer.Add(wx.StaticText(self.panel, -1, "Overshoot (mm):"), pos = (5, 0), flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
- self.overshoot = floatspin.FloatSpin(self.panel, -1, value = self._get_setting('project_overshoot', 3.0), increment = 0.1, digits = 1, min_val = 0, size = (80, -1))
|
|
|
7d3fbc1 |
- self.overshoot.Bind(floatspin.EVT_FLOATSPIN, self.update_overshoot)
|
|
|
7d3fbc1 |
+ if wx.VERSION < (3, 0):
|
|
|
7d3fbc1 |
+ self.overshoot = floatspin.FloatSpin(self.panel, -1, value = self._get_setting('project_overshoot', 3.0), increment = 0.1, digits = 1, min_val = 0, size = (80, -1))
|
|
|
7d3fbc1 |
+ self.overshoot.Bind(floatspin.EVT_FLOATSPIN, self.update_overshoot)
|
|
|
7d3fbc1 |
+ else:
|
|
|
7d3fbc1 |
+ self.overshoot = wx.SpinCtrlDouble(self.panel, -1, initial = self._get_setting('project_overshoot', 3.0), inc = 0.1, min = 0, size = (125, -1))
|
|
|
7d3fbc1 |
+ self.overshoot.SetDigits(1)
|
|
|
7d3fbc1 |
+ self.overshoot.Bind(wx.EVT_SPINCTRLDOUBLE, self.update_overshoot)
|
|
|
7d3fbc1 |
self.overshoot.SetHelpText("How far the axis should move beyond the next slice position for each slice. For Top Down printers this would dunk the model under the resi and then return. For Bottom Up printers this would raise the base away from the vat and then return.")
|
|
|
7d3fbc1 |
fieldsizer.Add(self.overshoot, pos = (5, 1))
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
@@ -329,38 +339,53 @@ class SettingsFrame(wx.Frame):
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
fieldsizer.Add(wx.StaticText(self.panel, -1, "X (px):"), pos = (0, 2), flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
projectX = int(math.floor(float(self._get_setting("project_x", 1920))))
|
|
|
7d3fbc1 |
- self.X = wx.SpinCtrl(self.panel, -1, str(projectX), max = 999999, size = (80, -1))
|
|
|
7d3fbc1 |
+ self.X = wx.SpinCtrl(self.panel, -1, str(projectX), max = 999999, size = (125, -1))
|
|
|
7d3fbc1 |
self.X.Bind(wx.EVT_SPINCTRL, self.update_resolution)
|
|
|
7d3fbc1 |
self.X.SetHelpText("The projector resolution in the X axis.")
|
|
|
7d3fbc1 |
fieldsizer.Add(self.X, pos = (0, 3))
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
fieldsizer.Add(wx.StaticText(self.panel, -1, "Y (px):"), pos = (1, 2), flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
projectY = int(math.floor(float(self._get_setting("project_y", 1200))))
|
|
|
7d3fbc1 |
- self.Y = wx.SpinCtrl(self.panel, -1, str(projectY), max = 999999, size = (80, -1))
|
|
|
7d3fbc1 |
+ self.Y = wx.SpinCtrl(self.panel, -1, str(projectY), max = 999999, size = (125, -1))
|
|
|
7d3fbc1 |
self.Y.Bind(wx.EVT_SPINCTRL, self.update_resolution)
|
|
|
7d3fbc1 |
self.Y.SetHelpText("The projector resolution in the Y axis.")
|
|
|
7d3fbc1 |
fieldsizer.Add(self.Y, pos = (1, 3))
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
fieldsizer.Add(wx.StaticText(self.panel, -1, "OffsetX (mm):"), pos = (2, 2), flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
- self.offset_X = floatspin.FloatSpin(self.panel, -1, value = self._get_setting("project_offset_x", 0.0), increment = 1, digits = 1, size = (80, -1))
|
|
|
7d3fbc1 |
- self.offset_X.Bind(floatspin.EVT_FLOATSPIN, self.update_offset)
|
|
|
7d3fbc1 |
+ if wx.VERSION < (3, 0):
|
|
|
7d3fbc1 |
+ self.offset_X = floatspin.FloatSpin(self.panel, -1, value = self._get_setting("project_offset_x", 0.0), increment = 1, digits = 1, size = (80, -1))
|
|
|
7d3fbc1 |
+ self.offset_X.Bind(floatspin.EVT_FLOATSPIN, self.update_offset)
|
|
|
7d3fbc1 |
+ else:
|
|
|
7d3fbc1 |
+ self.offset_X = wx.SpinCtrlDouble(self.panel, -1, initial = self._get_setting("project_offset_x", 0.0), inc = 1, size = (125, -1))
|
|
|
7d3fbc1 |
+ self.offset_X.SetDigits(1)
|
|
|
7d3fbc1 |
+ self.offset_X.Bind(wx.EVT_SPINCTRLDOUBLE, self.update_offset)
|
|
|
7d3fbc1 |
self.offset_X.SetHelpText("How far the slice should be offset from the edge in the X axis.")
|
|
|
7d3fbc1 |
fieldsizer.Add(self.offset_X, pos = (2, 3))
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
fieldsizer.Add(wx.StaticText(self.panel, -1, "OffsetY (mm):"), pos = (3, 2), flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
- self.offset_Y = floatspin.FloatSpin(self.panel, -1, value = self._get_setting("project_offset_y", 0.0), increment = 1, digits = 1, size = (80, -1))
|
|
|
7d3fbc1 |
- self.offset_Y.Bind(floatspin.EVT_FLOATSPIN, self.update_offset)
|
|
|
7d3fbc1 |
+ if wx.VERSION < (3, 0):
|
|
|
7d3fbc1 |
+ self.offset_Y = floatspin.FloatSpin(self.panel, -1, value = self._get_setting("project_offset_y", 0.0), increment = 1, digits = 1, size = (80, -1))
|
|
|
7d3fbc1 |
+ self.offset_Y.Bind(floatspin.EVT_FLOATSPIN, self.update_offset)
|
|
|
7d3fbc1 |
+ else:
|
|
|
7d3fbc1 |
+ self.offset_Y = wx.SpinCtrlDouble(self.panel, -1, initial = self._get_setting("project_offset_y", 0.0), inc = 1, size = (125, -1))
|
|
|
7d3fbc1 |
+ self.offset_Y.SetDigits(1)
|
|
|
7d3fbc1 |
+ self.offset_Y.Bind(wx.EVT_SPINCTRLDOUBLE, self.update_offset)
|
|
|
7d3fbc1 |
self.offset_Y.SetHelpText("How far the slice should be offset from the edge in the Y axis.")
|
|
|
7d3fbc1 |
fieldsizer.Add(self.offset_Y, pos = (3, 3))
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
fieldsizer.Add(wx.StaticText(self.panel, -1, "ProjectedX (mm):"), pos = (4, 2), flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
- self.projected_X_mm = floatspin.FloatSpin(self.panel, -1, value = self._get_setting("project_projected_x", 505.0), increment = 1, digits = 1, size = (80, -1))
|
|
|
7d3fbc1 |
- self.projected_X_mm.Bind(floatspin.EVT_FLOATSPIN, self.update_projected_Xmm)
|
|
|
7d3fbc1 |
+ if wx.VERSION < (3, 0):
|
|
|
7d3fbc1 |
+ self.projected_X_mm = floatspin.FloatSpin(self.panel, -1, value = self._get_setting("project_projected_x", 505.0), increment = 1, digits = 1, size = (80, -1))
|
|
|
7d3fbc1 |
+ self.projected_X_mm.Bind(floatspin.EVT_FLOATSPIN, self.update_projected_Xmm)
|
|
|
7d3fbc1 |
+ else:
|
|
|
7d3fbc1 |
+ self.projected_X_mm = wx.SpinCtrlDouble(self.panel, -1, initial = self._get_setting("project_projected_x", 505.0), inc = 1, size = (125, -1))
|
|
|
7d3fbc1 |
+ self.projected_X_mm.SetDigits(1)
|
|
|
7d3fbc1 |
+ self.projected_X_mm.Bind(wx.EVT_SPINCTRLDOUBLE, self.update_projected_Xmm)
|
|
|
7d3fbc1 |
self.projected_X_mm.SetHelpText("The actual width of the entire projected image. Use the Calibrate grid to show the full size of the projected image, and measure the width at the same level where the slice will be projected onto the resin.")
|
|
|
7d3fbc1 |
fieldsizer.Add(self.projected_X_mm, pos = (4, 3))
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
fieldsizer.Add(wx.StaticText(self.panel, -1, "Z Axis Speed (mm/min):"), pos = (5, 2), flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
- self.z_axis_rate = wx.SpinCtrl(self.panel, -1, str(self._get_setting("project_z_axis_rate", 200)), max = 9999, size = (80, -1))
|
|
|
7d3fbc1 |
+ self.z_axis_rate = wx.SpinCtrl(self.panel, -1, str(self._get_setting("project_z_axis_rate", 200)), max = 9999, size = (125, -1))
|
|
|
7d3fbc1 |
self.z_axis_rate.Bind(wx.EVT_SPINCTRL, self.update_z_axis_rate)
|
|
|
7d3fbc1 |
self.z_axis_rate.SetHelpText("Speed of the Z axis in mm/minute. Take into account that slower rates may require a longer pause value.")
|
|
|
7d3fbc1 |
fieldsizer.Add(self.z_axis_rate, pos = (5, 3))
|
|
|
7d3fbc1 |
@@ -394,7 +419,11 @@ class SettingsFrame(wx.Frame):
|
|
|
7d3fbc1 |
first_layer_boxer.Add(self.first_layer, flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
first_layer_boxer.Add(wx.StaticText(self.panel, -1, " (s):"), flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
- self.show_first_layer_timer = floatspin.FloatSpin(self.panel, -1, value=-1, increment = 1, digits = 1, size = (55, -1))
|
|
|
7d3fbc1 |
+ if wx.VERSION < (3, 0):
|
|
|
7d3fbc1 |
+ self.show_first_layer_timer = floatspin.FloatSpin(self.panel, -1, value=-1, increment = 1, digits = 1, size = (55, -1))
|
|
|
7d3fbc1 |
+ else:
|
|
|
7d3fbc1 |
+ self.show_first_layer_timer = wx.SpinCtrlDouble(self.panel, -1, initial = -1, inc = 1, size = (125, -1))
|
|
|
7d3fbc1 |
+ self.show_first_layer_timer.SetDigits(1)
|
|
|
7d3fbc1 |
self.show_first_layer_timer.SetHelpText("How long to display the first layer for. -1 = unlimited.")
|
|
|
7d3fbc1 |
first_layer_boxer.Add(self.show_first_layer_timer, flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
displaysizer.Add(first_layer_boxer, pos = (0, 6), flag = wx.ALIGN_CENTER_VERTICAL)
|
|
|
7d3fbc1 |
diff -up printrun/settings.py.gtk3 printrun/settings.py
|
|
|
7d3fbc1 |
--- printrun/settings.py.gtk3 2015-06-19 05:47:24.000000000 -0400
|
|
|
7d3fbc1 |
+++ printrun/settings.py 2015-08-11 23:32:05.603437536 -0400
|
|
|
7d3fbc1 |
@@ -145,7 +145,12 @@ class SpinSetting(wxSetting):
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
def get_specific_widget(self, parent):
|
|
|
7d3fbc1 |
from wx.lib.agw.floatspin import FloatSpin
|
|
|
7d3fbc1 |
- self.widget = FloatSpin(parent, -1, min_val = self.min, max_val = self.max, digits = 0)
|
|
|
7d3fbc1 |
+ import wx
|
|
|
7d3fbc1 |
+ if wx.VERSION < (3, 0):
|
|
|
7d3fbc1 |
+ self.widget = FloatSpin(parent, -1, min_val = self.min, max_val = self.max, digits = 0)
|
|
|
7d3fbc1 |
+ else:
|
|
|
7d3fbc1 |
+ self.widget = wx.SpinCtrlDouble(parent, -1, min = self.min, max = self.max)
|
|
|
7d3fbc1 |
+ self.widget.SetDigits(0)
|
|
|
7d3fbc1 |
self.widget.SetValue(self.value)
|
|
|
7d3fbc1 |
orig = self.widget.GetValue
|
|
|
7d3fbc1 |
self.widget.GetValue = lambda: int(orig())
|
|
|
7d3fbc1 |
@@ -155,7 +160,12 @@ class FloatSpinSetting(SpinSetting):
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
def get_specific_widget(self, parent):
|
|
|
7d3fbc1 |
from wx.lib.agw.floatspin import FloatSpin
|
|
|
7d3fbc1 |
- self.widget = FloatSpin(parent, -1, value = self.value, min_val = self.min, max_val = self.max, increment = self.increment, digits = 2)
|
|
|
7d3fbc1 |
+ import wx
|
|
|
7d3fbc1 |
+ if wx.VERSION < (3, 0):
|
|
|
7d3fbc1 |
+ self.widget = FloatSpin(parent, -1, value = self.value, min_val = self.min, max_val = self.max, increment = self.increment, digits = 2)
|
|
|
7d3fbc1 |
+ else:
|
|
|
7d3fbc1 |
+ self.widget = wx.SpinCtrlDouble(parent, -1, initial = self.value, min = self.min, max = self.max, inc = self.increment)
|
|
|
7d3fbc1 |
+ self.widget.SetDigits(2)
|
|
|
7d3fbc1 |
return self.widget
|
|
|
7d3fbc1 |
|
|
|
7d3fbc1 |
class BooleanSetting(wxSetting):
|
|
|
7d3fbc1 |
@@ -216,7 +226,12 @@ class BuildDimensionsSetting(wxSetting):
|
|
|
7d3fbc1 |
import wx
|
|
|
7d3fbc1 |
build_dimensions = parse_build_dimensions(self.value)
|
|
|
7d3fbc1 |
self.widgets = []
|
|
|
7d3fbc1 |
- w = lambda val, m, M: self.widgets.append(FloatSpin(parent, -1, value = val, min_val = m, max_val = M, digits = 2))
|
|
|
7d3fbc1 |
+ def w(val, m, M):
|
|
|
7d3fbc1 |
+ if wx.VERSION < (3, 0):
|
|
|
7d3fbc1 |
+ self.widgets.append(FloatSpin(parent, -1, value = val, min_val = m, max_val = M, digits = 2))
|
|
|
7d3fbc1 |
+ else:
|
|
|
7d3fbc1 |
+ self.widgets.append(wx.SpinCtrlDouble(parent, -1, initial = val, min = m, max = M))
|
|
|
7d3fbc1 |
+ self.widgets[-1].SetDigits(2)
|
|
|
7d3fbc1 |
addlabel = lambda name, pos: self.widget.Add(wx.StaticText(parent, -1, name), pos = pos, flag = wx.ALIGN_CENTER_VERTICAL | wx.RIGHT, border = 5)
|
|
|
7d3fbc1 |
addwidget = lambda *pos: self.widget.Add(self.widgets[-1], pos = pos, flag = wx.RIGHT, border = 5)
|
|
|
7d3fbc1 |
self.widget = wx.GridBagSizer()
|