From: Cédric Aguerre <cedric.aguerre@edf.fr>
Date: Tue, 21 Oct 2014 10:04:06 +0000 (+0200)
Subject: Add field interpolation to GUI
X-Git-Tag: V7_5_0b1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=22fef1c034a01f62ce8832b5a7f269ef713abe58;p=tools%2Fmedcoupling.git

Add field interpolation to GUI
---

diff --git a/src/MEDOP/cmp/CMakeLists.txt b/src/MEDOP/cmp/CMakeLists.txt
index 2849b66eb..f55ccecbd 100644
--- a/src/MEDOP/cmp/CMakeLists.txt
+++ b/src/MEDOP/cmp/CMakeLists.txt
@@ -47,9 +47,10 @@ SET(COMMON_LIBS
   ${KERNEL_SalomeKernelHelpers}
   ${KERNEL_SalomeLifeCycleCORBA}
   ${KERNEL_SALOMELocalTrace}
-  ${KERNEL_SALOMEBasics} 
+  ${KERNEL_SALOMEBasics}
   ${KERNEL_SalomeGenericObj}
   medcoupling
+  medcouplingremapper
   interpkernel
   ${MEDFILE_C_LIBRARIES}
   ${HDF5_LIBRARIES}
@@ -57,7 +58,7 @@ SET(COMMON_LIBS
   ${PLATFORM_LIBRARIES}
 )
 
-# This undefines the macros MIN and MAX which are specified in the windows headers 
+# This undefines the macros MIN and MAX which are specified in the windows headers
 IF(WIN32)
   SET(COMMON_FLAGS "${COMMON_FLAGS} -DNOMINMAX")
 ENDIF(WIN32)
diff --git a/src/MEDOP/gui/dialogs/CMakeLists.txt b/src/MEDOP/gui/dialogs/CMakeLists.txt
index 7b550727b..cad22cc20 100644
--- a/src/MEDOP/gui/dialogs/CMakeLists.txt
+++ b/src/MEDOP/gui/dialogs/CMakeLists.txt
@@ -26,6 +26,7 @@ SET(MEDOPGUI_dialogs_FORMS
   DlgAlias.ui
   DlgUseInWorkspace.ui
   DlgChangeUnderlyingMesh.ui
+  DlgInterpolateField.ui
   DlgImageToMed.ui
 )
 QT4_WRAP_UI(MEDOPGUI_dialogs_FORMS_HEADERS ${MEDOPGUI_dialogs_FORMS})
@@ -35,6 +36,7 @@ SET(MEDOPGUI_dialogs_FILES
   DlgAlias.hxx
   DlgUseInWorkspace.hxx
   DlgChangeUnderlyingMesh.hxx
+  DlgInterpolateField.hxx
   DlgImageToMed.hxx
 )
 QT4_WRAP_CPP(MEDOPGUI_dialogs_HEADERS_MOC ${MEDOPGUI_dialogs_FILES})
@@ -55,12 +57,13 @@ SET(MEDOPGUI_dialogs_SOURCES
   DlgAlias.cxx
   DlgUseInWorkspace.cxx
   DlgChangeUnderlyingMesh.cxx
+  DlgInterpolateField.cxx
   DlgImageToMed.cxx
 )
 
 ADD_LIBRARY(MEDOPGUI_dialogs SHARED ${MEDOPGUI_dialogs_SOURCES} ${MEDOPGUI_dialogs_HEADERS_MOC} ${MEDOPGUI_dialogs_FORMS_HEADERS})
-TARGET_LINK_LIBRARIES(MEDOPGUI_dialogs ${CAS_KERNEL} ${QT_LIBRARIES} ${KERNEL_SalomeIDLKernel} 
-    ${GUI_SalomeGuiHelpers} ${OMNIORB_LIBRARIES} ${GUI_qtx} ${GUI_suit} ${PLATFORM_LIBRARIES} 
+TARGET_LINK_LIBRARIES(MEDOPGUI_dialogs ${CAS_KERNEL} ${QT_LIBRARIES} ${KERNEL_SalomeIDLKernel}
+    ${GUI_SalomeGuiHelpers} ${OMNIORB_LIBRARIES} ${GUI_qtx} ${GUI_suit} ${PLATFORM_LIBRARIES}
     ${KERNEL_SalomeLifeCycleCORBA} ${KERNEL_SalomeKernelHelpers} ${GUI_SalomeGuiHelpers})
 INSTALL(TARGETS MEDOPGUI_dialogs DESTINATION ${SALOME_INSTALL_LIBS})
 
@@ -76,4 +79,3 @@ INSTALL(TARGETS dlgTester DESTINATION ${SALOME_INSTALL_BINS})
 
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
-
diff --git a/src/MEDOP/res/CMakeLists.txt b/src/MEDOP/res/CMakeLists.txt
index 2ce2792ea..60a339ea8 100644
--- a/src/MEDOP/res/CMakeLists.txt
+++ b/src/MEDOP/res/CMakeLists.txt
@@ -22,6 +22,7 @@ ADD_SUBDIRECTORY(testfiles)
 SET(MED_RESOURCES_FILES
   datasource_add.png
   datasource_changeUnderlyingMesh.png
+  datasource_interpolateField.png
   datasource_expandfield.png
   datasource_field.png
   datasource_mesh.png
@@ -37,4 +38,3 @@ SET(MED_RESOURCES_FILES
   workspace_save.png
   )
 INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA})
-