diff --git a/src/guis/CMakeLists.txt b/src/guis/CMakeLists.txt index c3c7097..a8f0ef5 100644 --- a/src/guis/CMakeLists.txt +++ b/src/guis/CMakeLists.txt @@ -13,7 +13,7 @@ set(GUIs fab fab.html fabserver make_png_oms make_stl_png make_stl_rml make_stl_sbp make_stl_g make_svg_camm make_svg_epi make_svg_uni make_svg_oms - make_svg_g make_svg_rml make_svg_sbp make_svg_ord make_png_snap + make_svg_g make_svg_rml make_svg_sbp make_svg_ord make_svg_gcc make_png_snap make_cad_snap make_stl_snap make_svg_snap make_png_eps_halftone make_cad_dxf make_math_dxf make_math_stl make_png_dxf make_gif_stl diff --git a/src/guis/make_png_gcc b/src/guis/make_png_gcc index d6c0f87..3236e73 100755 --- a/src/guis/make_png_gcc +++ b/src/guis/make_png_gcc @@ -9,7 +9,7 @@ # (c) Massachusetts Institute of Technology 2011 # Permission granted for experimental and personal use; # license for commercial sale available from MIT. -# # Jon Nordby 9/1/14 +# Jon Nordby 9/1/14 # (c) Jon Nordby, Fellesverkstedet 2014 # imports diff --git a/src/guis/make_svg_gcc b/src/guis/make_svg_gcc new file mode 100644 index 0000000..7b9a2a4 --- /dev/null +++ b/src/guis/make_svg_gcc @@ -0,0 +1,57 @@ +#!/usr/bin/env python +# +# make_svg_gcc +# .svg to .gcc GUI wrapper +# +# Neil Gershenfeld +# CBA MIT 7/19/11 +# +# (c) Massachusetts Institute of Technology 2011 +# Permission granted for experimental and personal use; +# license for commercial sale available from MIT. +# Jon Nordby 9/1/14 +# (c) Jon Nordby, Fellesverkstedet 2014 +# +# imports +# +import wx,sys +from fab_set import fab_frame +from panel_control import control_panel +from panel_svg import svg_panel +from panel_svg_path import svg_path_panel +from panel_path_gcc import path_gcc_panel +# +# command line +# +print "command line: make_svg_gcc [input_file [size]]" +print " input_file = input .svg file (optional)" +print " size = image panel size (optional)" +# +# start wx +# +app = wx.App() +# +# add panels to frame +# +frame = fab_frame("make_svg_gcc",sys.argv) +frame.control_panel = control_panel(frame) +frame.sizer.Add(frame.control_panel,(0,0),span=(1,4),flag=wx.ALIGN_CENTER_HORIZONTAL) +frame.svg_panel = svg_panel(frame) +frame.sizer.Add(frame.svg_panel,(1,0)) +frame.path_panel = svg_path_panel(frame) +frame.sizer.Add(frame.path_panel,(1,1)) +frame.gcc_panel = path_gcc_panel(frame) +frame.sizer.Add(frame.gcc_panel,(1,2)) +# +# defaults +# +frame.set_svg_gcc() +# +# fit and show frame +# +frame.Fit() +frame.Show() +# +# start mainloop +# +app.MainLoop() diff --git a/src/py/fab_mods.py b/src/py/fab_mods.py index 1e40d47..deca14c 100644 --- a/src/py/fab_mods.py +++ b/src/py/fab_mods.py @@ -78,6 +78,7 @@ def set_workflows(frame,formats,workflows): # frame.processes.Append("GCC lasercutter (.gcc)") workflows["image (.png) : GCC lasercutter (.gcc)"] = "make_png_gcc" + workflows["drawing (.svg) : GCC lasercutter (.gcc)"] = "make_svg_gcc" # frame.processes.Append("Resonetics excimer (.oms)") workflows["image (.png) : Resonetics excimer (.oms)"] = "make_png_oms" diff --git a/src/py/fab_set.py b/src/py/fab_set.py index 4d86cdc..4b1bd27 100644 --- a/src/py/fab_set.py +++ b/src/py/fab_set.py @@ -98,6 +98,27 @@ class fab_frame(wx.Frame): self.gcc_panel.min_power_3D.SetValue('25');\ self.gcc_panel.max_power_3D.SetValue('75');\ self.gcc_panel.speed_3D.SetValue('25');" + + # + # set .svg .gcc defaults + # + def set_svg_gcc(self): + self.defaults = {} + self.control_panel.defaults.Append('cardboard') + self.defaults["cardboard"]\ + = "self.gcc_panel.power_2D.SetValue('25');\ + self.gcc_panel.speed_2D.SetValue('75');\ + self.gcc_panel.min_power_3D.SetValue('5');\ + self.gcc_panel.max_power_3D.SetValue('25');\ + self.gcc_panel.speed_3D.SetValue('75');" + self.control_panel.defaults.Append('acrylic') + self.defaults["acrylic"]\ + = "self.gcc_panel.power_2D.SetValue('75');\ + self.gcc_panel.speed_2D.SetValue('25');\ + self.gcc_panel.min_power_3D.SetValue('25');\ + self.gcc_panel.max_power_3D.SetValue('75');\ + self.gcc_panel.speed_3D.SetValue('25');" + # # set .cad .epi defaults #