diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fdbe3b4..6709bb9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@ CHANGELOG for FlatCAM beta
- Calculator Tool - Electroplating Calculator - changing the area will update the current value
- GUI Elements FCDoubleSpinner and FCSpinner: modified the context menu to not allow cut/paste/delete/step_up/step_down when the GUI element is set as Read Only
- GUI Element FCLineEdit (and the inheritors) has now disabled cut/paste/delete context menu entries too
+- Cleaned the GUI in Excellon Preferences of parameters no longer used (transferred to Drilling Tool)
+- Removed warning message boxes from export DXF/SVG handlers of the menu entries in the File menu and upgraded the status bar message to error
20.11.2020
diff --git a/appGUI/preferences/PreferencesUIManager.py b/appGUI/preferences/PreferencesUIManager.py
index 563b619f..54b38371 100644
--- a/appGUI/preferences/PreferencesUIManager.py
+++ b/appGUI/preferences/PreferencesUIManager.py
@@ -192,9 +192,7 @@ class PreferencesUIManager:
"excellon_plot_line": self.ui.excellon_defaults_form.excellon_gen_group.line_color_entry,
# Excellon Options
- "excellon_milling_dia": self.ui.excellon_defaults_form.excellon_opt_group.mill_dia_entry,
-
- "excellon_tooldia": self.ui.excellon_defaults_form.excellon_opt_group.tooldia_entry,
+ "excellon_drill_tooldia": self.ui.excellon_defaults_form.excellon_opt_group.tooldia_entry,
"excellon_slot_tooldia": self.ui.excellon_defaults_form.excellon_opt_group.slot_tooldia_entry,
# Excellon Advanced Options
diff --git a/appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py b/appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py
index 68ab9907..aee8d03e 100644
--- a/appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py
@@ -29,7 +29,7 @@ class ExcellonOptPrefGroupUI(OptionsGroupUI):
self.decimals = decimals
# ## Create CNC Job
- self.cncjob_label = FCLabel('%s' % _('Create CNCJob'))
+ self.cncjob_label = FCLabel('%s' % _('Parameters'))
self.cncjob_label.setToolTip(
_("Parameters used to create a CNC Job object\n"
"for this drill object.")
@@ -41,53 +41,6 @@ class ExcellonOptPrefGroupUI(OptionsGroupUI):
grid2.setColumnStretch(0, 0)
grid2.setColumnStretch(1, 1)
- # Operation Type
- self.operation_label = FCLabel('%s:' % _('Operation'))
- self.operation_label.setToolTip(
- _("Operation type:\n"
- "- Drilling -> will drill the drills/slots associated with this tool\n"
- "- Milling -> will mill the drills/slots")
- )
- self.operation_radio = RadioSet(
- [
- {'label': _('Drilling'), 'value': 'drill'},
- {'label': _("Milling"), 'value': 'mill'}
- ]
- )
-
- grid2.addWidget(self.operation_label, 0, 0)
- grid2.addWidget(self.operation_radio, 0, 1)
-
- self.mill_type_label = FCLabel('%s:' % _('Milling Type'))
- self.mill_type_label.setToolTip(
- _("Milling type:\n"
- "- Drills -> will mill the drills associated with this tool\n"
- "- Slots -> will mill the slots associated with this tool\n"
- "- Both -> will mill both drills and mills or whatever is available")
- )
- self.milling_type_radio = RadioSet(
- [
- {'label': _('Drills'), 'value': 'drills'},
- {'label': _("Slots"), 'value': 'slots'},
- {'label': _("Both"), 'value': 'both'},
- ]
- )
-
- grid2.addWidget(self.mill_type_label, 1, 0)
- grid2.addWidget(self.milling_type_radio, 1, 1)
-
- self.mill_dia_label = FCLabel('%s:' % _('Milling Diameter'))
- self.mill_dia_label.setToolTip(
- _("The diameter of the tool who will do the milling")
- )
-
- self.mill_dia_entry = FCDoubleSpinner()
- self.mill_dia_entry.set_precision(self.decimals)
- self.mill_dia_entry.set_range(0.0000, 10000.0000)
-
- grid2.addWidget(self.mill_dia_label, 2, 0)
- grid2.addWidget(self.mill_dia_entry, 2, 1)
-
# ### Milling Holes ## ##
self.mill_hole_label = FCLabel('%s' % _('Mill Holes'))
self.mill_hole_label.setToolTip(
@@ -97,7 +50,8 @@ class ExcellonOptPrefGroupUI(OptionsGroupUI):
tdlabel = FCLabel('%s:' % _('Drill Tool dia'))
tdlabel.setToolTip(
- _("Diameter of the cutting tool.")
+ _("Diameter of the cutting tool\n"
+ "when milling drill holes.")
)
self.tooldia_entry = FCDoubleSpinner()
self.tooldia_entry.set_precision(self.decimals)
@@ -109,7 +63,7 @@ class ExcellonOptPrefGroupUI(OptionsGroupUI):
stdlabel = FCLabel('%s:' % _('Slot Tool dia'))
stdlabel.setToolTip(
_("Diameter of the cutting tool\n"
- "when milling slots.")
+ "when milling slot holes.")
)
self.slot_tooldia_entry = FCDoubleSpinner()
self.slot_tooldia_entry.set_precision(self.decimals)
diff --git a/appObjects/FlatCAMExcellon.py b/appObjects/FlatCAMExcellon.py
index b261626b..56ce16ac 100644
--- a/appObjects/FlatCAMExcellon.py
+++ b/appObjects/FlatCAMExcellon.py
@@ -53,8 +53,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
"multicolored": False,
"merge_fuse_tools": True,
- "tooldia": 0.1,
- "milling_dia": 0.04,
+ "drill_tooldia": 0.1,
"slot_tooldia": 0.1,
"format_upper_in": 2,
@@ -140,7 +139,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
"multicolored": self.ui.multicolored_cb,
"autoload_db": self.ui.autoload_db_cb,
- "tooldia": self.ui.tooldia_entry,
+ "drill_tooldia": self.ui.tooldia_entry,
"slot_tooldia": self.ui.slot_tooldia_entry,
})
diff --git a/app_Main.py b/app_Main.py
index 3f0963bd..3d85b8ef 100644
--- a/app_Main.py
+++ b/app_Main.py
@@ -4411,7 +4411,7 @@ class App(QtCore.QObject):
"gerber_editor_newdim", "gerber_editor_ma_low", "gerber_editor_ma_high",
# Excellon Object
- "excellon_milling_dia", 'excellon_tooldia', 'excellon_slot_tooldia',
+ 'excellon_drill_tooldia', 'excellon_slot_tooldia',
# Excellon Editor
"excellon_editor_newdia", "excellon_editor_lin_pitch", "excellon_editor_slot_lin_pitch",
@@ -8573,15 +8573,8 @@ class MenuFileHandlers(QtCore.QObject):
obj = self.app.collection.get_active()
if obj is None:
- self.inform.emit('[WARNING_NOTCL] %s' % _("No object is selected."))
- msg = _("Please Select a Geometry object to export")
- msgbox = QtWidgets.QMessageBox()
- msgbox.setIcon(QtWidgets.QMessageBox.Warning)
-
- msgbox.setInformativeText(msg)
- bt_ok = msgbox.addButton(_('Ok'), QtWidgets.QMessageBox.AcceptRole)
- msgbox.setDefaultButton(bt_ok)
- msgbox.exec_()
+ self.inform.emit('[ERROR_NOTCL] %s' % _("No object is selected."))
+ msg = _("No object is selected")
return
# Check for more compatible types and add as required
@@ -8675,7 +8668,7 @@ class MenuFileHandlers(QtCore.QObject):
obj = self.app.collection.get_active()
if obj is None:
- self.inform.emit('[WARNING_NOTCL] %s' % _("No object is selected."))
+ self.inform.emit('[ERROR_NOTCL] %s' % _("No object is selected."))
return
# Check for more compatible types and add as required
@@ -8717,7 +8710,7 @@ class MenuFileHandlers(QtCore.QObject):
obj = self.app.collection.get_active()
if obj is None:
- self.inform.emit('[WARNING_NOTCL] %s' % _("No object is selected."))
+ self.inform.emit('[ERROR_NOTCL] %s' % _("No object is selected."))
return
# Check for more compatible types and add as required
@@ -8759,7 +8752,7 @@ class MenuFileHandlers(QtCore.QObject):
obj = self.app.collection.get_active()
if obj is None:
- self.inform.emit('[WARNING_NOTCL] %s' % _("No object is selected."))
+ self.inform.emit('[ERROR_NOTCL] %s' % _("No object is selected."))
return
# Check for more compatible types and add as required
@@ -8801,7 +8794,7 @@ class MenuFileHandlers(QtCore.QObject):
obj = self.app.collection.get_active()
if obj is None:
- self.inform.emit('[WARNING_NOTCL] %s' % _("No object is selected."))
+ self.inform.emit('[ERROR_NOTCL] %s' % _("No object is selected."))
return
# Check for more compatible types and add as required
@@ -8842,7 +8835,7 @@ class MenuFileHandlers(QtCore.QObject):
obj = self.app.collection.get_active()
if obj is None:
- self.inform.emit('[WARNING_NOTCL] %s' % _("No object is selected."))
+ self.inform.emit('[ERROR_NOTCL] %s' % _("No object is selected."))
return
# Check for more compatible types and add as required
@@ -8887,7 +8880,7 @@ class MenuFileHandlers(QtCore.QObject):
obj = self.app.collection.get_active()
if obj is None:
- self.inform.emit('[WARNING_NOTCL] %s' % _("No object is selected."))
+ self.inform.emit('[ERROR_NOTCL] %s' % _("No object is selected."))
return
# Check for more compatible types and add as required
@@ -8932,15 +8925,7 @@ class MenuFileHandlers(QtCore.QObject):
obj = self.app.collection.get_active()
if obj is None:
- self.inform.emit('[WARNING_NOTCL] %s' % _("No object is selected."))
- msg = _("Please Select a Geometry object to export")
- msgbox = QtWidgets.QMessageBox()
- msgbox.setIcon(QtWidgets.QMessageBox.Warning)
-
- msgbox.setInformativeText(msg)
- bt_ok = msgbox.addButton(_('Ok'), QtWidgets.QMessageBox.AcceptRole)
- msgbox.setDefaultButton(bt_ok)
- msgbox.exec_()
+ self.inform.emit('[ERROR_NOTCL] %s' % _("No object is selected."))
return
# Check for more compatible types and add as required
diff --git a/defaults.py b/defaults.py
index 0e8a39bd..0ac569a0 100644
--- a/defaults.py
+++ b/defaults.py
@@ -256,9 +256,7 @@ class FlatCAMDefaults:
"excellon_plot_line": '#750000BF',
# Excellon Options
- "excellon_milling_dia": 0.8,
-
- "excellon_tooldia": 0.8,
+ "excellon_drill_tooldia": 0.8,
"excellon_slot_tooldia": 1.8,
# Excellon Advanced options