refs #1092: patch for crash in batch mode tests

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index 8dee02d603b4778ae61dbeb2f4a1a0ccaa45f9e0..c224cd7d3ad217d427db429ae4ad62e873b5d569 100644 (file)
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -752,13 +752,13 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
       aResAltitude = GetAltitudeForPoint( thePoint, aZone, theMethod );
     else
       {
-        DEBTRACE("GetAltitudeForPoint Region " << aRefRegion->GetName().toStdString() << " Zone " << aZone->GetName().toStdString() << " ---------------------------");
+        //DEBTRACE("GetAltitudeForPoint Region " << aRefRegion->GetName().toStdString() << " Zone " << aZone->GetName().toStdString() << " ---------------------------");
         aResAltitude = GetAltitudeForPoint( thePoint, aZone, theMethod );
       }
   }
   else
     {
-      DEBTRACE(" --- GetAltitudeForPoint No Zone ---");
+      //DEBTRACE(" --- GetAltitudeForPoint No Zone ---");
     }
 
   return aResAltitude;
@@ -785,7 +785,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
   }
   else if ( aZoneMergeType == HYDROData_Zone::Merge_UNKNOWN )
   {
-       DEBTRACE("GetAltitudeForPoint Zone " << theZone->GetName().toStdString() << " Merge_UNKNOWN");
+       //DEBTRACE("GetAltitudeForPoint Zone " << theZone->GetName().toStdString() << " Merge_UNKNOWN");
     return aResAltitude;
   }
 

diff --git a/src/HYDROData/HYDROData_GeomTool.cxx b/src/HYDROData/HYDROData_GeomTool.cxx
index 3d54e13f34e87e59f3cb4d8b03723619ca9f2f92..a152909c98247f0e26f54693bd0f917b820c8ba7 100644 (file)
--- a/src/HYDROData/HYDROData_GeomTool.cxx
+++ b/src/HYDROData/HYDROData_GeomTool.cxx
@@ -197,7 +197,12 @@ GEOM::GEOM_Object_ptr HYDROData_GeomTool::ExplodeShapeInGEOMandPublish( GEOM::GE
   }
 
   for (size_t i = 0; i < aFc->length(); i++)
-    GEOMBase::PublishSubObject(aFc->operator[](i), Names[i]);  
+  {
+    std::string name = Names[i].toStdString();
+    GEOM::GEOM_Object_ptr anObj = aFc->operator[](i);
+    //GEOMBase::PublishSubObject( anObj, name.c_str() );
+    theGeomEngine->AddInStudy( theStudy, anObj, name.c_str(), aGeomObj );
+  }
 
   return aGeomObj;
 }