- in NCC Tool fixed a bug when using Rest Machining; optimizations

- in NCC Tool fixed a UI issue
- updated the Turkish translation (by Mehmet Kaya)

CHANGELOG.md

@@ -14,6 +14,9 @@ CHANGELOG for FlatCAM beta
 - modified some strings and updated the translation strings
 - in NCC Tool added a check for the validity of the used tools; its only informative
 - in NCC Tool done some refactoring
+- in NCC Tool fixed a bug when using Rest Machining; optimizations
+- in NCC Tool fixed a UI issue
+- updated the Turkish translation (by Mehmet Kaya)
 
 21.10.2020
 

appTools/ToolNCC.py

@@ -511,6 +511,8 @@ class NonCopperClear(AppTool, Gerber):
         self.ui.ncc_offset_spinner.set_value(self.app.defaults["tools_ncc_offset_value"])
 
         self.ui.ncc_rest_cb.set_value(self.app.defaults["tools_ncc_rest"])
+        self.ui.on_rest_machining_check(state=self.app.defaults["tools_ncc_rest"])
+
         self.ui.rest_ncc_margin_entry.set_value(self.app.defaults["tools_ncc_margin"])
         self.ui.rest_ncc_connect_cb.set_value(self.app.defaults["tools_ncc_connect"])
         self.ui.rest_ncc_contour_cb.set_value(self.app.defaults["tools_ncc_contour"])
@@ -777,11 +779,11 @@ class NonCopperClear(AppTool, Gerber):
                     pass
 
         try:
-            self.ui.ncc_rest_cb.stateChanged.disconnect()
+            self.ui.ncc_rest_cb.stateChanged.disconnect(self.ui.on_rest_machining_check)
         except (TypeError, ValueError):
             pass
         try:
-            self.ui.ncc_order_radio.activated_custom[str].disconnect()
+            self.ui.ncc_order_radio.activated_custom[str].disconnect(self.on_order_changed)
         except (TypeError, ValueError):
             pass
 
@@ -2383,6 +2385,13 @@ class NonCopperClear(AppTool, Gerber):
                                                           ncc_margin=ncc_margin, tools_storage=tools_storage,
                                                           bounding_box=bbox)
 
+            # for testing purposes ----------------------------------
+            # for po in area.geoms:
+            #     self.app.tool_shapes.add(po, color=self.app.defaults['global_sel_line'],
+            #                              face_color=self.app.defaults['global_sel_line'],
+            #                              update=True, layer=0, tolerance=None)
+            # -------------------------------------------------------
+
             # Generate area for each tool
             while sorted_clear_tools:
                 tool = sorted_clear_tools.pop(0)
@@ -2402,84 +2411,135 @@ class NonCopperClear(AppTool, Gerber):
 
                 tool_uid = 0    # find the current tool_uid
                 for k, v in self.ncc_tools.items():
-                    if float('%.*f' % (self.decimals, v['tooldia'])) == float('%.*f' % (self.decimals, tool)):
+                    if self.app.dec_format(v['tooldia'], self.decimals) == self.app.dec_format(tool, self.decimals):
                         tool_uid = int(k)
                         break
 
+                tool_data_dict = self.ncc_tools[tool_uid]["data"]
+
                 # parameters that are particular to the current tool
-                ncc_overlap = float(self.ncc_tools[tool_uid]["data"]["tools_ncc_overlap"]) / 100.0
-                ncc_method = self.ncc_tools[tool_uid]["data"]["tools_ncc_method"]
+                ncc_overlap = float(tool_data_dict["tools_ncc_overlap"]) / 100.0
+                ncc_method = tool_data_dict["tools_ncc_method"]
 
                 # variables to display the percentage of work done
                 geo_len = len(area.geoms)
                 old_disp_number = 0
-                log.warning("Total number of polygons to be cleared. %s" % str(geo_len))
+                log.warning("Total number of polygons to be cleared: %s" % str(geo_len))
+
+                # def random_color():
+                #     r_color = np.random.rand(4)
+                #     r_color[3] = 0.5
+                #     return r_color
 
                 # store here the geometry generated by clear operation
                 cleared_geo = []
 
