- fixed issue when plotting a CNCJob object with multiple tools and annotations on by plotting annotations after all the tools geometries are plotted

CHANGELOG.md

@@ -19,6 +19,7 @@ CHANGELOG for FlatCAM beta
 - Isolation Tool - modified the add new tool method to search first in Tools Database  for a suitable tool
 - Isolation Tool - added ability to find the tool diameter that will guarantee total isolation of the currently selected Gerber object
 - NCC Tool - UI change: if the operation is Isolation then some of the tool parameters are disabled
+- fixed issue when plotting a CNCJob object with multiple tools and annotations on by plotting annotations after all the tools geometries are plotted
 
 25.08.2020
 

appObjects/FlatCAMCNCJob.py

@@ -142,6 +142,8 @@ class CNCJobObject(FlatCAMObj, CNCjob):
         self.coords_decimals = 4
         self.fr_decimals = 2
 
+        self.annotations_dict = {}
+
         # used for parsing the GCode lines to adjust the GCode when the GCode is offseted or scaled
         gcodex_re_string = r'(?=.*(X[-\+]?\d*\.\d*))'
         self.g_x_re = re.compile(gcodex_re_string)
@@ -2244,13 +2246,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
 
         visible = visible if visible else self.options['plot']
 
-        if self.app.is_legacy is False:
-            if self.ui.annotation_cb.get_value() and self.ui.plot_cb.get_value():
-                self.text_col.enabled = True
-            else:
-                self.text_col.enabled = False
-            self.annotation.redraw()
-
+        # Geometry shapes plotting
         try:
             if self.multitool is False:  # single tool usage
                 try:
@@ -2286,6 +2282,20 @@ class CNCJobObject(FlatCAMObj, CNCjob):
             if self.app.is_legacy is False:
                 self.annotation.clear(update=True)
 
+        # Annotaions shapes plotting
+        try:
+            if self.app.is_legacy is False:
+                if self.ui.annotation_cb.get_value() and self.ui.plot_cb.get_value():
+                   self.plot_annotations(obj=self, visible=True)
+                else:
+                    self.plot_annotations(obj=self, visible=False)
+
+        except (ObjectDeleted, AttributeError):
+            if self.app.is_legacy is False:
+                self.annotation.clear(update=True)
+
+
+
     def on_annotation_change(self):
         """
         Handler for toggling the annotation display by clicking a checkbox.

camlib.py

@@ -6570,7 +6570,6 @@ class CNCjob(Geometry):
             }
 
         gcode_parsed = gcode_parsed if gcode_parsed else self.gcode_parsed
-        path_num = 0
 
         if tooldia is None:
             tooldia = self.tooldia
@@ -6590,24 +6589,36 @@ class CNCjob(Geometry):
                     if geo['kind'][0] == 'C':
                         obj.add_shape(shape=geo['geom'], color=color['C'][1], visible=visible)
         else:
-            text = []
-            pos = []
+            path_num = 0
+
             self.coordinates_type = self.app.defaults["cncjob_coords_type"]
             if self.coordinates_type == "G90":
                 # For Absolute coordinates type G90
                 for geo in gcode_parsed:
                     if geo['kind'][0] == 'T':
-                        current_position = geo['geom'].coords[0]
-                        if current_position not in pos:
-                            pos.append(current_position)
+                        start_position = geo['geom'].coords[0]
+
+                        if tooldia not in obj.annotations_dict:
+                            obj.annotations_dict[tooldia] = {
+                                'pos': [],
+                                'text': []
+                            }
+                        if start_position not in obj.annotations_dict[tooldia]['pos']:
                             path_num += 1
-                            text.append(str(path_num))
+                            obj.annotations_dict[tooldia]['pos'].append(start_position)
+                            obj.annotations_dict[tooldia]['text'].append(str(path_num))
+
+                        end_position = geo['geom'].coords[-1]
 
-                        current_position = geo['geom'].coords[-1]
-                        if current_position not in pos:
-                            pos.append(current_position)
+                        if tooldia not in obj.annotations_dict:
+                            obj.annotations_dict[tooldia] = {
+                                'pos': [],
+                                'text': []
+                            }
+                        if end_position not in obj.annotations_dict[tooldia]['pos']:
                             path_num += 1
-                            text.append(str(path_num))
+                            obj.annotations_dict[tooldia]['pos'].append(end_position)
+                            obj.annotations_dict[tooldia]['text'].append(str(path_num))
 
                     # plot the geometry of Excellon objects
                     if self.origin_kind == 'excellon':
@@ -6640,70 +6651,66 @@ class CNCjob(Geometry):
                             obj.add_shape(shape=poly, color=color['C'][1], face_color=color['C'][0],
                                           visible=visible, layer=1)
             else:
-                # For Incremental coordinates type G91
-                self.app.inform.emit('[ERROR_NOTCL] %s' % _('G91 coordinates not implemented ...'))
-                for geo in gcode_parsed:
-                    if geo['kind'][0] == 'T':
-                        current_position = geo['geom'].coords[0]
-                        if current_position not in pos:
-                            pos.append(current_position)
-                            path_num += 1
-                            text.append(str(path_num))
+                self.app.inform.emit('[ERROR_NOTCL] %s...' % _('G91 coordinates not implemented'))
+                return 'fail'
 
-                        current_position = geo['geom'].coords[-1]
-                        if current_position not in pos:
-                            pos.append(current_position)
-                            path_num += 1
-                            text.append(str(path_num))
+    def plot_annotations(self, obj, visible=True):
+        """
+        Plot annotations.
 
