now they can be started on Windows without SALOME
note that tests do not pass
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
-INCLUDE(CMakeDependentOption)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
PROJECT(SalomeHYDRO C CXX)
PROJECT(SalomeHYDRO C CXX)
+ADD_SUBDIRECTORY (src/HYDRO_tests)
+
+INCLUDE(CMakeDependentOption)
+
# Ensure a proper linker behavior:
CMAKE_POLICY(SET CMP0003 NEW)
# Ensure a proper linker behavior:
CMAKE_POLICY(SET CMP0003 NEW)
ADD_SUBDIRECTORY (src/HYDROGUI)
ADD_SUBDIRECTORY (src/HYDROPy)
ADD_SUBDIRECTORY (src/HYDROTools)
ADD_SUBDIRECTORY (src/HYDROGUI)
ADD_SUBDIRECTORY (src/HYDROPy)
ADD_SUBDIRECTORY (src/HYDROTools)
-ADD_SUBDIRECTORY (src/HYDRO_tests)
IF(SALOME_BUILD_DOC)
ADD_SUBDIRECTORY(doc)
ENDIF()
IF(SALOME_BUILD_DOC)
ADD_SUBDIRECTORY(doc)
ENDIF()
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
//HYDROData_QuadtreeNode* HYDROData_Bathymetry::myQuadtree = 0;
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
//HYDROData_QuadtreeNode* HYDROData_Bathymetry::myQuadtree = 0;
std::map<int, HYDROData_QuadtreeNode*> HYDROData_Bathymetry::myQuadtrees;
std::map<int, HYDROData_QuadtreeNode*> HYDROData_Bathymetry::myQuadtrees;
std::map<int, vtkPolyData*> HYDROData_Bathymetry::myDelaunay2D;
#endif
std::map<int, vtkPolyData*> HYDROData_Bathymetry::myDelaunay2D;
#endif
HYDROData_QuadtreeNode* HYDROData_Bathymetry::GetQuadtreeNodes() const
{
TDF_Label aLabel = myLab.FindChild(DataTag_AltitudePoints, false);
HYDROData_QuadtreeNode* HYDROData_Bathymetry::GetQuadtreeNodes() const
{
TDF_Label aLabel = myLab.FindChild(DataTag_AltitudePoints, false);
return myQuadtrees[labkey];
}
return myQuadtrees[labkey];
}
vtkPolyData* HYDROData_Bathymetry::GetVtkDelaunay2D() const
{
TDF_Label aLabel = myLab.FindChild(DataTag_AltitudePoints, false);
vtkPolyData* HYDROData_Bathymetry::GetVtkDelaunay2D() const
{
TDF_Label aLabel = myLab.FindChild(DataTag_AltitudePoints, false);
double HYDROData_Bathymetry::GetAltitudeForPoint(const gp_XY& thePoint, int theMethod) const
{
double HYDROData_Bathymetry::GetAltitudeForPoint(const gp_XY& thePoint, int theMethod) const
{
bool isBathyInterpolRequired = false;
if (theMethod)
isBathyInterpolRequired =true;
bool isBathyInterpolRequired = false;
if (theMethod)
isBathyInterpolRequired =true;
if (isBathyInterpolRequired)
{
vtkPolyData* aDelaunay2D = GetVtkDelaunay2D();
if (isBathyInterpolRequired)
{
vtkPolyData* aDelaunay2D = GetVtkDelaunay2D();
}
if (!isInside) DEBTRACE(" point outside triangles, nearest z kept");
}
}
if (!isInside) DEBTRACE(" point outside triangles, nearest z kept");
}
void HYDROData_Bathymetry::SetFilePath( const TCollection_AsciiString& theFilePath )
{
TDataStd_AsciiString::Set( myLab.FindChild( DataTag_FilePath ), theFilePath );
void HYDROData_Bathymetry::SetFilePath( const TCollection_AsciiString& theFilePath )
{
TDataStd_AsciiString::Set( myLab.FindChild( DataTag_FilePath ), theFilePath );
link_directories( $ENV{KERNEL_ROOT_DIR}/lib/salome $ENV{GUI_ROOT_DIR}/lib/salome $ENV{GEOM_ROOT_DIR}/lib/salome )
SET( GUI_LIBRARIES ImageComposer qtx suit LightApp CAM OCCViewer )
link_directories( $ENV{KERNEL_ROOT_DIR}/lib/salome $ENV{GUI_ROOT_DIR}/lib/salome $ENV{GEOM_ROOT_DIR}/lib/salome )
SET( GUI_LIBRARIES ImageComposer qtx suit LightApp CAM OCCViewer )
-SET( GEOM_LIBRARIES CurveCreator )
+SET( GEOM_LIBRARIES CurveCreator GeomUtils )
include_directories(
${CAS_INCLUDES}
include_directories(
${CAS_INCLUDES}
source_group( "External files" FILES ${EXTERNAL_FILES} )
add_executable( HYDROData_tests ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${EXTERNAL_FILES} ${PROJECT_MOC_HEADERS} )
source_group( "External files" FILES ${EXTERNAL_FILES} )
add_executable( HYDROData_tests ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${EXTERNAL_FILES} ${PROJECT_MOC_HEADERS} )
-target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib HYDROData)
+target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib )
#IF( ${WIN32} )
# add_custom_command( TARGET HYDROData_tests POST_BUILD COMMAND $(TargetPath) COMMENT "Running tests" )
#IF( ${WIN32} )
# add_custom_command( TARGET HYDROData_tests POST_BUILD COMMAND $(TargetPath) COMMENT "Running tests" )
../HYDROData/HYDROData_BSplineOperation.cxx
../HYDROData/HYDROData_CalculationCase.cxx
../HYDROData/HYDROData_Channel.cxx
../HYDROData/HYDROData_BSplineOperation.cxx
../HYDROData/HYDROData_CalculationCase.cxx
../HYDROData/HYDROData_Channel.cxx
+ ../HYDROData/HYDROData_ChannelAltitude.cxx
../HYDROData/HYDROData_Confluence.cxx
../HYDROData/HYDROData_Digue.cxx
../HYDROData/HYDROData_Document.cxx
../HYDROData/HYDROData_Confluence.cxx
../HYDROData/HYDROData_Digue.cxx
../HYDROData/HYDROData_Document.cxx
../HYDROData/HYDROData_SinusX.cxx
../HYDROData/HYDROData_ShapeFile.cxx
../HYDROData/HYDROData_LandCoverMap.cxx
../HYDROData/HYDROData_SinusX.cxx
../HYDROData/HYDROData_ShapeFile.cxx
../HYDROData/HYDROData_LandCoverMap.cxx
+ ../HYDROData/HYDROData_QuadTree.cxx
+ ../HYDROData/HYDROData_QuadTreeNode.cxx
+ ../HYDROData/HYDROData_LCM_FaceClassifier.cxx
../HYDROGUI/HYDROGUI_ListModel.cxx
../HYDROGUI/HYDROGUI_DataObject.cxx
../HYDROGUI/HYDROGUI_ListModel.cxx
../HYDROGUI/HYDROGUI_DataObject.cxx