-                if area.geoms:
-                    if len(area.geoms) > 0:
-                        pol_nr = 0
-                        for p in area.geoms:
-                            if self.app.abort_flag:
-                                # graceful abort requested by the user
-                                raise grace
-
-                            if p is not None and p.is_valid:
-                                # provide the app with a way to process the GUI events when in a blocking loop
-                                QtWidgets.QApplication.processEvents()
-
-                                poly_failed = 0
+                poly_failed = 0
+                if area.geoms and len(area.geoms) > 0:
+                    pol_nr = 0
+                    for p in area.geoms:
+                        if self.app.abort_flag:
+                            # graceful abort requested by the user
+                            raise grace
 
-                                # speedup the clearing by not trying to clear polygons that is clear they can't be
-                                # cleared with the current tool. this tremendously reduce the clearing time
-                                check_dist = -tool / 2.0
-                                check_buff = p.buffer(check_dist)
-                                if not check_buff or check_buff.is_empty:
-                                    continue
+                        if p is not None and p.is_valid and not p.is_empty:
+                            # provide the app with a way to process the GUI events when in a blocking loop
+                            QtWidgets.QApplication.processEvents()
 
-                                # actual copper claring is done here
-                                if isinstance(p, Polygon):
-                                    res = self.clear_polygon_worker(pol=p, tooldia=tool,
-                                                                    ncc_method=ncc_method,
-                                                                    ncc_overlap=ncc_overlap,
-                                                                    ncc_connect=ncc_connect,
-                                                                    ncc_contour=ncc_contour,
-                                                                    prog_plot=prog_plot)
-                                    if res is not None:
-                                        cleared_geo += res
-                                    else:
-                                        poly_failed += 1
+                            # speedup the clearing by not trying to clear polygons that is clear they can't be
+                            # cleared with the current tool. this tremendously reduce the clearing time
+                            check_dist = -tool / 2
+                            check_buff = p.buffer(check_dist, self.circle_steps)
+                            if not check_buff or check_buff.is_empty:
+                                continue
+
+                            # if self.app.dec_format(float(tool), self.decimals) == 0.15:
+                            #     # for testing purposes ----------------------------------
+                            #     self.app.tool_shapes.add(p, color=self.app.defaults['global_sel_line'],
+                            #                              face_color=random_color(),
+                            #                              update=True, layer=0, tolerance=None)
+                            #     self.app.tool_shapes.add(check_buff, color=self.app.defaults['global_sel_line'],
+                            #                              face_color='#FFFFFFFF',
+                            #                              update=True, layer=0, tolerance=None)
+                            #     # -------------------------------------------------------
+
+                            # actual copper clearing is done here
+                            if isinstance(p, Polygon):
+                                res = self.clear_polygon_worker(pol=p, tooldia=tool,
+                                                                ncc_method=ncc_method,
+                                                                ncc_overlap=ncc_overlap,
+                                                                ncc_connect=ncc_connect,
+                                                                ncc_contour=ncc_contour,
+                                                                prog_plot=prog_plot)
+
+                                if res is not None:
+                                    cleared_geo += res
                                 else:
-                                    log.warning("Expected geo is a Polygon. Instead got a %s" % str(type(p)))
+                                    poly_failed += 1
+                            else:
+                                log.warning("Expected geo is a Polygon. Instead got a %s" % str(type(p)))
 
-                                if poly_failed > 0:
-                                    app_obj.poly_not_cleared = True
+                            if poly_failed > 0:
+                                app_obj.poly_not_cleared = True
 
-                                pol_nr += 1
-                                disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 100]))
-                                # log.debug("Polygons cleared: %d" % pol_nr)
+                            pol_nr += 1
+                            disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 100]))
+                            # log.debug("Polygons cleared: %d" % pol_nr)
 
-                                if old_disp_number < disp_number <= 100:
-                                    self.app.proc_container.update_view_text(' %d%%' % disp_number)
-                                    old_disp_number = disp_number
-                                    # log.debug("Polygons cleared: %d. Percentage done: %d%%" % (pol_nr, disp_number))
+                            if old_disp_number < disp_number <= 100:
+                                self.app.proc_container.update_view_text(' %d%%' % disp_number)
+                                old_disp_number = disp_number
+                                # log.debug("Polygons cleared: %d. Percentage done: %d%%" % (pol_nr, disp_number))
 
-                        if self.app.abort_flag:
-                            raise grace     # graceful abort requested by the user
+                    if self.app.abort_flag:
+                        raise grace     # graceful abort requested by the user
 
