]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
Merge branch 'BR_v14_rc' into BR_quadtree
authorPaul RASCLE <paul.rascle@edf.fr>
Wed, 24 Jun 2015 08:30:22 +0000 (10:30 +0200)
committerPaul RASCLE <paul.rascle@edf.fr>
Wed, 24 Jun 2015 08:30:22 +0000 (10:30 +0200)
1  2 
src/HYDROData/CMakeLists.txt
src/HYDROData/HYDROData_CalculationCase.cxx

Simple merge
index 2dd84bef4672b2a3a2f18bf2c900456278ebb7f7,00474d50b9317d3e9bcbc7ad82a71fc0664d86aa..be4d3cffd90ec4033bcfc2fd31306e088a71a558
@@@ -753,10 -762,9 +768,10 @@@ double HYDROData_CalculationCase::GetAl
  {
    double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
  
-   Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
+   Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, false );
    if ( !aZone.IsNull() )
    {
 +    //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 );