OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-07 18:30:55 +03:00
Code Packages Releases Activity

0024545: Convertation of the generic classes to the non-generic (XmlObjMgt).

Browse Source 
In the package "XmlObjMgt" class "XmlObjMgt_Array1" was converted to the non-generic.
And some changes were made in "XmlNaming" package for correct compilation of the application.
This commit is contained in:
dln 2014-01-21 15:59:23 +04:00 committed by bugmaster
parent cb78155f10
commit 3804f298a1
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/XmlMNaming/XmlMNaming.cdl
View File

@ -34,9 +34,6 @@ is
class Shape1; class Shape1;
class Array1OfShape1 instantiates Array1 from XmlObjMgt
(Shape1 from XmlMNaming);
AddDrivers (aDriverTable : ADriverTable from XmlMDF; AddDrivers (aDriverTable : ADriverTable from XmlMDF;
aMessageDriver: MessageDriver from CDM); aMessageDriver: MessageDriver from CDM);
---Purpose: Adds the attribute drivers to <aDriverTable>. ---Purpose: Adds the attribute drivers to <aDriverTable>.

8
src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx
View File

@ -18,7 +18,7 @@
#include <XmlMNaming_NamedShapeDriver.ixx> #include <XmlMNaming_NamedShapeDriver.ixx>
#include <XmlObjMgt.hxx> #include <XmlObjMgt.hxx>
#include <XmlMNaming_Array1OfShape1.hxx> #include <XmlObjMgt_Array1.hxx>
#include <XmlMNaming_Shape1.hxx> #include <XmlMNaming_Shape1.hxx>
#include <TDF_Label.hxx> #include <TDF_Label.hxx>
@ -103,8 +103,8 @@ Standard_Boolean XmlMNaming_NamedShapeDriver::Paste
// apres creation Builder qui a mis la version a 1 : // apres creation Builder qui a mis la version a 1 :
aTarget -> SetVersion (aVersion); aTarget -> SetVersion (aVersion);
const XmlMNaming_Array1OfShape1 OldPShapes (anElement, ::OldsString()); const XmlObjMgt_Array1 OldPShapes (anElement, ::OldsString());
const XmlMNaming_Array1OfShape1 NewPShapes (anElement, ::NewsString()); const XmlObjMgt_Array1 NewPShapes (anElement, ::NewsString());
if (NewPShapes.Length() == 0 && OldPShapes.Length() == 0) if (NewPShapes.Length() == 0 && OldPShapes.Length() == 0)
return Standard_True; return Standard_True;
@ -198,7 +198,7 @@ void XmlMNaming_NamedShapeDriver::Paste (const Handle(TDF_Attribute)& theSource,
} }
BRepTools_ShapeSet& aShapeSet = (BRepTools_ShapeSet&) myShapeSet; BRepTools_ShapeSet& aShapeSet = (BRepTools_ShapeSet&) myShapeSet;
XmlMNaming_Array1OfShape1 OldPShapes (1,NbShapes), NewPShapes (1,NbShapes); XmlObjMgt_Array1 OldPShapes (1,NbShapes), NewPShapes (1,NbShapes);
OldPShapes.CreateArrayElement (theTarget, ::OldsString()); OldPShapes.CreateArrayElement (theTarget, ::OldsString());
NewPShapes.CreateArrayElement (theTarget, ::NewsString()); NewPShapes.CreateArrayElement (theTarget, ::NewsString());

2
src/XmlObjMgt/XmlObjMgt.cdl
View File

@ -41,7 +41,7 @@ is
-- Retrieval Relocation Table -- Retrieval Relocation Table
alias RRelocationTable is DataMapOfIntegerTransient from TColStd; alias RRelocationTable is DataMapOfIntegerTransient from TColStd;
generic class Array1; class Array1;
-- Package methods -- Package methods
IdString returns DOMString from XmlObjMgt; IdString returns DOMString from XmlObjMgt;

2
src/XmlObjMgt/XmlObjMgt_Array1.cdl
View File

@ -14,7 +14,7 @@
-- Alternatively, this file may be used under the terms of Open CASCADE -- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement. -- commercial license or contractual agreement.
generic class Array1 from XmlObjMgt (Item as Storable) class Array1 from XmlObjMgt
---Purpose: The class Array1 represents unidimensionnal ---Purpose: The class Array1 represents unidimensionnal
-- array of fixed size known at run time. -- array of fixed size known at run time.

2
src/XmlObjMgt/XmlObjMgt_Array1.gxx → src/XmlObjMgt/XmlObjMgt_Array1.cxx
View File

@ -14,9 +14,11 @@
// commercial license or contractual agreement. // commercial license or contractual agreement.
//AGV 130202: Changed prototype LDOM_Node::getOwnerDocument() //AGV 130202: Changed prototype LDOM_Node::getOwnerDocument()
#include <XmlObjMgt_Array1.ixx>
#include <XmlObjMgt.hxx> #include <XmlObjMgt.hxx>
#include <XmlObjMgt_DOMString.hxx> #include <XmlObjMgt_DOMString.hxx>
#include <XmlObjMgt_Document.hxx>
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
IMPLEMENT_DOMSTRING (LowerString, "lower") IMPLEMENT_DOMSTRING (LowerString, "lower")