giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Copper Fill Tool: some PEP8 corrections

This commit is contained in:
Marius Stanciu 2019-10-28 03:06:37 +02:00 committed by Marius
parent f3100c4f28
commit f9ad83ba29
4 changed files with 60 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
FlatCAMApp.py
View File

@ -1697,7 +1697,8 @@ class App(QtCore.QObject):
# Init Plot Colors # Init Plot Colors
self.ui.general_defaults_form.general_gui_group.pf_color_entry.set_value(self.defaults['global_plot_fill']) self.ui.general_defaults_form.general_gui_group.pf_color_entry.set_value(self.defaults['global_plot_fill'])
self.ui.general_defaults_form.general_gui_group.pf_color_button.setStyleSheet( self.ui.general_defaults_form.general_gui_group.pf_color_button.setStyleSheet(
"background-color:%s" % str(self.defaults['global_plot_fill'])[:7]) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['global_plot_fill'])[:7])
self.ui.general_defaults_form.general_gui_group.pf_color_alpha_spinner.set_value( self.ui.general_defaults_form.general_gui_group.pf_color_alpha_spinner.set_value(
int(self.defaults['global_plot_fill'][7:9], 16)) int(self.defaults['global_plot_fill'][7:9], 16))
self.ui.general_defaults_form.general_gui_group.pf_color_alpha_slider.setValue( self.ui.general_defaults_form.general_gui_group.pf_color_alpha_slider.setValue(
@ -1705,12 +1706,14 @@ class App(QtCore.QObject):
self.ui.general_defaults_form.general_gui_group.pl_color_entry.set_value(self.defaults['global_plot_line']) self.ui.general_defaults_form.general_gui_group.pl_color_entry.set_value(self.defaults['global_plot_line'])
self.ui.general_defaults_form.general_gui_group.pl_color_button.setStyleSheet( self.ui.general_defaults_form.general_gui_group.pl_color_button.setStyleSheet(
"background-color:%s" % str(self.defaults['global_plot_line'])[:7]) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['global_plot_line'])[:7])
# Init Left-Right Selection colors # Init Left-Right Selection colors
self.ui.general_defaults_form.general_gui_group.sf_color_entry.set_value(self.defaults['global_sel_fill']) self.ui.general_defaults_form.general_gui_group.sf_color_entry.set_value(self.defaults['global_sel_fill'])
self.ui.general_defaults_form.general_gui_group.sf_color_button.setStyleSheet( self.ui.general_defaults_form.general_gui_group.sf_color_button.setStyleSheet(
"background-color:%s" % str(self.defaults['global_sel_fill'])[:7]) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['global_sel_fill'])[:7])
self.ui.general_defaults_form.general_gui_group.sf_color_alpha_spinner.set_value( self.ui.general_defaults_form.general_gui_group.sf_color_alpha_spinner.set_value(
int(self.defaults['global_sel_fill'][7:9], 16)) int(self.defaults['global_sel_fill'][7:9], 16))
self.ui.general_defaults_form.general_gui_group.sf_color_alpha_slider.setValue( self.ui.general_defaults_form.general_gui_group.sf_color_alpha_slider.setValue(
@ -1718,13 +1721,15 @@ class App(QtCore.QObject):
self.ui.general_defaults_form.general_gui_group.sl_color_entry.set_value(self.defaults['global_sel_line']) self.ui.general_defaults_form.general_gui_group.sl_color_entry.set_value(self.defaults['global_sel_line'])
self.ui.general_defaults_form.general_gui_group.sl_color_button.setStyleSheet( self.ui.general_defaults_form.general_gui_group.sl_color_button.setStyleSheet(
"background-color:%s" % str(self.defaults['global_sel_line'])[:7]) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['global_sel_line'])[:7])
# Init Right-Left Selection colors # Init Right-Left Selection colors
self.ui.general_defaults_form.general_gui_group.alt_sf_color_entry.set_value( self.ui.general_defaults_form.general_gui_group.alt_sf_color_entry.set_value(
self.defaults['global_alt_sel_fill']) self.defaults['global_alt_sel_fill'])
self.ui.general_defaults_form.general_gui_group.alt_sf_color_button.setStyleSheet( self.ui.general_defaults_form.general_gui_group.alt_sf_color_button.setStyleSheet(
"background-color:%s" % str(self.defaults['global_alt_sel_fill'])[:7]) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['global_alt_sel_fill'])[:7])
self.ui.general_defaults_form.general_gui_group.alt_sf_color_alpha_spinner.set_value( self.ui.general_defaults_form.general_gui_group.alt_sf_color_alpha_spinner.set_value(
int(self.defaults['global_sel_fill'][7:9], 16)) int(self.defaults['global_sel_fill'][7:9], 16))
self.ui.general_defaults_form.general_gui_group.alt_sf_color_alpha_slider.setValue( self.ui.general_defaults_form.general_gui_group.alt_sf_color_alpha_slider.setValue(
@ -1733,52 +1738,62 @@ class App(QtCore.QObject):
self.ui.general_defaults_form.general_gui_group.alt_sl_color_entry.set_value( self.ui.general_defaults_form.general_gui_group.alt_sl_color_entry.set_value(
self.defaults['global_alt_sel_line']) self.defaults['global_alt_sel_line'])
self.ui.general_defaults_form.general_gui_group.alt_sl_color_button.setStyleSheet( self.ui.general_defaults_form.general_gui_group.alt_sl_color_button.setStyleSheet(
"background-color:%s" % str(self.defaults['global_alt_sel_line'])[:7]) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['global_alt_sel_line'])[:7])
# Init Draw color and Selection Draw Color # Init Draw color and Selection Draw Color
self.ui.general_defaults_form.general_gui_group.draw_color_entry.set_value( self.ui.general_defaults_form.general_gui_group.draw_color_entry.set_value(
self.defaults['global_draw_color']) self.defaults['global_draw_color'])
self.ui.general_defaults_form.general_gui_group.draw_color_button.setStyleSheet( self.ui.general_defaults_form.general_gui_group.draw_color_button.setStyleSheet(
"background-color:%s" % str(self.defaults['global_draw_color'])[:7]) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['global_draw_color'])[:7])
self.ui.general_defaults_form.general_gui_group.sel_draw_color_entry.set_value( self.ui.general_defaults_form.general_gui_group.sel_draw_color_entry.set_value(
self.defaults['global_sel_draw_color']) self.defaults['global_sel_draw_color'])
self.ui.general_defaults_form.general_gui_group.sel_draw_color_button.setStyleSheet( self.ui.general_defaults_form.general_gui_group.sel_draw_color_button.setStyleSheet(
"background-color:%s" % str(self.defaults['global_sel_draw_color'])[:7]) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['global_sel_draw_color'])[:7])
# Init Project Items color # Init Project Items color
self.ui.general_defaults_form.general_gui_group.proj_color_entry.set_value( self.ui.general_defaults_form.general_gui_group.proj_color_entry.set_value(
self.defaults['global_proj_item_color']) self.defaults['global_proj_item_color'])
self.ui.general_defaults_form.general_gui_group.proj_color_button.setStyleSheet( self.ui.general_defaults_form.general_gui_group.proj_color_button.setStyleSheet(
"background-color:%s" % str(self.defaults['global_proj_item_color'])[:7]) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['global_proj_item_color'])[:7])
self.ui.general_defaults_form.general_gui_group.proj_color_dis_entry.set_value( self.ui.general_defaults_form.general_gui_group.proj_color_dis_entry.set_value(
self.defaults['global_proj_item_dis_color']) self.defaults['global_proj_item_dis_color'])
self.ui.general_defaults_form.general_gui_group.proj_color_dis_button.setStyleSheet( self.ui.general_defaults_form.general_gui_group.proj_color_dis_button.setStyleSheet(
"background-color:%s" % str(self.defaults['global_proj_item_dis_color'])[:7]) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['global_proj_item_dis_color'])[:7])
# Init the Annotation CNC Job color # Init the Annotation CNC Job color
self.ui.cncjob_defaults_form.cncjob_adv_opt_group.annotation_fontcolor_entry.set_value( self.ui.cncjob_defaults_form.cncjob_adv_opt_group.annotation_fontcolor_entry.set_value(
self.defaults['cncjob_annotation_fontcolor']) self.defaults['cncjob_annotation_fontcolor'])
self.ui.cncjob_defaults_form.cncjob_adv_opt_group.annotation_fontcolor_button.setStyleSheet( self.ui.cncjob_defaults_form.cncjob_adv_opt_group.annotation_fontcolor_button.setStyleSheet(
"background-color:%s" % str(self.defaults['cncjob_annotation_fontcolor'])[:7]) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['cncjob_annotation_fontcolor'])[:7])
# Init the Tool Film color # Init the Tool Film color
self.ui.tools_defaults_form.tools_film_group.film_color_entry.set_value( self.ui.tools_defaults_form.tools_film_group.film_color_entry.set_value(
self.defaults['tools_film_color']) self.defaults['tools_film_color'])
self.ui.tools_defaults_form.tools_film_group.film_color_button.setStyleSheet( self.ui.tools_defaults_form.tools_film_group.film_color_button.setStyleSheet(
"background-color:%s" % str(self.defaults['tools_film_color'])[:7]) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['tools_film_color'])[:7]
)
# Init the Tool QRCode colors # Init the Tool QRCode colors
self.ui.tools2_defaults_form.tools2_qrcode_group.fill_color_entry.set_value( self.ui.tools2_defaults_form.tools2_qrcode_group.fill_color_entry.set_value(
self.defaults['tools_qrcode_fill_color']) self.defaults['tools_qrcode_fill_color'])
self.ui.tools2_defaults_form.tools2_qrcode_group.fill_color_button.setStyleSheet( self.ui.tools2_defaults_form.tools2_qrcode_group.fill_color_button.setStyleSheet(
"background-color:%s" % str(self.defaults['tools_qrcode_fill_color'])[:7]) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['tools_qrcode_fill_color'])[:7])
self.ui.tools2_defaults_form.tools2_qrcode_group.back_color_entry.set_value( self.ui.tools2_defaults_form.tools2_qrcode_group.back_color_entry.set_value(
self.defaults['tools_qrcode_back_color']) self.defaults['tools_qrcode_back_color'])
self.ui.tools2_defaults_form.tools2_qrcode_group.back_color_button.setStyleSheet( self.ui.tools2_defaults_form.tools2_qrcode_group.back_color_button.setStyleSheet(
"background-color:%s" % str(self.defaults['tools_qrcode_back_color'])[:7]) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['tools_qrcode_back_color'])[:7])
# ### End of Data #### # ### End of Data ####
@ -6744,7 +6759,9 @@ class App(QtCore.QObject):
self.defaults['tools_film_color'] = \ self.defaults['tools_film_color'] = \
self.ui.tools_defaults_form.tools_film_group.film_color_entry.get_value() self.ui.tools_defaults_form.tools_film_group.film_color_entry.get_value()
self.ui.tools_defaults_form.tools_film_group.film_color_button.setStyleSheet( self.ui.tools_defaults_form.tools_film_group.film_color_button.setStyleSheet(
"background-color:%s" % str(self.defaults['tools_film_color'])) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['tools_film_color'])
)
def on_film_color_button(self): def on_film_color_button(self):
current_color = QtGui.QColor(self.defaults['tools_film_color']) current_color = QtGui.QColor(self.defaults['tools_film_color'])
@ -6760,8 +6777,9 @@ class App(QtCore.QObject):
self.on_preferences_edited() self.on_preferences_edited()
self.ui.tools_defaults_form.tools_film_group.film_color_button.setStyleSheet( self.ui.tools_defaults_form.tools_film_group.film_color_button.setStyleSheet(
"background-color:%s" % str(film_color.name())) "background-color:%s;"
"border-color: dimgray" % str(film_color.name())
)
new_val_sel = str(film_color.name()) new_val_sel = str(film_color.name())
self.ui.tools_defaults_form.tools_film_group.film_color_entry.set_value(new_val_sel) self.ui.tools_defaults_form.tools_film_group.film_color_entry.set_value(new_val_sel)
self.defaults['tools_film_color'] = new_val_sel self.defaults['tools_film_color'] = new_val_sel
@ -6770,7 +6788,9 @@ class App(QtCore.QObject):
self.defaults['tools_qrcode_fill_color'] = \ self.defaults['tools_qrcode_fill_color'] = \
self.ui.tools2_defaults_form.tools2_qrcode_group.fill_color_entry.get_value() self.ui.tools2_defaults_form.tools2_qrcode_group.fill_color_entry.get_value()
self.ui.tools2_defaults_form.tools2_qrcode_group.fill_color_button.setStyleSheet( self.ui.tools2_defaults_form.tools2_qrcode_group.fill_color_button.setStyleSheet(
"background-color:%s" % str(self.defaults['tools_qrcode_fill_color'])) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['tools_qrcode_fill_color'])
)
def on_qrcode_fill_color_button(self): def on_qrcode_fill_color_button(self):
current_color = QtGui.QColor(self.defaults['tools_qrcode_fill_color']) current_color = QtGui.QColor(self.defaults['tools_qrcode_fill_color'])
@ -6786,7 +6806,9 @@ class App(QtCore.QObject):
self.on_preferences_edited() self.on_preferences_edited()
self.ui.tools2_defaults_form.tools2_qrcode_group.fill_color_button.setStyleSheet( self.ui.tools2_defaults_form.tools2_qrcode_group.fill_color_button.setStyleSheet(
"background-color:%s" % str(fill_color.name())) "background-color:%s;"
"border-color: dimgray" % str(fill_color.name())
)
new_val_sel = str(fill_color.name()) new_val_sel = str(fill_color.name())
self.ui.tools2_defaults_form.tools2_qrcode_group.fill_color_entry.set_value(new_val_sel) self.ui.tools2_defaults_form.tools2_qrcode_group.fill_color_entry.set_value(new_val_sel)
@ -6796,7 +6818,9 @@ class App(QtCore.QObject):
self.defaults['tools_qrcode_back_color'] = \ self.defaults['tools_qrcode_back_color'] = \
self.ui.tools2_defaults_form.tools2_qrcode_group.back_color_entry.get_value() self.ui.tools2_defaults_form.tools2_qrcode_group.back_color_entry.get_value()
self.ui.tools2_defaults_form.tools2_qrcode_group.back_color_button.setStyleSheet( self.ui.tools2_defaults_form.tools2_qrcode_group.back_color_button.setStyleSheet(
"background-color:%s" % str(self.defaults['tools_qrcode_back_color'])) "background-color:%s;"
"border-color: dimgray" % str(self.defaults['tools_qrcode_back_color'])
)
def on_qrcode_back_color_button(self): def on_qrcode_back_color_button(self):
current_color = QtGui.QColor(self.defaults['tools_qrcode_back_color']) current_color = QtGui.QColor(self.defaults['tools_qrcode_back_color'])
@ -6812,7 +6836,9 @@ class App(QtCore.QObject):
self.on_preferences_edited() self.on_preferences_edited()
self.ui.tools2_defaults_form.tools2_qrcode_group.back_color_button.setStyleSheet( self.ui.tools2_defaults_form.tools2_qrcode_group.back_color_button.setStyleSheet(
"background-color:%s" % str(back_color.name())) "background-color:%s;"
"border-color: dimgray" % str(back_color.name())
)
new_val_sel = str(back_color.name()) new_val_sel = str(back_color.name())
self.ui.tools2_defaults_form.tools2_qrcode_group.back_color_entry.set_value(new_val_sel) self.ui.tools2_defaults_form.tools2_qrcode_group.back_color_entry.set_value(new_val_sel)

