- cleaned the Preferences classes and added the signals and signal slots in those classes, removing them from the main app class

- each FlatCAM object found in Preferences has it's own set of controls for changing the colors
- added a set of gray icons to be used when the theme is complete dark (for now it is useful only for MacOS with dark theme because at the moment the app is not styled to dark UI except the plot area)
This commit is contained in:
Marius Stanciu
2019-12-27 03:05:17 +02:00
committed by Marius
parent 787d85391a
commit 55549c7ba5
302 changed files with 933 additions and 505 deletions

View File

@@ -4252,8 +4252,7 @@ class CNCjob(Geometry):
# return fig
def plot2(self, tooldia=None, dpi=75, margin=0.1, gcode_parsed=None,
color={"T": ["#F0E24D4C", "#B5AB3A4C"], "C": ["#5E6CFFFF", "#4650BDFF"]},
alpha={"T": 0.3, "C": 1.0}, tool_tolerance=0.0005, obj=None, visible=False, kind='all'):
color=None, alpha={"T": 0.3, "C": 1.0}, tool_tolerance=0.0005, obj=None, visible=False, kind='all'):
"""
Plots the G-code job onto the given axes.
@@ -4270,6 +4269,12 @@ class CNCjob(Geometry):
"""
# units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().upper()
if color is None:
color = {
"T": [self.app.defaults["cncjob_travel_fill"], self.app.defaults["cncjob_travel_line"]],
"C": [self.app.defaults["cncjob_plot_fill"], self.app.defaults["cncjob_plot_line"]]
}
gcode_parsed = gcode_parsed if gcode_parsed else self.gcode_parsed
path_num = 0