From: isn <isn@opencascade.com>
Date: Wed, 29 Nov 2017 18:15:57 +0000 (+0300)
Subject: porting to salome 8.4
X-Git-Tag: v2.1.1__salome84~13
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3518bc4903992b3c3376cf7faaee391060957f02;p=modules%2Fhydro.git

porting to salome 8.4
---

diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx
index 526589c5..d4645ea4 100644
--- a/src/HYDROData/HYDROData_Channel.cxx
+++ b/src/HYDROData/HYDROData_Channel.cxx
@@ -60,6 +60,8 @@
 #include <TopoDS_Wire.hxx>
 #include <TopoDS_Vertex.hxx>
 
+#include <Quantity_Parameter.hxx>
+
 #define DEB_CHANNEL 1
 #ifdef DEB_CHANNEL
 #include <BRepTools.hxx>
diff --git a/src/HYDROData/HYDROData_DTM.cxx b/src/HYDROData/HYDROData_DTM.cxx
index 3313bfe0..f4fe6efa 100644
--- a/src/HYDROData/HYDROData_DTM.cxx
+++ b/src/HYDROData/HYDROData_DTM.cxx
@@ -58,6 +58,7 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <assert.h>
+#include <float.h>
 
 IMPLEMENT_STANDARD_RTTIEXT( HYDROData_DTM, HYDROData_Bathymetry )
 
@@ -98,7 +99,7 @@ HYDROData_DTM::CurveUZ HYDROData_DTM::CurveUZ::operator + ( const CurveUZ& c ) c
   {
     std::cout << "Warning: different number of points in curves: " << n << ", " << n1 << std::endl;
   }
