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

- fixed Editor Transform Tool in Gerber Editor 

- added a message in the status bar when copying coordinates to clipboard with SHIFT + LMB click combo
- languages update
This commit is contained in:
Marius Stanciu 2019-06-20 19:40:06 +03:00
parent 8091355915
commit 32f1c4f8fe
10 changed files with 1540 additions and 1461 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
FlatCAMApp.py
View File

@ -5424,6 +5424,7 @@ class App(QtCore.QObject):
self.click_noproject = True self.click_noproject = True
self.clipboard.setText(self.defaults["global_point_clipboard_format"] % (self.pos[0], self.pos[1])) self.clipboard.setText(self.defaults["global_point_clipboard_format"] % (self.pos[0], self.pos[1]))
self.inform.emit(_("[success] Coordinates copied to clipboard."))
return return
self.on_mouse_move_over_plot(event, origin_click=True) self.on_mouse_move_over_plot(event, origin_click=True)
@ -5580,6 +5581,10 @@ class App(QtCore.QObject):
if self.command_active is None: if self.command_active is None:
self.select_objects(key='CTRL') self.select_objects(key='CTRL')
self.delete_hover_shape() self.delete_hover_shape()
elif modifiers == QtCore.Qt.ShiftModifier:
# if SHIFT was pressed and LMB is clicked then we have a coordinates copy to clipboard
# therefore things should stay as they are
pass
else: else:
# If there is no active command (self.command_active is None) then we check if we clicked # If there is no active command (self.command_active is None) then we check if we clicked
# on a object by checking the bounding limits against mouse click position # on a object by checking the bounding limits against mouse click position

6
README.md
View File

@ -9,6 +9,12 @@ CAD program, and create G-Code for Isolation routing.
================================================= =================================================
20.06.2019
- fixed Editor Transform Tool in Gerber Editor
- added a message in the status bar when copying coordinates to clipboard with SHIFT + LMB click combo
- languages update
19.06.2019 19.06.2019
- milling an Excellon file (holes and/or slots) will now transfer the chosen milling bit diameter to the resulting Geometry object - milling an Excellon file (holes and/or slots) will now transfer the chosen milling bit diameter to the resulting Geometry object

138
flatcamEditors/FlatCAMGrbEditor.py
View File

