Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correction of the configuration for Linux
[modules/hydro.git]
/
src
/
HYDRO_tests
/
test_HYDROData_LandCoverMap.cxx
diff --git
a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
index df9deb4c9b47e1eecf2ca2e51db9d7090bb4d447..074748771701e180e2e8c2073368cd935d4d9486 100644
(file)
--- a/
src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/
src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@
-44,11
+44,12
@@
#include <BRep_Builder.hxx>
#include <BRepCheck_Analyzer.hxx>
#include <OSD_Timer.hxx>
#include <BRep_Builder.hxx>
#include <BRepCheck_Analyzer.hxx>
#include <OSD_Timer.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
#define _DEVDEBUG_
#include "HYDRO_trace.hxx"
#define _DEVDEBUG_
#include "HYDRO_trace.hxx"
-
const QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test"
;
+
extern QString REF_DATA_PATH
;
const QString DEF_STR_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/share/salome/resources/hydro/def_strickler_table.txt";
void test_HYDROData_LandCoverMap::test_add_2_objects()
const QString DEF_STR_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/share/salome/resources/hydro/def_strickler_table.txt";
void test_HYDROData_LandCoverMap::test_add_2_objects()
@@
-1181,7
+1182,7
@@
void test_HYDROData_LandCoverMap::test_shp_clc_classification_perf()
LCM->StoreLandCovers(aMapFace2ST);
LCM->StoreLandCovers(aMapFace2ST);
- std::vector<gp_
Pnt2d
> pnts;
+ std::vector<gp_
XY
> pnts;
#ifdef NDEBUG
int N = 1000; //1000*1000 points; uniform distribution for release mode
#else
#ifdef NDEBUG
int N = 1000; //1000*1000 points; uniform distribution for release mode
#else
@@
-1199,7
+1200,7
@@
void test_HYDROData_LandCoverMap::test_shp_clc_classification_perf()
{
double px = x0 + (x1-x0)*((double)i/(double)N);
double py = y0 + (y1-y0)*((double)j/(double)N);
{
double px = x0 + (x1-x0)*((double)i/(double)N);
double py = y0 + (y1-y0)*((double)j/(double)N);
- pnts.push_back(gp_
Pnt2d
(px,py));
+ pnts.push_back(gp_
XY
(px,py));
}
}
OSD_Timer aTimer;
}
}
OSD_Timer aTimer;
@@
-1237,7
+1238,7
@@
void test_HYDROData_LandCoverMap::test_shp_clc_classification_check()
TopoDS_Shape Sh = LCM->GetShape();
TopoDS_Shape Sh = LCM->GetShape();
- std::vector<gp_
Pnt2d
> pnts;
+ std::vector<gp_
XY
> pnts;
pnts.push_back(gp_XY(0,0));
pnts.push_back(gp_XY(468380, 6382300));
pnts.push_back(gp_XY(0,0));
pnts.push_back(gp_XY(468380, 6382300));