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

- minor UI changes for Gerber UI

Browse Source 
- ~~after an object move, the apertures plotted shapes are deleted from canvas and the 'mark all' button is deselected~~
- after move tool action or any other transform (rotate, skew, scale, mirror, offset), the plotted apertures are kept plotted.
- changing units now will convert all the default values from one unit type to another
- prettified the selection shape and the moving shape
- initial work in object hovering shape
This commit is contained in:
Marius Stanciu
2019-03-04 03:47:19 +02:00
parent d79d6cf2bc
commit 06fb48eb6a
16 changed files with 373 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
FlatCAMEditor.py
View File

@@ -346,7 +346,7 @@ class TextInputTool(FlatCAMTool):
font_name=self.font_name,
font_size=font_to_geo_size,
font_type=font_to_geo_type,
units=self.app.ui.general_options_form.general_app_group.units_radio.get_value().upper())
units=self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().upper())
def font_family(self, font):
self.text_input_entry.selectAll()
@@ -1483,7 +1483,7 @@ class TransformEditorTool(FlatCAMTool):
"[WARNING_NOTCL] Geometry shape rotate cancelled...")
def on_offx_key(self):
units = self.app.ui.general_options_form.general_app_group.units_radio.get_value().lower()
units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().lower()
val_box = FCInputDialog(title="Offset on X axis ...",
text=('Enter a distance Value (%s):' % str(units)),
@@ -1502,7 +1502,7 @@ class TransformEditorTool(FlatCAMTool):
"[WARNING_NOTCL] Geometry shape offset X cancelled...")
def on_offy_key(self):
units = self.app.ui.general_options_form.general_app_group.units_radio.get_value().lower()
units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().lower()
val_box = FCInputDialog(title="Offset on Y axis ...",
text=('Enter a distance Value (%s):' % str(units)),
@@ -4985,7 +4985,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.move_timer.setSingleShot(True)
## Current application units in Upper Case
self.units = self.app.ui.general_options_form.general_app_group.units_radio.get_value().upper()
self.units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().upper()
self.key = None # Currently pressed key
self.modifiers = None
@@ -5059,7 +5059,7 @@ class FlatCAMExcEditor(QtCore.QObject):
def set_ui(self):
# updated units
self.units = self.app.ui.general_options_form.general_app_group.units_radio.get_value().upper()
self.units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().upper()
self.olddia_newdia.clear()
self.tool2tooldia.clear()
@@ -5099,7 +5099,7 @@ class FlatCAMExcEditor(QtCore.QObject):
pass
# updated units
self.units = self.app.ui.general_options_form.general_app_group.units_radio.get_value().upper()
self.units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().upper()
# make a new name for the new Excellon object (the one with edited content)
self.edited_obj_name = self.exc_obj.options['name']