From 4ffecc0bf83cb0f27d07ea235cd2ef931a7a423e Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Thu, 19 Aug 2021 23:29:30 +0300 Subject: [PATCH] - some changes due of porting to PyQt6 --- CHANGELOG.md | 1 + appEditors/appGCodeEditor.py | 2 +- appPlugins/ToolIsolation.py | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c84d01ba..59a9e85a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ CHANGELOG for FlatCAM beta - cleaned up the Geometry and Gerber object classes - more cleanup in Isolation Plugin - started the work in adding to Isolation Plugin a new feature to extra isolate the pads +- some changes due of porting to PyQt6 18.08.2021 diff --git a/appEditors/appGCodeEditor.py b/appEditors/appGCodeEditor.py index 1e460ea8..b3bd8611 100644 --- a/appEditors/appGCodeEditor.py +++ b/appEditors/appGCodeEditor.py @@ -381,7 +381,7 @@ class AppGCodeEditor(QtCore.QObject): :return: :rtype: """ - flags = QtGui.QTextDocument.FindCaseSensitively + flags = QtGui.QTextDocument.FindFlag.FindCaseSensitively self.edit_area.moveCursor(QtGui.QTextCursor.MoveOperation.Start) if self.gcode_obj.options['type'].lower() == 'geometry': diff --git a/appPlugins/ToolIsolation.py b/appPlugins/ToolIsolation.py index 19efceec..cb33a812 100644 --- a/appPlugins/ToolIsolation.py +++ b/appPlugins/ToolIsolation.py @@ -1690,6 +1690,8 @@ class ToolIsolation(AppTool, Gerber): work_geo = geometry if work_geo is None: + # we do isolation over all the geometry of the Gerber object + # because it is already fused together work_geo = isolated_obj.solid_geometry iso_t = {