From 918b022dae89fb1e63a69231e0210dbd82700497 Mon Sep 17 00:00:00 2001 From: snn Date: Mon, 20 Feb 2017 13:35:39 +0300 Subject: [PATCH] XCAF: assembly item ref driver added, file name typo correction --- src/BinMXCAFDoc/BinMXCAFDoc.cxx | 2 ++ src/XCAFDoc/XCAFDoc_Note.cxx | 1 + src/XmlMXCAFDoc/FILES | 4 ++-- src/XmlMXCAFDoc/XmlMXCAFDoc.cxx | 4 +++- ...temRefDriver.cxx => XmlMXCAFDoc_AssemblyItemRefDriver.cxx} | 2 +- ...temRefDriver.hxx => XmlMXCAFDoc_AssemblyItemRefDriver.hxx} | 0 6 files changed, 9 insertions(+), 4 deletions(-) rename src/XmlMXCAFDoc/{XmlMXCAFDoc_AssemblyAtemRefDriver.cxx => XmlMXCAFDoc_AssemblyItemRefDriver.cxx} (98%) rename src/XmlMXCAFDoc/{XmlMXCAFDoc_AssemblyAtemRefDriver.hxx => XmlMXCAFDoc_AssemblyItemRefDriver.hxx} (100%) diff --git a/src/BinMXCAFDoc/BinMXCAFDoc.cxx b/src/BinMXCAFDoc/BinMXCAFDoc.cxx index 8c55dfbe94..55d1ac0e0d 100644 --- a/src/BinMXCAFDoc/BinMXCAFDoc.cxx +++ b/src/BinMXCAFDoc/BinMXCAFDoc.cxx @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -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 9ea85d0176..9a69acac5c 100644 --- 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 : "") diff --git a/src/XmlMXCAFDoc/FILES b/src/XmlMXCAFDoc/FILES index fe6d23aaf1..1ee7b6d56f 100644 --- 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 7c959f9ee9..5bb22d739d 100644 --- a/src/XmlMXCAFDoc/XmlMXCAFDoc.cxx +++ b/src/XmlMXCAFDoc/XmlMXCAFDoc.cxx @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -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_AssemblyItemRefDriver.cxx similarity index 98% rename from src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.cxx rename to src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyItemRefDriver.cxx index 118a9460ec..23404ed1f3 100644 --- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.cxx +++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyItemRefDriver.cxx @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_AssemblyItemRefDriver, XmlMDF_ADriver) diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyItemRefDriver.hxx similarity index 100% rename from src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.hxx rename to src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyItemRefDriver.hxx