jpcgt/flatcam/Beta слито с Beta

FlatCAMApp.py

@@ -2092,6 +2092,12 @@ class App(QtCore.QObject):
         self.setup_recent_items()
         self.setup_component_editor()
 
+        # this does not work in Legacy Mode
+        if self.is_legacy is True:
+            self.ui.general_defaults_form.general_gui_group.workspace_cb.setDisabled(True)
+            self.ui.general_defaults_form.general_gui_group.workspace_type_lbl.setDisabled(True)
+            self.ui.general_defaults_form.general_gui_group.wk_cb.setDisabled(True)
+
         # #####################################################################################
         # ######################### Auto-complete KEYWORDS ####################################
         # #####################################################################################

FlatCAMObj.py

@@ -85,7 +85,7 @@ 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)
+            self.shapes = ShapeCollectionLegacy(obj=self, app=self.app, name='application')
 
         # self.mark_shapes = self.app.plotcanvas.new_shape_collection(layers=2)
         self.mark_shapes = {}

README.md

@@ -28,6 +28,7 @@ CAD program, and create G-Code for Isolation routing.
 - updated the .POT file and the translation files
 - updated and corrected the Romanian and Spanish translations
 - updated the .PO files for the rest of the translations, they need to be filled in.
+- fixed crash when trying to set a workspace in FlatCAM in the Legacy engine 2D mode by disabling this function for the case of 2D mode
 
 21.09.2019