- Geometry Editor: modified the intersection (if the selected shapes don't intersects preserve them) and substract functions (delete all shapes that were used in the process)

- work in the ToolSilk
This commit is contained in:
Marius Stanciu 2019-04-25 16:47:17 +03:00 committed by Marius
parent c2334bd747
commit ddc2f2d873
3 changed files with 17 additions and 11 deletions

View File

@ -181,6 +181,7 @@ class FlatCAMObj(QtCore.QObject):
old_name = copy(self.options["name"])
new_name = self.ui.name_entry.get_value()
if new_name != old_name:
# update the SHELL auto-completer model data
try:
self.app.myKeywords.remove(old_name)

View File

@ -13,6 +13,7 @@ CAD program, and create G-Code for Isolation routing.
- Geometry Editor: modified the intersection (if the selected shapes don't intersects preserve them) and substract functions (delete all shapes that were used in the process)
- work in the ToolSilk
- for all objects, if in Selected the object name is changed to the same name, the rename is not done (because there is nothing changed)
24.04.2019

View File

@ -209,9 +209,13 @@ class ToolSilk(FlatCAMTool):
while True:
# removal from list is done in a multithreaded way therefore not always the removal can be done
# so we keep trying until it's done
if apid in self.promises:
self.promises.remove(apid)
else:
break
time.sleep(0.1)
except:
log.debug("Promise fulfilled: %s" % str(apid))
pass
def periodic_check(self, check_period, reset=False):