Several enhancements

+ PLMXML Reader + Some meta information sorting + Making ProductRefs invisibly in Tree
2015-04-02 22:56:42 +02:00
parent 5d5c04a508
commit c88a8336dc
15 changed files with 275 additions and 65 deletions
--- a/src/Mod/Assembly/App/Item.cpp
+++ b/src/Mod/Assembly/App/Item.cpp
@@ -43,6 +43,8 @@ PROPERTY_SOURCE_ABSTRACT(Assembly::Item, App::GeoFeature)

 Item::Item()
 {
+  ADD_PROPERTY_TYPE(Meta, (), 0, App::Prop_None, "Map with additional meta information");
+
 }

 short Item::mustExecute() const
--- a/src/Mod/Assembly/App/Item.h
+++ b/src/Mod/Assembly/App/Item.h
@@ -39,7 +39,10 @@ class AssemblyExport Item : public App::GeoFeature

 public:
    Item();
-	~Item() {};
+	  ~Item() {};
+
+    /// Meta descriptons
+    App::PropertyMap     Meta;

    /** @name methods override feature */
    //@{
--- a/src/Mod/Assembly/App/Product.cpp
+++ b/src/Mod/Assembly/App/Product.cpp
@@ -45,13 +45,6 @@ PROPERTY_SOURCE(Assembly::Product, Assembly::Item)

 Product::Product() {
    ADD_PROPERTY(Items,(0));
-    ADD_PROPERTY_TYPE(CreatedBy,(""),0,App::Prop_None,"The creator of the Item");
-    ADD_PROPERTY_TYPE(CreationDate,(Base::TimeInfo::currentDateTimeString()),0,App::Prop_ReadOnly,"Date of creation");
-    ADD_PROPERTY_TYPE(LastModifiedBy,(""),0,App::Prop_None,0);
-    ADD_PROPERTY_TYPE(LastModifiedDate,("Unknown"),0,App::Prop_ReadOnly,"Date of last modification");
-    ADD_PROPERTY_TYPE(Company,(""),0,App::Prop_None,"Additional tag to save the the name of the company");
-    ADD_PROPERTY_TYPE(Comment,(""),0,App::Prop_None,"Additional tag to save a comment");
-    ADD_PROPERTY_TYPE(Meta,(),0,App::Prop_None,"Map with additional meta information");
    ADD_PROPERTY_TYPE(Material,(),0,App::Prop_None,"Map with material properties");
    // create the uuid for the document
    Base::Uuid id;
--- a/src/Mod/Assembly/App/Product.h
+++ b/src/Mod/Assembly/App/Product.h
@@ -52,29 +52,16 @@ public:
    App::PropertyString  Id;
    /// unique identifier of the Item 
    App::PropertyUUID    Uid;
-    /// long description of the Item 
-    App::PropertyString  Description  ;
-    /// creators name (utf-8)
-    App::PropertyString  CreatedBy;
-    App::PropertyString  CreationDate;
-    /// user last modified the document
-    App::PropertyString  LastModifiedBy;
-    App::PropertyString  LastModifiedDate;
-    /// company name UTF8(optional)
-    App::PropertyString  Company;
-    /// long comment or description (UTF8 with line breaks)
-    App::PropertyString  Comment;
+    /// material descriptons
+    App::PropertyMap     Material;
+
    /** License string
-      * Holds the short license string for the Item, e.g. CC-BY
-      * for the Creative Commons license suit. 
-      */
+    * Holds the short license string for the Item, e.g. CC-BY
+    * for the Creative Commons license suit.
+    */
    App::PropertyString  License;
    /// License descripton/contract URL
    App::PropertyString  LicenseURL;
-    /// Meta descriptons
-    App::PropertyMap     Meta;
-    /// Meta descriptons
-    App::PropertyMap     Material;
    //@}

    /** @name Visual properties */
--- a/src/Mod/Assembly/Gui/ViewProviderProduct.cpp
+++ b/src/Mod/Assembly/Gui/ViewProviderProduct.cpp
@@ -35,7 +35,7 @@
 #include <Gui/Application.h>

 #include <Mod/Assembly/App/Product.h>
-#include <Mod/Assembly/App/PartRef.h>
+#include <Mod/Assembly/App/ProductRef.h>
 //#include <Mod/Part/App/BodyBase.h>

 using namespace AssemblyGui;
@@ -94,9 +94,26 @@ std::vector<std::string> ViewProviderProduct::getDisplayModes(void) const

 std::vector<App::DocumentObject*> ViewProviderProduct::claimChildren(void)const
 {
-    std::vector<App::DocumentObject*> temp(static_cast<Assembly::Product*>(getObject())->Items.getValues());

-    return temp;
+    std::vector<App::DocumentObject*> returnVector;
+    
+    // do not adopt the ref-objects as child, rather use the target objects if any 
+    // that makes the ProductRefs invisibly in the tree!
+    const std::vector<App::DocumentObject*> &items = static_cast<Assembly::Product*>(getObject())->Items.getValues();
+    for (std::vector<App::DocumentObject*>::const_iterator it = items.begin(); it != items.end(); ++it)
+    {
+        if ((*it)->getTypeId() == Assembly::ProductRef::getClassTypeId())
+        {
+            App::DocumentObject *obj = static_cast<Assembly::ProductRef *> (*it)->Item.getValue();
+            if (obj)
+            {
+                returnVector.push_back(obj);
+            }
+        }
+
+    }
+
+    return returnVector;
 }

 std::vector<App::DocumentObject*> ViewProviderProduct::claimChildren3D(void)const
--- a/src/Mod/Assembly/Gui/ViewProviderProductRef.cpp
+++ b/src/Mod/Assembly/Gui/ViewProviderProductRef.cpp
@@ -94,9 +94,15 @@ std::vector<std::string> ViewProviderProductRef::getDisplayModes(void) const

 std::vector<App::DocumentObject*> ViewProviderProductRef::claimChildren(void)const
 {
+  App::DocumentObject * obj = static_cast<Assembly::ProductRef*>(getObject())->Item.getValue();
+  if (obj){
    std::vector<App::DocumentObject*> ret(1);
-    ret[0] =  static_cast<Assembly::ProductRef*>(getObject())->Item.getValue();
+    ret[0] = obj;
    return ret;
+  }
+  else{
+    return std::vector<App::DocumentObject*>();
+  }
 }

 std::vector<App::DocumentObject*> ViewProviderProductRef::claimChildren3D(void)const
--- a/src/Mod/Assembly/Gui/ViewProviderProductRef.h
+++ b/src/Mod/Assembly/Gui/ViewProviderProductRef.h
@@ -50,6 +50,10 @@ public:
    virtual std::vector<App::DocumentObject*> claimChildren(void)const;

    virtual std::vector<App::DocumentObject*> claimChildren3D(void)const;
+    virtual bool showInTree() const
+    {
+      return false;
+    }
    
    virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member);
    virtual bool setEdit(int ModNum);
