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

- fixed the App Tools buttons in the Tools section of the Properties Tab for Excellon, Gerber and Geometry objects

Browse Source
This commit is contained in:
Marius Stanciu
2020-11-16 02:07:13 +02:00
committed by Marius
parent cd94814987
commit 9923188bbc
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -10,6 +10,7 @@ CHANGELOG for FlatCAM beta
16.11.2020 16.11.2020
- modified the behavior of the Tool Tab in the Notebook widget. Now the app start with the Tool Tab off. If an App Tool is launched then the Tool Tab is added and populated. If the same App Tool is launched again and the focus is in its Tool Tab then the Tool Tab is removed but if the focus is elsewhere then the focus is set again on the Tool Tab. - modified the behavior of the Tool Tab in the Notebook widget. Now the app start with the Tool Tab off. If an App Tool is launched then the Tool Tab is added and populated. If the same App Tool is launched again and the focus is in its Tool Tab then the Tool Tab is removed but if the focus is elsewhere then the focus is set again on the Tool Tab.
- fixed the App Tools buttons in the Tools section of the Properties Tab for Excellon, Gerber and Geometry objects
15.11.2020 15.11.2020

2
appObjects/FlatCAMExcellon.py
View File

@@ -632,7 +632,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
self.ui.treeWidget.resize_sig.emit() self.ui.treeWidget.resize_sig.emit()
def on_milling_button_clicked(self): def on_milling_button_clicked(self):
self.app.milling_tool.run(toggle=False) self.app.milling_tool.run(toggle=True)
self.app.milling_tool.ui.target_radio.set_value('exc') self.app.milling_tool.ui.target_radio.set_value('exc')
current_obj = self.app.collection.get_active() current_obj = self.app.collection.get_active()
self.app.milling_tool.ui.object_combo.set_value(current_obj.options['name']) self.app.milling_tool.ui.object_combo.set_value(current_obj.options['name'])

6
appObjects/FlatCAMGeometry.py
View File

@@ -655,8 +655,8 @@ class GeometryObject(FlatCAMObj, Geometry):
# Buttons Signals # Buttons Signals
self.ui.generate_cnc_button.clicked.connect(self.on_generatecnc_button_click) self.ui.generate_cnc_button.clicked.connect(self.on_generatecnc_button_click)
self.ui.paint_tool_button.clicked.connect(lambda: self.app.paint_tool.run(toggle=False)) self.ui.paint_tool_button.clicked.connect(lambda: self.app.paint_tool.run(toggle=True))
self.ui.generate_ncc_button.clicked.connect(lambda: self.app.ncclear_tool.run(toggle=False)) self.ui.generate_ncc_button.clicked.connect(lambda: self.app.ncclear_tool.run(toggle=True))
self.ui.milling_button.clicked.connect(self.on_milling_button_clicked) self.ui.milling_button.clicked.connect(self.on_milling_button_clicked)
# Postprocessor change # Postprocessor change
@@ -700,7 +700,7 @@ class GeometryObject(FlatCAMObj, Geometry):
self.ui.treeWidget.resize_sig.emit() self.ui.treeWidget.resize_sig.emit()
def on_milling_button_clicked(self): def on_milling_button_clicked(self):
self.app.milling_tool.run(toggle=False) self.app.milling_tool.run(toggle=True)
self.app.milling_tool.ui.target_radio.set_value('geo') self.app.milling_tool.ui.target_radio.set_value('geo')
current_obj = self.app.collection.get_active() current_obj = self.app.collection.get_active()
self.app.milling_tool.ui.object_combo.set_value(current_obj.options['name']) self.app.milling_tool.ui.object_combo.set_value(current_obj.options['name'])

8
appObjects/FlatCAMGerber.py
View File

@@ -153,10 +153,10 @@ class GerberObject(FlatCAMObj, Gerber):
self.calculations_finished.connect(self.update_area_chull) self.calculations_finished.connect(self.update_area_chull)
# Tools # Tools
self.ui.iso_button.clicked.connect(self.app.isolation_tool.run) self.ui.iso_button.clicked.connect(lambda: self.app.isolation_tool.run(toggle=True))
self.ui.generate_ncc_button.clicked.connect(self.app.ncclear_tool.run) self.ui.generate_ncc_button.clicked.connect(lambda: self.app.ncclear_tool.run(toggle=True))
self.ui.generate_cutout_button.clicked.connect(self.app.cutout_tool.run) self.ui.generate_cutout_button.clicked.connect(lambda: self.app.cutout_tool.run(toggle=True))
self.ui.generate_follow_button.clicked.connect(self.app.follow_tool.run) self.ui.generate_follow_button.clicked.connect(lambda: self.app.follow_tool.run(toggle=True))
# Utilties # Utilties
self.ui.generate_bb_button.clicked.connect(self.on_generatebb_button_click) self.ui.generate_bb_button.clicked.connect(self.on_generatebb_button_click)