From: isn <isn@opencascade.com>
Date: Fri, 16 Oct 2015 09:09:56 +0000 (+0300)
Subject: Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into... 
X-Git-Tag: v1.5~109
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f709724a7a412254db7ee6ca094b01b6dc75e82b;p=modules%2Fhydro.git

Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

Conflicts:
	src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
---

f709724a7a412254db7ee6ca094b01b6dc75e82b
diff --cc src/HYDROData/HYDROData_LandCoverMap.cxx
index 1af26fdb,9405b144..6f7ecb62
--- a/src/HYDROData/HYDROData_LandCoverMap.cxx
+++ b/src/HYDROData/HYDROData_LandCoverMap.cxx
@@@ -34,13 -35,16 +35,20 @@@
  #include <TopoDS_Face.hxx>
  #include <TopoDS_Iterator.hxx>
  #include <TopoDS_Shell.hxx>
+ #include <TopExp_Explorer.hxx>
  #include <TopTools_ListIteratorOfListOfShape.hxx>
 +#include <BOPAlgo_PaveFiller.hxx>
 +#include <BRepTools.hxx>
 +#include <TopExp_Explorer.hxx>
 +#include <ShapeUpgrade_UnifySameDomain.hxx>
  
+ #include <QFile>
  #include <QString>
+ #include <QTextStream>
+ 
+ const char TELEMAC_FORMAT = 'f';
+ const int TELEMAC_PRECISION = 3;
+ 
  
  IMPLEMENT_STANDARD_HANDLE(HYDROData_LandCoverMap, HYDROData_Entity)
  IMPLEMENT_STANDARD_RTTIEXT(HYDROData_LandCoverMap, HYDROData_Entity)
diff --cc src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
index b29a3bbe,2f077e16..5168523c
--- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@@ -172,13 -202,11 +204,12 @@@ void test_HYDROData_LandCoverMap::test_
    TopTools_ListOfShape aList;
    aList.Append( aMap->FindByPoint( aPnt1, aType1 ) );
    aList.Append( aMap->FindByPoint( aPnt2, aType2 ) );
-   //aList.Append( aMap->FindByPoint( aPnt3, aType1 ) );
-   //aList.Append( aMap->FindByPoint( aPnt4, aType2 ) );
 -  //CPPUNIT_ASSERT_EQUAL( true, aMap->Merge( aList, "new" ) );
 +  CPPUNIT_ASSERT_EQUAL( true, aMap->Merge( aList, "new" ) );
  
 -  //TestViewer::show( aMap->GetShape(), AIS_Shaded, true );
 -  //TestViewer::show( BRepBuilderAPI_MakeEdge( aPnt1, aPnt2 ).Edge(), QColor( Qt::black ), AIS_Shaded );
 -  //TestViewer::AssertEqual( "LandCoverMap_Merge_1" );
++
 +  TestViewer::show( aMap->GetShape(), AIS_Shaded, true );
 +  //TestViewer::show( BRepBuilderAPI_MakeEdge( gp_Pnt(aPnt1.X(), aPnt1.Y(), 0), gp_Pnt(aPnt2.X(), aPnt2.Y(), 0) ).Edge(), QColor( Qt::blue ), AIS_Shaded );
 +  TestViewer::AssertEqual( "LandCoverMap_Merge_1" );
  
    aDoc->Close();
  }