#define CALCULATION_REGIONS_PREF GetName() + "_Reg"
#define CALCULATION_ZONES_PREF GetName() + "_Zone"
#define CALCULATION_GROUPS_PREF GetName() + "_"
+//#define DEB_CLASS2D 1
+#ifdef DEB_CLASS2D
+#include <BRepBuilderAPI_MakeVertex.hxx>
+#endif
#define EXPORT_NAME "HYDRO_" + GetName()
}
}
- HYDROData_SequenceOfObjects aGroups = GetGeometryGroups();
+ HYDROData_SequenceOfObjects aGroups = GetSplittedGroups();
anIter.Init( aGroups );
for ( ; anIter.More(); anIter.Next() )
QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
{
QStringList aResList = dumpObjectCreation( theTreatedObjects );
- QString aCalculName = GetName();
+
+ QString aCalculName = GetObjPyName();
HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
HYDROData_SequenceOfObjects::Iterator anIter( aGeomObjects );
{
Handle(HYDROData_Object) aRefGeomObj =
Handle(HYDROData_Object)::DownCast( anIter.Value() );
- if ( !aRefGeomObj.IsNull() )
- setPythonReferenceObject( theTreatedObjects, aResList, aRefGeomObj, "AddGeometryObject" );
+ setPythonReferenceObject( theTreatedObjects, aResList, aRefGeomObj, "AddGeometryObject" );
}
aResList << QString( "" );
- aResList << QString( "%1.SplitGeometryObjects();" ).arg( aCalculName );
+ QString aGroupName = HYDROData_Tool::GenerateNameForPython( theTreatedObjects, "case_geom_group" );
+
+ HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
+ anIter.Init( aGeomGroups );
+ for ( ; anIter.More(); anIter.Next() )
+ {
+ Handle(HYDROData_ShapesGroup) aGeomGroup =
+ Handle(HYDROData_ShapesGroup)::DownCast( anIter.Value() );
+ if ( aGeomGroup.IsNull() )
+ continue;
+
+ Handle(HYDROData_Object) aFatherGeom =
+ Handle(HYDROData_Object)::DownCast( aGeomGroup->GetFatherObject() );
+ if ( aFatherGeom.IsNull() )
+ continue;
+
+ int aGroupId = aFatherGeom->GetGroupId( aGeomGroup );
+ aResList << QString( "%1 = %2.GetGroup( %3 );" )
+ .arg( aGroupName ).arg( aFatherGeom->GetObjPyName() ).arg( aGroupId );
+
+ aResList << QString( "%1.AddGeometryGroup( %2 );" ).arg( aCalculName ).arg( aGroupName );
+ }
+ aResList << QString( "" );
+
+ Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
+ setPythonReferenceObject( theTreatedObjects, aResList, aBoundaryPolyline, "SetBoundaryPolyline" );
+ aResList << QString( "" );
+
+ aResList << QString( "%1.Update();" ).arg( aCalculName );
aResList << QString( "" );
// Now we restore the regions and zones order
continue;
QString aRegionName = aRegion->GetName();
- // TODO
+
+ HYDROData_SequenceOfObjects aZones = aRegion->GetZones();
+ HYDROData_SequenceOfObjects::Iterator aZonesIter( aZones );
+ for ( ; aZonesIter.More(); aZonesIter.Next() )
+ {
+ Handle(HYDROData_Zone) aRegZone =
+ Handle(HYDROData_Zone)::DownCast( aZonesIter.Value() );
+ if ( aRegZone.IsNull() )
+ continue;
+
+ // TODO
+ }
}
+ aResList << QString( "" );
return aResList;
}
{
const QString& anObjName = aSplitData.ObjectNames.at( i );
- Handle(HYDROData_Object) aRefObject = Handle(HYDROData_Object)::DownCast(
- HYDROData_Tool::FindObjectByName( aDocument, anObjName ) );
+ Handle(HYDROData_Object) aRefObject =
+ Handle(HYDROData_Object)::DownCast( aDocument->FindObjectByName( anObjName ) );
if ( aRefObject.IsNull() )
continue;
QString anObjName = aSplitData.ObjectNames.first();
if ( anObjName.isEmpty() )
continue;
-
+#ifdef DEB_CALCULATION
+ QString aStr = aSplitData.ObjectNames.join(" ");
+ cout << " CCase: Names = "<<aStr.toStdString() << " size = " <<aSplitData.ObjectNames.size() <<endl;
+#endif
Handle(HYDROData_SplittedShapesGroup) aSplittedGroup;
if ( !aSplittedEdgesGroupsMap.contains( anObjName ) )
{
}
double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) const
+{
+ Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
+ return GetAltitudeForPoint( thePoint, aZone );
+}
+
+double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint,
+ const Handle(HYDROData_Region)& theRegion ) const
{
double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
- if ( aZone.IsNull() )
+ if ( !aZone.IsNull() )
+ {
+ Handle(HYDROData_Region) aRefRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
+ if ( IsEqual( aRefRegion, theRegion ) )
+ aResAltitude = GetAltitudeForPoint( thePoint, aZone );
+ }
+
+ return aResAltitude;
+}
+
+double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint,
+ const Handle(HYDROData_Zone)& theZone ) const
+{
+ double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
+ if ( theZone.IsNull() )
return aResAltitude;
- HYDROData_Zone::MergeAltitudesType aZoneMergeType = aZone->GetMergeType();
- if ( !aZone->IsMergingNeed() )
+ HYDROData_Zone::MergeAltitudesType aZoneMergeType = theZone->GetMergeType();
+ if ( !theZone->IsMergingNeed() )
{
aZoneMergeType = HYDROData_Zone::Merge_UNKNOWN;
}
return aResAltitude;
}
+ HYDROData_IInterpolator* aZoneInterpolator = theZone->GetInterpolator();
if ( aZoneMergeType == HYDROData_Zone::Merge_Object )
{
- Handle(HYDROData_IAltitudeObject) aMergeAltitude = aZone->GetMergeAltitude();
+ Handle(HYDROData_IAltitudeObject) aMergeAltitude = theZone->GetMergeAltitude();
if ( !aMergeAltitude.IsNull() )
- aResAltitude = aMergeAltitude->GetAltitudeForPoint( thePoint );
+ {
+ if ( aZoneInterpolator != NULL )
+ {
+ aZoneInterpolator->SetAltitudeObject( aMergeAltitude );
+ aResAltitude = aZoneInterpolator->GetAltitudeForPoint( thePoint );
+ }
+ else
+ aResAltitude = aMergeAltitude->GetAltitudeForPoint( thePoint );
+ }
}
else
{
- HYDROData_SequenceOfObjects aZoneObjects = aZone->GetGeometryObjects();
+ HYDROData_SequenceOfObjects aZoneObjects = theZone->GetGeometryObjects();
HYDROData_SequenceOfObjects::Iterator anIter( aZoneObjects );
for ( ; anIter.More(); anIter.Next() )
{
if ( anObjAltitude.IsNull() )
continue;
- double aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint );
+ double aPointAltitude = 0.0;
+ if ( aZoneInterpolator != NULL )
+ {
+ aZoneInterpolator->SetAltitudeObject( anObjAltitude );
+ aPointAltitude = aZoneInterpolator->GetAltitudeForPoint( thePoint );
+ }
+ else
+ aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint );
+
if ( ValuesEquals( aPointAltitude, HYDROData_IAltitudeObject::GetInvalidAltitude() ) )
continue;
return aResAltitude;
}
+NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints(
+ const NCollection_Sequence<gp_XY>& thePoints,
+ const Handle(HYDROData_Region)& theRegion ) const
+{
+ NCollection_Sequence<double> aResSeq;
+
+ for ( int i = 1, n = thePoints.Length(); i <= n; ++i )
+ {
+ const gp_XY& thePnt = thePoints.Value( i );
+
+ double anAltitude = GetAltitudeForPoint( thePnt, theRegion );
+ aResSeq.Append( anAltitude );
+ }
+
+ return aResSeq;
+}
+
+NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints(
+ const NCollection_Sequence<gp_XY>& thePoints,
+ const Handle(HYDROData_Zone)& theZone ) const
+{
+ NCollection_Sequence<double> aResSeq;
+
+ for ( int i = 1, n = thePoints.Length(); i <= n; ++i )
+ {
+ const gp_XY& thePnt = thePoints.Value( i );
+
+ double anAltitude = GetAltitudeForPoint( thePnt, theZone );
+ aResSeq.Append( anAltitude );
+ }
+
+ return aResSeq;
+}
+
+Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint ) const
+{
+ Handle(HYDROData_Region) aResRegion;
+
+ Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
+ if ( !aZone.IsNull() )
+ aResRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
+
+ return aResRegion;
+}
+
Handle(HYDROData_Zone) HYDROData_CalculationCase::GetZoneFromPoint( const gp_XY& thePoint ) const
{
Handle(HYDROData_Zone) aResZone;
TopoDS_Face aZoneFace = TopoDS::Face( theZone->GetShape() );
if ( aZoneFace.IsNull() )
return aRes;
-
- BRepTopAdaptor_FClass2d aClassifier( aZoneFace, Precision::Confusion() );
- TopAbs_State State = aClassifier.Perform( gp_Pnt2d(thePoint), Standard_False );
+#ifdef DEB_CLASS2D
+ TopoDS_Compound aCmp;
+ BRep_Builder aBB;
+ aBB.MakeCompound(aCmp);
+ aBB.Add(aCmp, aZoneFace);
+ gp_Pnt aPnt (thePoint.X(), thePoint.Y(), 0.);
+ BRepBuilderAPI_MakeVertex aMk(aPnt);
+ aBB.Add(aCmp, aMk.Vertex());
+ BRepTools::Write(aCmp, "FCL2d.brep");
+#endif
+ TopAbs_State State = HYDROData_Tool::ComputePointState(thePoint, aZoneFace);
if (State == TopAbs_OUT)
- aRes = POINT_OUT;
+ aRes = POINT_OUT;
else if(State == TopAbs_IN)
aRes = POINT_IN;
else if(State == TopAbs_ON)
- aRes = POINT_ON;
+ aRes = POINT_ON;
return aRes;
}
{
aSewing.Add( aShape );
#ifdef DEB_CALCULATION
- TCollection_AsciiString aName = aNam + ++i + ".brep";
- BRepTools::Write(aShape ,aName.ToCString());
+ TCollection_AsciiString aName = aNam + ++i + ".brep";
+ BRepTools::Write(aShape ,aName.ToCString());
#endif
}
else
{
#ifdef DEB_CALCULATION
- int j = 1;
+ int j = 1;
#endif
TopExp_Explorer anExp( aShape, TopAbs_FACE );
- for (; anExp.More(); anExp.Next() ) {
+ for (; anExp.More(); anExp.Next() ) {
aSewing.Add( anExp.Current() );
#ifdef DEB_CALCULATION
TCollection_AsciiString aName = aNam + i + "_" + ++j + ".brep";
- BRepTools::Write(anExp.Current() ,aName.ToCString());
+ BRepTools::Write(anExp.Current() ,aName.ToCString());
#endif
- }
+ }
}
} // faces iterator
NCollection_Sequence<int> aGroupIndexes;
for( int i = 1, n = aGroupDef.Shapes.Length(); i <= n; i++ )
- {
+ {
const TopoDS_Shape& aShape = aGroupDef.Shapes.Value( i );
#ifdef DEB_CALCULATION
cout << "\nOld shape(" << i << ") = " << aShape.TShape() <<endl;
#endif
- const TopoDS_Shape& aModifiedShape = aSewing.Modified( aShape );
- if ( aModifiedShape.IsNull() )
- continue;
+
+ TopoDS_Shape aModifiedShape = aShape;
+ if ( aSewing.IsModified( aShape ) )
+ aModifiedShape = aSewing.Modified( aShape );
+ else if ( aSewing.IsModifiedSubShape( aShape ) )
+ aModifiedShape = aSewing.ModifiedSubShape( aShape );
#ifdef DEB_CALCULATION
- const TopLoc_Location& aL1 = aShape.Location();
- const TopLoc_Location& aL2 = aModifiedShape.Location();
- cout << "\nNew shape(" << i << ") = " << aModifiedShape.TShape() << " Location is Equal = " << aL1.IsEqual(aL2)<<endl;
+ const TopLoc_Location& aL1 = aShape.Location();
+ const TopLoc_Location& aL2 = aModifiedShape.Location();
+ cout << "\nNew shape(" << i << ") = " << aModifiedShape.TShape() << " Location is Equal = " << aL1.IsEqual(aL2)<<endl;
#endif
- // Workaround for TopTools_IndexedMapOfShape::FindIndex()
- /*for ( int anIndex = 1; anIndex <= aMapOfSubShapes.Extent(); anIndex++ )
- {
- if ( aModifiedShape.IsPartner( aMapOfSubShapes.FindKey( anIndex ) ) )
+ int anIndex = aMapOfSubShapes.FindIndex(aModifiedShape);
+ if ( anIndex > 0 ) {
+ aGroupIndexes.Append( anIndex );
+ } else {
+#ifdef DEB_CALCULATION
+ TCollection_AsciiString aNam("Lost_");
+ if(!aMapOfSubShapes.Contains(aModifiedShape)) {
+ for ( int anIndex = 1; anIndex <= aMapOfSubShapes.Extent(); anIndex++ )
{
- aGroupIndexes.Append( anIndex );
- break;
+ const TopoDS_Shape& aS = aMapOfSubShapes.FindKey( anIndex );
+ if ( aModifiedShape.IsPartner( aS ) )
+ {
+ cout <<"\nIndex in Map = " << anIndex << "TShape = " << aS.TShape() <<endl;
+ TCollection_AsciiString aName = aNam + i + "_" + anIndex + ".brep";
+ BRepTools::Write(aS ,aName.ToCString());
+ break;
+ }
+ }
}
- }
- */
- int anIndex = aMapOfSubShapes.FindIndex(aModifiedShape);
- if(anIndex > 0) {
- aGroupIndexes.Append( anIndex );
- //break;
- } else {
-#ifdef DEB_CALCULATION
- TCollection_AsciiString aNam("Lost_");
- if(!aMapOfSubShapes.Contains(aModifiedShape)) {
- for ( int anIndex = 1; anIndex <= aMapOfSubShapes.Extent(); anIndex++ )
- {
- const TopoDS_Shape& aS = aMapOfSubShapes.FindKey( anIndex );
- if ( aModifiedShape.IsPartner( aS ) )
- {
- cout <<"\nIndex in Map = " << anIndex << "TShape = " << aS.TShape() <<endl;
- TCollection_AsciiString aName = aNam + i + "_" + anIndex + ".brep";
- BRepTools::Write(aS ,aName.ToCString());
- break;
- }
- }
- }
#endif
- }
- }
+ }
+ }
if ( !aGroupIndexes.IsEmpty() )
aGroupsData.Bind( aGroupDef.Name, aGroupIndexes );
}
