Linux release

.github/workflows/cmake.yml

@@ -0,0 +1,84 @@
+name: CMake
+
+on: [workflow_dispatch, push, pull_request]
+
+
+concurrency:
+  group: FC-CI-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
+    # You can convert this to a matrix build if you need cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-22.04       
+    env:
+      CPM_SOURCE_CACHE: ~/.cache/CPM
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install I-SIMPA dependencies
+        run: |
+          sudo sed -i 's/azure\.//' /etc/apt/sources.list 
+          sudo apt-get update 
+          sudo apt-get install -y --no-install-recommends \
+          build-essential \
+          libgtk-3-dev \
+          freeglut3-dev \
+          libxmu-dev \
+          libxi-dev \
+          libpng-dev \
+          libjpeg-dev \
+          libxxf86vm1 \
+          libxxf86vm-dev \
+          libxi-dev \
+          libxrandr-dev \
+          mesa-common-dev \
+          mesa-utils \
+          libgl1-mesa-dev \
+          libglapi-mesa \
+          byacc \
+          gettext \
+          cmake \
+          python3-dev \
+          swig \
+          libboost-all-dev
+      - name: Cache CPM dependency packages
+        uses: actions/cache@v3
+        with:
+          path: |
+            ${{ env.CPM_SOURCE_CACHE }}
+          key: ${{ runner.os }}-isimpa
+
+      - name: Configure CMake
+        # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+        # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+        run: |
+          cmake -DCPM_SOURCE_CACHE=${{ env.CPM_SOURCE_CACHE }} -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build
+        # Compile i-simpa
+        run: make
+
+      - name: Install
+        working-directory: ${{github.workspace}}/build
+        # Copy stuff to bin subdirectory for "standalone" application
+        run: make install
+
+      - name: Test
+        working-directory: ${{github.workspace}}/build
+        # Execute tests defined by the CMake configuration.
+        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+        run: make test
+
+      - name: Archive production artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: isimpa-amd64.zip 
+          path: ${{github.workspace}}/build/bin
+

.gitignore

@@ -46,4 +46,5 @@ files.txt
 *.pot
 # cmake should convert .po files into .mo files if necessary
 *.mo
-.vscode/
+.vscode
+.DS_Store

CMakeLists.txt

@@ -1,9 +1,13 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.6.0)
+# begin basic metadata
+# minimum CMake version required for C++20 support, among other things
+cmake_minimum_required(VERSION 3.15)
 
 # Maps to a solution file (isimpa.sln). The solution will
 # have all targets (exe, lib, dll) as projects (.vcproj)
 project (isimpa VERSION 1.3.4)
 
+# a better way to load dependencies
+include(cmake/CPM.cmake)
 
 # convert path of a .lib file into a .dll file
 # findboost does not store .dll locations
