Jelajahi Sumber

- in legacy graphic engine, fixed bug that made the old object disappear when a new object was loaded
- in legacy graphic engine, fixed bug that crashed the app when creating a new project

Marius Stanciu 6 tahun lalu
induk
melakukan
c17d05600b
3 mengubah file dengan 18 tambahan dan 1 penghapusan
  1. 2 1
      FlatCAMObj.py
  2. 5 0
      README.md
  3. 11 0
      flatcamGUI/PlotCanvasLegacy.py

+ 2 - 1
FlatCAMObj.py

@@ -85,7 +85,8 @@ class FlatCAMObj(QtCore.QObject):
         if self.app.is_legacy is False:
             self.shapes = self.app.plotcanvas.new_shape_group()
         else:
-            self.shapes = ShapeCollectionLegacy(obj=self, app=self.app, name='application')
+            # dont't give an axis name to this one or it will delete the old object when loading a new one
+            self.shapes = ShapeCollectionLegacy(obj=self, app=self.app)
 
         # self.mark_shapes = self.app.plotcanvas.new_shape_collection(layers=2)
         self.mark_shapes = {}

+ 5 - 0
README.md

@@ -9,6 +9,11 @@ CAD program, and create G-Code for Isolation routing.
 
 =================================================
 
+23.09.2019
+
+- in legacy graphic engine, fixed bug that made the old object disappear when a new object was loaded
+- in legacy graphic engine, fixed bug that crashed the app when creating a new project
+
 22.09.2019
 
 - fixed zoom directions legacy graphic engine (previous commit)

+ 11 - 0
flatcamGUI/PlotCanvasLegacy.py

@@ -306,10 +306,21 @@ class PlotCanvasLegacy(QtCore.QObject):
         self.figure.add_axes(self.axes)
         self.axes.set_aspect(1)
         self.axes.grid(True)
+        self.axes.axhline(color=(0.70, 0.3, 0.3), linewidth=2)
+        self.axes.axvline(color=(0.70, 0.3, 0.3), linewidth=2)
+
+        self.adjust_axes(-10, -10, 100, 100)
 
         # Re-draw
         self.canvas.draw_idle()
 
+    def redraw(self):
+        """
+        Created only to serve for compatibility with the VisPy plotcanvas (the other graphic engine, 3D)
+        :return:
+        """
+        self.clear()
+
     def adjust_axes(self, xmin, ymin, xmax, ymax):
         """
         Adjusts all axes while maintaining the use of the whole canvas