GitLab

Result after adding the --break-closing-brackets
to astyle
Signed-off-by: Emmanuel Promayon <Emmanuel.Promayon@imag.fr>

This is the result of running a basic
astyle --style=java -R *.cpp *.h
Signed-off-by: Emmanuel Promayon <Emmanuel.Promayon@imag.fr>

Conflicts:
	CMakeLists.txt
	sdk/cmake/modules/macros/camitk/CamiTKExtension.cmake

Reordering includes to avoid problems on Win32 with VTKQWidget2

This hotfix modifies RendererWidget inheritance. Now RendererWidget
inherits from VTKQWidget2 instead of VTKQWidget.
In VTK 6.3, VTKQWidget2 include somehow somewhere Win32 headers.
This defines the ERROR macro, which creates a conflict with the ApplyStatus enum
(that also defines ERROR apply status).
In order to solve this conflict, #include "Action.h" should be done before
any \#include "InteractiveViewer.h" or "RendererWidget.h"

Signed-off-by: Emmanuel Promayon <Emmanuel.Promayon@imag.fr>

There is also some specific OpenGL Format/context forced
reinitialization for integrated card (as well as a mean
to avoir this reinitialization, using CAMITK_NO_OPENGL_RESET=1
environment variable.
Note: use primusrun instead of optirun for GPU/discrete card
configuration on Linux (bumblebee)
Signed-off-by: Emmanuel Promayon <Emmanuel.Promayon@imag.fr>

If testing is disable, disable also all dependencies to
the testing applications as well as disabling test
proprerties.

Reordering includes to avoid problems on Win32 with VTKQWidget2

This hotfix modifies RendererWidget inheritance. Now RendererWidget
inherits from VTKQWidget2 instead of VTKQWidget.
In VTK 6.3, VTKQWidget2 include somehow somewhere Win32 headers.
This defines the ERROR macro, which creates a conflict with the ApplyStatus enum
(that also defines ERROR apply status).
In order to solve this conflict, #include "Action.h" should be done before
any \#include "InteractiveViewer.h" or "RendererWidget.h"

- sidebar has a smaller minimum size and is resizable
- screenshot action is no more visible by default
(this can be toggled on/off in the viewer menu)
Signed-off-by: Emmanuel Promayon <Emmanuel.Promayon@imag.fr>

Signed-off-by: Emmanuel Promayon <Emmanuel.Promayon@imag.fr>

There is also some specific OpenGL Format/context forced
reinitialization for integrated card (as well as a mean
to avoir this reinitialization, using CAMITK_NO_OPENGL_RESET=1
environment variable.
Note: use primusrun instead of optirun for GPU/discrete card
configuration on Linux (bumblebee)
Signed-off-by: Emmanuel Promayon <Emmanuel.Promayon@imag.fr>

If testing is disable, disable also all dependencies to
the testing applications as well as disabling test
proprerties.

Signed-off-by: Emmanuel Promayon <Emmanuel.Promayon@imag.fr>

action or component are used, interaction with progress or
status bar should be voided.
Signed-off-by: Emmanuel Promayon <Emmanuel.Promayon@imag.fr>

Signed-off-by: Emmanuel Promayon <Emmanuel.Promayon@imag.fr>

Signed-off-by: Emmanuel Promayon <Emmanuel.Promayon@imag.fr>