[Feat/aut586] - Updated ImGui::Tables API (#281)

* Updated ImGui::Tables API * appending a missing include for OpenSwathAlgo * appending a missing include for OpenSwathAlgo - typo fix * appending a missing include for OpenSwathAlgo - fixes * appending a missing include for OpenSwathAlgo - fixes * appending a missing include for OpenSwathAlgo - fixes * appending a missing include for OpenSwathAlgo - removing unused cmake module for boost * appending a missing include for OpenSwathAlgo - switching to contrib_build boost * appending a missing include for OpenSwathAlgo - using hosted version of boost * updating GUI to latest ImGui API tables * integrating ImGui in SmartPeak - ImGui v.:f3184b82b0a709e045bb09e00fa4be81311bae9c - Superbuild for ImGui is disabled * integrating ImGui in SmartPeak - ImGui v.:f3184b82b0a709e045bb09e00fa4be81311bae9c - Superbuild for ImGui is disabled - updating CI superbuild directories * integrating ImGui in SmartPeak - ImGui v.:f3184b82b0a709e045bb09e00fa4be81311bae9c - Superbuild for ImGui is disabled - updating CI superbuild directories * integrating ImGui in SmartPeak - ImGui v.:f3184b82b0a709e045bb09e00fa4be81311bae9c - Superbuild for ImGui is disabled - updating CI superbuild directories * removing unused CI mod
AutoFlowResearch · Oct 22, 2020 · 88b0679 · 88b0679
1 parent e33678c
commit 88b0679
Show file tree

Hide file tree

Showing 177 changed files with 82,603 additions and 2,139 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,18 +6,23 @@ orbs:
 jobs:
   build_ubuntu:
     docker:
-      - image: ubuntu:18.04
+      - image: ubuntu:20.04
     working_directory: ~/SmartPeak2
     resource_class: large
     steps:
       - checkout
       - run: |
           apt-get update
-      - run: >
-          apt-get install -y git cmake qt5-default libboost-dev libeigen3-dev
-          libxerces-c-dev coinor-libcbc-dev libsvm-dev libboost-iostreams-dev
-          libboost-date-time-dev libboost-math-dev libwildmagic-dev libsqlite3-dev
-          libglpk-dev seqan-dev libsdl2-dev libhdf5-dev libboost-filesystem-dev
+      - run: |
+          export DEBIAN_FRONTEND=noninteractive && apt-get install -y tzdata &&  
+          ln -fs /usr/share/zoneinfo/Europe/Paris /etc/localtime &&
+          dpkg-reconfigure --frontend noninteractive tzdata &&
+          apt-get install -y git cmake qt5-default libeigen3-dev
+      - run: |
+          apt-get install -y libboost-all-dev &&
+          apt-get install -y libxerces-c-dev coinor-libcbc-dev libsvm-dev &&
+          apt-get install -y libwildmagic-dev libsqlite3-dev &&
+          apt-get install -y libglpk-dev seqan-dev libsdl2-dev libhdf5-dev
       - run: |
           apt-get install -y graphviz doxygen python3-pip &&
           export DEBIAN_FRONTEND=noninteractive &&
@@ -34,15 +39,16 @@ jobs:
           make -j4 OpenMS
       - run:
           command: |
-            mkdir ~/SmartPeak2_superbuild
-            cd ~/SmartPeak2_superbuild
+            cd ~/SmartPeak2
+            # mkdir superbuild
+            cd superbuild
             cmake -DUSE_SUPERBUILD=ON -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug ~/SmartPeak2
             make -j4
       - run:
           command: |
             mkdir ~/SmartPeak2_build
             cd ~/SmartPeak2_build
-            cmake -DEIGEN_USE_GPU=OFF -DUSE_SUPERBUILD=OFF -DBOOST_USE_STATIC=OFF -G "Unix Makefiles" -DCMAKE_PREFIX_PATH=$HOME/OpenMS-build/ -DPLOG_INCLUDE_DIR=$HOME/SmartPeak2_superbuild/Dependencies/Source/plog/include -DIMGUI_DIR=$HOME/SmartPeak2_superbuild/Dependencies/Source/imgui -DIMPLOT_DIR=$HOME/SmartPeak2_superbuild/Dependencies/Source/implot -DCMAKE_BUILD_TYPE=Debug ~/SmartPeak2
+            cmake -DEIGEN_USE_GPU=OFF -DUSE_SUPERBUILD=OFF -DBOOST_USE_STATIC=OFF -G "Unix Makefiles" -DCMAKE_PREFIX_PATH=$HOME/OpenMS-build/ -DPLOG_INCLUDE_DIR=$HOME/SmartPeak2/superbuild/Dependencies/Source/plog/include -DIMGUI_DIR=$HOME/SmartPeak2/superbuild/Dependencies/Source/imgui -DIMPLOT_DIR=$HOME/SmartPeak2/superbuild/Dependencies/Source/implot -DCMAKE_BUILD_TYPE=Debug ~/SmartPeak2
             make -j4
       - run:
           command: |
@@ -67,32 +73,38 @@ jobs:
 
   build_macos:
     macos:
-      xcode: "11.0.0"
+      xcode: "11.2.1"
     resource_class: medium
     working_directory: ~/SmartPeak2
     steps:
       - checkout
-      - run: brew install cmake qt5 sdl2 [email protected] glpk eigen sqlite hdf5  libsvm xerces-c
+      - run: brew remove yarn node
+      - run: brew install cmake qt5 sdl2
+      - run: brew install boost
       - run: |
           set +o pipefail
-          brew install coin-or-tools/coinor/cbc coin-or-tools/coinor/cgl coin-or-tools/coinor/clp coin-or-tools/coinor/coin_data_netlib || true
+          # brew install coin-or-tools/coinor/cbc coin-or-tools/coinor/cgl coin-or-tools/coinor/clp coin-or-tools/coinor/coin_data_netlib || true
       - run: |
           set -o pipefail
-          brew install coin-or-tools/coinor/coin_data_sample coin-or-tools/coinor/coinutils coin-or-tools/coinor/osi || true
+          # brew install coin-or-tools/coinor/coin_data_sample coin-or-tools/coinor/coinutils coin-or-tools/coinor/osi || true
       - run: |
           cd ~ &&
           git clone --branch develop --depth 1 https://github.com/OpenMS/OpenMS.git &&
-          cd OpenMS && git submodule update --init contrib && mkdir contrib_build && cd contrib_build && 
-          cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DBUILD_TYPE=ALL ../contrib &&
+          cd OpenMS && mkdir contrib_build && cd contrib_build
+          curl -O https://abibuilder.informatik.uni-tuebingen.de/archive/openms/contrib/macOS/10.15.4/x64/appleclang-11.0.0/contrib_build.tar.gz
+          tar -xzf contrib_build.tar.gz
+          rm lib/libboost_* && rm -r include/boost && rm -r lib/cmake/Boost* && rm -r lib/cmake/boost*
           cd ~/OpenMS &&  mkdir openms_debug_build && cd openms_debug_build &&
-          cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_STANDARD=14 -DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_PREFIX_PATH="$(brew --prefix qt5);$(brew --prefix boost@1.60);$(brew --prefix)" -DBOOST_USE_STATIC=OFF -DOPENMS_CONTRIB_LIBS=~/OpenMS/contrib_build/   -DSEQAN_INCLUDE_DIRS=~/OpenMS/contrib_build/include/seqan -DCOIN_INCLUDE_DIR=../contrib_build/include/ -DWM5_INCLUDE_DIR=../contrib_build/include/WildMagic/ -DWM5_Wm5Core_LIBRARY=../contrib_build/lib/libWm5Core.a -DWM5_Wm5Mathematics_LIBRARY=../contrib_build/lib/libWm5Mathematics.a -DHAS_XSERVER=OFF -DWITH_GUI=OFF -DENABLE_TUTORIALS=OFF -DENABLE_DOCS=OFF -DGIT_TRACKING=OFF -DENABLE_UPDATE_CHECK=OFF -DCMAKE_BUILD_TYPE=Debug -DPYOPENMS=OFF -DOPENMS_COVERAGE=OFF ..
+          cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_STANDARD=14 -DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_PREFIX_PATH="$(brew --prefix qt5);$(brew --prefix boost)" -DBOOST_USE_STATIC=OFF -DOPENMS_CONTRIB_LIBS=~/OpenMS/contrib_build/ -DHAS_XSERVER=OFF -DWITH_GUI=OFF -DENABLE_TUTORIALS=OFF -DENABLE_DOCS=OFF -DGIT_TRACKING=OFF -DENABLE_UPDATE_CHECK=OFF -DCMAKE_BUILD_TYPE=Debug -DPYOPENMS=OFF -DOPENMS_COVERAGE=OFF ..
           make -j4 OpenMS
       - run: |
-          cd ~/SmartPeak2 && mkdir smartpeak2_debug_superbuild smartpeak2_debug_build
-          cd smartpeak2_debug_superbuild
+          cd ~/SmartPeak2
+          # mkdir superbuild 
+          mkdir smartpeak2_debug_build
+          cd superbuild
           cmake -DUSE_SUPERBUILD=ON -DCMAKE_BUILD_TYPE=Debug .. && make -j4
           cd ../smartpeak2_debug_build
-          cmake -DEIGEN_USE_GPU=OFF -DUSE_SUPERBUILD=OFF -DBOOST_USE_STATIC=OFF -DCMAKE_PREFIX_PATH="~/OpenMS/openms_debug_build/;$(brew --prefix qt5);$(brew --prefix boost@1.60)" -DPLOG_INCLUDE_DIR=~/SmartPeak2/smartpeak2_debug_superbuild/Dependencies/Source/plog/include   -DIMGUI_DIR=~/SmartPeak2/smartpeak2_debug_superbuild/Dependencies/Source/imgui  -DIMPLOT_DIR=~/SmartPeak2/smartpeak2_debug_superbuild/Dependencies/Source/implot   -DCMAKE_BUILD_TYPE=Debug ~/SmartPeak2
+          cmake -DEIGEN_USE_GPU=OFF -DUSE_SUPERBUILD=OFF -DBOOST_USE_STATIC=OFF -DCMAKE_PREFIX_PATH="~/OpenMS/openms_debug_build/;~/OpenMS/contrib_build;$(brew --prefix qt5);$(brew --prefix boost);(brew --prefix eigen)" -DPLOG_INCLUDE_DIR=~/SmartPeak2/superbuild/Dependencies/Source/plog/include   -DIMGUI_DIR=~/SmartPeak2/superbuild/Dependencies/Source/imgui  -DIMPLOT_DIR=~/SmartPeak2/superbuild/Dependencies/Source/implot   -DCMAKE_BUILD_TYPE=Debug ~/SmartPeak2
           make -j4
       - run: |
           set +o pipefail
@@ -129,12 +141,13 @@ jobs:
           $ProgressPreference = "SilentlyContinue"
           Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
           choco install cmake --installargs '"ADD_CMAKE_TO_PATH=System"'
-          choco install boost-msvc-14.1
+          # choco install boost-msvc-14.1
           choco install doxygen.install
           choco install nsis.portable
           refreshenv
           $qt_url = 'https://github.com/martinrotter/qt5-minimalistic-builds/releases/download/5.12.9/qt-5.12.9-dynamic-msvc2019-x86_64.7z'
           $sdl2_url = 'https://www.libsdl.org/release/SDL2-devel-2.0.12-VC.zip'
+          $boost_url = 'https://github.com/ahmedskhalil/Boost-1.73-Prebuilts/releases/download/0.0.1/boost_1_73_0.7z'
           $qt_tmp = New-TemporaryFile | Rename-Item -NewName { $_ -replace 'qt_tmp$', '7z' } –PassThru
           Invoke-WebRequest $qt_url -OutFile $qt_tmp 
           7z x $qt_tmp -o'C:\lib\Qt'
@@ -149,30 +162,37 @@ jobs:
           7z x $sdl2_tmp -o'C:\lib\sdl2'
           $SDL_DIR = 'C:\lib\sdl2\SDL2-2.0.12'
           $sdl2_tmp | Remove-Item
+          $boost_tmp = New-TemporaryFile | Rename-Item -NewName { $_ -replace 'boost_tmp$', '7z' } –PassThru
+          Invoke-WebRequest $boost_url -OutFile $boost_tmp 
+          7z x $boost_tmp -o'C:\lib\boost'
+          ls C:\lib\boost\boost_1_73_0
+          ls C:\lib\boost\
+          $BOOST_DIR = 'C:\lib\boost\boost_1_73_0'
+          $boost_tmp | Remove-Item
+      - run: |
+          cd ~
+          git clone --branch develop --depth 1 https://github.com/OpenMS/OpenMS.git
+          cd ~/OpenMS
       - run: |
+          [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+          $ProgressPreference = "SilentlyContinue"
           cmd.exe /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > %temp%\vcvars64.txt"
           Get-Content "$env:temp\vcvars64.txt" | Foreach-Object {
           if ($_ -match "^(.*?)=(.*)$") {
               Set-Content "env:\$($matches[1])" $matches[2]
               }
           }
-          cd ~
-          git clone --branch develop --depth 1 https://github.com/OpenMS/OpenMS.git
-          cd ~/OpenMS; git submodule update --init contrib; mkdir contrib_build; cd contrib_build
-          cmake -G "Visual Studio 16 2019" -A x64 -DBUILD_TYPE=SEQAN ~/OpenMS/contrib
-          cmake -G "Visual Studio 16 2019" -A x64 -DBUILD_TYPE=LIBSVM ~/OpenMS/contrib
-          cmake -G "Visual Studio 16 2019" -A x64 -DBUILD_TYPE=XERCESC ~/OpenMS/contrib
-          cmake -G "Visual Studio 16 2019" -A x64 -DBUILD_TYPE=COINOR ~/OpenMS/contrib
-          cmake -G "Visual Studio 16 2019" -A x64 -DBUILD_TYPE=BZIP2 ~/OpenMS/contrib
-          cmake -G "Visual Studio 16 2019" -A x64 -DBUILD_TYPE=ZLIB ~/OpenMS/contrib
-          cmake -G "Visual Studio 16 2019" -A x64 -DBUILD_TYPE=GLPK ~/OpenMS/contrib
-          cmake -G "Visual Studio 16 2019" -A x64 -DBUILD_TYPE=EIGEN ~/OpenMS/contrib
-          cmake -G "Visual Studio 16 2019" -A x64 -DBUILD_TYPE=WILDMAGIC ~/OpenMS/contrib
-          cmake -G "Visual Studio 16 2019" -A x64 -DBUILD_TYPE=SQLITE ~/OpenMS/contrib
-          cmake -G "Visual Studio 16 2019" -A x64 -DBUILD_TYPE=KISSFFT ~/OpenMS/contrib
-          cmake -G "Visual Studio 16 2019" -A x64 -DBUILD_TYPE=HDF5 ~/OpenMS/contrib
+          cd ~/OpenMS
+          mkdir contrib_build; cd contrib_build
+          $url_contrib = 'https://abibuilder.informatik.uni-tuebingen.de/archive/openms/contrib/windows/x64/msvc-14.2/contrib_build.tar.gz'
+          $contrib_tmp = New-TemporaryFile | Rename-Item -NewName { $_ -replace 'contrib_tmp$', 'tar.gz' } –PassThru
+          Invoke-WebRequest $url_contrib -OutFile $contrib_tmp
+          7z x $contrib_tmp -o'.'
+          7z x $contrib_tmp.BaseName -o'.'
+          rm  .\lib\libboost_*
+          rm  -r .\include\boost
           cd ~/OpenMS; mkdir openms_build; cd openms_build
-          cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_CXX_STANDARD=14 -DCMAKE_CXX_EXTENSIONS=OFF -DCXX_STANDARD_REQUIRED=ON -DBoost_NO_SYSTEM_PATHS=ON -DBOOST_USE_STATIC=ON -DBOOST_ROOT="C:/local/boost_1_67_0" -DBOOST_INCLUDE_DIR="C:/local/boost_1_67_0" -DBOOST_LIBRARYDIR="C:/local/boost_1_67_0/lib64-msvc-14.1" -DOPENMS_CONTRIB_LIBS=~/OpenMS/contrib_build -DCMAKE_PREFIX_PATH="C:/lib/Qt/qt-5.12.9-dynamic-msvc2019-x86_64" -DHAS_XSERVER=OFF -DWITH_GUI=OFF -DENABLE_TUTORIALS=OFF -DENABLE_DOCS=OFF -DGIT_TRACKING=OFF -DENABLE_UPDATE_CHECK=OFF -DCMAKE_BUILD_TYPE=Release -DPYOPENMS=OFF -DOPENMS_COVERAGE=OFF ~/OpenMS
+          cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_CXX_EXTENSIONS=OFF -DCXX_STANDARD_REQUIRED=ON -DBoost_NO_SYSTEM_PATHS=ON -DBOOST_USE_STATIC=ON -DBOOST_ROOT="C:\lib\boost\boost_1_73_0" -DBOOST_INCLUDE_DIR="C:\lib\boost\boost_1_73_0" -DBOOST_LIBRARYDIR="C:\lib\boost\boost_1_73_0\lib64-msvc-14.2" -DOPENMS_CONTRIB_LIBS=~/OpenMS/contrib_build -DCMAKE_PREFIX_PATH="C:/lib/Qt/qt-5.12.9-dynamic-msvc2019-x86_64" -DHAS_XSERVER=OFF -DWITH_GUI=OFF -DENABLE_TUTORIALS=OFF -DENABLE_DOCS=OFF -DGIT_TRACKING=OFF -DENABLE_UPDATE_CHECK=OFF -DCMAKE_BUILD_TYPE=Release -DPYOPENMS=OFF -DOPENMS_COVERAGE=OFF ~/OpenMS
           msbuild src\openswathalgo\OpenSWATHAlgo.sln /maxcpucount /p:Configuration=Release
           msbuild src\openms\OpenMS.sln /maxcpucount /p:Configuration=Release
       - run: |
@@ -186,12 +206,13 @@ jobs:
               }
           }
           cd ~/SmartPeak2
