diff --git a/FlatCAMDraw.py b/FlatCAMDraw.py index 18974b3..39592ab 100644 --- a/FlatCAMDraw.py +++ b/FlatCAMDraw.py @@ -1022,9 +1022,9 @@ class FlatCAMDraw(QtCore.QObject): # animated=True) try: for el in list(geo.geo): - self.tool_shape.add(el, color='blue', update=False) + self.tool_shape.add(el, color='#00000080', update=False) except TypeError: - self.tool_shape.add(geo.geo, color='blue', update=False) + self.tool_shape.add(geo.geo, color='#00000080', update=False) self.tool_shape.redraw() diff --git a/FlatCAMObj.py b/FlatCAMObj.py index 1273f39..6790ac3 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -53,6 +53,9 @@ class FlatCAMObj(QtCore.QObject): # self.ui.offset_button.clicked.connect(self.on_offset_button_click) # self.ui.scale_button.clicked.connect(self.on_scale_button_click) + def __del__(self): + pass + def from_dict(self, d): """ This supersedes ``from_dict`` in derived classes. Derived classes diff --git a/VisPyCanvas.py b/VisPyCanvas.py index 609cbbc..0ea77da 100644 --- a/VisPyCanvas.py +++ b/VisPyCanvas.py @@ -60,8 +60,9 @@ class VisPyCanvas(scene.SceneCanvas): def fit_view(self): rect = Rect(-1, -1, 10, 10) try: - rect.left, rect.right = self.shape_collection.bounds(axis=0) - rect.bottom, rect.top = self.shape_collection.bounds(axis=1) + rect.left, rect.right = self.shape_collection.bounds(axis=0, view=self.shape_collection) + rect.bottom, rect.top = self.shape_collection.bounds(axis=1, view=self.shape_collection) except TypeError: pass self.view.camera.rect = rect + print "fit_view", rect diff --git a/VisPyVisuals.py b/VisPyVisuals.py index 6ca558b..104f32e 100644 --- a/VisPyVisuals.py +++ b/VisPyVisuals.py @@ -27,13 +27,12 @@ class ShapeGroup(object): for i in self._indexes: self._collection.remove(i, False) - self._indexes = [] + del self._indexes[:] if update: self._collection.redraw() def redraw(self): - t0 = time.time() self._collection.redraw() @property @@ -54,7 +53,7 @@ class ShapeCollectionVisual(CompoundVisual): total_segments = 0 total_tris = 0 - def __init__(self, line_width=1, triangulation='vispy', **kwargs): + def __init__(self, line_width=1, triangulation='gpc', **kwargs): self.data = {} self.last_key = -1 @@ -181,12 +180,12 @@ class ShapeCollectionVisual(CompoundVisual): self.data[key]['mesh_colors'] = mesh_colors def remove(self, key, update=False): - del self.data[key] + self.data.pop(key) if update: self._update() def clear(self, update=False): - self.data = {} + self.data.clear() if update: self._update() @@ -213,6 +212,7 @@ class ShapeCollectionVisual(CompoundVisual): # Updating mesh if len(mesh_vertices) > 0: set_state(polygon_offset_fill=False) + print "set mesh data", len(mesh_vertices) self._mesh.set_data(np.asarray(mesh_vertices), np.asarray(mesh_tris, dtype=np.uint32), face_colors=np.asarray(mesh_colors)) @@ -230,7 +230,7 @@ class ShapeCollectionVisual(CompoundVisual): self._line._changed['pos'] = True self._line.update() - self._line._bounds_changed() + # self._line._bounds_changed() self._mesh._bounds_changed() self._bounds_changed()