X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FCMakeLists.txt;h=96cbffbcee1054708d25b9e46258e1e967bee620;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=5daac86832fad0a3d5573033130b970122c88acb;hpb=0b70c7bb91364703163f5db817926bee346b00ac;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt
index 5daac868..96cbffbc 100644
--- a/src/HYDROGUI/CMakeLists.txt
+++ b/src/HYDROGUI/CMakeLists.txt
@@ -1,9 +1,11 @@
-#include(../../CMake/Common.cmake)
+include(../../CMake/Common.cmake)
 include(../../CMake/UseQT4EXT.cmake)
- 
+INCLUDE(UseQtExt)
+
 set(PROJECT_HEADERS 
     HYDROGUI.h
     HYDROGUI_AbstractDisplayer.h
+    HYDROGUI_AISShape.h
     HYDROGUI_AISTrihedron.h
     HYDROGUI_BathymetryPrs.h
     HYDROGUI_CalculationDlg.h
@@ -36,13 +38,18 @@ set(PROJECT_HEADERS
     HYDROGUI_ImportBathymetryOp.h
     HYDROGUI_ImportImageDlg.h
     HYDROGUI_ImportImageOp.h
+    HYDROGUI_ImportLandCoverMapOp.h
+    HYDROGUI_ImportLandCoverMapDlg.h
     HYDROGUI_ImportPolylineOp.h
-    HYDROGUI_ImportLandCoverOp.h
-    HYDROGUI_ImportLandCoverDlg.h
     HYDROGUI_ImportSinusXOp.h
     HYDROGUI_ExportSinusXOp.h
     HYDROGUI_ExportSinusXDlg.h
+    HYDROGUI_ExportLandCoverMapDlg.h
     HYDROGUI_InputPanel.h
+    HYDROGUI_LandCoverArgsFilter.h
+    HYDROGUI_LandCoverMapDlg.h
+    HYDROGUI_LandCoverMapOp.h
+    HYDROGUI_LandCoverMapPrs.h
     HYDROGUI_LocalCSDlg.h
     HYDROGUI_LocalCSOp.h
     HYDROGUI_MergePolylinesDlg.h
@@ -78,6 +85,7 @@ set(PROJECT_HEADERS
     HYDROGUI_Polyline.h
     HYDROGUI_ShapeBathymetry.h
     HYDROGUI_ShapeImage.h
+    HYDROGUI_ShapeLandCoverMap.h
     HYDROGUI_ShowHideOp.h
     HYDROGUI_SplitPolylinesDlg.h
     HYDROGUI_SplitPolylinesOp.h
@@ -86,10 +94,10 @@ set(PROJECT_HEADERS
     HYDROGUI_LineEditDoubleValidator.h
     HYDROGUI_StricklerTableDlg.h
     HYDROGUI_StricklerTableOp.h
-    HYDROGUI_LandCoverDlg.h
-    HYDROGUI_LandCoverOp.h
+    HYDROGUI_StricklerTypeComboBox.h
     HYDROGUI_SubmersibleOp.h
     HYDROGUI_Tool.h
+    HYDROGUI_Tool2.h
     HYDROGUI_TwoImagesDlg.h
     HYDROGUI_TwoImagesOp.h
     HYDROGUI_UpdateFlags.h
@@ -134,13 +142,15 @@ set(PROJECT_HEADERS
     HYDROGUI_RecognizeContoursDlg.h
     HYDROGUI_RecognizeContoursOp.h
     HYDROGUI_LandCoverColoringOp.h
-    HYDROGUI_ShapeLandCover.h
+    HYDROGUI_SetTransparencyOp.h
+    HYDROGUI_TransparencyDlg.h
 )
 
-QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
+QT_WRAP_MOC(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
 
 set(PROJECT_SOURCES 
     HYDROGUI_AbstractDisplayer.cxx
+    HYDROGUI_AISShape.cxx
     HYDROGUI_AISTrihedron.cxx
     HYDROGUI_BathymetryPrs.cxx
     HYDROGUI_CalculationDlg.cxx
@@ -173,13 +183,18 @@ set(PROJECT_SOURCES
     HYDROGUI_ImportBathymetryOp.cxx
     HYDROGUI_ImportImageDlg.cxx
     HYDROGUI_ImportImageOp.cxx
+    HYDROGUI_ImportLandCoverMapOp.cxx
+    HYDROGUI_ImportLandCoverMapDlg.cxx
     HYDROGUI_ImportPolylineOp.cxx
     HYDROGUI_ImportSinusXOp.cxx
-    HYDROGUI_ImportLandCoverOp.cxx
-    HYDROGUI_ImportLandCoverDlg.cxx
     HYDROGUI_ExportSinusXOp.cxx
     HYDROGUI_ExportSinusXDlg.cxx
+    HYDROGUI_ExportLandCoverMapDlg.cxx
     HYDROGUI_InputPanel.cxx
+    HYDROGUI_LandCoverArgsFilter.cxx
+    HYDROGUI_LandCoverMapDlg.cxx
+    HYDROGUI_LandCoverMapOp.cxx
+    HYDROGUI_LandCoverMapPrs.cxx
     HYDROGUI_LocalCSDlg.cxx
     HYDROGUI_LocalCSOp.cxx
     HYDROGUI_MergePolylinesDlg.cxx
@@ -194,6 +209,7 @@ set(PROJECT_SOURCES
     HYDROGUI_Operations.cxx
     HYDROGUI_Poly3DDlg.cxx
     HYDROGUI_Poly3DOp.cxx
+    HYDROGUI_Polyline.cxx
     HYDROGUI_PolylineDlg.cxx
     HYDROGUI_PolylineOp.cxx
     HYDROGUI_ProfileDlg.cxx
@@ -212,21 +228,21 @@ set(PROJECT_SOURCES
     HYDROGUI_Region.cxx
     HYDROGUI_RemoveImageRefsOp.cxx
     HYDROGUI_Shape.cxx
-    HYDROGUI_Polyline.cxx
     HYDROGUI_ShapeBathymetry.cxx
     HYDROGUI_ShapeImage.cxx
+    HYDROGUI_ShapeLandCoverMap.cxx
     HYDROGUI_ShowHideOp.cxx
     HYDROGUI_StreamDlg.cxx
     HYDROGUI_StreamOp.cxx
     HYDROGUI_LineEditDoubleValidator.cxx
     HYDROGUI_StricklerTableDlg.cxx
     HYDROGUI_StricklerTableOp.cxx
-    HYDROGUI_LandCoverDlg.cxx
-    HYDROGUI_LandCoverOp.cxx
+    HYDROGUI_StricklerTypeComboBox.cxx
     HYDROGUI_SplitPolylinesDlg.cxx
     HYDROGUI_SplitPolylinesOp.cxx
     HYDROGUI_SubmersibleOp.cxx
     HYDROGUI_Tool.cxx
+    HYDROGUI_Tool2.cxx
     HYDROGUI_TwoImagesDlg.cxx
     HYDROGUI_TwoImagesOp.cxx
     HYDROGUI_UpdateObjectOp.cxx
@@ -272,7 +288,8 @@ set(PROJECT_SOURCES
     HYDROGUI_RecognizeContoursDlg.cxx
     HYDROGUI_RecognizeContoursOp.cxx
     HYDROGUI_LandCoverColoringOp.cxx
-    HYDROGUI_ShapeLandCover.cxx
+    HYDROGUI_SetTransparencyOp.cxx
+    HYDROGUI_TransparencyDlg.cxx
 )
 
 add_definitions(
@@ -289,11 +306,8 @@ 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}
@@ -310,7 +324,7 @@ target_link_libraries(HYDROGUI HYDROData shapelib
 
 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
@@ -328,24 +342,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)
-