-          mkdir smartpeak2_superbuild, smartpeak2_build
-          cd ~/SmartPeak2/smartpeak2_superbuild
+          # mkdir superbuild 
+          mkdir smartpeak2_build
+          cd ~/SmartPeak2/superbuild
           cmake -DUSE_SUPERBUILD=ON -DCMAKE_BUILD_TYPE=Release ~/SmartPeak2
           cmake --build .
           cd ~/SmartPeak2/smartpeak2_build
-          cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_CXX_STANDARD=14 -DCMAKE_CXX_EXTENSIONS=OFF -DCXX_STANDARD_REQUIRED=ON -DEIGEN_USE_GPU=OFF -DUSE_SUPERBUILD=OFF -DBoost_NO_SYSTEM_PATHS=ON -DBOOST_USE_STATIC=ON -DBOOST_ROOT="C:/local/boost_1_67_0" -DBOOST_INCLUDE_DIR="C:/local/boost_1_67_0" -DBOOST_LIBRARYDIR="C:/local/boost_1_67_0/lib64-msvc-14.1" -DCMAKE_PREFIX_PATH="~/OpenMS/openms_build/;C:/lib/Qt/qt-5.12.9-dynamic-msvc2019-x86_64;C:/lib/sdl2/SDL2-2.0.12" -DEIGEN3_INCLUDE_DIR=C:/Users/circleci/OpenMS/contrib_build/include/eigen3 -DPLOG_INCLUDE_DIR=~/SmartPeak2/smartpeak2_superbuild/Dependencies/Source/plog/include -DIMGUI_DIR=~/SmartPeak2/smartpeak2_superbuild/Dependencies/Source/imgui -DIMPLOT_DIR=~/SmartPeak2/smartpeak2_superbuild/Dependencies/Source/implot -DCMAKE_BUILD_TYPE=Release ~/SmartPeak2
+          cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_CXX_EXTENSIONS=OFF -DCXX_STANDARD_REQUIRED=ON -DEIGEN_USE_GPU=OFF -DUSE_SUPERBUILD=OFF -DBoost_NO_SYSTEM_PATHS=ON -DBOOST_USE_STATIC=ON -DBOOST_ROOT="C:\lib\boost\boost_1_73_0" -DBOOST_INCLUDE_DIR="C:\lib\boost\boost_1_73_0" -DBOOST_LIBRARYDIR="C:\lib\boost\boost_1_73_0\lib64-msvc-14.2" -DCMAKE_PREFIX_PATH="~/OpenMS/openms_build/;C:/lib/Qt/qt-5.12.9-dynamic-msvc2019-x86_64;C:/lib/sdl2/SDL2-2.0.12" -DEIGEN3_INCLUDE_DIR=C:/Users/circleci/OpenMS/contrib_build/include/eigen3 -DPLOG_INCLUDE_DIR=~/SmartPeak2/superbuild/Dependencies/Source/plog/include -DIMGUI_DIR=~/SmartPeak2/superbuild/Dependencies/Source/imgui -DIMPLOT_DIR=~/SmartPeak2/superbuild/Dependencies/Source/implot -DCMAKE_BUILD_TYPE=Release ~/SmartPeak2
           msbuild src/SmartPeak_src.sln /verbosity:normal /maxcpucount /p:Configuration=Release
           msbuild src/smartpeak/SmartPeak.sln /verbosity:normal /maxcpucount /p:Configuration=Release
           msbuild src/examples/SmartPeak_class_examples_smartpeak.sln /maxcpucount /property:Configuration=Release
