remove ui (#972)

Co-authored-by: Thomas Bittar <[email protected]>

.github/workflows/build_oracle8.yml

@@ -136,7 +136,6 @@ jobs:
                  -DCMAKE_BUILD_TYPE=Release \
                  -DCMAKE_INSTALL_PREFIX=_install \
                  -DCMAKE_PREFIX_PATH="${GITHUB_WORKSPACE}/deps;${{env.ORTOOLS_DIR}}/install" \
-                 -DBUILD_UI=OFF \
                  -DALLOW_RUN_AS_ROOT=ON \
                  -DVCPKG_TARGET_TRIPLET=x64-linux-release \
                  -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake

.github/workflows/build_ubuntu.yml

@@ -63,7 +63,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements-tests.txt
-          pip install -r requirements-ui.txt
 
       - name: Set-up Xpress with pip for Ubuntu
         shell: bash
@@ -142,7 +141,6 @@ jobs:
                 -DCMAKE_BUILD_TYPE=Release \
                 -DCMAKE_INSTALL_PREFIX=_install \
                 -DCMAKE_PREFIX_PATH="${{ github.workspace }}/deps;${{env.ORTOOLS_DIR}}/install" \
-                -DBUILD_UI=ON  \
                 -DVCPKG_TARGET_TRIPLET=x64-linux-release \
                 -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
 

.github/workflows/build_windows.yml

@@ -52,7 +52,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements-tests.txt
-          pip install -r requirements-ui.txt
 
       - name: Set-up Xpress with pip
         shell: bash
@@ -121,7 +120,6 @@ jobs:
           -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}
           -DCMAKE_INSTALL_PREFIX=_install
           -DPython3_EXECUTABLE="${{ env.Python3_ROOT_DIR }}/python.exe"
-          -DBUILD_UI=ON
 
       - name: Build
         run: |

.github/workflows/ubuntu-system-deps-build.yml

@@ -36,7 +36,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements-tests.txt
-          pip install -r requirements-ui.txt
 
       - name: Install mandatory system libraries
         run: |
@@ -94,7 +93,6 @@ jobs:
                 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
                 -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=Release \
                 -DCMAKE_INSTALL_PREFIX=_install \
-                -DBUILD_UI=ON \
                 -DVCPKG_TARGET_TRIPLET=x64-linux-release \
                 -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
 

.github/workflows/windows-vcpkg-deps-build.yml

@@ -39,7 +39,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements-tests.txt
-          pip install -r requirements-ui.txt
 
       - name: Pre-requisites
         shell: cmd
@@ -75,7 +74,7 @@ jobs:
       - name: Configure
         run: |
           $pwd=Get-Location
-          cmake -B _build -S . -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} -DCMAKE_INSTALL_PREFIX=_install -DBUILD_UI=ON
+          cmake -B _build -S . -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} -DCMAKE_INSTALL_PREFIX=_install
 
       - name: Cache vcpkg binary dir
         if: always()

.gitignore