--- a/src/Mod/Import/App/CMakeLists.txt
+++ b/src/Mod/Import/App/CMakeLists.txt
@@ -61,6 +61,7 @@ SET(SCL_Resources
    automotive_design.py     # AP214e3
    ifc2x3.py                # IFC
    ifc4.py                  # IFC 4
+    PlmXmlParser.py
 )
 SOURCE_GROUP("SCL" FILES ${SCL_Resources})

--- a/src/Mod/Import/App/PlmXmlParser.py
+++ b/src/Mod/Import/App/PlmXmlParser.py
@@ -20,40 +20,133 @@
 #*   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
 #*   USA                                                                   *
 #*                                                                         *
-#*   Juergen Riegel 2002                                                   *
+#*   Juergen Riegel 2015                                                   *
 #***************************************************************************/


 import xml.etree.ElementTree as ET

+FreeCAD_On = False
+FreeCAD_Doc = None
+FreeCAD_ObjList = []
+
 def ParseUserData(element):
-    if element:
-        res = {}
-        for value in element.findall('{http://www.plmxml.org/Schemas/PLMXMLSchema}UserValue'):
+    res = {}
+    for i in element.findall('{http://www.plmxml.org/Schemas/PLMXMLSchema}UserData'):
+        for value in i.findall('{http://www.plmxml.org/Schemas/PLMXMLSchema}UserValue'):
            res[value.attrib['title']] = value.attrib['value']
-        return res
-    return None
+    return res

 def addPart(partElement):
-    #print partElement.attrib
-    pass
+    global FreeCAD_On,FreeCAD_Doc,FreeCAD_ObjList
+    print "=== Part ======================================================"
+    name = partElement.attrib['name']
+    id = partElement.attrib['id']
+    userData = ParseUserData(partElement)
+
+    bound = partElement.find('{http://www.plmxml.org/Schemas/PLMXMLSchema}Bound')
+    print bound.attrib['values']
+
+    representation = partElement.find('{http://www.plmxml.org/Schemas/PLMXMLSchema}Representation')
+    format =  representation.attrib['format']
+    location = representation.attrib['location']
+
+    print id, name, userData, format, location
+    if FreeCAD_On:
+        import FreeCAD,Assembly
+        print"Create Reference"
+        partObject =FreeCAD_Doc.addObject("App::Part",id)
+        FreeCAD_ObjList.append(partObject)
+        partObject.Label = name
+        partObject.Meta = userData

 def addAssembly(asmElement):
