refs #430: incorrect coordinates in dump polyline

[modules/hydro.git] / src / HYDROData / HYDROData_CalculationCase.cxx

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index bfce3af46610d7a9b3923c18d25fa08c2030d7f1..509c2c5fb0bb63ffbd4ca5dd173f9d7aa5d15aa0 100644 (file)
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -42,6 +42,10 @@
 #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()
 
@@ -87,7 +91,7 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
       }
     }
 
-    HYDROData_SequenceOfObjects aGroups = GetGeometryGroups();
+    HYDROData_SequenceOfObjects aGroups = GetSplittedGroups();
 
     anIter.Init( aGroups );
     for ( ; anIter.More(); anIter.Next() )
@@ -250,8 +254,8 @@ void HYDROData_CalculationCase::Update()
       {
         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;
 
@@ -267,7 +271,10 @@ void HYDROData_CalculationCase::Update()
       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 ) )
       {
@@ -515,15 +522,36 @@ void HYDROData_CalculationCase::RemoveSplittedGroups()
 }
 
 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;
   }
@@ -532,15 +560,24 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) c
     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() )
     {
@@ -553,7 +590,15 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) c
       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;
 
@@ -584,6 +629,51 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) c
   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;
@@ -627,9 +717,17 @@ HYDROData_CalculationCase::PointClassification HYDROData_CalculationCase::GetPoi
   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;
   else if(State == TopAbs_IN)
@@ -787,9 +885,12 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
 #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();