bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- removed the enforced ActivityView width

Browse Source 
- various string changes; updated the strings
- brought up-to-date the Romanian translation strings
- updated the source file when creating Excellon objects in various places in the app
This commit is contained in:
Marius Stanciu
2020-11-15 15:05:58 +02:00
committed by Marius
parent 07df345f12
commit bb279cbebe
52 changed files with 12434 additions and 11263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tclCommands/TclCommandAlignDrill.py
View File

@@ -3,6 +3,7 @@ from tclCommands.TclCommand import TclCommandSignaled
from shapely.geometry import Point
import shapely.affinity as affinity
from copy import deepcopy
class TclCommandAlignDrill(TclCommandSignaled):
@@ -172,15 +173,20 @@ class TclCommandAlignDrill(TclCommandSignaled):
drills.append(point)
drills.append(point_mirror)
# populate init_obj.solid_geometry
init_obj.create_geometry()
# populate init_obj.tools dict
init_obj.tools = {
'1': {
'tooldia': tooldia,
'drills': drills,
'solid_geometry': []
'tooldia': tooldia,
'drills': deepcopy(drills),
'solid_geometry': init_obj.solid_geometry
}
}
init_obj.create_geometry()
init_obj.source_file = app_obj.f_handlers.export_excellon(obj_name=outname, local_use=init_obj,
filename=None, use_thread=False)
# Box
if 'box' in args:

11
tclCommands/TclCommandAlignDrillGrid.py
View File

@@ -2,6 +2,8 @@ import collections
from tclCommands.TclCommand import TclCommandSignaled
from shapely.geometry import Point
from copy import deepcopy
class TclCommandAlignDrillGrid(TclCommandSignaled):
"""
@@ -109,12 +111,15 @@ class TclCommandAlignDrillGrid(TclCommandSignaled):
init_obj.tools = {
'1': {
'tooldia': tooldia,
'drills': drills,
'solid_geometry': []
'tooldia': tooldia,
'drills': deepcopy(drills),
'solid_geometry': []
}
}
init_obj.create_geometry()
init_obj.source_file = app_obj.f_handlers.export_excellon(obj_name=outname, local_use=init_obj,
filename=None, use_thread=False)
# Create the new object
self.app.app_obj.new_object("excellon", outname, aligndrillgrid_init_me, plot=False)

8
tclCommands/TclCommandExportDXF.py
View File

@@ -2,6 +2,14 @@ from tclCommands.TclCommand import TclCommand
import collections
import gettext
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')
if '_' not in builtins.__dict__:
_ = gettext.gettext
class TclCommandExportDXF(TclCommand):
"""

10
tclCommands/TclCommandImportSvg.py
View File

@@ -3,6 +3,14 @@ from tclCommands.TclCommand import TclCommandSignaled
import collections
from camlib import Geometry
import gettext
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')
if '_' not in builtins.__dict__:
_ = gettext.gettext
class TclCommandImportSvg(TclCommandSignaled):
"""
@@ -73,7 +81,7 @@ class TclCommandImportSvg(TclCommandSignaled):
if obj_type != "geometry" and obj_type != "gerber":
self.raise_tcl_error("Option type can be 'geometry' or 'gerber' only, got '%s'." % obj_type)
with self.app.proc_container.new('%s ...' % _("Importing")):
with self.app.proc_container.new('%s...' % _("Importing")):
# Object creation
self.app.app_obj.new_object(obj_type, outname, obj_init, plot=False)

1
tclCommands/TclCommandNewGerber.py
View File

@@ -66,6 +66,7 @@ class TclCommandNewGerber(TclCommandSignaled):
grb_obj.follow = False
grb_obj.apertures = {}
grb_obj.solid_geometry = []
grb_obj.follow_geometry = []
try:
grb_obj.options['xmin'] = 0

10
tclCommands/TclCommandOpenDXF.py
View File

@@ -2,6 +2,14 @@ from tclCommands.TclCommand import TclCommandSignaled
import collections
import gettext
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')
if '_' not in builtins.__dict__:
_ = gettext.gettext
class TclCommandOpenDXF(TclCommandSignaled):
"""
@@ -78,7 +86,7 @@ class TclCommandOpenDXF(TclCommandSignaled):
units = self.app.defaults['units'].upper()
with self.app.proc_container.new('%s' % _("Opening ...")):
with self.app.proc_container.new('%s...' % _("Opening")):
# Object creation
ret_val = self.app.app_obj.new_object(obj_type, outname, obj_init, plot=False)

10
tclCommands/TclCommandOpenSVG.py
View File

@@ -2,6 +2,14 @@ from tclCommands.TclCommand import TclCommandSignaled
import collections
import gettext
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')
if '_' not in builtins.__dict__:
_ = gettext.gettext
class TclCommandOpenSVG(TclCommandSignaled):
"""
@@ -74,7 +82,7 @@ class TclCommandOpenSVG(TclCommandSignaled):
units = self.app.defaults['units'].upper()
with self.app.proc_container.new(_("Working ...")):
with self.app.proc_container.new('%s...' % _("Working")):
# Object creation
ret_val = self.app.app_obj.new_object(obj_type, outname, obj_init, plot=False)

14
tclCommands/TclCommandPanelize.py
View File

@@ -6,8 +6,16 @@ import logging
from copy import deepcopy
import collections
import gettext
import appTranslation as fcTranslate
import builtins
log = logging.getLogger('base')
fcTranslate.apply_language('strings')
if '_' not in builtins.__dict__:
_ = gettext.gettext
class TclCommandPanelize(TclCommand):
"""
@@ -288,12 +296,12 @@ class TclCommandPanelize(TclCommand):
self.app.app_obj.new_object("geometry", outname, job_init_geometry, plot=False, autoselected=True)
if threaded is True:
self.app.proc_container.new(_("Working ..."))
self.app.proc_container.new('%s...' % _("Working"))
def job_thread(app_obj):
try:
panelize_2()
app_obj.inform.emit('[success]' % _("Done."))
app_obj.inform.emit('[success] %s' % _("Done."))
except Exception as ee:
log.debug(str(ee))
return
@@ -302,4 +310,4 @@ class TclCommandPanelize(TclCommand):
self.app.worker_task.emit({'fcn': job_thread, 'params': [self.app]})
else:
panelize_2()
self.app.inform.emit('[success]' % _("Done."))
self.app.inform.emit('[success] %s' % _("Done."))