@@ -49,13 +53,15 @@ IF (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
     IF (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
         SET(USE_CXX_11 TRUE)
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+        set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wall --std=c++11 -O3 -fPIC" )        
+        set( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -Wall -O3 -fPIC" )
     ENDIF()
 ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     IF ((NOT APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "3.2")
             OR (APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.1"))
         SET(USE_CXX_11 TRUE)
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-error=c++11-narrowing")
+        set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wall --std=c++11  -Wno-error=c++11-narrowing -O3 -fPIC" )    
+        set(CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -Wall -O3 -fPIC" )
     ENDIF()
 ELSEIF (MSVC AND MSVC_VERSION GREATER 1600)
     SET(USE_CXX_11 TRUE)

Docs/Building.md

@@ -10,33 +10,33 @@
 #### Software & Dependencies requirements
 
 * CMake
-* Boost 1.60
-* wxWidget 3.1.0
-* Swig
-* Python 2.7
+* Boost 1.73
+* wxWidget 3.1.4
+* Swig 3.0.11
+* Python 3.8
 
 :warning: This project uses OpenGL, check if your graphic driver is up to date !
 
 ---
 
 ### On Windows with Microsoft Visual Studio (64bits)
 
-Last (free) version in date :  [Visual Studio Community 2015](https://www.visualstudio.com/)
+Last (free) version in date :  [Visual Studio Community 2019](https://www.visualstudio.com/)
 
 #### Libraries installation
 
 We recommend you to create a lib folder in `C:` and to use it when extracting extracting externals libraries source.
 
 * **Boost**
-	* [Download Boost 1.60](http://www.boost.org/users/history/)
+	* [Download Boost 1.73](http://www.boost.org/users/history/)
 	* Extract the archive
 	* To build Boost : from the Visual Studio shell (Menu > All Programs > Visual Studio Tools), in the Boost folder
 
 			.\bootstrap.bat
 			# build just what we need
-			.\b2. toolset=msvc-14.0 --with-thread --with-random --with-python --with-date_time --with-test --with-filesystem --with-regex --build-type=complete stage
+			.\b2. toolset=msvc-16.0 --with-thread --with-random --with-python --with-date_time --with-test --with-filesystem --with-regex --build-type=complete stage
 			# or everything
-			.\b2. toolset=msvc-14.0 --build-type=complete stage
+			.\b2. toolset=msvc-16.0 --build-type=complete stage
 
 	* Move the lib/ folder (inside stage/) to the Boost folder root
 	* Create/check environment variable
@@ -49,9 +49,9 @@ We recommend you to create a lib folder in `C:` and to use it when extracting ex
 	* Extract the archive
 	* Add to Path the Swig folder path
 * **wxWidgets**
-	* [Download the wxWidget 3.1.0 Windows Installer](http://www.wxwidgets.org/downloads/)
+	* [Download the wxWidget 3.1.4 Windows Installer](http://www.wxwidgets.org/downloads/)
 	* The installer extract the source in a folder
-	* In the wxWidget folder, in build/msw, launch wx_vc14.sl
+	* In the wxWidget folder, in build/msw, launch wx_vc16.sl
 	* Choose the "debug" mode and generate the solution
 	* Choose the "release" mode and generate the solution again
 	* Quit Visual Studio
@@ -60,7 +60,7 @@ We recommend you to create a lib folder in `C:` and to use it when extracting ex
 			WXWIN		path\to\wxwidget
 
 * **Python**
-	* [Download Python 2.7](https://www.python.org/downloads/)
+	* [Download Python 3.8](https://www.python.org/downloads/)
 	* Install it (the installer has an option that can do the two next steps for you)
 	* Add to Path the Python installation folder path
 	* Create/check environment variable
@@ -89,7 +89,7 @@ In order to build under linux you have to download/install the following librari
 
 - gcc-4.8
 - g++-4.8
-- python 2.7
+- python 3.8
 - freeglut3-dev
 - libxmu-dev
 - libxi-dev
@@ -111,13 +111,13 @@ Swig from here:
 https://github.com/swig/swig/archive/rel-3.0.10.tar.gz
 
 Boost from here:
-https://sourceforge.net/projects/boost/files/boost/1.61.0/boost_1_61_0.tar.bz2
+https://sourceforge.net/projects/boost/files/boost/1.73.0/boost_1_73_0.tar.bz2/download
 
 wxWidgets from here:
-https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.0/wxWidgets-3.1.0.tar.bz2
+https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.4/wxWidgets-3.1.4.tar.bz2
 
-Cmake from here
-https://cmake.org/files/v3.6/cmake-3.6.1-Linux-x86_64.tar.gz
+Cmake from here (or from apt-get)
+https://cmake.org/files/LatestRelease/cmake-3.22.0.tar.gz
 
 #### Building instructions
 

Docs/code_TCR.rst

@@ -3,7 +3,7 @@ Presentation
 
 **TCR is a numerical code based on the Classical Theory or Reverberation.**
 
-- `Visit the offical I-Simpa website`_ for more information about SPPS code.
+- `Visit the offical I-Simpa website`_ for more information about TCR code.
 
 - See the main `characteristics of the code`_ that is embedded in I-Simpa.
 

Docs/index.rst

@@ -36,15 +36,16 @@ the TCR numerical codes (embedded within the I-Simpa software).
    `instructions`_
 
 .. note::
-	- Some illustrations may referred to previous versions of I-Simpa.
-	- Depending of your OS, screenchots may differs.
-	- Some texts and translations in I-Simpa may have changed.
-	- If the present documentation is the 'Offline documentation' you may refer to the online version at http://i-simpa-wiki.readthedocs.io/fr/latest/ for an up-to-date documentation.
-	- If you observe some mistakes or errors, please `write an Issue on GitHub`_
-	- You can also `contribute to the documentation`_.
-	- The official documentation is available in English only.
-
-.. _visit the offical I-Simpa website: https://i-simpa.univ-gustave-eiffel.fr/
+	-  This user guide is currently not complete. Additions are underway.
+	-  Some illustrations may referred to previous versions of I-Simpa.
+	-  Depending of your OS, screenchots may differs.
+	-  Some texts and translations in I-Simpa may have changed.
+	- If the present documentation is the 'Offline documentation' you may refer to the online version at http://i-simpa-wiki.readthedocs.io/en/latest/ for an up-to-date documentation.
+	-  If you observe some mistakes or errors, please `write an Issue on GitHub`_
+	-  You can also `contribute to the documentation`_.
+	-  The official documentation is available in English only.
+
+.. _visit the offical I-Simpa website: http://i-simpa.ifsttar.fr
 .. _instructions: https://github.com/Ifsttar/I-Simpa/wiki
 .. _contribute to the documentation: https://github.com/Ifsttar/I-Simpa/wiki/Write-documentation
 .. _write an Issue on GitHub: https://github.com/Ifsttar/I-Simpa/issues
@@ -111,7 +112,6 @@ the TCR numerical codes (embedded within the I-Simpa software).
    :maxdepth: 2
    :caption: Appendices
 
-   errors_messages
    I_Simpa_standard
    room_acoustics_parameters
    glossary

Docs/presentation.rst

@@ -20,14 +20,14 @@ Windows properties:
 	- User can **rearrange and resize** all components in the computer screen by selecting and moving the corresponding component.
 	- You can come back to the **default view** by selecting the option 'Reinitialize interface' in the 'Windows' menu.
 
-.. _'File': Menu_File.html
-.. _'Edition': Menu_Edition.html
-.. _'Simulation': Menu_Simulation.html
-.. _'View': Menu_View.html
-.. _'Windows': Menu_Windows.html
-.. _'Help': Menu_Help.html
-.. _'Toolbars': Toolbars.html
-.. _'Project' window: Project_window.html
-.. _'Properties' window: Properties_window.html
-.. _'Console' window: Console_window.html
-.. _'Main' window: Main_window.html
+.. _'File': menu_file.html
+.. _'Edition': menu_edition.html
+.. _'Simulation': menu_simulation.html
+.. _'View': menu_view.html
+.. _'Windows': menu_windows.html
+.. _'Help': menu_help.html
+.. _'Toolbars': toolbars.html
+.. _'Project' window: project_window.html
+.. _'Properties' window: properties_window.html
+.. _'Console' window: console_window.html
+.. _'Main' window: main_window.html

Docs/requirements.txt

@@ -1,2 +1 @@
 sphinxcontrib-bibtex==1.0.0
-docutils==0.16

appveyor.yml

@@ -12,21 +12,15 @@ environment:
     BOOST_LIBRARYDIR: C:\Libraries\boost_1_73_0\lib64-msvc-14.2
     PYTHON_LIBRARY: C:\Python38-x64\libs\python38.lib
     PYTHON_INCLUDE_DIR: C:\Python38-x64\include
-    WXWIN: C:\wxWidgets-3.1.4\
-    wxWidgets_ROOT_DIR: C:\wxWidgets-3.1.4\
-    wxWidgets_INCLUDE_DIRS: C:\wxWidgets-3.1.4\include
-    wxWidgets_LIBRARIES: C:\wxWidgets-3.1.4\lib\vc14x_x64_dll
-    SWIG_DIR: C:\Libraries\swigwin-3.0.11
-    SWIG_EXECUTABLE: C:\Libraries\swigwin-3.0.11\swig.exe
+    WXWIN: C:\wxWidgets-3.1.5\
+    wxWidgets_ROOT_DIR: C:\wxWidgets-3.1.5\
+    wxWidgets_INCLUDE_DIRS: C:\wxWidgets-3.1.5\include
+    wxWidgets_LIBRARIES: C:\wxWidgets-3.1.5\lib\vc14x_x64_dll
+    SWIG_DIR: C:\ProgramData\chocolatey\lib\swig\tools
+    #SWIG_EXECUTABLE: C:\Libraries\swigwin-3.0.11\swig.exe
     PYTHON_EXECUTABLE: C:\Python38-x64\python.exe
     CTEST_OUTPUT_ON_FAILURE: 1
 
-# branches to build
-branches:
-  # whitelist
-  only:
-    - master
-
 # Operating system (build VM template)
 os: Visual Studio 2019
 
@@ -50,18 +44,19 @@ before_build:
   # Copy x64 dll from system32 to python27 x64
   #- cmd: copy c:\windows\system32\PYTHON27.DLL C:\Python27-x64\python27.dll
   - echo Download wxWidgets lib
-  - ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.4/wxWidgets-3.1.4.7z'
-  - ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.4/wxMSW-3.1.4_vc14x_x64_Dev.7z'
-  - cmd: 7z x -aoa wxWidgets-3.1.4.7z -oC:\wxWidgets-3.1.4
-  - cmd: 7z x -aoa wxMSW-3.1.4_vc14x_x64_Dev.7z -oC:\wxWidgets-3.1.4
+  - ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.5/wxWidgets-3.1.5.7z'
+  - ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.5/wxMSW-3.1.5_vc14x_x64_Dev.7z'
+  - cmd: 7z x -aoa wxWidgets-3.1.5.7z -oC:\wxWidgets-3.1.5
+  - cmd: 7z x -aoa wxMSW-3.1.5_vc14x_x64_Dev.7z -oC:\wxWidgets-3.1.5
   - cmd: dir %wxWidgets_LIBRARIES%
   # Download Release wxWidgets DLL's
-  - ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.4/wxMSW-3.1.4_vc14x_x64_ReleaseDLL.7z' -Timeout 15000
-  - cmd: 7z x -aoa wxMSW-3.1.4_vc14x_x64_ReleaseDLL.7z -oC:\wxWidgets-3.1.4
+  - ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.5/wxMSW-3.1.5_vc14x_x64_ReleaseDLL.7z' -Timeout 15000
+  - cmd: 7z x -aoa wxMSW-3.1.5_vc14x_x64_ReleaseDLL.7z -oC:\wxWidgets-3.1.5
   # install dependencies:
   - choco install poedit nsis 7zip.install
-  - ps: Start-FileDownload 'https://github.com/nicolas-f/build_resources/raw/master/swigwin-3.0.11.zip' -FileName 'c:\Libraries\swigwin-3.0.11.zip' -Timeout 15000
-  - ps: 7z x -aoa c:\Libraries\swigwin-3.0.11.zip -oC:\Libraries -r -y
+  #- ps: Start-FileDownload 'https://github.com/nicolas-f/build_resources/raw/master/swigwin-3.0.11.zip' -FileName 'c:\Libraries\swigwin-3.0.11.zip' -Timeout 15000
+  #- ps: 7z x c:\Libraries\swigwin-3.0.11.zip -oC:\Libraries -r -y
+  - choco install swig
   - cmd: SET PATH=%PATH%;%WXWIN%;%SWIG_DIR%;%wxWidgets_LIB_DIR%;C:\Program Files (x86)\Poedit\Gettexttools\bin;%BOOST_LIBRARYDIR%;
   - ps: swig.exe -version
   - echo Running cmake...