From 31c0cd09522eaf13a9ec1c0d0f285793150084c0 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Mon, 3 Feb 2020 00:43:38 +0200 Subject: [PATCH] - small changes in Gerber UI - in Geometry Editor make sure that after an edit is finished (correctly or forced) the QTree in the Editor UI is cleared of items --- README.md | 6 +++-- flatcamEditors/FlatCAMGeoEditor.py | 6 +++++ flatcamGUI/ObjectUI.py | 38 +++++++++++++----------------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index daf74c75..e05d72fc 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,12 @@ CAD program, and create G-Code for Isolation routing. 2.02.2020 -- fixed issue #376 where the V-Shape parameters from Gerber UI are not transfered to the resulting Geometry object if the 'combine' checkbox is not checked in the Gerber UI +- fixed issue #376 where the V-Shape parameters from Gerber UI are not transferred to the resulting Geometry object if the 'combine' checkbox is not checked in the Gerber UI - in Excellon UI, if Basic application mode is selected in Preferences, the Plot column 'P' is hidden now because some inexperienced users mistake this column checkboxes for tool selection -- fixed an error in Gerber Parser; the initial values for currnet_x, current_y were None but should have been 0.0 +- fixed an error in Gerber Parser; the initial values for current_x, current_y were None but should have been 0.0 - limited the lower limit of angle of V-tip to a value of 1 because 0 makes no sense +- small changes in Gerber UI +- in Geometry Editor make sure that after an edit is finished (correctly or forced) the QTree in the Editor UI is cleared of items 31.01.2020 diff --git a/flatcamEditors/FlatCAMGeoEditor.py b/flatcamEditors/FlatCAMGeoEditor.py index 0bd67d36..604227b1 100644 --- a/flatcamEditors/FlatCAMGeoEditor.py +++ b/flatcamEditors/FlatCAMGeoEditor.py @@ -3627,6 +3627,12 @@ class FlatCAMGeoEditor(QtCore.QObject): if self.fcgeometry: self.fcgeometry.visible = True + # clear the Tree + self.tw.clear() + parent = self.tw.invisibleRootItem() + self.geo_parent = self.tw.addParent( + parent, _('Geometry Elements'), expanded=True, color=QtGui.QColor("#000000"), font=self.geo_font) + # hide the UI self.geo_frame.hide() diff --git a/flatcamGUI/ObjectUI.py b/flatcamGUI/ObjectUI.py index 0b5b251a..67559194 100644 --- a/flatcamGUI/ObjectUI.py +++ b/flatcamGUI/ObjectUI.py @@ -160,8 +160,6 @@ class GerberObjectUI(ObjectUI): ObjectUI.__init__(self, title=_('Gerber Object'), parent=parent, decimals=decimals) self.decimals = decimals - self.custom_box.addWidget(QtWidgets.QLabel('')) - # Plot options grid0 = QtWidgets.QGridLayout() grid0.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) @@ -169,20 +167,10 @@ class GerberObjectUI(ObjectUI): grid0.setColumnStretch(0, 0) grid0.setColumnStretch(1, 1) - # Plot CB - self.plot_cb = FCCheckBox() - self.plot_cb.setToolTip( - _("Plot (show) this object.") - ) - plot_label = QtWidgets.QLabel('%s:' % _("Plot")) - - grid0.addWidget(plot_label, 0, 0) - grid0.addWidget(self.plot_cb, 0, 1) - self.plot_options_label = QtWidgets.QLabel("%s:" % _("Plot Options")) self.plot_options_label.setMinimumWidth(90) - grid0.addWidget(self.plot_options_label, 1, 0) + grid0.addWidget(self.plot_options_label, 0, 0) # Solid CB self.solid_cb = FCCheckBox(label=_('Solid')) @@ -190,7 +178,7 @@ class GerberObjectUI(ObjectUI): _("Solid color polygons.") ) self.solid_cb.setMinimumWidth(50) - grid0.addWidget(self.solid_cb, 1, 1) + grid0.addWidget(self.solid_cb, 0, 1) # Multicolored CB self.multicolored_cb = FCCheckBox(label=_('Multi-Color')) @@ -198,7 +186,14 @@ class GerberObjectUI(ObjectUI): _("Draw polygons in different colors.") ) self.multicolored_cb.setMinimumWidth(55) - grid0.addWidget(self.multicolored_cb, 1, 2) + grid0.addWidget(self.multicolored_cb, 0, 2) + + # Plot CB + self.plot_cb = FCCheckBox('%s' % _("Plot")) + # self.plot_cb.setLayoutDirection(QtCore.Qt.RightToLeft) + self.plot_cb.setToolTip(_("Plot (show) this object.")) + + grid0.addWidget(self.plot_cb, 1, 0, 1, 2) # ## Object name self.name_hlay = QtWidgets.QHBoxLayout() @@ -526,7 +521,7 @@ class GerberObjectUI(ObjectUI): "Clicking this will create the buffered geometry\n" "required for isolation.") ) - grid1.addWidget(self.create_buffer_button, 13, 0, 1, 2) + grid1.addWidget(self.create_buffer_button, 13, 0, 1, 3) self.ohis_iso = OptionalHideInputSection( self.except_cb, @@ -534,7 +529,11 @@ class GerberObjectUI(ObjectUI): logic=True ) - grid1.addWidget(QtWidgets.QLabel(''), 14, 0) + separator_line2 = QtWidgets.QFrame() + separator_line2.setFrameShape(QtWidgets.QFrame.HLine) + separator_line2.setFrameShadow(QtWidgets.QFrame.Sunken) + grid1.addWidget(separator_line2, 14, 0, 1, 3) + # grid1.addWidget(QtWidgets.QLabel(''), 15, 0) # ########################################### # ########## NEW GRID ####################### @@ -681,11 +680,6 @@ class GerberObjectUI(ObjectUI): grid2.addWidget(self.bbrounded_cb, 10, 0) grid2.addWidget(self.generate_bb_button, 10, 1) - separator_line2 = QtWidgets.QFrame() - separator_line2.setFrameShape(QtWidgets.QFrame.HLine) - separator_line2.setFrameShadow(QtWidgets.QFrame.Sunken) - grid2.addWidget(separator_line2, 11, 0, 1, 2) - class ExcellonObjectUI(ObjectUI): """