From 66678b87712eab12502457d3ae4b0aec6e1e903d Mon Sep 17 00:00:00 2001 From: Florian OMNES Date: Tue, 19 Sep 2023 21:03:57 +0200 Subject: [PATCH] Move stuff around, fix headers --- src/antares-deps | 2 +- src/libs/antares/study/CMakeLists.txt | 5 -- src/tests/resources/Antares_Simulator_Tests | 2 +- src/ui/CMakeLists.txt | 1 + .../study => ui}/action/CMakeLists.txt | 49 ++++++++++--------- .../antares/study => ui}/action/action.cpp | 4 +- .../antares/study => ui}/action/behavior.cpp | 2 +- .../antares/study => ui}/action/context.cpp | 2 +- .../area/allocation-hydro-post.cpp | 0 .../area/allocation-hydro-post.h | 2 +- .../area/allocation-hydro-post.hxx | 0 .../antares-study/area/allocation-hydro.cpp | 0 .../antares-study/area/allocation-hydro.h | 2 +- .../handler/antares-study/area/color.cpp | 0 .../action/handler/antares-study/area/color.h | 2 +- .../antares-study/area/correlation-post.cpp | 0 .../antares-study/area/correlation-post.h | 2 +- .../antares-study/area/correlation-post.hxx | 0 .../antares-study/area/correlation.cpp | 0 .../handler/antares-study/area/correlation.h | 2 +- .../handler/antares-study/area/create.cpp | 2 +- .../handler/antares-study/area/filtering.cpp | 0 .../handler/antares-study/area/filtering.h | 2 +- .../handler/antares-study/area/misc-gen.cpp | 0 .../handler/antares-study/area/misc-gen.h | 2 +- .../antares-study/area/nodal-optimization.cpp | 0 .../antares-study/area/nodal-optimization.h | 2 +- .../handler/antares-study/area/position.cpp | 0 .../handler/antares-study/area/position.h | 2 +- .../handler/antares-study/area/reserves.cpp | 0 .../handler/antares-study/area/reserves.h | 2 +- .../handler/antares-study/area/timeseries.cpp | 0 .../handler/antares-study/area/timeseries.h | 4 +- .../antares-study/area/ts-generator.cpp | 2 +- .../handler/antares-study/area/ts-generator.h | 4 +- .../handler/antares-study/area/ts-node.cpp | 2 +- .../handler/antares-study/area/ts-node.h | 4 +- .../handler/antares-study/area/ts-node.hxx | 0 .../antares-study/constraint/comments.cpp | 0 .../antares-study/constraint/comments.h | 2 +- .../antares-study/constraint/comments.hxx | 0 .../antares-study/constraint/create.cpp | 2 +- .../handler/antares-study/constraint/data.cpp | 0 .../handler/antares-study/constraint/data.h | 2 +- .../handler/antares-study/constraint/data.hxx | 0 .../antares-study/constraint/enabled.cpp | 0 .../antares-study/constraint/enabled.h | 2 +- .../antares-study/constraint/enabled.hxx | 0 .../antares-study/constraint/offsets.cpp | 0 .../antares-study/constraint/offsets.h | 2 +- .../antares-study/constraint/weights.cpp | 0 .../antares-study/constraint/weights.h | 2 +- .../handler/antares-study/link/comments.cpp | 0 .../handler/antares-study/link/comments.h | 2 +- .../handler/antares-study/link/comments.hxx | 0 .../antares-study/link/copper-plate.cpp | 0 .../handler/antares-study/link/copper-plate.h | 2 +- .../handler/antares-study/link/create.cpp | 2 +- .../handler/antares-study/link/filtering.cpp | 0 .../handler/antares-study/link/filtering.h | 2 +- .../antares-study/link/hurdles-cost.cpp | 2 +- .../handler/antares-study/link/hurdles-cost.h | 2 +- .../handler/antares-study/link/impedances.cpp | 2 +- .../handler/antares-study/link/impedances.h | 2 +- .../action/handler/antares-study/link/ntc.cpp | 2 +- .../action/handler/antares-study/link/ntc.h | 2 +- .../antares-study/link/unload-data.cpp | 0 .../handler/antares-study/link/unload-data.h | 2 +- .../antares-study/link/unload-data.hxx | 0 .../antares-study/thermal-cluster/common.cpp | 0 .../antares-study/thermal-cluster/common.h | 2 +- .../antares-study/thermal-cluster/create.cpp | 0 .../antares-study/thermal-cluster/create.h | 2 +- .../antares-study/thermal-cluster/create.hxx | 0 .../thermal-cluster/root-node.cpp | 0 .../antares-study/thermal-cluster/root-node.h | 2 +- .../thermal-cluster/root-node.hxx | 0 .../action/include}/action/action.h | 2 +- .../action/include}/action/action.hxx | 0 .../action/include}/action/behavior.h | 0 .../action/include}/action/context.h | 4 +- .../study => ui/action/include}/action/fwd.h | 6 +-- .../handler/antares-study/area/create.h | 2 +- .../handler/antares-study/area/create.hxx | 0 .../handler/antares-study/constraint/create.h | 2 +- .../antares-study/constraint/create.hxx | 0 .../handler/antares-study/link/create.h | 2 +- .../handler/antares-study/link/create.hxx | 0 .../action/settings/decal-area-position.h | 0 .../action/settings/decal-area-position.hxx | 0 .../action/settings/suffix-for-area-names.h | 0 .../action/settings/suffix-for-area-names.hxx | 0 .../settings/suffix-for-cluster-names.h | 0 .../settings/suffix-for-cluster-names.hxx | 0 .../settings/suffix-for-constraint-names.h | 0 .../settings/suffix-for-constraint-names.hxx | 0 .../action/include}/action/state.h | 0 .../study => ui/action/include}/action/text.h | 0 .../action/include}/action/text.hxx | 0 .../action/settings/decal-area-position.cpp | 2 +- .../action/settings/suffix-for-area-names.cpp | 2 +- .../settings/suffix-for-cluster-names.cpp | 2 +- .../settings/suffix-for-constraint-names.cpp | 2 +- .../antares/study => ui}/action/state.cpp | 2 +- src/ui/simulator/cmake/copy-paste.cmake | 7 ++- .../toolbox/ext-source/action-panel.h | 2 +- src/ui/simulator/toolbox/ext-source/apply.h | 4 +- .../handler/com.rte-france.antares.study.cpp | 18 +++---- .../simulator/toolbox/ext-source/performer.h | 2 +- src/ui/simulator/toolbox/ext-source/window.h | 2 +- 110 files changed, 104 insertions(+), 104 deletions(-) rename src/{libs/antares/study => ui}/action/CMakeLists.txt (81%) rename src/{libs/antares/study => ui}/action/action.cpp (98%) rename src/{libs/antares/study => ui}/action/behavior.cpp (97%) rename src/{libs/antares/study => ui}/action/context.cpp (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/allocation-hydro-post.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/allocation-hydro-post.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/allocation-hydro-post.hxx (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/allocation-hydro.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/allocation-hydro.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/color.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/color.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/correlation-post.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/correlation-post.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/correlation-post.hxx (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/correlation.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/correlation.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/create.cpp (99%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/filtering.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/filtering.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/misc-gen.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/misc-gen.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/nodal-optimization.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/nodal-optimization.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/position.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/position.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/reserves.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/reserves.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/timeseries.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/timeseries.h (97%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/ts-generator.cpp (99%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/ts-generator.h (97%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/ts-node.cpp (99%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/ts-node.h (97%) rename src/{libs/antares/study => ui}/action/handler/antares-study/area/ts-node.hxx (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/constraint/comments.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/constraint/comments.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/constraint/comments.hxx (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/constraint/create.cpp (99%) rename src/{libs/antares/study => ui}/action/handler/antares-study/constraint/data.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/constraint/data.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/constraint/data.hxx (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/constraint/enabled.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/constraint/enabled.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/constraint/enabled.hxx (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/constraint/offsets.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/constraint/offsets.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/constraint/weights.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/constraint/weights.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/comments.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/comments.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/comments.hxx (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/copper-plate.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/copper-plate.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/create.cpp (99%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/filtering.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/filtering.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/hurdles-cost.cpp (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/hurdles-cost.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/impedances.cpp (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/impedances.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/ntc.cpp (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/ntc.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/unload-data.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/unload-data.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/link/unload-data.hxx (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/thermal-cluster/common.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/thermal-cluster/common.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/thermal-cluster/create.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/thermal-cluster/create.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/thermal-cluster/create.hxx (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/thermal-cluster/root-node.cpp (100%) rename src/{libs/antares/study => ui}/action/handler/antares-study/thermal-cluster/root-node.h (98%) rename src/{libs/antares/study => ui}/action/handler/antares-study/thermal-cluster/root-node.hxx (100%) rename src/{libs/antares/study => ui/action/include}/action/action.h (99%) rename src/{libs/antares/study => ui/action/include}/action/action.hxx (100%) rename src/{libs/antares/study => ui/action/include}/action/behavior.h (100%) rename src/{libs/antares/study => ui/action/include}/action/context.h (97%) rename src/{libs/antares/study => ui/action/include}/action/fwd.h (95%) rename src/{libs/antares/study => ui/action/include}/action/handler/antares-study/area/create.h (98%) rename src/{libs/antares/study => ui/action/include}/action/handler/antares-study/area/create.hxx (100%) rename src/{libs/antares/study => ui/action/include}/action/handler/antares-study/constraint/create.h (99%) rename src/{libs/antares/study => ui/action/include}/action/handler/antares-study/constraint/create.hxx (100%) rename src/{libs/antares/study => ui/action/include}/action/handler/antares-study/link/create.h (98%) rename src/{libs/antares/study => ui/action/include}/action/handler/antares-study/link/create.hxx (100%) rename src/{libs/antares/study => ui/action/include}/action/settings/decal-area-position.h (100%) rename src/{libs/antares/study => ui/action/include}/action/settings/decal-area-position.hxx (100%) rename src/{libs/antares/study => ui/action/include}/action/settings/suffix-for-area-names.h (100%) rename src/{libs/antares/study => ui/action/include}/action/settings/suffix-for-area-names.hxx (100%) rename src/{libs/antares/study => ui/action/include}/action/settings/suffix-for-cluster-names.h (100%) rename src/{libs/antares/study => ui/action/include}/action/settings/suffix-for-cluster-names.hxx (100%) rename src/{libs/antares/study => ui/action/include}/action/settings/suffix-for-constraint-names.h (100%) rename src/{libs/antares/study => ui/action/include}/action/settings/suffix-for-constraint-names.hxx (100%) rename src/{libs/antares/study => ui/action/include}/action/state.h (100%) rename src/{libs/antares/study => ui/action/include}/action/text.h (100%) rename src/{libs/antares/study => ui/action/include}/action/text.hxx (100%) rename src/{libs/antares/study => ui}/action/settings/decal-area-position.cpp (98%) rename src/{libs/antares/study => ui}/action/settings/suffix-for-area-names.cpp (97%) rename src/{libs/antares/study => ui}/action/settings/suffix-for-cluster-names.cpp (97%) rename src/{libs/antares/study => ui}/action/settings/suffix-for-constraint-names.cpp (97%) rename src/{libs/antares/study => ui}/action/state.cpp (98%) diff --git a/src/antares-deps b/src/antares-deps index 2788a3a409..0d6bebfb90 160000 --- a/src/antares-deps +++ b/src/antares-deps @@ -1 +1 @@ -Subproject commit 2788a3a409f3d2b6a04ab90819f3c61bd6a2b282 +Subproject commit 0d6bebfb901e47ec6ac1c73cb61a522803c81b98 diff --git a/src/libs/antares/study/CMakeLists.txt b/src/libs/antares/study/CMakeLists.txt index e773901dc6..700b6aff2e 100644 --- a/src/libs/antares/study/CMakeLists.txt +++ b/src/libs/antares/study/CMakeLists.txt @@ -323,8 +323,3 @@ target_include_directories(study ${CMAKE_CURRENT_SOURCE_DIR}/../.. #Dirty trick to allow inclusion via # Make more than just study visible but it's the lesser evil for now ) - -# TODO when removing the UI, also remove this directory & target -if(BUILD_UI) - add_subdirectory(action) -endif() diff --git a/src/tests/resources/Antares_Simulator_Tests b/src/tests/resources/Antares_Simulator_Tests index 5c90bbd5c6..2d79167609 160000 --- a/src/tests/resources/Antares_Simulator_Tests +++ b/src/tests/resources/Antares_Simulator_Tests @@ -1 +1 @@ -Subproject commit 5c90bbd5c6479749f0c5a83473b8a1bd7f3736a5 +Subproject commit 2d79167609fc15497085aaa7311698adb63222a2 diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 9c87f77e2c..0c8f846f96 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -23,4 +23,5 @@ endif() add_subdirectory(common) #All UI libraries add_subdirectory(simulator) #Simulator application +add_subdirectory(action) #Async action handler diff --git a/src/libs/antares/study/action/CMakeLists.txt b/src/ui/action/CMakeLists.txt similarity index 81% rename from src/libs/antares/study/action/CMakeLists.txt rename to src/ui/action/CMakeLists.txt index 40c7bfc4f5..d69627811e 100644 --- a/src/libs/antares/study/action/CMakeLists.txt +++ b/src/ui/action/CMakeLists.txt @@ -1,6 +1,6 @@ set(SRC_STUDY_ACTIONS_HANDLER_ANTARES_STUDY_AREA - handler/antares-study/area/create.h - handler/antares-study/area/create.hxx + include/action/handler/antares-study/area/create.h + include/action/handler/antares-study/area/create.hxx handler/antares-study/area/create.cpp handler/antares-study/area/position.h handler/antares-study/area/position.cpp @@ -35,8 +35,8 @@ set(SRC_STUDY_ACTIONS_HANDLER_ANTARES_STUDY_AREA source_group("study\\actions\\handler\\antares study\\area" FILES ${SRC_STUDY_ACTIONS_HANDLER_ANTARES_STUDY_AREA}) set(SRC_STUDY_ACTIONS_HANDLER_ANTARES_STUDY_LINK - handler/antares-study/link/create.h - handler/antares-study/link/create.hxx + include/action/handler/antares-study/link/create.h + include/action/handler/antares-study/link/create.hxx handler/antares-study/link/create.cpp handler/antares-study/link/ntc.h handler/antares-study/link/ntc.cpp @@ -70,8 +70,8 @@ source_group("study\\action\\handler\\sntares study\\thermal cluster" FILES ${SR set(SRC_STUDY_ACTIONS_HANDLER_ANTARES_STUDY_CONSTRAINT - handler/antares-study/constraint/create.h - handler/antares-study/constraint/create.hxx + include/action/handler/antares-study/constraint/create.h + include/action/handler/antares-study/constraint/create.hxx handler/antares-study/constraint/create.cpp handler/antares-study/constraint/comments.h handler/antares-study/constraint/comments.hxx @@ -90,29 +90,29 @@ set(SRC_STUDY_ACTIONS_HANDLER_ANTARES_STUDY_CONSTRAINT source_group("study\\action\\handler\\antares study\\constraint" FILES ${SRC_STUDY_ACTIONS_HANDLER_ANTARES_STUDY_CONSTRAINT}) set(SRC_STUDY_ACTIONS - fwd.h - action.h - action.hxx + include/action/fwd.h + include/action/action.h + include/action/action.hxx action.cpp - text.h - text.hxx - settings/suffix-for-area-names.h - settings/suffix-for-area-names.hxx + include/action/text.h + include/action/text.hxx + include/action/settings/suffix-for-area-names.h + include/action/settings/suffix-for-area-names.hxx settings/suffix-for-area-names.cpp - settings/suffix-for-cluster-names.h - settings/suffix-for-cluster-names.hxx + include/action/settings/suffix-for-cluster-names.h + include/action/settings/suffix-for-cluster-names.hxx settings/suffix-for-cluster-names.cpp - settings/suffix-for-constraint-names.h - settings/suffix-for-constraint-names.hxx + include/action/settings/suffix-for-constraint-names.h + include/action/settings/suffix-for-constraint-names.hxx settings/suffix-for-constraint-names.cpp - settings/decal-area-position.h - settings/decal-area-position.hxx + include/action/settings/decal-area-position.h + include/action/settings/decal-area-position.hxx settings/decal-area-position.cpp - behavior.h + include/action/behavior.h behavior.cpp - state.h + include/action/state.h state.cpp - context.h + include/action/context.h context.cpp) source_group("study\\actions" FILES ${SRC_STUDY_ACTIONS}) @@ -136,4 +136,9 @@ target_link_libraries(antares-action Antares::study ) +target_include_directories(antares-action + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/include +) + add_library(Antares::action ALIAS antares-action) diff --git a/src/libs/antares/study/action/action.cpp b/src/ui/action/action.cpp similarity index 98% rename from src/libs/antares/study/action/action.cpp rename to src/ui/action/action.cpp index b84c7b0389..60b0915589 100644 --- a/src/libs/antares/study/action/action.cpp +++ b/src/ui/action/action.cpp @@ -25,8 +25,8 @@ ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions */ -#include "action.h" -#include "../../antares.h" +#include +#include using namespace Yuni; diff --git a/src/libs/antares/study/action/behavior.cpp b/src/ui/action/behavior.cpp similarity index 97% rename from src/libs/antares/study/action/behavior.cpp rename to src/ui/action/behavior.cpp index 00e026ab06..3caefb7c0e 100644 --- a/src/libs/antares/study/action/behavior.cpp +++ b/src/ui/action/behavior.cpp @@ -26,7 +26,7 @@ */ #include -#include "behavior.h" +#include #include namespace Antares diff --git a/src/libs/antares/study/action/context.cpp b/src/ui/action/context.cpp similarity index 98% rename from src/libs/antares/study/action/context.cpp rename to src/ui/action/context.cpp index 051ceddcf4..7e26fb20ed 100644 --- a/src/libs/antares/study/action/context.cpp +++ b/src/ui/action/context.cpp @@ -25,7 +25,7 @@ ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions */ -#include "context.h" +#include using namespace Yuni; diff --git a/src/libs/antares/study/action/handler/antares-study/area/allocation-hydro-post.cpp b/src/ui/action/handler/antares-study/area/allocation-hydro-post.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/area/allocation-hydro-post.cpp rename to src/ui/action/handler/antares-study/area/allocation-hydro-post.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/area/allocation-hydro-post.h b/src/ui/action/handler/antares-study/area/allocation-hydro-post.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/area/allocation-hydro-post.h rename to src/ui/action/handler/antares-study/area/allocation-hydro-post.h index dce41f8355..1305383c3a 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/allocation-hydro-post.h +++ b/src/ui/action/handler/antares-study/area/allocation-hydro-post.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_ALLOCATION_HYDRO_POST_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/area/allocation-hydro-post.hxx b/src/ui/action/handler/antares-study/area/allocation-hydro-post.hxx similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/area/allocation-hydro-post.hxx rename to src/ui/action/handler/antares-study/area/allocation-hydro-post.hxx diff --git a/src/libs/antares/study/action/handler/antares-study/area/allocation-hydro.cpp b/src/ui/action/handler/antares-study/area/allocation-hydro.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/area/allocation-hydro.cpp rename to src/ui/action/handler/antares-study/area/allocation-hydro.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/area/allocation-hydro.h b/src/ui/action/handler/antares-study/area/allocation-hydro.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/area/allocation-hydro.h rename to src/ui/action/handler/antares-study/area/allocation-hydro.h index 981e798d7b..ff49f00e22 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/allocation-hydro.h +++ b/src/ui/action/handler/antares-study/area/allocation-hydro.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_ALLOCATION_HYDRO_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/area/color.cpp b/src/ui/action/handler/antares-study/area/color.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/area/color.cpp rename to src/ui/action/handler/antares-study/area/color.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/area/color.h b/src/ui/action/handler/antares-study/area/color.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/area/color.h rename to src/ui/action/handler/antares-study/area/color.h index b1d23af7b1..3b59eb21ba 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/color.h +++ b/src/ui/action/handler/antares-study/area/color.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_COLOR_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/area/correlation-post.cpp b/src/ui/action/handler/antares-study/area/correlation-post.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/area/correlation-post.cpp rename to src/ui/action/handler/antares-study/area/correlation-post.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/area/correlation-post.h b/src/ui/action/handler/antares-study/area/correlation-post.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/area/correlation-post.h rename to src/ui/action/handler/antares-study/area/correlation-post.h index f192bba67a..f08965031d 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/correlation-post.h +++ b/src/ui/action/handler/antares-study/area/correlation-post.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_CORRELATION_POST_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/area/correlation-post.hxx b/src/ui/action/handler/antares-study/area/correlation-post.hxx similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/area/correlation-post.hxx rename to src/ui/action/handler/antares-study/area/correlation-post.hxx diff --git a/src/libs/antares/study/action/handler/antares-study/area/correlation.cpp b/src/ui/action/handler/antares-study/area/correlation.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/area/correlation.cpp rename to src/ui/action/handler/antares-study/area/correlation.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/area/correlation.h b/src/ui/action/handler/antares-study/area/correlation.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/area/correlation.h rename to src/ui/action/handler/antares-study/area/correlation.h index ce95d34acc..2ee15083fe 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/correlation.h +++ b/src/ui/action/handler/antares-study/area/correlation.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_CORRELATION_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/area/create.cpp b/src/ui/action/handler/antares-study/area/create.cpp similarity index 99% rename from src/libs/antares/study/action/handler/antares-study/area/create.cpp rename to src/ui/action/handler/antares-study/area/create.cpp index a0502d7b94..0348c2d253 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/create.cpp +++ b/src/ui/action/handler/antares-study/area/create.cpp @@ -25,7 +25,7 @@ ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions */ -#include "create.h" +#include #include #include "nodal-optimization.h" #include "reserves.h" diff --git a/src/libs/antares/study/action/handler/antares-study/area/filtering.cpp b/src/ui/action/handler/antares-study/area/filtering.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/area/filtering.cpp rename to src/ui/action/handler/antares-study/area/filtering.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/area/filtering.h b/src/ui/action/handler/antares-study/area/filtering.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/area/filtering.h rename to src/ui/action/handler/antares-study/area/filtering.h index cf717ea4bb..840977fe0c 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/filtering.h +++ b/src/ui/action/handler/antares-study/area/filtering.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_FILTERING_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/area/misc-gen.cpp b/src/ui/action/handler/antares-study/area/misc-gen.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/area/misc-gen.cpp rename to src/ui/action/handler/antares-study/area/misc-gen.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/area/misc-gen.h b/src/ui/action/handler/antares-study/area/misc-gen.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/area/misc-gen.h rename to src/ui/action/handler/antares-study/area/misc-gen.h index 486ccdfd6c..da10675ed8 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/misc-gen.h +++ b/src/ui/action/handler/antares-study/area/misc-gen.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_MISC_GEN_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/area/nodal-optimization.cpp b/src/ui/action/handler/antares-study/area/nodal-optimization.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/area/nodal-optimization.cpp rename to src/ui/action/handler/antares-study/area/nodal-optimization.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/area/nodal-optimization.h b/src/ui/action/handler/antares-study/area/nodal-optimization.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/area/nodal-optimization.h rename to src/ui/action/handler/antares-study/area/nodal-optimization.h index fda3f281ab..94e363db18 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/nodal-optimization.h +++ b/src/ui/action/handler/antares-study/area/nodal-optimization.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_NODAL_OPTIMIZATION_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/area/position.cpp b/src/ui/action/handler/antares-study/area/position.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/area/position.cpp rename to src/ui/action/handler/antares-study/area/position.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/area/position.h b/src/ui/action/handler/antares-study/area/position.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/area/position.h rename to src/ui/action/handler/antares-study/area/position.h index a8643a7041..8767dfdb0b 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/position.h +++ b/src/ui/action/handler/antares-study/area/position.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_POSITION_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/area/reserves.cpp b/src/ui/action/handler/antares-study/area/reserves.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/area/reserves.cpp rename to src/ui/action/handler/antares-study/area/reserves.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/area/reserves.h b/src/ui/action/handler/antares-study/area/reserves.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/area/reserves.h rename to src/ui/action/handler/antares-study/area/reserves.h index 45c612a9de..da891cee89 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/reserves.h +++ b/src/ui/action/handler/antares-study/area/reserves.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_RESERVES_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/area/timeseries.cpp b/src/ui/action/handler/antares-study/area/timeseries.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/area/timeseries.cpp rename to src/ui/action/handler/antares-study/area/timeseries.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/area/timeseries.h b/src/ui/action/handler/antares-study/area/timeseries.h similarity index 97% rename from src/libs/antares/study/action/handler/antares-study/area/timeseries.h rename to src/ui/action/handler/antares-study/area/timeseries.h index 67bfb4342b..e086bfc9df 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/timeseries.h +++ b/src/ui/action/handler/antares-study/area/timeseries.h @@ -28,8 +28,8 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_TIMESERIES_H__ #include -#include "../../../action.h" -#include "../../../../fwd.h" +#include +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/area/ts-generator.cpp b/src/ui/action/handler/antares-study/area/ts-generator.cpp similarity index 99% rename from src/libs/antares/study/action/handler/antares-study/area/ts-generator.cpp rename to src/ui/action/handler/antares-study/area/ts-generator.cpp index c6faee52d0..8adf150624 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/ts-generator.cpp +++ b/src/ui/action/handler/antares-study/area/ts-generator.cpp @@ -26,7 +26,7 @@ */ #include "ts-generator.h" -#include "antares/study/parts/load/prepro.h" +#include using namespace Yuni; diff --git a/src/libs/antares/study/action/handler/antares-study/area/ts-generator.h b/src/ui/action/handler/antares-study/area/ts-generator.h similarity index 97% rename from src/libs/antares/study/action/handler/antares-study/area/ts-generator.h rename to src/ui/action/handler/antares-study/area/ts-generator.h index 418b4fbd7a..371a29f463 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/ts-generator.h +++ b/src/ui/action/handler/antares-study/area/ts-generator.h @@ -28,8 +28,8 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_TS_GENERATOR_H__ #include -#include "../../../action.h" -#include "../../../../fwd.h" +#include +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/area/ts-node.cpp b/src/ui/action/handler/antares-study/area/ts-node.cpp similarity index 99% rename from src/libs/antares/study/action/handler/antares-study/area/ts-node.cpp rename to src/ui/action/handler/antares-study/area/ts-node.cpp index a759b7013f..4479a95e0c 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/ts-node.cpp +++ b/src/ui/action/handler/antares-study/area/ts-node.cpp @@ -26,7 +26,7 @@ */ #include "ts-node.h" -#include "../../../../fwd.h" +#include using namespace Yuni; diff --git a/src/libs/antares/study/action/handler/antares-study/area/ts-node.h b/src/ui/action/handler/antares-study/area/ts-node.h similarity index 97% rename from src/libs/antares/study/action/handler/antares-study/area/ts-node.h rename to src/ui/action/handler/antares-study/area/ts-node.h index d841340bf1..3e407aed56 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/ts-node.h +++ b/src/ui/action/handler/antares-study/area/ts-node.h @@ -28,8 +28,8 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_TS_NODE_H__ #include -#include "../../../action.h" -#include "../../../../fwd.h" +#include +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/area/ts-node.hxx b/src/ui/action/handler/antares-study/area/ts-node.hxx similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/area/ts-node.hxx rename to src/ui/action/handler/antares-study/area/ts-node.hxx diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/comments.cpp b/src/ui/action/handler/antares-study/constraint/comments.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/constraint/comments.cpp rename to src/ui/action/handler/antares-study/constraint/comments.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/comments.h b/src/ui/action/handler/antares-study/constraint/comments.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/constraint/comments.h rename to src/ui/action/handler/antares-study/constraint/comments.h index 7b36f3aebd..bad0e94f45 100644 --- a/src/libs/antares/study/action/handler/antares-study/constraint/comments.h +++ b/src/ui/action/handler/antares-study/constraint/comments.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_CONSTRAINT_COMMENTS_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/comments.hxx b/src/ui/action/handler/antares-study/constraint/comments.hxx similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/constraint/comments.hxx rename to src/ui/action/handler/antares-study/constraint/comments.hxx diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/create.cpp b/src/ui/action/handler/antares-study/constraint/create.cpp similarity index 99% rename from src/libs/antares/study/action/handler/antares-study/constraint/create.cpp rename to src/ui/action/handler/antares-study/constraint/create.cpp index 780e12e153..288551dcba 100644 --- a/src/libs/antares/study/action/handler/antares-study/constraint/create.cpp +++ b/src/ui/action/handler/antares-study/constraint/create.cpp @@ -25,7 +25,7 @@ ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions */ -#include "create.h" +#include #include #include #include "antares/study/fwd.h" diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/data.cpp b/src/ui/action/handler/antares-study/constraint/data.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/constraint/data.cpp rename to src/ui/action/handler/antares-study/constraint/data.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/data.h b/src/ui/action/handler/antares-study/constraint/data.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/constraint/data.h rename to src/ui/action/handler/antares-study/constraint/data.h index 727acb253b..3490b67803 100644 --- a/src/libs/antares/study/action/handler/antares-study/constraint/data.h +++ b/src/ui/action/handler/antares-study/constraint/data.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_CONSTRAINT_DATA_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/data.hxx b/src/ui/action/handler/antares-study/constraint/data.hxx similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/constraint/data.hxx rename to src/ui/action/handler/antares-study/constraint/data.hxx diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/enabled.cpp b/src/ui/action/handler/antares-study/constraint/enabled.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/constraint/enabled.cpp rename to src/ui/action/handler/antares-study/constraint/enabled.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/enabled.h b/src/ui/action/handler/antares-study/constraint/enabled.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/constraint/enabled.h rename to src/ui/action/handler/antares-study/constraint/enabled.h index d7dc9de5cb..025616a16c 100644 --- a/src/libs/antares/study/action/handler/antares-study/constraint/enabled.h +++ b/src/ui/action/handler/antares-study/constraint/enabled.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_CONSTRAINT_ENABLED_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/enabled.hxx b/src/ui/action/handler/antares-study/constraint/enabled.hxx similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/constraint/enabled.hxx rename to src/ui/action/handler/antares-study/constraint/enabled.hxx diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/offsets.cpp b/src/ui/action/handler/antares-study/constraint/offsets.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/constraint/offsets.cpp rename to src/ui/action/handler/antares-study/constraint/offsets.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/offsets.h b/src/ui/action/handler/antares-study/constraint/offsets.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/constraint/offsets.h rename to src/ui/action/handler/antares-study/constraint/offsets.h index f8addf6012..3dfe671579 100644 --- a/src/libs/antares/study/action/handler/antares-study/constraint/offsets.h +++ b/src/ui/action/handler/antares-study/constraint/offsets.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_CONSTRAINT_OFFSETS_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/weights.cpp b/src/ui/action/handler/antares-study/constraint/weights.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/constraint/weights.cpp rename to src/ui/action/handler/antares-study/constraint/weights.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/weights.h b/src/ui/action/handler/antares-study/constraint/weights.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/constraint/weights.h rename to src/ui/action/handler/antares-study/constraint/weights.h index 99f10def14..50630a0257 100644 --- a/src/libs/antares/study/action/handler/antares-study/constraint/weights.h +++ b/src/ui/action/handler/antares-study/constraint/weights.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_CONSTRAINT_WEIGHTS_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/link/comments.cpp b/src/ui/action/handler/antares-study/link/comments.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/link/comments.cpp rename to src/ui/action/handler/antares-study/link/comments.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/link/comments.h b/src/ui/action/handler/antares-study/link/comments.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/link/comments.h rename to src/ui/action/handler/antares-study/link/comments.h index 3a9f81e217..d6377f4bc3 100644 --- a/src/libs/antares/study/action/handler/antares-study/link/comments.h +++ b/src/ui/action/handler/antares-study/link/comments.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_LINK_COMMENTS_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/link/comments.hxx b/src/ui/action/handler/antares-study/link/comments.hxx similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/link/comments.hxx rename to src/ui/action/handler/antares-study/link/comments.hxx diff --git a/src/libs/antares/study/action/handler/antares-study/link/copper-plate.cpp b/src/ui/action/handler/antares-study/link/copper-plate.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/link/copper-plate.cpp rename to src/ui/action/handler/antares-study/link/copper-plate.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/link/copper-plate.h b/src/ui/action/handler/antares-study/link/copper-plate.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/link/copper-plate.h rename to src/ui/action/handler/antares-study/link/copper-plate.h index e8f506ab40..8a193333c9 100644 --- a/src/libs/antares/study/action/handler/antares-study/link/copper-plate.h +++ b/src/ui/action/handler/antares-study/link/copper-plate.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_COPPERPLATE_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/link/create.cpp b/src/ui/action/handler/antares-study/link/create.cpp similarity index 99% rename from src/libs/antares/study/action/handler/antares-study/link/create.cpp rename to src/ui/action/handler/antares-study/link/create.cpp index 45f995a8db..c1148a2589 100644 --- a/src/libs/antares/study/action/handler/antares-study/link/create.cpp +++ b/src/ui/action/handler/antares-study/link/create.cpp @@ -25,7 +25,7 @@ ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions */ -#include "create.h" +#include #include #include "ntc.h" #include "hurdles-cost.h" diff --git a/src/libs/antares/study/action/handler/antares-study/link/filtering.cpp b/src/ui/action/handler/antares-study/link/filtering.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/link/filtering.cpp rename to src/ui/action/handler/antares-study/link/filtering.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/link/filtering.h b/src/ui/action/handler/antares-study/link/filtering.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/link/filtering.h rename to src/ui/action/handler/antares-study/link/filtering.h index 20dfdcf4aa..20403e1638 100644 --- a/src/libs/antares/study/action/handler/antares-study/link/filtering.h +++ b/src/ui/action/handler/antares-study/link/filtering.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_LINK_FILTERING_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/link/hurdles-cost.cpp b/src/ui/action/handler/antares-study/link/hurdles-cost.cpp similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/link/hurdles-cost.cpp rename to src/ui/action/handler/antares-study/link/hurdles-cost.cpp index 6bb2b1bb9d..d50be1d4d3 100644 --- a/src/libs/antares/study/action/handler/antares-study/link/hurdles-cost.cpp +++ b/src/ui/action/handler/antares-study/link/hurdles-cost.cpp @@ -26,7 +26,7 @@ */ #include "hurdles-cost.h" -#include "../../../../area/constants.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/link/hurdles-cost.h b/src/ui/action/handler/antares-study/link/hurdles-cost.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/link/hurdles-cost.h rename to src/ui/action/handler/antares-study/link/hurdles-cost.h index e3c00d84df..c436ad8f06 100644 --- a/src/libs/antares/study/action/handler/antares-study/link/hurdles-cost.h +++ b/src/ui/action/handler/antares-study/link/hurdles-cost.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREAHURDLES_COST_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/link/impedances.cpp b/src/ui/action/handler/antares-study/link/impedances.cpp similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/link/impedances.cpp rename to src/ui/action/handler/antares-study/link/impedances.cpp index 9b02a18d1d..757ccb2231 100644 --- a/src/libs/antares/study/action/handler/antares-study/link/impedances.cpp +++ b/src/ui/action/handler/antares-study/link/impedances.cpp @@ -26,7 +26,7 @@ */ #include "impedances.h" -#include "../../../../area/constants.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/link/impedances.h b/src/ui/action/handler/antares-study/link/impedances.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/link/impedances.h rename to src/ui/action/handler/antares-study/link/impedances.h index 38696c2ceb..47a1d22c3e 100644 --- a/src/libs/antares/study/action/handler/antares-study/link/impedances.h +++ b/src/ui/action/handler/antares-study/link/impedances.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_IMPEDANCES_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/link/ntc.cpp b/src/ui/action/handler/antares-study/link/ntc.cpp similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/link/ntc.cpp rename to src/ui/action/handler/antares-study/link/ntc.cpp index 66bd21a545..772f7eae6e 100644 --- a/src/libs/antares/study/action/handler/antares-study/link/ntc.cpp +++ b/src/ui/action/handler/antares-study/link/ntc.cpp @@ -26,7 +26,7 @@ */ #include "ntc.h" -#include "../../../../area/constants.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/link/ntc.h b/src/ui/action/handler/antares-study/link/ntc.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/link/ntc.h rename to src/ui/action/handler/antares-study/link/ntc.h index 3b43efa595..fe109e5cca 100644 --- a/src/libs/antares/study/action/handler/antares-study/link/ntc.h +++ b/src/ui/action/handler/antares-study/link/ntc.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_NTC_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/link/unload-data.cpp b/src/ui/action/handler/antares-study/link/unload-data.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/link/unload-data.cpp rename to src/ui/action/handler/antares-study/link/unload-data.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/link/unload-data.h b/src/ui/action/handler/antares-study/link/unload-data.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/link/unload-data.h rename to src/ui/action/handler/antares-study/link/unload-data.h index 2151f26b9d..a5ad39f864 100644 --- a/src/libs/antares/study/action/handler/antares-study/link/unload-data.h +++ b/src/ui/action/handler/antares-study/link/unload-data.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_UNLOAD_DATA_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/link/unload-data.hxx b/src/ui/action/handler/antares-study/link/unload-data.hxx similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/link/unload-data.hxx rename to src/ui/action/handler/antares-study/link/unload-data.hxx diff --git a/src/libs/antares/study/action/handler/antares-study/thermal-cluster/common.cpp b/src/ui/action/handler/antares-study/thermal-cluster/common.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/thermal-cluster/common.cpp rename to src/ui/action/handler/antares-study/thermal-cluster/common.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/thermal-cluster/common.h b/src/ui/action/handler/antares-study/thermal-cluster/common.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/thermal-cluster/common.h rename to src/ui/action/handler/antares-study/thermal-cluster/common.h index f340fab289..6fca3397d5 100644 --- a/src/libs/antares/study/action/handler/antares-study/thermal-cluster/common.h +++ b/src/ui/action/handler/antares-study/thermal-cluster/common.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_THERMAL_PLANT_COMMON_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/thermal-cluster/create.cpp b/src/ui/action/handler/antares-study/thermal-cluster/create.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/thermal-cluster/create.cpp rename to src/ui/action/handler/antares-study/thermal-cluster/create.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/thermal-cluster/create.h b/src/ui/action/handler/antares-study/thermal-cluster/create.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/thermal-cluster/create.h rename to src/ui/action/handler/antares-study/thermal-cluster/create.h index f2b7c9fb69..dab1991af7 100644 --- a/src/libs/antares/study/action/handler/antares-study/thermal-cluster/create.h +++ b/src/ui/action/handler/antares-study/thermal-cluster/create.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_THERMAL_PLANT_CREATE_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/thermal-cluster/create.hxx b/src/ui/action/handler/antares-study/thermal-cluster/create.hxx similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/thermal-cluster/create.hxx rename to src/ui/action/handler/antares-study/thermal-cluster/create.hxx diff --git a/src/libs/antares/study/action/handler/antares-study/thermal-cluster/root-node.cpp b/src/ui/action/handler/antares-study/thermal-cluster/root-node.cpp similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/thermal-cluster/root-node.cpp rename to src/ui/action/handler/antares-study/thermal-cluster/root-node.cpp diff --git a/src/libs/antares/study/action/handler/antares-study/thermal-cluster/root-node.h b/src/ui/action/handler/antares-study/thermal-cluster/root-node.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/thermal-cluster/root-node.h rename to src/ui/action/handler/antares-study/thermal-cluster/root-node.h index 3959a73fd1..d0f47f2489 100644 --- a/src/libs/antares/study/action/handler/antares-study/thermal-cluster/root-node.h +++ b/src/ui/action/handler/antares-study/thermal-cluster/root-node.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_PLANT_ROOT_NODE_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/thermal-cluster/root-node.hxx b/src/ui/action/handler/antares-study/thermal-cluster/root-node.hxx similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/thermal-cluster/root-node.hxx rename to src/ui/action/handler/antares-study/thermal-cluster/root-node.hxx diff --git a/src/libs/antares/study/action/action.h b/src/ui/action/include/action/action.h similarity index 99% rename from src/libs/antares/study/action/action.h rename to src/ui/action/include/action/action.h index 3c6111d55c..2bd12cadf2 100644 --- a/src/libs/antares/study/action/action.h +++ b/src/ui/action/include/action/action.h @@ -31,7 +31,7 @@ #include #include #include "fwd.h" -#include "../study.h" +#include #include namespace Antares diff --git a/src/libs/antares/study/action/action.hxx b/src/ui/action/include/action/action.hxx similarity index 100% rename from src/libs/antares/study/action/action.hxx rename to src/ui/action/include/action/action.hxx diff --git a/src/libs/antares/study/action/behavior.h b/src/ui/action/include/action/behavior.h similarity index 100% rename from src/libs/antares/study/action/behavior.h rename to src/ui/action/include/action/behavior.h diff --git a/src/libs/antares/study/action/context.h b/src/ui/action/include/action/context.h similarity index 97% rename from src/libs/antares/study/action/context.h rename to src/ui/action/include/action/context.h index a163ffffce..deec4fde08 100644 --- a/src/libs/antares/study/action/context.h +++ b/src/ui/action/include/action/context.h @@ -28,13 +28,13 @@ #define __ANTARES_LIBS_STUDY_ACTION_CONTEXT_H__ #include -#include "../study.h" +#include #include #include #include #include #include "action.h" -#include "antares/study/binding_constraint/BindingConstraintsRepository.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/fwd.h b/src/ui/action/include/action/fwd.h similarity index 95% rename from src/libs/antares/study/action/fwd.h rename to src/ui/action/include/action/fwd.h index 7bf4389ab0..b659b45cd8 100644 --- a/src/libs/antares/study/action/fwd.h +++ b/src/ui/action/include/action/fwd.h @@ -29,9 +29,9 @@ #include #include -#include "../study.h" -#include "behavior.h" -#include "state.h" +#include +#include +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/area/create.h b/src/ui/action/include/action/handler/antares-study/area/create.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/area/create.h rename to src/ui/action/include/action/handler/antares-study/area/create.h index 5e90018ece..5f85eda12a 100644 --- a/src/libs/antares/study/action/handler/antares-study/area/create.h +++ b/src/ui/action/include/action/handler/antares-study/area/create.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_CREATE_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/area/create.hxx b/src/ui/action/include/action/handler/antares-study/area/create.hxx similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/area/create.hxx rename to src/ui/action/include/action/handler/antares-study/area/create.hxx diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/create.h b/src/ui/action/include/action/handler/antares-study/constraint/create.h similarity index 99% rename from src/libs/antares/study/action/handler/antares-study/constraint/create.h rename to src/ui/action/include/action/handler/antares-study/constraint/create.h index 4f3bee75b7..789c900dcf 100644 --- a/src/libs/antares/study/action/handler/antares-study/constraint/create.h +++ b/src/ui/action/include/action/handler/antares-study/constraint/create.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_CONSTRAINT_CREATE_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/constraint/create.hxx b/src/ui/action/include/action/handler/antares-study/constraint/create.hxx similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/constraint/create.hxx rename to src/ui/action/include/action/handler/antares-study/constraint/create.hxx diff --git a/src/libs/antares/study/action/handler/antares-study/link/create.h b/src/ui/action/include/action/handler/antares-study/link/create.h similarity index 98% rename from src/libs/antares/study/action/handler/antares-study/link/create.h rename to src/ui/action/include/action/handler/antares-study/link/create.h index 02314ced40..721fea131e 100644 --- a/src/libs/antares/study/action/handler/antares-study/link/create.h +++ b/src/ui/action/include/action/handler/antares-study/link/create.h @@ -28,7 +28,7 @@ #define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_LINK_CREATE_H__ #include -#include "../../../action.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/handler/antares-study/link/create.hxx b/src/ui/action/include/action/handler/antares-study/link/create.hxx similarity index 100% rename from src/libs/antares/study/action/handler/antares-study/link/create.hxx rename to src/ui/action/include/action/handler/antares-study/link/create.hxx diff --git a/src/libs/antares/study/action/settings/decal-area-position.h b/src/ui/action/include/action/settings/decal-area-position.h similarity index 100% rename from src/libs/antares/study/action/settings/decal-area-position.h rename to src/ui/action/include/action/settings/decal-area-position.h diff --git a/src/libs/antares/study/action/settings/decal-area-position.hxx b/src/ui/action/include/action/settings/decal-area-position.hxx similarity index 100% rename from src/libs/antares/study/action/settings/decal-area-position.hxx rename to src/ui/action/include/action/settings/decal-area-position.hxx diff --git a/src/libs/antares/study/action/settings/suffix-for-area-names.h b/src/ui/action/include/action/settings/suffix-for-area-names.h similarity index 100% rename from src/libs/antares/study/action/settings/suffix-for-area-names.h rename to src/ui/action/include/action/settings/suffix-for-area-names.h diff --git a/src/libs/antares/study/action/settings/suffix-for-area-names.hxx b/src/ui/action/include/action/settings/suffix-for-area-names.hxx similarity index 100% rename from src/libs/antares/study/action/settings/suffix-for-area-names.hxx rename to src/ui/action/include/action/settings/suffix-for-area-names.hxx diff --git a/src/libs/antares/study/action/settings/suffix-for-cluster-names.h b/src/ui/action/include/action/settings/suffix-for-cluster-names.h similarity index 100% rename from src/libs/antares/study/action/settings/suffix-for-cluster-names.h rename to src/ui/action/include/action/settings/suffix-for-cluster-names.h diff --git a/src/libs/antares/study/action/settings/suffix-for-cluster-names.hxx b/src/ui/action/include/action/settings/suffix-for-cluster-names.hxx similarity index 100% rename from src/libs/antares/study/action/settings/suffix-for-cluster-names.hxx rename to src/ui/action/include/action/settings/suffix-for-cluster-names.hxx diff --git a/src/libs/antares/study/action/settings/suffix-for-constraint-names.h b/src/ui/action/include/action/settings/suffix-for-constraint-names.h similarity index 100% rename from src/libs/antares/study/action/settings/suffix-for-constraint-names.h rename to src/ui/action/include/action/settings/suffix-for-constraint-names.h diff --git a/src/libs/antares/study/action/settings/suffix-for-constraint-names.hxx b/src/ui/action/include/action/settings/suffix-for-constraint-names.hxx similarity index 100% rename from src/libs/antares/study/action/settings/suffix-for-constraint-names.hxx rename to src/ui/action/include/action/settings/suffix-for-constraint-names.hxx diff --git a/src/libs/antares/study/action/state.h b/src/ui/action/include/action/state.h similarity index 100% rename from src/libs/antares/study/action/state.h rename to src/ui/action/include/action/state.h diff --git a/src/libs/antares/study/action/text.h b/src/ui/action/include/action/text.h similarity index 100% rename from src/libs/antares/study/action/text.h rename to src/ui/action/include/action/text.h diff --git a/src/libs/antares/study/action/text.hxx b/src/ui/action/include/action/text.hxx similarity index 100% rename from src/libs/antares/study/action/text.hxx rename to src/ui/action/include/action/text.hxx diff --git a/src/libs/antares/study/action/settings/decal-area-position.cpp b/src/ui/action/settings/decal-area-position.cpp similarity index 98% rename from src/libs/antares/study/action/settings/decal-area-position.cpp rename to src/ui/action/settings/decal-area-position.cpp index 458a6694ac..da7ca27c24 100644 --- a/src/libs/antares/study/action/settings/decal-area-position.cpp +++ b/src/ui/action/settings/decal-area-position.cpp @@ -25,7 +25,7 @@ ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions */ -#include "decal-area-position.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/settings/suffix-for-area-names.cpp b/src/ui/action/settings/suffix-for-area-names.cpp similarity index 97% rename from src/libs/antares/study/action/settings/suffix-for-area-names.cpp rename to src/ui/action/settings/suffix-for-area-names.cpp index b21a1a62c1..602c6f7d1d 100644 --- a/src/libs/antares/study/action/settings/suffix-for-area-names.cpp +++ b/src/ui/action/settings/suffix-for-area-names.cpp @@ -25,7 +25,7 @@ ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions */ -#include "suffix-for-area-names.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/settings/suffix-for-cluster-names.cpp b/src/ui/action/settings/suffix-for-cluster-names.cpp similarity index 97% rename from src/libs/antares/study/action/settings/suffix-for-cluster-names.cpp rename to src/ui/action/settings/suffix-for-cluster-names.cpp index eb6edb5af8..8ef5a91ecb 100644 --- a/src/libs/antares/study/action/settings/suffix-for-cluster-names.cpp +++ b/src/ui/action/settings/suffix-for-cluster-names.cpp @@ -25,7 +25,7 @@ ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions */ -#include "suffix-for-cluster-names.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/settings/suffix-for-constraint-names.cpp b/src/ui/action/settings/suffix-for-constraint-names.cpp similarity index 97% rename from src/libs/antares/study/action/settings/suffix-for-constraint-names.cpp rename to src/ui/action/settings/suffix-for-constraint-names.cpp index e01b38cfd6..df62a1adc6 100644 --- a/src/libs/antares/study/action/settings/suffix-for-constraint-names.cpp +++ b/src/ui/action/settings/suffix-for-constraint-names.cpp @@ -25,7 +25,7 @@ ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions */ -#include "suffix-for-constraint-names.h" +#include namespace Antares { diff --git a/src/libs/antares/study/action/state.cpp b/src/ui/action/state.cpp similarity index 98% rename from src/libs/antares/study/action/state.cpp rename to src/ui/action/state.cpp index 623403cc1c..3f171c4785 100644 --- a/src/libs/antares/study/action/state.cpp +++ b/src/ui/action/state.cpp @@ -26,7 +26,7 @@ */ #include -#include "state.h" +#include #include namespace Antares diff --git a/src/ui/simulator/cmake/copy-paste.cmake b/src/ui/simulator/cmake/copy-paste.cmake index 63ebcb1b47..6cdc66e179 100644 --- a/src/ui/simulator/cmake/copy-paste.cmake +++ b/src/ui/simulator/cmake/copy-paste.cmake @@ -21,7 +21,6 @@ set(SRC_UI_COPYPASTE ) add_Library(antares-ui-copy-paste ${SRC_UI_COPYPASTE}) - -target_link_libraries(antares-ui-copy-paste PRIVATE ${wxWidgets_LIBRARIES}) -target_link_libraries(antares-ui-copy-paste PRIVATE antares-ui-common) - +target_link_libraries(antares-ui-copy-paste PRIVATE ${wxWidgets_LIBRARIES} + antares-ui-common + Antares::action) diff --git a/src/ui/simulator/toolbox/ext-source/action-panel.h b/src/ui/simulator/toolbox/ext-source/action-panel.h index 4d13b05212..232f055056 100644 --- a/src/ui/simulator/toolbox/ext-source/action-panel.h +++ b/src/ui/simulator/toolbox/ext-source/action-panel.h @@ -27,7 +27,7 @@ #ifndef __ANTARES_TOOLBOX_EXT_SOURCE_ACTION_PANEL_H__ #define __ANTARES_TOOLBOX_EXT_SOURCE_ACTION_PANEL_H__ -#include +#include #include #include #include diff --git a/src/ui/simulator/toolbox/ext-source/apply.h b/src/ui/simulator/toolbox/ext-source/apply.h index 17af0e55a8..e6b5fd364a 100644 --- a/src/ui/simulator/toolbox/ext-source/apply.h +++ b/src/ui/simulator/toolbox/ext-source/apply.h @@ -29,8 +29,8 @@ #include #include -#include -#include +#include +#include namespace Antares { diff --git a/src/ui/simulator/toolbox/ext-source/handler/com.rte-france.antares.study.cpp b/src/ui/simulator/toolbox/ext-source/handler/com.rte-france.antares.study.cpp index ffef22adf7..6b548e514f 100644 --- a/src/ui/simulator/toolbox/ext-source/handler/com.rte-france.antares.study.cpp +++ b/src/ui/simulator/toolbox/ext-source/handler/com.rte-france.antares.study.cpp @@ -27,15 +27,15 @@ #include "handler.h" #include "../apply.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include "build-context.h" #include "../../jobs.h" diff --git a/src/ui/simulator/toolbox/ext-source/performer.h b/src/ui/simulator/toolbox/ext-source/performer.h index 049abbe1c6..67b5063c4e 100644 --- a/src/ui/simulator/toolbox/ext-source/performer.h +++ b/src/ui/simulator/toolbox/ext-source/performer.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include "../components/progressbar.h" namespace Antares diff --git a/src/ui/simulator/toolbox/ext-source/window.h b/src/ui/simulator/toolbox/ext-source/window.h index f84cb07d65..66e5aa4c80 100644 --- a/src/ui/simulator/toolbox/ext-source/window.h +++ b/src/ui/simulator/toolbox/ext-source/window.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include namespace Antares {