From 171e713de041f58b2ec251a02e37637b61328bc0 Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Fri, 25 Jan 2019 22:16:37 +1100
Subject: [PATCH] Refactor IfcAttributes to be called IfcData.

 * IfcAttributes as a name is misleading, as currently it stores GUID (yes, an attribute), but also stores IFC export settings (i.e. not an IFC "attribute", per say)
 * The previous description of "Custom IFC properties ..." is also misleading, as properties might suggest it stores property sets, which it doesn't (IfcProperties does, currently)
 * IfcData is more generic and allows us to store more data in it in the future
---
 src/Mod/Arch/ArchComponent.py | 37 ++++++++++++++---------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py
index 275f8c88c7..7286169ff9 100644
--- a/src/Mod/Arch/ArchComponent.py
+++ b/src/Mod/Arch/ArchComponent.py
@@ -197,8 +197,8 @@ class Component:
             obj.addProperty("App::PropertyString","Tag","Component",QT_TRANSLATE_NOOP("App::Property","An optional tag for this component"))
         if not "StandardCode" in pl:
             obj.addProperty("App::PropertyString","StandardCode","Component",QT_TRANSLATE_NOOP("App::Property","An optional standard (OmniClass, etc...) code for this component"))
-        if not "IfcAttributes" in pl:
-            obj.addProperty("App::PropertyMap","IfcAttributes","Component",QT_TRANSLATE_NOOP("App::Property","Custom IFC properties and attributes"))
+        if not "IfcData" in pl:
+            obj.addProperty("App::PropertyMap","IfcData","Component",QT_TRANSLATE_NOOP("App::Property","IFC data"))
         if not "Material" in pl:
             obj.addProperty("App::PropertyLink","Material","Component",QT_TRANSLATE_NOOP("App::Property","A material for this object"))
         if "BaseMaterial" in pl:
@@ -1227,8 +1227,8 @@ class ComponentTaskPanel:
         self.ifcEditor.comboPset.addItems([QtGui.QApplication.translate("Arch", "Add property set...", None),
                                            QtGui.QApplication.translate("Arch", "New...", None)]+self.psetkeys)
         # set UUID
-        if "IfcUID" in self.obj.IfcAttributes:
-            self.ifcEditor.labelUUID.setText(self.obj.IfcAttributes["IfcUID"])
+        if "IfcUID" in self.obj.IfcData:
+            self.ifcEditor.labelUUID.setText(self.obj.IfcData["IfcUID"])
         # fill the tree
         psets = {}
         for pname,value in self.obj.IfcProperties.items():
@@ -1274,10 +1274,10 @@ class ComponentTaskPanel:
         QtCore.QObject.connect(self.ifcEditor.buttonDelete, QtCore.SIGNAL("clicked()"), self.removeIfcProperty)
         self.ifcEditor.treeProperties.setSortingEnabled(True)
         # set checkboxes
-        if "FlagForceBrep" in self.obj.IfcAttributes:
-            self.ifcEditor.checkBrep.setChecked(self.obj.IfcAttributes["FlagForceBrep"] == "True")
-        if "FlagParametric" in self.obj.IfcAttributes:
-            self.ifcEditor.checkParametric.setChecked(self.obj.IfcAttributes["FlagParametric"] == "True")
+        if "FlagForceBrep" in self.obj.IfcData:
+            self.ifcEditor.checkBrep.setChecked(self.obj.IfcData["FlagForceBrep"] == "True")
+        if "FlagParametric" in self.obj.IfcData:
+            self.ifcEditor.checkParametric.setChecked(self.obj.IfcData["FlagParametric"] == "True")
         self.ifcEditor.show()
 
     def acceptIfcProperties(self):
@@ -1299,16 +1299,16 @@ class ComponentTaskPanel:
                         else:
                             # keys cannot be unicode
                             ifcdict[prop.encode("utf8")] = pset+";;"+ptype+";;"+pvalue
-            ifcattrs = self.obj.IfcAttributes
-            ifcattrs["IfcUID"] = self.ifcEditor.labelUUID.text()
-            ifcattrs["FlagForceBrep"] = str(self.ifcEditor.checkBrep.isChecked())
-            ifcattrs["FlagParametric"] = str(self.ifcEditor.checkParametric.isChecked())
-            if (ifcdict != self.obj.IfcProperties) or (ifcattrs != self.obj.IfcAttributes):
+            ifcData = self.obj.IfcData
+            ifcData["IfcUID"] = self.ifcEditor.labelUUID.text()
+            ifcData["FlagForceBrep"] = str(self.ifcEditor.checkBrep.isChecked())
+            ifcData["FlagParametric"] = str(self.ifcEditor.checkParametric.isChecked())
+            if (ifcdict != self.obj.IfcProperties) or (ifcData != self.obj.IfcData):
                 FreeCAD.ActiveDocument.openTransaction("Change Ifc Properties")
                 if ifcdict != self.obj.IfcProperties:
                     self.obj.IfcProperties = ifcdict
-                if ifcattrs != self.obj.IfcAttributes:
-                    self.obj.IfcAttributes = ifcattrs
+                if ifcData != self.obj.IfcData:
+                    self.obj.IfcData = ifcData
                 FreeCAD.ActiveDocument.commitTransaction()
             del self.ifcEditor
 
@@ -1472,10 +1472,3 @@ if FreeCAD.GuiUp:
                 else:
                     model.setData(index,editor.text())
             self.dialog.update()
-
-
-
-
-
-
-