X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_CalculationCase.cxx;h=ff5dd2980a6078f20982a483ab1d1b56403585eb;hb=83437139f2e5e8f7c7d4268866b8b9c42bebdcb2;hp=8dee02d603b4778ae61dbeb2f4a1a0ccaa45f9e0;hpb=15aed67b5f26dad1f17035be35bcd570e947158c;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index 8dee02d6..ff5dd298 100644
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -82,10 +82,9 @@
 #include <SALOME_LifeCycleCORBA.hxx>
 #endif
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_CalculationCase, HYDROData_Entity)
 
 HYDROData_CalculationCase::HYDROData_CalculationCase()
@@ -608,6 +607,7 @@ Handle(HYDROData_LandCoverMap) HYDROData_CalculationCase::GetLandCoverMap() cons
 {
   Handle(HYDROData_LandCoverMap) aMap = Handle(HYDROData_LandCoverMap)::DownCast(
     GetReferenceObject( DataTag_LandCoverMap ) );
+  DEBTRACE("GetLandCoverMap " << aMap.IsNull());
   return aMap;
 }
 
@@ -674,31 +674,31 @@ void HYDROData_CalculationCase::UpdateRegionsOrder()
   if ( aDocument.IsNull() )
     return;
 
+  QString aRegsPref = CALCULATION_REGIONS_PREF;
+  std::map<int, Handle(HYDROData_Region)> IndToRegion; //index in the name of region to region itself 
   HYDROData_SequenceOfObjects aRegions = GetRegions();
   HYDROData_SequenceOfObjects::Iterator anIter( aRegions );
+  QString aName;
+  int aVal;
   for ( ; anIter.More(); anIter.Next() )
   {
-    Handle(HYDROData_Region) aRegion =
-      Handle(HYDROData_Region)::DownCast( anIter.Value() );
+    Handle(HYDROData_Region) aRegion = Handle(HYDROData_Region)::DownCast( anIter.Value() );
     if ( aRegion.IsNull() )
       continue;
 
-    aRegion->SetName( "" );
+    if (HYDROData_Tool::ExtractGeneratedObjectName(aRegion->GetName(), aVal, aName) && aName == aRegsPref)
+      IndToRegion[aVal] = aRegion;
   }
 
-  QString aRegsPref = CALCULATION_REGIONS_PREF;
-
-  anIter.Init( aRegions );
-  for ( ; anIter.More(); anIter.Next() )
-  {
-    Handle(HYDROData_Region) aRegion =
-      Handle(HYDROData_Region)::DownCast( anIter.Value() );
-    if ( aRegion.IsNull() )
-      continue;
-
-    QString aRegionName = HYDROData_Tool::GenerateObjectName( aDocument, aRegsPref );
-    aRegion->SetName( aRegionName );
-  }
+  int nbR = aRegions.Length();
+  std::map<int, Handle(HYDROData_Region)>::iterator it = IndToRegion.begin();
+  for( int i = 1; it != IndToRegion.end(); ++it )
+    if (it->first <= nbR + 1)
+    {
+      QString aNewName = QString("%1_%2").arg(aRegsPref).arg(QString::number(i));
+      it->second->SetName(aNewName);
+      i++;
+    }
 }
 
 void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& theRegion )
@@ -746,7 +746,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
   Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
   if ( !aZone.IsNull() )
   {
-    //DEBTRACE("GetAltitudeForPoint Region " << theRegion->GetName().toStdString() << " Zone " << aZone->GetName().toStdString());
+    DEBTRACE("GetAltitudeForPoint Region " << theRegion->GetName().toStdString() << " Zone " << aZone->GetName().toStdString());
     Handle(HYDROData_Region) aRefRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
     if ( IsEqual( aRefRegion, theRegion ) )
       aResAltitude = GetAltitudeForPoint( thePoint, aZone, theMethod );
@@ -768,7 +768,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
                                                        const Handle(HYDROData_Zone)& theZone,
                                                        int theMethod) const
 {
-  //DEBTRACE("GetAltitudeForPoint Zone " << theZone->GetName().toStdString());
+  DEBTRACE("GetAltitudeForPoint Zone " << theZone->GetName().toStdString());
   double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
   if ( theZone.IsNull() )
   {
@@ -777,11 +777,11 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
   }
 
   HYDROData_Zone::MergeType aZoneMergeType = theZone->GetMergeType();
-  //DEBTRACE("aZoneMergeType " << aZoneMergeType);
+  DEBTRACE("aZoneMergeType " << aZoneMergeType);
   if ( !theZone->IsMergingNeed() )
   {
     aZoneMergeType = HYDROData_Zone::Merge_UNKNOWN;
-    //DEBTRACE("---");
+    DEBTRACE("---");
   }
   else if ( aZoneMergeType == HYDROData_Zone::Merge_UNKNOWN )
   {
@@ -811,7 +811,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
   }
   else
   {
-	//DEBTRACE("aZoneMergeType != HYDROData_Zone::Merge_Object");
+	DEBTRACE("aZoneMergeType != HYDROData_Zone::Merge_Object");
     HYDROData_SequenceOfObjects aZoneObjects = theZone->GetObjects();
     HYDROData_SequenceOfObjects::Iterator anIter( aZoneObjects );
     for ( ; anIter.More(); anIter.Next() )
@@ -834,7 +834,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
       }
       else
       {
-    	//DEBTRACE("aZoneInterpolator == NULL");
+    	DEBTRACE("aZoneInterpolator == NULL");
         aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint, theMethod );
       }
 
@@ -921,9 +921,12 @@ double HYDROData_CalculationCase::GetStricklerCoefficientForPoint( const gp_XY&
 std::vector<double> HYDROData_CalculationCase::GetStricklerCoefficientForPoints(const std::vector<gp_XY>& thePoints,
   double DefValue, bool UseMax ) const
 {
+  DEBTRACE("GetStricklerCoefficientForPoints");
   Handle( HYDROData_LandCoverMap ) aLCM = GetLandCoverMap();
   Handle( HYDROData_StricklerTable ) aTable = GetStricklerTable();
   std::vector<double> theCoeffs;
+  DEBTRACE("aLCM.IsNull() " << aLCM.IsNull());
+  DEBTRACE("aTable.IsNull() "<< aTable.IsNull());
   if( aLCM.IsNull() || aTable.IsNull() )
     return theCoeffs;
 
@@ -1162,7 +1165,7 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
     const TopoDS_Shape& aShape = aShToName.FindKey(i);
     if ( aShape.IsNull() )
       continue;
-    
+
     SH2M.Bind(aShape, TopTools_ListOfShape());
     TopTools_ListOfShape& LM = SH2M.ChangeFind(aShape);
     if ( aShape.ShapeType() == TopAbs_FACE || aShape.ShapeType() == TopAbs_SHELL )
@@ -1179,6 +1182,7 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
         LM.Append(anExp.Current());
       }
       anExp.Init( aShape, TopAbs_FACE, TopAbs_SHELL );
+      for (; anExp.More(); anExp.Next() )
       {
         aSewing.Add( anExp.Current() );
         LM.Append(anExp.Current());
@@ -1213,8 +1217,7 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
 
 #ifdef DEB_CALCULATION
   BRepTools::Write(aSewedShape ,"Sew.brep");
-#endif
-  // Publish the sewed shape
+#endif  // Publish the sewed shape
   QString aName = EXPORT_NAME;
   GEOM::GEOM_Object_ptr aMainShape = 
     HYDROData_GeomTool::ExplodeShapeInGEOMandPublish( theGeomEngine, theStudy, aSewedShape, aFacesToNameModif, aName, theGeomObjEntry );