X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FCMakeLists.txt;h=18acca61c4c18793beefc7290f568303b6e60079;hb=fdd7dcde36312e41d8ffb63ec58a77567e8592ef;hp=1aa750d2979699bf6f4dc8a3a70f56b752f98177;hpb=d07d7ebf5fa5f6a479971cf7d7e56034c6e31db3;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt
index 1aa750d2..18acca61 100644
--- a/src/HYDROGUI/CMakeLists.txt
+++ b/src/HYDROGUI/CMakeLists.txt
@@ -1,10 +1,11 @@
 #include(../../CMake/Common.cmake)
 include(../../CMake/UseQT4EXT.cmake)
-
+ 
 set(PROJECT_HEADERS 
     HYDROGUI.h
     HYDROGUI_AbstractDisplayer.h
     HYDROGUI_AISTrihedron.h
+    HYDROGUI_BathymetryPrs.h
     HYDROGUI_CalculationDlg.h
     HYDROGUI_CalculationOp.h
     HYDROGUI_ChannelDlg.h
@@ -12,8 +13,10 @@ set(PROJECT_HEADERS
     HYDROGUI_ColorWidget.h
     HYDROGUI_CopyPasteOp.h
     HYDROGUI_CopyPastePositionOp.h
+    HYDROGUI_CurveCreatorProfile.h
     HYDROGUI_DataBrowser.h
     HYDROGUI_DataModel.h
+    HYDROGUI_DataModelSync.h
     HYDROGUI_DataObject.h
     HYDROGUI_DeleteDlg.h
     HYDROGUI_DeleteOp.h
@@ -22,6 +25,7 @@ set(PROJECT_HEADERS
     HYDROGUI_Displayer.h
     HYDROGUI_ExportImageOp.h
     HYDROGUI_GVSelector.h
+    HYDROGUI_ImagePrs.h
     HYDROGUI_ImmersibleZoneDlg.h
     HYDROGUI_ImmersibleZoneOp.h
     HYDROGUI_ImportBathymetryDlg.h
@@ -29,6 +33,8 @@ set(PROJECT_HEADERS
     HYDROGUI_ImportImageDlg.h
     HYDROGUI_ImportImageOp.h
     HYDROGUI_InputPanel.h
+    HYDROGUI_LocalCSDlg.h
+    HYDROGUI_LocalCSOp.h
     HYDROGUI_Module.h
     HYDROGUI_NameValidator.h
     HYDROGUI_ObjSelector.h
@@ -43,6 +49,8 @@ set(PROJECT_HEADERS
     HYDROGUI_PolylineOp.h
     HYDROGUI_ProfileDlg.h
     HYDROGUI_ProfileOp.h
+    HYDROGUI_ProfileInterpolateDlg.h
+    HYDROGUI_ProfileInterpolateOp.h
     HYDROGUI_Prs.h
     HYDROGUI_PrsDriver.h
     HYDROGUI_PrsImage.h
@@ -55,9 +63,13 @@ set(PROJECT_HEADERS
     HYDROGUI_Region.h
     HYDROGUI_RemoveImageRefsOp.h
     HYDROGUI_Shape.h
+    HYDROGUI_Polyline.h
+    HYDROGUI_ShapeBathymetry.h
+    HYDROGUI_ShapeImage.h
     HYDROGUI_ShowHideOp.h
     HYDROGUI_StreamDlg.h
     HYDROGUI_StreamOp.h
+    HYDROGUI_SubmersibleOp.h
     HYDROGUI_Tool.h
     HYDROGUI_TwoImagesDlg.h
     HYDROGUI_TwoImagesOp.h
@@ -86,8 +98,20 @@ set(PROJECT_HEADERS
     HYDROGUI_BathymetryBoundsOp.h
     HYDROGUI_TranslateObstacleDlg.h
     HYDROGUI_TranslateObstacleOp.h
-    HYDROGUI_ZLevelsModel.h
+    HYDROGUI_ListModel.h
     HYDROGUI_ZLevelsDlg.h
+    HYDROGUI_ZLevelsOp.h
+    HYDROGUI_OrderedListWidget.h
+    HYDROGUI_ListSelector.h
+    HYDROGUI_ZLayers.h
+    HYDROGUI_PriorityWidget.h
+    HYDROGUI_PriorityTableModel.h
+    HYDROGUI_RiverBottomDlg.h
+    HYDROGUI_RiverBottomOp.h
+    HYDROGUI_ViewerDlg.h
+    HYDROGUI_ObjComboBox.h
+    HYDROGUI_RecognizeContoursDlg.h
+    HYDROGUI_RecognizeContoursOp.h
 )
 
 QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
@@ -95,6 +119,7 @@ QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
 set(PROJECT_SOURCES 
     HYDROGUI_AbstractDisplayer.cxx
     HYDROGUI_AISTrihedron.cxx
+    HYDROGUI_BathymetryPrs.cxx
     HYDROGUI_CalculationDlg.cxx
     HYDROGUI_CalculationOp.cxx
     HYDROGUI_ChannelDlg.cxx
@@ -102,8 +127,10 @@ set(PROJECT_SOURCES
     HYDROGUI_ColorWidget.cxx
     HYDROGUI_CopyPasteOp.cxx
     HYDROGUI_CopyPastePositionOp.cxx
+    HYDROGUI_CurveCreatorProfile.cxx
     HYDROGUI_DataBrowser.cxx
     HYDROGUI_DataModel.cxx
+    HYDROGUI_DataModelSync.cxx
     HYDROGUI_DataObject.cxx
     HYDROGUI_DeleteDlg.cxx
     HYDROGUI_DeleteOp.cxx
@@ -112,6 +139,7 @@ set(PROJECT_SOURCES
     HYDROGUI_Displayer.cxx
     HYDROGUI_ExportImageOp.cxx
     HYDROGUI_GVSelector.cxx
+    HYDROGUI_ImagePrs.cxx
     HYDROGUI_ImmersibleZoneDlg.cxx
     HYDROGUI_ImmersibleZoneOp.cxx
     HYDROGUI_ImportBathymetryDlg.cxx
@@ -119,6 +147,8 @@ set(PROJECT_SOURCES
     HYDROGUI_ImportImageDlg.cxx
     HYDROGUI_ImportImageOp.cxx
     HYDROGUI_InputPanel.cxx
+    HYDROGUI_LocalCSDlg.cxx
+    HYDROGUI_LocalCSOp.cxx
     HYDROGUI_Module.cxx
     HYDROGUI_NameValidator.cxx
     HYDROGUI_ObjSelector.cxx
@@ -133,6 +163,8 @@ set(PROJECT_SOURCES
     HYDROGUI_PolylineOp.cxx
     HYDROGUI_ProfileDlg.cxx
     HYDROGUI_ProfileOp.cxx
+    HYDROGUI_ProfileInterpolateDlg.cxx
+    HYDROGUI_ProfileInterpolateOp.cxx
     HYDROGUI_Prs.cxx
     HYDROGUI_PrsDriver.cxx
     HYDROGUI_PrsImage.cxx
@@ -145,9 +177,13 @@ set(PROJECT_SOURCES
     HYDROGUI_Region.cxx
     HYDROGUI_RemoveImageRefsOp.cxx
     HYDROGUI_Shape.cxx
+    HYDROGUI_Polyline.cxx
+    HYDROGUI_ShapeBathymetry.cxx
+    HYDROGUI_ShapeImage.cxx
     HYDROGUI_ShowHideOp.cxx
     HYDROGUI_StreamDlg.cxx
     HYDROGUI_StreamOp.cxx
+    HYDROGUI_SubmersibleOp.cxx
     HYDROGUI_Tool.cxx
     HYDROGUI_TwoImagesDlg.cxx
     HYDROGUI_TwoImagesOp.cxx
@@ -175,8 +211,22 @@ set(PROJECT_SOURCES
     HYDROGUI_BathymetryBoundsOp.cxx
     HYDROGUI_TranslateObstacleDlg.cxx
     HYDROGUI_TranslateObstacleOp.cxx
-    HYDROGUI_ZLevelsModel.cxx
+    HYDROGUI_ListModel.cxx
     HYDROGUI_ZLevelsDlg.cxx
+    HYDROGUI_ZLevelsOp.cxx
+    HYDROGUI_OrderedListWidget.cxx
+    HYDROGUI_ListSelector.cxx
+    HYDROGUI_ZLayers.cxx
+    HYDROGUI_ZLayers2.cxx
+    HYDROGUI_ZLayers3.cxx
+    HYDROGUI_PriorityWidget.cxx
+    HYDROGUI_PriorityTableModel.cxx
+    HYDROGUI_RiverBottomDlg.cxx
+    HYDROGUI_RiverBottomOp.cxx
+    HYDROGUI_ViewerDlg.cxx
+    HYDROGUI_ObjComboBox.cxx
+    HYDROGUI_RecognizeContoursDlg.cxx
+    HYDROGUI_RecognizeContoursOp.cxx
 )
 
 add_definitions(
@@ -199,18 +249,18 @@ include_directories(
   ${GEOM_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
-  ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROCurveCreator
   ${VTK_INCLUDE_DIRS}
 )
 
 
 add_library(HYDROGUI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${PROJECT_HEADERS_MOC})
-target_link_libraries(HYDROGUI HYDROData HYDROCurveCreator
+target_link_libraries(HYDROGUI HYDROData
     ${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}
+    ${GUI_Event} ${GUI_OCCViewer} ${GEOM_GEOM} ${GEOM_GEOMBase} ${GEOM_CurveCreator}
     ${VTK_LIBRARIES} ${SVTK} ${SalomeObject} ${SalomePrs}
     )
+
 INSTALL(TARGETS HYDROGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 set(PROJECT_LIBRARIES HYDROGUI)
@@ -235,17 +285,19 @@ INSTALL(FILES ${GUI_DATA} DESTINATION ${SALOME_HYDRO_INSTALL_RES_DATA})
 if(SALOME_BUILD_TESTS)
 
   set(TEST_HEADERS 
-    test_HYDROGUI_ZLevelsModel.h
+    test_HYDROGUI_ListModel.h
   )
 
   set(TEST_SOURCES 
     test_HYDROGUI_Main.cxx
-    test_HYDROGUI_ZLevelsModel.cxx    
+    test_HYDROGUI_ListModel.cxx    
   )
   
   set(TEST_EXE test_HYDROGUI)
   include(../../CMake/CPPUnitTests.cmake)
-  target_link_libraries(test_HYDROGUI ${CAS_OCAF} ${CAS_MODELER} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} HYDROData HYDROGUI)
+  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)