From 2d1cf899e8a99af410e87219f7db403e9b8afd8f Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Thu, 9 Dec 2021 13:10:01 +0200
Subject: [PATCH] - small optimization when deleting all objects (creating a
 new project)

---
 CHANGELOG.md                   |  4 ++++
 appObjects/ObjectCollection.py | 28 +++++++++++++---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1eae24de..791352a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta
 
 =================================================
 
+9.12.2021
+
+- small optimization when deleting all objects (creating a new project)
+
 8.12.2021
 
 - fixed some more Shapely 2.0 deprecation warnings
diff --git a/appObjects/ObjectCollection.py b/appObjects/ObjectCollection.py
index 557f23b7..484ddf0f 100644
--- a/appObjects/ObjectCollection.py
+++ b/appObjects/ObjectCollection.py
@@ -805,30 +805,28 @@ class ObjectCollection(QtCore.QAbstractItemModel):
             self.app.all_objects_list.clear()
 
             self.app.geo_editor.clear()
-
             self.app.exc_editor.clear()
 
             self.app.dblsidedtool.reset_fields()
-
             self.app.panelize_tool.reset_fields()
-
             self.app.cutout_tool.reset_fields()
-
             self.app.film_tool.reset_fields()
-
-            self.beginResetModel()
-
-            self.checked_indexes = []
-
-            for group in self.root_item.child_items:
-                group.remove_children()
-
-            self.endResetModel()
-
-            self.app.plotcanvas.redraw()
         except Exception as e:
             self.app.log.error("ObjectCollection.delete_all() --> %s" % str(e))
 
+        self.beginResetModel()
+        self.checked_indexes = []
+
+        for group in self.root_item.child_items:
+            try:
+                group.remove_children()
+            except Exception as e:
+                self.app.log.error("ObjectCollection.delete_all() group %s--> %s" % (str(group), str(e)))
+
+        self.endResetModel()
+
+        self.app.plotcanvas.redraw()
+
     def get_active(self):
         """
         Returns the active object or None