From 4cfecfa70af8661000c118886b5d243eec5e7a8d Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Sun, 17 May 2020 21:56:44 +0300
Subject: [PATCH] - reverted the previous changes to object collection; it is
 better to create empty methods in FlatCAMScript and FlatCAMDocument objects

---
 CHANGELOG.md                                |   1 +
 FlatCAMApp.py                               |   5 ++++-
 assets/resources/dark_resources/etch_32.png | Bin 0 -> 811 bytes
 assets/resources/etch_32.png                | Bin 0 -> 637 bytes
 flatcamObjects/FlatCAMDocument.py           |  21 ++++++++++++++++++++
 flatcamObjects/FlatCAMScript.py             |  21 ++++++++++++++++++++
 flatcamObjects/ObjectCollection.py          |  17 +++-------------
 7 files changed, 50 insertions(+), 15 deletions(-)
 create mode 100644 assets/resources/dark_resources/etch_32.png
 create mode 100644 assets/resources/etch_32.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f866665..21c93fcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ CHANGELOG for FlatCAM beta
 - added a label in the status bar to show if the workplace is active and what size it is
 - now the Edit command (either from Menu Edit ->Edit Object) or through the shortcut key (E key) or project tab context menu works also for the CNCJob objects (will open a text Editor with the GCode)
 - fixed the object collection methods that return a list of objects or names of objects such that they have a parameter now to allow adding to those lists (or not) for the objects of type Script or Document. Thus fixing some of the Tcl commands such Set Origin
+- reverted the previous changes to object collection; it is better to create empty methods in FlatCAMScript and FlatCAMDocument objects
 
 16.05.2020
 
diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index 07750ef9..b5fa601b 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -3080,7 +3080,10 @@ class App(QtCore.QObject):
         :return: None
         """
 
-        xmin, ymin, xmax, ymax = obj.bounds()
+        try:
+            xmin, ymin, xmax, ymax = obj.bounds()
+        except TypeError:
+            return
         obj.options['xmin'] = xmin
         obj.options['ymin'] = ymin
         obj.options['xmax'] = xmax
diff --git a/assets/resources/dark_resources/etch_32.png b/assets/resources/dark_resources/etch_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec8687ab79f6e8328a7700550d0de20b3ec1af1f
GIT binary patch
literal 811
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50
z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10;!=Q5h%1nO^774-m+v0G
zc=Pz>+s7~7{r~^}@k=lp$bI?t>ec@bKYRcRo&jPocnky}m2aQCc>Cz(+b1Ap?||sx
z>(`H7zXnQy1Yd#lK6wEY2Qff`uRvx3#qYg*31mEc`QZ^r&6~&1UjvPTsJZ|A{ZpWp
zH*bKBc?8xAblbBxZyr2*bNlUEpy7Aly#w0_B;P%G`5vU})hjT12T>37jy0E5JdkoJ
z3GxeOn0ltYYZBv~W9P512{N%VvvAg>78F~S>KU6{-W{^a=i%3P+25PRpDOkLaJc^a
zu7a=hfyjTc8k&4k{3YpG`g>JW_vsw<dEE&#k1@&H-G!lpRn`N@;VkfoEM{QfI|9Ot
zQ?>b|fr9KMp1!W^Pgn){G`V;9sb2>Qo$+*W46!(U_R@8}CIgX%hmVi&uISL{dbHqO
zXZ7jd_LH|<?RGM}Gvi16+&MLx%B&qOg@zx*)PJ+6u(D78)M#=uonez@%sqCl6#Ykm
zlUyIDo)VJn^6TV2)#udS74?+KckRQ^pFix~#n+n_(8fJy+HXEb&HpU7)b{hS#l~{{
zm~2uM;{W*i@dHlH`+uAfNRarNwlU$!{(@vKwP2>Sgflb6HY{<7+<S0V?Vi7kPcHqF
zc_QE>l(Wsp`i62zLxHUC?A`V=)2(9Gnd|MapU0q|ex<oS#gE4n=r7e0*NBpo#FA92
z<f2p{#b9J$WT0zcs%vN-VrXJzVrXS(sBK_iWniFS>A-=aAvZrIGp!Q0hQO2`TYwrQ
vK{f>Er<If^7Ns(jmzV2h=4BTrCl;jY<rk&TerF>ERK(!v>gTe~DWM4f%<YOy

literal 0
HcmV?d00001

diff --git a/assets/resources/etch_32.png b/assets/resources/etch_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0c23ce2a9b685045ef3410bcb8069a6027feb04
GIT binary patch
literal 637
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50
z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz
z5n0T@z;^_M8K-LVNdpDhOFVsD*`Kfq@~I0sEn75`fq~K6)5S5w<M`bvhThDE5^eJ<
zLZeDvX0W#}y5Lw)P$16A?p}D=mqmRc->x6bEQO!=U)T$5Uvy>ZV!nGyGD%0Z%Qjr%
z%lc}-_wk&_$4eDX2h9)Hs#MO`|Nc~&=|*~2fa*4b%=VWW>lzL?yDd)Ia=3NdebEC9
z%@>m<mn$!rzfdEu)v=4mPyD8{Ws1j3;oBZzIt;Hpy1JHpIVGBYWjEWNhk?tM@!e0K
z_;WVP^gG6<nYyptWA0;Axq4peMxWAzH$VQfEGWM$oU8r5`<KT&&4-a?Nyj-aonbII
zv}EdcztVL_)X&FFvg6qC?BjOVH-An4Wy&*bDeRq>SY*%qOhcNHPp?(q!C`^!J%-O6
z62C3&N@X{!lvDF{-`J4KXPv!a_L`2p`;UFd-<-m@Lv?{bH1m8h%S#8C&n|gsntLJP
zWYT{v-fLevIsGKIGV~OlvN*s#ySd@Cl<;g|urjEYxJHzuB$lLFB^RXvDF!10BLiIn
zQ(Z&z5JM9yV@oST3vB}fD+7am-+(nJ8glbfGSez?YxpPdLI9{i5@bVgep*R+Vo@qX
jd3m{BW?pu2a$-TMUVc&f>~}U&Kt&9mu6{1-oD!M<X<O)y

literal 0
HcmV?d00001

diff --git a/flatcamObjects/FlatCAMDocument.py b/flatcamObjects/FlatCAMDocument.py
index 5f33b73a..ed1e8b56 100644
--- a/flatcamObjects/FlatCAMDocument.py
+++ b/flatcamObjects/FlatCAMDocument.py
@@ -284,6 +284,27 @@ class DocumentObject(FlatCAMObj):
         self.ui.sel_color_entry.set_value(new_val)
         self.app.defaults['document_sel_color'] = new_val
 
+    def mirror(self, axis, point):
+        pass
+
+    def offset(self, vect):
+        pass
+
+    def rotate(self, angle, point):
+        pass
+
+    def scale(self, xfactor, yfactor=None, point=None):
+        pass
+
+    def skew(self, angle_x, angle_y, point):
+        pass
+
+    def buffer(self, distance, join, factor=None):
+        pass
+
+    def bounds(self, flatten=False):
+        return None, None, None, None
+
     def to_dict(self):
         """
         Returns a representation of the object as a dictionary.
