bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- the application now uses only the default values from the app.options dict, the app.defaults dict holds the definitive default values

Browse Source 
- 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:
Marius Stanciu
2022-02-18 23:06:58 +02:00
committed by Marius
parent 14d9ea5470
commit 65d8dcc0b2
92 changed files with 1881 additions and 1882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
appPlugins/ToolFilm.py
View File

@@ -186,40 +186,40 @@ class Film(AppTool):
self.reset_fields()
f_type = self.app.defaults["tools_film_polarity"] if self.app.defaults["tools_film_polarity"] else 'neg'
f_type = self.app.options["tools_film_polarity"] if self.app.options["tools_film_polarity"] else 'neg'
self.ui.film_type.set_value(str(f_type))
self.ui.on_film_type(val=f_type)
b_entry = self.app.defaults["tools_film_boundary"] if self.app.defaults["tools_film_boundary"] else 0.0
b_entry = self.app.options["tools_film_boundary"] if self.app.options["tools_film_boundary"] else 0.0
self.ui.boundary_entry.set_value(float(b_entry))
scale_stroke_width = self.app.defaults["tools_film_scale_stroke"] if \
self.app.defaults["tools_film_scale_stroke"] else 0.0
scale_stroke_width = self.app.options["tools_film_scale_stroke"] if \
self.app.options["tools_film_scale_stroke"] else 0.0
self.ui.film_scale_stroke_entry.set_value(float(scale_stroke_width))
self.ui.punch_cb.set_value(False)
self.ui.source_punch.set_value('exc')
self.ui.film_scale_cb.set_value(self.app.defaults["tools_film_scale_cb"])
self.ui.film_scalex_entry.set_value(float(self.app.defaults["tools_film_scale_x_entry"]))
self.ui.film_scaley_entry.set_value(float(self.app.defaults["tools_film_scale_y_entry"]))
self.ui.scale_ref_combo.set_value(self.app.defaults["tools_film_scale_ref"])
self.ui.film_scale_cb.set_value(self.app.options["tools_film_scale_cb"])
self.ui.film_scalex_entry.set_value(float(self.app.options["tools_film_scale_x_entry"]))
self.ui.film_scaley_entry.set_value(float(self.app.options["tools_film_scale_y_entry"]))
self.ui.scale_ref_combo.set_value(self.app.options["tools_film_scale_ref"])
self.ui.film_skew_cb.set_value(self.app.defaults["tools_film_skew_cb"])
self.ui.film_skewx_entry.set_value(float(self.app.defaults["tools_film_skew_x_entry"]))
self.ui.film_skewy_entry.set_value(float(self.app.defaults["tools_film_skew_y_entry"]))
self.ui.skew_ref_combo.set_value(self.app.defaults["tools_film_skew_ref"])
self.ui.film_skew_cb.set_value(self.app.options["tools_film_skew_cb"])
self.ui.film_skewx_entry.set_value(float(self.app.options["tools_film_skew_x_entry"]))
self.ui.film_skewy_entry.set_value(float(self.app.options["tools_film_skew_y_entry"]))
self.ui.skew_ref_combo.set_value(self.app.options["tools_film_skew_ref"])
self.ui.film_mirror_cb.set_value(self.app.defaults["tools_film_mirror_cb"])
self.ui.film_mirror_axis.set_value(self.app.defaults["tools_film_mirror_axis_radio"])
self.ui.file_type_radio.set_value(self.app.defaults["tools_film_file_type_radio"])
self.ui.orientation_radio.set_value(self.app.defaults["tools_film_orientation"])
self.ui.pagesize_combo.set_value(self.app.defaults["tools_film_pagesize"])
self.ui.film_mirror_cb.set_value(self.app.options["tools_film_mirror_cb"])
self.ui.film_mirror_axis.set_value(self.app.options["tools_film_mirror_axis_radio"])
self.ui.file_type_radio.set_value(self.app.options["tools_film_file_type_radio"])
self.ui.orientation_radio.set_value(self.app.options["tools_film_orientation"])
self.ui.pagesize_combo.set_value(self.app.options["tools_film_pagesize"])
self.ui.png_dpi_spinner.set_value(self.app.defaults["tools_film_png_dpi"])
self.ui.png_dpi_spinner.set_value(self.app.options["tools_film_png_dpi"])
self.ui.convex_box_cb.set_value(self.app.defaults["tools_film_shape"])
self.ui.rounded_cb.set_value(self.app.defaults["tools_film_rounded"])
self.ui.convex_box_cb.set_value(self.app.options["tools_film_shape"])
self.ui.rounded_cb.set_value(self.app.options["tools_film_rounded"])
obj = self.app.collection.get_active()
if obj:
@@ -251,7 +251,7 @@ class Film(AppTool):
self.on_type_box_index_changed(val='grb')
# 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 change_level(self, level):
@@ -298,12 +298,12 @@ class Film(AppTool):
self.ui.film_adj_label.show()
self.ui.adj_frame.show()
self.ui.film_scale_cb.set_value(self.app.defaults["tools_film_scale_cb"])
self.ui.film_skew_cb.set_value(self.app.defaults["tools_film_skew_cb"])
self.ui.film_mirror_cb.set_value(self.app.defaults["tools_film_mirror_cb"])
self.ui.film_scale_cb.set_value(self.app.options["tools_film_scale_cb"])
self.ui.film_skew_cb.set_value(self.app.options["tools_film_skew_cb"])
self.ui.film_mirror_cb.set_value(self.app.options["tools_film_mirror_cb"])
scale_stroke_width = self.app.defaults["tools_film_scale_stroke"] if \
self.app.defaults["tools_film_scale_stroke"] else 0.0
scale_stroke_width = self.app.options["tools_film_scale_stroke"] if \
self.app.options["tools_film_scale_stroke"] else 0.0
self.ui.film_scale_stroke_entry.set_value(float(scale_stroke_width))
def on_film_creation(self):
@@ -599,7 +599,7 @@ class Film(AppTool):
self.app.defaults.report_usage("export_negative()")
if filename is None:
filename = self.app.defaults["global_last_save_folder"]
filename = self.app.options["global_last_save_folder"]
self.app.log.debug("Film.export_svg() negative")
@@ -896,7 +896,7 @@ class Film(AppTool):
self.app.log.error("FilmTool.export_negative() --> PDF output Reportlab section --> %s" % str(e))
return 'fail'
if self.app.defaults["global_open_style"] is False:
if self.app.options["global_open_style"] is False:
self.app.file_opened.emit("SVG", filename)
self.app.file_saved.emit("SVG", filename)
self.app.inform.emit('[success] %s: %s' % (_("Film file exported to"), filename))
@@ -949,7 +949,7 @@ class Film(AppTool):
self.app.defaults.report_usage("export_positive()")
if filename is None:
filename = self.app.defaults["global_last_save_folder"]
filename = self.app.options["global_last_save_folder"]
self.app.log.debug("Film.export_positive() black")
@@ -1171,7 +1171,7 @@ class Film(AppTool):
self.app.log.error("FilmTool.export_positive() --> PDF output --> %s" % str(e))
return 'fail'
if self.app.defaults["global_open_style"] is False:
if self.app.options["global_open_style"] is False:
self.app.file_opened.emit("SVG", filename)
self.app.file_saved.emit("SVG", filename)
self.app.inform.emit('[success] %s: %s' % (_("Film file exported to"), filename))