- remade file names in the app

- fixed the issue with factory_defaults being saved every time the app start
- fixed the preferences not being saved to a file when the Save button is pressed in Edit -> Preferences
- fixed and updated the Transform Tools in the Editors
This commit is contained in:
Marius Stanciu
2020-06-03 20:35:59 +03:00
committed by Marius
parent 378a497935
commit 2eecb20e95
190 changed files with 1940 additions and 1990 deletions

View File

@@ -1,6 +1,6 @@
import sys
import re
import App_Main
import app_Main
import abc
import collections
from PyQt5 import QtCore
@@ -53,7 +53,7 @@ class TclCommand(object):
if self.app is None:
raise TypeError('Expected app to be FlatCAMApp instance.')
if not isinstance(self.app, App_Main.App):
if not isinstance(self.app, app_Main.App):
raise TypeError('Expected FlatCAMApp, got %s.' % type(app))
self.log = self.app.log

View File

@@ -4,7 +4,7 @@ from tclCommands.TclCommand import TclCommand
from shapely.ops import cascaded_union
import gettext
import AppTranslation as fcTranslate
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')

View File

@@ -3,7 +3,7 @@ import collections
import logging
import gettext
import AppTranslation as fcTranslate
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')

View File

@@ -4,7 +4,7 @@ import collections
import logging
import gettext
import AppTranslation as fcTranslate
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')

View File

@@ -4,7 +4,7 @@ import collections
import math
import gettext
import AppTranslation as fcTranslate
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')

View File

@@ -7,7 +7,7 @@ from shapely.ops import cascaded_union
from shapely.geometry import Polygon, LineString, LinearRing
import gettext
import AppTranslation as fcTranslate
import appTranslation as fcTranslate
import builtins
log = logging.getLogger('base')

View File

@@ -5,7 +5,7 @@ import collections
class TclCommandGetNames(TclCommand):
"""
Tcl shell command to set an object as active in the AppGUI.
Tcl shell command to set an object as active in the appGUI.
example:

View File

@@ -11,7 +11,7 @@ import collections
import os
import logging
import gettext
import AppTranslation as fcTranslate
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')

View File

@@ -11,7 +11,7 @@ from tclCommands.TclCommand import TclCommand
import collections
import gettext
import AppTranslation as fcTranslate
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')

View File

@@ -1,5 +1,5 @@
from tclCommands.TclCommand import TclCommand
from AppObjects.FlatCAMExcellon import ExcellonObject
from appObjects.FlatCAMExcellon import ExcellonObject
import collections

View File

@@ -1,5 +1,5 @@
from tclCommands.TclCommand import TclCommand
from AppObjects.FlatCAMGeometry import GeometryObject
from appObjects.FlatCAMGeometry import GeometryObject
import collections

View File

@@ -5,7 +5,7 @@ from shapely.ops import cascaded_union
import collections
import gettext
import AppTranslation as fcTranslate
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')

View File

@@ -4,7 +4,7 @@ import collections
import logging
import gettext
import AppTranslation as fcTranslate
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')

View File

@@ -14,7 +14,7 @@ class TclCommandPlotAll(TclCommandSignaled):
# List of all command aliases, to be able use old names for backward compatibility (add_poly, add_polygon)
aliases = ['plot_all']
description = '%s %s' % ("--", "Plots all objects on AppGUI.")
description = '%s %s' % ("--", "Plots all objects on appGUI.")
# Dictionary of types from Tcl command, needs to be ordered
arg_names = collections.OrderedDict([
@@ -32,7 +32,7 @@ class TclCommandPlotAll(TclCommandSignaled):
# structured help for current command, args needs to be ordered
help = {
'main': "Plots all objects on AppGUI.",
'main': "Plots all objects on appGUI.",
'args': collections.OrderedDict([
('plot_status', 'If to display or not the objects: True (1) or False (0).'),
('use_thread', 'If to use multithreading: True (1) or False (0).')

View File

@@ -21,7 +21,7 @@ class TclCommandPlotObjects(TclCommand):
# List of all command aliases, to be able use old names for backward compatibility (add_poly, add_polygon)
aliases = ['plot_objects']
description = '%s %s' % ("--", "Plot a specified list of objects in AppGUI.")
description = '%s %s' % ("--", "Plot a specified list of objects in appGUI.")
# Dictionary of types from Tcl command, needs to be ordered
arg_names = collections.OrderedDict([
@@ -38,7 +38,7 @@ class TclCommandPlotObjects(TclCommand):
# structured help for current command, args needs to be ordered
help = {
'main': "Plot a specified list of objects in AppGUI.",
'main': "Plot a specified list of objects in appGUI.",
'args': collections.OrderedDict([
('names', "A list of object names to be plotted separated by comma. Required.\n"
"WARNING: no spaces are allowed. If unsure enclose the entire list with quotes."),

View File

@@ -4,7 +4,7 @@ import collections
import logging
import gettext
import AppTranslation as fcTranslate
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')

View File

@@ -5,7 +5,7 @@ import collections
class TclCommandSetActive(TclCommand):
"""
Tcl shell command to set an object as active in the AppGUI.
Tcl shell command to set an object as active in the appGUI.
example:

View File

@@ -13,7 +13,7 @@ from camlib import get_bounds
import logging
import gettext
import AppTranslation as fcTranslate
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')

View File

@@ -11,7 +11,7 @@ import collections
import os
import logging
import gettext
import AppTranslation as fcTranslate
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')

View File

@@ -3,7 +3,7 @@ from tclCommands.TclCommand import TclCommandSignaled
import collections
import gettext
import AppTranslation as fcTranslate
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')