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

- fixed bug in the Cutout Tool that did not allowed the manual cutous to be added on a Geometry created in the Tool

Browse Source 
- fixed bug that made the selection box show in the stage of adding manual gaps
- updated Cutout Tool UI
- Cutout Tool - in manual gap adding there is now an option to automatically turn on the big cursor which could help
- Cutout Tool - fixed errors when trying to add a manual gap without having a geometry object selected in the combobox
This commit is contained in:
Marius Stanciu
2020-06-18 14:26:24 +03:00
committed by Marius
parent e70c795961
commit 79fec61934
9 changed files with 717 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app_Main.py
View File

@@ -6068,6 +6068,10 @@ class App(QtCore.QObject):
self.mouse = [pos[0], pos[1]]
if self.defaults['global_selection_shape'] is False:
self.selection_type = None
return
# if the mouse is moved and the LMB is clicked then the action is a selection
if self.event_is_dragging == 1 and event.button == 1:
self.delete_selection_shape()
@@ -9104,26 +9108,26 @@ class App(QtCore.QObject):
App.log.debug(" **************** Started PROEJCT loading... **************** ")
for obj in d['objs']:
try:
def obj_init(obj_inst, app_inst):
def obj_init(obj_inst, app_inst):
try:
obj_inst.from_dict(obj)
except Exception as e:
print('App.open_project() --> ' + str(e))
return 'fail'
App.log.debug("Recreating from opened project an %s object: %s" %
(obj['kind'].capitalize(), obj['options']['name']))
App.log.debug("Recreating from opened project an %s object: %s" %
(obj['kind'].capitalize(), obj['options']['name']))
# for some reason, setting ui_title does not work when this method is called from Tcl Shell
# it's because the TclCommand is run in another thread (it inherit TclCommandSignaled)
if cli is None:
self.set_ui_title(name="{} {}: {}".format(_("Loading Project ... restoring"),
obj['kind'].upper(),
obj['options']['name']
)
)
# for some reason, setting ui_title does not work when this method is called from Tcl Shell
# it's because the TclCommand is run in another thread (it inherit TclCommandSignaled)
if cli is None:
self.set_ui_title(name="{} {}: {}".format(_("Loading Project ... restoring"),
obj['kind'].upper(),
obj['options']['name']
)
)
self.app_obj.new_object(obj['kind'], obj['options']['name'], obj_init, plot=plot)
except Exception as e:
print('App.open_project() --> ' + str(e))
self.app_obj.new_object(obj['kind'], obj['options']['name'], obj_init, plot=plot)
self.inform.emit('[success] %s: %s' % (_("Project loaded from"), filename))