-                        # check if there is a geometry at all in the cleared geometry
-                        if cleared_geo:
-                            tools_storage[tool_uid]["solid_geometry"] = deepcopy(cleared_geo)
-                            tools_storage[tool_uid]["data"]["name"] = name + '_' + str(tool)
-                            geo_obj.tools[current_uid] = dict(tools_storage[current_uid])
-                        else:
-                            log.debug("There are no geometries in the cleared polygon.")
+                    # check if there is a geometry at all in the cleared geometry
+                    if cleared_geo:
+                        tools_storage[tool_uid]["solid_geometry"] = deepcopy(cleared_geo)
+                        tools_storage[tool_uid]["data"]["name"] = name + '_' + str(tool)
+                        geo_obj.tools[tool_uid] = dict(tools_storage[tool_uid])
+                    else:
+                        log.debug("There are no geometries in the cleared polygon.")
 
-                # Area to clear next
-                buffered_cleared = unary_union(cleared_geo).buffer(tool / 2.0)
-                area = area.difference(buffered_cleared)
+                    log.warning("Total number of polygons failed to be cleared: %s" % str(poly_failed))
+                else:
+                    log.warning("The area to be cleared has no polygons.")
+
+                # # Area to clear next
+                # try:
+                #     # buffered_cleared = unary_union(cleared_geo).buffer(tool / 2.0)
+                #     # area = area.difference(buffered_cleared)
+                #     area = area.difference(unary_union(cleared_geo))
+                # except Exception as e:
+                #     log.debug("Creating new area failed due of: %s" % str(e))
+
+                new_area = MultiPolygon([line.buffer(tool / 1.9999999) for line in cleared_geo])
+                new_area = new_area.buffer(0.0000001)
+
+                area = area.difference(new_area)
+
+                new_area = [pol for pol in area if pol.is_valid and not pol.is_empty]
+                area = MultiPolygon(new_area)
+
+                # speedup the clearing by not trying to clear polygons that is clear they can't be
+                # cleared with any tool. this tremendously reduce the clearing time
+                # found_poly_to_clear = False
+                # for t in sorted_clear_tools:
+                #     check_dist = -t / 2.000000001
+                #     for pl in area:
+                #         check_buff = pl.buffer(check_dist)
+                #         if not check_buff or check_buff.is_empty or not check_buff.is_valid:
+                #             continue
+                #         else:
+                #             found_poly_to_clear = True
+                #             break
+                #     if found_poly_to_clear is True:
+                #         break
+                #
+                # if found_poly_to_clear is False:
+                #     log.warning("The area to be cleared no longer has polygons. Finishing.")
+                #     break
 
                 if not area or area.is_empty:
                     break

locale/tr/LC_MESSAGES/strings.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: 2020-10-22 15:08+0300\n"
-"PO-Revision-Date: 2020-10-22 15:08+0300\n"
+"PO-Revision-Date: 2020-10-22 16:13+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: tr_TR\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
-"X-Generator: Poedit 2.3.1\n"
+"X-Generator: Poedit 2.4.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-SearchPath-0: .\n"
@@ -5909,7 +5909,7 @@ msgstr "Komut Satırı Paneli"
 msgid ""
 "Add a Tool (when in Geometry Selected Tab or in Tools NCC or Tools Paint)"
 msgstr ""
-"Bir araç ekleyin (\"Seçili\" sekmede Şekil, Bakır Temizleme veya Çizim "
+"Bir araç ekleyin (\"Özellikler\" sekmede Şekil, Bakır Temizleme veya Çizim "
 "Araçlarındayken)"
 
 #: appGUI/MainGUI.py:4265
@@ -6474,16 +6474,12 @@ msgid ""
 msgstr "PCB'yi kesmek için kesim şekilleri oluşturun."
 
 #: appGUI/ObjectUI.py:407 appGUI/ObjectUI.py:756
-#, fuzzy
-#| msgid "UTILITIES"
 msgid "UTILTIES"
-msgstr "HİZMETLER"
+msgstr "ARAÇLAR"
 
 #: appGUI/ObjectUI.py:409 appGUI/ObjectUI.py:758
-#, fuzzy
-#| msgid "Show the Properties."
 msgid "Show the Utilties."
-msgstr "Özellikleri göster."
+msgstr "Araçaları göster."
 
 #: appGUI/ObjectUI.py:433 appGUI/preferences/gerber/GerberOptPrefGroupUI.py:32
 msgid "Non-copper regions"
@@ -7428,24 +7424,14 @@ msgid "Launch Paint Tool in Tools Tab."
 msgstr "Araçlar sekmesindeki \"Çizim\" aracını başlatır."
 
 #: appGUI/ObjectUI.py:1770
-#, fuzzy
-#| msgid "Generating slot milling geometry..."
 msgid "Generate a CNCJob by milling a Geometry."
-msgstr "Yuva frezeleme şekli oluşturuluyor ..."
+msgstr "Bir Şekli frezeleyerek bir CNC İşi oluşturun."
 
 #: appGUI/ObjectUI.py:1786 appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:35
-#, fuzzy
-#| msgid ""
-#| "Creates tool paths to cover the\n"
-#| "whole area of a polygon (remove\n"
-#| "all copper). You will be asked\n"
-#| "to click on the desired polygon."
 msgid ""
 "Creates tool paths to cover the\n"
 "whole area of a polygon."
-msgstr ""
-"PCB'de yollar dışında kalan tüm bakır kazınarak çıkarılır.\n"
-"Bakır temizliği yapılacak alanı tıklamanız istenir."
+msgstr "Bir çokgenin tüm alanlarını kaplayacak yollar oluşturur."
 
 #: appGUI/ObjectUI.py:1840
 msgid "CNC Job Object"
@@ -9067,7 +9053,7 @@ msgstr ""
 #: appGUI/preferences/general/GeneralAPPSetGroupUI.py:214
 #: appTools/ToolDblSided.py:666 appTools/ToolDblSided.py:838
 msgid "Axis"
-msgstr "Eksen Yazı Boyutu"
+msgstr "Eksen"
 
 #: appGUI/preferences/general/GeneralAPPSetGroupUI.py:216
 msgid "This sets the font size for canvas axis."
@@ -12263,7 +12249,7 @@ msgid ""
 "if they will provide a complete isolation."
 msgstr ""
 "İşaretlenirse, uç kalınlıklarının tam bir yalıtım\n"
-"sağlayıp sağlamadıkları doğrulanır."
+"sağlayıp sağlamadıkları kontrol edilir."
 
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:287
 #: appTools/ToolIsolation.py:3370
@@ -13081,6 +13067,8 @@ msgid ""
 "Voronoi function can not be loaded.\n"
 "Shapely >= 1.8 is required"
 msgstr ""
+"Voronoi işlevi yüklenemiyor.\n"
+"Shapely> = 1.8 gereklidir"
 
 #: appObjects/FlatCAMCNCJob.py:808
 msgid "Click on canvas to add a Probe Point..."
@@ -14932,7 +14920,7 @@ msgstr "Terslenecek nesneler"
 
 #: appTools/ToolDblSided.py:521
 msgid "Select the type of application object to be processed in this tool."
-msgstr ""
+msgstr "Bu araçta işlenecek nesnesinin türünü seçin."
 
 #: appTools/ToolDblSided.py:555
 msgid "Bounds Values"
@@ -16326,23 +16314,17 @@ msgstr "Sol tıklandığında hata oluştu."
 
 #: appTools/ToolNCC.py:835
 msgid "NCC Tool. Checking tools for validity."
-msgstr ""
+msgstr "Bakır Temizleme. Uçların uygunluğu kontrol ediliyor."
 
 #: appTools/ToolNCC.py:947
-#, fuzzy
-#| msgid ""
-#| "Incomplete isolation. At least one tool could not do a complete isolation."
 msgid ""
 "Incomplete isolation. None of the selected tools could do a complete "
 "isolation."
-msgstr "Eksik yalıtım. En az bir uç tam bir yalıtım yapamadı."
+msgstr "Eksik yalıtım. Seçilen uçların hiçbiri tam bir yalıtım sağlayamadı."
 
 #: appTools/ToolNCC.py:950
-#, fuzzy
-#| msgid ""
-#| "Incomplete isolation. At least one tool could not do a complete isolation."
 msgid "At least one of the selected tools can do a complete isolation."
-msgstr "Eksik yalıtım. En az bir uç tam bir yalıtım yapamadı."
+msgstr "Seçilen uçlardan en az biri tam bir yalıtım yapabilir."
 
 #: appTools/ToolNCC.py:1722 appTools/ToolNCC.py:2646
 msgid "NCC Tool. Preparing non-copper polygons."
@@ -16488,7 +16470,7 @@ msgstr ""
 
 #: appTools/ToolNCC.py:3750
 msgid "Non-Copper Clearing"
-msgstr "Bakır Temizleniyor"
+msgstr "Bakır Temizleme"
 
 #: appTools/ToolNCC.py:3779 appTools/ToolPaint.py:2765
 msgid "Obj Type"