-    #print asmElement.attrib
-    pass
+    global FreeCAD_On,FreeCAD_Doc,FreeCAD_ObjList
+    print "=== Assembly ======================================================"
+    userData = ParseUserData(asmElement)
+    name = asmElement.attrib['name']
+    id = asmElement.attrib['id']
+    instanceRefs = asmElement.attrib['instanceRefs']
+    userData['instanceRefs'] = instanceRefs
+
+    print id, name, instanceRefs, userData
+    if FreeCAD_On:
+        import FreeCAD,Assembly
+        print"Create Reference"
+        admObject =FreeCAD_Doc.addObject("Assembly::Product",id)
+        FreeCAD_ObjList.append(admObject)
+        admObject.Label = name
+        admObject.Meta = userData

 def addReference(refElement):
-    #print refElement.attrib
-    pass
+    global FreeCAD_On,FreeCAD_Doc,FreeCAD_ObjList
+    print "=== Reference ======================================================"
+    userData = ParseUserData(refElement)
+    partRef = refElement.attrib['partRef'][1:]
+    userData['partRef'] = partRef
+    id = refElement.attrib['id']
+    name = refElement.attrib['name']
+    transform = refElement.find('{http://www.plmxml.org/Schemas/PLMXMLSchema}Transform')
+    mtrx = [float(i) for i in transform.text.split(' ')]
+    print mtrx
+    print id,name,partRef

+    if FreeCAD_On:
+        import FreeCAD,Assembly
+        print"Create Reference"
+        refObject =FreeCAD_Doc.addObject("Assembly::ProductRef",id)
+        FreeCAD_ObjList.append(refObject)
+        refObject.Label = name
+        refObject.Meta = userData
+
+def resolveRefs():
+    global FreeCAD_On,FreeCAD_Doc,FreeCAD_ObjList
+    print "=== Resolve References ======================================================"
+    if FreeCAD_On:
+        for i in FreeCAD_ObjList:
+            if i.TypeId == 'Assembly::Product':
+                objectList = []
+                for l in  i.Meta['instanceRefs'].split(' '):
+                    objectList.append(FreeCAD_Doc.getObject(l))
+                i.Items = objectList
+            if i.TypeId == 'Assembly::ProductRef':
+                i.Item = FreeCAD_Doc.getObject(i.Meta['partRef'])
+
+def open(fileName):
+    """called when freecad opens an PlmXml file"""
+    global FreeCAD_On,FreeCAD_Doc
+    import FreeCAD,os
+    docname = os.path.splitext(os.path.basename(fileName))[0]
+    doc = FreeCAD.newDocument(docname)
+    message='Started with opening of "'+fileName+'" file\n'
+    FreeCAD.Console.PrintMessage(message)
+    FreeCAD_Doc = doc
+    FreeCAD_On = True
+    parse(fileName)
+    resolveRefs()
+
+def insert(filename,docname):
+    """called when freecad imports an PlmXml file"""
+    global FreeCAD_On,FreeCAD_Doc
+    import FreeCAD
+    FreeCAD.setActiveDocument(docname)
+    doc=FreeCAD.getDocument(docname)
+    FreeCAD.Console.PrintMessage('Started import of "'+filename+'" file')
+    FreeCAD_Doc = doc
+    FreeCAD_On = True
+    parse(fileName)
+    resolveRefs()

 def main():
+    parse('../../../../data/tests/Jt/Engine/2_Cylinder_Engine3.plmxml')

-    tree = ET.parse('../../../../data/tests/Jt/Engine/2_Cylinder_Engine3.plmxml')
+def parse(fileName):
+
+    tree = ET.parse(fileName)
    root = tree.getroot()
    ProductDef = root.find('{http://www.plmxml.org/Schemas/PLMXMLSchema}ProductDef')

-    ParseUserData(ProductDef.find('{http://www.plmxml.org/Schemas/PLMXMLSchema}UserData'))
+    res = ParseUserData(ProductDef.find('{http://www.plmxml.org/Schemas/PLMXMLSchema}UserData'))

    InstanceGraph = ProductDef.find('{http://www.plmxml.org/Schemas/PLMXMLSchema}InstanceGraph')

@@ -87,7 +180,7 @@ def main():
                addPart(child)
                continue
            if child.attrib['type'] == 'assembly' :
-                addPart(child)
+                addAssembly(child)
                continue
            print "Unknown Part type:",child
        else:
--- a/src/Mod/Import/Init.py
+++ b/src/Mod/Import/Init.py
@@ -31,4 +31,4 @@
 #FreeCAD.addImportType("STEP 214 (*.step *.stp)","ImportGui")
 #FreeCAD.addExportType("STEP 214 (*.step *.stp)","ImportGui")
 #FreeCAD.addExportType("IGES files (*.iges *.igs)","ImportGui")
-FreeCAD.addExportType("PLMXML files (*.plmxml)","Import")
+FreeCAD.addImportType("PLMXML files (*.plmxml)","PlmXmlParser")