-  int q = std::min(n, n1);
+  int q = min(n, n1);
   res.reserve( q );
   for( int i=0; i<q; i++ )
   {
@@ -428,7 +429,7 @@ void HYDROData_DTM::GetProperties( const Handle(HYDROData_Profile)& theProfile,
   HYDROData_Profile::ProfilePoints points = theProfile->GetProfilePoints();
   int lo = points.Lower();
   int up = points.Upper();
-  theZMin = std::numeric_limits<double>::max();
+  theZMin = DBL_MAX;
   theZMax = -theZMin;
   for( int i=lo; i<=up; i++ )
   {
@@ -656,7 +657,7 @@ std::vector<Handle(Geom2d_Curve)> HYDROData_DTM::ProfileToParametric(
 
 bool CalcMidWidth( const std::set<double>& intersections, double& theMid, double& theWid )
 {
-  double umin = std::numeric_limits<double>::max(),
+  double umin = DBL_MAX,
          umax = -umin;
 
   size_t n = intersections.size();
@@ -684,7 +685,7 @@ void HYDROData_DTM::ProfileDiscretization( const Handle(HYDROData_Profile)& theP
                                            int& intersection_nb,
                                            double theTolerance)
 {
-  double aDblMax = std::numeric_limits<double>::max(),
+  double aDblMax = DBL_MAX,
          aUMin = aDblMax,
          aUMax = -aUMin,
          aVMax = 1000000;
@@ -823,21 +824,21 @@ void HYDROData_DTM::CurveTo3D( const Handle(Geom2d_BSplineCurve)& theHydraulicAx
       thePoints.push_back( it->second );
 }
 
-inline double max( double a, double b )
-{
-  if( a>b )
-    return a;
-  else
-    return b;
-}
-
-inline double min( double a, double b )
-{
-  if( a<b )
-    return a;
-  else
-    return b;
-}
+//inline double max( double a, double b )
+//{
+//  if( a>b )
+//    return a;
+//  else
+//    return b;
+//}
+//
+//inline double min( double a, double b )
+//{
+//  if( a<b )
+//    return a;
+//  else
+//    return b;
+//}
 
 #include <BRepLib_MakeWire.hxx>
 
diff --git a/src/HYDROData/HYDROData_Document.h b/src/HYDROData/HYDROData_Document.h
index ce3bde51..6d474b69 100644
--- a/src/HYDROData/HYDROData_Document.h
+++ b/src/HYDROData/HYDROData_Document.h
@@ -21,6 +21,7 @@
 
 #include <HYDROData_Entity.h>
 #include <TDocStd_Document.hxx>
+#include <MMgt_TShared.hxx>
 
 class HYDROData_InterpolatorsFactory;
 class HYDROData_IProfilesInterpolator;
diff --git a/src/HYDROData/HYDROData_Entity.cxx b/src/HYDROData/HYDROData_Entity.cxx
index 62a7095e..92833456 100644
--- a/src/HYDROData/HYDROData_Entity.cxx
+++ b/src/HYDROData/HYDROData_Entity.cxx
@@ -117,6 +117,7 @@ void HYDROData_Entity::SetName(const QString& theName, bool isDefault)
         {
           TCollection_AsciiString aName = theName.toStdString().c_str();
           theDefaultName = TDataStd_AsciiString::Set(myLab.FindChild( DataTag_DefaultName), aName );
+          theDefaultName->SetID( TDataStd_AsciiString::GetID() );
         }
     }
 }
@@ -194,7 +195,8 @@ void HYDROData_Entity::Changed( Geometry theChangedGeometry )
     return;
 
   aGeomChangeFlag = ( aGeomChangeFlag | aBitsToChange );
-  TDataStd_Integer::Set( aGeomChangeLab, aGeomChangeFlag );
+  Handle(TDataStd_Integer) anAttr = TDataStd_Integer::Set( aGeomChangeLab, aGeomChangeFlag );
+  anAttr->SetID( TDataStd_Integer::GetID() );
 
   HYDROData_Iterator anIter( aDocument );
   for ( ; anIter.More(); anIter.Next() )
@@ -351,6 +353,7 @@ void HYDROData_Entity::SaveByteArray( const int   theTag,
   Handle(TDataStd_ByteArray) aData;
   if (!aLab.FindAttribute(TDataStd_ByteArray::GetID(), aData)) {
     aData = TDataStd_ByteArray::Set(aLab, 1, theLen);
+    aData->SetID( TDataStd_ByteArray::GetID() );
   }
   Standard_Byte* Byte0 = &(aData->InternalArray()->ChangeArray1().ChangeFirst());
   memcpy(Byte0, theData, theLen * sizeof (char));
@@ -588,7 +591,10 @@ Handle(TDataStd_ReferenceList) HYDROData_Entity::getReferenceList( const int the
 
   Handle(TDataStd_ReferenceList) aRefs;
   if ( !aLabel.FindAttribute( TDataStd_ReferenceList::GetID(), aRefs ) && theIsCreate )
+  {
     aRefs = TDataStd_ReferenceList::Set( aLabel );
+    aRefs->SetID(TDataStd_ReferenceList::GetID());
+  }
   return aRefs;
 }
 
@@ -813,7 +819,11 @@ void HYDROData_Entity::SetDouble( int theTag, double theValue )
   Handle(TDataStd_Real) anAttr;
   TDF_Label aLabel = myLab.FindChild( theTag );
   if( !aLabel.FindAttribute( TDataStd_Real::GetID(), anAttr ) )
-    aLabel.AddAttribute( anAttr = new TDataStd_Real() );
+  {
+    anAttr = new TDataStd_Real();
+    anAttr->SetID(TDataStd_Real::GetID());
+    aLabel.AddAttribute( anAttr );
+  }
   anAttr->Set( theValue );
 }
 
@@ -832,7 +842,11 @@ void HYDROData_Entity::SetInteger( int theTag, int theValue )
   Handle(TDataStd_Integer) anAttr;
   TDF_Label aLabel = myLab.FindChild( theTag );
   if( !aLabel.FindAttribute( TDataStd_Integer::GetID(), anAttr ) )
-    aLabel.AddAttribute( anAttr = new TDataStd_Integer() );
+  {
+    anAttr = new TDataStd_Integer();
+    anAttr->SetID(TDataStd_Integer::GetID());
+    aLabel.AddAttribute(anAttr);
+  }
   anAttr->Set( theValue );
 }
 
diff --git a/src/HYDROData/HYDROData_Entity.h b/src/HYDROData/HYDROData_Entity.h
index ddd2ae8a..97cbe846 100644
--- a/src/HYDROData/HYDROData_Entity.h
+++ b/src/HYDROData/HYDROData_Entity.h
@@ -25,7 +25,7 @@
 #include <QMap>
 #include <QString>
 #include <Standard_Type.hxx>
-
+#include <MMgt_TShared.hxx>
 
 #ifdef NONLS
 #undef NONLS
diff --git a/src/HYDROData/HYDROData_LandCoverMap.cxx b/src/HYDROData/HYDROData_LandCoverMap.cxx
index 18eaeee8..03b49e81 100644
--- a/src/HYDROData/HYDROData_LandCoverMap.cxx
+++ b/src/HYDROData/HYDROData_LandCoverMap.cxx
@@ -678,8 +678,7 @@ TopoDS_Shape HYDROData_LandCoverMap::MergeFaces( const TopTools_ListOfShape& the
   aPF.SetFuzzyValue( theTolerance );
 
   aPF.Perform();
-  anError = aPF.ErrorStatus();
-  if( anError )
+  if( aPF.HasErrors())
     return TopoDS_Shape();
 
   BOPAlgo_Builder anAlgo;
@@ -688,8 +687,7 @@ TopoDS_Shape HYDROData_LandCoverMap::MergeFaces( const TopTools_ListOfShape& the
     anAlgo.AddArgument( anIt.Value() );
 
   anAlgo.PerformWithFiller( aPF ); 
-  anError = anAlgo.ErrorStatus();
-  if( anError )
+  if( anAlgo.HasErrors())
     return TopoDS_Shape();
 
   const TopoDS_Shape& aMergedShape = anAlgo.Shape();
@@ -856,8 +854,7 @@ bool HYDROData_LandCoverMap::LocalPartition( const TopoDS_Shape& theNewShape, co
   // prepare pave filler
   aPaveFiller.SetArguments( aShapesList );
   aPaveFiller.Perform();
-  Standard_Integer anError = aPaveFiller.ErrorStatus();
-  if( anError )
+  if( aPaveFiller.HasErrors())
     return false;
 
   // add faces to builder
@@ -869,8 +866,7 @@ bool HYDROData_LandCoverMap::LocalPartition( const TopoDS_Shape& theNewShape, co
 
   // perform the partition with the pave filler
   aBuilder.PerformWithFiller( aPaveFiller );
-  anError = aBuilder.ErrorStatus();
-  if( anError )
+  if( aBuilder.HasErrors())
     return false;
 
   //std::cout << "History:" << std::endl;
diff --git a/src/HYDROData/HYDROData_PolylineXY.cxx b/src/HYDROData/HYDROData_PolylineXY.cxx
index 33e4090a..9115b6d6 100644
--- a/src/HYDROData/HYDROData_PolylineXY.cxx
+++ b/src/HYDROData/HYDROData_PolylineXY.cxx
@@ -32,6 +32,7 @@
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <BRepOffsetAPI_NormalProjection.hxx>
 #include <BRepAdaptor_Curve.hxx>
+#include <Quantity_Parameter.hxx>
 
 #ifndef LIGHT_MODE
 #include <GEOMBase.h>
diff --git a/src/HYDROData/HYDROData_Region.cxx b/src/HYDROData/HYDROData_Region.cxx
index f4b58faa..80c005cc 100644
--- a/src/HYDROData/HYDROData_Region.cxx
+++ b/src/HYDROData/HYDROData_Region.cxx
@@ -392,7 +392,7 @@ TopoDS_Shape HYDROData_Region::GetShape( HYDROData_ShapesGroup::SeqOfGroupsDefs*
     if (!IE.IsEmpty())
     {
       //remove dummy face from shell; shell becomes valid
-      const TopoDS_Shape& NDF = unif.Generated(DF);
+      const TopoDS_Shape& NDF = unif.History()->Modified(DF).First();
       BRepTools_ReShape ReShaper;
       ReShaper.Remove(NDF);
       anUnitedShape = ReShaper.Apply(out);
diff --git a/src/HYDROData/HYDROData_ShapesGroup.cxx b/src/HYDROData/HYDROData_ShapesGroup.cxx
index 9db2e01c..96b3d6c9 100644
--- a/src/HYDROData/HYDROData_ShapesGroup.cxx
+++ b/src/HYDROData/HYDROData_ShapesGroup.cxx
@@ -93,7 +93,7 @@ void HYDROData_ShapesGroup::GroupDefinition::Update( SeqOfGroupsDefs*
     {
       TopoDS_Shape aShape = aGroupDef.Shapes.Value( i );
 
-      TopoDS_Shape aGeneratedByAlgo = theAlgo->Generated( aShape );
+      TopoDS_Shape aGeneratedByAlgo = theAlgo->History()->Modified(aShape).First(); //??TODO check
       if ( aGeneratedByAlgo.IsNull() )
       {
         // Edge has been removed
diff --git a/src/HYDROData/HYDROData_SplitToZonesTool.cxx b/src/HYDROData/HYDROData_SplitToZonesTool.cxx
index 07a515ff..488618de 100644
--- a/src/HYDROData/HYDROData_SplitToZonesTool.cxx
+++ b/src/HYDROData/HYDROData_SplitToZonesTool.cxx
@@ -119,7 +119,7 @@ void HYDROData_SplitToZonesTool::SetFileNames(const QString& theNameBefore, cons
 #endif
 }
 //======================================================================================
-Standard_Integer HYDROData_SplitToZonesTool::SplitFaces(const TopoDS_Compound& theComp, 
+bool HYDROData_SplitToZonesTool::SplitFaces(const TopoDS_Compound& theComp, 
                                                         HYDROData_Transform& theTool)
 {
   theTool.Clear();
@@ -128,8 +128,7 @@ Standard_Integer HYDROData_SplitToZonesTool::SplitFaces(const TopoDS_Compound& t
   const Standard_Boolean bToTransform = theTool.ToTransform();  
   theTool.SetToTransform(bToTransform);  
   theTool.Perform();
-  Standard_Integer anErr = theTool.ErrorStatus();
-  return anErr;
+  return theTool.HasErrors();
 }
 
 //======================================================================================
@@ -346,7 +345,7 @@ HYDROData_SplitToZonesTool::SplitDataList
   HYDROData_DataMapOfShapeListOfShape aDM1;
   if(anInputSplitDataList.size() > 1) {
     HYDROData_Transform splitTool; 
-    const Standard_Integer anErr = SplitFaces(aCmp, splitTool);    
+    bool anErr = SplitFaces(aCmp, splitTool);    
     if(anErr)
       return anOutputSplitDataList;
     aResult = splitTool.Shape();
@@ -816,9 +815,8 @@ int HYDROData_SplitToZonesTool::CutByEdges(const TopoDS_Shape& InSh, const TopTo
     anAlgo.AddArgument( anIt.Value() );
 
   anAlgo.Perform(); 
-  anError = anAlgo.ErrorStatus();
-  if (anError)
-    return anError;
+  if (anAlgo.HasErrors())
+    return -1;
 
   outShs = anAlgo.Modified( InSh );
   if (outShs.IsEmpty())
diff --git a/src/HYDROData/HYDROData_SplitToZonesTool.h b/src/HYDROData/HYDROData_SplitToZonesTool.h
index 2e3b8711..665f35a0 100644
--- a/src/HYDROData/HYDROData_SplitToZonesTool.h
+++ b/src/HYDROData/HYDROData_SplitToZonesTool.h
@@ -117,7 +117,7 @@ private:
   /**
    * Split input faces.
    */
-  static Standard_Integer SplitFaces(const TopoDS_Compound& theComp, HYDROData_Transform& theTool);
+  static bool SplitFaces(const TopoDS_Compound& theComp, HYDROData_Transform& theTool);
 };
 
 #ifdef WIN32
diff --git a/src/HYDROData/HYDROData_Transform.cxx b/src/HYDROData/HYDROData_Transform.cxx
index 391482b5..69676bb8 100644
--- a/src/HYDROData/HYDROData_Transform.cxx
+++ b/src/HYDROData/HYDROData_Transform.cxx
@@ -64,6 +64,8 @@ HYDROData_Transform::HYDROData_Transform()
   myTransform1=NULL;
   myTransform2=NULL;
   myBuilder=NULL;
+  myErrorStatus=0;
+  myWarningStatus=0;
 }
 //=======================================================================
 //function : ~
@@ -304,8 +306,8 @@ void HYDROData_Transform::BuildFuse()
   aPF.SetArguments(aLC);
   //
   aPF.Perform();
-  iErr=aPF.ErrorStatus();
-  if (iErr) {
+  if (aPF.HasErrors()) 
+  {
     myErrorStatus=20;
     return;
   }
@@ -319,8 +321,8 @@ void HYDROData_Transform::BuildFuse()
   }
   //
   myBuilder->PerformWithFiller(aPF);
-  iErr=myBuilder->ErrorStatus();
-  if (iErr) {
+  if (myBuilder->HasErrors())
+  {
     myErrorStatus=21;
     return;
   }
diff --git a/src/HYDROData/HYDROData_Transform.h b/src/HYDROData/HYDROData_Transform.h
index 0b6e9b63..0b824a1f 100644
--- a/src/HYDROData/HYDROData_Transform.h
+++ b/src/HYDROData/HYDROData_Transform.h
@@ -134,6 +134,9 @@ class HYDROData_Transform : public BOPAlgo_BuilderShape
   BRepBuilderAPI_Transform* myTransform1;
   BRepBuilderAPI_Transform* myTransform2;
   BOPAlgo_Builder* myBuilder;
+  //
+  int myErrorStatus; //no longer used since occt 7.2.1 (added for backcompatibility)
+  int myWarningStatus;  //no longer used since occt 7.2.1
 };
 
 #endif
diff --git a/src/HYDROGUI/HYDROGUI_AISTrihedron.cxx b/src/HYDROGUI/HYDROGUI_AISTrihedron.cxx
index 79959971..8b976a48 100644
--- a/src/HYDROGUI/HYDROGUI_AISTrihedron.cxx
+++ b/src/HYDROGUI/HYDROGUI_AISTrihedron.cxx
@@ -25,6 +25,7 @@
 #include <Prs3d_Drawer.hxx>
 #include <DsgPrs_XYZAxisPresentation.hxx>
 #include <gp_Ax2.hxx>
+#include <Quantity_Length.hxx>
 
 HYDROGUI_AISTrihedron::HYDROGUI_AISTrihedron( const Handle(Geom_Axis2Placement)& thePlacement )
  : AIS_Trihedron(thePlacement)
diff --git a/src/HYDROGUI/HYDROGUI_BathymetrySelectionOp.cxx b/src/HYDROGUI/HYDROGUI_BathymetrySelectionOp.cxx
index 526c2c21..7a18167d 100644
--- a/src/HYDROGUI/HYDROGUI_BathymetrySelectionOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_BathymetrySelectionOp.cxx
@@ -90,7 +90,7 @@ void HYDROGUI_BathymetrySelectionOp::activateSelection( bool isActive )
   if( myIsActive==isActive )
     return;
 
-  getContext( module() )->ClearSelected();
+  getContext( module() )->ClearSelected(true);
 
   Handle(AIS_InteractiveContext) ctx = getContext( module() );
   QList<Handle(HYDROGUI_BathymetryPrs)> baths = getShownBathymetries( module() );
diff --git a/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx b/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx
index 16162cfb..5c982205 100644
--- a/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx
@@ -465,7 +465,7 @@ void HYDROGUI_LandCoverMapOp::onPolylineFaceChanged()
             if ( !aCtx.IsNull() )
             {
               myPolylineFacePreviewPrs = new HYDROGUI_Shape( aCtx, NULL, getPreviewZLayer() );
-              aCtx->ClearSelected();
+              aCtx->ClearSelected(true);
 
               myPolylineFacePreviewPrs->setBorderColor( Qt::white, false, false );
               myPolylineFacePreviewPrs->setShape( aTopoDSShape, true, true, !aPolyline.IsNull() ? AIS_WireFrame : AIS_Shaded );
@@ -623,7 +623,7 @@ void HYDROGUI_LandCoverMapOp::onMouseRelease(SUIT_ViewWindow* theWindow, QMouseE
     if ( !aViewer->isPreselectionEnabled() ) {
       Handle(V3d_View) aView3d = aView->getViewPort()->getView();
       if ( !aView3d.IsNull() ) {
-        aCtx->MoveTo(myEndPnt.x(), myEndPnt.y(), aView3d);
+        aCtx->MoveTo(myEndPnt.x(), myEndPnt.y(), aView3d, true);
       }
     }
 
diff --git a/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx b/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx
index aa29e8a4..7888166a 100644
--- a/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx
+++ b/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx
@@ -177,6 +177,8 @@ void HYDROGUI_LandCoverMapPrs::HilightSelected( const Handle(PrsMgr_Presentation
 
 void HYDROGUI_LandCoverMapPrs::SetHilightAttributes( const Quantity_Color& theEdgesColor )
 {
+  if (HilightAttributes().IsNull())
+    AIS_ColoredShape::SetHilightAttributes(new Prs3d_Drawer());
   HilightAttributes()->UIsoAspect()->SetNumber( HILIGHT_ISO_NB );
   HilightAttributes()->UIsoAspect()->SetColor( theEdgesColor );
   HilightAttributes()->VIsoAspect()->SetNumber( HILIGHT_ISO_NB );
diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
index feed7992..a52182d5 100644
--- a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
+++ b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
@@ -294,7 +294,7 @@ void HYDROGUI_OCCDisplayer::Display( const HYDROData_SequenceOfObjects& theObjs,
     }
   } 
   else if ( !aCtx.IsNull() ) { // TODO: determine if this code is necessary (added as a fix for issue# 359)
-    aCtx->UpdateSelected();
+    aCtx->UpdateSelected(true);
   }
 
   UpdateColorScale( aViewer );
@@ -491,14 +491,14 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
 	  aCtx->Display( aColorScale, Standard_False );
 	}
 
-	aCtx->Update( aColorScale );
+	aCtx->Update( aColorScale, true );
       }
     }
   }
   else
   {
     if ( !aCtx.IsNull() && aCtx->IsDisplayed( aColorScale ) ) {
-      aCtx->Erase( aColorScale );
+      aCtx->Erase( aColorScale, true );
     }
   }
 
diff --git a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
index dfc3a62c..ddb5d785 100644
--- a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
+++ b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
@@ -241,7 +241,7 @@ void HYDROGUI_ShapeBathymetry::RescaleBySelection()
 
 void HYDROGUI_ShapeBathymetry::Rescale( double theMin, double theMax )
 {
-  getContext()->ClearSelected();
+  getContext()->ClearSelected(true);
   myMin = qMin( theMin, theMax );
   myMax = qMax( theMin, theMax );
   setToUpdateColorScale( true );
@@ -295,7 +295,7 @@ void HYDROGUI_ShapeBathymetry::TextLabels( bool isOn )
   if( isOn )
     selection = selected();
 
-  getContext()->ClearSelected();
+  getContext()->ClearSelected(true);
   prs->SetTextLabels( selection );
   prs->Redisplay();
   getContext()->UpdateCurrentViewer();
diff --git a/src/HYDROGUI/HYDROGUI_SplitPolylinesOp.cxx b/src/HYDROGUI/HYDROGUI_SplitPolylinesOp.cxx
index be1c18e3..439af525 100644
--- a/src/HYDROGUI/HYDROGUI_SplitPolylinesOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_SplitPolylinesOp.cxx
@@ -209,7 +209,7 @@ void HYDROGUI_SplitPolylinesOp::OnUpdatePreview()
             aCtx->Erase( mySplitPointPreview, Standard_False );  
         }
 
-        aCtx->ClearSelected();
+        aCtx->ClearSelected(true);
       }
 
       if ( aPanel->GetMode() == HYDROGUI_SplitPolylinesDlg::ByPoint )
diff --git a/src/HYDROGUI/HYDROGUI_ViewerDlg.cxx b/src/HYDROGUI/HYDROGUI_ViewerDlg.cxx
index 78c17941..a40e9174 100644
--- a/src/HYDROGUI/HYDROGUI_ViewerDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_ViewerDlg.cxx
@@ -121,7 +121,7 @@ bool HYDROGUI_ViewerDlg::event( QEvent* e )
         if ( !anAISContext.IsNull() && !aTrihedron.IsNull() )
         {
             viewer()->setTrihedronShown( false );
-            anAISContext->Display( aTrihedron );
+            anAISContext->Display( aTrihedron, true );
             anAISContext->Deactivate( aTrihedron );
         }
     }
diff --git a/src/HYDROGUI/HYDROGUI_ZLayers2.cxx b/src/HYDROGUI/HYDROGUI_ZLayers2.cxx
index c3f54766..f6506749 100644
--- a/src/HYDROGUI/HYDROGUI_ZLayers2.cxx
+++ b/src/HYDROGUI/HYDROGUI_ZLayers2.cxx
@@ -41,7 +41,9 @@ void UpdateZLayersOfHilightPresentationsOfDisplayedObjects( const Handle(AIS_Int
 #if OCC_VERSION_LARGE < 0x07010000
       Quantity_NameOfColor aStyle = Quantity_NOC_YELLOW;
 #else
-      Handle(Graphic3d_HighlightStyle) aStyle = new Graphic3d_HighlightStyle( Aspect_TOHM_COLOR, Quantity_NOC_YELLOW );
+      Handle(Graphic3d_HighlightStyle) aStyle = new Graphic3d_HighlightStyle( /*Aspect_TOHM_COLOR, Quantity_NOC_YELLOW*/ );
+      aStyle->SetMethod(Aspect_TOHM_COLOR);
+      aStyle->SetColor(Quantity_NOC_YELLOW);
 #endif
       theContext->MainPrsMgr()->Color( aPrsObj, aStyle, aMode );
       SetPrsZLayer( aPrsObj, aMode, theLayer );
diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index 9c940fb6..fa147744 100644
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -85,7 +85,7 @@ SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome )
 SET( ECW_INCLUDES $ENV{ECWLIB_ROOT_DIR}/include )
 
 IF( ${WIN32} )
-  link_directories( $ENV{CASROOT}/win64/vc10/lib $ENV{GL2PS_DIR}/lib )
+  link_directories( $ENV{CASROOT}/win64/lib/vc10 $ENV{GL2PS_DIR}/lib )
 ELSE()
   link_directories( $ENV{CASROOT}/lib $ENV{TBB_ROOT_DIR}/lib/intel64/gcc4.4 )
 ENDIF()
diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx
index 7210c108..6e20be46 100644
--- a/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@ -71,13 +71,13 @@ OCCViewer_ViewManager* TestViewer::viewManager()
   myViewManager = new OCCViewer_ViewManager( 0, 0 );
   OCCViewer_Viewer* aViewer = new OCCViewer_Viewer( true );
 
-  aViewer->setTrihedronSize( 100, true );
+  aViewer->setTrihedronSize( 0, true );
   aViewer->setInteractionStyle( 0 );
   aViewer->setZoomingStyle( 1 );
 
   myViewManager->setViewModel( aViewer );
   myViewWindow = dynamic_cast<OCCViewer_ViewFrame*>( myViewManager->createViewWindow() );
-
+  aViewer->setTrihedronShown( false );
   return myViewManager;
 }
 
@@ -153,11 +153,11 @@ void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
   if( theSelectionMode > 0 )
   {
     context()->OpenLocalContext();
-    context()->Display( theObject, theMode, theSelectionMode );
+    context()->Display( theObject, theMode, theSelectionMode, true );
     context()->Activate( theObject, theSelectionMode, Standard_True );
   }
   else
-    context()->Display( theObject, theMode, theSelectionMode );
+    context()->Display( theObject, theMode, theSelectionMode, true );
 
   if( isFitAll )
     fitAll();
@@ -382,12 +382,12 @@ void TestViewer::showColorScale( bool isShow )
   if( isShow )
   {
     if( !context()->IsDisplayed( aColorScale ) )
-      context()->Display( aColorScale );
+      context()->Display( aColorScale, true );
   }
   else
   {
     if( context()->IsDisplayed( aColorScale ) )
-      context()->Erase( aColorScale );
+      context()->Erase( aColorScale, true );
   }
 }
 
@@ -399,8 +399,8 @@ bool TestViewer::ColorScaleIsDisplayed()
 void TestViewer::select( int theViewX, int theViewY )
 {
   Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
-  context()->MoveTo( theViewX, theViewY, aView );
-  context()->Select();
+  context()->MoveTo( theViewX, theViewY, aView, true);
+  context()->Select(true);
   // context()->CloseAllContexts();
 }
 
diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h
index 7a0fcab3..20500d53 100644
--- a/src/HYDRO_tests/TestViewer.h
+++ b/src/HYDRO_tests/TestViewer.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <AIS_InteractiveContext.hxx>
+#include <Standard_Version.hxx>
 
 class OCCViewer_ViewManager;
 class OCCViewer_Viewer;
@@ -30,6 +31,13 @@ class QImage;
 class AIS_InteractiveObject;
 class AIS_ColorScale;
 
+#define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8)
+#if OCC_VERSION_LARGE >= 0x07020000
+const bool SWAP_RGB = false;
+#else
+const bool SWAP_RGB = true;
+#endif
+
 class TestViewer
 {
 public:
@@ -45,7 +53,7 @@ public:
                     int theUIANb = 10, int theVIANb = 10);
   static void show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey,
                     int theUIANb = 10, int theVIANb = 10);
-  static bool AssertImages( QString& theMessage, const QImage* = 0, const char* theCase = 0, bool swapRGB = true );
+  static bool AssertImages( QString& theMessage, const QImage* = 0, const char* theCase = 0, bool swapRGB = SWAP_RGB );
   static QColor GetColor(int i);
 
   static Handle(AIS_ColorScale) colorScale();
diff --git a/src/HYDRO_tests/reference_data/win32/CLC06-cut_1_res.png b/src/HYDRO_tests/reference_data/win32/CLC06-cut_1_res.png
index 8f43edbc..7f60af4a 100644
Binary files a/src/HYDRO_tests/reference_data/win32/CLC06-cut_1_res.png and b/src/HYDRO_tests/reference_data/win32/CLC06-cut_1_res.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/DTM_1.png b/src/HYDRO_tests/reference_data/win32/DTM_1.png
index a00e5a78..190ed1b4 100644
Binary files a/src/HYDRO_tests/reference_data/win32/DTM_1.png and b/src/HYDRO_tests/reference_data/win32/DTM_1.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/DTM_2.png b/src/HYDRO_tests/reference_data/win32/DTM_2.png
index ed8e7b22..1878684f 100644
Binary files a/src/HYDRO_tests/reference_data/win32/DTM_2.png and b/src/HYDRO_tests/reference_data/win32/DTM_2.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/Extraction_Channel.png b/src/HYDRO_tests/reference_data/win32/Extraction_Channel.png
index a9e5c6ab..a3ee86ba 100644
Binary files a/src/HYDRO_tests/reference_data/win32/Extraction_Channel.png and b/src/HYDRO_tests/reference_data/win32/Extraction_Channel.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/Extraction_ImmZone.png b/src/HYDRO_tests/reference_data/win32/Extraction_ImmZone.png
index 3d9a2790..96953701 100644
Binary files a/src/HYDRO_tests/reference_data/win32/Extraction_ImmZone.png and b/src/HYDRO_tests/reference_data/win32/Extraction_ImmZone.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/LCM_copied.png b/src/HYDRO_tests/reference_data/win32/LCM_copied.png
index 9e474825..2e2101ea 100644
Binary files a/src/HYDRO_tests/reference_data/win32/LCM_copied.png and b/src/HYDRO_tests/reference_data/win32/LCM_copied.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/LCM_split_2a.png b/src/HYDRO_tests/reference_data/win32/LCM_split_2a.png
index 82f9efb5..88e58dce 100644
Binary files a/src/HYDRO_tests/reference_data/win32/LCM_split_2a.png and b/src/HYDRO_tests/reference_data/win32/LCM_split_2a.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/LCM_split_2b.png b/src/HYDRO_tests/reference_data/win32/LCM_split_2b.png
index 76bc1a83..88581d58 100644
Binary files a/src/HYDRO_tests/reference_data/win32/LCM_split_2b.png and b/src/HYDRO_tests/reference_data/win32/LCM_split_2b.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/LandCoverMap_Add_2_Objects.png b/src/HYDRO_tests/reference_data/win32/LandCoverMap_Add_2_Objects.png
index 0f8dc779..bde255ca 100644
Binary files a/src/HYDRO_tests/reference_data/win32/LandCoverMap_Add_2_Objects.png and b/src/HYDRO_tests/reference_data/win32/LandCoverMap_Add_2_Objects.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/LandCoverMap_Merge_1.png b/src/HYDRO_tests/reference_data/win32/LandCoverMap_Merge_1.png
index 17cdc8ad..6733e5e5 100644
Binary files a/src/HYDRO_tests/reference_data/win32/LandCoverMap_Merge_1.png and b/src/HYDRO_tests/reference_data/win32/LandCoverMap_Merge_1.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/LandCoverMap_Merge_2.png b/src/HYDRO_tests/reference_data/win32/LandCoverMap_Merge_2.png
index 86554642..d8e718c2 100644
Binary files a/src/HYDRO_tests/reference_data/win32/LandCoverMap_Merge_2.png and b/src/HYDRO_tests/reference_data/win32/LandCoverMap_Merge_2.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/LandCoverMap_PrsByCoeff.png b/src/HYDRO_tests/reference_data/win32/LandCoverMap_PrsByCoeff.png
index e7b15138..09f6cd06 100644
Binary files a/src/HYDRO_tests/reference_data/win32/LandCoverMap_PrsByCoeff.png and b/src/HYDRO_tests/reference_data/win32/LandCoverMap_PrsByCoeff.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/LandCoverMap_PrsByTypes.png b/src/HYDRO_tests/reference_data/win32/LandCoverMap_PrsByTypes.png
index c9beda2e..09f6cd06 100644
Binary files a/src/HYDRO_tests/reference_data/win32/LandCoverMap_PrsByTypes.png and b/src/HYDRO_tests/reference_data/win32/LandCoverMap_PrsByTypes.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/LandCoverMap_Remove_1.png b/src/HYDRO_tests/reference_data/win32/LandCoverMap_Remove_1.png
index d5a31379..fc448f26 100644
Binary files a/src/HYDRO_tests/reference_data/win32/LandCoverMap_Remove_1.png and b/src/HYDRO_tests/reference_data/win32/LandCoverMap_Remove_1.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/LandCoverMap_Split_1.png b/src/HYDRO_tests/reference_data/win32/LandCoverMap_Split_1.png
index 71077cf7..1d107394 100644
Binary files a/src/HYDRO_tests/reference_data/win32/LandCoverMap_Split_1.png and b/src/HYDRO_tests/reference_data/win32/LandCoverMap_Split_1.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/LandCoverMap_Split_2.png b/src/HYDRO_tests/reference_data/win32/LandCoverMap_Split_2.png
index 9bc13b04..47fd55d7 100644
Binary files a/src/HYDRO_tests/reference_data/win32/LandCoverMap_Split_2.png and b/src/HYDRO_tests/reference_data/win32/LandCoverMap_Split_2.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/LandCoverMap_Split_Polyline.png b/src/HYDRO_tests/reference_data/win32/LandCoverMap_Split_Polyline.png
index 93db9e58..bae3119d 100644
Binary files a/src/HYDRO_tests/reference_data/win32/LandCoverMap_Split_Polyline.png and b/src/HYDRO_tests/reference_data/win32/LandCoverMap_Split_Polyline.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/LandCoverMap_TransparentPrs.png b/src/HYDRO_tests/reference_data/win32/LandCoverMap_TransparentPrs.png
index 52a22cc7..0dc2596d 100644
Binary files a/src/HYDRO_tests/reference_data/win32/LandCoverMap_TransparentPrs.png and b/src/HYDRO_tests/reference_data/win32/LandCoverMap_TransparentPrs.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/LandCover_Triangles.png b/src/HYDRO_tests/reference_data/win32/LandCover_Triangles.png
index d2a01267..faf6967a 100644
Binary files a/src/HYDRO_tests/reference_data/win32/LandCover_Triangles.png and b/src/HYDRO_tests/reference_data/win32/LandCover_Triangles.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/LandCover_Triangles_Split.png b/src/HYDRO_tests/reference_data/win32/LandCover_Triangles_Split.png
index 55b4d88d..840d2e24 100644
Binary files a/src/HYDRO_tests/reference_data/win32/LandCover_Triangles_Split.png and b/src/HYDRO_tests/reference_data/win32/LandCover_Triangles_Split.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/Merge_Polylines.png b/src/HYDRO_tests/reference_data/win32/Merge_Polylines.png
index c90a95d5..5546325e 100644
Binary files a/src/HYDRO_tests/reference_data/win32/Merge_Polylines.png and b/src/HYDRO_tests/reference_data/win32/Merge_Polylines.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/NLD_water_areas_dcw.png b/src/HYDRO_tests/reference_data/win32/NLD_water_areas_dcw.png
index b548c8c2..75d5b247 100644
Binary files a/src/HYDRO_tests/reference_data/win32/NLD_water_areas_dcw.png and b/src/HYDRO_tests/reference_data/win32/NLD_water_areas_dcw.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/Polyline_Presentation.png b/src/HYDRO_tests/reference_data/win32/Polyline_Presentation.png
index e5275ac7..bccde218 100644
Binary files a/src/HYDRO_tests/reference_data/win32/Polyline_Presentation.png and b/src/HYDRO_tests/reference_data/win32/Polyline_Presentation.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/Polyline_Presentation_triangle.png b/src/HYDRO_tests/reference_data/win32/Polyline_Presentation_triangle.png
index 652ec440..64830f95 100644
Binary files a/src/HYDRO_tests/reference_data/win32/Polyline_Presentation_triangle.png and b/src/HYDRO_tests/reference_data/win32/Polyline_Presentation_triangle.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/Shape_preview_im_zone.png b/src/HYDRO_tests/reference_data/win32/Shape_preview_im_zone.png
index c41a5666..f63fb275 100644
Binary files a/src/HYDRO_tests/reference_data/win32/Shape_preview_im_zone.png and b/src/HYDRO_tests/reference_data/win32/Shape_preview_im_zone.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/Split_Polylines_Colors.png b/src/HYDRO_tests/reference_data/win32/Split_Polylines_Colors.png
index b96b1d93..7bcb35d0 100644
Binary files a/src/HYDRO_tests/reference_data/win32/Split_Polylines_Colors.png and b/src/HYDRO_tests/reference_data/win32/Split_Polylines_Colors.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/Split_Straight.png b/src/HYDRO_tests/reference_data/win32/Split_Straight.png
index 89586780..0bcd9def 100644
Binary files a/src/HYDRO_tests/reference_data/win32/Split_Straight.png and b/src/HYDRO_tests/reference_data/win32/Split_Straight.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/bathy_prs.png b/src/HYDRO_tests/reference_data/win32/bathy_prs.png
index 72452c09..127dd8eb 100644
Binary files a/src/HYDRO_tests/reference_data/win32/bathy_prs.png and b/src/HYDRO_tests/reference_data/win32/bathy_prs.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/bathy_prs_fit_selected.png b/src/HYDRO_tests/reference_data/win32/bathy_prs_fit_selected.png
index 69a8f937..f43b9788 100644
Binary files a/src/HYDRO_tests/reference_data/win32/bathy_prs_fit_selected.png and b/src/HYDRO_tests/reference_data/win32/bathy_prs_fit_selected.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/bathy_rescaled_selection.png b/src/HYDRO_tests/reference_data/win32/bathy_rescaled_selection.png
index 6f628ccc..318a413e 100644
Binary files a/src/HYDRO_tests/reference_data/win32/bathy_rescaled_selection.png and b/src/HYDRO_tests/reference_data/win32/bathy_rescaled_selection.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/bathy_rescaled_user.png b/src/HYDRO_tests/reference_data/win32/bathy_rescaled_user.png
index 63d666dc..908bd0ad 100644
Binary files a/src/HYDRO_tests/reference_data/win32/bathy_rescaled_user.png and b/src/HYDRO_tests/reference_data/win32/bathy_rescaled_user.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/bathy_rescaled_visible.png b/src/HYDRO_tests/reference_data/win32/bathy_rescaled_visible.png
index 1d70bc84..1b265756 100644
Binary files a/src/HYDRO_tests/reference_data/win32/bathy_rescaled_visible.png and b/src/HYDRO_tests/reference_data/win32/bathy_rescaled_visible.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/bathy_selection.png b/src/HYDRO_tests/reference_data/win32/bathy_selection.png
index 4855ae47..5d14b3c8 100644
Binary files a/src/HYDRO_tests/reference_data/win32/bathy_selection.png and b/src/HYDRO_tests/reference_data/win32/bathy_selection.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/bathy_text_labels.png b/src/HYDRO_tests/reference_data/win32/bathy_text_labels.png
index 7b88665b..31855434 100644
Binary files a/src/HYDRO_tests/reference_data/win32/bathy_text_labels.png and b/src/HYDRO_tests/reference_data/win32/bathy_text_labels.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/cc_int_w_3.png b/src/HYDRO_tests/reference_data/win32/cc_int_w_3.png
index cad13ea7..9a0baf43 100644
Binary files a/src/HYDRO_tests/reference_data/win32/cc_int_w_3.png and b/src/HYDRO_tests/reference_data/win32/cc_int_w_3.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/clc_dec_150_350.png b/src/HYDRO_tests/reference_data/win32/clc_dec_150_350.png
index 02a2b3e9..8d2145bd 100644
Binary files a/src/HYDRO_tests/reference_data/win32/clc_dec_150_350.png and b/src/HYDRO_tests/reference_data/win32/clc_dec_150_350.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/cyprus_natural_all.png b/src/HYDRO_tests/reference_data/win32/cyprus_natural_all.png
index 26331819..d6b91454 100644
Binary files a/src/HYDRO_tests/reference_data/win32/cyprus_natural_all.png and b/src/HYDRO_tests/reference_data/win32/cyprus_natural_all.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/lcm_poly_2_sections.png b/src/HYDRO_tests/reference_data/win32/lcm_poly_2_sections.png
index c2b32e52..bdda975e 100644
Binary files a/src/HYDRO_tests/reference_data/win32/lcm_poly_2_sections.png and b/src/HYDRO_tests/reference_data/win32/lcm_poly_2_sections.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_11.png b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_11.png
index 15aed111..938ce79a 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_11.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_11.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_12.png b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_12.png
index d96c96c1..a596acd5 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_12.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_12.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_13.png b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_13.png
index a85f343c..7b33b172 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_13.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_13.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_14.png b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_14.png
index 5cb66dad..b48b01cc 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_14.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_14.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_21.png b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_21.png
index 487d5ff8..de0c9b52 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_21.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_21.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_22.png b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_22.png
index d96c96c1..a596acd5 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_22.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_22.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_23.png b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_23.png
index 2bca4889..c784e8fe 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_23.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_23.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_24.png b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_24.png
index 9187ce5f..7c111c6f 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_24.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_boxes_24.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_11.png b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_11.png
index 8b255595..62a9ad45 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_11.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_11.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_12.png b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_12.png
index 4abe17aa..b7f753e4 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_12.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_12.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_13.png b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_13.png
index 4b73eb8c..4146c52e 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_13.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_13.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_14.png b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_14.png
index 4b73eb8c..4146c52e 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_14.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_14.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_21.png b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_21.png
index ca1eb432..41740dae 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_21.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_21.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_22.png b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_22.png
index 4abe17aa..b7f753e4 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_22.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_22.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_23.png b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_23.png
index 58fffafb..a83e65a0 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_23.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_23.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_24.png b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_24.png
index 58fffafb..a83e65a0 100644
Binary files a/src/HYDRO_tests/reference_data/win32/merge_faces_circles_24.png and b/src/HYDRO_tests/reference_data/win32/merge_faces_circles_24.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/rebuild_cmp_out.png b/src/HYDRO_tests/reference_data/win32/rebuild_cmp_out.png
index b0362051..c80979dc 100644
Binary files a/src/HYDRO_tests/reference_data/win32/rebuild_cmp_out.png and b/src/HYDRO_tests/reference_data/win32/rebuild_cmp_out.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/stream_dtm_2d.png b/src/HYDRO_tests/reference_data/win32/stream_dtm_2d.png
index f6490379..c9281775 100644
Binary files a/src/HYDRO_tests/reference_data/win32/stream_dtm_2d.png and b/src/HYDRO_tests/reference_data/win32/stream_dtm_2d.png differ
diff --git a/src/HYDRO_tests/reference_data/win32/stream_dtm_3d.png b/src/HYDRO_tests/reference_data/win32/stream_dtm_3d.png
index 2f0eb241..f71e71ee 100644
Binary files a/src/HYDRO_tests/reference_data/win32/stream_dtm_3d.png and b/src/HYDRO_tests/reference_data/win32/stream_dtm_3d.png differ
diff --git a/src/HYDRO_tests/test_HYDROData_DTM.cxx b/src/HYDRO_tests/test_HYDROData_DTM.cxx
index 6b31d151..51de524a 100644
--- a/src/HYDRO_tests/test_HYDROData_DTM.cxx
+++ b/src/HYDRO_tests/test_HYDROData_DTM.cxx
@@ -241,7 +241,7 @@ void test_HYDROData_DTM::test_profile_conversion_to_2d()
   aProfile2->SetLeftPoint( gp_XY( 10, 10 ) );
   aProfile2->SetRightPoint( gp_XY( 20, 20 ) );
 
-  double aUMin1 = std::numeric_limits<double>::max(),
+  double aUMin1 = DBL_MAX,
          aUMax1 = -aUMin1,
          aUMin2 = aUMin1,
          aUMax2 = aUMax1;
diff --git a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
index 9b505914..abc72f65 100644
--- a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
+++ b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
@@ -283,7 +283,7 @@ void test_HYDROData_PolylineXY::test_presentation()
   TestViewer::show( aPointsPrs, AIS_PointCloud::DM_Points, 0, true, "Polyline_Presentation_triangle" );
   TestViewer::show( aPolyline2d->GetShape(), 0, true, Qt::red );
   //TestViewer::show( aNewPolylinePrs, AIS_PointCloud::DM_Points, 0, true, "" );
-  TestViewer::context()->RecomputePrsOnly( arr );
+  TestViewer::context()->RecomputePrsOnly( arr, true );
   aNewPolylinePrs->display();
   TestViewer::fitAll();
   CPPUNIT_ASSERT_IMAGES