@@ -212,4 +233,4 @@ workflows:
     jobs:
       - build_ubuntu
       - build_macos
-      - build_windows
+      - build_windows
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ option (USE_SUPERBUILD "Whether or not a superbuild should be invoked" ON)
 if (USE_SUPERBUILD)
   project ("SuperBuild" NONE)
   include(external/plog.cmake)
-  include(external/imgui.cmake)
+  # include(external/imgui.cmake)
   include(external/implot.cmake)
   if (MSVC)
     include(external/eigen.cmake)

diff --git a/cmake/modules/FindImGui.cmake b/cmake/modules/FindImGui.cmake
@@ -205,7 +205,7 @@ foreach(_component IN LISTS ImGui_FIND_COMPONENTS)
                 # _imgui_setup_source_file(ImGui_${_file}_EXAMPLE)
 
                 find_file(ImGui_${_file}_EXAMPLE NAMES ${_file}.cpp
-                    HINTS ${IMGUI_DIR}/examples NO_CMAKE_FIND_ROOT_PATH)
+                    HINTS ${IMGUI_DIR}/backends NO_CMAKE_FIND_ROOT_PATH)
                 list(APPEND ImGui_EXAMPLES ${ImGui_${_file}_EXAMPLE})
 
                 if(NOT ImGui_${_file}_EXAMPLE)