land cover object is removed from the data model

[modules/hydro.git] / src / HYDROGUI / CMakeLists.txt

diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt
index 4be75c780915e058d19f38132062ab040ff9013c..ae5ef8328f34bfe0d7893607d28bb29c74ad672b 100644 (file)
--- a/src/HYDROGUI/CMakeLists.txt
+++ b/src/HYDROGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-#include(../../CMake/Common.cmake)
+include(../../CMake/Common.cmake)
 include(../../CMake/UseQT4EXT.cmake)
  
 set(PROJECT_HEADERS 
@@ -18,7 +18,7 @@ set(PROJECT_HEADERS
     HYDROGUI_DataModel.h
     HYDROGUI_DataModelSync.h
     HYDROGUI_DataObject.h
-       HYDROGUI_DataOwner.h
+    HYDROGUI_DataOwner.h
     HYDROGUI_DeleteDlg.h
     HYDROGUI_DeleteOp.h
     HYDROGUI_DigueDlg.h
@@ -29,7 +29,7 @@ set(PROJECT_HEADERS
     HYDROGUI_ExportFileOp.h
     HYDROGUI_GVSelector.h
     HYDROGUI_ImagePrs.h
-       HYDROGUI_BasicZoneDlg.h
+    HYDROGUI_BasicZoneDlg.h
     HYDROGUI_ImmersibleZoneDlg.h
     HYDROGUI_ImmersibleZoneOp.h
     HYDROGUI_ImportBathymetryDlg.h
@@ -37,6 +37,8 @@ set(PROJECT_HEADERS
     HYDROGUI_ImportImageDlg.h
     HYDROGUI_ImportImageOp.h
     HYDROGUI_ImportPolylineOp.h
+    HYDROGUI_ImportLandCoverOp.h
+    HYDROGUI_ImportLandCoverDlg.h
     HYDROGUI_ImportSinusXOp.h
     HYDROGUI_ExportSinusXOp.h
     HYDROGUI_ExportSinusXDlg.h
@@ -84,8 +86,8 @@ set(PROJECT_HEADERS
     HYDROGUI_LineEditDoubleValidator.h
     HYDROGUI_StricklerTableDlg.h
     HYDROGUI_StricklerTableOp.h
-       HYDROGUI_LandCoverDlg.h
-       HYDROGUI_LandCoverOp.h
+    HYDROGUI_LandCoverDlg.h
+    HYDROGUI_LandCoverOp.h
     HYDROGUI_SubmersibleOp.h
     HYDROGUI_Tool.h
     HYDROGUI_TwoImagesDlg.h
@@ -127,9 +129,12 @@ set(PROJECT_HEADERS
     HYDROGUI_RiverBottomOp.h
     HYDROGUI_ViewerDlg.h
     HYDROGUI_ObjComboBox.h
+    HYDROGUI_PolylineExtractionOp.h
     HYDROGUI_ObjListBox.h
     HYDROGUI_RecognizeContoursDlg.h
     HYDROGUI_RecognizeContoursOp.h
+    HYDROGUI_LandCoverColoringOp.h
+    HYDROGUI_ShapeLandCover.h
 )
 
 QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
@@ -150,7 +155,7 @@ set(PROJECT_SOURCES
     HYDROGUI_DataModel.cxx
     HYDROGUI_DataModelSync.cxx
     HYDROGUI_DataObject.cxx
-       HYDROGUI_DataOwner.cxx
+    HYDROGUI_DataOwner.cxx
     HYDROGUI_DeleteDlg.cxx
     HYDROGUI_DeleteOp.cxx
     HYDROGUI_DigueDlg.cxx
@@ -161,7 +166,7 @@ set(PROJECT_SOURCES
     HYDROGUI_ExportFileOp.cxx
     HYDROGUI_GVSelector.cxx
     HYDROGUI_ImagePrs.cxx
-       HYDROGUI_BasicZoneDlg.cxx
+    HYDROGUI_BasicZoneDlg.cxx
     HYDROGUI_ImmersibleZoneDlg.cxx
     HYDROGUI_ImmersibleZoneOp.cxx
     HYDROGUI_ImportBathymetryDlg.cxx
@@ -170,6 +175,8 @@ set(PROJECT_SOURCES
     HYDROGUI_ImportImageOp.cxx
     HYDROGUI_ImportPolylineOp.cxx
     HYDROGUI_ImportSinusXOp.cxx
+    HYDROGUI_ImportLandCoverOp.cxx
+    HYDROGUI_ImportLandCoverDlg.cxx
     HYDROGUI_ExportSinusXOp.cxx
     HYDROGUI_ExportSinusXDlg.cxx
     HYDROGUI_InputPanel.cxx
@@ -214,8 +221,8 @@ set(PROJECT_SOURCES
     HYDROGUI_LineEditDoubleValidator.cxx
     HYDROGUI_StricklerTableDlg.cxx
     HYDROGUI_StricklerTableOp.cxx
-       HYDROGUI_LandCoverDlg.cxx
-       HYDROGUI_LandCoverOp.cxx
+    HYDROGUI_LandCoverDlg.cxx
+    HYDROGUI_LandCoverOp.cxx
     HYDROGUI_SplitPolylinesDlg.cxx
     HYDROGUI_SplitPolylinesOp.cxx
     HYDROGUI_SubmersibleOp.cxx
@@ -260,9 +267,12 @@ set(PROJECT_SOURCES
     HYDROGUI_RiverBottomOp.cxx
     HYDROGUI_ViewerDlg.cxx
     HYDROGUI_ObjComboBox.cxx
+    HYDROGUI_PolylineExtractionOp.cxx
     HYDROGUI_ObjListBox.cxx
     HYDROGUI_RecognizeContoursDlg.cxx
     HYDROGUI_RecognizeContoursOp.cxx
+    HYDROGUI_LandCoverColoringOp.cxx
+    HYDROGUI_ShapeLandCover.cxx
 )
 
 add_definitions(
@@ -279,18 +289,16 @@ add_definitions(
 include_directories(
   ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
-#  ${GUI_ROOT_DIR}/include/salome
   ${GUI_INCLUDE_DIRS}
-#  ${GEOM_ROOT_DIR}/include/salome
   ${GEOM_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../shapelib
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
   ${VTK_INCLUDE_DIRS}
 )
 
 
 add_library(HYDROGUI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${PROJECT_HEADERS_MOC})
-target_link_libraries(HYDROGUI HYDROData
+target_link_libraries(HYDROGUI HYDROData shapelib
     ${CAS_TKV3d} ${CAS_TKTopAlgo} ${CAS_TKBrep} ${CAS_TKBO}
     ${GUI_LightApp} ${GUI_CAM} ${GUI_suit} ${GUI_qtx} ${GUI_ObjBrowser} ${GUI_GraphicsView} ${GUI_std} 
     ${GUI_Event} ${GUI_OCCViewer} ${GEOM_GEOM} ${GEOM_GEOMBase} ${GEOM_CurveCreator}
@@ -299,7 +307,7 @@ target_link_libraries(HYDROGUI HYDROData
 
 INSTALL(TARGETS HYDROGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-set(PROJECT_LIBRARIES HYDROGUI)
+set(PROJECT_LIBRARIES shapelib HYDROGUI)
 
 set(GUITS_SOURCES
   resources/HYDROGUI_images.ts
@@ -317,24 +325,3 @@ FILE(GLOB GUIXML_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.xml")
 FILE(GLOB GUITXT_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.txt")
 SET(GUI_DATA ${GUIPNG_DATA} ${GUIXML_DATA} ${GUITXT_DATA})
 INSTALL(FILES ${GUI_DATA} DESTINATION ${SALOME_HYDRO_INSTALL_RES_DATA})
-
-# tests
-if(SALOME_BUILD_TESTS)
-
-  set(TEST_HEADERS 
-    test_HYDROGUI_ListModel.h
-  )
-
-  set(TEST_SOURCES 
-    test_HYDROGUI_Main.cxx
-    test_HYDROGUI_ListModel.cxx    
-  )
-  
-  set(TEST_EXE test_HYDROGUI)
-  include(../../CMake/CPPUnitTests.cmake)
-  target_link_libraries(test_HYDROGUI ${CPPUNIT_LIBRARIES} HYDROData HYDROGUI)
-
-  INSTALL(TARGETS test_HYDROGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
-
-endif(SALOME_BUILD_TESTS)
-