Porting on OCCT 7.0 and Qt 5. Make compilable version.

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

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index 78c2de6856e3c2f11592ace8fb0bce9a866fc68a..9bea62647310c65f3235c134c6fe4eabad555b64 100644 (file)
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -83,7 +83,6 @@
 #define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_CalculationCase, HYDROData_Entity)
 
 HYDROData_CalculationCase::HYDROData_CalculationCase()
@@ -196,9 +195,10 @@ QStringList HYDROData_CalculationCase::DumpToPython( const QString&       thePyS
   aResList << "import GEOM";
   aResList << QString( "print \"Entry:\", %1" ).arg( anEntryVar );
   QString aGeomShapeName = aCalculName + "_geom";
-  aResList << QString( "%1 = salome.IDToObject( str( %2 ) )" ).arg( aGeomShapeName ).arg( anEntryVar );
-  aResList << QString( "print \"Geom shape:\", %1" ).arg( aGeomShapeName );
-  aResList << QString( "print \"Geom shape name:\", %1.GetName()" ).arg( aGeomShapeName );
+  aResList << QString( "HYDRO_%1 = salome.IDToObject( str( %2 ) )" ).arg( GetName() ).arg( anEntryVar );
+  aResList << QString( "print \"Geom shape:\", HYDRO_%1" ).arg( GetName() );
+  aResList << QString( "print \"Geom shape name:\", HYDRO_%1.GetName()" ).arg( GetName() );
+
 
   //DumpSampleMeshing( aResList, aStudyName, aGeomShapeName, aCalculName+"_mesh" );
 
@@ -985,7 +985,7 @@ Handle(HYDROData_Region) HYDROData_CalculationCase::addNewRegion( const Handle(H
   AddRegion( aNewRegion );
 
   QString aRegionName = isPrefix ? HYDROData_Tool::GenerateObjectName( theDoc, thePrefixOrName ) : thePrefixOrName;
-  aNewRegion->SetName( aRegionName );
+  aNewRegion->SetName( aRegionName, true );
 
   return aNewRegion;
 }
@@ -1341,18 +1341,28 @@ void HYDROData_CalculationCase::DumpRegionsToPython( QStringList& theResList,
                                                      const HYDROData_SequenceOfObjects& theRegions ) const
 {
   HYDROData_SequenceOfObjects::Iterator anIter;
-  anIter.Init( theRegions );
-  for ( ; anIter.More(); anIter.Next() )
-  {
-    Handle(HYDROData_Region) aRegion =
-      Handle(HYDROData_Region)::DownCast( anIter.Value() );
-    if ( aRegion.IsNull() )
-      continue;
-
-    theTreatedObjects.insert( aRegion->GetName(), aRegion );
-    QStringList aRegDump = aRegion->DumpToPython( thePyScriptPath, theTreatedObjects );
-    theResList << aRegDump;
-  }
+  anIter.Init(theRegions);
+  for (int ireg = 1; anIter.More(); anIter.Next(), ireg++)
+    {
+      Handle(HYDROData_Region) aRegion = Handle(HYDROData_Region)::DownCast(anIter.Value());
+      if (aRegion.IsNull())
+        continue;
+      QString defRegName = this->GetName();
+      QString regSuffix = QString("_Reg_%1").arg(ireg);
+      defRegName += regSuffix;
+      theTreatedObjects.insert(aRegion->GetName(), aRegion);
+      QStringList aRegDump = aRegion->DumpToPython(thePyScriptPath, theTreatedObjects, defRegName);
+      theResList << aRegDump;
+    }
+  for (anIter.Init(theRegions); anIter.More(); anIter.Next())
+    {
+      Handle(HYDROData_Region) aRegion = Handle(HYDROData_Region)::DownCast(anIter.Value());
+      if (aRegion.IsNull())
+        continue;
+      QStringList aRegDump;
+      aRegion->SetNameInDumpPython(aRegDump);
+      theResList << aRegDump;
+    }
 }
 
 bool HYDROData_CalculationCase::GetRule( int theIndex,