- replaced the testing if instance of FlatCAMObj with testing the obj.kind attribute

- removed the import of the whole FlatCAMApp file only for the usage of GracefulException
- remove the import of FlatCAMApp and used alternate ways
- optimized the imports in some files
- moved the Bookmarksmanager and ToolDB classes into their own files
- solved some bugs that were not so visible in the Editors and HPGL parser
- split the FlatCAMObj file into multiple files located in the flatcamObjects folder and renamed the contained classes with names more suggestive
- updated the Google Translation for the German language
This commit is contained in:
Marius Stanciu
2020-04-27 12:34:56 +03:00
committed by Marius
parent 3ec666edbb
commit 9f13b47077
50 changed files with 23069 additions and 21543 deletions

View File

@@ -1,5 +1,5 @@
from tclCommands.TclCommand import TclCommand
from FlatCAMObj import FlatCAMExcellon
from flatcamObjects.FlatCAMExcellon import ExcellonObject
import collections
@@ -62,7 +62,7 @@ class TclCommandJoinExcellon(TclCommand):
objs.append(obj)
def initialize(obj_, app):
FlatCAMExcellon.merge(self, objs, obj_)
ExcellonObject.merge(self, objs, obj_)
if objs and len(objs) >= 2:
self.app.new_object("excellon", outname, initialize, plot=False)