|
|
@@ -16,6 +16,7 @@ import shapely.affinity as affinity
|
|
|
from camlib import Geometry
|
|
|
|
|
|
from flatcamObjects.FlatCAMObj import *
|
|
|
+import FlatCAMTool
|
|
|
|
|
|
import ezdxf
|
|
|
import math
|
|
|
@@ -68,6 +69,10 @@ class GeometryObject(FlatCAMObj, Geometry):
|
|
|
"extracut_length": 0.1,
|
|
|
"endz": 2.0,
|
|
|
"endxy": '',
|
|
|
+ "area_exclusion": False,
|
|
|
+ "area_shape": "polygon",
|
|
|
+ "area_strategy": "over",
|
|
|
+ "area_overz": 1.0,
|
|
|
|
|
|
"startz": None,
|
|
|
"toolchange": False,
|
|
|
@@ -146,6 +151,18 @@ class GeometryObject(FlatCAMObj, Geometry):
|
|
|
|
|
|
self.param_fields = {}
|
|
|
|
|
|
+ # Event signals disconnect id holders
|
|
|
+ self.mr = None
|
|
|
+ self.mm = None
|
|
|
+ self.kp = None
|
|
|
+
|
|
|
+ # variables to be used in area exclusion
|
|
|
+ self.cursor_pos = (0, 0)
|
|
|
+ self.exclusion_areas_list = []
|
|
|
+ self.first_click = False
|
|
|
+ self.points = []
|
|
|
+ self.poly_drawn = False
|
|
|
+
|
|
|
# Attributes to be included in serialization
|
|
|
# Always append to it because it carries contents
|
|
|
# from predecessors.
|
|
|
@@ -344,7 +361,11 @@ class GeometryObject(FlatCAMObj, Geometry):
|
|
|
"toolchangez": self.ui.toolchangez_entry,
|
|
|
"endz": self.ui.endz_entry,
|
|
|
"endxy": self.ui.endxy_entry,
|
|
|
- "cnctooldia": self.ui.addtool_entry
|
|
|
+ "cnctooldia": self.ui.addtool_entry,
|
|
|
+ "area_exclusion": self.ui.exclusion_cb,
|
|
|
+ "area_shape":self.ui.area_shape_radio,
|
|
|
+ "area_strategy": self.ui.strategy_radio,
|
|
|
+ "area_overz": self.ui.over_z_entry,
|
|
|
})
|
|
|
|
|
|
self.param_fields.update({
|
|
|
@@ -402,6 +423,10 @@ class GeometryObject(FlatCAMObj, Geometry):
|
|
|
"toolchangez": None,
|
|
|
"endz": None,
|
|
|
"endxy": '',
|
|
|
+ "area_exclusion": None,
|
|
|
+ "area_shape": None,
|
|
|
+ "area_strategy": None,
|
|
|
+ "area_overz": None,
|
|
|
"spindlespeed": 0,
|
|
|
"toolchangexy": None,
|
|
|
"startz": None
|
|
|
@@ -522,6 +547,9 @@ class GeometryObject(FlatCAMObj, Geometry):
|
|
|
self.ui.apply_param_to_all.clicked.connect(self.on_apply_param_to_all_clicked)
|
|
|
self.ui.cutz_entry.returnPressed.connect(self.on_cut_z_changed)
|
|
|
|
|
|
+ self.ui.add_area_button.clicked.connect(self.on_add_area_click)
|
|
|
+ self.ui.delete_area_button.clicked.connect(self.on_clear_area_click)
|
|
|
+
|
|
|
def on_cut_z_changed(self):
|
|
|
self.old_cutz = self.ui.cutz_entry.get_value()
|
|
|
|
|
|
@@ -2545,6 +2573,219 @@ class GeometryObject(FlatCAMObj, Geometry):
|
|
|
self.ui.plot_cb.setChecked(True)
|
|
|
self.ui_connect()
|
|
|
|
|
|
+ def on_add_area_click(self):
|
|
|
+ self.app.inform.emit('[WARNING_NOTCL] %s' % _("Click the start point of the area."))
|
|
|
+ self.app.call_source = 'geometry'
|
|
|
+
|
|
|
+ if self.app.is_legacy is False:
|
|
|
+ self.app.plotcanvas.graph_event_disconnect('mouse_press', self.app.on_mouse_click_over_plot)
|
|
|
+ self.app.plotcanvas.graph_event_disconnect('mouse_move', self.app.on_mouse_move_over_plot)
|
|
|
+ self.app.plotcanvas.graph_event_disconnect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
|
|
+ else:
|
|
|
+ self.app.plotcanvas.graph_event_disconnect(self.app.mp)
|
|
|
+ self.app.plotcanvas.graph_event_disconnect(self.app.mm)
|
|
|
+ self.app.plotcanvas.graph_event_disconnect(self.app.mr)
|
|
|
+
|
|
|
+ self.mr = self.app.plotcanvas.graph_event_connect('mouse_release', self.on_mouse_release)
|
|
|
+ self.mm = self.app.plotcanvas.graph_event_connect('mouse_move', self.on_mouse_move)
|
|
|
+ # self.kp = self.app.plotcanvas.graph_event_connect('key_press', self.on_key_press)
|
|
|
+
|
|
|
+ # To be called after clicking on the plot.
|
|
|
+ def on_mouse_release(self, event):
|
|
|
+ if self.app.is_legacy is False:
|
|
|
+ event_pos = event.pos
|
|
|
+ # event_is_dragging = event.is_dragging
|
|
|
+ right_button = 2
|
|
|
+ else:
|
|
|
+ event_pos = (event.xdata, event.ydata)
|
|
|
+ # event_is_dragging = self.app.plotcanvas.is_dragging
|
|
|
+ right_button = 3
|
|
|
+
|
|
|
+ event_pos = self.app.plotcanvas.translate_coords(event_pos)
|
|
|
+ if self.app.grid_status():
|
|
|
+ curr_pos = self.app.geo_editor.snap(event_pos[0], event_pos[1])
|
|
|
+ else:
|
|
|
+ curr_pos = (event_pos[0], event_pos[1])
|
|
|
+
|
|
|
+ x1, y1 = curr_pos[0], curr_pos[1]
|
|
|
+
|
|
|
+ shape_type = self.ui.area_shape_radio.get_value()
|
|
|
+
|
|
|
+ # do clear area only for left mouse clicks
|
|
|
+ if event.button == 1:
|
|
|
+ if shape_type == "square":
|
|
|
+ if self.first_click is False:
|
|
|
+ self.first_click = True
|
|
|
+ self.app.inform.emit('[WARNING_NOTCL] %s' % _("Click the end point of the area."))
|
|
|
+
|
|
|
+ self.cursor_pos = self.app.plotcanvas.translate_coords(event_pos)
|
|
|
+ if self.app.grid_status():
|
|
|
+ self.cursor_pos = self.app.geo_editor.snap(event_pos[0], event_pos[1])
|
|
|
+ else:
|
|
|
+ self.app.inform.emit(_("Zone added. Click to start adding next zone or right click to finish."))
|
|
|
+ self.app.delete_selection_shape()
|
|
|
+
|
|
|
+ x0, y0 = self.cursor_pos[0], self.cursor_pos[1]
|
|
|
+
|
|
|
+ pt1 = (x0, y0)
|
|
|
+ pt2 = (x1, y0)
|
|
|
+ pt3 = (x1, y1)
|
|
|
+ pt4 = (x0, y1)
|
|
|
+
|
|
|
+ new_rectangle = Polygon([pt1, pt2, pt3, pt4])
|
|
|
+ self.exclusion_areas_list.append(new_rectangle)
|
|
|
+
|
|
|
+ # add a temporary shape on canvas
|
|
|
+ FlatCAMTool.FlatCAMTool.draw_tool_selection_shape(self, old_coords=(x0, y0), coords=(x1, y1))
|
|
|
+
|
|
|
+ self.first_click = False
|
|
|
+ return
|
|
|
+ else:
|
|
|
+ self.points.append((x1, y1))
|
|
|
+
|
|
|
+ if len(self.points) > 1:
|
|
|
+ self.poly_drawn = True
|
|
|
+ self.app.inform.emit(_("Click on next Point or click right mouse button to complete ..."))
|
|
|
+
|
|
|
+ return ""
|
|
|
+ elif event.button == right_button and self.mouse_is_dragging is False:
|
|
|
+
|
|
|
+ shape_type = self.ui.area_shape_radio.get_value()
|
|
|
+
|
|
|
+ if shape_type == "square":
|
|
|
+ self.first_click = False
|
|
|
+ else:
|
|
|
+ # if we finish to add a polygon
|
|
|
+ if self.poly_drawn is True:
|
|
|
+ try:
|
|
|
+ # try to add the point where we last clicked if it is not already in the self.points
|
|
|
+ last_pt = (x1, y1)
|
|
|
+ if last_pt != self.points[-1]:
|
|
|
+ self.points.append(last_pt)
|
|
|
+ except IndexError:
|
|
|
+ pass
|
|
|
+
|
|
|
+ # we need to add a Polygon and a Polygon can be made only from at least 3 points
|
|
|
+ if len(self.points) > 2:
|
|
|
+ FlatCAMTool.FlatCAMTool.delete_moving_selection_shape(self)
|
|
|
+ pol = Polygon(self.points)
|
|
|
+ # do not add invalid polygons even if they are drawn by utility geometry
|
|
|
+ if pol.is_valid:
|
|
|
+ self.exclusion_areas_list.append(pol)
|
|
|
+ FlatCAMTool.FlatCAMTool.draw_selection_shape_polygon(self, points=self.points)
|
|
|
+ self.app.inform.emit(
|
|
|
+ _("Zone added. Click to start adding next zone or right click to finish."))
|
|
|
+
|
|
|
+ self.points = []
|
|
|
+ self.poly_drawn = False
|
|
|
+ return
|
|
|
+
|
|
|
+ FlatCAMTool.FlatCAMTool.delete_tool_selection_shape(self)
|
|
|
+
|
|
|
+ if self.app.is_legacy is False:
|
|
|
+ self.app.plotcanvas.graph_event_disconnect('mouse_release', self.on_mouse_release)
|
|
|
+ self.app.plotcanvas.graph_event_disconnect('mouse_move', self.on_mouse_move)
|
|
|
+ # self.app.plotcanvas.graph_event_disconnect('key_press', self.on_key_press)
|
|
|
+ else:
|
|
|
+ self.app.plotcanvas.graph_event_disconnect(self.mr)
|
|
|
+ self.app.plotcanvas.graph_event_disconnect(self.mm)
|
|
|
+ # self.app.plotcanvas.graph_event_disconnect(self.kp)
|
|
|
+
|
|
|
+ self.app.mp = self.app.plotcanvas.graph_event_connect('mouse_press',
|
|
|
+ self.app.on_mouse_click_over_plot)
|
|
|
+ self.app.mm = self.app.plotcanvas.graph_event_connect('mouse_move',
|
|
|
+ self.app.on_mouse_move_over_plot)
|
|
|
+ self.app.mr = self.app.plotcanvas.graph_event_connect('mouse_release',
|
|
|
+ self.app.on_mouse_click_release_over_plot)
|
|
|
+
|
|
|
+ self.app.call_source = 'app'
|
|
|
+
|
|
|
+ if len(self.exclusion_areas_list) == 0:
|
|
|
+ return
|
|
|
+
|
|
|
+ def area_disconnect(self):
|
|
|
+ if self.app.is_legacy is False:
|
|
|
+ self.app.plotcanvas.graph_event_disconnect('mouse_release', self.on_mouse_release)
|
|
|
+ self.app.plotcanvas.graph_event_disconnect('mouse_move', self.on_mouse_move)
|
|
|
+ else:
|
|
|
+ self.app.plotcanvas.graph_event_disconnect(self.mr)
|
|
|
+ self.app.plotcanvas.graph_event_disconnect(self.mm)
|
|
|
+ self.app.plotcanvas.graph_event_disconnect(self.kp)
|
|
|
+
|
|
|
+ self.app.mp = self.app.plotcanvas.graph_event_connect('mouse_press',
|
|
|
+ self.app.on_mouse_click_over_plot)
|
|
|
+ self.app.mm = self.app.plotcanvas.graph_event_connect('mouse_move',
|
|
|
+ self.app.on_mouse_move_over_plot)
|
|
|
+ self.app.mr = self.app.plotcanvas.graph_event_connect('mouse_release',
|
|
|
+ self.app.on_mouse_click_release_over_plot)
|
|
|
+ self.points = []
|
|
|
+ self.poly_drawn = False
|
|
|
+ self.exclusion_areas_list = []
|
|
|
+
|
|
|
+ FlatCAMTool.FlatCAMTool.delete_moving_selection_shape(self)
|
|
|
+ FlatCAMTool.FlatCAMTool.delete_tool_selection_shape(self)
|
|
|
+
|
|
|
+ self.app.call_source = "app"
|
|
|
+ self.app.inform.emit("[WARNING_NOTCL] %s" % _("Cancelled. Area exclusion drawing was interrupted."))
|
|
|
+
|
|
|
+ # called on mouse move
|
|
|
+ def on_mouse_move(self, event):
|
|
|
+ shape_type = self.ui.area_shape_radio.get_value()
|
|
|
+
|
|
|
+ if self.app.is_legacy is False:
|
|
|
+ event_pos = event.pos
|
|
|
+ event_is_dragging = event.is_dragging
|
|
|
+ # right_button = 2
|
|
|
+ else:
|
|
|
+ event_pos = (event.xdata, event.ydata)
|
|
|
+ event_is_dragging = self.app.plotcanvas.is_dragging
|
|
|
+ # right_button = 3
|
|
|
+
|
|
|
+ curr_pos = self.app.plotcanvas.translate_coords(event_pos)
|
|
|
+
|
|
|
+ # detect mouse dragging motion
|
|
|
+ if event_is_dragging is True:
|
|
|
+ self.mouse_is_dragging = True
|
|
|
+ else:
|
|
|
+ self.mouse_is_dragging = False
|
|
|
+
|
|
|
+ # update the cursor position
|
|
|
+ if self.app.grid_status():
|
|
|
+ # Update cursor
|
|
|
+ curr_pos = self.app.geo_editor.snap(curr_pos[0], curr_pos[1])
|
|
|
+
|
|
|
+ self.app.app_cursor.set_data(np.asarray([(curr_pos[0], curr_pos[1])]),
|
|
|
+ symbol='++', edge_color=self.app.cursor_color_3D,
|
|
|
+ edge_width=self.app.defaults["global_cursor_width"],
|
|
|
+ size=self.app.defaults["global_cursor_size"])
|
|
|
+
|
|
|
+ # update the positions on status bar
|
|
|
+ self.app.ui.position_label.setText(" <b>X</b>: %.4f "
|
|
|
+ "<b>Y</b>: %.4f" % (curr_pos[0], curr_pos[1]))
|
|
|
+ if self.cursor_pos is None:
|
|
|
+ self.cursor_pos = (0, 0)
|
|
|
+
|
|
|
+ self.app.dx = curr_pos[0] - float(self.cursor_pos[0])
|
|
|
+ self.app.dy = curr_pos[1] - float(self.cursor_pos[1])
|
|
|
+ self.app.ui.rel_position_label.setText("<b>Dx</b>: %.4f <b>Dy</b>: "
|
|
|
+ "%.4f " % (self.app.dx, self.app.dy))
|
|
|
+
|
|
|
+ # draw the utility geometry
|
|
|
+ if shape_type == "square":
|
|
|
+ if self.first_click:
|
|
|
+ self.app.delete_selection_shape()
|
|
|
+ self.app.draw_moving_selection_shape(old_coords=(self.cursor_pos[0], self.cursor_pos[1]),
|
|
|
+ coords=(curr_pos[0], curr_pos[1]))
|
|
|
+ else:
|
|
|
+ FlatCAMTool.FlatCAMTool.delete_moving_selection_shape(self)
|
|
|
+ FlatCAMTool.FlatCAMTool.draw_moving_selection_shape_poly(
|
|
|
+ self, points=self.points, data=(curr_pos[0], curr_pos[1]))
|
|
|
+
|
|
|
+ def on_clear_area_click(self):
|
|
|
+ self.exclusion_areas_list = []
|
|
|
+ FlatCAMTool.FlatCAMTool.delete_moving_selection_shape(self)
|
|
|
+ self.app.delete_selection_shape()
|
|
|
+
|
|
|
@staticmethod
|
|
|
def merge(geo_list, geo_final, multigeo=None):
|
|
|
"""
|
Marius Stanciu