fix visual drill progress updates again

change default safety heigth to 25 (before: 5)


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@595 bbaffbd6-741e-11dd-a85d-61de82d9cad9

src/pycam/Gui/OpenGLTools.py

@@ -715,7 +715,10 @@ def draw_complete_model_view(settings):
         GL.glColor3f(*settings.get("color_support_grid"))
         settings.get("support_grid").to_OpenGL()
     # draw the toolpath
-    if settings.get("show_toolpath"):
+    # don't do it, if a new toolpath is just being calculated
+    if settings.get("show_toolpath") \
+            and not (settings.get("show_drill_progress") \
+            and (not settings.get("toolpath_in_progress") is None)):
         for toolpath_obj in settings.get("toolpath"):
             if toolpath_obj.visible:
                 draw_toolpath(toolpath_obj.get_path(),
@@ -727,6 +730,12 @@ def draw_complete_model_view(settings):
         if not cutter is None:
             GL.glColor3f(*settings.get("color_cutter"))
             cutter.to_OpenGL()
+        # also show the toolpath that is currently being calculated
+        toolpath_in_progress = settings.get("toolpath_in_progress")
+        if not toolpath_in_progress is None:
+                draw_toolpath(toolpath_in_progress,
+                        settings.get("color_toolpath_cut"),
+                        settings.get("color_toolpath_return"))
 
 @keep_gl_mode
 @keep_matrix

src/pycam/Gui/Project.py

@@ -860,8 +860,8 @@ class ProjectGui:
         location = pycam.Utils.get_external_program_location(key)
         if not location:
             log.error("Failed to locate the external program '%s'. " % key \
-                    + "Please install the program and try again.\nOr maybe" \
-                    + "you need to specify the location manually.")
+                    + "Please install the program and try again.\n" \
+                    + "Or maybe you need to specify the location manually.")
         else:
             # store the new setting
             self.settings.set("external_program_%s" % key, location)
@@ -2398,9 +2398,12 @@ class ProjectGui:
                 self.last_update = time.time()
                 self.max_fps = max_fps
                 self.func = func
-            def update(self, text=None, percent=None, tool_position=None):
+            def update(self, text=None, percent=None, tool_position=None,
+                    toolpath=None):
                 if not tool_position is None:
                     parent.cutter.moveto(tool_position)
+                if not toolpath is None:
+                    parent.settings.set("toolpath_in_progress", toolpath)
                 if (time.time() - self.last_update) > 1.0/self.max_fps:
                     self.last_update = time.time()
                     if self.func:
@@ -2437,6 +2440,8 @@ class ProjectGui:
             return False
 
         log.info("Toolpath generation time: %f" % (time.time() - start_time))
+        # don't show the new toolpath anymore
+        self.settings.set("toolpath_in_progress", None)
 
         if toolpath is None:
             # user interruption

src/pycam/Gui/Settings.py

@@ -174,7 +174,7 @@ tool_radius: 0.5
 
 [ProcessDefault]
 path_direction: x
-safety_height: 5
+safety_height: 25
 engrave_offset: 0.0
 
 [Process0]

src/pycam/PathGenerators/DropCutter.py

@@ -141,7 +141,8 @@ class DropCutter:
                 # "draw_callback" returns true, if the user requested to quit
                 # via the GUI.
                 # The progress counter may return True, if cancel was requested.
-                if (draw_callback and draw_callback(tool_position=p)) \
+                if (draw_callback and draw_callback(tool_position=p,
+                        toolpath=self.pa.paths)) \
                         or (progress_counter.increment()):
                     quit_requested = True
                     break

src/pycam/PathGenerators/EngraveCutter.py

@@ -156,7 +156,7 @@ class EngraveCutter:
                 pa.append(p)
             self.cutter.moveto(p)
             if draw_callback:
-                draw_callback(tool_position=p)
+                draw_callback(tool_position=p, toolpath=pa.paths)
 
 
     def GenerateToolPathLineDrop(self, pa, line, minz, maxz, horiz_step,
@@ -201,7 +201,8 @@ class EngraveCutter:
             self.cutter.moveto(p)
             # "draw_callback" returns true, if the user requested quitting via
             # the GUI.
-            if draw_callback and draw_callback(tool_position=p):
+            if draw_callback \
+                    and draw_callback(tool_position=p, toolpath=pa.paths):
                 break
         pa.end_scanline()
         pa.end_direction()

src/pycam/PathGenerators/PushCutter.py

@@ -141,7 +141,7 @@ class PushCutter:
                     self.pa.append(p)
                 self.cutter.moveto(p)
                 if draw_callback:
-                    draw_callback(tool_position=p)
+                    draw_callback(tool_position=p, toolpath=self.pa.paths)
             self.pa.end_scanline()
 
             # update the progress counter