4
README.md
View File

@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
================================================= =================================================
27.10.2019
- Copper Fill Tool: some PEP8 corrections
26.10.2019 26.10.2019
- fixed an error in the FCDoubleSpinner class when FlatCAM is run on system with locale that use the comma as decimal separator - fixed an error in the FCDoubleSpinner class when FlatCAM is run on system with locale that use the comma as decimal separator

16
flatcamTools/ToolCopperFill.py
View File

@ -353,11 +353,11 @@ class ToolCopperFill(FlatCAMTool):
def on_mouse_release(self, event): def on_mouse_release(self, event):
if self.app.is_legacy is False: if self.app.is_legacy is False:
event_pos = event.pos event_pos = event.pos
event_is_dragging = event.is_dragging # event_is_dragging = event.is_dragging
right_button = 2 right_button = 2
else: else:
event_pos = (event.xdata, event.ydata) event_pos = (event.xdata, event.ydata)
event_is_dragging = self.app.plotcanvas.is_dragging # event_is_dragging = self.app.plotcanvas.is_dragging
right_button = 3 right_button = 3
event_pos = self.app.plotcanvas.translate_coords(event_pos) event_pos = self.app.plotcanvas.translate_coords(event_pos)
@ -369,12 +369,12 @@ class ToolCopperFill(FlatCAMTool):
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Click the end point of the filling area.")) self.app.inform.emit('[WARNING_NOTCL] %s' % _("Click the end point of the filling area."))
self.cursor_pos = self.app.plotcanvas.translate_coords(event_pos) self.cursor_pos = self.app.plotcanvas.translate_coords(event_pos)
if self.app.grid_status() == True: if self.app.grid_status() is True:
self.cursor_pos = self.app.geo_editor.snap(event_pos[0], event_pos[1]) self.cursor_pos = self.app.geo_editor.snap(event_pos[0], event_pos[1])
else: else:
self.app.inform.emit(_("Zone added. Click to start adding next zone or right click to finish.")) self.app.inform.emit(_("Zone added. Click to start adding next zone or right click to finish."))
if self.app.grid_status() == True: if self.app.grid_status() is True:
curr_pos = self.app.geo_editor.snap(event_pos[0], event_pos[1]) curr_pos = self.app.geo_editor.snap(event_pos[0], event_pos[1])
else: else:
curr_pos = (event_pos[0], event_pos[1]) curr_pos = (event_pos[0], event_pos[1])
@ -390,7 +390,7 @@ class ToolCopperFill(FlatCAMTool):
self.first_click = False self.first_click = False
return return
elif event.button == right_button and self.mouse_is_dragging == False: elif event.button == right_button and self.mouse_is_dragging is False:
self.app.delete_selection_shape() self.app.delete_selection_shape()
self.area_method = False self.area_method = False
self.first_click = False self.first_click = False
@ -429,11 +429,11 @@ class ToolCopperFill(FlatCAMTool):
if self.app.is_legacy is False: if self.app.is_legacy is False:
event_pos = event.pos event_pos = event.pos
event_is_dragging = event.is_dragging event_is_dragging = event.is_dragging
right_button = 2 # right_button = 2
else: else:
event_pos = (event.xdata, event.ydata) event_pos = (event.xdata, event.ydata)
event_is_dragging = self.app.plotcanvas.is_dragging event_is_dragging = self.app.plotcanvas.is_dragging
right_button = 3 # right_button = 3
curr_pos = self.app.plotcanvas.translate_coords(event_pos) curr_pos = self.app.plotcanvas.translate_coords(event_pos)
@ -444,7 +444,7 @@ class ToolCopperFill(FlatCAMTool):
self.mouse_is_dragging = False self.mouse_is_dragging = False
# update the cursor position # update the cursor position
if self.app.grid_status() == True: if self.app.grid_status() is True:
# Update cursor # Update cursor
curr_pos = self.app.geo_editor.snap(curr_pos[0], curr_pos[1]) curr_pos = self.app.geo_editor.snap(curr_pos[0], curr_pos[1])

2
flatcamTools/ToolNonCopperClear.py
View File

@ -1767,7 +1767,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
# variables to display the percentage of work done # variables to display the percentage of work done
geo_len = len(area.geoms) geo_len = len(area.geoms)
disp_number = 0
old_disp_number = 0 old_disp_number = 0
log.warning("Total number of polygons to be cleared. %s" % str(geo_len)) log.warning("Total number of polygons to be cleared. %s" % str(geo_len))