-                    # plot the geometry of Excellon objects
-                    if self.origin_kind == 'excellon':
-                        try:
-                            poly = Polygon(geo['geom'])
-                        except ValueError:
-                            # if the geos are travel lines it will enter into Exception
-                            poly = geo['geom'].buffer(distance=(tooldia / 1.99999999), resolution=self.steps_per_circle)
-                            poly = poly.simplify(tool_tolerance)
-                    else:
-                        # plot the geometry of any objects other than Excellon
-                        poly = geo['geom'].buffer(distance=(tooldia / 1.99999999), resolution=self.steps_per_circle)
-                        poly = poly.simplify(tool_tolerance)
+        :param obj:         FlatCAM CNCJob object for which to plot the annotations
+        :type obj:
+        :param visible:     annotaions visibility
+        :type visible:      bool
+        :return:            Nothing
+        :rtype:
+        """
 
-                    if kind == 'all':
-                        obj.add_shape(shape=poly, color=color[geo['kind'][0]][1], face_color=color[geo['kind'][0]][0],
-                                      visible=visible, layer=1 if geo['kind'][0] == 'C' else 2)
-                    elif kind == 'travel':
-                        if geo['kind'][0] == 'T':
-                            obj.add_shape(shape=poly, color=color['T'][1], face_color=color['T'][0],
-                                          visible=visible, layer=2)
-                    elif kind == 'cut':
-                        if geo['kind'][0] == 'C':
-                            obj.add_shape(shape=poly, color=color['C'][1], face_color=color['C'][0],
-                                          visible=visible, layer=1)
+        if not obj.annotations_dict:
+            return
 
-            try:
-                if self.app.defaults['global_theme'] == 'white':
-                    obj.annotation.set(text=text, pos=pos, visible=obj.options['plot'],
-                                       font_size=self.app.defaults["cncjob_annotation_fontsize"],
-                                       color=self.app.defaults["cncjob_annotation_fontcolor"])
-                else:
-                    # invert the color
-                    old_color = self.app.defaults["cncjob_annotation_fontcolor"].lower()
-                    new_color = ''
-                    code = {}
-                    l1 = "#;0123456789abcdef"
-                    l2 = "#;fedcba9876543210"
-                    for i in range(len(l1)):
-                        code[l1[i]] = l2[i]
-
-                    for x in range(len(old_color)):
-                        new_color += code[old_color[x]]
-
-                    obj.annotation.set(text=text, pos=pos, visible=obj.options['plot'],
-                                       font_size=self.app.defaults["cncjob_annotation_fontsize"],
-                                       color=new_color)
-            except Exception as e:
-                log.debug("CNCJob.plot2() --> annotations --> %s" % str(e))
+        if visible is True:
+            obj.text_col.enabled = True
+        else:
+            obj.text_col.enabled = False
+            return
+
+        text = []
+        pos = []
+        for tooldia in obj.annotations_dict:
+            pos += obj.annotations_dict[tooldia]['pos']
+            text += obj.annotations_dict[tooldia]['text']
+
+        if not text or not pos:
+            return
+
+        try:
+            if self.app.defaults['global_theme'] == 'white':
+                obj.annotation.set(text=text, pos=pos, visible=obj.options['plot'],
+                                   font_size=self.app.defaults["cncjob_annotation_fontsize"],
+                                   color=self.app.defaults["cncjob_annotation_fontcolor"])
+            else:
+                # invert the color
+                old_color = self.app.defaults["cncjob_annotation_fontcolor"].lower()
+                new_color = ''
+                code = {}
+                l1 = "#;0123456789abcdef"
+                l2 = "#;fedcba9876543210"
+                for i in range(len(l1)):
+                    code[l1[i]] = l2[i]
+
+                for x in range(len(old_color)):
+                    new_color += code[old_color[x]]
+
+                obj.annotation.set(text=text, pos=pos, visible=obj.options['plot'],
+                                   font_size=self.app.defaults["cncjob_annotation_fontsize"],
+                                   color=new_color)
+        except Exception as e:
+            log.debug("CNCJob.plot2() --> annotations --> %s" % str(e))
+            if self.app.is_legacy is False:
+                obj.annotation.clear(update=True)
+
+        obj.annotation.redraw()
 
     def create_geometry(self):
         """