Skip to content

Instantly share code, notes, and snippets.

@garyhodgson
Created May 30, 2013 14:14
Show Gist options
  • Save garyhodgson/5678171 to your computer and use it in GitHub Desktop.
Save garyhodgson/5678171 to your computer and use it in GitHub Desktop.
diff --git a/printrun/projectlayer.py b/printrun/projectlayer.py
index 0288782..f51b377 100644
--- a/printrun/projectlayer.py
+++ b/printrun/projectlayer.py
@@ -275,49 +275,49 @@ class SettingsFrame(wx.Frame):
# Left Column
fieldsizer.Add(wx.StaticText(self.panel, -1, "Layer (mm):"), pos=(0, 0), flag=wx.ALIGN_CENTER_VERTICAL)
- self.thickness = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_layer", "0.1")), size=(80, -1))
+ self.thickness = wx.TextCtrl(self.panel, -1, str(self._get_setting("_project_layer", "0.1")), size=(80, -1))
self.thickness.Bind(wx.EVT_TEXT, self.update_thickness)
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.")
fieldsizer.Add(self.thickness, pos=(0, 1))
fieldsizer.Add(wx.StaticText(self.panel, -1, "Exposure (s):"), pos=(1, 0), flag=wx.ALIGN_CENTER_VERTICAL)
- self.interval = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_interval", "0.5")), size=(80,-1))
+ self.interval = wx.TextCtrl(self.panel, -1, str(self._get_setting("_project_interval", "0.5")), size=(80,-1))
self.interval.Bind(wx.EVT_TEXT, self.update_interval)
self.interval.SetHelpText("How long each slice should be displayed.")
fieldsizer.Add(self.interval, pos=(1, 1))
fieldsizer.Add(wx.StaticText(self.panel, -1, "Blank (s):"), pos=(2,0), flag=wx.ALIGN_CENTER_VERTICAL)
- self.pause = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_pause", "0.5")), size=(80,-1))
+ self.pause = wx.TextCtrl(self.panel, -1, str(self._get_setting("_project_pause", "0.5")), size=(80,-1))
self.pause.Bind(wx.EVT_TEXT, self.update_pause)
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).")
fieldsizer.Add(self.pause, pos=(2, 1))
fieldsizer.Add(wx.StaticText(self.panel, -1, "Scale:"), pos=(3,0), flag=wx.ALIGN_CENTER_VERTICAL)
- self.scale = floatspin.FloatSpin(self.panel, -1, value=self._get_setting('project_scale', 1.0), increment=0.1, digits=3, size=(80,-1))
+ self.scale = floatspin.FloatSpin(self.panel, -1, value=self._get_setting('_project_scale', 1.0), increment=0.1, digits=3, size=(80,-1))
self.scale.Bind(floatspin.EVT_FLOATSPIN, self.update_scale)
self.scale.SetHelpText("The additional scaling of each slice.")
fieldsizer.Add(self.scale, pos=(3, 1))
fieldsizer.Add(wx.StaticText(self.panel, -1, "Direction:"), pos=(4,0), flag=wx.ALIGN_CENTER_VERTICAL)
- self.direction = wx.ComboBox(self.panel, -1, choices=["Top Down","Bottom Up"], value=self._get_setting('project_direction', "Top Down"), size=(80,-1))
+ self.direction = wx.ComboBox(self.panel, -1, choices=["Top Down","Bottom Up"], value=self._get_setting('_project_direction', "Top Down"), size=(80,-1))
self.direction.Bind(wx.EVT_COMBOBOX, self.update_direction)
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.")
fieldsizer.Add(self.direction, pos=(4, 1), flag=wx.ALIGN_CENTER_VERTICAL)
fieldsizer.Add(wx.StaticText(self.panel, -1, "Overshoot (mm):"), pos=(5,0), flag=wx.ALIGN_CENTER_VERTICAL)
- 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))
+ 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))
self.overshoot.Bind(floatspin.EVT_FLOATSPIN, self.update_overshoot)
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.")
fieldsizer.Add(self.overshoot, pos=(5, 1))
fieldsizer.Add(wx.StaticText(self.panel, -1, "Pre-lift Gcode:"), pos=(6, 0), flag=wx.ALIGN_CENTER_VERTICAL)
- self.prelift_gcode = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_prelift_gcode", "").replace("\\n",'\n')), size=(-1, 35), style=wx.TE_MULTILINE)
+ self.prelift_gcode = wx.TextCtrl(self.panel, -1, str(self._get_setting("_project_prelift_gcode", "").replace("\\n",'\n')), size=(-1, 35), style=wx.TE_MULTILINE)
self.prelift_gcode.SetHelpText("Additional gcode to run before raising the Z axis. Be sure to take into account any additional time needed in the pause value, and be careful what gcode is added!")
self.prelift_gcode.Bind(wx.EVT_TEXT, self.update_prelift_gcode)
fieldsizer.Add(self.prelift_gcode, pos=(6, 1), span=(2,1))
fieldsizer.Add(wx.StaticText(self.panel, -1, "Post-lift Gcode:"), pos=(6, 2), flag=wx.ALIGN_CENTER_VERTICAL)
- self.postlift_gcode = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_postlift_gcode", "").replace("\\n",'\n')), size=(-1, 35), style=wx.TE_MULTILINE)
+ self.postlift_gcode = wx.TextCtrl(self.panel, -1, str(self._get_setting("_project_postlift_gcode", "").replace("\\n",'\n')), size=(-1, 35), style=wx.TE_MULTILINE)
self.postlift_gcode.SetHelpText("Additional gcode to run after raising the Z axis. Be sure to take into account any additional time needed in the pause value, and be careful what gcode is added!")
self.postlift_gcode.Bind(wx.EVT_TEXT, self.update_postlift_gcode)
fieldsizer.Add(self.postlift_gcode, pos=(6, 3), span=(2,1))
@@ -325,38 +325,38 @@ class SettingsFrame(wx.Frame):
# Right Column
fieldsizer.Add(wx.StaticText(self.panel, -1, "X (px):"), pos=(0, 2), flag=wx.ALIGN_CENTER_VERTICAL)
- self.X = wx.SpinCtrl(self.panel, -1, str(int(self._get_setting("project_x", 1024))), max=999999, size=(80,-1))
+ self.X = wx.SpinCtrl(self.panel, -1, str(int(self._get_setting("_project_x", 1024))), max=999999, size=(80,-1))
self.X.Bind(wx.EVT_SPINCTRL, self.update_resolution)
self.X.SetHelpText("The projector resolution in the X axis.")
fieldsizer.Add(self.X, pos=(0, 3))
fieldsizer.Add(wx.StaticText(self.panel, -1, "Y (px):"), pos=(1, 2), flag=wx.ALIGN_CENTER_VERTICAL)
- self.Y = wx.SpinCtrl(self.panel, -1, str(int(self._get_setting("project_y", 768))), max=999999, size=(80,-1))
+ self.Y = wx.SpinCtrl(self.panel, -1, str(int(self._get_setting("_project_y", 768))), max=999999, size=(80,-1))
self.Y.Bind(wx.EVT_SPINCTRL, self.update_resolution)
self.Y.SetHelpText("The projector resolution in the Y axis.")
fieldsizer.Add(self.Y, pos=(1, 3))
fieldsizer.Add(wx.StaticText(self.panel, -1, "OffsetX (mm):"), pos=(2, 2), flag=wx.ALIGN_CENTER_VERTICAL)
- self.offset_X = floatspin.FloatSpin(self.panel, -1, value=self._get_setting("project_offset_x", 0.0), increment=1, digits=1, size=(80,-1))
+ self.offset_X = floatspin.FloatSpin(self.panel, -1, value=self._get_setting("_project_offset_x", 0.0), increment=1, digits=1, size=(80,-1))
self.offset_X.Bind(floatspin.EVT_FLOATSPIN, self.update_offset)
self.offset_X.SetHelpText("How far the slice should be offset from the edge in the X axis.")
fieldsizer.Add(self.offset_X, pos=(2, 3))
fieldsizer.Add(wx.StaticText(self.panel, -1, "OffsetY (mm):"), pos=(3, 2), flag=wx.ALIGN_CENTER_VERTICAL)
- self.offset_Y = floatspin.FloatSpin(self.panel, -1, value=self._get_setting("project_offset_y", 0.0), increment=1, digits=1, size=(80,-1))
+ self.offset_Y = floatspin.FloatSpin(self.panel, -1, value=self._get_setting("_project_offset_y", 0.0), increment=1, digits=1, size=(80,-1))
self.offset_Y.Bind(floatspin.EVT_FLOATSPIN, self.update_offset)
self.offset_Y.SetHelpText("How far the slice should be offset from the edge in the Y axis.")
fieldsizer.Add(self.offset_Y, pos=(3, 3))
fieldsizer.Add(wx.StaticText(self.panel, -1, "ProjectedX (mm):"), pos=(4, 2), flag=wx.ALIGN_CENTER_VERTICAL)
- self.projected_X_mm = floatspin.FloatSpin(self.panel, -1, value=self._get_setting("project_projected_x", 415.0), increment=1, digits=1, size=(80,-1))
+ self.projected_X_mm = floatspin.FloatSpin(self.panel, -1, value=self._get_setting("_project_projected_x", 415.0), increment=1, digits=1, size=(80,-1))
self.projected_X_mm.Bind(floatspin.EVT_FLOATSPIN, self.update_projected_Xmm)
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.")
fieldsizer.Add(self.projected_X_mm, pos=(4, 3))
fieldsizer.Add(wx.StaticText(self.panel, -1, "Z Axis Speed (mm/min):"), pos=(5, 2), flag=wx.ALIGN_CENTER_VERTICAL)
- self.z_axis_rate = wx.SpinCtrl(self.panel, -1, str(self._get_setting("project_z_axis_rate", 200)), max=9999, size=(80,-1))
+ self.z_axis_rate = wx.SpinCtrl(self.panel, -1, str(self._get_setting("_project_z_axis_rate", 200)), max=9999, size=(80,-1))
self.z_axis_rate.Bind(wx.EVT_SPINCTRL, self.update_z_axis_rate)
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.")
fieldsizer.Add(self.z_axis_rate, pos=(5, 3))
@@ -679,8 +679,8 @@ class SettingsFrame(wx.Frame):
offset_y = float(self.offset_Y.GetValue())
self.display_frame.offset = (offset_x, offset_y)
- self._set_setting('project_offset_x',offset_x)
- self._set_setting('project_offset_y',offset_y)
+ self._set_setting('_project_offset_x',offset_x)
+ self._set_setting('_project_offset_y',offset_y)
self.refresh_display(event)
@@ -689,57 +689,57 @@ class SettingsFrame(wx.Frame):
self.present_first_layer(event)
def update_thickness(self, event):
- self._set_setting('project_layer',self.thickness.GetValue())
+ self._set_setting('_project_layer',self.thickness.GetValue())
self.refresh_display(event)
def update_projected_Xmm(self, event):
- self._set_setting('project_projected_x',self.projected_X_mm.GetValue())
+ self._set_setting('_project_projected_x',self.projected_X_mm.GetValue())
self.refresh_display(event)
def update_scale(self, event):
scale = float(self.scale.GetValue())
self.display_frame.scale = scale
- self._set_setting('project_scale',scale)
+ self._set_setting('_project_scale',scale)
self.refresh_display(event)
def update_interval(self, event):
interval = float(self.interval.GetValue())
self.display_frame.interval = interval
- self._set_setting('project_interval',interval)
+ self._set_setting('_project_interval',interval)
self.set_estimated_time()
self.refresh_display(event)
def update_pause(self, event):
pause = float(self.pause.GetValue())
self.display_frame.pause = pause
- self._set_setting('project_pause',pause)
+ self._set_setting('_project_pause',pause)
self.set_estimated_time()
self.refresh_display(event)
def update_overshoot(self, event):
overshoot = float(self.overshoot.GetValue())
self.display_frame.pause = overshoot
- self._set_setting('project_overshoot',overshoot)
+ self._set_setting('_project_overshoot',overshoot)
def update_prelift_gcode(self, event):
prelift_gcode = self.prelift_gcode.GetValue().replace('\n', "\\n")
self.display_frame.prelift_gcode = prelift_gcode
- self._set_setting('project_prelift_gcode',prelift_gcode)
+ self._set_setting('_project_prelift_gcode',prelift_gcode)
def update_postlift_gcode(self, event):
postlift_gcode = self.postlift_gcode.GetValue().replace('\n', "\\n")
self.display_frame.postlift_gcode = postlift_gcode
- self._set_setting('project_postlift_gcode',postlift_gcode)
+ self._set_setting('_project_postlift_gcode',postlift_gcode)
def update_z_axis_rate(self, event):
z_axis_rate = int(self.z_axis_rate.GetValue())
self.display_frame.z_axis_rate = z_axis_rate
- self._set_setting('project_z_axis_rate',z_axis_rate)
+ self._set_setting('_project_z_axis_rate',z_axis_rate)
def update_direction(self, event):
direction = self.direction.GetValue()
self.display_frame.direction = direction
- self._set_setting('project_direction',direction)
+ self._set_setting('_project_direction',direction)
def update_fullscreen(self, event):
if (self.fullscreen.GetValue()):
@@ -752,8 +752,8 @@ class SettingsFrame(wx.Frame):
x = float(self.X.GetValue())
y = float(self.Y.GetValue())
self.display_frame.resize((x,y))
- self._set_setting('project_x',x)
- self._set_setting('project_y',y)
+ self._set_setting('_project_x',x)
+ self._set_setting('_project_y',y)
self.refresh_display(event)
def get_dpi(self):
diff --git a/pronsole.py b/pronsole.py
index 637ef6a..885a2f9 100755
--- a/pronsole.py
+++ b/pronsole.py
@@ -205,6 +205,22 @@ class Settings(object):
self._add(StringSetting("sliceoptscommand", "python skeinforge/skeinforge_application/skeinforge.py", _("Slicer options command"), _("Slice settings command\n default:\n python skeinforge/skeinforge_application/skeinforge.py")))
self._add(StringSetting("final_command", "", _("Final command"), _("Executable to run when the print is finished")))
+ self._project_offset_x = 0.0
+ self._project_offset_y = 0.0
+ self._project_interval = 2.0
+ self._project_pause = 2.5
+ self._project_scale = 1.0
+ self._project_x = 1024.0
+ self._project_y = 768.0
+ self._project_projected_x = 150.0
+ self._project_direction = "Top Down"
+ self._project_overshoot = 3.0
+ self._project_z_axis_rate = 200
+ self._project_layer = 0.1
+ self._project_prelift_gcode = ""
+ self._project_postlift_gcode = ""
+
+
_settings = []
def __setattr__(self, name, value):
if name.startswith("_"):
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment