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

Important fix to Excellon parser.

Browse Source
This commit is contained in:
Juan Pablo Caram
2014-03-18 09:06:10 -04:00
parent 5312e78f92
commit 942e274597
4 changed files with 177 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

233
FlatCAM.py
View File

@@ -846,15 +846,18 @@ class App:
self.store = Gtk.ListStore(str) self.store = Gtk.ListStore(str)
self.tree = Gtk.TreeView(self.store) self.tree = Gtk.TreeView(self.store)
#self.list = Gtk.ListBox()
self.tree.connect("row_activated", self.on_row_activated)
self.tree_select = self.tree.get_selection() self.tree_select = self.tree.get_selection()
self.signal_id = self.tree_select.connect("changed", self.on_tree_selection_changed)
renderer = Gtk.CellRendererText() renderer = Gtk.CellRendererText()
column = Gtk.TreeViewColumn("Objects", renderer, text=0) column = Gtk.TreeViewColumn("Objects", renderer, text=0)
self.tree.append_column(column) self.tree.append_column(column)
self.builder.get_object("box_project").pack_start(self.tree, False, False, 1) self.builder.get_object("box_project").pack_start(self.tree, False, False, 1)
# Double-click or Enter takes you to the object's options
self.tree.connect("row_activated", self.on_row_activated)
# Changes the selected item and populates the object options form
self.signal_id = self.tree_select.connect("changed", self.on_tree_selection_changed)
def setup_component_editor(self): def setup_component_editor(self):
""" """
Initial configuration of the component editor. Creates Initial configuration of the component editor. Creates
@@ -888,6 +891,22 @@ class App:
"project": "share/project16.png" "project": "share/project16.png"
} }
openers = {
'gerber': self.open_gerber,
'excellon': self.open_excellon,
'cncjob': self.open_gcode,
'project': lambda x: ""
}
# Closure needed to create callbacks in a loop.
# Otherwise late binding occurs.
def make_callback(func, fname):
def opener(*args):
t = threading.Thread(target=lambda: func(fname))
t.daemon = True
t.start()
return opener
try: try:
f = open('recent.json') f = open('recent.json')
except: except:
@@ -910,8 +929,10 @@ class App:
item = Gtk.ImageMenuItem.new_with_label(filename) item = Gtk.ImageMenuItem.new_with_label(filename)
im = Gtk.Image.new_from_file(icons[recent["kind"]]) im = Gtk.Image.new_from_file(icons[recent["kind"]])
item.set_image(im) item.set_image(im)
# def opener():
o = make_callback(openers[recent["kind"]], recent['filename'])
item.connect('activate', o)
recent_menu.append(item) recent_menu.append(item)
self.builder.get_object('open_recent').set_submenu(recent_menu) self.builder.get_object('open_recent').set_submenu(recent_menu)
@@ -2633,6 +2654,24 @@ class App:
self.info("Save cancelled.") # print("Cancel clicked") self.info("Save cancelled.") # print("Cancel clicked")
dialog.destroy() dialog.destroy()
def open_gerber(self, filename):
GLib.idle_add(lambda: self.set_progress_bar(0.1, "Opening Gerber ..."))
def obj_init(gerber_obj, app_obj):
assert isinstance(gerber_obj, FlatCAMGerber)
GLib.idle_add(lambda: app_obj.set_progress_bar(0.2, "Parsing ..."))
gerber_obj.parse_file(filename)
GLib.idle_add(lambda: app_obj.set_progress_bar(0.5, "Creating Geometry ..."))
gerber_obj.create_geometry()
GLib.idle_add(lambda: app_obj.set_progress_bar(0.6, "Plotting ..."))
name = filename.split('/')[-1].split('\\')[-1]
self.new_object("gerber", name, obj_init)
self.register_recent("gerber", filename)
GLib.idle_add(lambda: self.set_progress_bar(1.0, "Done!"))
GLib.timeout_add_seconds(1, lambda: self.set_progress_bar(0.0, ""))
def on_fileopengerber(self, param): def on_fileopengerber(self, param):
""" """
Callback for menu item File->Open Gerber. Defines a function that is then passed Callback for menu item File->Open Gerber. Defines a function that is then passed
@@ -2645,27 +2684,44 @@ class App:
# IMPORTANT: on_success will run on a separate thread. Use # IMPORTANT: on_success will run on a separate thread. Use
# GLib.idle_add(function, **kwargs) to launch actions that will # GLib.idle_add(function, **kwargs) to launch actions that will
# updata the GUI. # updata the GUI.
def on_success(app_obj, filename): # def on_success(app_obj, filename):
assert isinstance(app_obj, App) # assert isinstance(app_obj, App)
GLib.idle_add(lambda: app_obj.set_progress_bar(0.1, "Opening Gerber ...")) # GLib.idle_add(lambda: app_obj.set_progress_bar(0.1, "Opening Gerber ..."))
#
def obj_init(gerber_obj, app_obj): # def obj_init(gerber_obj, app_obj):
assert isinstance(gerber_obj, FlatCAMGerber) # assert isinstance(gerber_obj, FlatCAMGerber)
GLib.idle_add(lambda: app_obj.set_progress_bar(0.2, "Parsing ...")) # GLib.idle_add(lambda: app_obj.set_progress_bar(0.2, "Parsing ..."))
gerber_obj.parse_file(filename) # gerber_obj.parse_file(filename)
GLib.idle_add(lambda: app_obj.set_progress_bar(0.5, "Creating Geometry ...")) # GLib.idle_add(lambda: app_obj.set_progress_bar(0.5, "Creating Geometry ..."))
gerber_obj.create_geometry() # gerber_obj.create_geometry()
GLib.idle_add(lambda: app_obj.set_progress_bar(0.6, "Plotting ...")) # GLib.idle_add(lambda: app_obj.set_progress_bar(0.6, "Plotting ..."))
#
name = filename.split('/')[-1].split('\\')[-1] # name = filename.split('/')[-1].split('\\')[-1]
app_obj.new_object("gerber", name, obj_init) # app_obj.new_object("gerber", name, obj_init)
self.register_recent("gerber", filename) # app_obj.register_recent("gerber", filename)
#
GLib.idle_add(lambda: app_obj.set_progress_bar(1.0, "Done!")) # GLib.idle_add(lambda: app_obj.set_progress_bar(1.0, "Done!"))
GLib.timeout_add_seconds(1, lambda: app_obj.set_progress_bar(0.0, "")) # GLib.timeout_add_seconds(1, lambda: app_obj.set_progress_bar(0.0, ""))
# on_success gets run on a separate thread # on_success gets run on a separate thread
self.file_chooser_action(on_success) # self.file_chooser_action(on_success)
self.file_chooser_action(lambda ao, filename: self.open_gerber(filename))
def open_excellon(self, filename):
GLib.idle_add(lambda: self.set_progress_bar(0.1, "Opening Excellon ..."))
def obj_init(excellon_obj, app_obj):
GLib.idle_add(lambda: app_obj.set_progress_bar(0.2, "Parsing ..."))
excellon_obj.parse_file(filename)
excellon_obj.create_geometry()
GLib.idle_add(lambda: app_obj.set_progress_bar(0.6, "Plotting ..."))
name = filename.split('/')[-1].split('\\')[-1]
self.new_object("excellon", name, obj_init)
self.register_recent("excellon", filename)
GLib.idle_add(lambda: self.set_progress_bar(1.0, "Done!"))
GLib.timeout_add_seconds(1, lambda: self.set_progress_bar(0.0, ""))
def on_fileopenexcellon(self, param): def on_fileopenexcellon(self, param):
""" """
@@ -2679,25 +2735,57 @@ class App:
# IMPORTANT: on_success will run on a separate thread. Use # IMPORTANT: on_success will run on a separate thread. Use
# GLib.idle_add(function, **kwargs) to launch actions that will # GLib.idle_add(function, **kwargs) to launch actions that will
# updata the GUI. # updata the GUI.
def on_success(app_obj, filename): # def on_success(app_obj, filename):
assert isinstance(app_obj, App) # assert isinstance(app_obj, App)
GLib.idle_add(lambda: app_obj.set_progress_bar(0.1, "Opening Excellon ...")) # GLib.idle_add(lambda: app_obj.set_progress_bar(0.1, "Opening Excellon ..."))
#
def obj_init(excellon_obj, app_obj): # def obj_init(excellon_obj, app_obj):
GLib.idle_add(lambda: app_obj.set_progress_bar(0.2, "Parsing ...")) # GLib.idle_add(lambda: app_obj.set_progress_bar(0.2, "Parsing ..."))
excellon_obj.parse_file(filename) # excellon_obj.parse_file(filename)
excellon_obj.create_geometry() # excellon_obj.create_geometry()
GLib.idle_add(lambda: app_obj.set_progress_bar(0.6, "Plotting ...")) # GLib.idle_add(lambda: app_obj.set_progress_bar(0.6, "Plotting ..."))
#
name = filename.split('/')[-1].split('\\')[-1] # name = filename.split('/')[-1].split('\\')[-1]
app_obj.new_object("excellon", name, obj_init) # app_obj.new_object("excellon", name, obj_init)
self.register_recent("excellon", filename) # self.register_recent("excellon", filename)
#
GLib.idle_add(lambda: app_obj.set_progress_bar(1.0, "Done!")) # GLib.idle_add(lambda: app_obj.set_progress_bar(1.0, "Done!"))
GLib.timeout_add_seconds(1, lambda: app_obj.set_progress_bar(0.0, "")) # GLib.timeout_add_seconds(1, lambda: app_obj.set_progress_bar(0.0, ""))
# on_success gets run on a separate thread # on_success gets run on a separate thread
self.file_chooser_action(on_success) # self.file_chooser_action(on_success)
self.file_chooser_action(lambda ao, filename: self.open_excellon(filename))
def open_gcode(self, filename):
def obj_init(job_obj, app_obj_):
"""
:type app_obj_: App
"""
assert isinstance(app_obj_, App)
GLib.idle_add(lambda: app_obj_.set_progress_bar(0.1, "Opening G-Code ..."))
f = open(filename)
gcode = f.read()
f.close()
job_obj.gcode = gcode
GLib.idle_add(lambda: app_obj_.set_progress_bar(0.2, "Parsing ..."))
job_obj.gcode_parse()
GLib.idle_add(lambda: app_obj_.set_progress_bar(0.6, "Creating geometry ..."))
job_obj.create_geometry()
GLib.idle_add(lambda: app_obj_.set_progress_bar(0.6, "Plotting ..."))
name = filename.split('/')[-1].split('\\')[-1]
self.new_object("cncjob", name, obj_init)
self.register_recent("cncjob", filename)
GLib.idle_add(lambda: self.set_progress_bar(1.0, "Done!"))
GLib.timeout_add_seconds(1, lambda: self.set_progress_bar(0.0, ""))
def on_fileopengcode(self, param): def on_fileopengcode(self, param):
""" """
@@ -2711,40 +2799,41 @@ class App:
# IMPORTANT: on_success will run on a separate thread. Use # IMPORTANT: on_success will run on a separate thread. Use
# GLib.idle_add(function, **kwargs) to launch actions that will # GLib.idle_add(function, **kwargs) to launch actions that will
# updata the GUI. # updata the GUI.
def on_success(app_obj, filename): # def on_success(app_obj, filename):
assert isinstance(app_obj, App) # assert isinstance(app_obj, App)
#
def obj_init(job_obj, app_obj_): # def obj_init(job_obj, app_obj_):
""" # """
#
:type app_obj_: App # :type app_obj_: App
""" # """
assert isinstance(app_obj_, App) # assert isinstance(app_obj_, App)
GLib.idle_add(lambda: app_obj_.set_progress_bar(0.1, "Opening G-Code ...")) # GLib.idle_add(lambda: app_obj_.set_progress_bar(0.1, "Opening G-Code ..."))
#
f = open(filename) # f = open(filename)
gcode = f.read() # gcode = f.read()
f.close() # f.close()
#
job_obj.gcode = gcode # job_obj.gcode = gcode
#
GLib.idle_add(lambda: app_obj_.set_progress_bar(0.2, "Parsing ...")) # GLib.idle_add(lambda: app_obj_.set_progress_bar(0.2, "Parsing ..."))
job_obj.gcode_parse() # job_obj.gcode_parse()
#
GLib.idle_add(lambda: app_obj_.set_progress_bar(0.6, "Creating geometry ...")) # GLib.idle_add(lambda: app_obj_.set_progress_bar(0.6, "Creating geometry ..."))
job_obj.create_geometry() # job_obj.create_geometry()
#
GLib.idle_add(lambda: app_obj_.set_progress_bar(0.6, "Plotting ...")) # GLib.idle_add(lambda: app_obj_.set_progress_bar(0.6, "Plotting ..."))
#
name = filename.split('/')[-1].split('\\')[-1] # name = filename.split('/')[-1].split('\\')[-1]
app_obj.new_object("cncjob", name, obj_init) # app_obj.new_object("cncjob", name, obj_init)
self.register_recent("cncjob", filename) # self.register_recent("cncjob", filename)
#
GLib.idle_add(lambda: app_obj.set_progress_bar(1.0, "Done!")) # GLib.idle_add(lambda: app_obj.set_progress_bar(1.0, "Done!"))
GLib.timeout_add_seconds(1, lambda: app_obj.set_progress_bar(0.0, "")) # GLib.timeout_add_seconds(1, lambda: app_obj.set_progress_bar(0.0, ""))
# on_success gets run on a separate thread # on_success gets run on a separate thread
self.file_chooser_action(on_success) # self.file_chooser_action(on_success)
self.file_chooser_action(lambda ao, filename: self.open_gcode(filename))
def on_mouse_move_over_plot(self, event): def on_mouse_move_over_plot(self, event):
""" """

