Started solution to #145.
This commit is contained in:
parent
6fa0e91875
commit
0077aaea14
|
@ -2003,7 +2003,7 @@ class App(QtCore.QObject):
|
||||||
geo_obj.solid_geometry = cascaded_union([LineString(segment) for segment in cuts])
|
geo_obj.solid_geometry = cascaded_union([LineString(segment) for segment in cuts])
|
||||||
|
|
||||||
try:
|
try:
|
||||||
obj.app.new_object("geometry", name+ "_cutout", geo_init_me)
|
obj.app.new_object("geometry", name + "_cutout", geo_init_me)
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
return "Operation failed: %s" % str(e)
|
return "Operation failed: %s" % str(e)
|
||||||
|
|
||||||
|
@ -2164,6 +2164,14 @@ class App(QtCore.QObject):
|
||||||
return 'Ok'
|
return 'Ok'
|
||||||
|
|
||||||
def write_gcode(obj_name, filename, preamble='', postamble=''):
|
def write_gcode(obj_name, filename, preamble='', postamble=''):
|
||||||
|
if self.collection.has_promises():
|
||||||
|
self.log.debug("Collection has promises. write_gcode() queued.")
|
||||||
|
self.worker_task.emit({
|
||||||
|
'fcn': write_gcode,
|
||||||
|
'params': [obj_name, filename, preamble, postamble]
|
||||||
|
})
|
||||||
|
return
|
||||||
|
|
||||||
try:
|
try:
|
||||||
obj = self.collection.get_by_name(str(obj_name))
|
obj = self.collection.get_by_name(str(obj_name))
|
||||||
except:
|
except:
|
||||||
|
|
|
@ -441,7 +441,7 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
|
||||||
base_name = self.options["name"] + "_iso"
|
base_name = self.options["name"] + "_iso"
|
||||||
base_name = outname or base_name
|
base_name = outname or base_name
|
||||||
|
|
||||||
def generate_envelope (offset, invert):
|
def generate_envelope(offset, invert):
|
||||||
# isolation_geometry produces an envelope that is going on the left of the geometry
|
# isolation_geometry produces an envelope that is going on the left of the geometry
|
||||||
# (the copper features). To leave the least amount of burrs on the features
|
# (the copper features). To leave the least amount of burrs on the features
|
||||||
# the tool needs to travel on the right side of the features (this is called conventional milling)
|
# the tool needs to travel on the right side of the features (this is called conventional milling)
|
||||||
|
@ -453,15 +453,15 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
|
||||||
if type(geom) is MultiPolygon:
|
if type(geom) is MultiPolygon:
|
||||||
pl = []
|
pl = []
|
||||||
for p in geom:
|
for p in geom:
|
||||||
pl.append(Polygon (p.exterior.coords[::-1], p.interiors))
|
pl.append(Polygon(p.exterior.coords[::-1], p.interiors))
|
||||||
geom = MultiPolygon(pl)
|
geom = MultiPolygon(pl)
|
||||||
elif type(geom) is Polygon:
|
elif type(geom) is Polygon:
|
||||||
geom = Polygon (geom.exterior.coords[::-1], geom.interiors);
|
geom = Polygon(geom.exterior.coords[::-1], geom.interiors)
|
||||||
else:
|
else:
|
||||||
raise "Unexpected Geometry"
|
raise "Unexpected Geometry"
|
||||||
return geom
|
return geom
|
||||||
|
|
||||||
if (combine):
|
if combine:
|
||||||
iso_name = base_name
|
iso_name = base_name
|
||||||
|
|
||||||
# TODO: This is ugly. Create way to pass data into init function.
|
# TODO: This is ugly. Create way to pass data into init function.
|
||||||
|
@ -718,6 +718,9 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
|
||||||
app_obj.new_object("geometry", geo_name, geo_init)
|
app_obj.new_object("geometry", geo_name, geo_init)
|
||||||
app_obj.progress.emit(100)
|
app_obj.progress.emit(100)
|
||||||
|
|
||||||
|
# Create a promise with the new name
|
||||||
|
self.app.collection.promise(geo_name)
|
||||||
|
|
||||||
# Send to worker
|
# Send to worker
|
||||||
self.app.worker_task.emit({'fcn': geo_thread, 'params': [self.app]})
|
self.app.worker_task.emit({'fcn': geo_thread, 'params': [self.app]})
|
||||||
|
|
||||||
|
@ -765,6 +768,9 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
|
||||||
app_obj.new_object("cncjob", job_name, job_init)
|
app_obj.new_object("cncjob", job_name, job_init)
|
||||||
app_obj.progress.emit(100)
|
app_obj.progress.emit(100)
|
||||||
|
|
||||||
|
# Create promise for the new name.
|
||||||
|
self.app.collection.promise(job_name)
|
||||||
|
|
||||||
# Send to worker
|
# Send to worker
|
||||||
# self.app.worker.add_task(job_thread, [self.app])
|
# self.app.worker.add_task(job_thread, [self.app])
|
||||||
self.app.worker_task.emit({'fcn': job_thread, 'params': [self.app]})
|
self.app.worker_task.emit({'fcn': job_thread, 'params': [self.app]})
|
||||||
|
@ -1048,16 +1054,20 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
|
||||||
|
|
||||||
proc = self.app.proc_container.new("Painting polygon.")
|
proc = self.app.proc_container.new("Painting polygon.")
|
||||||
|
|
||||||
|
name = self.options["name"] + "_paint"
|
||||||
|
|
||||||
# Initializes the new geometry object
|
# Initializes the new geometry object
|
||||||
def gen_paintarea(geo_obj, app_obj):
|
def gen_paintarea(geo_obj, app_obj):
|
||||||
assert isinstance(geo_obj, FlatCAMGeometry)
|
assert isinstance(geo_obj, FlatCAMGeometry)
|
||||||
#assert isinstance(app_obj, App)
|
#assert isinstance(app_obj, App)
|
||||||
|
|
||||||
if self.options["paintmethod"] == "seed":
|
if self.options["paintmethod"] == "seed":
|
||||||
cp = self.clear_polygon2(poly.buffer(-self.options["paintmargin"]), tooldia, overlap=overlap)
|
cp = self.clear_polygon2(poly.buffer(-self.options["paintmargin"]),
|
||||||
|
tooldia, overlap=overlap)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
cp = self.clear_polygon(poly.buffer(-self.options["paintmargin"]), tooldia, overlap=overlap)
|
cp = self.clear_polygon(poly.buffer(-self.options["paintmargin"]),
|
||||||
|
tooldia, overlap=overlap)
|
||||||
|
|
||||||
geo_obj.solid_geometry = list(cp.get_objects())
|
geo_obj.solid_geometry = list(cp.get_objects())
|
||||||
geo_obj.options["cnctooldia"] = tooldia
|
geo_obj.options["cnctooldia"] = tooldia
|
||||||
|
@ -1065,7 +1075,6 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
|
||||||
|
|
||||||
def job_thread(app_obj):
|
def job_thread(app_obj):
|
||||||
try:
|
try:
|
||||||
name = self.options["name"] + "_paint"
|
|
||||||
app_obj.new_object("geometry", name, gen_paintarea)
|
app_obj.new_object("geometry", name, gen_paintarea)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
proc.done()
|
proc.done()
|
||||||
|
@ -1073,6 +1082,11 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
|
||||||
proc.done()
|
proc.done()
|
||||||
|
|
||||||
self.app.inform.emit("Polygon Paint started ...")
|
self.app.inform.emit("Polygon Paint started ...")
|
||||||
|
|
||||||
|
# Promise object with the new name
|
||||||
|
self.app.collection.promise(name)
|
||||||
|
|
||||||
|
# Background
|
||||||
self.app.worker_task.emit({'fcn': job_thread, 'params': [self.app]})
|
self.app.worker_task.emit({'fcn': job_thread, 'params': [self.app]})
|
||||||
|
|
||||||
def on_generatecnc_button_click(self, *args):
|
def on_generatecnc_button_click(self, *args):
|
||||||
|
@ -1082,6 +1096,17 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
|
||||||
|
|
||||||
def generatecncjob(self, z_cut=None, z_move=None,
|
def generatecncjob(self, z_cut=None, z_move=None,
|
||||||
feedrate=None, tooldia=None, outname=None, spindlespeed=None):
|
feedrate=None, tooldia=None, outname=None, spindlespeed=None):
|
||||||
|
"""
|
||||||
|
Creates a CNCJob out of this Geometry object.
|
||||||
|
|
||||||
|
:param z_cut: Cut depth (negative)
|
||||||
|
:param z_move: Hight of the tool when travelling (not cutting)
|
||||||
|
:param feedrate: Feed rate while cutting
|
||||||
|
:param tooldia: Tool diameter
|
||||||
|
:param outname: Name of the new object
|
||||||
|
:param spindlespeed: Spindle speed (RPM)
|
||||||
|
:return: None
|
||||||
|
"""
|
||||||
|
|
||||||
outname = outname if outname is not None else self.options["name"] + "_cnc"
|
outname = outname if outname is not None else self.options["name"] + "_cnc"
|
||||||
z_cut = z_cut if z_cut is not None else self.options["cutz"]
|
z_cut = z_cut if z_cut is not None else self.options["cutz"]
|
||||||
|
@ -1090,9 +1115,11 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
|
||||||
tooldia = tooldia if tooldia is not None else self.options["cnctooldia"]
|
tooldia = tooldia if tooldia is not None else self.options["cnctooldia"]
|
||||||
|
|
||||||
# To allow default value to be "" (optional in gui) and translate to None
|
# To allow default value to be "" (optional in gui) and translate to None
|
||||||
if(not isinstance(spindlespeed, int)):
|
if not isinstance(spindlespeed, int):
|
||||||
spindlespeed = self.options["spindlespeed"] if isinstance(self.options["spindlespeed"], int) else None
|
if isinstance(self.options["spindlespeed"], int):
|
||||||
|
spindlespeed = self.options["spindlespeed"]
|
||||||
|
else:
|
||||||
|
spindlespeed = None
|
||||||
|
|
||||||
# Object initialization function for app.new_object()
|
# Object initialization function for app.new_object()
|
||||||
# RUNNING ON SEPARATE THREAD!
|
# RUNNING ON SEPARATE THREAD!
|
||||||
|
@ -1122,6 +1149,9 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
|
||||||
app_obj.inform.emit("CNCjob created: %s" % outname)
|
app_obj.inform.emit("CNCjob created: %s" % outname)
|
||||||
app_obj.progress.emit(100)
|
app_obj.progress.emit(100)
|
||||||
|
|
||||||
|
# Create a promise with the name
|
||||||
|
self.app.collection.promise(outname)
|
||||||
|
|
||||||
# Send to worker
|
# Send to worker
|
||||||
self.app.worker_task.emit({'fcn': job_thread, 'params': [self.app]})
|
self.app.worker_task.emit({'fcn': job_thread, 'params': [self.app]})
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,10 @@ from PyQt4 import Qt, QtGui, QtCore
|
||||||
|
|
||||||
|
|
||||||
class KeySensitiveListView(QtGui.QListView):
|
class KeySensitiveListView(QtGui.QListView):
|
||||||
|
"""
|
||||||
|
QtGui.QListView extended to emit a signal on key press.
|
||||||
|
"""
|
||||||
|
|
||||||
keyPressed = QtCore.pyqtSignal(int)
|
keyPressed = QtCore.pyqtSignal(int)
|
||||||
|
|
||||||
def keyPressEvent(self, event):
|
def keyPressEvent(self, event):
|
||||||
|
@ -43,6 +47,13 @@ class ObjectCollection(QtCore.QAbstractListModel):
|
||||||
self.object_list = []
|
self.object_list = []
|
||||||
self.checked_indexes = []
|
self.checked_indexes = []
|
||||||
|
|
||||||
|
# Names of objects that are expected to become available.
|
||||||
|
# For example, when the creation of a new object will run
|
||||||
|
# in the background and will complete some time in the
|
||||||
|
# future. This is a way to reserve the name and to let other
|
||||||
|
# tasks know that they have to wait until available.
|
||||||
|
self.promises = set()
|
||||||
|
|
||||||
### View
|
### View
|
||||||
#self.view = QtGui.QListView()
|
#self.view = QtGui.QListView()
|
||||||
self.view = KeySensitiveListView()
|
self.view = KeySensitiveListView()
|
||||||
|
@ -57,6 +68,13 @@ class ObjectCollection(QtCore.QAbstractListModel):
|
||||||
self.view.keyPressed.connect(self.on_key)
|
self.view.keyPressed.connect(self.on_key)
|
||||||
self.view.clicked.connect(self.on_mouse_down)
|
self.view.clicked.connect(self.on_mouse_down)
|
||||||
|
|
||||||
|
def promise(self, obj_name):
|
||||||
|
FlatCAMApp.App.log.debug("Object %s has been promised." % obj_name)
|
||||||
|
self.promises.add(obj_name)
|
||||||
|
|
||||||
|
def has_promises(self):
|
||||||
|
return len(self.promises) > 0
|
||||||
|
|
||||||
def on_key(self, key):
|
def on_key(self, key):
|
||||||
|
|
||||||
# Delete
|
# Delete
|
||||||
|
@ -95,8 +113,14 @@ class ObjectCollection(QtCore.QAbstractListModel):
|
||||||
def append(self, obj, active=False):
|
def append(self, obj, active=False):
|
||||||
FlatCAMApp.App.log.debug(str(inspect.stack()[1][3]) + " --> OC.append()")
|
FlatCAMApp.App.log.debug(str(inspect.stack()[1][3]) + " --> OC.append()")
|
||||||
|
|
||||||
# Prevent same name
|
|
||||||
name = obj.options["name"]
|
name = obj.options["name"]
|
||||||
|
|
||||||
|
# Check promises and clear if exists
|
||||||
|
if name in self.promises:
|
||||||
|
self.promises.remove(name)
|
||||||
|
FlatCAMApp.App.log.debug("Promised object %s became available." % name)
|
||||||
|
|
||||||
|
# Prevent same name
|
||||||
while name in self.get_names():
|
while name in self.get_names():
|
||||||
## Create a new name
|
## Create a new name
|
||||||
# Ends with number?
|
# Ends with number?
|
||||||
|
|
Loading…
Reference in New Issue