diff --git a/flatcamObjects/FlatCAMScript.py b/flatcamObjects/FlatCAMScript.py
index 946f578f..68a6a423 100644
--- a/flatcamObjects/FlatCAMScript.py
+++ b/flatcamObjects/FlatCAMScript.py
@@ -228,6 +228,27 @@ class ScriptObject(FlatCAMObj):
         else:
             self.script_editor_tab.code_editor.completer_enable = False
 
+    def mirror(self, axis, point):
+        pass
+
+    def offset(self, vect):
+        pass
+
+    def rotate(self, angle, point):
+        pass
+
+    def scale(self, xfactor, yfactor=None, point=None):
+        pass
+
+    def skew(self, angle_x, angle_y, point):
+        pass
+
+    def buffer(self, distance, join, factor=None):
+        pass
+
+    def bounds(self, flatten=False):
+        return None, None, None, None
+
     def to_dict(self):
         """
         Returns a representation of the object as a dictionary.
diff --git a/flatcamObjects/ObjectCollection.py b/flatcamObjects/ObjectCollection.py
index 56fcbd36..556728a0 100644
--- a/flatcamObjects/ObjectCollection.py
+++ b/flatcamObjects/ObjectCollection.py
@@ -593,22 +593,16 @@ class ObjectCollection(QtCore.QAbstractItemModel):
             # always open the notebook on object added to collection
             self.app.ui.splitter.setSizes([1, 1])
 
-    def get_names(self, sel_all=None):
+    def get_names(self):
         """
         Gets a list of the names of all objects in the collection.
 
-        :param sel_all:     Will return all objects if True. If False or None all except Script and Document
         :return:            List of names.
         :rtype:             list
         """
 
         # log.debug(str(inspect.stack()[1][3]) + " --> OC.get_names()")
-        if sel_all is None or sel_all is False:
-            names_list = [x.options['name'] for x in self.get_list()]
-        else:
-            names_list = [x.options['name'] for x in self.get_list(sel_all=sel_all)]
-
-        return names_list
+        return [x.options['name'] for x in self.get_list()]
 
     def get_bounds(self):
         """
@@ -990,20 +984,15 @@ class ObjectCollection(QtCore.QAbstractItemModel):
                 self.app.inform.emit('[ERROR] %s: %s' % (_("Cause of error"), str(e)))
                 raise
 
-    def get_list(self, sel_all=None):
+    def get_list(self):
         """
         Will return a list of all objects currently opened. Except FlatCAMScript and FlatCAMDocuments
 
-        :param sel_all:     Will return all objects if True. If False or None all except Script and Document
         :return:
         """
         obj_list = []
         for group in self.root_item.child_items:
             for item in group.child_items:
-                kind = item.obj.kind
-                if sel_all is None or sel_all is False:
-                    if kind == 'document' or kind == 'script':
-                        continue
                 obj_list.append(item.obj)
 
         return obj_list