@@ -44,7 +44,6 @@ CMakeFiles/*
 src/python/config.yaml
 src/python/antares_xpansion/__version__.py
 src/python/resources.py
-config-ui.yaml
 build_config.yaml
 
 # Tests

CMakeLists.txt

@@ -255,7 +255,6 @@ endif (COIN_OR)
 # ===========================================================================
 # Targets
 # ===========================================================================
-option(BUILD_UI "Build antares-xpansion ui" OFF)
 option(BUILD_TESTING "Activates unit tests building" OFF)
 
 if (WIN32)

README.md

@@ -96,11 +96,6 @@ where `x.y.z` is the version number.
     ```
 
 
-
-### Graphical user interface
-
-Antares-Xpansion comes with a GUI. The GUI can be launched by running `antares-xpansion-ui.exe`. For now, this GUI is in the experimental phase.
-
 ## Technologies
 Antares-Xpansion is developed mainly in **C++** and uses a **Python** runner
 to drive the execution of multiple executables.

docker/centos7-build

@@ -46,8 +46,7 @@ WORKDIR /workspace/antares-xpansion
 
 RUN pip3 install --upgrade pip && \
     pip3 install wheel && \
-    pip3 install -r requirements-tests.txt && \
-    pip3 install -r requirements-ui.txt
+    pip3 install -r requirements-tests.txt
 
 # Accept build arguments for ccache
 ARG CCACHE_DIR
@@ -72,7 +71,6 @@ RUN  source /opt/rh/devtoolset-11/enable && \
       -DCMAKE_PREFIX_PATH="/deps;/ortools/install" \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_INSTALL_PREFIX=_install \
-      -DBUILD_UI=ON \
       -DALLOW_RUN_AS_ROOT=ON \
       -DVCPKG_TARGET_TRIPLET=x64-linux-release \
       -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake

docs/developer-guide/install_from_sources/0-INSTALL.md

@@ -18,9 +18,8 @@ Follow this [link][Doxygen_Code_Documentation] for Doxygen code documentation.
 - [Dependencies](2-Dependencies-install.md)
 - [Build](3-Build.md)
 - [Tests](4-Tests.md)
-- [UI creation](5-ui-creation.md)
-- [Installer creation](6-Installer-creation.md)
-- [Xpress integration](7-Xpress.md)
+- [Installer creation](5-Installer-creation.md)
+- [Xpress integration](6-Xpress.md)
 
 [ubuntu_system_svg]: https://github.com/AntaresSimulatorTeam/antares-xpansion/actions/workflows/ubuntu-system-deps-build.yml/badge.svg?query=branch%3Adevelop
 [ubuntu_system_link]: https://github.com/AntaresSimulatorTeam/antares-xpansion/actions/workflows/ubuntu-system-deps-build.yml?query=branch%3Adevelop

docs/developer-guide/install_from_sources/3-Build.md

@@ -42,7 +42,6 @@ Here is a list of available CMake configure options:
 |`BUILD_not_system`|`ON`|Enable build of external librairies not available on system package manager.|
 |`BUILD_ALL`|`OFF`|Enable build of ALL external librairies.|
 |`BUILD_TESTING`|`OFF`|Enable test build.|
-|`BUILD_UI`|`OFF`|Enable UI build.|
 |`ALLOW_RUN_AS_ROOT`|`OFF`|allow mpi to run as root for centOs docker.|
 
 Additionnal vcpkg options:

docs/user-guide/get-started/launching-optimization.md

@@ -94,10 +94,6 @@ Show the Antares-Xpansion version.
 
 Show the Antares-Simulator version (used in the `antares` step).
 
-## Graphical user interface
-
-Since v0.6.0, Antares-Xpansion comes with a GUI. The GUI can be launched by running `antares-xpansion-ui.exe`. For now, this GUI is in the experimental phase. 
-
 ![](../../assets/media/ui.png)
 
 ## Output of Antares-Xpansion

mkdocs.yml

@@ -53,8 +53,8 @@ nav:
       - 'Dependencies install': 'developer-guide/install_from_sources/2-Dependencies-install.md'
       - 'Build': 'developer-guide/install_from_sources/3-Build.md'
       - 'Tests': 'developer-guide/install_from_sources/4-Tests.md'
-      - 'UI creation': 'developer-guide/install_from_sources/5-ui-creation.md'
-      - 'Installer creation': 'developer-guide/install_from_sources/6-Installer-creation.md'
+      - 'Installer creation': 'developer-guide/install_from_sources/5-Installer-creation.md'
+      - 'Xpress': 'developer-guide/install_from_sources/6-Xpress.md'
     - 'Antares-Xpansion simulation procedure' : 
       - 'Overview' : 'developer-guide/xpansion_steps/0-overview.md'
       - 'Antares optimization problem retrieval' : 'developer-guide/xpansion_steps/1-antares-solver-problem.md'

src/CMakeLists.txt

@@ -15,15 +15,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/python/config.yaml.in ${CMAKE_CURRENT
 #use file generator to define xpansion executable name with $<TARGET_FILE_NAME:exe> : need to be done with generate instead of configure because values are not available at configure time
 file(GENERATE OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/python/config.yaml INPUT ${CMAKE_CURRENT_SOURCE_DIR}/python/config.yaml)
 
-if (BUILD_UI)
-    execute_process(COMMAND           pyrcc5 images.qrc
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python/
-                    OUTPUT_FILE resources.py)
-
-    #configure file to define install directory
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/python/config-ui.yaml.in ${CMAKE_CURRENT_SOURCE_DIR}/python/config-ui.yaml)
-endif()
-
 find_program(PYINSTALLER "pyinstaller")
 
 #if pyinstaller available add compiled version of python scripts
@@ -35,10 +26,6 @@ if (PYINSTALLER)
         install(CODE "execute_process(COMMAND ${PYINSTALLER} -F ${CMAKE_CURRENT_SOURCE_DIR}/python/launch.py -n antares-xpansion-launcher --add-data \"${CMAKE_CURRENT_SOURCE_DIR}/python/config.yaml:.\")" )
     endif()
 
-    if (BUILD_UI)
-        install(CODE "execute_process(COMMAND ${PYINSTALLER} -F ${CMAKE_CURRENT_SOURCE_DIR}/python/antares-xpansion-ui.py -n antares-xpansion-ui)" )
-    endif()
-
     #code is executed in CMAKE_BINARY_DIR
     install(DIRECTORY ${CMAKE_BINARY_DIR}/dist/
             DESTINATION .