X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FCMakeLists.txt;h=17441f3aa5df015faa798f503703232735c4125b;hb=6ba63abdcb5832a1773cb33cf67d6b34aee4139d;hp=b036383260559525859a90efe0ce550458bc1074;hpb=3b59e1468a122ec7d237649886bc3e5d6a6a8117;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt
old mode 100644
new mode 100755
index b0363832..17441f3a
--- 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
@@ -18,7 +20,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,20 +31,26 @@ 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
     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_ImportBCPolygonOp.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 +86,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 +95,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
@@ -115,6 +124,8 @@ set(PROJECT_HEADERS
     HYDROGUI_GeoreferencementOp.h
     HYDROGUI_Actor.h
     HYDROGUI_BathymetryBoundsOp.h
+    HYDROGUI_BathymetrySelectionOp.h
+    HYDROGUI_BathymetryOp.h
     HYDROGUI_TranslateObstacleDlg.h
     HYDROGUI_TranslateObstacleOp.h
     HYDROGUI_ListModel.h
@@ -129,17 +140,34 @@ 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
+    HYDROGUI_SetTransparencyOp.h
+    HYDROGUI_TransparencyDlg.h
+    HYDROGUI_Overview.h
+    HYDROGUI_PolylineStyleOp.h
+    HYDROGUI_PolylineStyleDlg.h
+    HYDROGUI_ZoneTool.h
+    HYDROGUI_RegenerateRegionColorsOp.h
+    HYDROGUI_ZoneSetColorOp.h
+    HYDROGUI_PolyAttrDlg.h
+    HYDROGUI_ShowAttrPolyOp.h
+    HYDROGUI_SetBoundaryTypePolygonOp.h
+    HYDROGUI_SetBoundaryTypePolygonDlg.h
+    HYDROGUI_MeasurementToolOp.h
+    HYDROGUI_MeasurementToolDlg.h
+    HYDROGUI_SIProgressIndicator.h
+    HYDROGUI_ZIProgressIndicator.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
@@ -154,7 +182,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
@@ -165,20 +193,26 @@ 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
     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_ImportBCPolygonOp.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
@@ -193,6 +227,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
@@ -211,21 +246,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
@@ -250,6 +285,8 @@ set(PROJECT_SOURCES
     HYDROGUI_GeoreferencementOp.cxx
     HYDROGUI_Actor.cxx
     HYDROGUI_BathymetryBoundsOp.cxx
+    HYDROGUI_BathymetrySelectionOp.cxx
+    HYDROGUI_BathymetryOp.cxx
     HYDROGUI_TranslateObstacleDlg.cxx
     HYDROGUI_TranslateObstacleOp.cxx
     HYDROGUI_ListModel.cxx
@@ -266,11 +303,27 @@ 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
+    HYDROGUI_SetTransparencyOp.cxx
+    HYDROGUI_TransparencyDlg.cxx
+    HYDROGUI_Overview.cxx
+    HYDROGUI_PolylineStyleOp.cxx
+    HYDROGUI_PolylineStyleDlg.cxx
+    HYDROGUI_ZoneTool.cxx
+    HYDROGUI_RegenerateRegionColorsOp.cxx
+    HYDROGUI_ZoneSetColorOp.cxx
+    HYDROGUI_PolyAttrDlg.cxx
+    HYDROGUI_ShowAttrPolyOp.cxx
+    HYDROGUI_SetBoundaryTypePolygonOp.cxx
+    HYDROGUI_SetBoundaryTypePolygonDlg.cxx
+    HYDROGUI_MeasurementToolOp.cxx
+    HYDROGUI_MeasurementToolDlg.cxx
+    HYDROGUI_SIProgressIndicator.cxx
+    HYDROGUI_ZIProgressIndicator.cxx
 )
 
 add_definitions(
@@ -287,18 +340,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}
@@ -307,7 +358,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
@@ -325,24 +376,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)
-