Commit 96357ba7 authored by fw4splbot's avatar fw4splbot
Browse files

merge(dev): release 17.0.0

parents f8a8202d a9573746
......@@ -124,7 +124,6 @@ Please remember that JAVA_HOME is the root folder of the JDK and not the binary
For windows, the path to the JDK binaries (java, javac, etc...) must also be in the PATH environment variable.
.. include:: CommonDeps.rst
:end-before: Project configuration
Toolchain
~~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -144,7 +143,7 @@ Project configuration
To build the dependencies, you must configure the project with CMake into the Build folder. As any CMake based project, there are three different ways to perform that.
1. Command-line
+++++++++++++++++
*****************
In this case, you give all the necessary variables on the command-line in one shot :
......@@ -154,7 +153,7 @@ In this case, you give all the necessary variables on the command-line in one sh
$ cmake ../Src/fw4spl-deps -DCMAKE_INSTALL_PREFIX=~/Dev/Deps/Install/Debug -DCMAKE_BUILD_TYPE=Debug -DCROSS_COMPILING=ON -DANDROID_NATIVE_API_LEVEL=21 -DCMAKE_TOOLCHAIN_FILE=~/Dev/Droid/android.toolchain.cmake
2. NCurses based editor
+++++++++++++++++++++++++
*****************************
This editor allows to set the required each variable in a more interactive way :
......@@ -179,7 +178,7 @@ Press *"c"* to configure and then *"g"* to generate the makefiles.
.. figure:: ../media/ccmake_fw4spl-deps.png
3. Qt based gui
+++++++++++++++++
*******************
.. code:: bash
......@@ -211,7 +210,7 @@ Click on "configure" then "generate".
.. include:: CommonSrc.rst
:end-before: - Go into your Build directory
:end-before: * Go into your Build directory
- Clone fw4spl-droid repository into your source directory:
......@@ -223,8 +222,8 @@ Click on "configure" then "generate".
$ git checkout master
.. include:: CommonSrc.rst
:start-after: git checkout master
:end-before: - Change the following cmake arguments
:start-after: $ git clone https://github.com/fw4spl-org/fw4spl.git
:end-before: * Change the following cmake arguments
- Change the following cmake arguments
- ``CMAKE_INSTALL_PREFIX``: set the install location (~/Dev/Install/Debug or Release)
......
FW4SPL installation
-------------------------
Source tree layout
~~~~~~~~~~~~~~~~~~~~~~
Good practices in FW4SPL recommend to separate source files, build and install folders.
So to prepare the development environment:
So to prepare the development environment, we propose to follow this layout:
* Create a development folder (Dev)
......@@ -35,9 +35,9 @@ To prepare the third party environment:
Of course you can name the folders as you wish, or choose a different layout, but keep in mind to not build inside the source directory. This is strongly discouraged by *CMake* authors.
Dependencies
~~~~~~~~~~~~~~
-----------------
First, we need to build the third-party librairies. We will now fetch the scripts that allow to build them and then launch the compilation.
First, we need to build the third-party libraries. We will now fetch the scripts that allow to build them and then launch the compilation.
* `Clone <http://git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository#Cloning-an-Existing-Repository>`_ the following repository in the (BinPkgs/Src) source folder:
......@@ -49,9 +49,7 @@ First, we need to build the third-party librairies. We will now fetch the script
$ git clone https://github.com/fw4spl-org/fw4spl-deps.git
.. note:: *Optional*:
You can also clone this extension repository: `fw4spl-ext-deps <https://github.com/fw4spl-org/fw4spl-ext-deps.git>`_
You'll need it if you want to add extension to fw4spl (like fw4spl-ar).
You may also clone extension repositories like `fw4spl-ext-deps <https://github.com/fw4spl-org/fw4spl-ext-deps.git>`_. Additional dependency repositories must be cloned in the same directory as **fw4spl-deps** and they will be automatically discovered and then can be enabled via CMake.
* Ensure that all the cloned repositories are on the same `branch <https://git-scm.com/docs/git-branch>`_.
......@@ -63,16 +61,13 @@ First, we need to build the third-party librairies. We will now fetch the script
$ cd Dev/BinPkgs/Build/Debug
Dependencies configuration
++++++++++++++++++++++++++
Configuration
~~~~~~~~~~~~~~~~
To build the dependencies, you must configure the project with CMake into the Build folder. As any CMake based project, there are three different ways to perform that.
.. note::
All the generation options are specified in 'Dependencies generation'
1. Command-line
***************
*****************
In this case, you give all the necessary variables on the command-line in one shot :
......@@ -81,15 +76,8 @@ In this case, you give all the necessary variables on the command-line in one sh
$ cd Dev/BinPkgs/Build/Debug
$ cmake ../../Src/fw4spl-deps -DCMAKE_INSTALL_PREFIX=Dev/BinPkgs/Install/Debug -DCMAKE_BUILD_TYPE=Debug
Or, if you cloned the fw4spl-ext-deps :
.. code:: bash
$ cd Dev/BinPkgs/Build/Debug
$ cmake ../../Src/fw4spl-deps -DCMAKE_INSTALL_PREFIX=Dev/BinPkgs/Install/Debug -DCMAKE_BUILD_TYPE=Debug -DADDITIONAL_DEPS=Dev/Src/fw4spl-ext-deps
2. NCurses based editor
***********************
*************************
This editor allows to set the required each variable in a more interactive way :
......@@ -98,57 +86,38 @@ This editor allows to set the required each variable in a more interactive way :
$ cd Dev/BinPkgs/Build/Debug
$ ccmake ../../Src/fw4spl-deps
.. image:: ../media/cmake_binpkgs.png
Then change the following CMake variables:
- ``CMAKE_INSTALL_PREFIX``: set the install location, here ``Deps/BinPkgs/Install/Debug``
- ``CMAKE_BUILD_TYPE``: set the build type 'Debug' or 'Release'
- ``ADDITIONAL_DEPS``: you can leave it empty, it is only needed if you have an extra source location like fw4spl-ext-deps or a custom repository.
- ``ENABLE_SSE_SUPPORT``: enable SSE support. We need that to ensure coherency of the SSE support accross all dependencies. This option will also be forwarded to FW4SPL when building it.
- ``BUILD_FW4SPL-EXT-DEPS``: allows to enable/disable the **fw4spl-ext-deps** if you cloned it.
Press *"c"* to configure.
.. image:: ../media/osx_cmake_binpkgs.png
3. Qt based gui
***************
.. code:: bash
$ cd ~/Dev/BinPkgs/Build/Debug
$ cmake-gui ../../Src/fw4spl-deps
Like ccmake, change the following CMake variables:
- ``CMAKE_INSTALL_PREFIX``: set the install location, here ``~/Deps/Install/Debug``
- ``CMAKE_BUILD_TYPE``: set the build type 'Debug' or 'Release'
- ``ADDITIONAL_DEPS``: you can leave it empty, it is only needed if you have an extra source location like fw4spl-ext-deps or a custom repository.
Click on "configure".
The following options are also available (some of the options will be needed for the optional source repositories):
* ``ENABLE_AR``: Build **fw4spl-ar** dependencies (OpenCV, PCL, OpenIGTLink...).
* ``ENABLE_OGRE``: Build Ogre3D and its dependencies (necessary for **fw4spl-ogre**).
* ``ENABLE_CUDA``: Enable CUDA support in some libraries (OpenCV, PCL, libSGM). This requires `Cuda <https://developer.nvidia.com/cuda-downloads>`_ library to be installed on the system.
* ``ENABLE_SOFA``: Build sofa.
* ``ENABLE_EXTRAS`` : Build dependencies that are not used currently in the open-source repositories (Odil, Bullet, realsense, libSGM,...).
* ``ENABLE_EXPERIMENTAL_DEPS``: Build experimental libraries (you shouldn't use it, moreover this option is only available with **fw4spl-ext-deps**).
Dependencies generation
+++++++++++++++++++++++
When you're done, generate the code by pressing *"g"* on NCurses based editor or click on "generate" on gui.
.. warning::
Do not compile debug and release with the same Build and Install folders. If you followed the recommended folder layout, this should be fine.
``ENABLE_PCL``, ``ENABLE_LIBSGM`` and ``ENABLE_OPENCV_CUDA`` require the `Cuda <https://developer.nvidia.com/cuda-downloads>`_ library, if you intend to use one of these, you should install it before.
3. Qt based gui
*****************
Set the following options (some of the options will be needed for the optional source):
.. code:: bash
* ``ENABLE_EXPERIMENTAL_DEPS``: set to ON to build experimentals libraries (You shouldn't use it).
* ``ENABLE_INFINITAM``: set to ON to build infinitam.
* ``ENABLE_LIBSGM``: set to ON to build libSGM dependencies.
* ``ENABLE_ODIL``: set to ON to build Odil dependencies.
* ``ENABLE_OGRE``: set to ON to build ogre.
* ``ENABLE_OPENCV_CONTRIB``: set to ON to build OpenCV contrib extra modules.
* ``ENABLE_OPENCV_CUDA``: set to ON to build OpenCV with CUDA support.
* ``ENABLE_OPEN_MP``: set to ON to enable OpenMP.
* ``ENABLE_BUILD_ORB_SLAM2``: set to ON to build ORB Slam 2.
* ``ENABLE_PCL``: set to ON to build PCL.
* ``ENABLE_PCL_CUDA``: set to ON to build PCL with CUDA support.
* ``ENABLE_REALSENSE``: set to ON to build librealsense.
* ``ENABLE_SOFA``: set to ON to build sofa.
$ cd ~/Dev/BinPkgs/Build/Debug
$ cmake-gui ../../Src/fw4spl-deps
Generate the code by pressing *"g"* on NCurses based editor or click on "generate" on gui.
You can then edit the same options than with ``ccmake``.
.. warning::
Do not compile debug and release with the same Build and Install folders. If you followed the recommended folder layout, this should be fine.
\ No newline at end of file
......@@ -5,7 +5,7 @@
If you get compilation errors at this step, please ensure you installed all the requirements, especially those for `Qt <http://wiki.qt.io/Building_Qt_5_from_Git>`_.
Source
~~~~~~
--------
* `Clone <http://git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository#Cloning-an-Existing-Repository>`_ the following repositories in the (Dev/Src) source folder:
* `fw4spl <https://github.com/fw4spl-org/fw4spl.git>`_
......@@ -22,6 +22,8 @@ Source
- `fw4spl-ext <https://github.com/fw4spl-org/fw4spl-ext.git>`_ contains experimental code.
- `fw4spl-ogre <https://github.com/fw4spl-org/fw4spl-ogre.git>`_ contains a 3D backend using `Ogre3D <http://www.ogre3d.org/>`_.
* Ensure that all the cloned repositories are in the same folder as **fw4spl**. They will be automatically discovered and then can be enabled via CMake.
* Ensure that all the cloned repositories are on the same `branch <https://git-scm.com/docs/git-branch>`_.
* Update the cloned repositories to the same `tag <https://git-scm.com/book/en/v2/Git-Basics-Tagging>`_.
......@@ -32,14 +34,12 @@ Source
$ cd Dev/Build/Debug
* Open the cmake-gui.
Now you have to configure the project. You can use one of the three tools explained above.
Also, for FW4SPL, we recommend to use the `Ninja <https://ninja-build.org/>`_ generator. It builds faster, and is much better for everyday use because of how fast it is at figuring out which files need to be built. In other words, with Ninja the compilation starts instantly whereas Make spends a dozen of seconds to check what should be compiled before actually compiling something. So if you plan to develop with FW4SPL, go with Ninja. If you only want to give a single try, you can live with the standard "Unix Makefiles" generator.
Source configuration
++++++++++++++++++++
Configuration
~~~~~~~~~~~~~~~~~~~~~~~~
1. NCurses based editor
***********************
......@@ -58,42 +58,20 @@ To use ninja :
$ cd Dev/Build/Debug
$ ccmake -G Ninja ../../Src/fw4spl
.. image:: ../media/cmake_fw4spl.png
* Change the following cmake arguments
- ``CMAKE_INSTALL_PREFIX``: set the install location (~/Dev/Install/Debug or Release)
- ``CMAKE_BUILD_TYPE``: set to Debug or Release
- ``BUILD_FW4SPL-AR``: allow to enable/disable the **fw4spl-ar** repository if you cloned it.
- ``BUILD_FW4SPL-EXT``: allow to enable/disable the **fw4spl-ext** repository if you cloned it.
- ``BUILD_FW4SPL-OGRE``: allow to enable/disable the **fw4spl-ogre** repository if you cloned it.
- ``CMAKE_INSTALL_PREFIX``: set the install location, here ``~/Dev/Install/Debug``
- ``CMAKE_BUILD_TYPE``: set the build type 'Debug', 'Release', 'RelWithDebInfo' or 'MinSizeRel'
- ``EXTERNAL_LIBRARIES``: set the install path of the third party libraries you compiled earlier.(ex : ~/Dev/Install/Debug)
- ``PROJECTS_TO_BUILD``: set the list of the projects you want to build (ex: VRRender, Tuto01Basic ...), each project should be separated by ";"
- ``PROJECTS_TO_INSTALL``: set the name of the application to install
.. image:: ../media/osx_cmake_fw4spl.png
* Press *"c"* to configure and then *"g"* to generate the makefiles.
2. Qt based gui
***************
.. code:: bash
$ cd Dev/Build/Debug
$ cmake-gui ../../Src/fw4spl-deps
* Change the following CMake variables:
- ``CMAKE_INSTALL_PREFIX``: set the install location, here ``~/Dev/Install/Debug``
- ``CMAKE_BUILD_TYPE``: set the build type 'Debug' or 'Release'
- ``ADDITIONAL_DEPS``: you can leave it empty, it is only needed if you have an extra source location like fw4spl-ext-deps or a custom repository.
* Click on "configure".
* Change the following cmake arguments
- ``CMAKE_INSTALL_PREFIX``: set the install location (~/Dev/Install/Debug or Release)
- ``CMAKE_BUILD_TYPE``: set to Debug or Release
- ``EXTERNAL_LIBRARIES``: set the install path of the third party libraries you compiled earlier.(ex : ~/Deps/Install/Debug)
- ``PROJECTS_TO_BUILD``: set the list of the projects you want to build (ex: VRRender, Tuto01Basic ...), each project should be separated by ";"
- ``PROJECTS_TO_INSTALL``: set the name of the application to install
-----------------------------------
.. note::
- If ``PROJECTS_TO_BUILD`` is empty, all application will be compiled
- If ``PROJECTS_TO_INSTALL`` is empty, no application will be installed
......@@ -103,9 +81,20 @@ Click on "generate".
.. note::
To generate the projects in release mode, change CMake argument ``CMAKE_BUILD_TYPE`` to ``Release`` **both** for fw4spl and fw4spl-deps
2. Qt based gui
***************
.. code:: bash
$ cd Dev/Build/Debug
$ cmake-gui ../../Src/fw4spl
You can then edit the same options than with ``ccmake``.
Source Build
++++++++++++
Build
~~~~~~~~~~~~~~~
Then, according to the generator you chose, build FW4SPL with make :
......@@ -144,4 +133,4 @@ Example:
.. code:: bash
$ cd /Dev/Build/Debug
$ ./bin/fwlauncher share/VRRender_0-9/profile.xml
\ No newline at end of file
$ ./bin/fwlauncher share/VRRender_0-9/profile.xml
Installation for Linux
======================
Prerequisites for Linux users
--------------------------------
Prerequisites
---------------
If not already installed:
......@@ -42,16 +42,16 @@ Follow the instructions there to install the necessary packages on your system f
Since we build Qt with openssl support you also need to install ``libssl-dev`` (be sure that the version is equal or upper to 1.0.0).
``libudev-dev`` and ``libusb-1.0.0-dev`` are required by the OpenNI library. Last for VTK we also need the X Toolkit Intrinsics library headers, that you can easily install for instance on a Debian-based distribution with the packages ``libxt-dev``, ``libxrandr-dev`` and ``libxaw7-dev``.
If you are building the dependencies with the fw4spl-ext-deps additional dependencies, the VLC libraries are also needed, regarding to streaming capabilities, and thus the packages: ``libvlc-dev``, ``libvlccore-dev`` and ``vlc-nox``, are required.
If you plan to build extra dependencies, the VLC libraries are also needed, regarding to streaming capabilities, and thus the packages: ``libvlc-dev``, ``libvlccore-dev`` and ``vlc-nox``, are required.
Finally, please note that we provide Dockerfile at this `link <https://github.com/fw4spl-org/docker-fw4spl-deps>`_. The commands for dependency installation are provided there.
Finally, please note that we provide Dockerfile at this `link <https://github.com/fw4spl-org/docker-fw4spl-deps>`_. You can have a look at the Dockerfile to get the precise list of commands needed to install dependencies.
.. include:: CommonDeps.rst
Dependencies build
++++++++++++++++++
Build
~~~~~~~~~
Now you can compile the FW4SPL dependencies with make in the console, it will automaticaly download, build and install each dependency.
Now you can compile the FW4SPL dependencies with make in the console, it will automatically download, build and install each dependency.
.. code:: bash
......@@ -62,7 +62,7 @@ Now you can compile the FW4SPL dependencies with make in the console, it will au
.. include:: CommonSrc.rst
Recommended software
-------------------------
--------------------------------
The following programs may be helpful for your developments:
......
Installation for MacOSX
=======================
Prerequisites for MacOSX users
--------------------------------
Prerequisites
-----------------
If not already installed:
......@@ -25,7 +25,7 @@ For Openni dependency, you need libusb
$ brew install libusb-compat
If you are building the dependencies with the fw4spl-ext-deps additional dependencies, the `VLC <https://www.videolan.org/vlc/index.fr.html>`_ application is also needed.
If you plan to build extra dependencies, the `VLC <https://www.videolan.org/vlc/index.fr.html>`_ application is also needed.
.. code:: bash
......@@ -33,8 +33,8 @@ If you are building the dependencies with the fw4spl-ext-deps additional depende
.. include:: CommonDeps.rst
Compilation
++++++++++++++
Build
~~~~~~~~
Now you can compile the FW4SPL dependencies with make in the console, it will automaticaly download, build and install each dependency.
......@@ -46,7 +46,7 @@ Now you can compile the FW4SPL dependencies with make in the console, it will au
.. include:: CommonSrc.rst
Recommended software
-------------------------
--------------------------------
The following programs may be helpful for your developments:
......
Installation for Windows
=========================
Prerequisites for Windows users
--------------------------------
Prerequisites
----------------
If not already installed:
......@@ -25,8 +25,8 @@ Qt is an external library used in FW4SPL. For the successful compilation of Qt f
- http://wiki.qt.io/Building_Qt_5_from_Git
FW4SPL installation
-------------------
Source tree layout
~~~~~~~~~~~~~~~~~~~~~~
Good practices in FW4SPL recommend to separate source files, build and install folders.
So to prepare the development environment:
......@@ -67,7 +67,7 @@ To compile BinPkgs and sources, you must use the 'VS2015 x64 Native Tools Comman
.. |directories| image:: ../media/Directories.png
Dependencies
~~~~~~~~~~~~
-----------------
First, we need first to build the third-party librairies. We will now fetch the scripts that allow to build them and then launch the compilation.
......@@ -81,9 +81,7 @@ First, we need first to build the third-party librairies. We will now fetch the
> git clone https://github.com/fw4spl-org/fw4spl-deps.git
.. note:: *Optional*:
You can also clone this extension repository: `fw4spl-ext-deps <https://github.com/fw4spl-org/fw4spl-ext-deps.git>`_
You'll need it if you want to add extension to fw4spl (like fw4spl-ar).
You may also clone extension repositories like `fw4spl-ext-deps <https://github.com/fw4spl-org/fw4spl-ext-deps.git>`_. Additional dependency repositories must be cloned in the same directory as **fw4spl-deps** and they will be automatically discovered and then can be enabled via CMake.
* Check if all the cloned repositories are on the same `branch <https://git-scm.com/docs/git-branch>`_.
......@@ -113,8 +111,8 @@ First, we need first to build the third-party librairies. We will now fetch the
> cmake-gui
Dependencies configuration
++++++++++++++++++++++++++
Configuration
~~~~~~~~~~~~~~~~
.. note::
All the generation options are specified in 'Dependencies generation'
......@@ -131,37 +129,26 @@ Dependencies configuration
* ``CMAKE_INSTALL_PREFIX``: set the install location (e.g. Dev\\BinPkgs\\Install\\Debug or Release).
* ``CMAKE_BUILD_TYPE``: set to Debug or Release.
* ``ADDITIONAL_DEPS``: you can leave it empty, it is only needed if you have an extra source location like fw4spl-ext-deps or a custom repository.
* ``BUILD_FW4SPL-EXT-DEPS``: allows to enable/disable the **fw4spl-ext-deps** if you cloned it.
* Click on "configure".
Dependencies generation
+++++++++++++++++++++++
.. warning::
Generation
~~~~~~~~~~~~~~
``ENABLE_PCL``, ``ENABLE_LIBSGM`` and ``ENABLE_OPENCV_CUDA`` require `Cuda <https://developer.nvidia.com/cuda-downloads>`_ library, if you intend to use one of these, you should install it befor and re-open the ‘VS2015 x64 Native Tools Command Prompt’ to update your PATH.
Set the following options (some of the options will be needed for the optional source repositories):
Set the following options (some of the options will be needed for the optional source):
* ``ENABLE_EXPERIMENTAL_DEPS``: set to ON to build experimentals libraries (You shouldn't use it).
* ``ENABLE_INFINITAM``: set to ON to build infinitam.
* ``ENABLE_LIBSGM``: set to ON to build libSGM dependencies.
* ``ENABLE_ODIL``: set to ON to build Odil dependencies.
* ``ENABLE_OGRE``: set to ON to build ogre.
* ``ENABLE_OPENCV_CONTRIB``: set to ON to build OpenCV contrib extra modules.
* ``ENABLE_OPENCV_CUDA``: set to ON to build OpenCV with CUDA support.
* ``ENABLE_OPEN_MP``: set to ON to enable OpenMP.
* ``ENABLE_BUILD_ORB_SLAM2``: set to ON to build ORB Slam 2.
* ``ENABLE_PCL``: set to ON to build PCL.
* ``ENABLE_PCL_CUDA``: set to ON to build PCL with CUDA support.
* ``ENABLE_REALSENSE``: set to ON to build librealsense.
* ``ENABLE_SOFA``: set to ON to build sofa.
* ``ENABLE_AR``: Build **fw4spl-ar** dependencies (OpenCV, PCL, OpenIGTLink...).
* ``ENABLE_OGRE``: Build Ogre3D and its dependencies (necessary for **fw4spl-ogre**).
* ``ENABLE_CUDA``: Enable CUDA support in some libraries (OpenCV, PCL, libSGM). This requires `Cuda <https://developer.nvidia.com/cuda-downloads>`_ library to be installed on the system and present in your PATH.
* ``ENABLE_SOFA``: Build sofa.
* ``ENABLE_EXTRAS`` : Build dependencies that are not used currently in the open-source repositories (Odil, Bullet, realsense, libSGM,...).
* ``ENABLE_EXPERIMENTAL_DEPS``: Build experimental libraries (you shouldn't use it, moreover this option is only available with **fw4spl-ext-deps**).
* click on "generate".
Dependencies build
++++++++++++++++++
Build
~~~~~~~~~~~
* Compile the FW4SPL dependencies using jom in the console:
......@@ -179,7 +166,7 @@ Dependencies build
.. note:: To prevent any future problems with source generation, ensure that all the libraries have been compiled
Source
~~~~~~
----------
* `Clone <http://git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository#Cloning-an-Existing-Repository>`_ the following repositories in the (Dev\Src) source folder:
* `fw4spl <https://github.com/fw4spl-org/fw4spl.git>`_
......@@ -196,6 +183,8 @@ Source
- `fw4spl-ext <https://github.com/fw4spl-org/fw4spl-ext.git>`_ contains experimental code.
- `fw4spl-ogre <https://github.com/fw4spl-org/fw4spl-ogre.git>`_ contains a 3D backend using `Ogre3D <http://www.ogre3d.org/>`_.
* Ensure that all the cloned repositories are in the same folder as **fw4spl**. They will be automatically discovered and then can be enabled via CMake.
* Ensure that all the cloned repositories are on the same `branch <https://git-scm.com/docs/git-branch>`_.
* Update the cloned repositories to the same `tag <https://git-scm.com/book/en/v2/Git-Basics-Tagging>`_.
......@@ -224,8 +213,8 @@ Source
> cmake-gui
Source configuration
++++++++++++++++++++
Configuration
~~~~~~~~~~~~~~~~
* Set the desired Build directory (e.g. Dev\\Build\\Debug or Release)
......@@ -235,8 +224,8 @@ Source configuration
* During configure step, choose the generator 'Ninja' to compile FW4SPL sources.
Source generation
+++++++++++++++++
Generation
~~~~~~~~~~~~~~
* Set the following arguments:
......@@ -259,8 +248,8 @@ Source generation
* click on "generate".
Source build
++++++++++++
Build
~~~~~~~
* Compile the FW4SPL source using ninja in the console:
......
......@@ -4,7 +4,7 @@
[*Tuto05Mesher*] Create a mesh from an image
**********************************************
The fifth tutorial explains how to use several objects in an application.
The fifth tutorial explains how to use several objects in an application.
This application provides an action to create a mesh from an image mask.
.. figure:: ../media/tuto05Mesher.png
......@@ -15,7 +15,7 @@ This application provides an action to create a mesh from an image mask.
Prerequisites
===============
Before reading this tutorial, you should have seen :
Before reading this tutorial, you should have seen:
* :ref:`tuto04`
......@@ -25,7 +25,7 @@ Structure
Properties.cmake
------------------
This file describes the project information and requirements :
This file describes the project information and requirements:
.. code-block:: cmake
......@@ -189,6 +189,11 @@ This file is in the ``rc/`` directory of the application. It defines the service
<percentReduction value="0" />
</service>
<!-- Add a shortcut in the application (key "v") -->
<service uid="ActionShortcut" type="::guiQt::SSignalShortcut">
<config shortcut="v" sid="myDefaultView" />
</service>
<!--
Services associated to the Image data :
Visualization, reading and writing service creation.
......@@ -225,7 +230,14 @@ This file is in the ``rc/`` directory of the application. It defines the service
<type mode="writer" />
</service>
<!-- Connect the shortcut "v" to the update slot of 'actionCreateVTKMesh'-->
<connect>
<signal>ActionShortcut/activated</signal>
<slot>actionCreateVTKMesh/update</slot>
</connect>
<start uid="myFrame" />
<start uid="ActionShortcut" />
</config>
</extension>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment