From 3c44fbaedbd72ba96e8f8b54e3bab32d34978cfb Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sun, 15 Aug 2021 15:42:34 +0300 Subject: [PATCH] - made sure that the optimal tool detected works for isolation --- CHANGELOG.md | 1 + FlatCAM.py | 5 ++++- appPlugins/ToolIsolation.py | 1 + appPlugins/ToolNCC.py | 1 + appPlugins/ToolOptimal.py | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c12b1054..45378b80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ CHANGELOG for FlatCAM beta - fixed some issues with using the exec_() which now should be exec() - added a context menu action in the canvas context menu for moving selected objects to origin +- made sure that the optimal tool detected works for isolation 14.08.2021 diff --git a/FlatCAM.py b/FlatCAM.py index 169d7b97..27fb0667 100644 --- a/FlatCAM.py +++ b/FlatCAM.py @@ -166,5 +166,8 @@ if __name__ == '__main__': timer.timeout.connect(lambda: None) timer.start(100) - sys.exit(app.exec()) + try: + sys.exit(app.exec()) + except SystemError: + pass # app.exec() diff --git a/appPlugins/ToolIsolation.py b/appPlugins/ToolIsolation.py index ac94d1b9..243f54d2 100644 --- a/appPlugins/ToolIsolation.py +++ b/appPlugins/ToolIsolation.py @@ -1096,6 +1096,7 @@ class ToolIsolation(AppTool, Gerber): min_list = list(min_dict.keys()) min_dist = min(min_list) + min_dist -= 0.0001 # make sure that this works for isolation case return msg, min_dist diff --git a/appPlugins/ToolNCC.py b/appPlugins/ToolNCC.py index 94d5414f..12a2f3a9 100644 --- a/appPlugins/ToolNCC.py +++ b/appPlugins/ToolNCC.py @@ -1057,6 +1057,7 @@ class NonCopperClear(AppTool, Gerber): min_list = list(min_dict.keys()) min_dist = min(min_list) + min_dist -= 0.0001 # make sure that this works for isolation case return msg, min_dist diff --git a/appPlugins/ToolOptimal.py b/appPlugins/ToolOptimal.py index c6791697..b9ccee3b 100644 --- a/appPlugins/ToolOptimal.py +++ b/appPlugins/ToolOptimal.py @@ -257,6 +257,7 @@ class ToolOptimal(AppTool): min_list = list(self.min_dict.keys()) min_dist = min(min_list) + min_dist -= 0.0001 # make sure that this will work for isolation case min_dist_string = '%.*f' % (self.decimals, float(min_dist)) self.ui.result_entry.set_value(min_dist_string)