From 32076d4020689bd2fd8480cb28a552ac4ae24952 Mon Sep 17 00:00:00 2001 From: Juan Pablo Caram Date: Sat, 6 Sep 2014 20:45:44 -0400 Subject: [PATCH] Alpha 6 release files --- FlatCAMApp.py | 29 +++++++++++++++-------------- FlatCAMGUI.py | 5 ++++- LICENSE | 3 +-- camlib.py | 4 +++- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index f5ccf0a0..464c532f 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -251,7 +251,7 @@ class App(QtCore.QObject): #### Check for updates #### # Separate thread (Not worker) - self.version = 5 + self.version = 6 App.log.info("Checking for updates in backgroud (this is version %s)." % str(self.version)) self.worker2 = Worker(self, name="worker2") @@ -540,7 +540,7 @@ class App(QtCore.QObject): title = QtGui.QLabel( "FlatCAM
" - "Version Alpha 5 (2015/06)
" + "Version Alpha 6 (2014/09)
" "
" "2D Post-processing for Manufacturing specialized in
" "Printed Circuit Boards
" @@ -1211,19 +1211,20 @@ class App(QtCore.QObject): # Object name name = filename.split('/')[-1].split('\\')[-1] + self.new_object("excellon", name, obj_init) # New object creation and file processing - try: - self.new_object("excellon", name, obj_init) - except: - e = sys.exc_info() - App.log.error(str(e)) - self.message_dialog("Failed to create Excellon Object", - "Attempting to create a FlatCAM Excellon Object from " + - "Excellon file failed during processing:\n" + - str(e[0]) + " " + str(e[1]), kind="error") - self.progress.emit(0) - self.collection.delete_active() - return + # try: + # self.new_object("excellon", name, obj_init) + # except: + # e = sys.exc_info() + # App.log.error(str(e)) + # self.message_dialog("Failed to create Excellon Object", + # "Attempting to create a FlatCAM Excellon Object from " + + # "Excellon file failed during processing:\n" + + # str(e[0]) + " " + str(e[1]), kind="error") + # self.progress.emit(0) + # self.collection.delete_active() + # return # Register recent file self.file_opened.emit("excellon", filename) diff --git a/FlatCAMGUI.py b/FlatCAMGUI.py index fbc492cf..bbb8d1a2 100644 --- a/FlatCAMGUI.py +++ b/FlatCAMGUI.py @@ -217,7 +217,7 @@ class FlatCAMGUI(QtGui.QMainWindow): self.setWindowIcon(self.app_icon) self.setGeometry(100, 100, 1024, 650) - self.setWindowTitle('FlatCAM - Alpha 5') + self.setWindowTitle('FlatCAM - Alpha 6') self.show() @@ -635,6 +635,9 @@ class CNCJobOptionsGroupUI(OptionsGroupUI): class GlobalOptionsUI(QtGui.QWidget): + """ + This is the app and project options editor. + """ def __init__(self, parent=None): QtGui.QWidget.__init__(self, parent=parent) diff --git a/LICENSE b/LICENSE index f312ae0c..60d2ed54 100644 --- a/LICENSE +++ b/LICENSE @@ -2,8 +2,7 @@ The MIT License (MIT) Copyright (c) 2014 Juan Pablo Caram -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/camlib.py b/camlib.py index 64389972..10ef8aea 100644 --- a/camlib.py +++ b/camlib.py @@ -1424,7 +1424,7 @@ class Excellon(Geometry): self.drills = [] # Trailing "T" or leading "L" (default) - self.zeros = "L" + self.zeros = "T" # Attributes to be included in serialization # Always append to it because it carries contents @@ -1625,6 +1625,8 @@ class Excellon(Geometry): continue log.warning("Line ignored: %s" % eline) + + log.info("Zeros: %s, Units %s." % (self.zeros, self.units)) def parse_number(self, number_str): """