Juan Pablo Caram пре 11 година
родитељ
комит
32076d4020
4 измењених фајлова са 23 додато и 18 уклоњено
  1. 15 14
      FlatCAMApp.py
  2. 4 1
      FlatCAMGUI.py
  3. 1 2
      LICENSE
  4. 3 1
      camlib.py

+ 15 - 14
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(
                     "<font size=8><B>FlatCAM</B></font><BR>"
-                    "Version Alpha 5 (2015/06)<BR>"
+                    "Version Alpha 6 (2014/09)<BR>"
                     "<BR>"
                     "2D Post-processing for Manufacturing specialized in<BR>"
                     "Printed Circuit Boards<BR>"
@@ -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)

+ 4 - 1
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)
 

+ 1 - 2
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.
 

+ 3 - 1
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):
         """