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

printrun/power/__init__.py

@@ -77,6 +77,20 @@ else:
 try:
     import psutil
 
+    def get_nice(nice, p = None):
+        if not p: p = psutil.Process(os.getpid())
+        if callable(p.nice):
+            return p.nice()
+        else:
+            return p.nice
+
+    def set_nice(nice, p = None):
+        if not p: p = psutil.Process(os.getpid())
+        if callable(p.nice):
+            p.nice(nice)
+        else:
+            p.nice = nice
+
     if platform.system() != "Windows":
         import resource
         if hasattr(psutil, "RLIMIT_NICE"):
@@ -87,22 +101,15 @@ try:
             # RLIMIT_NICE is not available (probably OSX), let's probe
             # Try setting niceness to -20 .. -1
             p = psutil.Process(os.getpid())
-            orig_nice = p.get_nice()
+            orig_nice = get_nice(p)
             for i in range(-20, 0):
                 try:
-                    p.set_nice(i)
+                    set_nice(i, p)
                     high_priority_nice = i
                     break
                 except psutil.AccessDenied, e:
                     pass
-            p.set_nice(orig_nice)
-
-    def set_nice(nice):
-        p = psutil.Process(os.getpid())
-        if callable(p.nice):
-            p.nice(nice)
-        else:
-            p.nice = nice
+            set_nice(orig_nice, p)
 
     def set_priority():
         if platform.system() == "Windows":
@@ -126,7 +133,7 @@ try:
         reset_priority()
         deinhibit_sleep()
 except ImportError, e:
-    logging.warning("psutil unavailable, could not import power utils:" + e)
+    logging.warning("psutil unavailable, could not import power utils:" + str(e))
 
     def powerset_print_start(reason):
         pass

printrun/stlplater.py

@@ -266,7 +266,7 @@ class StlPlaterPanel(PlaterPanel):
             self.menusizer.Add(cutpanel, pos = (nrows + 1, 0), span = (1, 2), flag = wx.EXPAND)
         else:
             viewer = showstl(self, (580, 580), (0, 0))
-        self.simarrange_path = simarrange_path if simarrange_path else "./simarrange/sa"
+        self.simarrange_path = simarrange_path
         self.set_viewer(viewer)
 
     def start_cutting_tool(self, event, axis, direction):
@@ -475,12 +475,15 @@ class StlPlaterPanel(PlaterPanel):
             logging.info(_("Wrote plate to %s") % name)
 
     def autoplate(self, event = None):
-        try:
-            self.autoplate_simarrange()
-        except Exception, e:
-            logging.warning(_("Failed to use simarrange for plating, "
-                              "falling back to the standard method. "
-                              "The error was: ") + e)
+        if self.simarrange_path:
+            try:
+                self.autoplate_simarrange()
+            except Exception, e:
+                logging.warning(_("Failed to use simarrange for plating, "
+                                  "falling back to the standard method. "
+                                  "The error was: ") + e)
+                super(StlPlater, self).autoplate()
+        else:
             super(StlPlater, self).autoplate()
 
     def autoplate_simarrange(self):