X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_CalculationCase.cxx;h=509c2c5fb0bb63ffbd4ca5dd173f9d7aa5d15aa0;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=eb3026c0e12c2efc5366d3ccf2838e1f66c812f6;hpb=4fb26469914cfdce427475638c0ed89299036c54;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index eb3026c0..509c2c5f 100644
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -34,10 +34,18 @@
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
-
+//#define  DEB_CALCULATION 1
+#ifdef DEB_CALCULATION
+#include <BRepTools.hxx>
+#include <TopLoc_Location.hxx>
+#endif 
 #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()
 
@@ -83,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() )
@@ -102,8 +110,9 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
 
 QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
-  QStringList aResList = HYDROData_Entity::DumpToPython( theTreatedObjects );
-  QString aCalculName = GetName();
+  QStringList aResList = dumpObjectCreation( theTreatedObjects );
+
+  QString aCalculName = GetObjPyName();
 
   HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
   HYDROData_SequenceOfObjects::Iterator anIter( aGeomObjects );
@@ -111,12 +120,39 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
   {
     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( "" );
+
+  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( "" );
 
-  aResList << QString( "%1.SplitGeometryObjects();" ).arg( aCalculName );
+  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
@@ -130,8 +166,20 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
       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;
 }
@@ -206,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;
 
@@ -223,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 ) )
       {
@@ -471,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;
   }
@@ -488,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() )
     {
@@ -509,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;
 
@@ -540,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;
@@ -583,15 +717,23 @@ 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;
+    aRes =  POINT_OUT;
   else if(State == TopAbs_IN)
     aRes =  POINT_IN;
   else if(State == TopAbs_ON)
-    aRes =  POINT_ON;	  
+    aRes =  POINT_ON;
   return aRes;
 }
 
@@ -668,8 +810,11 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
 {
   // Sew faces
   BRepBuilderAPI_Sewing aSewing( Precision::Confusion() * 10.0 );
-  aSewing.SetNonManifoldMode( Standard_True );
-
+  aSewing.SetNonManifoldMode( Standard_False );
+#ifdef DEB_CALCULATION
+  TCollection_AsciiString aNam("Sh_");
+  int i=1;
+#endif
   TopTools_ListIteratorOfListOfShape aFaceIter( theFaces );
   for ( ; aFaceIter.More(); aFaceIter.Next() )
   {
@@ -680,12 +825,25 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
     if ( aShape.ShapeType() == TopAbs_FACE )
     {
       aSewing.Add( aShape );
+#ifdef DEB_CALCULATION
+      TCollection_AsciiString aName = aNam + ++i + ".brep";
+      BRepTools::Write(aShape ,aName.ToCString());
+#endif
     }
     else
     {
+#ifdef DEB_CALCULATION
+      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());
+#endif
+      }
     }
   } // faces iterator
   
@@ -696,12 +854,15 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
   if ( aSewedShape.IsNull() || !TopoDS_Iterator( aSewedShape ).More() )
     return false;
 
+#ifdef DEB_CALCULATION
+  BRepTools::Write(aSewedShape ,"Sew.brep");
+#endif
   // Publish the sewed shape
   QString aName = EXPORT_NAME;
   GEOM::GEOM_Object_ptr aMainShape = 
     publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName );
 
-  if ( aMainShape->_is_nil() )
+  if ( aMainShape->_is_nil() )  
     return false;
 
   if ( theGroupsDefs.IsEmpty() )
@@ -721,26 +882,48 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
     for( int i = 1, n = aGroupDef.Shapes.Length(); i <= n; i++ )
     {
       const TopoDS_Shape& aShape = aGroupDef.Shapes.Value( i );
-
-      const TopoDS_Shape& aModifiedShape = aSewing.Modified( aShape );
-      if ( aModifiedShape.IsNull() )
-        continue;
-
-      // Workaround for TopTools_IndexedMapOfShape::FindIndex()
-      for ( int anIndex = 1; anIndex <= aMapOfSubShapes.Extent(); anIndex++ )
-      {
-        if ( aModifiedShape.IsPartner( aMapOfSubShapes.FindKey( anIndex ) ) )
+#ifdef DEB_CALCULATION
+      cout << "\nOld shape(" << i << ") = " << aShape.TShape() <<endl;
+#endif
+      
+      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;
+#endif
+
+      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;
+           }
+         }
         }
+#endif
       }
     }
-
     if ( !aGroupIndexes.IsEmpty() )
       aGroupsData.Bind( aGroupDef.Name, aGroupIndexes );
   }
-  
+ 
   if ( !aGroupsData.IsEmpty() )
   {
     GEOM::GEOM_IGroupOperations_var aGroupOp =