12
FlatCAM.ui
View File

@@ -3156,6 +3156,12 @@ objects and options.</property>
<signal name="activate" handler="on_file_new" swapped="no"/> <signal name="activate" handler="on_file_new" swapped="no"/>
</object> </object>
</child> </child>
<child>
<object class="GtkSeparatorMenuItem" id="separatormenuitem5">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child> <child>
<object class="GtkImageMenuItem" id="open_recent"> <object class="GtkImageMenuItem" id="open_recent">
<property name="label" translatable="yes">Open recent</property> <property name="label" translatable="yes">Open recent</property>
@@ -3165,6 +3171,12 @@ objects and options.</property>
<property name="use_stock">False</property> <property name="use_stock">False</property>
</object> </object>
</child> </child>
<child>
<object class="GtkSeparatorMenuItem" id="separatormenuitem6">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child> <child>
<object class="GtkImageMenuItem" id="imagemenuitem2"> <object class="GtkImageMenuItem" id="imagemenuitem2">
<property name="label">Open Gerber</property> <property name="label">Open Gerber</property>

6
camlib.py
View File

@@ -1513,11 +1513,11 @@ class Excellon(Geometry):
# Coordinates # Coordinates
#self.xcoord_re = re.compile(r'^X(\d*\.?\d*)(?:Y\d*\.?\d*)?$') #self.xcoord_re = re.compile(r'^X(\d*\.?\d*)(?:Y\d*\.?\d*)?$')
#self.ycoord_re = re.compile(r'^(?:X\d*\.?\d*)?Y(\d*\.?\d*)$') #self.ycoord_re = re.compile(r'^(?:X\d*\.?\d*)?Y(\d*\.?\d*)$')
self.coordsperiod_re = re.compile(r'(?=.*X(\d*\.\d*))?(?=.*Y(\d*\.\d*))?[XY]') self.coordsperiod_re = re.compile(r'(?=.*X(-?\d*\.\d*))?(?=.*Y(-?\d*\.\d*))?[XY]')
self.coordsnoperiod_re = re.compile(r'(?!.*\.)(?=.*X(\d*))?(?=.*Y(\d*))?[XY]') self.coordsnoperiod_re = re.compile(r'(?!.*\.)(?=.*X(-?\d*))?(?=.*Y(-?\d*))?[XY]')
# R - Repeat hole (# times, X offset, Y offset) # R - Repeat hole (# times, X offset, Y offset)
self.rep_re = re.compile(r'^R(\d+)(?=.*[XY])+(?:X(\d*\.?\d*))?(?:Y(\d*\.?\d*))?$') self.rep_re = re.compile(r'^R(\d+)(?=.*[XY])+(?:X(-?\d*\.?\d*))?(?:Y(-?\d*\.?\d*))?$')
# Various stop/pause commands # Various stop/pause commands
self.stop_re = re.compile(r'^((G04)|(M09)|(M06)|(M00)|(M30))') self.stop_re = re.compile(r'^((G04)|(M09)|(M06)|(M00)|(M30))')

