diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetFloatParameterFactory.cxx b/Code/Wrappers/QtWidget/otbWrapperQtWidgetFloatParameterFactory.cxx
index 9d2945d48f75495ffa2173e422120c242e847b66..9d1f751eee6d8de1282b575de1652c4155505824 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetFloatParameterFactory.cxx
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetFloatParameterFactory.cxx
@@ -52,6 +52,7 @@ QWidget * QtWidgetFloatParameterFactory::CreateQtWidget(Parameter * param)
input->setDecimals(5);
input->setRange(floatParam->GetMinimumValue(), floatParam->GetMaximumValue());
input->setToolTip(floatParam->GetDescription());
+
QString optionID(floatParam->GetName());
hLayout->addWidget(input);
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetIntParameterFactory.cxx b/Code/Wrappers/QtWidget/otbWrapperQtWidgetIntParameterFactory.cxx
index 3840d6f60e3d0d554b6f247c2ed06053817fd463..de7f7aeb5862e73ee0c18d117178d6a182c952d0 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetIntParameterFactory.cxx
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetIntParameterFactory.cxx
@@ -38,28 +38,33 @@ QWidget * QtWidgetIntParameterFactory::CreateQtWidget(Parameter * param)
IntParameter * intParam = dynamic_cast<IntParameter *>(param);
// Check if dynamic cast succeeds
- if(!param)
+ if(!intParam)
{
return 0;
}
-
- // Set up input text edit
- QHBoxLayout *hLayout = new QHBoxLayout;
- hLayout->setSpacing(0);
- hLayout->setContentsMargins(0,0,0,0);
+
+ // a GridLayout with two colums : option name / option inputs
+ QGroupBox *gridGroup = new QGroupBox;
+ gridGroup->setFlat(true);
+
+ QGridLayout *gridLayout = new QGridLayout;
+ gridLayout->setSpacing(1);
+ gridLayout->setContentsMargins(0,0,0,0);
+ gridGroup->setLayout(gridLayout);
QSpinBox* input = new QSpinBox;
input->setRange(intParam->GetMinimumValue(), intParam->GetMaximumValue());
input->setToolTip(intParam->GetDescription());
-
- QString optionID(intParam->GetName());
- hLayout->addWidget(input);
- hLayout->addStretch();
+ // Set up label
+ QLabel *label = new QLabel;
+ label->setText(intParam->GetName());
+ label->setToolTip(intParam->GetDescription());
+
+ gridLayout->addWidget(label,0,0);
+ gridLayout->addWidget(input,0,1);
- QGroupBox *paramHGroup = new QGroupBox;
- paramHGroup->setLayout(hLayout);
- return paramHGroup;
+ return gridGroup;
}
}
}
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterFactory.cxx b/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterFactory.cxx
index 5914eb16e7cb67702cf4f041ccde3d303129a5cb..d3d9217b9908be091d6141f3bd6598ec89f6837e 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterFactory.cxx
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterFactory.cxx
@@ -21,6 +21,7 @@
//#include "otbWrapperQtWidgetNumericalParameterFactory.h"
#include "otbWrapperQtWidgetEmptyParameterFactory.h"
#include "otbWrapperQtWidgetIntParameterFactory.h"
+#include "otbWrapperQtWidgetFloatParameterFactory.h"
//#include "otbWrapperQtWidgetStringParameterFactory.h"
//#include "otbWrapperQtWidgetChoiceParameterFactory.h"
@@ -49,8 +50,8 @@ QtWidgetParameterFactory::CreateQtWidget( Parameter* param )
if (!widget)
widget = QtWidgetIntParameterFactory::CreateQtWidget( param );
- // if (!widget)
- // widget = QtWidgetFloatParameterFactory::CreateQtWidget( param );
+ if (!widget)
+ widget = QtWidgetFloatParameterFactory::CreateQtWidget( param );
if (!widget)
widget = QtWidgetEmptyParameterFactory::CreateQtWidget( param );
@@ -61,7 +62,7 @@ QtWidgetParameterFactory::CreateQtWidget( Parameter* param )
//if (!widget)
// widget = QtWidgetChoiceParameterFactory::CreateQtWidget( param );
- return 0;
+ return widget;
}
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterFactory.h b/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterFactory.h
index df5015958c2807e1ac423f09890b0cd434c58f24..05f5adf8622cc0a96b809c3a063d8fd16afef7a2 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterFactory.h
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterFactory.h
@@ -38,6 +38,9 @@ public:
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
+ /** New() method */
+ itkNewMacro(Self);
+
/** Run-time type information (and related methods). */
itkTypeMacro(QtWidgetParameterFactory, Object);
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 9a05f461b98f24030f1cb7ede02769c30b889a88..1eeced66817c7845e07d3bfe36ac72480fb5c273 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -5,6 +5,7 @@ IF(WIN32)
ENDIF(WIN32)
SET(OTB_WRAPPER_TESTS ${CXX_TEST_PATH}/otbWrapperTests)
+SET(OTB_WRAPPER_QT_TESTS ${CXX_TEST_PATH}/otbWrapperQtWidgetTests)
ADD_TEST(owTuParameterNew ${OTB_WRAPPER_TESTS}
otbWrapperParameterNew
@@ -48,6 +49,13 @@ ADD_TEST(owTuApplication ${OTB_WRAPPER_TESTS}
otbWrapperApplicationNew
)
+IF(OTB_USE_QT)
+ADD_TEST(owTvQtWidgetParameterFactory ${OTB_WRAPPER_QT_TESTS}
+ otbWrapperQtWidgetParameterFactory
+)
+
+ENDIF(OTB_USE_QT)
+
# ----------------Source files CXX -----------------------------------
SET(Wrapper_SRCS
@@ -63,3 +71,14 @@ otbWrapperInputImageParameterTest.cxx
ADD_EXECUTABLE(otbWrapperTests ${Wrapper_SRCS})
TARGET_LINK_LIBRARIES(otbWrapperTests OTBIO OTBCommon ITKIO ITKCommon OTBTesting OTBWrapperCore)
+IF(OTB_USE_QT)
+
+SET(WrapperQtWidget_SRCS
+otbWrapperQtWidgetTests.cxx
+otbWrapperQtWidgetParameterFactory.cxx
+)
+
+ADD_EXECUTABLE(otbWrapperQtWidgetTests ${WrapperQtWidget_SRCS})
+TARGET_LINK_LIBRARIES(otbWrapperQtWidgetTests OTBIO OTBCommon ITKIO ITKCommon OTBTesting OTBWrapperCore OTBWrapperQtWidget)
+
+ENDIF(OTB_USE_QT)
diff --git a/Testing/otbWrapperQtWidgetParameterFactory.cxx b/Testing/otbWrapperQtWidgetParameterFactory.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..015d873b2d536fb9a20f95e8384af91196f464bb
--- /dev/null
+++ b/Testing/otbWrapperQtWidgetParameterFactory.cxx
@@ -0,0 +1,71 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+#if defined(_MSC_VER)
+#pragma warning ( disable : 4786 )
+#endif
+
+#include "otbWrapperQtWidgetParameterFactory.h"
+#include "otbWrapperEmptyParameter.h"
+#include "otbWrapperNumericalParameter.h"
+
+int otbWrapperQtWidgetParameterFactory(int argc, char* argv[])
+{
+ QApplication app(argc, argv);
+
+ otb::Wrapper::QtWidgetParameterFactory::Pointer factory = otb::Wrapper::QtWidgetParameterFactory::New();
+
+ otb::Wrapper::IntParameter::Pointer intParam = otb::Wrapper::IntParameter::New();
+ otb::Wrapper::FloatParameter::Pointer floatParam = otb::Wrapper::FloatParameter::New();
+ otb::Wrapper::EmptyParameter::Pointer emptyParam = otb::Wrapper::EmptyParameter::New();
+
+ intParam->SetName("Int parameter");
+ intParam->SetDescription("This is an int parameter");
+ intParam->SetKey("int");
+ intParam->SetDefaultValue(10);
+ intParam->SetValue(5);
+ intParam->SetMinimumValue(-10);
+ intParam->SetMaximumValue(10);
+
+ floatParam->SetName("Float parameter");
+ floatParam->SetDescription("This is an float parameter");
+ floatParam->SetKey("float");
+ floatParam->SetDefaultValue(0.567);
+ floatParam->SetValue(0.21);
+ floatParam->SetMinimumValue(-3.75);
+ floatParam->SetMaximumValue(4.97);
+
+ emptyParam->SetName("Empty parameter");
+ emptyParam->SetDescription("This is an empty parameter");
+ emptyParam->SetKey("empty");
+
+
+ QWidget * intWidget = factory->CreateQtWidget(intParam);
+ QWidget * floatWidget = factory->CreateQtWidget(floatParam);
+ QWidget * emptyWidget = factory->CreateQtWidget(emptyParam);
+
+ if(intWidget)
+ {
+ intWidget->show();
+ floatWidget->show();
+ emptyWidget->show();
+
+ return EXIT_SUCCESS;
+ }
+
+ return EXIT_FAILURE;
+}
diff --git a/Testing/otbWrapperQtWidgetTests.cxx b/Testing/otbWrapperQtWidgetTests.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..8cdafefb8d44da9090ef9206f75a734cf21837fb
--- /dev/null
+++ b/Testing/otbWrapperQtWidgetTests.cxx
@@ -0,0 +1,28 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+
+#if defined(_MSC_VER)
+#pragma warning ( disable : 4786 )
+#endif
+
+#include "otbTestMain.h"
+
+void RegisterTests()
+{
+ REGISTER_TEST(otbWrapperQtWidgetParameterFactory);
+}