HYDROData_Region::HYDROData_Region()
- : HYDROData_Entity()
+ : HYDROData_Entity( Geom_2d )
{
}
if ( !aFatherRegion.IsNull() && aFatherRegion->Label() != myLab )
{
Handle(HYDROData_Zone) aNewZone = addNewZone( aDocument, "", TopoDS_Face(), QStringList() );
- theZone->CopyTo( aNewZone );
+ theZone->CopyTo( aNewZone, false );
// To prevent changing of stored shape
aNewZone->SetShape( theZone->GetShape() );
for ( int i = 0, n = theRefObjects.length(); i < n; ++i )
{
const QString& anObjName = theRefObjects.at( i );
- Handle(HYDROData_Object) aRefObject =
- Handle(HYDROData_Object)::DownCast( theDoc->FindObjectByName( anObjName ) );
+ Handle(HYDROData_Entity) aRefObject = theDoc->FindObjectByName( anObjName );
if ( aRefObject.IsNull() )
continue;
- aNewZone->AddGeometryObject( aRefObject );
+ aNewZone->AddObject( aRefObject );
}
return aNewZone;
// set zone merge type
QString aMergeTypeStr;
- HYDROData_Zone::MergeAltitudesType aMergeType = aZone->GetMergeType();
+ HYDROData_Zone::MergeType aMergeType = aZone->GetMergeType();
if ( aMergeType == HYDROData_Zone::Merge_ZMIN ) {
aMergeTypeStr = "HYDROData_Zone.Merge_ZMIN";
} else if ( aMergeType == HYDROData_Zone::Merge_ZMAX ) {
aResList << QString( "%1.SetMergeType( %2 )" ).arg( aZone->GetObjPyName() ).arg( aMergeTypeStr );
}
if ( aMergeType == HYDROData_Zone::Merge_Object ) {
- Handle(HYDROData_IAltitudeObject) aMergeAltitude = aZone->GetMergeAltitude();
- if ( !aMergeAltitude.IsNull() ) {
- aMergeAltitude->findPythonReferenceObject( theTreatedObjects, aResList );
- aResList << QString( "%1.SetMergeAltitude( %2 )" ).arg( aZone->GetObjPyName() )
- .arg( aMergeAltitude->GetObjPyName() );
+ Handle(HYDROData_Entity) aMergeObject = aZone->GetMergeObject();
+ if ( !aMergeObject.IsNull() ) {
+ aMergeObject->findPythonReferenceObject( theTreatedObjects, aResList );
+ aResList << QString( "%1.SetMergeObject( %2 )" ).arg( aZone->GetObjPyName() )
+ .arg( aMergeObject->GetObjPyName() );
}
}