Merge branch 'master' of github.com:kliment/Printrun

.gitignore

@@ -5,3 +5,4 @@
 uploads
 .DS_Store
 .vagrant
+prontserve-env

printrun/gui.py

@@ -170,7 +170,7 @@ def add_extra_controls(self, root, parentpanel, extra_buttons = None):
 
     esettingspanel = root.newPanel(parentpanel)
     esettingssizer = wx.BoxSizer(wx.HORIZONTAL)
-    root.edist = wx.SpinCtrl(esettingspanel, -1, "5", min = 0, max = 1000, size = (70, -1))
+    root.edist = wx.SpinCtrl(esettingspanel, -1, str(root.settings.extrusion_default), min = 0, max = 1000, size = (70, -1))
     root.edist.SetBackgroundColour((225, 200, 200))
     root.edist.SetForegroundColour("black")
     esettingssizer.Add(root.edist, flag = wx.ALIGN_CENTER | wx.RIGHT, border = 5)

pronsole.py

@@ -244,6 +244,7 @@ class Settings(object):
         self._add(SpinSetting("xy_feedrate", 3000, 0, 50000, _("X && Y manual feedrate"), _("Feedrate for Control Panel Moves in X and Y (mm/min)"), "Printer"))
         self._add(SpinSetting("z_feedrate", 200, 0, 50000, _("Z manual feedrate"), _("Feedrate for Control Panel Moves in Z (mm/min)"), "Printer"))
         self._add(SpinSetting("e_feedrate", 100, 0, 1000, _("E manual feedrate"), _("Feedrate for Control Panel Moves in Extrusions (mm/min)"), "Printer"))
+        self._add(SpinSetting("extrusion_default", 5, 0, 1000, _("Extrusion length"), _("Extrusion/REtraction (mm)"), "Printer"))
         self._add(StringSetting("slicecommand", "python skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py $s", _("Slice command"), _("Slice command"), "External"))
         self._add(StringSetting("sliceoptscommand", "python skeinforge/skeinforge_application/skeinforge.py", _("Slicer options command"), _("Slice settings command"), "External"))
         self._add(StringSetting("final_command", "", _("Final command"), _("Executable to run when the print is finished"), "External"))

prontserve.py

@@ -189,6 +189,9 @@ class Prontserve(pronsole.pronsole, EventEmitter):
   def post_process_print_job(self, filename, filebody):
     return FastGCode(filebody.split("\n"))
 
+  def get_print_job_memory_footprint(self, filename,filebody):
+    return 0 # TODO
+
   def current_print_line(self):
     if(self.p.printing): return (self.p.queueindex)
     return 0

requirements.txt

-inflection
-pybonjour
 git+https://github.com/D1plo1d/tornado.git
 git+https://github.com/D1plo1d/py-mdns.git
 git+https://github.com/construct-protocol/construct_server.py
+
+inflection>=0.2.0
+mdns>=1.0.0
+objgraph>=1.7.2
+pybonjour>=1.1.1
+pyserial==2.6
+wsgiref==0.1.2