bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- reworked the offer to save a project so it is done only if there are objects in the project but those objects are new and/or are modified since last project load (if an old project was loaded.)

Browse Source
This commit is contained in:
Marius Stanciu
2019-02-16 00:29:54 +02:00
committed by Marius S
parent e717cb8f15
commit 367d6f3155
4 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
FlatCAMGUI.py
View File

@@ -3632,28 +3632,6 @@ class ExcellonExpPrefGroupUI(OptionsGroupUI):
form.addRow(self.excellon_units_label, self.excellon_units_radio)
# Select the Excellon Format
self.format_label = QtWidgets.QLabel("<b>Format:</b>")
self.format_label.setToolTip(
"Select the kind of coordinates format used.\n"
"Coordinates can be saved with decimal point or without.\n"
"When there is no decimal point, it is required to specify\n"
"the number of digits for integer part and the number of decimals.\n"
"Also it will have to be specified if LZ = leading zeros are kept\n"
"or TZ = trailing zeros are kept."
)
self.format_radio = RadioSet([{'label': 'Decimal', 'value': 'dec'}, {'label': 'No-Decimal', 'value': 'ndec'}])
self.format_radio.setToolTip(
"Select the kind of coordinates format used.\n"
"Coordinates can be saved with decimal point or without.\n"
"When there is no decimal point, it is required to specify\n"
"the number of digits for integer part and the number of decimals.\n"
"Also it will have to be specified if LZ = leading zeros are kept\n"
"or TZ = trailing zeros are kept."
)
form.addRow(self.format_label, self.format_radio)
# Excellon non-decimal format
self.digits_label = QtWidgets.QLabel("<b>Int/Decimals:</b>")
self.digits_label.setToolTip(
@@ -3692,6 +3670,28 @@ class ExcellonExpPrefGroupUI(OptionsGroupUI):
form.addRow(self.digits_label, hlay1)
# Select the Excellon Format
self.format_label = QtWidgets.QLabel("<b>Format:</b>")
self.format_label.setToolTip(
"Select the kind of coordinates format used.\n"
"Coordinates can be saved with decimal point or without.\n"
"When there is no decimal point, it is required to specify\n"
"the number of digits for integer part and the number of decimals.\n"
"Also it will have to be specified if LZ = leading zeros are kept\n"
"or TZ = trailing zeros are kept."
)
self.format_radio = RadioSet([{'label': 'Decimal', 'value': 'dec'}, {'label': 'No-Decimal', 'value': 'ndec'}])
self.format_radio.setToolTip(
"Select the kind of coordinates format used.\n"
"Coordinates can be saved with decimal point or without.\n"
"When there is no decimal point, it is required to specify\n"
"the number of digits for integer part and the number of decimals.\n"
"Also it will have to be specified if LZ = leading zeros are kept\n"
"or TZ = trailing zeros are kept."
)
form.addRow(self.format_label, self.format_radio)
# Excellon Zeros
self.zeros_label = QtWidgets.QLabel('<b>Zeros</b>:')
self.zeros_label.setAlignment(QtCore.Qt.AlignLeft)
@@ -3720,13 +3720,9 @@ class ExcellonExpPrefGroupUI(OptionsGroupUI):
def optimization_selection(self):
if self.format_radio.get_value() == 'dec':
self.digits_label.setDisabled(True)
self.zeros_label.setDisabled(True)
self.zeros_radio.setDisabled(True)
else:
self.digits_label.setDisabled(False)
self.zeros_label.setDisabled(False)
self.zeros_radio.setDisabled(False)