CNC job general prefs
This commit is contained in:
David Robertson
@@ -142,21 +142,6 @@ class PreferencesUIManager:
|
|||||||
self.ui.excellon_defaults_form.excellon_editor_group.slot_array_circular_angle_entry,
|
self.ui.excellon_defaults_form.excellon_editor_group.slot_array_circular_angle_entry,
|
||||||
|
|
||||||
|
|
||||||
# CNCJob General
|
|
||||||
"cncjob_plot": self.ui.cncjob_defaults_form.cncjob_gen_group.plot_cb,
|
|
||||||
"cncjob_plot_kind": self.ui.cncjob_defaults_form.cncjob_gen_group.cncplot_method_radio,
|
|
||||||
"cncjob_annotation": self.ui.cncjob_defaults_form.cncjob_gen_group.annotation_cb,
|
|
||||||
|
|
||||||
"cncjob_tooldia": self.ui.cncjob_defaults_form.cncjob_gen_group.tooldia_entry,
|
|
||||||
"cncjob_coords_type": self.ui.cncjob_defaults_form.cncjob_gen_group.coords_type_radio,
|
|
||||||
"cncjob_coords_decimals": self.ui.cncjob_defaults_form.cncjob_gen_group.coords_dec_entry,
|
|
||||||
"cncjob_fr_decimals": self.ui.cncjob_defaults_form.cncjob_gen_group.fr_dec_entry,
|
|
||||||
"cncjob_steps_per_circle": self.ui.cncjob_defaults_form.cncjob_gen_group.steps_per_circle_entry,
|
|
||||||
"cncjob_line_ending": self.ui.cncjob_defaults_form.cncjob_gen_group.line_ending_cb,
|
|
||||||
"cncjob_plot_line": self.ui.cncjob_defaults_form.cncjob_gen_group.line_color_entry,
|
|
||||||
"cncjob_plot_fill": self.ui.cncjob_defaults_form.cncjob_gen_group.fill_color_entry,
|
|
||||||
"cncjob_travel_line": self.ui.cncjob_defaults_form.cncjob_gen_group.tline_color_entry,
|
|
||||||
"cncjob_travel_fill": self.ui.cncjob_defaults_form.cncjob_gen_group.tfill_color_entry,
|
|
||||||
|
|
||||||
# CNC Job Options
|
# CNC Job Options
|
||||||
"cncjob_prepend": self.ui.cncjob_defaults_form.cncjob_opt_group.prepend_text,
|
"cncjob_prepend": self.ui.cncjob_defaults_form.cncjob_opt_group.prepend_text,
|
||||||
@@ -552,35 +537,7 @@ class PreferencesUIManager:
|
|||||||
"background-color:%s;"
|
"background-color:%s;"
|
||||||
"border-color: dimgray" % str(self.defaults['excellon_plot_line'])[:7])
|
"border-color: dimgray" % str(self.defaults['excellon_plot_line'])[:7])
|
||||||
|
|
||||||
# Init CNCJob Travel Line Colors
|
|
||||||
self.ui.cncjob_defaults_form.cncjob_gen_group.tfill_color_entry.set_value(
|
|
||||||
self.defaults['cncjob_travel_fill'])
|
|
||||||
self.ui.cncjob_defaults_form.cncjob_gen_group.tfill_color_button.setStyleSheet(
|
|
||||||
"background-color:%s;"
|
|
||||||
"border-color: dimgray" % str(self.defaults['cncjob_travel_fill'])[:7])
|
|
||||||
self.ui.cncjob_defaults_form.cncjob_gen_group.tcolor_alpha_spinner.set_value(
|
|
||||||
int(self.defaults['cncjob_travel_fill'][7:9], 16))
|
|
||||||
self.ui.cncjob_defaults_form.cncjob_gen_group.tcolor_alpha_slider.setValue(
|
|
||||||
int(self.defaults['cncjob_travel_fill'][7:9], 16))
|
|
||||||
|
|
||||||
self.ui.cncjob_defaults_form.cncjob_gen_group.tline_color_entry.set_value(
|
|
||||||
self.defaults['cncjob_travel_line'])
|
|
||||||
self.ui.cncjob_defaults_form.cncjob_gen_group.tline_color_button.setStyleSheet(
|
|
||||||
"background-color:%s;"
|
|
||||||
"border-color: dimgray" % str(self.defaults['cncjob_travel_line'])[:7])
|
|
||||||
|
|
||||||
# Init CNCJob Plot Colors
|
|
||||||
self.ui.cncjob_defaults_form.cncjob_gen_group.fill_color_entry.set_value(
|
|
||||||
self.defaults['cncjob_plot_fill'])
|
|
||||||
self.ui.cncjob_defaults_form.cncjob_gen_group.fill_color_button.setStyleSheet(
|
|
||||||
"background-color:%s;"
|
|
||||||
"border-color: dimgray" % str(self.defaults['cncjob_plot_fill'])[:7])
|
|
||||||
|
|
||||||
self.ui.cncjob_defaults_form.cncjob_gen_group.line_color_entry.set_value(
|
|
||||||
self.defaults['cncjob_plot_line'])
|
|
||||||
self.ui.cncjob_defaults_form.cncjob_gen_group.line_color_button.setStyleSheet(
|
|
||||||
"background-color:%s;"
|
|
||||||
"border-color: dimgray" % str(self.defaults['cncjob_plot_line'])[:7])
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,389 +1,142 @@
|
|||||||
from PyQt5 import QtWidgets, QtCore, QtGui
|
from flatcamGUI.preferences.OptionUI import *
|
||||||
from PyQt5.QtCore import QSettings
|
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI2
|
||||||
|
|
||||||
from flatcamGUI.GUIElements import FCCheckBox, RadioSet, FCSpinner, FCDoubleSpinner, FCEntry
|
|
||||||
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI
|
|
||||||
import gettext
|
import gettext
|
||||||
import FlatCAMTranslation as fcTranslate
|
import FlatCAMTranslation as fcTranslate
|
||||||
import builtins
|
import builtins
|
||||||
|
|
||||||
fcTranslate.apply_language('strings')
|
fcTranslate.apply_language('strings')
|
||||||
if '_' not in builtins.__dict__:
|
if '_' not in builtins.__dict__:
|
||||||
_ = gettext.gettext
|
_ = gettext.gettext
|
||||||
|
|
||||||
settings = QSettings("Open Source", "FlatCAM")
|
|
||||||
if settings.contains("machinist"):
|
|
||||||
machinist_setting = settings.value('machinist', type=int)
|
|
||||||
else:
|
|
||||||
machinist_setting = 0
|
|
||||||
|
|
||||||
|
class CNCJobGenPrefGroupUI(OptionsGroupUI2):
|
||||||
|
|
||||||
class CNCJobGenPrefGroupUI(OptionsGroupUI):
|
def __init__(self, decimals=4, **kwargs):
|
||||||
def __init__(self, decimals=4, parent=None):
|
|
||||||
# OptionsGroupUI.__init__(self, "CNC Job General Preferences", parent=None)
|
|
||||||
super(CNCJobGenPrefGroupUI, self).__init__(self, parent=parent)
|
|
||||||
|
|
||||||
self.setTitle(str(_("CNC Job General")))
|
|
||||||
self.decimals = decimals
|
self.decimals = decimals
|
||||||
|
super().__init__(**kwargs)
|
||||||
# ## Plot options
|
self.setTitle(str(_("CNC Job General")))
|
||||||
self.plot_options_label = QtWidgets.QLabel("<b>%s:</b>" % _("Plot Options"))
|
|
||||||
self.layout.addWidget(self.plot_options_label)
|
|
||||||
|
|
||||||
grid0 = QtWidgets.QGridLayout()
|
|
||||||
self.layout.addLayout(grid0)
|
|
||||||
grid0.setColumnStretch(0, 0)
|
|
||||||
grid0.setColumnStretch(1, 1)
|
|
||||||
|
|
||||||
# Plot CB
|
|
||||||
# self.plot_cb = QtWidgets.QCheckBox('Plot')
|
|
||||||
self.plot_cb = FCCheckBox(_('Plot Object'))
|
|
||||||
self.plot_cb.setToolTip(_("Plot (show) this object."))
|
|
||||||
grid0.addWidget(self.plot_cb, 0, 0, 1, 2)
|
|
||||||
|
|
||||||
# Plot Kind
|
|
||||||
self.cncplot_method_label = QtWidgets.QLabel('%s:' % _("Plot kind"))
|
|
||||||
self.cncplot_method_label.setToolTip(
|
|
||||||
_("This selects the kind of geometries on the canvas to plot.\n"
|
|
||||||
"Those can be either of type 'Travel' which means the moves\n"
|
|
||||||
"above the work piece or it can be of type 'Cut',\n"
|
|
||||||
"which means the moves that cut into the material.")
|
|
||||||
)
|
|
||||||
|
|
||||||
self.cncplot_method_radio = RadioSet([
|
|
||||||
{"label": _("All"), "value": "all"},
|
|
||||||
{"label": _("Travel"), "value": "travel"},
|
|
||||||
{"label": _("Cut"), "value": "cut"}
|
|
||||||
], orientation='vertical')
|
|
||||||
|
|
||||||
grid0.addWidget(self.cncplot_method_label, 1, 0)
|
|
||||||
grid0.addWidget(self.cncplot_method_radio, 1, 1)
|
|
||||||
grid0.addWidget(QtWidgets.QLabel(''), 1, 2)
|
|
||||||
|
|
||||||
# Display Annotation
|
|
||||||
self.annotation_cb = FCCheckBox(_("Display Annotation"))
|
|
||||||
self.annotation_cb.setToolTip(
|
|
||||||
_("This selects if to display text annotation on the plot.\n"
|
|
||||||
"When checked it will display numbers in order for each end\n"
|
|
||||||
"of a travel line."
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
grid0.addWidget(self.annotation_cb, 2, 0, 1, 3)
|
|
||||||
|
|
||||||
# ###################################################################
|
|
||||||
# Number of circle steps for circular aperture linear approximation #
|
|
||||||
# ###################################################################
|
|
||||||
self.steps_per_circle_label = QtWidgets.QLabel('%s:' % _("Circle Steps"))
|
|
||||||
self.steps_per_circle_label.setToolTip(
|
|
||||||
_("The number of circle steps for <b>GCode</b> \n"
|
|
||||||
"circle and arc shapes linear approximation.")
|
|
||||||
)
|
|
||||||
grid0.addWidget(self.steps_per_circle_label, 3, 0)
|
|
||||||
self.steps_per_circle_entry = FCSpinner()
|
|
||||||
self.steps_per_circle_entry.set_range(0, 99999)
|
|
||||||
grid0.addWidget(self.steps_per_circle_entry, 3, 1)
|
|
||||||
|
|
||||||
# Tool dia for plot
|
|
||||||
tdlabel = QtWidgets.QLabel('%s:' % _('Travel dia'))
|
|
||||||
tdlabel.setToolTip(
|
|
||||||
_("The width of the travel lines to be\n"
|
|
||||||
"rendered in the plot.")
|
|
||||||
)
|
|
||||||
self.tooldia_entry = FCDoubleSpinner()
|
|
||||||
self.tooldia_entry.set_range(0, 99999)
|
|
||||||
self.tooldia_entry.set_precision(self.decimals)
|
|
||||||
self.tooldia_entry.setSingleStep(0.1)
|
|
||||||
self.tooldia_entry.setWrapping(True)
|
|
||||||
|
|
||||||
grid0.addWidget(tdlabel, 4, 0)
|
|
||||||
grid0.addWidget(self.tooldia_entry, 4, 1)
|
|
||||||
|
|
||||||
# add a space
|
|
||||||
grid0.addWidget(QtWidgets.QLabel('<b>%s:</b>' % _("G-code Decimals")), 5, 0, 1, 2)
|
|
||||||
|
|
||||||
# Number of decimals to use in GCODE coordinates
|
|
||||||
cdeclabel = QtWidgets.QLabel('%s:' % _('Coordinates'))
|
|
||||||
cdeclabel.setToolTip(
|
|
||||||
_("The number of decimals to be used for \n"
|
|
||||||
"the X, Y, Z coordinates in CNC code (GCODE, etc.)")
|
|
||||||
)
|
|
||||||
self.coords_dec_entry = FCSpinner()
|
|
||||||
self.coords_dec_entry.set_range(0, 9)
|
|
||||||
self.coords_dec_entry.setWrapping(True)
|
|
||||||
|
|
||||||
grid0.addWidget(cdeclabel, 6, 0)
|
|
||||||
grid0.addWidget(self.coords_dec_entry, 6, 1)
|
|
||||||
|
|
||||||
# Number of decimals to use in GCODE feedrate
|
|
||||||
frdeclabel = QtWidgets.QLabel('%s:' % _('Feedrate'))
|
|
||||||
frdeclabel.setToolTip(
|
|
||||||
_("The number of decimals to be used for \n"
|
|
||||||
"the Feedrate parameter in CNC code (GCODE, etc.)")
|
|
||||||
)
|
|
||||||
self.fr_dec_entry = FCSpinner()
|
|
||||||
self.fr_dec_entry.set_range(0, 9)
|
|
||||||
self.fr_dec_entry.setWrapping(True)
|
|
||||||
|
|
||||||
grid0.addWidget(frdeclabel, 7, 0)
|
|
||||||
grid0.addWidget(self.fr_dec_entry, 7, 1)
|
|
||||||
|
|
||||||
# The type of coordinates used in the Gcode: Absolute or Incremental
|
|
||||||
coords_type_label = QtWidgets.QLabel('%s:' % _('Coordinates type'))
|
|
||||||
coords_type_label.setToolTip(
|
|
||||||
_("The type of coordinates to be used in Gcode.\n"
|
|
||||||
"Can be:\n"
|
|
||||||
"- Absolute G90 -> the reference is the origin x=0, y=0\n"
|
|
||||||
"- Incremental G91 -> the reference is the previous position")
|
|
||||||
)
|
|
||||||
self.coords_type_radio = RadioSet([
|
|
||||||
{"label": _("Absolute G90"), "value": "G90"},
|
|
||||||
{"label": _("Incremental G91"), "value": "G91"}
|
|
||||||
], orientation='vertical', stretch=False)
|
|
||||||
grid0.addWidget(coords_type_label, 8, 0)
|
|
||||||
grid0.addWidget(self.coords_type_radio, 8, 1)
|
|
||||||
|
|
||||||
# hidden for the time being, until implemented
|
# hidden for the time being, until implemented
|
||||||
coords_type_label.hide()
|
self.option_dict()["cncjob_coords_type"].label_widget.hide()
|
||||||
self.coords_type_radio.hide()
|
self.option_dict()["cncjob_coords_type"].get_field().hide()
|
||||||
|
|
||||||
# Line Endings
|
def build_options(self) -> [OptionUI]:
|
||||||
self.line_ending_cb = FCCheckBox(_("Force Windows style line-ending"))
|
return [
|
||||||
self.line_ending_cb.setToolTip(
|
HeadingOptionUI(label_text="Plot Options"),
|
||||||
_("When checked will force a Windows style line-ending\n"
|
CheckboxOptionUI(
|
||||||
"(\\r\\n) on non-Windows OS's.")
|
option="cncjob_plot",
|
||||||
)
|
label_text="Plot Object",
|
||||||
|
label_tooltip="Plot (show) this object."
|
||||||
|
),
|
||||||
|
RadioSetOptionUI(
|
||||||
|
option="cncjob_plot_kind",
|
||||||
|
label_text="Plot kind",
|
||||||
|
label_tooltip="This selects the kind of geometries on the canvas to plot.\n"
|
||||||
|
"Those can be either of type 'Travel' which means the moves\n"
|
||||||
|
"above the work piece or it can be of type 'Cut',\n"
|
||||||
|
"which means the moves that cut into the material.",
|
||||||
|
choices=[
|
||||||
|
{"label": _("All"), "value": "all"},
|
||||||
|
{"label": _("Travel"), "value": "travel"},
|
||||||
|
{"label": _("Cut"), "value": "cut"}
|
||||||
|
],
|
||||||
|
orientation="vertical"
|
||||||
|
),
|
||||||
|
CheckboxOptionUI(
|
||||||
|
option="cncjob_annotation",
|
||||||
|
label_text="Display Annotation",
|
||||||
|
label_tooltip="This selects if to display text annotation on the plot.\n"
|
||||||
|
"When checked it will display numbers in order for each end\n"
|
||||||
|
"of a travel line."
|
||||||
|
),
|
||||||
|
SpinnerOptionUI(
|
||||||
|
option="cncjob_steps_per_circle",
|
||||||
|
label_text="Circle Steps",
|
||||||
|
label_tooltip="The number of circle steps for <b>GCode</b> \n"
|
||||||
|
"circle and arc shapes linear approximation.",
|
||||||
|
min_value=3, max_value=99999, step=1
|
||||||
|
),
|
||||||
|
DoubleSpinnerOptionUI(
|
||||||
|
option="cncjob_tooldia",
|
||||||
|
label_text="Travel dia",
|
||||||
|
label_tooltip="The width of the travel lines to be\n"
|
||||||
|
"rendered in the plot.",
|
||||||
|
min_value=0, max_value=99999, step=0.1, decimals=self.decimals
|
||||||
|
),
|
||||||
|
|
||||||
grid0.addWidget(self.line_ending_cb, 9, 0, 1, 3)
|
HeadingOptionUI(label_text="G-code Decimals"),
|
||||||
|
SpinnerOptionUI(
|
||||||
|
option="cncjob_coords_decimals",
|
||||||
|
label_text="Coordinates",
|
||||||
|
label_tooltip="The number of decimals to be used for \n"
|
||||||
|
"the X, Y, Z coordinates in CNC code (GCODE, etc.)",
|
||||||
|
min_value=0, max_value=9, step=1
|
||||||
|
),
|
||||||
|
SpinnerOptionUI(
|
||||||
|
option="cncjob_fr_decimals",
|
||||||
|
label_text="Feedrate",
|
||||||
|
label_tooltip="The number of decimals to be used for \n"
|
||||||
|
"the Feedrate parameter in CNC code (GCODE, etc.)",
|
||||||
|
min_value=0, max_value=9, step=1
|
||||||
|
),
|
||||||
|
RadioSetOptionUI(
|
||||||
|
option="cncjob_coords_type",
|
||||||
|
label_text="Coordinates type",
|
||||||
|
label_tooltip="The type of coordinates to be used in Gcode.\n"
|
||||||
|
"Can be:\n"
|
||||||
|
"- Absolute G90 -> the reference is the origin x=0, y=0\n"
|
||||||
|
"- Incremental G91 -> the reference is the previous position",
|
||||||
|
choices=[
|
||||||
|
{"label": _("Absolute G90"), "value": "G90"},
|
||||||
|
{"label": _("Incremental G91"), "value": "G91"}
|
||||||
|
],
|
||||||
|
orientation="vertical"
|
||||||
|
),
|
||||||
|
CheckboxOptionUI(
|
||||||
|
option="cncjob_line_ending",
|
||||||
|
label_text="Force Windows style line-ending",
|
||||||
|
label_tooltip="When checked will force a Windows style line-ending\n"
|
||||||
|
"(\\r\\n) on non-Windows OS's."
|
||||||
|
),
|
||||||
|
SeparatorOptionUI(),
|
||||||
|
|
||||||
separator_line = QtWidgets.QFrame()
|
HeadingOptionUI(label_text="Travel Line Color"),
|
||||||
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
|
ColorOptionUI(
|
||||||
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
|
option="cncjob_travel_line",
|
||||||
grid0.addWidget(separator_line, 12, 0, 1, 2)
|
label_text="Outline",
|
||||||
|
label_tooltip="Set the line color for plotted objects.",
|
||||||
|
),
|
||||||
|
ColorOptionUI(
|
||||||
|
option="cncjob_travel_fill",
|
||||||
|
label_text="Fill",
|
||||||
|
label_tooltip="Set the fill color for plotted objects.\n"
|
||||||
|
"First 6 digits are the color and the last 2\n"
|
||||||
|
"digits are for alpha (transparency) level."
|
||||||
|
),
|
||||||
|
ColorAlphaSliderOptionUI(
|
||||||
|
applies_to=["cncjob_travel_line", "cncjob_travel_fill"],
|
||||||
|
group=self,
|
||||||
|
label_text="Alpha",
|
||||||
|
label_tooltip="Set the transparency for plotted objects."
|
||||||
|
),
|
||||||
|
|
||||||
# Travel Line Color
|
HeadingOptionUI(label_text="CNCJob Object Color"),
|
||||||
self.travel_color_label = QtWidgets.QLabel('<b>%s</b>' % _('Travel Line Color'))
|
ColorOptionUI(
|
||||||
grid0.addWidget(self.travel_color_label, 13, 0, 1, 2)
|
option="cncjob_plot_line",
|
||||||
|
label_text="Outline",
|
||||||
# Plot Line Color
|
label_tooltip="Set the line color for plotted objects.",
|
||||||
self.tline_color_label = QtWidgets.QLabel('%s:' % _('Outline'))
|
),
|
||||||
self.tline_color_label.setToolTip(
|
ColorOptionUI(
|
||||||
_("Set the travel line color for plotted objects.")
|
option="cncjob_plot_fill",
|
||||||
)
|
label_text="Fill",
|
||||||
self.tline_color_entry = FCEntry()
|
label_tooltip="Set the fill color for plotted objects.\n"
|
||||||
self.tline_color_button = QtWidgets.QPushButton()
|
"First 6 digits are the color and the last 2\n"
|
||||||
self.tline_color_button.setFixedSize(15, 15)
|
"digits are for alpha (transparency) level."
|
||||||
|
),
|
||||||
self.form_box_child_2 = QtWidgets.QHBoxLayout()
|
ColorAlphaSliderOptionUI(
|
||||||
self.form_box_child_2.addWidget(self.tline_color_entry)
|
applies_to=["cncjob_plot_line", "cncjob_plot_fill"],
|
||||||
self.form_box_child_2.addWidget(self.tline_color_button)
|
group=self,
|
||||||
self.form_box_child_2.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
|
label_text="Alpha",
|
||||||
|
label_tooltip="Set the transparency for plotted objects."
|
||||||
grid0.addWidget(self.tline_color_label, 14, 0)
|
)
|
||||||
grid0.addLayout(self.form_box_child_2, 14, 1)
|
]
|
||||||
|
|
||||||
# Plot Fill Color
|
|
||||||
self.tfill_color_label = QtWidgets.QLabel('%s:' % _('Fill'))
|
|
||||||
self.tfill_color_label.setToolTip(
|
|
||||||
_("Set the fill color for plotted objects.\n"
|
|
||||||
"First 6 digits are the color and the last 2\n"
|
|
||||||
"digits are for alpha (transparency) level.")
|
|
||||||
)
|
|
||||||
self.tfill_color_entry = FCEntry()
|
|
||||||
self.tfill_color_button = QtWidgets.QPushButton()
|
|
||||||
self.tfill_color_button.setFixedSize(15, 15)
|
|
||||||
|
|
||||||
self.form_box_child_1 = QtWidgets.QHBoxLayout()
|
|
||||||
self.form_box_child_1.addWidget(self.tfill_color_entry)
|
|
||||||
self.form_box_child_1.addWidget(self.tfill_color_button)
|
|
||||||
self.form_box_child_1.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
|
|
||||||
|
|
||||||
grid0.addWidget(self.tfill_color_label, 15, 0)
|
|
||||||
grid0.addLayout(self.form_box_child_1, 15, 1)
|
|
||||||
|
|
||||||
# Plot Fill Transparency Level
|
|
||||||
self.alpha_label = QtWidgets.QLabel('%s:' % _('Alpha'))
|
|
||||||
self.alpha_label.setToolTip(
|
|
||||||
_("Set the fill transparency for plotted objects.")
|
|
||||||
)
|
|
||||||
self.tcolor_alpha_slider = QtWidgets.QSlider(QtCore.Qt.Horizontal)
|
|
||||||
self.tcolor_alpha_slider.setMinimum(0)
|
|
||||||
self.tcolor_alpha_slider.setMaximum(255)
|
|
||||||
self.tcolor_alpha_slider.setSingleStep(1)
|
|
||||||
|
|
||||||
self.tcolor_alpha_spinner = FCSpinner()
|
|
||||||
self.tcolor_alpha_spinner.setMinimumWidth(70)
|
|
||||||
self.tcolor_alpha_spinner.set_range(0, 255)
|
|
||||||
|
|
||||||
self.form_box_child_3 = QtWidgets.QHBoxLayout()
|
|
||||||
self.form_box_child_3.addWidget(self.tcolor_alpha_slider)
|
|
||||||
self.form_box_child_3.addWidget(self.tcolor_alpha_spinner)
|
|
||||||
|
|
||||||
grid0.addWidget(self.alpha_label, 16, 0)
|
|
||||||
grid0.addLayout(self.form_box_child_3, 16, 1)
|
|
||||||
|
|
||||||
separator_line = QtWidgets.QFrame()
|
|
||||||
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
|
|
||||||
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
|
|
||||||
grid0.addWidget(separator_line, 17, 0, 1, 2)
|
|
||||||
|
|
||||||
# CNCJob Object Color
|
|
||||||
self.cnc_color_label = QtWidgets.QLabel('<b>%s</b>' % _('CNCJob Object Color'))
|
|
||||||
grid0.addWidget(self.cnc_color_label, 18, 0, 1, 2)
|
|
||||||
|
|
||||||
# Plot Line Color
|
|
||||||
self.line_color_label = QtWidgets.QLabel('%s:' % _('Outline'))
|
|
||||||
self.line_color_label.setToolTip(
|
|
||||||
_("Set the color for plotted objects.")
|
|
||||||
)
|
|
||||||
self.line_color_entry = FCEntry()
|
|
||||||
self.line_color_button = QtWidgets.QPushButton()
|
|
||||||
self.line_color_button.setFixedSize(15, 15)
|
|
||||||
|
|
||||||
self.form_box_child_2 = QtWidgets.QHBoxLayout()
|
|
||||||
self.form_box_child_2.addWidget(self.line_color_entry)
|
|
||||||
self.form_box_child_2.addWidget(self.line_color_button)
|
|
||||||
self.form_box_child_2.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
|
|
||||||
|
|
||||||
grid0.addWidget(self.line_color_label, 19, 0)
|
|
||||||
grid0.addLayout(self.form_box_child_2, 19, 1)
|
|
||||||
|
|
||||||
# Plot Fill Color
|
|
||||||
self.fill_color_label = QtWidgets.QLabel('%s:' % _('Fill'))
|
|
||||||
self.fill_color_label.setToolTip(
|
|
||||||
_("Set the fill color for plotted objects.\n"
|
|
||||||
"First 6 digits are the color and the last 2\n"
|
|
||||||
"digits are for alpha (transparency) level.")
|
|
||||||
)
|
|
||||||
self.fill_color_entry = FCEntry()
|
|
||||||
self.fill_color_button = QtWidgets.QPushButton()
|
|
||||||
self.fill_color_button.setFixedSize(15, 15)
|
|
||||||
|
|
||||||
self.form_box_child_1 = QtWidgets.QHBoxLayout()
|
|
||||||
self.form_box_child_1.addWidget(self.fill_color_entry)
|
|
||||||
self.form_box_child_1.addWidget(self.fill_color_button)
|
|
||||||
self.form_box_child_1.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
|
|
||||||
|
|
||||||
grid0.addWidget(self.fill_color_label, 20, 0)
|
|
||||||
grid0.addLayout(self.form_box_child_1, 20, 1)
|
|
||||||
|
|
||||||
self.layout.addStretch()
|
|
||||||
|
|
||||||
# Setting plot colors signals
|
|
||||||
self.tline_color_entry.editingFinished.connect(self.on_tline_color_entry)
|
|
||||||
self.tline_color_button.clicked.connect(self.on_tline_color_button)
|
|
||||||
self.tfill_color_entry.editingFinished.connect(self.on_tfill_color_entry)
|
|
||||||
self.tfill_color_button.clicked.connect(self.on_tfill_color_button)
|
|
||||||
self.tcolor_alpha_spinner.valueChanged.connect(self.on_tcolor_spinner)
|
|
||||||
self.tcolor_alpha_slider.valueChanged.connect(self.on_tcolor_slider)
|
|
||||||
|
|
||||||
self.line_color_entry.editingFinished.connect(self.on_line_color_entry)
|
|
||||||
self.line_color_button.clicked.connect(self.on_line_color_button)
|
|
||||||
self.fill_color_entry.editingFinished.connect(self.on_fill_color_entry)
|
|
||||||
self.fill_color_button.clicked.connect(self.on_fill_color_button)
|
|
||||||
|
|
||||||
# ------------------------------------------------------
|
|
||||||
# Setting travel colors handlers
|
|
||||||
# ------------------------------------------------------
|
|
||||||
def on_tfill_color_entry(self):
|
|
||||||
self.app.defaults['cncjob_travel_fill'] = self.tfill_color_entry.get_value()[:7] + \
|
|
||||||
self.app.defaults['cncjob_travel_fill'][7:9]
|
|
||||||
self.tfill_color_button.setStyleSheet(
|
|
||||||
"background-color:%s" % str(self.app.defaults['cncjob_travel_fill'])[:7])
|
|
||||||
|
|
||||||
def on_tfill_color_button(self):
|
|
||||||
current_color = QtGui.QColor(self.app.defaults['cncjob_travel_fill'][:7])
|
|
||||||
|
|
||||||
c_dialog = QtWidgets.QColorDialog()
|
|
||||||
plot_fill_color = c_dialog.getColor(initial=current_color)
|
|
||||||
|
|
||||||
if plot_fill_color.isValid() is False:
|
|
||||||
return
|
|
||||||
|
|
||||||
self.tfill_color_button.setStyleSheet("background-color:%s" % str(plot_fill_color.name()))
|
|
||||||
|
|
||||||
new_val = str(plot_fill_color.name()) + str(self.app.defaults['cncjob_travel_fill'][7:9])
|
|
||||||
self.tfill_color_entry.set_value(new_val)
|
|
||||||
self.app.defaults['cncjob_travel_fill'] = new_val
|
|
||||||
|
|
||||||
def on_tcolor_spinner(self):
|
|
||||||
spinner_value = self.tcolor_alpha_spinner.value()
|
|
||||||
self.tcolor_alpha_slider.setValue(spinner_value)
|
|
||||||
self.app.defaults['cncjob_travel_fill'] = \
|
|
||||||
self.app.defaults['cncjob_travel_fill'][:7] + \
|
|
||||||
(hex(spinner_value)[2:] if int(hex(spinner_value)[2:], 16) > 0 else '00')
|
|
||||||
self.app.defaults['cncjob_travel_line'] = \
|
|
||||||
self.app.defaults['cncjob_travel_line'][:7] + \
|
|
||||||
(hex(spinner_value)[2:] if int(hex(spinner_value)[2:], 16) > 0 else '00')
|
|
||||||
|
|
||||||
def on_tcolor_slider(self):
|
|
||||||
slider_value = self.tcolor_alpha_slider.value()
|
|
||||||
self.tcolor_alpha_spinner.setValue(slider_value)
|
|
||||||
|
|
||||||
def on_tline_color_entry(self):
|
|
||||||
self.app.defaults['cncjob_travel_line'] = self.tline_color_entry.get_value()[:7] + \
|
|
||||||
self.app.defaults['cncjob_travel_line'][7:9]
|
|
||||||
self.tline_color_button.setStyleSheet(
|
|
||||||
"background-color:%s" % str(self.app.defaults['cncjob_travel_line'])[:7])
|
|
||||||
|
|
||||||
def on_tline_color_button(self):
|
|
||||||
current_color = QtGui.QColor(self.app.defaults['cncjob_travel_line'][:7])
|
|
||||||
# print(current_color)
|
|
||||||
|
|
||||||
c_dialog = QtWidgets.QColorDialog()
|
|
||||||
plot_line_color = c_dialog.getColor(initial=current_color)
|
|
||||||
|
|
||||||
if plot_line_color.isValid() is False:
|
|
||||||
return
|
|
||||||
|
|
||||||
self.tline_color_button.setStyleSheet("background-color:%s" % str(plot_line_color.name()))
|
|
||||||
|
|
||||||
new_val_line = str(plot_line_color.name()) + str(self.app.defaults['cncjob_travel_line'][7:9])
|
|
||||||
self.tline_color_entry.set_value(new_val_line)
|
|
||||||
self.app.defaults['cncjob_travel_line'] = new_val_line
|
|
||||||
|
|
||||||
# ------------------------------------------------------
|
|
||||||
# Setting plot colors handlers
|
|
||||||
# ------------------------------------------------------
|
|
||||||
def on_fill_color_entry(self):
|
|
||||||
self.app.defaults['cncjob_plot_fill'] = self.fill_color_entry.get_value()[:7] + \
|
|
||||||
self.app.defaults['cncjob_plot_fill'][7:9]
|
|
||||||
self.fill_color_button.setStyleSheet(
|
|
||||||
"background-color:%s" % str(self.app.defaults['cncjob_plot_fill'])[:7])
|
|
||||||
|
|
||||||
def on_fill_color_button(self):
|
|
||||||
current_color = QtGui.QColor(self.app.defaults['cncjob_plot_fill'][:7])
|
|
||||||
|
|
||||||
c_dialog = QtWidgets.QColorDialog()
|
|
||||||
plot_fill_color = c_dialog.getColor(initial=current_color)
|
|
||||||
|
|
||||||
if plot_fill_color.isValid() is False:
|
|
||||||
return
|
|
||||||
|
|
||||||
self.fill_color_button.setStyleSheet("background-color:%s" % str(plot_fill_color.name()))
|
|
||||||
|
|
||||||
new_val = str(plot_fill_color.name()) + str(self.app.defaults['cncjob_plot_fill'][7:9])
|
|
||||||
self.fill_color_entry.set_value(new_val)
|
|
||||||
self.app.defaults['cncjob_plot_fill'] = new_val
|
|
||||||
|
|
||||||
def on_line_color_entry(self):
|
|
||||||
self.app.defaults['cncjob_plot_line'] = self.line_color_entry.get_value()[:7] + \
|
|
||||||
self.app.defaults['cncjob_plot_line'][7:9]
|
|
||||||
self.line_color_button.setStyleSheet(
|
|
||||||
"background-color:%s" % str(self.app.defaults['cncjob_plot_line'])[:7])
|
|
||||||
|
|
||||||
def on_line_color_button(self):
|
|
||||||
current_color = QtGui.QColor(self.app.defaults['cncjob_plot_line'][:7])
|
|
||||||
# print(current_color)
|
|
||||||
|
|
||||||
c_dialog = QtWidgets.QColorDialog()
|
|
||||||
plot_line_color = c_dialog.getColor(initial=current_color)
|
|
||||||
|
|
||||||
if plot_line_color.isValid() is False:
|
|
||||||
return
|
|
||||||
|
|
||||||
self.line_color_button.setStyleSheet("background-color:%s" % str(plot_line_color.name()))
|
|
||||||
|
|
||||||
new_val_line = str(plot_line_color.name()) + str(self.app.defaults['cncjob_plot_line'][7:9])
|
|
||||||
self.line_color_entry.set_value(new_val_line)
|
|
||||||
self.app.defaults['cncjob_plot_line'] = new_val_line
|
|
||||||
@@ -6,19 +6,25 @@ from flatcamGUI.preferences.cncjob.CNCJobAdvOptPrefGroupUI import CNCJobAdvOptPr
|
|||||||
from flatcamGUI.preferences.cncjob.CNCJobOptPrefGroupUI import CNCJobOptPrefGroupUI
|
from flatcamGUI.preferences.cncjob.CNCJobOptPrefGroupUI import CNCJobOptPrefGroupUI
|
||||||
from flatcamGUI.preferences.cncjob.CNCJobGenPrefGroupUI import CNCJobGenPrefGroupUI
|
from flatcamGUI.preferences.cncjob.CNCJobGenPrefGroupUI import CNCJobGenPrefGroupUI
|
||||||
|
|
||||||
|
import gettext
|
||||||
|
import FlatCAMTranslation as fcTranslate
|
||||||
|
import builtins
|
||||||
|
fcTranslate.apply_language('strings')
|
||||||
|
if '_' not in builtins.__dict__:
|
||||||
|
_ = gettext.gettext
|
||||||
|
|
||||||
|
|
||||||
class CNCJobPreferencesUI(PreferencesSectionUI):
|
class CNCJobPreferencesUI(PreferencesSectionUI):
|
||||||
|
|
||||||
def __init__(self, decimals, **kwargs):
|
def __init__(self, decimals, **kwargs):
|
||||||
self.decimals = decimals
|
self.decimals = decimals
|
||||||
self.cncjob_gen_group = CNCJobGenPrefGroupUI(decimals=self.decimals)
|
|
||||||
self.cncjob_opt_group = CNCJobOptPrefGroupUI(decimals=self.decimals)
|
self.cncjob_opt_group = CNCJobOptPrefGroupUI(decimals=self.decimals)
|
||||||
self.cncjob_adv_opt_group = CNCJobAdvOptPrefGroupUI(decimals=self.decimals)
|
self.cncjob_adv_opt_group = CNCJobAdvOptPrefGroupUI(decimals=self.decimals)
|
||||||
super().__init__(**kwargs)
|
super().__init__(**kwargs)
|
||||||
|
|
||||||
def build_groups(self) -> [OptionsGroupUI]:
|
def build_groups(self) -> [OptionsGroupUI]:
|
||||||
return [
|
return [
|
||||||
self.cncjob_gen_group,
|
CNCJobGenPrefGroupUI(decimals=self.decimals),
|
||||||
self.cncjob_opt_group,
|
self.cncjob_opt_group,
|
||||||
self.cncjob_adv_opt_group
|
self.cncjob_adv_opt_group
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user