From eb6e2bc32a95bc3111ffb1315565af297f0f92d9 Mon Sep 17 00:00:00 2001 From: daid303 Date: Wed, 26 Dec 2012 11:39:24 +0100 Subject: [PATCH 1/3] Fix the double click on STL/OBJ files. --- scripts/win32/installer.nsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/win32/installer.nsi b/scripts/win32/installer.nsi index a9d639de..e86c1376 100644 --- a/scripts/win32/installer.nsi +++ b/scripts/win32/installer.nsi @@ -120,7 +120,7 @@ Section "Open STL files with Cura" DeleteRegValue HKCR .stl "Content Type" WriteRegStr HKCR "Cura STL model file\DefaultIcon" "" "$INSTDIR\Cura\resources\stl.ico,0" WriteRegStr HKCR "Cura STL model file\shell" "" "open" - WriteRegStr HKCR "Cura STL model file\shell\open\command" "" '"$INSTDIR\python\pythonw.exe" "$INSTDIR\Cura\cura.py" "%1"' + WriteRegStr HKCR "Cura STL model file\shell\open\command" "" '"$INSTDIR\python\pythonw.exe" -c "import os; os.chdir(\"$INSTDIR\"); import Cura.cura; Cura.cura.main()" "%1"' SectionEnd Section /o "Open OBJ files with Cura" @@ -128,7 +128,7 @@ Section /o "Open OBJ files with Cura" DeleteRegValue HKCR .obj "Content Type" WriteRegStr HKCR "Cura OBJ model file\DefaultIcon" "" "$INSTDIR\Cura\resources\stl.ico,0" WriteRegStr HKCR "Cura OBJ model file\shell" "" "open" - WriteRegStr HKCR "Cura OBJ model file\shell\open\command" "" '"$INSTDIR\python\pythonw.exe" "$INSTDIR\Cura\cura.py" "%1"' + WriteRegStr HKCR "Cura OBJ model file\shell\open\command" "" '"$INSTDIR\python\pythonw.exe" -c "import os; os.chdir(\"$INSTDIR\"); import Cura.cura; Cura.cura.main()" "%1"' SectionEnd ;-------------------------------- From cabff2d951b4b22099e776e4e98864362897c2c8 Mon Sep 17 00:00:00 2001 From: daid303 Date: Thu, 27 Dec 2012 09:22:02 +0100 Subject: [PATCH 2/3] Fix starting the printing interface under windows and linux. --- Cura/gui/printWindow.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py index 3b004e1b..c426ba42 100644 --- a/Cura/gui/printWindow.py +++ b/Cura/gui/printWindow.py @@ -23,7 +23,7 @@ printWindowMonitorHandle = None def printFile(filename): global printWindowMonitorHandle - if printWindowMonitorHandle == None: + if printWindowMonitorHandle is None: printWindowMonitorHandle = printProcessMonitor() printWindowMonitorHandle.loadFile(filename) @@ -47,11 +47,11 @@ class printProcessMonitor(): self.handle = None def loadFile(self, filename): - if self.handle == None: + if self.handle is None: if platform.system() == "Darwin" and hasattr(sys, 'frozen'): cmdList = [os.path.join(os.path.dirname(sys.executable), 'Cura')] else: - cmdList = [sys.executable, sys.argv[0]] + cmdList = [sys.executable, '-m', 'Cura.cura'] cmdList.append('-r') cmdList.append(filename) if platform.system() == "Darwin": @@ -68,8 +68,8 @@ class printProcessMonitor(): def Monitor(self): p = self.handle line = p.stdout.readline() - while(len(line) > 0): - #print line.rstrip() + while len(line) > 0: + print line.rstrip() line = p.stdout.readline() p.communicate() self.handle = None @@ -90,7 +90,7 @@ class PrintCommandButton(buttons.GenBitmapButton): self.Bind(wx.EVT_BUTTON, self.OnClick) def OnClick(self, e): - if self.parent.machineCom == None or self.parent.machineCom.isPrinting(): + if self.parent.machineCom is None or self.parent.machineCom.isPrinting(): return; for cmd in self.commandList: self.parent.machineCom.sendCommand(cmd) From 3fba2b4d5ba9f3a2eeeb6654ca2933242eedd235 Mon Sep 17 00:00:00 2001 From: daid303 Date: Thu, 27 Dec 2012 10:21:06 +0100 Subject: [PATCH 3/3] Fixed #299 --- Cura/gui/projectPlanner.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py index 0025a2fc..c0a41e1f 100644 --- a/Cura/gui/projectPlanner.py +++ b/Cura/gui/projectPlanner.py @@ -661,16 +661,18 @@ class projectPlanner(wx.Frame): pspw.Show(True) def OnScaleChange(self, e): - if self.selection == None: + if self.selection is None: return try: self.selection.scale = float(self.scaleCtrl.GetValue()) except ValueError: self.selection.scale = 1.0 + if self.alwaysAutoPlace: + self.OnAutoPlace(None) self.preview.Refresh() def OnRotateChange(self, e): - if self.selection == None: + if self.selection is None: return self.selection.rotate = float(self.rotateCtrl.GetValue()) self.selection.updateModelTransform()