Commit ef836ebb authored by promayon's avatar promayon
Browse files

FIXED Do not force install dir, please set it in the CamiTK install root path...

FIXED Do not force install dir, please set it in the CamiTK install root path in your CMake command line / GUI
FIXED module path when only using installed version of CamiTK
FIXED parameters in Wizard can have space in names (e.g. "This Is A Parameter", the generated C++ variable is "thisIsAParameter", which compiles) (undocumented bug), this is more intuitive for the GUI/action widget
FIXED QPointF, QPoint, QVector and QVector3D parameters in Wizard correctly handled (undocumented bug)
FIXED updated testdata xml files consequently in order to check the possibility of using white space in property names

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@258 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 711b16f3
This diff is collapsed.
......@@ -81,7 +81,7 @@ Action::ApplyStatus @ACTIONCLASSNAME@::apply() {
// Get the parameters
@ENDIF_ADDPROPERTIES@
@BEGIN_ADDPROPERTIES@
@PROPERTY_TYPE@ @PROPERTY_NAME@ = property("@PROPERTY_NAME@").@PROPERTY_TOTYPE@;
@PROPERTY_TYPE@ @PROPERTY_CPP_NAME@ = property("@PROPERTY_NAME@").@PROPERTY_TOTYPE@;
@END_ADDPROPERTIES@
// For this example, the action just pops up a message.
......@@ -92,7 +92,7 @@ Action::ApplyStatus @ACTIONCLASSNAME@::apply() {
in << "With parameters: " << endl;
@ENDIF_ADDPROPERTIES@
@BEGIN_ADDPROPERTIES@
in << "@PROPERTY_NAME@: " << @PROPERTY_NAME@ << endl;
in << "@PROPERTY_NAME@: " << @PROPERTY_NAME_STRING@ << endl;
@END_ADDPROPERTIES@
QMessageBox::warning(NULL, "Action Called", msg);
......@@ -106,7 +106,7 @@ Action::ApplyStatus @ACTIONCLASSNAME@::apply() {
// Get the parameters
@ENDIF_ADDPROPERTIES@
@BEGIN_ADDPROPERTIES@
@PROPERTY_TYPE@ @PROPERTY_NAME@ = property("@PROPERTY_NAME@").@PROPERTY_TOTYPE@;
@PROPERTY_TYPE@ @PROPERTY_CPP_NAME@ = property("@PROPERTY_NAME@").@PROPERTY_TOTYPE@;
@END_ADDPROPERTIES@
// For this example, the action just pops up a message.
......@@ -117,7 +117,7 @@ Action::ApplyStatus @ACTIONCLASSNAME@::apply() {
in << "With parameters: " << endl;
@ENDIF_ADDPROPERTIES@
@BEGIN_ADDPROPERTIES@
in << "@PROPERTY_NAME@: " << @PROPERTY_NAME@ << endl;
in << "@PROPERTY_NAME@: " << @PROPERTY_NAME_STRING@ << endl;
@END_ADDPROPERTIES@
QMessageBox::warning(NULL, "Action Called", msg);
@ENDIF_DEFCOMPONENT@
......@@ -132,7 +132,7 @@ void @ACTIONCLASSNAME@::process(@COMPONENTNAME@ * comp) {
// Get the parameters
@ENDIF_ADDPROPERTIES@
@BEGIN_ADDPROPERTIES@
@PROPERTY_TYPE@ @PROPERTY_NAME@ = property("@PROPERTY_NAME@").@PROPERTY_TOTYPE@;
@PROPERTY_TYPE@ @PROPERTY_CPP_NAME@ = property("@PROPERTY_NAME@").@PROPERTY_TOTYPE@;
@END_ADDPROPERTIES@
// For this example, the action just pops up a message.
......
......@@ -20,6 +20,8 @@
<parameter name="a" type="int" defaultValue="0"/>
<parameter name="b" type="double" defaultValue="2.0"/>
<parameter name="c" type="QString" defaultValue='QString("hello")'/>
<parameter name="a long name with space" type="QPoint" defaultValue='QPoint(0, 0)'/>
<parameter name="YET another one" type="QPointF" defaultValue='QPointF(0.0, 0.0)'/>
</parameters>
......
......@@ -17,9 +17,10 @@
</classification>
<parameters>
<parameter name="aTime" type="QTime"/>
<parameter name="aDate" type="QDate"/>
<parameter name="aVector3D" type="QVector3D"/>
<parameter name="b" type="bool"/>
<parameter name="aTime" type="QTime"/>
<parameter name="A Date" type="QDate"/>
<parameter name="A Vector 3D" type="QVector3D"/>
</parameters>
......
......@@ -165,7 +165,7 @@ if (UNIX AND NOT WIN32)
# Installation path
# Set the install location to "/usr"
set(CAMITK_INSTALL_ROOT "/usr") # Set the CamiTK install root path in your CMake command line / GUI.
# set(CAMITK_INSTALL_ROOT "/usr") # Set the CamiTK install root path in your CMake command line / GUI.
set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
set(CPACK_PACKAGE_DEFAULT_LOCATION "/usr")
set(CPACK_SET_DESTDIR TRUE)
......
......@@ -116,7 +116,7 @@ if(NOT ${CAMITK_INSTALL_ROOT} EQUAL "")
link_directories(${CAMITK_INSTALL_ROOT}/lib)
# update module path
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CAMITK_LIB_DIR}/cmake ${CAMITK_INSTALL_ROOT}/camitk/cmake/modules ${CMAKE_CURRENT_SOURCE_DIR}/../camitk/cmake/modules)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CAMITK_LIB_DIR}/cmake ${CAMITK_INSTALL_ROOT}/camitk/cmake/modules ${CMAKE_CURRENT_SOURCE_DIR}/../camitk/cmake/modules ${CAMITK_INSTALL_ROOT}/share/${CAMITK_SHORT_VERSION_STRING}/cmake)
# include useful modules
include(CamiTKVariables)
......
Markdown is supported
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