-#include <HYDROData_Iterator.h>
-#include <HYDROData_Image.h>
-#include <HYDROData_Polyline.h>
-#include <HYDROData_VisualState.h>
-#include <HYDROData_Bathymetry.h>
-#include <HYDROData_Calculation.h>
-#include <HYDROData_Zone.h>
+#include "HYDROData_Iterator.h"
+
+#include "HYDROData_AltitudeObject.h"
+#include "HYDROData_Bathymetry.h"
+#include "HYDROData_CalculationCase.h"
+#include "HYDROData_Channel.h"
+#include "HYDROData_Confluence.h"
+#include "HYDROData_Digue.h"
+#include "HYDROData_Image.h"
+#include "HYDROData_ImmersibleZone.h"
+#include "HYDROData_Obstacle.h"
+#include "HYDROData_PolylineXY.h"
+#include "HYDROData_Profile.h"
+#include "HYDROData_ProfileUZ.h"
+#include "HYDROData_VisualState.h"
+#include "HYDROData_Region.h"
+#include "HYDROData_River.h"
+#include "HYDROData_Stream.h"
+#include "HYDROData_Zone.h"
#include <TDataStd_Name.hxx>
+#include <TDataStd_NamedData.hxx>
+
#include <NCollection_DataMap.hxx>
//! Returns label by root objects kind and the kind of the object
return theRoot.FindChild(theKind);
}
-HYDROData_Iterator::HYDROData_Iterator(Handle(HYDROData_Document) theDoc, ObjectKind theKind)
- : myIter(GetLabelByKind(theDoc->LabelOfObjects(), theKind),
- TDataStd_Name::GetID(), theKind == KIND_UNKNOWN) // iterate all sub-objects for unknown kind
+HYDROData_Iterator::HYDROData_Iterator( const Handle(HYDROData_Document)& theDoc,
+ const ObjectKind theKind )
+: myIter( GetLabelByKind( theDoc->LabelOfObjects(), theKind ),
+ TDataStd_Name::GetID(), theKind == KIND_UNKNOWN ) // iterate all sub-objects for unknown kind
{
}
{
myIter.Next();
// omit the properties iteration in case of UNKNOWN kind filtering
- while(myIter.More() && myIter.Value()->Label().Depth() != 4)
+ while ( myIter.More() && myIter.Value()->Label().Depth() < 4 )
myIter.Next();
}
return myIter.More();
}
-Handle(HYDROData_Object) HYDROData_Iterator::Current()
+Handle(HYDROData_Entity) HYDROData_Iterator::Current()
{
return Object(myIter.Value()->Label());
}
-Handle_HYDROData_Object HYDROData_Iterator::CreateObject(
- Handle(HYDROData_Document) theDoc, ObjectKind theKind)
+Handle(HYDROData_Entity) HYDROData_Iterator::CreateObject(
+ const Handle(HYDROData_Document)& theDoc,
+ const ObjectKind& theObjectKind )
+{
+ TDF_Label aNewLab =
+ GetLabelByKind( theDoc->LabelOfObjects(), theObjectKind ).FindChild( theDoc->NewID() );
+ return CreateObject( aNewLab, theObjectKind );
+}
+
+Handle(HYDROData_Entity) HYDROData_Iterator::CreateObject( TDF_Label& theNewLabel,
+ const ObjectKind& theObjectKind )
{
- TDF_Label aNewLab = GetLabelByKind(theDoc->LabelOfObjects(), theKind).
- FindChild(theDoc->NewID());
- // object exists if there is name attribute
- TDataStd_Name::Set(aNewLab, TCollection_ExtendedString(""));
- return Object(aNewLab);
+ // Object exists if there is a name attribute
+ TDataStd_Name::Set( theNewLabel, "" );
+
+ // Store the type of object in data label
+ TDataStd_NamedData::Set( theNewLabel );
+
+ Handle(TDataStd_NamedData) aNamedData;
+ theNewLabel.FindAttribute( TDataStd_NamedData::GetID(), aNamedData );
+ aNamedData->SetInteger( "ObjectKind", theObjectKind );
+
+ return Object( theNewLabel );
}
-Handle_HYDROData_Object HYDROData_Iterator::Object( const TDF_Label theLabel )
+Handle(HYDROData_Entity) HYDROData_Iterator::Object( const TDF_Label& theLabel )
{
- ObjectKind aKind = theLabel.Father().Tag();
+ Handle(HYDROData_Entity) aResult;
+
+ // If label has no name attribute it mean that this is not object or
+ // this object has been removed from document
+ Handle(TDataStd_Name) aNameAtt;
+ if ( !theLabel.FindAttribute( TDataStd_Name::GetID(), aNameAtt ) )
+ return aResult;
+
+ ObjectKind aKind = KIND_UNKNOWN;
+
+ // Retrieve the type of object from label
+ Handle(TDataStd_NamedData) aNamedData;
+ if ( theLabel.FindAttribute( TDataStd_NamedData::GetID(), aNamedData ) )
+ aKind = aNamedData->GetInteger( "ObjectKind" );
+
+ if ( aKind == KIND_UNKNOWN )
+ aKind = theLabel.Father().Tag(); // Try to get type from father label
- Handle(HYDROData_Object) aResult;
switch( aKind )
{
- case KIND_IMAGE:
- aResult = new HYDROData_Image();
- break;
- case KIND_POLYLINE:
- aResult = new HYDROData_Polyline();
- break;
- case KIND_VISUAL_STATE:
- aResult = new HYDROData_VisualState();
- break;
- case KIND_BATHYMETRY:
- aResult = new HYDROData_Bathymetry();
- break;
- case KIND_CALCULATION:
- aResult = new HYDROData_Calculation();
- break;
- case KIND_ZONE:
- aResult = new HYDROData_Zone();
- break;
+ case KIND_IMAGE:
+ aResult = new HYDROData_Image();
+ break;
+ //case KIND_POLYLINE:
+ //aResult = new HYDROData_Polyline();
+ //break;
+ case KIND_BATHYMETRY:
+ aResult = new HYDROData_Bathymetry();
+ break;
+ case KIND_ALTITUDE:
+ aResult = new HYDROData_AltitudeObject();
+ break;
+ case KIND_IMMERSIBLE_ZONE:
+ aResult = new HYDROData_ImmersibleZone();
+ break;
+ case KIND_RIVER:
+ aResult = new HYDROData_River();
+ break;
+ case KIND_STREAM:
+ aResult = new HYDROData_Stream();
+ break;
+ case KIND_CONFLUENCE:
+ aResult = new HYDROData_Confluence();
+ break;
+ case KIND_CHANNEL:
+ aResult = new HYDROData_Channel();
+ break;
+ case KIND_OBSTACLE:
+ aResult = new HYDROData_Obstacle();
+ break;
+ case KIND_DIGUE:
+ aResult = new HYDROData_Digue();
+ break;
+ case KIND_PROFILE:
+ aResult = new HYDROData_Profile();
+ break;
+ case KIND_PROFILEUZ:
+ aResult = new HYDROData_ProfileUZ();
+ break;
+ case KIND_POLYLINEXY:
+ aResult = new HYDROData_PolylineXY();
+ break;
+ case KIND_CALCULATION:
+ aResult = new HYDROData_CalculationCase();
+ break;
+ case KIND_REGION:
+ aResult = new HYDROData_Region();
+ break;
+ case KIND_ZONE:
+ aResult = new HYDROData_Zone();
+ break;
+ case KIND_VISUAL_STATE:
+ aResult = new HYDROData_VisualState();
+ break;
+ default:
+ break;
}
if ( !aResult.IsNull() )