X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FCMakeLists.txt;h=963da06712ab1426f27691de2403e0b5a8e19c36;hb=cd6ea20d9a76665a24a533d0340385a335961f05;hp=95a1d878c6b73b328a3658807493ace6fcdc9583;hpb=f2cd9ebfca8f8f58c6e98e30d2ebb387488016cc;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt
index 95a1d878..963da067 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
@@ -29,6 +32,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 +48,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,6 +62,8 @@ set(PROJECT_HEADERS
     HYDROGUI_Region.h
     HYDROGUI_RemoveImageRefsOp.h
     HYDROGUI_Shape.h
+    HYDROGUI_ShapeBathymetry.h
+    HYDROGUI_ShapeImage.h
     HYDROGUI_ShowHideOp.h
     HYDROGUI_StreamDlg.h
     HYDROGUI_StreamOp.h
@@ -86,9 +95,18 @@ 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
 )
 
 QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
@@ -96,6 +114,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
@@ -103,8 +122,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
@@ -120,6 +141,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
@@ -134,6 +157,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
@@ -146,6 +171,8 @@ set(PROJECT_SOURCES
     HYDROGUI_Region.cxx
     HYDROGUI_RemoveImageRefsOp.cxx
     HYDROGUI_Shape.cxx
+    HYDROGUI_ShapeBathymetry.cxx
+    HYDROGUI_ShapeImage.cxx
     HYDROGUI_ShowHideOp.cxx
     HYDROGUI_StreamDlg.cxx
     HYDROGUI_StreamOp.cxx
@@ -176,9 +203,20 @@ 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
 )
 
 add_definitions(
@@ -201,16 +239,15 @@ 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}
     )
 
@@ -238,12 +275,12 @@ 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)