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

Added scaling support, unit checking and changing API, fixed re-plotting problems, added documentation.

Browse Source
This commit is contained in:
Juan Pablo Caram
2014-01-26 22:58:18 -05:00
parent 80cb2a8de3
commit 1ce8f672af
95 changed files with 9598 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
cirkuix.py
View File

@@ -54,14 +54,14 @@ class CirkuixObj:
print "Clearing Axes"
self.axes.cla()
self.axes.set_frame_on(False)
self.axes.set_xticks([])
self.axes.set_yticks([])
# Remove all decoration. The app's axes will have
# the ticks and grid.
self.axes.set_frame_on(False) # No frame
self.axes.set_xticks([]) # No tick
self.axes.set_yticks([]) # No ticks
self.axes.patch.set_visible(False) # No background
self.axes.set_aspect(1)
#return self.axes
def set_options(self, options):
for name in options:
self.options[name] = options[name]
@@ -183,7 +183,7 @@ class CirkuixGerber(CirkuixObj, Gerber):
self.kind = "gerber"
# The 'name' is already in self.options
# The 'name' is already in self.options from CirkuixObj
self.options.update({
"plot": True,
"mergepolys": True,
@@ -198,7 +198,7 @@ class CirkuixGerber(CirkuixObj, Gerber):
"bboxrounded": False
})
# The 'name' is already in self.form_kinds
# The 'name' is already in self.form_kinds from CirkuixObj
self.form_kinds.update({
"plot": "cb",
"mergepolys": "cb",
@@ -216,20 +216,27 @@ class CirkuixGerber(CirkuixObj, Gerber):
self.radios = {"gaps": {"rb_2tb": "tb", "rb_2lr": "lr", "rb_4": "4"}}
self.radios_inv = {"gaps": {"tb": "rb_2tb", "lr": "rb_2lr", "4": "rb_4"}}
def convert_units(self, units):
factor = Gerber.convert_units(self, units)
self.options['isotooldia'] *= factor
self.options['cutoutmargin'] *= factor
self.options['cutoutgapsize'] *= factor
self.options['noncoppermargin'] *= factor
self.options['bboxmargin'] *= factor
def plot(self, figure):
CirkuixObj.plot(self, figure)
self.create_geometry()
geometry = None # TODO: Test if needed
if self.options["mergepolys"]:
geometry = self.solid_geometry
else:
geometry = self.buffered_paths + \
[poly['polygon'] for poly in self.regions] + \
self.flash_geometry
[poly['polygon'] for poly in self.regions] + \
self.flash_geometry
linespec = None # TODO: Test if needed
if self.options["multicolored"]:
linespec = '-'
else:
@@ -242,6 +249,8 @@ class CirkuixGerber(CirkuixObj, Gerber):
x, y = ints.coords.xy
self.axes.plot(x, y, linespec)
self.app.canvas.queue_draw()
def serialize(self):
return {
"options": self.options,
@@ -282,8 +291,16 @@ class CirkuixExcellon(CirkuixObj, Excellon):
self.tool_cbs = {}
def convert_units(self, units):
factor = Excellon.convert_units(self, units)
self.options['drillz'] *= factor
self.options['travelz'] *= factor
self.options['feedrate'] *= factor
def plot(self, figure):
self.setup_axes(figure)
CirkuixObj.plot(self, figure)
#self.setup_axes(figure)
self.create_geometry()
# Plot excellon
@@ -294,6 +311,9 @@ class CirkuixExcellon(CirkuixObj, Excellon):
x, y = ints.coords.xy
self.axes.plot(x, y, 'g-')
self.app.on_zoom_fit(None)
self.app.canvas.queue_draw()
def show_tool_chooser(self):
win = Gtk.Window()
box = Gtk.Box(spacing=2)
@@ -318,6 +338,10 @@ class CirkuixExcellon(CirkuixObj, Excellon):
button.connect("activate", on_accept)
button.connect("clicked", on_accept)
# def parse_lines(self, elines):
# Excellon.parse_lines(self, elines)
# self.options["units"] = self.units
class CirkuixCNCjob(CirkuixObj, CNCjob):
"""
@@ -346,9 +370,11 @@ class CirkuixCNCjob(CirkuixObj, CNCjob):
})
def plot(self, figure):
self.setup_axes(figure)
CirkuixObj.plot(self, figure)
#self.setup_axes(figure)
self.plot2(self.axes, tooldia=self.options["tooldia"])
app.canvas.queue_draw()
self.app.on_zoom_fit(None)
self.app.canvas.queue_draw()
class CirkuixGeometry(CirkuixObj, Geometry):
@@ -359,6 +385,7 @@ class CirkuixGeometry(CirkuixObj, Geometry):
def __init__(self, name):
CirkuixObj.__init__(self, name)
Geometry.__init__(self)
self.kind = "geometry"
@@ -388,8 +415,32 @@ class CirkuixGeometry(CirkuixObj, Geometry):
"paintmargin": "entry_eval"
})
# def convert_units(self, units):
# factor = Geometry.convert_units(self, units)
def scale(self, factor):
if type(self.solid_geometry) == list:
self.solid_geometry = [affinity.scale(g, factor, factor, origin=(0, 0))
for g in self.solid_geometry]
else:
self.solid_geometry = affinity.scale(self.solid_geometry, factor, factor,
origin=(0, 0))
def convert_units(self, units):
factor = Geometry.convert_units(self, units)
self.options['cutz'] *= factor
self.options['travelz'] *= factor
self.options['feedrate'] *= factor
self.options['cnctooldia'] *= factor
self.options['painttooldia'] *= factor
self.options['paintmargin'] *= factor
return factor
def plot(self, figure):
self.setup_axes(figure)
CirkuixObj.plot(self, figure)
#self.setup_axes(figure)
try:
_ = iter(self.solid_geometry)
@@ -422,6 +473,9 @@ class CirkuixGeometry(CirkuixObj, Geometry):
print "WARNING: Did not plot:", str(type(geo))
self.app.on_zoom_fit(None)
self.app.canvas.queue_draw()
########################################
## App ##
@@ -499,7 +553,6 @@ class App:
########################################
self.window.set_default_size(900, 600)
self.window.show_all()
#Gtk.main()
def setup_plot(self):
"""
@@ -722,18 +775,23 @@ class App:
"""
Creates a new specalized CirkuixObj and attaches it to the application,
this is, updates the GUI accordingly, any other records and plots it.
@param kind: Knd of object to create.
@param name: Name for the object.
@param initilize: Function to run after the
object has been created but before attacing it
to the application. Takes the new object and the
app as parameters.
@return: The object requested
@rtype : CirkuixObj extended
:param kind: The kind of object to create. One of 'gerber',
'excellon', 'cncjob' and 'geometry'.
:type kind: str
:param name: Name for the object.
:type name: str
:param initialize: Function to run after creation of the object
but before it is attached to the application. The function is
called with 2 parameters: the new object and the App instance.
:type initialize: function
:return: None
:rtype: None
"""
# Check for existing name
if name in self.stuff:
self.info("Rename " + name + " in project first.")
return None
# Create object
@@ -751,6 +809,11 @@ class App:
# have been invoked in a separate thread.
initialize(obj, self)
# Check units and convert if necessary
if self.options["units"].upper() != obj.units.upper():
GLib.idle_add(lambda: self.info("Converting units to " + self.options["units"] + "."))
obj.convert_units(self.options["units"])
# Add to our records
self.stuff[name] = obj
@@ -845,6 +908,13 @@ class App:
## EVENT HANDLERS ##
########################################
def on_scale_object(self, widget):
obj = self.get_current()
factor = self.get_eval("entry_eval_" + obj.kind + "_scalefactor")
obj.scale(factor)
obj.to_form()
self.on_update_plot(None)
def on_canvas_configure(self, widget, event):
print "on_canvas_configure()"
@@ -883,8 +953,11 @@ class App:
#GLib.idle_add(lambda: self.set_progress_bar(0.5, "Plotting..."))
def thread_func(app_obj):
assert isinstance(app_obj, App)
#GLib.idle_add(lambda: app_obj.set_progress_bar(0.5, "Plotting..."))
GLib.idle_add(lambda: app_obj.get_current().plot(app_obj.figure))
#GLib.idle_add(lambda: app_obj.get_current().plot(app_obj.figure))
app_obj.get_current().plot(app_obj.figure)
GLib.idle_add(lambda: app_obj.on_zoom_fit(None))
GLib.timeout_add(300, lambda: app_obj.set_progress_bar(0.0, ""))
t = threading.Thread(target=thread_func, args=(self,))