|
@@ -9,9 +9,9 @@ from PyQt5 import QtGui, QtCore, QtWidgets
|
|
|
from PyQt5.QtCore import Qt, QSettings
|
|
from PyQt5.QtCore import Qt, QSettings
|
|
|
|
|
|
|
|
from camlib import distance, arc, FlatCAMRTreeStorage
|
|
from camlib import distance, arc, FlatCAMRTreeStorage
|
|
|
-from AppGUI.GUIElements import FCEntry, FCComboBox, FCTable, FCDoubleSpinner, RadioSet, FCSpinner
|
|
|
|
|
-from AppEditors.FlatCAMGeoEditor import FCShapeTool, DrawTool, DrawToolShape, DrawToolUtilityShape, FlatCAMGeoEditor
|
|
|
|
|
-from AppParsers.ParseExcellon import Excellon
|
|
|
|
|
|
|
+from appGUI.GUIElements import FCEntry, FCComboBox, FCTable, FCDoubleSpinner, RadioSet, FCSpinner
|
|
|
|
|
+from appEditors.FlatCAMGeoEditor import FCShapeTool, DrawTool, DrawToolShape, DrawToolUtilityShape, FlatCAMGeoEditor
|
|
|
|
|
+from appParsers.ParseExcellon import Excellon
|
|
|
|
|
|
|
|
from shapely.geometry import LineString, LinearRing, MultiLineString, Polygon, MultiPolygon, Point
|
|
from shapely.geometry import LineString, LinearRing, MultiLineString, Polygon, MultiPolygon, Point
|
|
|
import shapely.affinity as affinity
|
|
import shapely.affinity as affinity
|
|
@@ -26,7 +26,7 @@ import logging
|
|
|
from copy import deepcopy
|
|
from copy import deepcopy
|
|
|
|
|
|
|
|
import gettext
|
|
import gettext
|
|
|
-import AppTranslation as fcTranslate
|
|
|
|
|
|
|
+import appTranslation as fcTranslate
|
|
|
import builtins
|
|
import builtins
|
|
|
|
|
|
|
|
fcTranslate.apply_language('strings')
|
|
fcTranslate.apply_language('strings')
|
|
@@ -2123,7 +2123,7 @@ class FlatCAMExcEditor(QtCore.QObject):
|
|
|
else:
|
|
else:
|
|
|
self.tool_shape = self.app.plotcanvas.new_shape_collection(layers=1)
|
|
self.tool_shape = self.app.plotcanvas.new_shape_collection(layers=1)
|
|
|
else:
|
|
else:
|
|
|
- from AppGUI.PlotCanvasLegacy import ShapeCollectionLegacy
|
|
|
|
|
|
|
+ from appGUI.PlotCanvasLegacy import ShapeCollectionLegacy
|
|
|
self.shapes = ShapeCollectionLegacy(obj=self, app=self.app, name='shapes_exc_editor')
|
|
self.shapes = ShapeCollectionLegacy(obj=self, app=self.app, name='shapes_exc_editor')
|
|
|
self.tool_shape = ShapeCollectionLegacy(obj=self, app=self.app, name='tool_shapes_exc_editor')
|
|
self.tool_shape = ShapeCollectionLegacy(obj=self, app=self.app, name='tool_shapes_exc_editor')
|
|
|
|
|
|
|
@@ -2312,7 +2312,7 @@ class FlatCAMExcEditor(QtCore.QObject):
|
|
|
tool_dia = float('%.*f' % (self.decimals, v['C']))
|
|
tool_dia = float('%.*f' % (self.decimals, v['C']))
|
|
|
self.tool2tooldia[int(k)] = tool_dia
|
|
self.tool2tooldia[int(k)] = tool_dia
|
|
|
|
|
|
|
|
- # Init AppGUI
|
|
|
|
|
|
|
+ # Init appGUI
|
|
|
self.addtool_entry.set_value(float(self.app.defaults['excellon_editor_newdia']))
|
|
self.addtool_entry.set_value(float(self.app.defaults['excellon_editor_newdia']))
|
|
|
self.drill_array_size_entry.set_value(int(self.app.defaults['excellon_editor_array_size']))
|
|
self.drill_array_size_entry.set_value(int(self.app.defaults['excellon_editor_array_size']))
|
|
|
self.drill_axis_radio.set_value(self.app.defaults['excellon_editor_lin_dir'])
|
|
self.drill_axis_radio.set_value(self.app.defaults['excellon_editor_lin_dir'])
|
|
@@ -3043,7 +3043,7 @@ class FlatCAMExcEditor(QtCore.QObject):
|
|
|
|
|
|
|
|
self.set_ui()
|
|
self.set_ui()
|
|
|
|
|
|
|
|
- # now that we hava data, create the AppGUI interface and add it to the Tool Tab
|
|
|
|
|
|
|
+ # now that we hava data, create the appGUI interface and add it to the Tool Tab
|
|
|
self.build_ui(first_run=True)
|
|
self.build_ui(first_run=True)
|
|
|
|
|
|
|
|
# we activate this after the initial build as we don't need to see the tool been populated
|
|
# we activate this after the initial build as we don't need to see the tool been populated
|
|
@@ -4026,7 +4026,7 @@ class FlatCAMExcEditor(QtCore.QObject):
|
|
|
|
|
|
|
|
def select_tool(self, toolname):
|
|
def select_tool(self, toolname):
|
|
|
"""
|
|
"""
|
|
|
- Selects a drawing tool. Impacts the object and AppGUI.
|
|
|
|
|
|
|
+ Selects a drawing tool. Impacts the object and appGUI.
|
|
|
|
|
|
|
|
:param toolname: Name of the tool.
|
|
:param toolname: Name of the tool.
|
|
|
:return: None
|
|
:return: None
|