From 1a5fa0f4c0bb69276916a503612b0388613d0193 Mon Sep 17 00:00:00 2001 From: azakir Date: Tue, 5 Jan 2021 11:18:05 +0100 Subject: [PATCH] replace files in their respective rep --- src/ADAPT/CMakeLists.txt | 4 ++++ src/{SMESHGUI => ADAPT}/MG_ADAPT.cxx | 0 src/{SMESHGUI => ADAPT}/MG_ADAPT.hxx | 20 ++++++++++---------- src/ADAPTGUI/CMakeLists.txt | 4 ++++ src/{SMESHGUI => ADAPTGUI}/MG_ADAPTGUI.cxx | 12 ++++++------ src/{SMESHGUI => ADAPTGUI}/MG_ADAPTGUI.hxx | 0 src/SMESHGUI/CMakeLists.txt | 10 ++++++---- 7 files changed, 30 insertions(+), 20 deletions(-) rename src/{SMESHGUI => ADAPT}/MG_ADAPT.cxx (100%) rename src/{SMESHGUI => ADAPT}/MG_ADAPT.hxx (95%) rename src/{SMESHGUI => ADAPTGUI}/MG_ADAPTGUI.cxx (99%) rename src/{SMESHGUI => ADAPTGUI}/MG_ADAPTGUI.hxx (100%) diff --git a/src/ADAPT/CMakeLists.txt b/src/ADAPT/CMakeLists.txt index 728d7203d..fe9b1ef74 100644 --- a/src/ADAPT/CMakeLists.txt +++ b/src/ADAPT/CMakeLists.txt @@ -21,6 +21,7 @@ # additional include directories INCLUDE_DIRECTORIES( ${KERNEL_INCLUDE_DIRS} + ${MEDCOUPLING_INCLUDE_DIRS} ) # additional preprocessor / compiler flags @@ -31,6 +32,7 @@ ADD_DEFINITIONS( # libraries to link to SET(_link_LIBRARIES ${KERNEL_SALOMELocalTrace} + ${MEDCoupling_medloader} ) # --- headers --- @@ -48,6 +50,7 @@ SET(ADAPTImpl_HEADERS HOMARD_YACS.hxx HomardDriver.hxx YACSDriver.hxx + MG_ADAPT.hxx ) # --- sources --- @@ -64,6 +67,7 @@ SET(ADAPTImpl_SOURCES HOMARD_YACS.cxx HomardDriver.cxx YACSDriver.cxx + MG_ADAPT.cxx ) # --- rules --- diff --git a/src/SMESHGUI/MG_ADAPT.cxx b/src/ADAPT/MG_ADAPT.cxx similarity index 100% rename from src/SMESHGUI/MG_ADAPT.cxx rename to src/ADAPT/MG_ADAPT.cxx diff --git a/src/SMESHGUI/MG_ADAPT.hxx b/src/ADAPT/MG_ADAPT.hxx similarity index 95% rename from src/SMESHGUI/MG_ADAPT.hxx rename to src/ADAPT/MG_ADAPT.hxx index e25101dfb..d597cf5f2 100644 --- a/src/SMESHGUI/MG_ADAPT.hxx +++ b/src/ADAPT/MG_ADAPT.hxx @@ -161,28 +161,28 @@ public: void setUseLocalMap(bool mybool); bool getUseLocalMap(); - void setUseBackgroundMap(bool); + void setUseBackgroundMap(bool mybool); bool getUseBackgroundMap(); - void setUseConstantValue(bool); + void setUseConstantValue(bool mybool); bool getUseConstantValue(); - void setConstantValue(double); + void setConstantValue(double cnst); double getConstantValue() const; - void setSizeMapFile(std::string); + void setSizeMapFile(std::string mapFile); std::string getSizeMapFile(); - void setFromMedFile(bool); + void setFromMedFile(bool mybool); bool isFromMedFile(); - void setKeepWorkingFiles(bool); + void setKeepWorkingFiles(bool mybool); bool getKeepWorkingFiles(); - void setPrintLogInFile(bool); + void setPrintLogInFile(bool mybool); bool getPrintLogInFile(); - void setWorkingDir(std::string); + void setWorkingDir(std::string dir); std::string getWorkingDir() const; @@ -192,9 +192,9 @@ public: int compute(std::string& errStr); std::string getFileName() const; static std::string getExeName(); - void copyMgAdaptHypothesisData( MgAdaptHypothesisData* ) ; + void copyMgAdaptHypothesisData( MgAdaptHypothesisData* from) ; - void checkDirPath(std::string& ); + void checkDirPath(std::string& dirPath); diff --git a/src/ADAPTGUI/CMakeLists.txt b/src/ADAPTGUI/CMakeLists.txt index 7008df0b0..8ab085563 100644 --- a/src/ADAPTGUI/CMakeLists.txt +++ b/src/ADAPTGUI/CMakeLists.txt @@ -39,6 +39,7 @@ INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR}/adm_local/unix ${PROJECT_SOURCE_DIR}/src/ADAPT ${PROJECT_SOURCE_DIR}/src/ADAPT_I + ${MEDCOUPLING_INCLUDE_DIRS} ) # additional preprocessor / compiler flags @@ -56,6 +57,7 @@ SET(_link_LIBRARIES ${GUI_SalomeApp} ${SMESH_SalomeIDLSMESH} ADAPTEngine + ${MEDCoupling_medloader} ) # --- resources --- @@ -112,6 +114,7 @@ SET(_moc_HEADERS MonCreateYACS.h MonEditYACS.h MonEditFile.h + MG_ADAPTGUI.hxx ) # header files / uic wrappings @@ -160,6 +163,7 @@ SET(_other_SOURCES MonEditYACS.cxx MonEditFile.cxx HomardQtCommun.cxx + MG_ADAPTGUI.cxx ) # sources / to compile diff --git a/src/SMESHGUI/MG_ADAPTGUI.cxx b/src/ADAPTGUI/MG_ADAPTGUI.cxx similarity index 99% rename from src/SMESHGUI/MG_ADAPTGUI.cxx rename to src/ADAPTGUI/MG_ADAPTGUI.cxx index 598e0cf3f..af8c47e24 100644 --- a/src/SMESHGUI/MG_ADAPTGUI.cxx +++ b/src/ADAPTGUI/MG_ADAPTGUI.cxx @@ -30,13 +30,13 @@ #include "SalomeApp_Application.h" #include "SalomeApp_Module.h" #include "SalomeApp_Study.h" -#include "SMESH_Actor.h" +//~#include "SMESH_Actor.h" #include -#include -#include -#include -#include -#include +//~#include +//~#include +//~#include +//~#include +//~#include #include #include #include diff --git a/src/SMESHGUI/MG_ADAPTGUI.hxx b/src/ADAPTGUI/MG_ADAPTGUI.hxx similarity index 100% rename from src/SMESHGUI/MG_ADAPTGUI.hxx rename to src/ADAPTGUI/MG_ADAPTGUI.hxx diff --git a/src/SMESHGUI/CMakeLists.txt b/src/SMESHGUI/CMakeLists.txt index df5580f27..59f09da98 100644 --- a/src/SMESHGUI/CMakeLists.txt +++ b/src/SMESHGUI/CMakeLists.txt @@ -42,10 +42,12 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/Controls ${PROJECT_SOURCE_DIR}/src/SMESHClient ${PROJECT_SOURCE_DIR}/src/MEDWrapper + ${PROJECT_SOURCE_DIR}/src/ADAPT ${PROJECT_SOURCE_DIR}/src/ADAPTGUI ${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}/idl ${PROJECT_BINARY_DIR}/src/ADAPTGUI + ${PROJECT_BINARY_DIR}/src/ADAPT ${MEDCOUPLING_INCLUDE_DIRS} ) @@ -154,7 +156,7 @@ SET(_moc_HEADERS SMESHGUI_PreVisualObj.h SMESHGUI_AdaptDlg.h SMESHGUI_MG_ADAPTDRIVER.h - MG_ADAPTGUI.hxx # to replace in ../ADAPTGUI/ + #~MG_ADAPTGUI.hxx # to replace in ../ADAPTGUI/ ) # header files / no moc processing @@ -177,7 +179,7 @@ SET(_other_HEADERS SMESHGUI_FileValidator.h SMESHGUI_SelectionProxy.h SMESH_SMESHGUI.hxx - MG_ADAPT.hxx # to replace in ../ADAPT/ + #~MG_ADAPT.hxx # to replace in ../ADAPT/ ) # header files / to install @@ -273,8 +275,8 @@ SET(_other_SOURCES SMESHGUI_IdPreview.cxx SMESHGUI_AdaptDlg.cxx SMESHGUI_MG_ADAPTDRIVER.cxx - MG_ADAPTGUI.cxx # to replace in ../ADAPTGUI/ - MG_ADAPT.cxx # to replace in ../ADAPT/ + #~MG_ADAPTGUI.cxx # to replace in ../ADAPTGUI/ + #MG_ADAPT.cxx ) # sources / to compile -- 2.39.2