Version 7. Version is now a variable.

FlatCAMApp.py

@@ -43,7 +43,11 @@ class App(QtCore.QObject):
     handler.setFormatter(formatter)
     log.addHandler(handler)
 
-    ## URL for update checks
+    ## Version
+    version = 7
+    version_date = "2014/10"
+
+    ## URL for update checks and statistics
     version_url = "http://flatcam.org/FlatCAM/apptalk/version"
 
     ## App URL
@@ -73,7 +77,7 @@ class App(QtCore.QObject):
 
         QtCore.QObject.__init__(self)
 
-        self.ui = FlatCAMGUI()
+        self.ui = FlatCAMGUI(self.version)
 
         #### Plot Area ####
         # self.plotcanvas = PlotCanvas(self.ui.splitter)
@@ -272,7 +276,6 @@ class App(QtCore.QObject):
 
         #### Check for updates ####
         # Separate thread (Not worker)
-        self.version = 7
         App.log.info("Checking for updates in backgroud (this is version %s)." % str(self.version))
 
         self.worker2 = Worker(self, name="worker2")
@@ -357,7 +360,7 @@ class App(QtCore.QObject):
         self.shell.setWindowTitle("FlatCAM Shell")
         self.shell.show()
         self.shell.resize(550, 300)
-        self.shell.append_output("FlatCAM Alpha 7\n(c) 2014 Juan Pablo Caram\n\n")
+        self.shell.append_output("FlatCAM %s\n(c) 2014 Juan Pablo Caram\n\n" % self.version)
         self.shell.append_output("Type help to get started.\n\n")
         self.tcl = Tkinter.Tcl()
         self.setup_shell()
@@ -637,6 +640,9 @@ class App(QtCore.QObject):
         """
         self.report_usage("on_about")
 
+        version = self.version
+        version_date = self.version_date
+
         class AboutDialog(QtGui.QDialog):
             def __init__(self, parent=None):
                 QtGui.QDialog.__init__(self, parent)
@@ -655,12 +661,12 @@ class App(QtCore.QObject):
 
                 title = QtGui.QLabel(
                     "<font size=8><B>FlatCAM</B></font><BR>"
-                    "Version Alpha 7 (2014/10)<BR>"
+                    "Version %s (%s)<BR>"
                     "<BR>"
                     "2D Post-processing for Manufacturing specialized in<BR>"
                     "Printed Circuit Boards<BR>"
                     "<BR>"
-                    "(c) 2014 Juan Pablo Caram"
+                    "(c) 2014 Juan Pablo Caram" % (version, version_date)
                 )
                 layout2.addWidget(title, stretch=1)
 

FlatCAMGUI.py

@@ -4,7 +4,7 @@ from GUIElements import *
 
 class FlatCAMGUI(QtGui.QMainWindow):
 
-    def __init__(self):
+    def __init__(self, version):
         super(FlatCAMGUI, self).__init__()
 
         # Divine icon pack by Ipapun @ finicons.com
@@ -220,7 +220,7 @@ class FlatCAMGUI(QtGui.QMainWindow):
         self.setWindowIcon(self.app_icon)
 
         self.setGeometry(100, 100, 1024, 650)
-        self.setWindowTitle('FlatCAM - Alpha 7')
+        self.setWindowTitle('FlatCAM %s' % version)
         self.show()
 
 

LICENSE

@@ -1,9 +0,0 @@
-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:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README

@@ -1,8 +0,0 @@
-FlatCAM: 2D Post-processing for Manufacturing
-=============================================
-
-(c) 2014 Juan Pablo Caram
-
-FlatCAM is a program for preparing CNC jobs for making PCBs on a CNC router.
-Among other things, it can take a Gerber file generated by your favorite PCB
-CAD program, and create G-Code for Isolation routing. But there's more.

defaults.json

@@ -1 +1 @@
-{}
+{"gerber_noncopperrounded": false, "geometry_paintoverlap": 0.15, "excellon_plot": true, "excellon_feedrate": 3.0, "serial": "m4qp82ykwf8immc8asi2", "stats": {"on_about": 5, "save_defaults": 59, "exec_command": 1}, "gerber_plot": true, "geometry_plot": true, "excellon_drillz": -0.1, "geometry_feedrate": 3.0, "units": "IN", "excellon_travelz": 0.1, "gerber_multicolored": false, "gerber_solid": true, "gerber_isopasses": 1, "cncjob_append": "", "gerber_isotooldia": 0.016, "cncjob_tooldia": 0.016, "geometry_travelz": 0.1, "gerber_cutoutmargin": 0.1, "excellon_solid": false, "geometry_paintmargin": 0.0, "geometry_cutz": -0.002, "geometry_cnctooldia": 0.016, "gerber_cutouttooldia": 0.07, "gerber_gaps": "4", "gerber_bboxmargin": 0.0, "cncjob_plot": true, "gerber_cutoutgapsize": 0.15, "gerber_isooverlap": 0.15, "gerber_bboxrounded": false, "gerber_noncoppermargin": 0.0, "geometry_painttooldia": 0.07}