diff --git a/CHANGELOG.md b/CHANGELOG.md index 78ecc2d2..6644e08a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ CHANGELOG for FlatCAM beta ================================================= +6.08.2021 + +- more changes due of porting to PyQt6 +- fixed the Autocompleter highlighting to work in PyQt6 + 5.08.2021 - continuing to fix the PyQt6 port diff --git a/appEditors/AppExcEditor.py b/appEditors/AppExcEditor.py index aabd37f7..b0aacc61 100644 --- a/appEditors/AppExcEditor.py +++ b/appEditors/AppExcEditor.py @@ -14,7 +14,7 @@ from appEditors.AppGeoEditor import FCShapeTool, DrawTool, DrawToolShape, DrawTo from shapely.geometry import LineString, LinearRing, MultiLineString, Polygon, MultiPolygon, Point import shapely.affinity as affinity -from appCommon.Common import LoudDict +# from appCommon.Common import LoudDict import numpy as np @@ -2124,7 +2124,9 @@ class AppExcEditor(QtCore.QObject): # make the diameter column editable for row in range(self.tool_row): self.ui.tools_table_exc.item(row, 1).setFlags( - QtCore.Qt.ItemFlag.ItemIsEditable | QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled) + QtCore.Qt.ItemFlag.ItemIsEditable | + QtCore.Qt.ItemFlag.ItemIsSelectable | + QtCore.Qt.ItemFlag.ItemIsEnabled) self.ui.tools_table_exc.item(row, 2).setForeground(QtGui.QColor(0, 0, 0)) self.ui.tools_table_exc.item(row, 3).setForeground(QtGui.QColor(0, 0, 0)) @@ -4132,7 +4134,8 @@ class AppExcEditorUI: hlay2 = QtWidgets.QHBoxLayout() self.resdrill_entry = FCDoubleSpinner(policy=False) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, + QtWidgets.QSizePolicy.Policy.Preferred) self.resdrill_entry.setSizePolicy(sizePolicy) self.resdrill_entry.set_precision(self.decimals) self.resdrill_entry.set_range(0.0000, 10000.0000) diff --git a/appEditors/AppGeoEditor.py b/appEditors/AppGeoEditor.py index 53abe6b5..a869e957 100644 --- a/appEditors/AppGeoEditor.py +++ b/appEditors/AppGeoEditor.py @@ -3473,7 +3473,7 @@ class AppGeoEditor(QtCore.QObject): self.tooldia_entry.set_range(-10000.0000, 10000.0000) self.grid_d.addWidget(tooldia_lbl, 0, 0) - self.grid_d.addWidget( self.tooldia_entry, 0, 1) + self.grid_d.addWidget(self.tooldia_entry, 0, 1) # Tree Widget Title tw_label = FCLabel('%s:' % _("Geometry Table")) tw_label.setToolTip( diff --git a/appEditors/AppGerberEditor.py b/appEditors/AppGerberEditor.py index 61acc0da..934664ff 100644 --- a/appEditors/AppGerberEditor.py +++ b/appEditors/AppGerberEditor.py @@ -1640,8 +1640,8 @@ class DiscEditorGrb(ShapeToolEditorGrb): size_ap = float(self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['size']) except KeyError: size_ap = 0.0 - # self.draw_app.app.inform.emit('[ERROR_NOTCL] %s' % - # _("You need to preselect a aperture in the Aperture Table that has a size.")) + # self.draw_app.app.inform.emit( + # '[ERROR_NOTCL] %s' % _("You need to preselect a aperture in the Aperture Table that has a size.")) # try: # QtGui.QGuiApplication.restoreOverrideCursor() # except Exception: @@ -1764,8 +1764,8 @@ class DiscSemiEditorGrb(ShapeToolEditorGrb): size_ap = float(self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['size']) except KeyError: size_ap = 0.0 - # self.draw_app.app.inform.emit('[ERROR_NOTCL] %s' % - # _("You need to preselect a aperture in the Aperture Table that has a size.")) + # self.draw_app.app.inform.emit( + # '[ERROR_NOTCL] %s' % _("You need to preselect a aperture in the Aperture Table that has a size.")) # try: # QtGui.QGuiApplication.restoreOverrideCursor() # except Exception: @@ -2456,7 +2456,8 @@ class EraserEditorGrb(ShapeToolEditorGrb): if str(aper) == self.draw_app.ui.apertures_table.item(row, 1).text(): self.draw_app.ui.apertures_table.selectRow(row) self.draw_app.last_aperture_selected = aper - self.draw_app.ui.apertures_table.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection) + self.draw_app.ui.apertures_table.setSelectionMode( + QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection) self.draw_app.ui.apertures_table.cellPressed.connect(self.draw_app.on_row_selected) @@ -3615,13 +3616,17 @@ class AppGerberEditor(QtCore.QObject): self.decimals, self.storage_dict[ap_code]['height'] ) ) - ap_dim_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled | QtCore.Qt.ItemFlag.ItemIsEditable) + ap_dim_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | + QtCore.Qt.ItemFlag.ItemIsEnabled | + QtCore.Qt.ItemFlag.ItemIsEditable) elif str(self.storage_dict[ap_code]['type']) == 'P': ap_dim_item = QtWidgets.QTableWidgetItem( '%.*f, %.*f' % (self.decimals, self.storage_dict[ap_code]['diam'], self.decimals, self.storage_dict[ap_code]['nVertices']) ) - ap_dim_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled | QtCore.Qt.ItemFlag.ItemIsEditable) + ap_dim_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | + QtCore.Qt.ItemFlag.ItemIsEnabled | + QtCore.Qt.ItemFlag.ItemIsEditable) else: ap_dim_item = QtWidgets.QTableWidgetItem('') ap_dim_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled) @@ -3636,9 +3641,12 @@ class AppGerberEditor(QtCore.QObject): ap_size_item = QtWidgets.QTableWidgetItem('') if str(self.storage_dict[ap_code]['type']) == 'C': - ap_size_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled | QtCore.Qt.ItemFlag.ItemIsEditable) + ap_size_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | + QtCore.Qt.ItemFlag.ItemIsEnabled | + QtCore.Qt.ItemFlag.ItemIsEditable) else: - ap_size_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled) + ap_size_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | + QtCore.Qt.ItemFlag.ItemIsEnabled) self.ui.apertures_table.setItem(self.apertures_row, 1, ap_code_item) # Aperture Code self.ui.apertures_table.setItem(self.apertures_row, 2, ap_type_item) # Aperture Type @@ -6166,7 +6174,8 @@ class AppGerberEditorUI: ) self.delaperture_btn = FCButton(_('Delete')) - # self.delaperture_btn.setSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) + # self.delaperture_btn.setSizePolicy( + # QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.delaperture_btn.setIcon(QtGui.QIcon(self.app.resource_location + '/trash32.png')) self.delaperture_btn.setToolTip( @@ -6331,7 +6340,7 @@ class AppGerberEditorUI: self.buffer_distance_entry.set_precision(self.decimals) self.buffer_distance_entry.set_range(-10000.0000, 10000.0000) - buff_grid.addWidget(FCLabel('%s:' % _("Buffer distance")), 0 ,0 ) + buff_grid.addWidget(FCLabel('%s:' % _("Buffer distance")), 0, 0) buff_grid.addWidget(self.buffer_distance_entry, 0, 1) # Buffer Corner diff --git a/appGUI/GUIElements.py b/appGUI/GUIElements.py index 67b0a635..91caed23 100644 --- a/appGUI/GUIElements.py +++ b/appGUI/GUIElements.py @@ -881,7 +881,8 @@ class FCSliderWithSpinner(QtWidgets.QFrame): self.spinner.set_step(step) self.spinner.setMinimumWidth(70) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, + QtWidgets.QSizePolicy.Policy.Preferred) self.spinner.setSizePolicy(sizePolicy) self.layout = QtWidgets.QHBoxLayout() @@ -1792,7 +1793,8 @@ class FCTextAreaExtended(FCTextEdit): self.comment() tc = self.textCursor() - if (key == Qt.Key.Key_Tab or key == Qt.Key.Key_Enter or key == Qt.Key.Key_Return) and self.completer.popup().isVisible(): + if (key == Qt.Key.Key_Tab or key == Qt.Key.Key_Enter or key == Qt.Key.Key_Return) and \ + self.completer.popup().isVisible(): self.completer.insertText.emit(self.completer.getSelected()) self.completer.setCompletionMode(QCompleter.CompletionMode.PopupCompletion) return @@ -1815,7 +1817,7 @@ class FCTextAreaExtended(FCTextEdit): tc.clearSelection() self.textCursor().insertText('}') elif key == Qt.Key.Key_BracketRight: - tc.select(QtGui.QTextCursor.SelectionTypeWordUnderCursor) + tc.select(QtGui.QTextCursor.SelectionType.WordUnderCursor) if tc.selectedText() == ']': tc.movePosition(QTextCursor.MoveOperation.Right) self.setTextCursor(tc) @@ -1823,7 +1825,7 @@ class FCTextAreaExtended(FCTextEdit): tc.clearSelection() self.textCursor().insertText(']') elif key == Qt.Key.Key_ParenRight: - tc.select(QtGui.QTextCursor.SelectionTypeWordUnderCursor) + tc.select(QtGui.QTextCursor.SelectionType.WordUnderCursor) if tc.selectedText() == ')': tc.movePosition(QTextCursor.MoveOperation.Right) self.setTextCursor(tc) @@ -1834,7 +1836,7 @@ class FCTextAreaExtended(FCTextEdit): super(FCTextAreaExtended, self).keyPressEvent(event) if self.completer_enable: - tc.select(QTextCursor.SelectionTypeWordUnderCursor) + tc.select(QTextCursor.SelectionType.WordUnderCursor) cr = self.cursorRect() if len(tc.selectedText()) > 0: @@ -2100,7 +2102,8 @@ class FCPlainTextAreaExtended(QtWidgets.QPlainTextEdit): self.comment() tc = self.textCursor() - if (key == Qt.Key.Key_Tab or key == Qt.Key.Key_Enter or key == Qt.Key.Key_Return) and self.completer.popup().isVisible(): + if (key == Qt.Key.Key_Tab or key == Qt.Key.Key_Enter or key == Qt.Key.Key_Return) and \ + self.completer.popup().isVisible(): self.completer.insertText.emit(self.completer.getSelected()) self.completer.setCompletionMode(QCompleter.CompletionMode.PopupCompletion) return @@ -2409,7 +2412,8 @@ class FCInputSpinner(QtWidgets.QDialog): self.wdg.set_step(self.step) self.wdg.set_precision(decimals) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, + QtWidgets.QSizePolicy.Policy.Preferred) self.wdg.setSizePolicy(sizePolicy) QBtn = QtWidgets.QDialogButtonBox.StandardButton.Ok | QtWidgets.QDialogButtonBox.StandardButton.Cancel @@ -2590,7 +2594,7 @@ class FCButton(QtWidgets.QPushButton): if checkable is not None: self.setCheckable(checkable) - if not click_callback is None: + if click_callback is not None: self.clicked.connect(click_callback) def get_value(self): @@ -3199,8 +3203,8 @@ class FCDetachableTab(QtWidgets.QTabWidget): :return: """ # Determine if the current movement is detected as a drag - if not self.dragStartPos.isNull() and \ - ((event.position().toPoint() - self.dragStartPos).manhattanLength() < QtWidgets.QApplication.startDragDistance()): + if not self.dragStartPos.isNull() and ( + (event.position().toPoint() - self.dragStartPos).manhattanLength() < QtWidgets.QApplication.startDragDistance()): self.dragInitiated = True # If the current movement is a drag initiated by the left button @@ -4209,7 +4213,8 @@ class _ExpandableTextEdit(FCTextEdit): """ key = event.key() - if (key == Qt.Key.Key_Tab or key == Qt.Key.Key_Return or key == Qt.Key.Key_Enter) and self.completer.popup().isVisible(): + if (key == Qt.Key.Key_Tab or key == Qt.Key.Key_Return or key == Qt.Key.Key_Enter) and \ + self.completer.popup().isVisible(): self.completer.insertText.emit(self.completer.getSelected()) self.completer.setCompletionMode(QCompleter.CompletionMode.PopupCompletion) return @@ -4486,7 +4491,7 @@ class FCTextAreaLineNumber(QtWidgets.QFrame): # boolean boolean.setForeground(brush) - keywords = ["TRUE", "True","FALSE", "False"] + keywords = ["TRUE", "True", "FALSE", "False"] for word in keywords: pattern = QtCore.QRegularExpression("\\b" + word + "\\b") rule = (pattern, boolean) @@ -4502,14 +4507,17 @@ class FCTextAreaLineNumber(QtWidgets.QFrame): # string brush = QtGui.QBrush(Qt.GlobalColor.red, Qt.BrushStyle.SolidPattern) pattern = QtCore.QRegularExpression("\".*\"") - pattern.setMinimal(True) + # pattern.setMinimal + pattern.setPatternOptions(QtCore.QRegularExpression.PatternOption.InvertedGreedinessOption) string.setForeground(brush) rule = (pattern, string) self.highlightingRules.append(rule) # singleQuotedString pattern = QtCore.QRegularExpression("\'.*\'") - pattern.setMinimal(True) + # pattern.setMinimal(True) + pattern.setPatternOptions(QtCore.QRegularExpression.PatternOption.InvertedGreedinessOption) + singleQuotedString.setForeground(brush) rule = (pattern, singleQuotedString) self.highlightingRules.append(rule) @@ -4517,7 +4525,9 @@ class FCTextAreaLineNumber(QtWidgets.QFrame): # X coordinate brush = QtGui.QBrush(Qt.GlobalColor.darkBlue, Qt.BrushStyle.SolidPattern) pattern = QtCore.QRegularExpression("X") - pattern.setMinimal(True) + # pattern.setMinimal(True) + pattern.setPatternOptions(QtCore.QRegularExpression.PatternOption.InvertedGreedinessOption) + x_chars.setFontWeight(QtGui.QFont.Weight.Bold) x_chars.setForeground(brush) rule = (pattern, x_chars) @@ -4526,7 +4536,9 @@ class FCTextAreaLineNumber(QtWidgets.QFrame): # Y coordinate brush = QtGui.QBrush(Qt.GlobalColor.darkBlue, Qt.BrushStyle.SolidPattern) pattern = QtCore.QRegularExpression("Y") - pattern.setMinimal(True) + # pattern.setMinimal(True) + pattern.setPatternOptions(QtCore.QRegularExpression.PatternOption.InvertedGreedinessOption) + y_chars.setFontWeight(QtGui.QFont.Weight.Bold) y_chars.setForeground(brush) rule = (pattern, y_chars) @@ -4545,12 +4557,20 @@ class FCTextAreaLineNumber(QtWidgets.QFrame): # go in reverse from the last element to the first for rule in self.highlightingRules[::-1]: - expression = QtCore.QRegularExpression(rule[0]) - index = expression.indexIn(text) - while index >= 0: - length = expression.matchedLength() - self.setFormat(index, length, rule[1]) - index = expression.indexIn(text, index + length) + # expression = QtCore.QRegularExpression(rule[0]) + # index = expression.indexIn(text) + # while index >= 0: + # length = expression.matchedLength() + # self.setFormat(index, length, rule[1]) + # index = expression.indexIn(text, index + length) + expression = rule[0] + index = expression.globalMatch(text) + while index.hasNext(): + match = index.next() + length = match.capturedLength(0) + start = match.capturedStart(0) + self.setFormat(start, length, rule[1]) + self.setCurrentBlockState(0) # def format_text_color(self): @@ -4618,7 +4638,7 @@ class FCTextAreaLineNumber(QtWidgets.QFrame): def __init__(self, *args, color_dict=None): QtWidgets.QFrame.__init__(self, *args) - self.setFrameStyle(QtWidgets.QFrame.StyledPanel | QtWidgets.QFrame.Shadow.Sunken) + self.setFrameStyle(QtWidgets.QFrame.Shape.StyledPanel | QtWidgets.QFrame.Shadow.Sunken) self.edit = self.PlainTextEdit(color_dict=color_dict) self.number_bar = self.NumberBar(self.edit) diff --git a/appObjects/FlatCAMCNCJob.py b/appObjects/FlatCAMCNCJob.py index 9a88712f..2f551702 100644 --- a/appObjects/FlatCAMCNCJob.py +++ b/appObjects/FlatCAMCNCJob.py @@ -617,7 +617,8 @@ class CNCJobObject(FlatCAMObj, CNCjob): self.ui.treeWidget.clear() self.add_properties_items(obj=self, treeWidget=self.ui.treeWidget) - self.ui.treeWidget.setSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, QtWidgets.QSizePolicy.Policy.MinimumExpanding) + self.ui.treeWidget.setSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, + QtWidgets.QSizePolicy.Policy.MinimumExpanding) # make sure that the FCTree widget columns are resized to content self.ui.treeWidget.resize_sig.emit() @@ -1313,7 +1314,9 @@ class CNCJobObject(FlatCAMObj, CNCjob): dia_plot = float(self.options["tools_mill_tooldia"]) except ValueError: # we may have a tuple with only one element and a comma - dia_plot = [float(el) for el in self.options["tools_mill_tooldia"].split(',') if el != ''][0] + dia_plot = [ + float(el) for el in self.options["tools_mill_tooldia"].split(',') if el != '' + ][0] self.plot2(tooldia=dia_plot, obj=self, visible=visible, kind=kind) else: @@ -1328,7 +1331,8 @@ class CNCJobObject(FlatCAMObj, CNCjob): if not gcode_parsed: continue # gcode_parsed = self.gcode_parsed - self.plot2(tooldia=dia_plot, obj=self, visible=visible, gcode_parsed=gcode_parsed, kind=kind) + self.plot2(tooldia=dia_plot, obj=self, visible=visible, gcode_parsed=gcode_parsed, + kind=kind) else: # multiple tools usage if self.tools: @@ -1338,7 +1342,8 @@ class CNCJobObject(FlatCAMObj, CNCjob): self.decimals ) gcode_parsed = self.tools[tooluid_key]['gcode_parsed'] - self.plot2(tooldia=dia_plot, obj=self, visible=visible, gcode_parsed=gcode_parsed, kind=kind) + self.plot2(tooldia=dia_plot, obj=self, visible=visible, gcode_parsed=gcode_parsed, + kind=kind) self.shapes.redraw() except (ObjectDeleted, AttributeError): diff --git a/appObjects/FlatCAMDocument.py b/appObjects/FlatCAMDocument.py index 3ce82ce7..01bcd80b 100644 --- a/appObjects/FlatCAMDocument.py +++ b/appObjects/FlatCAMDocument.py @@ -136,7 +136,7 @@ class DocumentObject(FlatCAMObj): # self.document_editor_tab.handleTextChanged() self.ser_attrs = ['options', 'kind', 'source_file'] - if Qt.mightBeRichText(self.source_file): + if QtGui.Qt.mightBeRichText(self.source_file): # self.document_editor_tab.code_editor.setHtml(self.source_file) self.document_editor_tab.load_text(self.source_file, move_to_start=True, clear_text=True, as_html=True) else: @@ -245,10 +245,10 @@ class DocumentObject(FlatCAMObj): def on_bold_button(self): if self.ui.font_bold_tb.isChecked(): - self.document_editor_tab.code_editor.setFontWeight(QtGui.QFont.Bold) + self.document_editor_tab.code_editor.setFontWeight(QtGui.QFont.Weight.Bold) self.font_bold = True else: - self.document_editor_tab.code_editor.setFontWeight(QtGui.QFont.Normal) + self.document_editor_tab.code_editor.setFontWeight(QtGui.QFont.Weight.Normal) self.font_bold = False def on_italic_button(self): diff --git a/appObjects/FlatCAMExcellon.py b/appObjects/FlatCAMExcellon.py index 812492cf..cb60b6bf 100644 --- a/appObjects/FlatCAMExcellon.py +++ b/appObjects/FlatCAMExcellon.py @@ -674,7 +674,8 @@ class ExcellonObject(FlatCAMObj, Excellon): self.ui.treeWidget.clear() self.add_properties_items(obj=self, treeWidget=self.ui.treeWidget) - self.ui.treeWidget.setSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, QtWidgets.QSizePolicy.Policy.MinimumExpanding) + self.ui.treeWidget.setSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, + QtWidgets.QSizePolicy.Policy.MinimumExpanding) # make sure that the FCTree widget columns are resized to content self.ui.treeWidget.resize_sig.emit() @@ -751,7 +752,7 @@ class ExcellonObject(FlatCAMObj, Excellon): exc_x_formatted = exc_x_formatted.partition('.') exc_y_formatted = exc_y_formatted.partition('.') - # left padd the 'whole' part with zeros + # left pad the 'whole' part with zeros x_whole = exc_x_formatted[0].rjust(whole, 0) y_whole = exc_y_formatted[0].rjust(whole, 0) @@ -824,7 +825,7 @@ class ExcellonObject(FlatCAMObj, Excellon): stop_slot_x_formatted = stop_slot_x_formatted.partition('.') stop_slot_y_formatted = stop_slot_y_formatted.partition('.') - # left padd the 'whole' part with zeros + # left pad the 'whole' part with zeros start_x_whole = start_slot_x_formatted[0].rjust(whole, 0) start_y_whole = start_slot_y_formatted[0].rjust(whole, 0) stop_x_whole = stop_slot_x_formatted[0].rjust(whole, 0) diff --git a/appObjects/FlatCAMGeometry.py b/appObjects/FlatCAMGeometry.py index 1bc1fb45..805b8d3a 100644 --- a/appObjects/FlatCAMGeometry.py +++ b/appObjects/FlatCAMGeometry.py @@ -376,8 +376,9 @@ class GeometryObject(FlatCAMObj, Geometry): # # End Build Exclusion Areas # # ----------------------------- # - # # HACK: for whatever reasons the name in Selected tab is reverted to the original one after a successful rename - # # done in the collection view but only for Geometry objects. Perhaps some references remains. Should be fixed. + # # HACK: for whatever reasons the name in Selected tab is reverted to the original one after a successful + # rename done in the collection view but only for Geometry objects. Perhaps some references remains. + # Should be fixed. # self.ui.name_entry.set_value(self.options['name']) # self.ui_connect() # @@ -680,7 +681,8 @@ class GeometryObject(FlatCAMObj, Geometry): self.ui.treeWidget.clear() self.add_properties_items(obj=self, treeWidget=self.ui.treeWidget) - self.ui.treeWidget.setSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, QtWidgets.QSizePolicy.Policy.MinimumExpanding) + self.ui.treeWidget.setSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, + QtWidgets.QSizePolicy.Policy.MinimumExpanding) # make sure that the FCTree widget columns are resized to content self.ui.treeWidget.resize_sig.emit() @@ -705,8 +707,8 @@ class GeometryObject(FlatCAMObj, Geometry): for geo in flattened_geo: if geo.geom_type == 'Polygon': vertex_points += len(list(geo.exterior.coords)) - for int in geo.interiors: - vertex_points += len(list(int.coords)) + for inter in geo.interiors: + vertex_points += len(list(inter.coords)) if geo.geom_type in ['LineString', 'LinearRing']: vertex_points += len(list(geo.coords)) @@ -2144,7 +2146,6 @@ class GeometryObject(FlatCAMObj, Geometry): :param outname: :param tools_dict: a dictionary that holds the whole data needed to create the Gcode (including the solid_geometry) - :param tools_in_use: the tools that are used, needed by some preprocessors :param segx: number of segments on the X axis, for auto-levelling :param segy: number of segments on the Y axis, for auto-levelling :param plot: if True the generated object will be plotted; if False will not be plotted diff --git a/appObjects/FlatCAMObj.py b/appObjects/FlatCAMObj.py index d74e119f..ef24a495 100644 --- a/appObjects/FlatCAMObj.py +++ b/appObjects/FlatCAMObj.py @@ -10,7 +10,7 @@ # File modified by: Marius Stanciu # # ########################################################## -import inspect # TODO: For debugging only. +# import inspect # TODO: For debugging only. from appGUI.ObjectUI import * diff --git a/appObjects/ObjectCollection.py b/appObjects/ObjectCollection.py index 834a5411..3c28f4e4 100644 --- a/appObjects/ObjectCollection.py +++ b/appObjects/ObjectCollection.py @@ -226,6 +226,7 @@ class TreeItem(KeySensitiveListView): except AttributeError: pass + class ObjectCollection(QtCore.QAbstractItemModel): """ Object storage and management.