diff --git a/FlatCAMObj.py b/FlatCAMObj.py index 56b78dc6..bf87962a 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -655,6 +655,9 @@ class FlatCAMGerber(FlatCAMObj, Gerber): self.ui.apertures_table.setItem(self.apertures_row, 3, ap_size_item) # Aperture Dimensions self.ui.apertures_table.setItem(self.apertures_row, 4, ap_dim_item) # Aperture Dimensions + empty_plot_item = QtWidgets.QTableWidgetItem('') + empty_plot_item.setFlags(~QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.ui.apertures_table.setItem(self.apertures_row, 5, empty_plot_item) self.ui.apertures_table.setCellWidget(self.apertures_row, 5, mark_item) self.apertures_row += 1 @@ -1957,6 +1960,9 @@ class FlatCAMExcellon(FlatCAMObj, Excellon): self.ui.tools_table.setItem(self.tool_row, 2, drill_count) # Number of drills per tool self.ui.tools_table.setItem(self.tool_row, 3, slot_count) # Number of drills per tool self.ui.tools_table.setItem(self.tool_row, 4, tool_offset_item) # Tool offset + empty_plot_item = QtWidgets.QTableWidgetItem('') + empty_plot_item.setFlags(~QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.ui.tools_table.setItem(self.tool_row, 5, empty_plot_item) self.ui.tools_table.setCellWidget(self.tool_row, 5, plot_item) self.tool_row += 1 diff --git a/README.md b/README.md index 75cecdd0..3810884b 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ CAD program, and create G-Code for Isolation routing. - fixed issue in NCC Tool when using area option - added formatting for some strings in the app strings, making the future translations easier - made changes in the Excellon Tools Table to make it more clear that the tools are selected in the # column and not in the Plot column +- in Excellon and Gerber Seleted tab made the Plot (mark) columns not selectable +- some ToolTips were modified 1.09.2019 diff --git a/flatcamGUI/ObjectUI.py b/flatcamGUI/ObjectUI.py index 18742085..d0e178ae 100644 --- a/flatcamGUI/ObjectUI.py +++ b/flatcamGUI/ObjectUI.py @@ -738,7 +738,8 @@ class ExcellonObjectUI(ObjectUI): choose_tools_label = QtWidgets.QLabel( _("Select from the Tools Table above\n" - "the tools you want to include.") + "the hole dias that are to be drilled.\n" + "Use the # column to make the selection.") ) self.tools_box.addWidget(choose_tools_label) @@ -761,7 +762,7 @@ class ExcellonObjectUI(ObjectUI): self.excellon_gcode_type_radio.setVisible(False) gcode_type_label.hide() - self.generate_cnc_button = QtWidgets.QPushButton(_('Create GCode')) + self.generate_cnc_button = QtWidgets.QPushButton(_('Create Drills GCode')) self.generate_cnc_button.setToolTip( _("Generate the CNC Job.") ) @@ -776,7 +777,8 @@ class ExcellonObjectUI(ObjectUI): self.choose_tools_label2 = QtWidgets.QLabel( _("Select from the Tools Table above\n" - " the hole dias that are to be milled.") + "the hole dias that are to be milled.\n" + "Use the # column to make the selection.") ) self.tools_box.addWidget(self.choose_tools_label2) @@ -1113,7 +1115,7 @@ class GeometryObjectUI(ObjectUI): # Tool change: - self.toolchzlabel = QtWidgets.QLabel('%s:' %_("Tool change Z")) + self.toolchzlabel = QtWidgets.QLabel('%s:' % _("Tool change Z")) self.toolchzlabel.setToolTip( _( "Z-axis position (height) for\n" @@ -1352,8 +1354,7 @@ class CNCObjectUI(ObjectUI): self.annotation_label.setToolTip( _("This selects if to display text annotation on the plot.\n" "When checked it will display numbers in order for each end\n" - "of a travel line." - ) + "of a travel line.") ) self.annotation_cb = FCCheckBox()