@ -3890,7 +3890,17 @@ class FlatCAMGrbEditor(QtCore.QObject):
"%.4f    " % (0, 0)) "%.4f    " % (0, 0))
# Selection with left mouse button # Selection with left mouse button
if self.active_tool is not None and event.button is 1: if self.active_tool is not None:
modifiers = QtWidgets.QApplication.keyboardModifiers()
# If the SHIFT key is pressed when LMB is clicked then the coordinates are copied to clipboard
if modifiers == QtCore.Qt.ShiftModifier:
self.app.clipboard.setText(
self.app.defaults["global_point_clipboard_format"] % (self.pos[0], self.pos[1])
)
self.app.inform.emit(_("[success] Coordinates copied to clipboard."))
return
# Dispatch event to active_tool # Dispatch event to active_tool
self.active_tool.click(self.app.geo_editor.snap(self.pos[0], self.pos[1])) self.active_tool.click(self.app.geo_editor.snap(self.pos[0], self.pos[1]))
@ -4406,19 +4416,13 @@ class FlatCAMGrbEditor(QtCore.QObject):
if geom_el in selection: if geom_el in selection:
geometric_data = geom_el.geo geometric_data = geom_el.geo
buffered_geom_el = dict() buffered_geom_el = dict()
if 'solid' in geom_el: if 'solid' in geometric_data:
buffered_geom_el['solid'] = DrawToolShape( buffered_geom_el['solid'] = geometric_data['solid'].buffer(buff_value, join_style=join_style)
geometric_data['solid'].buffer(buff_value, join_style=join_style) if 'follow' in geometric_data:
) buffered_geom_el['follow'] = geometric_data['follow'].buffer(buff_value, join_style=join_style)
if 'follow' in geom_el: if 'clear' in geometric_data:
buffered_geom_el['follow'] = DrawToolShape( buffered_geom_el['clear'] = geometric_data['clear'].buffer(buff_value, join_style=join_style)
geometric_data['follow'].buffer(buff_value, join_style=join_style) return DrawToolShape(buffered_geom_el)
)
if 'clear' in geom_el:
buffered_geom_el['clear'] = DrawToolShape(
geometric_data['clear'].buffer(buff_value, join_style=join_style)
)
return buffered_geom_el
else: else:
return geom_el return geom_el
@ -4468,17 +4472,20 @@ class FlatCAMGrbEditor(QtCore.QObject):
if geom_el in selection: if geom_el in selection:
geometric_data = geom_el.geo geometric_data = geom_el.geo
scaled_geom_el = dict() scaled_geom_el = dict()
if 'solid' in geom_el: if 'solid' in geometric_data:
scaled_geom_el['solid'] = DrawToolShape( scaled_geom_el['solid'] = affinity.scale(
affinity.scale(geometric_data['solid'], scale_factor, scale_factor, origin='center')) geometric_data['solid'], scale_factor, scale_factor, origin='center'
if 'follow' in geom_el: )
scaled_geom_el['follow'] = DrawToolShape( if 'follow' in geometric_data:
affinity.scale(geometric_data['follow'], scale_factor, scale_factor, origin='center')) scaled_geom_el['follow'] = affinity.scale(
if 'clear' in geom_el: geometric_data['follow'], scale_factor, scale_factor, origin='center'
scaled_geom_el['clear'] = DrawToolShape( )
affinity.scale(geometric_data['clear'], scale_factor, scale_factor, origin='center')) if 'clear' in geometric_data:
scaled_geom_el['clear'] = affinity.scale(
geometric_data['clear'], scale_factor, scale_factor, origin='center'
)
return scaled_geom_el return DrawToolShape(scaled_geom_el)
else: else:
return geom_el return geom_el
@ -5230,9 +5237,10 @@ class TransformEditorTool(FlatCAMTool):
try: try:
# first get a bounding box to fit all; we use only the 'solids' as those should provide the biggest # first get a bounding box to fit all; we use only the 'solids' as those should provide the biggest
# bounding box # bounding box
for el in elem_list: for el_shape in elem_list:
el = el_shape.geo
if 'solid' in el: if 'solid' in el:
xmin, ymin, xmax, ymax = el['solid'].bounds() xmin, ymin, xmax, ymax = el['solid'].bounds
xminlist.append(xmin) xminlist.append(xmin)
yminlist.append(ymin) yminlist.append(ymin)
xmaxlist.append(xmax) xmaxlist.append(xmax)
@ -5248,13 +5256,14 @@ class TransformEditorTool(FlatCAMTool):
px = 0.5 * (xminimal + xmaximal) px = 0.5 * (xminimal + xmaximal)
py = 0.5 * (yminimal + ymaximal) py = 0.5 * (yminimal + ymaximal)
for sel_el in elem_list: for sel_el_shape in elem_list:
sel_el = sel_el_shape.geo
if 'solid' in sel_el: if 'solid' in sel_el:
sel_el['solid'].rotate(-num, point=(px, py)) sel_el['solid'] = affinity.rotate(sel_el['solid'], angle=-num, origin=(px, py))
if 'follow' in sel_el: if 'follow' in sel_el:
sel_el['follow'].rotate(-num, point=(px, py)) sel_el['follow'] = affinity.rotate(sel_el['follow'], angle=-num, origin=(px, py))
if 'clear' in sel_el: if 'clear' in sel_el:
sel_el['clear'].rotate(-num, point=(px, py)) sel_el['clear'] = affinity.rotate(sel_el['clear'], angle=-num, origin=(px, py))
self.draw_app.plot_all() self.draw_app.plot_all()
self.app.inform.emit(_("[success] Done. Rotate completed.")) self.app.inform.emit(_("[success] Done. Rotate completed."))
@ -5288,9 +5297,10 @@ class TransformEditorTool(FlatCAMTool):
else: else:
# first get a bounding box to fit all; we use only the 'solids' as those should provide the biggest # first get a bounding box to fit all; we use only the 'solids' as those should provide the biggest
# bounding box # bounding box
for el in elem_list: for el_shape in elem_list:
el = el_shape.geo
if 'solid' in el: if 'solid' in el:
xmin, ymin, xmax, ymax = el['solid'].bounds() xmin, ymin, xmax, ymax = el['solid'].bounds
xminlist.append(xmin) xminlist.append(xmin)
yminlist.append(ymin) yminlist.append(ymin)
xmaxlist.append(xmax) xmaxlist.append(xmax)
@ -5308,22 +5318,23 @@ class TransformEditorTool(FlatCAMTool):
self.app.progress.emit(20) self.app.progress.emit(20)
# execute mirroring # execute mirroring
for sel_el in elem_list: for sel_el_shape in elem_list:
sel_el = sel_el_shape.geo
if axis is 'X': if axis is 'X':
if 'solid' in sel_el: if 'solid' in sel_el:
sel_el['solid'].mirror('X', (px, py)) sel_el['solid'] = affinity.scale(sel_el['solid'], xfact=1, yfact=-1, origin=(px, py))
if 'follow' in sel_el: if 'follow' in sel_el:
sel_el['follow'].mirror('X', (px, py)) sel_el['follow'] = affinity.scale(sel_el['follow'], xfact=1, yfact=-1, origin=(px, py))
if 'clear' in sel_el: if 'clear' in sel_el:
sel_el['clear'].mirror('X', (px, py)) sel_el['clear'] = affinity.scale(sel_el['clear'], xfact=1, yfact=-1, origin=(px, py))
self.app.inform.emit(_('[success] Flip on the Y axis done ...')) self.app.inform.emit(_('[success] Flip on the Y axis done ...'))
elif axis is 'Y': elif axis is 'Y':
if 'solid' in sel_el: if 'solid' in sel_el:
sel_el['solid'].mirror('Y', (px, py)) sel_el['solid'] = affinity.scale(sel_el['solid'], xfact=-1, yfact=1, origin=(px, py))
if 'follow' in sel_el: if 'follow' in sel_el:
sel_el['follow'].mirror('Y', (px, py)) sel_el['follow'] = affinity.scale(sel_el['follow'], xfact=-1, yfact=1, origin=(px, py))
if 'clear' in sel_el: if 'clear' in sel_el:
sel_el['clear'].mirror('Y', (px, py)) sel_el['clear'] = affinity.scale(sel_el['clear'], xfact=-1, yfact=1, origin=(px, py))
self.app.inform.emit(_('[success] Flip on the X axis done ...')) self.app.inform.emit(_('[success] Flip on the X axis done ...'))
self.draw_app.plot_all() self.draw_app.plot_all()
self.app.progress.emit(100) self.app.progress.emit(100)
@ -5351,9 +5362,10 @@ class TransformEditorTool(FlatCAMTool):
try: try:
# first get a bounding box to fit all; we use only the 'solids' as those should provide the biggest # first get a bounding box to fit all; we use only the 'solids' as those should provide the biggest
# bounding box # bounding box
for el in elem_list: for el_shape in elem_list:
el = el_shape.geo
if 'solid' in el: if 'solid' in el:
xmin, ymin, xmax, ymax = el['solid'].bounds() xmin, ymin, xmax, ymax = el['solid'].bounds
xminlist.append(xmin) xminlist.append(xmin)
yminlist.append(ymin) yminlist.append(ymin)
@ -5363,21 +5375,22 @@ class TransformEditorTool(FlatCAMTool):
self.app.progress.emit(20) self.app.progress.emit(20)
for sel_el in elem_list: for sel_el_shape in elem_list:
sel_el = sel_el_shape.geo
if axis is 'X': if axis is 'X':
if 'solid' in sel_el: if 'solid' in sel_el:
sel_el['solid'].skew(num, 0, point=(xminimal, yminimal)) sel_el['solid'] = affinity.skew(sel_el['solid'], num, 0, origin=(xminimal, yminimal))
if 'follow' in sel_el: if 'follow' in sel_el:
sel_el['follow'].skew(num, 0, point=(xminimal, yminimal)) sel_el['follow'] = affinity.skew(sel_el['follow'], num, 0, origin=(xminimal, yminimal))
if 'clear' in sel_el: if 'clear' in sel_el:
sel_el['clear'].skew(num, 0, point=(xminimal, yminimal)) sel_el['clear'] = affinity.skew(sel_el['clear'], num, 0, origin=(xminimal, yminimal))
elif axis is 'Y': elif axis is 'Y':
if 'solid' in sel_el: if 'solid' in sel_el:
sel_el['solid'].skew(0, num, point=(xminimal, yminimal)) sel_el['solid'] = affinity.skew(sel_el['solid'], 0, num, origin=(xminimal, yminimal))
if 'follow' in sel_el: if 'follow' in sel_el:
sel_el['follow'].skew(0, num, point=(xminimal, yminimal)) sel_el['follow'] = affinity.skew(sel_el['follow'], 0, num, origin=(xminimal, yminimal))
if 'clear' in sel_el: if 'clear' in sel_el:
sel_el['clear'].skew(0, num, point=(xminimal, yminimal)) sel_el['clear'] = affinity.skew(sel_el['clear'], 0, num, origin=(xminimal, yminimal))
self.draw_app.plot_all() self.draw_app.plot_all()
self.app.inform.emit(_('[success] Skew on the %s axis done ...') % str(axis)) self.app.inform.emit(_('[success] Skew on the %s axis done ...') % str(axis))
@ -5410,9 +5423,10 @@ class TransformEditorTool(FlatCAMTool):
try: try:
# first get a bounding box to fit all; we use only the 'solids' as those should provide the biggest # first get a bounding box to fit all; we use only the 'solids' as those should provide the biggest
# bounding box # bounding box
for el in elem_list: for el_shape in elem_list:
el = el_shape.geo
if 'solid' in el: if 'solid' in el:
xmin, ymin, xmax, ymax = el['solid'].bounds() xmin, ymin, xmax, ymax = el['solid'].bounds
xminlist.append(xmin) xminlist.append(xmin)
yminlist.append(ymin) yminlist.append(ymin)
xmaxlist.append(xmax) xmaxlist.append(xmax)
@ -5433,13 +5447,14 @@ class TransformEditorTool(FlatCAMTool):
px = 0 px = 0
py = 0 py = 0
for sel_el in elem_list: for sel_el_shape in elem_list:
sel_el = sel_el_shape.geo
if 'solid' in sel_el: if 'solid' in sel_el:
sel_el['solid'].scale(xfactor, yfactor, point=(px, py)) sel_el['solid'] = affinity.scale(sel_el['solid'], xfactor, yfactor, origin=(px, py))
if 'follow' in sel_el: if 'follow' in sel_el:
sel_el['follow'].scale(xfactor, yfactor, point=(px, py)) sel_el['follow'] = affinity.scale(sel_el['follow'], xfactor, yfactor, origin=(px, py))
if 'clear' in sel_el: if 'clear' in sel_el:
sel_el['clear'].scale(xfactor, yfactor, point=(px, py)) sel_el['clear'] = affinity.scale(sel_el['clear'], xfactor, yfactor, origin=(px, py))
self.draw_app.plot_all() self.draw_app.plot_all()
self.app.inform.emit(_('[success] Scale on the %s axis done ...') % str(axis)) self.app.inform.emit(_('[success] Scale on the %s axis done ...') % str(axis))
@ -5465,21 +5480,22 @@ class TransformEditorTool(FlatCAMTool):
try: try:
self.app.progress.emit(20) self.app.progress.emit(20)
for sel_el in elem_list: for sel_el_shape in elem_list:
sel_el = sel_el_shape.geo
if axis is 'X': if axis is 'X':
if 'solid' in sel_el: if 'solid' in sel_el:
sel_el['solid'].offset((num, 0)) sel_el['solid'] = affinity.translate(sel_el['solid'], num, 0)
if 'follow' in sel_el: if 'follow' in sel_el:
sel_el['follow'].offset((num, 0)) sel_el['follow'] = affinity.translate(sel_el['follow'], num, 0)
if 'clear' in sel_el: if 'clear' in sel_el:
sel_el['clear'].offset((num, 0)) sel_el['clear'] = affinity.translate(sel_el['clear'], num, 0)
elif axis is 'Y': elif axis is 'Y':
if 'solid' in sel_el: if 'solid' in sel_el:
sel_el['solid'].offset((0, num)) sel_el['solid'] = affinity.translate(sel_el['solid'], 0, num)
if 'follow' in sel_el: if 'follow' in sel_el:
sel_el['follow'].offset((0, num)) sel_el['follow'] = affinity.translate(sel_el['follow'], 0, num)
if 'clear' in sel_el: if 'clear' in sel_el:
sel_el['clear'].offset((0, num)) sel_el['clear'] = affinity.translate(sel_el['clear'], 0, num)
self.draw_app.plot_all() self.draw_app.plot_all()
self.app.inform.emit(_('[success] Offset on the %s axis done ...') % str(axis)) self.app.inform.emit(_('[success] Offset on the %s axis done ...') % str(axis))

BIN
locale/de/LC_MESSAGES/strings.mo
View File

Binary file not shown.

696
locale/de/LC_MESSAGES/strings.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/en/LC_MESSAGES/strings.mo
View File

Binary file not shown.

699
locale/en/LC_MESSAGES/strings.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/ro/LC_MESSAGES/strings.mo
View File

Binary file not shown.

766
locale/ro/LC_MESSAGES/strings.po
View File

File diff suppressed because it is too large Load Diff

691
locale_template/strings.pot
View File

File diff suppressed because it is too large Load Diff