2
recent.json
View File

@@ -1 +1 @@
[{"kind": "project", "filename": "C:\\Users\\jpcaram\\Dropbox\\CNC\\pcbcam\\test_files\\full.fcproj"}, {"kind": "excellon", "filename": "C:\\Users\\jpcaram\\Dropbox\\CNC\\squarerpcb\\KiCad_Squarer.drl"}, {"kind": "gerber", "filename": "C:\\Users\\jpcaram\\Dropbox\\VNA\\KiCad_Squarer\\KiCad_Squarer-F_Cu.gtl"}, {"kind": "gerber", "filename": "C:\\Users\\jpcaram\\Dropbox\\PhD\\PLLs\\RTWO\\Project Outputs for RTWO1\\PCB1.GTL"}] [{"kind": "gerber", "filename": "C:\\Users\\jpcaram\\Dropbox\\CNC\\pcbcam\\test_files\\BLDC_1303_Bottom.gbr"}, {"kind": "excellon", "filename": "C:\\Users\\jpcaram\\Dropbox\\CNC\\pcbcam\\test_files\\PlacaReles.drl"}, {"kind": "gerber", "filename": "C:\\Users\\jpcaram\\Dropbox\\CNC\\pcbcam\\test_files\\PlacaReles-F_Cu.gtl"}, {"kind": "gerber", "filename": "C:\\Users\\jpcaram\\Dropbox\\CNC\\pcbcam\\test_files\\Example1_copper_bottom.gbr"}, {"kind": "cncjob", "filename": "C:\\Users\\jpcaram\\Dropbox\\PhD\\PLLs\\RTWO\\RTWO1_CNC\\cutout1.gcode"}, {"kind": "project", "filename": "C:\\Users\\jpcaram\\Dropbox\\PhD\\PLLs\\RTWO\\RTWO1.fcproj"}, {"kind": "excellon", "filename": "C:\\Users\\jpcaram\\Dropbox\\PhD\\PLLs\\RTWO\\Project Outputs for RTWO1\\PCB1.TXT"}, {"kind": "excellon", "filename": "C:\\Users\\jpcaram\\Dropbox\\PhD\\PLLs\\RTWO\\Project Outputs for RTWO1\\PCB1.DRL"}, {"kind": "gerber", "filename": "C:\\Users\\jpcaram\\Dropbox\\PhD\\PLLs\\RTWO\\Project Outputs for RTWO1\\PCB1.GBL"}, {"kind": "project", "filename": "C:\\Users\\jpcaram\\Dropbox\\CNC\\pcbcam\\test_files\\full.fcproj"}]