Переглянути джерело

- small changes to allow making the x86 installer that is made from a Python 3.5 run FlatCAM beta
- fixed multiple parameter 'outname' in the Tcl commands OpenGerber and OpenGcode
- added more examples in the scripts Examples: isolate and cutout examples
- updated the Italian translation
- updated the translation files

Marius Stanciu 5 роки тому
батько
коміт
77f6e19267

+ 9 - 1
CHANGELOG.md

@@ -7,6 +7,14 @@ CHANGELOG for FlatCAM beta
 
 =================================================
 
+3.05.2020
+
+- small changes to allow making the x86 installer that is made from a Python 3.5 run FlatCAM beta 
+- fixed multiple parameter 'outname' in the Tcl commands OpenGerber and OpenGcode 
+- added more examples in the scripts Examples: isolate and cutout examples
+- updated the Italian translation
+- updated the translation files
+
 2.05.2020
 
 - working on a new feature: adding interdiction area for Gcode generation. They will be added in the Geometry Object
@@ -21,7 +29,7 @@ CHANGELOG for FlatCAM beta
 - modified the Cutout Tool to generate multi-geo objects therefore the set geometry parameters will populate the Geometry Object UI
 - modified the Panelize Tool to optimize the output from Cutout Tool such that there are no longer overlapping cuts
 - some string corrections
-- updated the Italian translation done by user @pcb-hobbyst
+- updated the Italian translation done by user @pcb-hobbyst (Golfetto Massimiliano)
 - RELEASE 8.992
 
 01.05.2020

+ 3 - 2
FlatCAMApp.py

@@ -165,6 +165,7 @@ class App(QtCore.QObject):
     version = 8.993
     version_date = "2020/08/01"
     beta = True
+
     engine = '3D'
 
     # current date now
@@ -3344,9 +3345,9 @@ class App(QtCore.QObject):
                 self.translator_grid_lay.addWidget(QtWidgets.QLabel('%s' % " "), 3, 3)
 
                 self.translator_grid_lay.addWidget(QtWidgets.QLabel('%s' % "Italian"), 4, 0)
-                self.translator_grid_lay.addWidget(QtWidgets.QLabel('%s' % "@pcb-hobyst"), 4, 1)
+                self.translator_grid_lay.addWidget(QtWidgets.QLabel('%s' % "Golfetto Massimiliano"), 4, 1)
                 self.translator_grid_lay.addWidget(QtWidgets.QLabel('%s' % " "), 4, 2)
-                self.translator_grid_lay.addWidget(QtWidgets.QLabel('%s' % " "), 4, 3)
+                self.translator_grid_lay.addWidget(QtWidgets.QLabel('%s' % "pcb@golfetto.eu"), 4, 3)
 
                 self.translator_grid_lay.addWidget(QtWidgets.QLabel('%s' % "German"), 5, 0)
                 self.translator_grid_lay.addWidget(QtWidgets.QLabel('%s' % "Marius Stanciu (Google-Tr)"), 5, 1)

+ 1 - 1
FlatCAMTranslation.py

@@ -49,7 +49,7 @@ def load_languages():
         available_translations = next(os.walk(languages_path_search))[1]
     except StopIteration:
         if not available_translations:
-            languages_path_search = os.path.join(Path(__file__).parents[1], 'locale')
+            languages_path_search = os.path.join(str(Path(__file__).parents[1]), 'locale')
             try:
                 available_translations = next(os.walk(languages_path_search))[1]
             except StopIteration:

+ 11 - 4
assets/examples/open_file.FlatScript

@@ -1,3 +1,10 @@
+# #####################################################################################
+# DESCRIPTION:
+# Will open a Gerber (and Excellon) file in FlatCAM
+# #####################################################################################
+
+puts "**************** RUNNING an EXAMPLE SCRIPT = Open a file *******************"
+
 # ----------- START: This is needed only for the examples ----------------
 # first set the default location where to search for the files to be open and store it to the ROOT_FOLDER variable 
 set ROOT_FOLDER  [get_sys root_folder_path]
@@ -9,11 +16,11 @@ set PATH ${ROOT_FOLDER}/assets/examples/files
 # set the working path to the path that holds the files we are going to work with
 set_path $PATH
 
-# load the GERBER file 
-open_gerber test.gbr
+# load the GERBER file and rename it to a known name so we can use it further
+open_gerber test.gbr -outname gerber_obj
 
