XCAF: assembly item ref driver added, file name typo correction

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc.cxx b/src/BinMXCAFDoc/BinMXCAFDoc.cxx
index 8c55dfbe94bacde9d5b5f264c26dbbbe3dd06606..55d1ac0e0d7fe911f337173840ce9135cdfa32d5 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc.cxx
@@ -17,6 +17,7 @@
 #include <BinMDF_ADriverTable.hxx>
 #include <BinMNaming_NamedShapeDriver.hxx>
 #include <BinMXCAFDoc.hxx>
+#include <BinMXCAFDoc_AssemblyItemRefDriver.hxx>
 #include <BinMXCAFDoc_AreaDriver.hxx>
 #include <BinMXCAFDoc_CentroidDriver.hxx>
 #include <BinMXCAFDoc_ColorDriver.hxx>
@@ -68,6 +69,7 @@ void BinMXCAFDoc::AddDrivers(const Handle(BinMDF_ADriverTable)& theDriverTable,
   }
   
   theDriverTable->AddDriver( aLocationDriver);
+  theDriverTable->AddDriver( new BinMXCAFDoc_AssemblyItemRefDriver(theMsgDrv));
   theDriverTable->AddDriver( new BinMXCAFDoc_VolumeDriver      (theMsgDrv));
   theDriverTable->AddDriver( new BinMXCAFDoc_DatumDriver       (theMsgDrv));
   theDriverTable->AddDriver( new BinMXCAFDoc_GeomToleranceDriver (theMsgDrv));

diff --git a/src/XCAFDoc/XCAFDoc_Note.cxx b/src/XCAFDoc/XCAFDoc_Note.cxx
index 9ea85d017688e12eb54c55c0a2c261b37d3911b0..9a69acac5c3fa37345e5ec436f787b98c4276446 100644 (file)
--- a/src/XCAFDoc/XCAFDoc_Note.cxx
+++ b/src/XCAFDoc/XCAFDoc_Note.cxx
@@ -90,6 +90,7 @@ XCAFDoc_Note::Paste(const Handle(TDF_Attribute)&       theAttrInto,
 Standard_OStream& 
 XCAFDoc_Note::Dump(Standard_OStream& theOS) const
 {
+  TDF_Attribute::Dump(theOS);
   theOS 
     << "Note : " 
     << (myUserName.IsEmpty() ? myUserName : "<anonymous>")

diff --git a/src/XmlMXCAFDoc/FILES b/src/XmlMXCAFDoc/FILES
index fe6d23aaf10f98b9a7b9c26cdb2acf29587249f9..1ee7b6d56f30aa4454dfdcc7663e112e9064e7ec 100644 (file)
--- a/src/XmlMXCAFDoc/FILES
+++ b/src/XmlMXCAFDoc/FILES
@@ -1,7 +1,7 @@
 XmlMXCAFDoc.cxx
 XmlMXCAFDoc.hxx
-XmlMXCAFDoc_AssemblyAtemRefDriver.cxx
-XmlMXCAFDoc_AssemblyAtemRefDriver.hxx
+XmlMXCAFDoc_AssemblyItemRefDriver.cxx
+XmlMXCAFDoc_AssemblyItemRefDriver.hxx
 XmlMXCAFDoc_AreaDriver.cxx
 XmlMXCAFDoc_AreaDriver.hxx
 XmlMXCAFDoc_CentroidDriver.cxx

diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc.cxx
index 7c959f9ee928bd45c94b8af93d9cac84894fab43..5bb22d739df54a8a38ed9256e78febd14f8aff17 100644 (file)
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc.cxx
@@ -19,6 +19,7 @@
 #include <XmlMDF_ADriverTable.hxx>
 #include <XmlMNaming_NamedShapeDriver.hxx>
 #include <XmlMXCAFDoc.hxx>
+#include <XmlMXCAFDoc_AssemblyItemRefDriver.hxx>
 #include <XmlMXCAFDoc_AreaDriver.hxx>
 #include <XmlMXCAFDoc_CentroidDriver.hxx>
 #include <XmlMXCAFDoc_ClippingPlaneToolDriver.hxx>
@@ -64,7 +65,8 @@ void XmlMXCAFDoc::AddDrivers (const Handle(XmlMDF_ADriverTable)& aDriverTable,
     aLocationDriver->SetSharedLocations( &(aNamedShapeDriver->GetShapesLocations()) );
   }
   
-  aDriverTable -> AddDriver( aLocationDriver);
+  aDriverTable -> AddDriver (aLocationDriver);
+  aDriverTable -> AddDriver (new XmlMXCAFDoc_AssemblyItemRefDriver(anMsgDrv));
   aDriverTable -> AddDriver (new XmlMXCAFDoc_VolumeDriver    (anMsgDrv));
   aDriverTable -> AddDriver (new XmlMXCAFDoc_DatumDriver     (anMsgDrv));
   aDriverTable -> AddDriver (new XmlMXCAFDoc_DimTolDriver    (anMsgDrv));

diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.cxx
deleted file mode 100644 (file)
index 118a946..0000000
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.cxx
+++ /dev/null
@@ -1,80 +0,0 @@
-// Created on: 2017-02-14
-// Created by: Sergey NIKONOV
-// Copyright (c) 2008-2017 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <CDM_MessageDriver.hxx>
-#include <Standard_Type.hxx>
-#include <TDF_Attribute.hxx>
-#include <XCAFDoc_AssemblyItemRef.hxx>
-#include <XmlMXCAFDoc_AssemblyAtemRefDriver.hxx>
-#include <XmlObjMgt_Persistent.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_AssemblyItemRefDriver, XmlMDF_ADriver)
-IMPLEMENT_DOMSTRING(Path, "path")
-
-//=======================================================================
-//function :
-//purpose  : 
-//=======================================================================
-XmlMXCAFDoc_AssemblyItemRefDriver::XmlMXCAFDoc_AssemblyItemRefDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
-: XmlMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_AssemblyItemRef)->Name())
-{
-}
-
-//=======================================================================
-//function :
-//purpose  : 
-//=======================================================================
-Handle(TDF_Attribute) XmlMXCAFDoc_AssemblyItemRefDriver::NewEmpty() const
-{
-  return new XCAFDoc_AssemblyItemRef();
-}
-
-//=======================================================================
-//function :
-//purpose  : 
-//=======================================================================
-Standard_Boolean XmlMXCAFDoc_AssemblyItemRefDriver::Paste(const XmlObjMgt_Persistent&  theSource,
-                                                          const Handle(TDF_Attribute)& theTarget,
-                                                          XmlObjMgt_RRelocationTable&  /*theRelocTable*/) const
-{
-  const XmlObjMgt_Element& anElement = theSource;
-
-  XmlObjMgt_DOMString aPath = anElement.getAttribute(::Path());
-  if (aPath == NULL)
-    return Standard_False;
-
-  Handle(XCAFDoc_AssemblyItemRef) aThis = Handle(XCAFDoc_AssemblyItemRef)::DownCast(theTarget);
-  if (aThis.IsNull())
-    return Standard_False;
-
-  aThis->Set(aPath.GetString());
-
-  return Standard_True;
-}
-
-//=======================================================================
-//function :
-//purpose  : 
-//=======================================================================
-void XmlMXCAFDoc_AssemblyItemRefDriver::Paste(const Handle(TDF_Attribute)& theSource,
-                                              XmlObjMgt_Persistent&        theTarget,
-                                              XmlObjMgt_SRelocationTable&  /*theRelocTable*/) const
-{
-  Handle(XCAFDoc_AssemblyItemRef) aThis = Handle(XCAFDoc_AssemblyItemRef)::DownCast(theSource);
-
-  XmlObjMgt_DOMString aPath(aThis->Get().ToString().ToCString());
-
-  theTarget.Element().setAttribute(::Path(), aPath);
-}

diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.hxx
deleted file mode 100644 (file)
index 2be1a1e..0000000
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.hxx
+++ /dev/null
@@ -1,55 +0,0 @@
-// Created on: 2017-02-16
-// Created by: Sergey NIKONOV
-// Copyright (c) 2008-2017 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _XmlMXCAFDoc_AssemblyItemRefDriver_HeaderFile
-#define _XmlMXCAFDoc_AssemblyItemRefDriver_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <XmlMDF_ADriver.hxx>
-#include <Standard_Boolean.hxx>
-#include <XmlObjMgt_RRelocationTable.hxx>
-#include <XmlObjMgt_SRelocationTable.hxx>
-
-class CDM_MessageDriver;
-class TDF_Attribute;
-class XmlObjMgt_Persistent;
-
-class XmlMXCAFDoc_AssemblyItemRefDriver;
-DEFINE_STANDARD_HANDLE(XmlMXCAFDoc_AssemblyItemRefDriver, XmlMDF_ADriver)
-
-//! Attribute Driver.
-class XmlMXCAFDoc_AssemblyItemRefDriver : public XmlMDF_ADriver
-{
-public:
-
-  Standard_EXPORT XmlMXCAFDoc_AssemblyItemRefDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
-
-  Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
-
-  Standard_EXPORT Standard_Boolean Paste(const XmlObjMgt_Persistent&  theSource,
-                                         const Handle(TDF_Attribute)& theTarget,
-                                         XmlObjMgt_RRelocationTable&  theRelocTable) const Standard_OVERRIDE;
-
-  Standard_EXPORT void Paste(const Handle(TDF_Attribute)& theSource,
-                             XmlObjMgt_Persistent&        theTarget,
-                             XmlObjMgt_SRelocationTable&  theRelocTable) const Standard_OVERRIDE;
-
-  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_AssemblyItemRefDriver, XmlMDF_ADriver)
-
-};
-
-#endif // _XmlMXCAFDoc_AssemblyItemRefDriver_HeaderFile

diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyItemRefDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyItemRefDriver.cxx
new file mode 100644 (file)
index 0000000..23404ed
--- /dev/null
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyItemRefDriver.cxx
@@ -0,0 +1,80 @@
+// Created on: 2017-02-14
+// Created by: Sergey NIKONOV
+// Copyright (c) 2008-2017 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#include <CDM_MessageDriver.hxx>
+#include <Standard_Type.hxx>
+#include <TDF_Attribute.hxx>
+#include <XCAFDoc_AssemblyItemRef.hxx>
+#include <XmlMXCAFDoc_AssemblyItemRefDriver.hxx>
+#include <XmlObjMgt_Persistent.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_AssemblyItemRefDriver, XmlMDF_ADriver)
+IMPLEMENT_DOMSTRING(Path, "path")
+
+//=======================================================================
+//function :
+//purpose  : 
+//=======================================================================
+XmlMXCAFDoc_AssemblyItemRefDriver::XmlMXCAFDoc_AssemblyItemRefDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+: XmlMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_AssemblyItemRef)->Name())
+{
+}
+
+//=======================================================================
+//function :
+//purpose  : 
+//=======================================================================
+Handle(TDF_Attribute) XmlMXCAFDoc_AssemblyItemRefDriver::NewEmpty() const
+{
+  return new XCAFDoc_AssemblyItemRef();
+}
+
+//=======================================================================
+//function :
+//purpose  : 
+//=======================================================================
+Standard_Boolean XmlMXCAFDoc_AssemblyItemRefDriver::Paste(const XmlObjMgt_Persistent&  theSource,
+                                                          const Handle(TDF_Attribute)& theTarget,
+                                                          XmlObjMgt_RRelocationTable&  /*theRelocTable*/) const
+{
+  const XmlObjMgt_Element& anElement = theSource;
+
+  XmlObjMgt_DOMString aPath = anElement.getAttribute(::Path());
+  if (aPath == NULL)
+    return Standard_False;
+
+  Handle(XCAFDoc_AssemblyItemRef) aThis = Handle(XCAFDoc_AssemblyItemRef)::DownCast(theTarget);
+  if (aThis.IsNull())
+    return Standard_False;
+
+  aThis->Set(aPath.GetString());
+
+  return Standard_True;
+}
+
+//=======================================================================
+//function :
+//purpose  : 
+//=======================================================================
+void XmlMXCAFDoc_AssemblyItemRefDriver::Paste(const Handle(TDF_Attribute)& theSource,
+                                              XmlObjMgt_Persistent&        theTarget,
+                                              XmlObjMgt_SRelocationTable&  /*theRelocTable*/) const
+{
+  Handle(XCAFDoc_AssemblyItemRef) aThis = Handle(XCAFDoc_AssemblyItemRef)::DownCast(theSource);
+
+  XmlObjMgt_DOMString aPath(aThis->Get().ToString().ToCString());
+
+  theTarget.Element().setAttribute(::Path(), aPath);
+}

diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyItemRefDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyItemRefDriver.hxx
new file mode 100644 (file)
index 0000000..2be1a1e
--- /dev/null
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyItemRefDriver.hxx
@@ -0,0 +1,55 @@
+// Created on: 2017-02-16
+// Created by: Sergey NIKONOV
+// Copyright (c) 2008-2017 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _XmlMXCAFDoc_AssemblyItemRefDriver_HeaderFile
+#define _XmlMXCAFDoc_AssemblyItemRefDriver_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <XmlMDF_ADriver.hxx>
+#include <Standard_Boolean.hxx>
+#include <XmlObjMgt_RRelocationTable.hxx>
+#include <XmlObjMgt_SRelocationTable.hxx>
+
+class CDM_MessageDriver;
+class TDF_Attribute;
+class XmlObjMgt_Persistent;
+
+class XmlMXCAFDoc_AssemblyItemRefDriver;
+DEFINE_STANDARD_HANDLE(XmlMXCAFDoc_AssemblyItemRefDriver, XmlMDF_ADriver)
+
+//! Attribute Driver.
+class XmlMXCAFDoc_AssemblyItemRefDriver : public XmlMDF_ADriver
+{
+public:
+
+  Standard_EXPORT XmlMXCAFDoc_AssemblyItemRefDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+
+  Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
+
+  Standard_EXPORT Standard_Boolean Paste(const XmlObjMgt_Persistent&  theSource,
+                                         const Handle(TDF_Attribute)& theTarget,
+                                         XmlObjMgt_RRelocationTable&  theRelocTable) const Standard_OVERRIDE;
+
+  Standard_EXPORT void Paste(const Handle(TDF_Attribute)& theSource,
+                             XmlObjMgt_Persistent&        theTarget,
+                             XmlObjMgt_SRelocationTable&  theRelocTable) const Standard_OVERRIDE;
+
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_AssemblyItemRefDriver, XmlMDF_ADriver)
+
+};
+
+#endif // _XmlMXCAFDoc_AssemblyItemRefDriver_HeaderFile