- the application now uses only the default values from the app.options dict, the app.defaults dict holds the definitive default values
- fixed some outstanding issues from the PyQt6 port - PEP8 fixes - minor fixes - updated the saving of Preferences to update the self.options too: the `Apply` action will update the self.options but the `Save` action will save the updated preferences to the file on disk
This commit is contained in:
@@ -228,7 +228,7 @@ class PadEditorGrb(ShapeToolEditorGrb):
|
||||
self.dont_execute = False
|
||||
|
||||
self.storage_obj = self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['geometry']
|
||||
self.steps_per_circ = self.draw_app.app.defaults["geometry_circle_steps"]
|
||||
self.steps_per_circ = self.draw_app.app.options["geometry_circle_steps"]
|
||||
|
||||
# if those cause KeyError exception it means that the aperture type is not 'R'. Only 'R' type has those keys
|
||||
try:
|
||||
@@ -273,7 +273,7 @@ class PadEditorGrb(ShapeToolEditorGrb):
|
||||
# updating values here allows us to change the aperture on the fly, after the Tool has been started
|
||||
self.storage_obj = self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['geometry']
|
||||
self.radius = float(self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['size']) / 2
|
||||
self.steps_per_circ = self.draw_app.app.defaults["geometry_circle_steps"]
|
||||
self.steps_per_circ = self.draw_app.app.options["geometry_circle_steps"]
|
||||
|
||||
# if those cause KeyError exception it means that the aperture type is not 'R'. Only 'R' type has those keys
|
||||
try:
|
||||
@@ -438,7 +438,7 @@ class PadArrayEditorGrb(ShapeToolEditorGrb):
|
||||
QtGui.QGuiApplication.setOverrideCursor(self.cursor)
|
||||
|
||||
self.storage_obj = self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['geometry']
|
||||
self.steps_per_circ = self.draw_app.app.defaults["geometry_circle_steps"]
|
||||
self.steps_per_circ = self.draw_app.app.options["geometry_circle_steps"]
|
||||
|
||||
# if those cause KeyError exception it means that the aperture type is not 'R'. Only 'R' type has those keys
|
||||
try:
|
||||
@@ -629,7 +629,7 @@ class PadArrayEditorGrb(ShapeToolEditorGrb):
|
||||
# updating values here allows us to change the aperture on the fly, after the Tool has been started
|
||||
self.storage_obj = self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['geometry']
|
||||
self.radius = float(self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['size']) / 2
|
||||
self.steps_per_circ = self.draw_app.app.defaults["geometry_circle_steps"]
|
||||
self.steps_per_circ = self.draw_app.app.options["geometry_circle_steps"]
|
||||
|
||||
# if those cause KeyError exception it means that the aperture type is not 'R'. Only 'R' type has those keys
|
||||
try:
|
||||
@@ -942,7 +942,7 @@ class PoligonizeEditorGrb(ShapeToolEditorGrb):
|
||||
# MS: always return to the Select Tool if modifier key is not pressed
|
||||
# else return to the current tool
|
||||
key_modifier = QtWidgets.QApplication.keyboardModifiers()
|
||||
if self.draw_app.app.defaults["global_mselect_key"] == 'Control':
|
||||
if self.draw_app.app.options["global_mselect_key"] == 'Control':
|
||||
modifier_to_use = Qt.KeyboardModifier.ControlModifier
|
||||
else:
|
||||
modifier_to_use = Qt.KeyboardModifier.ShiftModifier
|
||||
@@ -971,7 +971,7 @@ class RegionEditorGrb(ShapeToolEditorGrb):
|
||||
self.draw_app = draw_app
|
||||
self.dont_execute = False
|
||||
|
||||
self.steps_per_circle = self.draw_app.app.defaults["gerber_circle_steps"]
|
||||
self.steps_per_circle = self.draw_app.app.options["gerber_circle_steps"]
|
||||
|
||||
# try:
|
||||
# size_ap = float(self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['size'])
|
||||
@@ -1337,7 +1337,7 @@ class TrackEditorGrb(ShapeToolEditorGrb):
|
||||
self.draw_app = draw_app
|
||||
self.dont_execute = False
|
||||
|
||||
self.steps_per_circle = self.draw_app.app.defaults["gerber_circle_steps"]
|
||||
self.steps_per_circle = self.draw_app.app.options["gerber_circle_steps"]
|
||||
|
||||
try:
|
||||
size_ap = float(self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['size'])
|
||||
@@ -1667,7 +1667,7 @@ class DiscEditorGrb(ShapeToolEditorGrb):
|
||||
|
||||
self.draw_app.app.jump_signal.connect(lambda x: self.draw_app.update_utility_geometry(data=x))
|
||||
|
||||
self.steps_per_circ = self.draw_app.app.defaults["gerber_circle_steps"]
|
||||
self.steps_per_circ = self.draw_app.app.options["gerber_circle_steps"]
|
||||
|
||||
def click(self, point):
|
||||
self.points.append(point)
|
||||
@@ -1787,7 +1787,7 @@ class DiscSemiEditorGrb(ShapeToolEditorGrb):
|
||||
}
|
||||
self.storage_obj = self.draw_app.storage_dict[0]['geometry']
|
||||
|
||||
self.steps_per_circ = self.draw_app.app.defaults["gerber_circle_steps"]
|
||||
self.steps_per_circ = self.draw_app.app.options["gerber_circle_steps"]
|
||||
self.draw_app.app.jump_signal.connect(lambda x: self.draw_app.update_utility_geometry(data=x))
|
||||
|
||||
def click(self, point):
|
||||
@@ -2206,7 +2206,7 @@ class MoveEditorGrb(ShapeToolEditorGrb):
|
||||
|
||||
self.draw_app.app.jump_signal.connect(lambda x: self.draw_app.update_utility_geometry(data=x))
|
||||
|
||||
self.sel_limit = self.draw_app.app.defaults["gerber_editor_sel_limit"]
|
||||
self.sel_limit = self.draw_app.app.options["gerber_editor_sel_limit"]
|
||||
self.selection_shape = self.selection_bbox()
|
||||
|
||||
def set_origin(self, origin):
|
||||
@@ -2421,7 +2421,7 @@ class EraserEditorGrb(ShapeToolEditorGrb):
|
||||
|
||||
self.draw_app.app.jump_signal.connect(lambda x: self.draw_app.update_utility_geometry(data=x))
|
||||
|
||||
self.sel_limit = self.draw_app.app.defaults["gerber_editor_sel_limit"]
|
||||
self.sel_limit = self.draw_app.app.options["gerber_editor_sel_limit"]
|
||||
|
||||
def set_origin(self, origin):
|
||||
self.origin = origin
|
||||
@@ -2614,7 +2614,7 @@ class SelectEditorGrb(QtCore.QObject, DrawTool):
|
||||
else:
|
||||
mod_key = None
|
||||
|
||||
if mod_key == self.draw_app.app.defaults["global_mselect_key"]:
|
||||
if mod_key == self.draw_app.app.options["global_mselect_key"]:
|
||||
pass
|
||||
else:
|
||||
self.draw_app.selected = []
|
||||
@@ -2630,7 +2630,7 @@ class SelectEditorGrb(QtCore.QObject, DrawTool):
|
||||
else:
|
||||
mod_key = None
|
||||
|
||||
if mod_key != self.draw_app.app.defaults["global_mselect_key"]:
|
||||
if mod_key != self.draw_app.app.options["global_mselect_key"]:
|
||||
self.draw_app.selected.clear()
|
||||
self.sel_aperture.clear()
|
||||
|
||||
@@ -2903,8 +2903,8 @@ class ImportEditorGrb(QtCore.QObject, DrawTool):
|
||||
|
||||
# Update cursor
|
||||
self.app.app_cursor.set_data(np.asarray([(x, y)]), symbol='++', edge_color=self.app.cursor_color_3D,
|
||||
edge_width=self.app.defaults["global_cursor_width"],
|
||||
size=self.app.defaults["global_cursor_size"])
|
||||
edge_width=self.app.options["global_cursor_width"],
|
||||
size=self.app.options["global_cursor_size"])
|
||||
|
||||
self.snap_x = x
|
||||
self.snap_y = y
|
||||
@@ -2931,8 +2931,8 @@ class ImportEditorGrb(QtCore.QObject, DrawTool):
|
||||
self.app.delete_selection_shape()
|
||||
if dx < 0:
|
||||
self.app.draw_moving_selection_shape((self.pos[0], self.pos[1]), (x, y),
|
||||
color=self.app.defaults["global_alt_sel_line"],
|
||||
face_color=self.app.defaults['global_alt_sel_fill'])
|
||||
color=self.app.options["global_alt_sel_line"],
|
||||
face_color=self.app.options['global_alt_sel_fill'])
|
||||
self.app.selection_type = False
|
||||
else:
|
||||
self.app.draw_moving_selection_shape((self.pos[0], self.pos[1]), (x, y))
|
||||
@@ -3024,9 +3024,9 @@ class ImportEditorGrb(QtCore.QObject, DrawTool):
|
||||
if solid_geo not in self.get_selected_geos():
|
||||
shape_id = self.app.tool_shapes.add(tolerance=obj.drawing_tolerance, layer=0,
|
||||
shape=solid_geo,
|
||||
color=self.app.defaults[
|
||||
color=self.app.options[
|
||||
'global_sel_draw_color'] + 'AF',
|
||||
face_color=self.app.defaults[
|
||||
face_color=self.app.options[
|
||||
'global_sel_draw_color'
|
||||
] + 'AF',
|
||||
visible=True)
|
||||
@@ -3068,8 +3068,8 @@ class ImportEditorGrb(QtCore.QObject, DrawTool):
|
||||
|
||||
added_poly_count = 0
|
||||
|
||||
color = self.app.defaults['global_sel_draw_color'] + 'AF'
|
||||
face_color = self.app.defaults['global_sel_draw_color'] + 'AF'
|
||||
color = self.app.options['global_sel_draw_color'] + 'AF'
|
||||
face_color = self.app.options['global_sel_draw_color'] + 'AF'
|
||||
|
||||
for obj in self.app.collection.get_list():
|
||||
# only Gerber objects and only those that are active and not the edited object
|
||||
@@ -3347,7 +3347,7 @@ class AppGerberEditor(QtCore.QObject):
|
||||
# this will flag if the Editor "tools" are launched from key shortcuts (True) or from menu toolbar (False)
|
||||
self.launched_from_shortcuts = False
|
||||
|
||||
def_tol_val = float(self.app.defaults["global_tolerance"])
|
||||
def_tol_val = float(self.app.options["global_tolerance"])
|
||||
self.tolerance = def_tol_val if self.units == 'MM' else def_tol_val / 25.4
|
||||
|
||||
# options of this widget (AppGerberEditor class is a widget)
|
||||
@@ -3527,31 +3527,31 @@ class AppGerberEditor(QtCore.QObject):
|
||||
# #############################################################################################################
|
||||
# Init appGUI
|
||||
# #############################################################################################################
|
||||
self.ui.buffer_distance_entry.set_value(self.app.defaults["gerber_editor_buff_f"])
|
||||
self.ui.scale_factor_entry.set_value(self.app.defaults["gerber_editor_scale_f"])
|
||||
self.ui.ma_upper_threshold_entry.set_value(self.app.defaults["gerber_editor_ma_high"])
|
||||
self.ui.ma_lower_threshold_entry.set_value(self.app.defaults["gerber_editor_ma_low"])
|
||||
self.ui.buffer_distance_entry.set_value(self.app.options["gerber_editor_buff_f"])
|
||||
self.ui.scale_factor_entry.set_value(self.app.options["gerber_editor_scale_f"])
|
||||
self.ui.ma_upper_threshold_entry.set_value(self.app.options["gerber_editor_ma_high"])
|
||||
self.ui.ma_lower_threshold_entry.set_value(self.app.options["gerber_editor_ma_low"])
|
||||
|
||||
self.ui.apsize_entry.set_value(self.app.defaults["gerber_editor_newsize"])
|
||||
self.ui.aptype_cb.set_value(self.app.defaults["gerber_editor_newtype"])
|
||||
self.ui.apdim_entry.set_value(self.app.defaults["gerber_editor_newdim"])
|
||||
self.ui.apsize_entry.set_value(self.app.options["gerber_editor_newsize"])
|
||||
self.ui.aptype_cb.set_value(self.app.options["gerber_editor_newtype"])
|
||||
self.ui.apdim_entry.set_value(self.app.options["gerber_editor_newdim"])
|
||||
|
||||
# PAD Array
|
||||
self.ui.array_type_radio.set_value('linear') # Linear
|
||||
self.on_array_type_radio(val=self.ui.array_type_radio.get_value())
|
||||
self.ui.pad_array_size_entry.set_value(int(self.app.defaults["gerber_editor_array_size"]))
|
||||
self.ui.pad_array_size_entry.set_value(int(self.app.options["gerber_editor_array_size"]))
|
||||
|
||||
# linear array
|
||||
self.ui.pad_axis_radio.set_value('X')
|
||||
self.on_linear_angle_radio(val=self.ui.pad_axis_radio.get_value())
|
||||
self.ui.pad_axis_radio.set_value(self.app.defaults["gerber_editor_lin_axis"])
|
||||
self.ui.pad_pitch_entry.set_value(float(self.app.defaults["gerber_editor_lin_pitch"]))
|
||||
self.ui.linear_angle_spinner.set_value(self.app.defaults["gerber_editor_lin_angle"])
|
||||
self.ui.pad_axis_radio.set_value(self.app.options["gerber_editor_lin_axis"])
|
||||
self.ui.pad_pitch_entry.set_value(float(self.app.options["gerber_editor_lin_pitch"]))
|
||||
self.ui.linear_angle_spinner.set_value(self.app.options["gerber_editor_lin_angle"])
|
||||
|
||||
# circular array
|
||||
self.ui.pad_direction_radio.set_value('CW')
|
||||
self.ui.pad_direction_radio.set_value(self.app.defaults["gerber_editor_circ_dir"])
|
||||
self.ui.pad_angle_entry.set_value(float(self.app.defaults["gerber_editor_circ_angle"]))
|
||||
self.ui.pad_direction_radio.set_value(self.app.options["gerber_editor_circ_dir"])
|
||||
self.ui.pad_angle_entry.set_value(float(self.app.options["gerber_editor_circ_angle"]))
|
||||
|
||||
self.ui.geo_coords_entry.setText('')
|
||||
self.ui.geo_vertex_entry.set_value(0.0)
|
||||
@@ -3559,7 +3559,7 @@ class AppGerberEditor(QtCore.QObject):
|
||||
self.ui.geo_zoom.set_value(False)
|
||||
|
||||
# Show/Hide Advanced Options
|
||||
app_mode = self.app.defaults["global_app_level"]
|
||||
app_mode = self.app.options["global_app_level"]
|
||||
self.change_level(app_mode)
|
||||
|
||||
def build_ui(self, first_run=None):
|
||||
@@ -3724,7 +3724,7 @@ class AppGerberEditor(QtCore.QObject):
|
||||
self.ui.apcode_entry.set_value(max(self.tid2apcode.values()) + 1)
|
||||
except ValueError:
|
||||
# this means that the edited object has no apertures so we start with 10 (Gerber specifications)
|
||||
self.ui.apcode_entry.set_value(self.app.defaults["gerber_editor_newcode"])
|
||||
self.ui.apcode_entry.set_value(self.app.options["gerber_editor_newcode"])
|
||||
|
||||
def on_aperture_add(self, apcode=None):
|
||||
self.is_modified = True
|
||||
@@ -4551,7 +4551,7 @@ class AppGerberEditor(QtCore.QObject):
|
||||
else:
|
||||
self.conversion_factor = 0.0393700787401575
|
||||
|
||||
def_tol_val = float(self.app.defaults["global_tolerance"])
|
||||
def_tol_val = float(self.app.options["global_tolerance"])
|
||||
self.tolerance = def_tol_val if self.units == 'MM' else def_tol_val / 25.4
|
||||
|
||||
# Hide original geometry
|
||||
@@ -4995,7 +4995,7 @@ class AppGerberEditor(QtCore.QObject):
|
||||
def on_row_selected(self, row, col):
|
||||
# if col == 0:
|
||||
key_modifier = QtWidgets.QApplication.keyboardModifiers()
|
||||
if self.app.defaults["global_mselect_key"] == 'Control':
|
||||
if self.app.options["global_mselect_key"] == 'Control':
|
||||
modifier_to_use = Qt.KeyboardModifier.ControlModifier
|
||||
else:
|
||||
modifier_to_use = Qt.KeyboardModifier.ShiftModifier
|
||||
@@ -5188,7 +5188,7 @@ class AppGerberEditor(QtCore.QObject):
|
||||
# If the SHIFT key is pressed when LMB is clicked then the coordinates are copied to clipboard
|
||||
if modifiers == QtCore.Qt.KeyboardModifier.ShiftModifier:
|
||||
self.app.clipboard.setText(
|
||||
self.app.defaults["global_point_clipboard_format"] %
|
||||
self.app.options["global_point_clipboard_format"] %
|
||||
(self.decimals, self.pos[0], self.decimals, self.pos[1])
|
||||
)
|
||||
self.app.inform.emit('[success] %s' % _("Copied to clipboard."))
|
||||
@@ -5206,7 +5206,7 @@ class AppGerberEditor(QtCore.QObject):
|
||||
# MS: always return to the Select Tool if modifier key is not pressed
|
||||
# else return to the current tool
|
||||
key_modifier = QtWidgets.QApplication.keyboardModifiers()
|
||||
if self.app.defaults["global_mselect_key"] == 'Control':
|
||||
if self.app.options["global_mselect_key"] == 'Control':
|
||||
modifier_to_use = Qt.KeyboardModifier.ControlModifier
|
||||
else:
|
||||
modifier_to_use = Qt.KeyboardModifier.ShiftModifier
|
||||
@@ -5286,9 +5286,9 @@ class AppGerberEditor(QtCore.QObject):
|
||||
self.select_tool(self.active_tool.name)
|
||||
else:
|
||||
key_modifier = QtWidgets.QApplication.keyboardModifiers()
|
||||
if (self.app.defaults["global_mselect_key"] == 'Control' and
|
||||
if (self.app.options["global_mselect_key"] == 'Control' and
|
||||
key_modifier == Qt.KeyboardModifier.ControlModifier) or \
|
||||
(self.app.defaults["global_mselect_key"] == 'Shift' and
|
||||
(self.app.options["global_mselect_key"] == 'Shift' and
|
||||
key_modifier == Qt.KeyboardModifier.ShiftModifier):
|
||||
|
||||
self.select_tool(self.active_tool.name)
|
||||
@@ -5335,7 +5335,7 @@ class AppGerberEditor(QtCore.QObject):
|
||||
geometric_data = obj.geo['solid']
|
||||
if (sel_type is True and poly_selection.contains(geometric_data)) or \
|
||||
(sel_type is False and poly_selection.intersects(geometric_data)):
|
||||
if self.key == self.app.defaults["global_mselect_key"]:
|
||||
if self.key == self.app.options["global_mselect_key"]:
|
||||
if obj in self.selected:
|
||||
self.selected.remove(obj)
|
||||
else:
|
||||
@@ -5448,8 +5448,8 @@ class AppGerberEditor(QtCore.QObject):
|
||||
|
||||
# Update cursor
|
||||
self.app.app_cursor.set_data(np.asarray([(x, y)]), symbol='++', edge_color=self.app.cursor_color_3D,
|
||||
edge_width=self.app.defaults["global_cursor_width"],
|
||||
size=self.app.defaults["global_cursor_size"])
|
||||
edge_width=self.app.options["global_cursor_width"],
|
||||
size=self.app.options["global_cursor_size"])
|
||||
|
||||
self.snap_x = x
|
||||
self.snap_y = y
|
||||
@@ -5489,8 +5489,8 @@ class AppGerberEditor(QtCore.QObject):
|
||||
self.app.delete_selection_shape()
|
||||
if dx < 0:
|
||||
self.app.draw_moving_selection_shape((self.pos[0], self.pos[1]), (x, y),
|
||||
color=self.app.defaults["global_alt_sel_line"],
|
||||
face_color=self.app.defaults['global_alt_sel_fill'])
|
||||
color=self.app.options["global_alt_sel_line"],
|
||||
face_color=self.app.options['global_alt_sel_fill'])
|
||||
self.app.selection_type = False
|
||||
else:
|
||||
self.app.draw_moving_selection_shape((self.pos[0], self.pos[1]), (x, y))
|
||||
@@ -5516,8 +5516,8 @@ class AppGerberEditor(QtCore.QObject):
|
||||
geometric_data = el['solid']
|
||||
# Add the new utility shape
|
||||
self.tool_shape.add(
|
||||
shape=geometric_data, color=(self.app.defaults["global_draw_color"]),
|
||||
# face_color=self.app.defaults['global_alt_sel_fill'],
|
||||
shape=geometric_data, color=(self.app.options["global_draw_color"]),
|
||||
# face_color=self.app.options['global_alt_sel_fill'],
|
||||
update=False, layer=0, tolerance=None
|
||||
)
|
||||
except TypeError:
|
||||
@@ -5525,8 +5525,8 @@ class AppGerberEditor(QtCore.QObject):
|
||||
# Add the new utility shape
|
||||
self.tool_shape.add(
|
||||
shape=geometric_data,
|
||||
color=(self.app.defaults["global_draw_color"]),
|
||||
# face_color=self.app.defaults['global_alt_sel_fill'],
|
||||
color=(self.app.options["global_draw_color"]),
|
||||
# face_color=self.app.options['global_alt_sel_fill'],
|
||||
update=False, layer=0, tolerance=None
|
||||
)
|
||||
|
||||
@@ -5553,11 +5553,11 @@ class AppGerberEditor(QtCore.QObject):
|
||||
|
||||
if elem in self.selected:
|
||||
self.plot_shape(geometry=geometric_data,
|
||||
color=self.app.defaults['global_sel_draw_color'] + 'FF',
|
||||
color=self.app.options['global_sel_draw_color'] + 'FF',
|
||||
linewidth=2)
|
||||
else:
|
||||
self.plot_shape(geometry=geometric_data,
|
||||
color=self.app.defaults['global_draw_color'][:-2] + 'FF')
|
||||
color=self.app.options['global_draw_color'][:-2] + 'FF')
|
||||
|
||||
if self.utility:
|
||||
for elem in self.utility:
|
||||
@@ -6001,7 +6001,7 @@ class AppGerberEditor(QtCore.QObject):
|
||||
|
||||
if text:
|
||||
self.ma_annotation.set(text=text, pos=position, visible=True,
|
||||
font_size=self.app.defaults["cncjob_annotation_fontsize"],
|
||||
font_size=self.app.options["cncjob_annotation_fontsize"],
|
||||
color='#000000FF')
|
||||
self.app.inform.emit('[success] %s' % _("Polygons marked."))
|
||||
else:
|
||||
@@ -7159,27 +7159,27 @@ class TransformEditorTool(AppTool):
|
||||
|
||||
def set_tool_ui(self):
|
||||
# Initialize form
|
||||
ref_val = self.app.defaults["tools_transform_reference"]
|
||||
ref_val = self.app.options["tools_transform_reference"]
|
||||
if ref_val == _("Object"):
|
||||
ref_val = _("Selection")
|
||||
self.ref_combo.set_value(ref_val)
|
||||
self.point_entry.set_value(self.app.defaults["tools_transform_ref_point"])
|
||||
self.rotate_entry.set_value(self.app.defaults["tools_transform_rotate"])
|
||||
self.point_entry.set_value(self.app.options["tools_transform_ref_point"])
|
||||
self.rotate_entry.set_value(self.app.options["tools_transform_rotate"])
|
||||
|
||||
self.skewx_entry.set_value(self.app.defaults["tools_transform_skew_x"])
|
||||
self.skewy_entry.set_value(self.app.defaults["tools_transform_skew_y"])
|
||||
self.skew_link_cb.set_value(self.app.defaults["tools_transform_skew_link"])
|
||||
self.skewx_entry.set_value(self.app.options["tools_transform_skew_x"])
|
||||
self.skewy_entry.set_value(self.app.options["tools_transform_skew_y"])
|
||||
self.skew_link_cb.set_value(self.app.options["tools_transform_skew_link"])
|
||||
|
||||
self.scalex_entry.set_value(self.app.defaults["tools_transform_scale_x"])
|
||||
self.scaley_entry.set_value(self.app.defaults["tools_transform_scale_y"])
|
||||
self.scale_link_cb.set_value(self.app.defaults["tools_transform_scale_link"])
|
||||
self.scalex_entry.set_value(self.app.options["tools_transform_scale_x"])
|
||||
self.scaley_entry.set_value(self.app.options["tools_transform_scale_y"])
|
||||
self.scale_link_cb.set_value(self.app.options["tools_transform_scale_link"])
|
||||
|
||||
self.offx_entry.set_value(self.app.defaults["tools_transform_offset_x"])
|
||||
self.offy_entry.set_value(self.app.defaults["tools_transform_offset_y"])
|
||||
self.offx_entry.set_value(self.app.options["tools_transform_offset_x"])
|
||||
self.offy_entry.set_value(self.app.options["tools_transform_offset_y"])
|
||||
|
||||
self.buffer_entry.set_value(self.app.defaults["tools_transform_buffer_dis"])
|
||||
self.buffer_factor_entry.set_value(self.app.defaults["tools_transform_buffer_factor"])
|
||||
self.buffer_rounded_cb.set_value(self.app.defaults["tools_transform_buffer_corner"])
|
||||
self.buffer_entry.set_value(self.app.options["tools_transform_buffer_dis"])
|
||||
self.buffer_factor_entry.set_value(self.app.options["tools_transform_buffer_factor"])
|
||||
self.buffer_rounded_cb.set_value(self.app.options["tools_transform_buffer_corner"])
|
||||
|
||||
# initial state is hidden
|
||||
self.point_label.hide()
|
||||
@@ -7603,10 +7603,10 @@ class TransformEditorTool(AppTool):
|
||||
else:
|
||||
if 'solid' in sel_el:
|
||||
sel_el['solid'] = sel_el['solid'].buffer(
|
||||
value, resolution=self.app.defaults["gerber_circle_steps"], join_style=join)
|
||||
value, resolution=self.app.options["gerber_circle_steps"], join_style=join)
|
||||
if 'clear' in sel_el:
|
||||
sel_el['clear'] = sel_el['clear'].buffer(
|
||||
value, resolution=self.app.defaults["gerber_circle_steps"], join_style=join)
|
||||
value, resolution=self.app.options["gerber_circle_steps"], join_style=join)
|
||||
|
||||
self.draw_app.plot_all()
|
||||
|
||||
@@ -7621,7 +7621,7 @@ class TransformEditorTool(AppTool):
|
||||
val_box = FCInputDoubleSpinner(title=_("Rotate ..."),
|
||||
text='%s:' % _('Enter an Angle Value (degrees)'),
|
||||
min=-359.9999, max=360.0000, decimals=self.decimals,
|
||||
init_val=float(self.app.defaults['tools_transform_rotate']),
|
||||
init_val=float(self.app.options['tools_transform_rotate']),
|
||||
parent=self.app.ui)
|
||||
val_box.set_icon(QtGui.QIcon(self.app.resource_location + '/rotate.png'))
|
||||
|
||||
@@ -7639,7 +7639,7 @@ class TransformEditorTool(AppTool):
|
||||
val_box = FCInputDoubleSpinner(title=_("Offset on X axis ..."),
|
||||
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
|
||||
min=-10000.0000, max=10000.0000, decimals=self.decimals,
|
||||
init_val=float(self.app.defaults['tools_transform_offset_x']),
|
||||
init_val=float(self.app.options['tools_transform_offset_x']),
|
||||
parent=self.app.ui)
|
||||
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/offsetx32.png'))
|
||||
|
||||
@@ -7657,7 +7657,7 @@ class TransformEditorTool(AppTool):
|
||||
val_box = FCInputDoubleSpinner(title=_("Offset on Y axis ..."),
|
||||
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
|
||||
min=-10000.0000, max=10000.0000, decimals=self.decimals,
|
||||
init_val=float(self.app.defaults['tools_transform_offset_y']),
|
||||
init_val=float(self.app.options['tools_transform_offset_y']),
|
||||
parent=self.app.ui)
|
||||
val_box.set_icon(QtGui.QIcon(self.app.resource_location + '/offsety32.png'))
|
||||
|
||||
@@ -7673,7 +7673,7 @@ class TransformEditorTool(AppTool):
|
||||
val_box = FCInputDoubleSpinner(title=_("Skew on X axis ..."),
|
||||
text='%s:' % _('Enter an Angle Value (degrees)'),
|
||||
min=-359.9999, max=360.0000, decimals=self.decimals,
|
||||
init_val=float(self.app.defaults['tools_transform_skew_x']),
|
||||
init_val=float(self.app.options['tools_transform_skew_x']),
|
||||
parent=self.app.ui)
|
||||
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/skewX.png'))
|
||||
|
||||
@@ -7689,7 +7689,7 @@ class TransformEditorTool(AppTool):
|
||||
val_box = FCInputDoubleSpinner(title=_("Skew on Y axis ..."),
|
||||
text='%s:' % _('Enter an Angle Value (degrees)'),
|
||||
min=-359.9999, max=360.0000, decimals=self.decimals,
|
||||
init_val=float(self.app.defaults['tools_transform_skew_y']),
|
||||
init_val=float(self.app.options['tools_transform_skew_y']),
|
||||
parent=self.app.ui)
|
||||
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/skewY.png'))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user