-# load the Excellon ifle
-open_excellon test.txt
+# load the Excellon file and rename it to a known name so we can use it further
+open_excellon test.txt -outname excellon_obj
 
 # plot them all so we can see them on canvas
 plot_all 

BIN
locale/de/LC_MESSAGES/strings.mo


Різницю між файлами не показано, бо вона завелика
+ 213 - 207
locale/de/LC_MESSAGES/strings.po


BIN
locale/en/LC_MESSAGES/strings.mo


Різницю між файлами не показано, бо вона завелика
+ 213 - 207
locale/en/LC_MESSAGES/strings.po


BIN
locale/es/LC_MESSAGES/strings.mo


Різницю між файлами не показано, бо вона завелика
+ 213 - 207
locale/es/LC_MESSAGES/strings.po


BIN
locale/fr/LC_MESSAGES/strings.mo


Різницю між файлами не показано, бо вона завелика
+ 213 - 207
locale/fr/LC_MESSAGES/strings.po


BIN
locale/hu/LC_MESSAGES/strings.mo


Різницю між файлами не показано, бо вона завелика
+ 223 - 302
locale/hu/LC_MESSAGES/strings.po


BIN
locale/it/LC_MESSAGES/strings.mo


Різницю між файлами не показано, бо вона завелика
+ 207 - 207
locale/it/LC_MESSAGES/strings.po


BIN
locale/pt_BR/LC_MESSAGES/strings.mo


Різницю між файлами не показано, бо вона завелика
+ 213 - 207
locale/pt_BR/LC_MESSAGES/strings.po


BIN
locale/ro/LC_MESSAGES/strings.mo


Різницю між файлами не показано, бо вона завелика
+ 213 - 207
locale/ro/LC_MESSAGES/strings.po


BIN
locale/ru/LC_MESSAGES/strings.mo


Різницю між файлами не показано, бо вона завелика
+ 212 - 206
locale/ru/LC_MESSAGES/strings.po


Різницю між файлами не показано, бо вона завелика
+ 365 - 432
locale_template/strings.pot


+ 1 - 1
make_freezed.py

@@ -68,7 +68,7 @@ include_files.append(("config", "lib/config"))
 
 include_files.append(("README.md", "README.md"))
 include_files.append(("LICENSE", "LICENSE"))
-
+include_files.append(("CHANGELOG.md", "CHANGELOG.md"))
 base = None
 
 # Lets not open the console while running the app

+ 2 - 2
tclCommands/TclCommandIsolate.py

@@ -44,7 +44,7 @@ class TclCommandIsolate(TclCommandSignaled):
     help = {
         'main': "Creates isolation routing Geometry for the specified Gerber object.",
         'args': collections.OrderedDict([
-            ('name', 'Name of the source object. Required.'),
+            ('name', 'Name of the Gerber source object to be isolated. Required.'),
             ('dia', 'Tool diameter.'),
             ('passes', 'Passes of tool width.'),
             ('overlap', 'Percentage of tool diameter to overlap current pass over previous pass. Float [0, 99.9999]\n'
@@ -55,7 +55,7 @@ class TclCommandIsolate(TclCommandSignaled):
             ('iso_type', 'A value of 0 will isolate exteriors, a value of 1 will isolate interiors '
                          'and a value of 2 will do full isolation.')
         ]),
-        'examples': ['isolate my_geo -dia 0.1 -passes 2 -overlap 10 -combine True -iso_type 2 -outname out_geo']
+        'examples': ['isolate my_gerber -dia 0.1 -passes 2 -overlap 10 -combine True -iso_type 2 -outname out_geo']
     }
 
     def execute(self, args, unnamed_args):

+ 2 - 1
tclCommands/TclCommandOpenGCode.py

@@ -52,7 +52,8 @@ class TclCommandOpenGCode(TclCommandSignaled):
         """
         args['plot'] = False
         args['from_tcl'] = True
-        filename = args["filename"]
+        filename = args.pop("filename")
+
         # if ' ' in filename:
         #     return "The absolute path to the project file contain spaces which is not allowed.\n" \
         #            "Please enclose the path within quotes."

+ 1 - 1
tclCommands/TclCommandOpenGerber.py

@@ -56,7 +56,7 @@ class TclCommandOpenGerber(TclCommandSignaled):
         filename = args.pop('filename')
 
         if 'outname' in args:
-            outname = args['outname']
+            outname = args.pop('outname')
         else:
             outname = filename.split('/')[-1].split('\\')[-1]
 

Деякі файли не було показано, через те що забагато файлів було змінено