Add support to GCode comments. Show connect button in print dialog.

diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py
index 8837e377bde057a3e44b986a1abcaeb0a73ef039..00e255405deaa818958f90a5b1ffb44704f56844 100644 (file)
--- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py
+++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py
@@ -126,6 +126,8 @@ class GcodeSmallSkein:
                        self.output.write(';TYPE:FILL\n');
                elif line.startswith('(<alteration>'):
                        self.output.write(';TYPE:CUSTOM\n');
+               elif line.startswith('(<supportLayer>'):
+                       self.output.write(';TYPE:SUPPORT\n');
                elif line.startswith('(<layer>'):
                        self.output.write(';LAYER:%d\n' % (self.layerNr));
                        self.layerNr += 1

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index 8607f68ccbe29b51511d142924c52b3bacd0b245..ac424290158dcc35c8a088e3af34c3c9f65fc73a 100644 (file)
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -41,17 +41,17 @@ class printWindow(wx.Frame):
                \r
                sb = wx.StaticBox(self.panel, label="Statistics")\r
                boxsizer = wx.StaticBoxSizer(sb, wx.VERTICAL)\r
-               self.statsText = wx.StaticText(self.panel, -1, "Filament: #.##m #.##g\nPrint time: ##:##")\r
+               self.statsText = wx.StaticText(self.panel, -1, "Filament: ####.##m #.##g\nPrint time: #####:##")\r
                boxsizer.Add(self.statsText, flag=wx.LEFT, border=5)\r
                \r
                self.sizer.Add(boxsizer, pos=(0,0), span=(4,1), flag=wx.EXPAND)\r
                \r
-               #self.connectButton = wx.Button(self.panel, -1, 'Connect')\r
+               self.connectButton = wx.Button(self.panel, -1, 'Connect')\r
                #self.loadButton = wx.Button(self.panel, -1, 'Load GCode')\r
                self.printButton = wx.Button(self.panel, -1, 'Print GCode')\r
                self.cancelButton = wx.Button(self.panel, -1, 'Cancel print')\r
                self.progress = wx.Gauge(self.panel, -1)\r
-               #self.sizer.Add(self.connectButton, pos=(0,1))\r
+               self.sizer.Add(self.connectButton, pos=(0,1))\r
                #self.sizer.Add(self.loadButton, pos=(1,1))\r
                self.sizer.Add(self.printButton, pos=(2,1))\r
                self.sizer.Add(self.cancelButton, pos=(3,1))\r
@@ -60,7 +60,7 @@ class printWindow(wx.Frame):
                self.sizer.AddGrowableCol(0)\r
                \r
                self.Bind(wx.EVT_CLOSE, self.OnClose)\r
-               #self.connectButton.Bind(wx.EVT_BUTTON, self.OnConnect)\r
+               self.connectButton.Bind(wx.EVT_BUTTON, self.OnConnect)\r
                #self.loadButton.Bind(wx.EVT_BUTTON, self.OnLoad)\r
                self.printButton.Bind(wx.EVT_BUTTON, self.OnPrint)\r
                self.cancelButton.Bind(wx.EVT_BUTTON, self.OnCancel)\r
@@ -73,7 +73,7 @@ class printWindow(wx.Frame):
                self.UpdateProgress()\r
        \r
        def UpdateButtonStates(self):\r
-               #self.connectButton.Enable(not self.machineConnected)\r
+               self.connectButton.Enable(not self.machineConnected)\r
                #self.loadButton.Enable(self.printIdx == None)\r
                self.printButton.Enable(self.machineConnected and self.gcodeList != None and self.printIdx == None)\r
                self.cancelButton.Enable(self.printIdx != None)\r