Commit c594dfcb authored by Victor Poughon's avatar Victor Poughon

Merge branch 'develop' into 513-SetFileName

parents 3323621c 1c6b1407
We are ready to release OTB version MAJOR.MINOR.PATCH. The following steps need to be done:
### 1. Branches
* [ ] **(if major or minor release)** Feature freeze: [create the new release branch](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#create-release-branch)
* [ ] **(if patch release)** Work on the already existing branch `release-MAJOR-MINOR`
* [ ] Make sure the version number in `CMakeLists.txt` is MAJOR.MINOR.PATCH
### 2. Housekeeping
* [ ] In this story, make a list of blocking issues for the release (if any)
* [ ] [Update dashboard scripts](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#dashboard) to support new version numbers
* [ ] [Update the SuperBuild archive](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#superbuild-archive) (if needed)
* [ ] Update release notes (walk the GitLab MR merged history and log all improvements)
* [ ] Update the date in RELEASE_NOTES.txt
* [ ] Run Debian [spelling](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#spelling-check) checker
* [ ] Run shellcheck script from [OTB-Devutils/Scripts/](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-devutils/blob/master/Scripts/run_shellcheck.sh)
* [ ] [Update translation](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#translation-for-monteverdi-mapla) for Monteverdi and Mapla
* [ ] [Sanity check the binary packages](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#standalone-packages-sanity-check)
* [ ] Windows
* [ ] Linux
* [ ] Mac
### 3. Actual release
Once all blocking issues are closed, and the previous steps are done:
* [ ] [Tag the release or RC](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#release-tag)
* [ ] **(if major or minor release)**: Merge the release into develop
* [ ] **(if it's the latest release)**: Merge the release into master
* [ ] **(if patch release)**: Backport fixes
* [ ] Update GIT_TAG for all official remote modules (if needed)
### 4. Publish and plan next release
* [ ] [Prepare and upload source packages](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#prepare-and-upload-source-packages)
* [ ] [Promote nightly packages](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#promote-nightly-packages)
* [ ] [Update documentation](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#update-documentation)
* [ ] Software Guide
* [ ] Cookbook
* [ ] Doxygen
* [ ] Application online documentation
* [ ] WordPress page "Home" and "Download" pages
* [ ] Upload OTB source archive to [Zenodo](https://zenodo.org/) to create a unique Digital Object Identifier (DOI)
* [ ] Update OTB-Data-Examples.tgz on orfeo-toolbox (packages)
* [ ] Send email to mailing list to announce the release
* [ ] Release announcement on the blog
* [ ] Announcement on social networks (twitter, google+)
* [ ] Forward announcement to news_item@osgeo.org ([OSGeo news](https://www.osgeo.org/foundation-news/))
* [ ] Plan the next release (nominate new release manager, setup PSC meeting on IRC)
* [ ] Contact QGis processing plugin maintainer to update XML description for new OTB-Applications (or [supply it](https://wiki.orfeo-toolbox.org/index.php/QGIS_access_to_OTB_applications#updating-the-XML-descriptors))
* [ ] Remove public branches related to MR or bugfix merged before the release
/label ~story
......@@ -23,7 +23,8 @@ cmake_minimum_required(VERSION 3.1.0)
foreach(p
CMP0025 # CMake 3.0
CMP0042 # CMake 3.0
CMP0058
CMP0058 # CMake 3.3
CMP0072 # CMake 3.11
)
if(POLICY ${p})
cmake_policy(SET ${p} NEW)
......
......@@ -177,3 +177,21 @@ Regarding labels, we use the following set:
* ~"To Do": action is planned
* ~Doing: work in progress
* ~api ~app ~documentation ~monteverdi ~packaging ~qgis: optional context information
## Versioning
Starting from OTB 7.0.0, we use [semantic versioning](https://semver.org/). See the website for the full spec, in summary:
> Given a version number MAJOR.MINOR.PATCH, increment the:
>
> 1. MAJOR version when you make incompatible API changes,
> 2. MINOR version when you add functionality in a backwards-compatible manner, and
> 3. PATCH version when you make backwards-compatible bug fixes.
>
> Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format.
The develop branch is always the place where the upcoming major or minor release is worked on. Patch releases are done on release branches, for example 7.0.1 and 7.0.2 could be found on the release-7.0 branch.
For the purpose of defining backwards compatibility, the OTB API covers (not an exhaustive list): the C++ API, the Python bindings, application names, application parameters, output format and interpretation of input data.
When we deprecate part of our public API, we should do two things: (1) update our documentation to let users know about the change, (2) issue a new minor or major release with the deprecation in place.
......@@ -34,7 +34,7 @@ Julien Malik (CS),
Julien Michel (CS then CNES),
Julien Osman,
Julien Radoux (UCL),
Lauren\cb{t}iu Nicola (CS ROMANIA),
Laurentiu Nicola (CS ROMANIA),
Luc Hermitte (CS),
Ludovic Hussonnois (CS),
Manuel Grizonnet (CNES),
......
......@@ -29,11 +29,11 @@ set( OTBQtAdapters_HEADERS_MOC
add_to_qt_i18n_sources( ${OTBQtAdapters_SRCS} )
add_to_qt_i18n_headers( "../include" ${OTBQtAdapters_SRCS} )
qt5_wrap_cpp( OTBQtAdapters_SRC_MOC ${OTBQtAdapters_HEADERS_MOC} )
qt5_wrap_cpp( OTBQtAdapters_SRC_MOC ${OTBQtAdapters_HEADERS_MOC} OPTIONS -p "." )
add_library( OTBQtAdapters ${OTBQtAdapters_SRC} ${OTBQtAdapters_SRC_MOC})
target_link_libraries( OTBQtAdapters
target_link_libraries( OTBQtAdapters
${OTBQt_LIBRARIES}
)
......
......@@ -52,7 +52,7 @@ PersistentStreamingStatisticsMapFromLabelImageFilter<TInputVectorImage, TLabelIm
template<class TInputVectorImage, class TLabelImage>
typename itk::DataObject::Pointer
PersistentStreamingStatisticsMapFromLabelImageFilter<TInputVectorImage, TLabelImage>
::MakeOutput(DataObjectPointerArraySizeType output)
::MakeOutput(DataObjectPointerArraySizeType itkNotUsed(output))
{
return static_cast<itk::DataObject*>(PixelValueMapObjectType::New().GetPointer());
}
......
......@@ -116,13 +116,17 @@ public:
m_CreationOptions = opts;
}
itkSetMacro(NoDataList, NoDataListType);
GDALCreationOptionsType GetOptions(void)
{
return m_CreationOptions;
}
/** Set NoDataList */
void SetNoDataList(const NoDataListType& noDataList)
{
m_NoDataList = noDataList;
}
/** Provide hist about the output container to deal with complex pixel
* type */
void SetOutputImagePixelType( bool isComplexInternalPixelType,
......
......@@ -18,7 +18,7 @@
# limitations under the License.
#
#detection of OpenGL is apply is bit tricy as we deactivate
#detection of OpenGL is apply is a bit tricky as we deactivate
#framework on OSX globally. see mantis #1193
if(APPLE)
set( OPENGL_FOUND FALSE )
......@@ -38,7 +38,7 @@ if(APPLE)
PATHS "/System/Library/Frameworks/"
DOC "OpenGL lib for OSX"
)
find_library(
OPENGL_glu_LIBRARY AGL
PATHS "/System/Library/Frameworks/"
......@@ -62,6 +62,7 @@ if(APPLE)
)
else(APPLE)
find_package(OpenGL REQUIRED)
mark_as_advanced(OPENGL_INCLUDE_DIR)
mark_as_advanced(OPENGL_LIBRARIES)
endif(APPLE)
......@@ -73,11 +74,15 @@ if(NOT OPENGL_INCLUDE_DIR)
endif()
endif()
if(NOT OPENGL_gl_LIBRARY)
message(FATAL_ERROR "Could not find OpenGL (missing: OPENGL_gl_LIBRARY")
# For CMake > 3.11 the default GLVND instead of legacy GL library
# Test both of them to
# FIXME: As stated in CMake documentation we should use the OpenGL::* import targets instead available
# It should be done when OTB will increase CMake minimum version to 3.X
# See: https://cmake.org/cmake/help/v3.11/module/FindOpenGL.html
if(NOT OPENGL_gl_LIBRARY AND NOT OPENGL_opengl_LIBRARY)
message(FATAL_ERROR "Could not find OpenGL (missing: OPENGL_gl_LIBRARY or OPENGL_opengl_LIBRARY")
endif()
if(NOT OPENGL_glu_LIBRARY)
message(FATAL_ERROR "Could not find OpenGL (missing: OPENGL_glu_LIBRARY")
endif()
......@@ -61,7 +61,7 @@ if (WIN32)
endif()
#############################################################################
qt5_wrap_cpp( OTBMapla_SRC_MOC ${OTBMapla_HEADERS_MOC} )
qt5_wrap_cpp( OTBMapla_SRC_MOC ${OTBMapla_HEADERS_MOC} OPTIONS -p "." )
qt5_wrap_ui( OTBMapla_FORMS_HEADERS ${OTBMapla_FORMS} )
qt5_add_resources( OTBMapla_RESOURCES_RCC ${OTBMapla_RESOURCES} OPTIONS "-no-compress")
......
......@@ -44,7 +44,7 @@ set( OTBMonteverdi_RESOURCES
)
#############################################################################
qt5_wrap_cpp( OTBMonteverdi_SRC_MOC ${OTBMonteverdi_HEADERS_MOC} )
qt5_wrap_cpp( OTBMonteverdi_SRC_MOC ${OTBMonteverdi_HEADERS_MOC} OPTIONS -p "." )
qt5_wrap_ui( OTBMonteverdi_FORMS_HEADERS ${OTBMonteverdi_FORMS} )
qt5_add_resources( OTBMonteverdi_RESOURCES_RCC ${OTBMonteverdi_RESOURCES} OPTIONS "-no-compress")
......
......@@ -94,7 +94,7 @@ add_to_qt_i18n_sources( ${OTBMonteverdiCore_SRCS} )
add_to_qt_i18n_headers( "../include" ${OTBMonteverdiCore_SRCS} )
#############################################################################
qt5_wrap_cpp( OTBMonteverdiCore_SRC_MOC ${OTBMonteverdiCore_HEADERS_MOC} )
qt5_wrap_cpp( OTBMonteverdiCore_SRC_MOC ${OTBMonteverdiCore_HEADERS_MOC} OPTIONS -p "." )
add_library( OTBMonteverdiCore ${OTBMonteverdiCore_SRCS} ${OTBMonteverdiCore_SRC_MOC})
......
......@@ -174,7 +174,7 @@ if( OTBQtWidget_ENABLED )
endif()
#############################################################################
qt5_wrap_cpp( OTBMonteverdiGUI_SRC_MOC ${OTBMonteverdiGUI_HEADERS_MOC} )
qt5_wrap_cpp( OTBMonteverdiGUI_SRC_MOC ${OTBMonteverdiGUI_HEADERS_MOC} OPTIONS -p "." )
qt5_wrap_ui( OTBMonteverdiGUI_FORMS_HEADERS ${OTBMonteverdiGUI_FORMS} )
qt5_add_resources( OTBMonteverdiGUI_RESOURCES_RCC ${OTBMonteverdiGUI_RESOURCES} )
......
......@@ -17,5 +17,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
project(OTBQgis)
project(OTBQGIS)
otb_module_impl()
......@@ -20,15 +20,14 @@
set(DOCUMENTATION "This module allows to generate application descriptor files for QGIS processing plugin.")
otb_module(OTBQgis
otb_module(OTBQGIS
DEPENDS
OTBITK
OTBApplicationEngine
TEST_DEPENDS
OTBTestKernel
DESCRIPTION
"${DOCUMENTATION}"
)
......@@ -18,7 +18,7 @@
# limitations under the License.
add_executable(otbQgisDescriptor otbQgisDescriptor.cxx)
target_link_libraries(otbQgisDescriptor ${OTBQgis_LIBRARIES})
target_link_libraries(otbQgisDescriptor ${OTBQGIS_LIBRARIES})
otb_module_target(otbQgisDescriptor)
add_custom_command(TARGET otbQgisDescriptor PRE_BUILD
......@@ -53,4 +53,3 @@ endforeach()
add_custom_target(generate_descriptors DEPENDS ${dfiles} )
add_dependencies(${otb-module}-all generate_descriptors)
......@@ -111,7 +111,7 @@ set( OTBQtWidget_RESOURCES
otbWrapperQtWidgetIcons.qrc
)
qt5_wrap_cpp( OTBQtWidget_MOC_SRC ${OTBQtWidget_MOC_HDR} )
qt5_wrap_cpp( OTBQtWidget_MOC_SRC ${OTBQtWidget_MOC_HDR} OPTIONS -p "." )
qt5_wrap_ui( OTBQtWidget_FORMS_HEADERS ${OTBQtWidget_FORMS} )
qt5_add_resources( OTBQtWidget_RESOURCES_RCC ${OTBQtWidget_RESOURCES} OPTIONS "-no-compress")
......
......@@ -64,7 +64,7 @@ void QtWidgetBoolParameter::DoUpdateGUI()
void QtWidgetBoolParameter::DoCreateWidget()
{
QHBoxLayout *hLayout = new QHBoxLayout(this);
QHBoxLayout *hLayout = new QHBoxLayout;
hLayout->setSpacing(0);
hLayout->setContentsMargins(0, 0, 0, 0);
......
......@@ -88,7 +88,7 @@ void QtWidgetChoiceParameter::DoCreateWidget()
connect( m_ComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), m_StackWidget, &QStackedWidget::setCurrentIndex);
connect( m_ComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), GetModel(), &QtWidgetModel::NotifyUpdate );
m_VLayout = new QVBoxLayout(this);
m_VLayout = new QVBoxLayout;
m_VLayout->addWidget(m_ComboBox);
if (!m_WidgetList.empty())
{
......
......@@ -69,7 +69,7 @@ void QtWidgetComplexInputImageParameter::DoUpdateGUI()
void QtWidgetComplexInputImageParameter::DoCreateWidget()
{
// Set up input text edit
m_HLayout = new QHBoxLayout(this);
m_HLayout = new QHBoxLayout;
m_HLayout->setSpacing(0);
m_HLayout->setContentsMargins(0, 0, 0, 0);
m_Input = new QLineEdit;
......
......@@ -67,7 +67,7 @@ void QtWidgetComplexOutputImageParameter::DoUpdateGUI()
void QtWidgetComplexOutputImageParameter::DoCreateWidget()
{
// Set up input text edit
m_HLayout = new QHBoxLayout(this);
m_HLayout = new QHBoxLayout;
m_HLayout->setSpacing(0);
m_HLayout->setContentsMargins(0, 0, 0, 0);
m_Input = new QLineEdit(this);
......
......@@ -52,7 +52,7 @@ void QtWidgetDirectoryParameter::DoUpdateGUI()
void QtWidgetDirectoryParameter::DoCreateWidget()
{
// Set up input text edit
m_HLayout = new QHBoxLayout(this);
m_HLayout = new QHBoxLayout;
m_HLayout->setSpacing(0);
m_HLayout->setContentsMargins(0, 0, 0, 0);
m_Input = new QLineEdit(this);
......
......@@ -42,7 +42,7 @@ void QtWidgetEmptyParameter::DoUpdateGUI()
void QtWidgetEmptyParameter::DoCreateWidget()
{
// Set up input text edit
QHBoxLayout *hLayout = new QHBoxLayout(this);
QHBoxLayout *hLayout = new QHBoxLayout;
hLayout->setSpacing(0);
hLayout->setContentsMargins(0, 0, 0, 0);
......
......@@ -64,7 +64,7 @@ void QtWidgetFloatParameter::DoUpdateGUI()
void QtWidgetFloatParameter::DoCreateWidget()
{
m_QHBoxLayout = new QHBoxLayout(this);
m_QHBoxLayout = new QHBoxLayout;
m_QHBoxLayout->setSpacing(0);
m_QHBoxLayout->setContentsMargins(0, 0, 0, 0);
......
......@@ -71,7 +71,7 @@ void QtWidgetInputFilenameParameter::DoUpdateGUI()
void QtWidgetInputFilenameParameter::DoCreateWidget()
{
// Set up input text edit
m_HLayout = new QHBoxLayout(this);
m_HLayout = new QHBoxLayout;
m_HLayout->setSpacing(0);
m_HLayout->setContentsMargins(0, 0, 0, 0);
m_Input = new QLineEdit;
......
......@@ -78,7 +78,7 @@ void QtWidgetInputImageParameter::DoUpdateGUI()
void QtWidgetInputImageParameter::DoCreateWidget()
{
// Set up input text edit
m_HLayout = new QHBoxLayout(this);
m_HLayout = new QHBoxLayout;
m_HLayout->setSpacing(0);
m_HLayout->setContentsMargins(0, 0, 0, 0);
m_Input = new QLineEdit(this);
......
......@@ -70,7 +70,7 @@ void QtWidgetInputProcessXMLParameter::DoUpdateGUI()
void QtWidgetInputProcessXMLParameter::DoCreateWidget()
{
// Set up input text edit
m_HLayout = new QHBoxLayout(this);
m_HLayout = new QHBoxLayout;
m_HLayout->setSpacing(0);
m_HLayout->setContentsMargins(0, 0, 0, 0);
m_Input = new QLineEdit(this);
......
......@@ -71,7 +71,7 @@ void QtWidgetInputVectorDataParameter::DoUpdateGUI()
void QtWidgetInputVectorDataParameter::DoCreateWidget()
{
// Set up input text edit
m_HLayout = new QHBoxLayout(this);
m_HLayout = new QHBoxLayout;
m_HLayout->setSpacing(0);
m_HLayout->setContentsMargins(0, 0, 0, 0);
m_Input = new QLineEdit(this);
......
......@@ -62,7 +62,7 @@ void QtWidgetIntParameter::DoUpdateGUI()
void QtWidgetIntParameter::DoCreateWidget()
{
// Set up input text edit
m_QHBoxLayout = new QHBoxLayout(this);
m_QHBoxLayout = new QHBoxLayout;
m_QHBoxLayout->setSpacing(0);
m_QHBoxLayout->setContentsMargins(0, 0, 0, 0);
......
......@@ -117,7 +117,7 @@ void QtWidgetListViewParameter::DoCreateWidget()
connect( m_ListView, &QListWidget::itemSelectionChanged, this, &QtWidgetListViewParameter::SelectedItems );
m_VLayout = new QHBoxLayout(this);
m_VLayout = new QHBoxLayout;
m_VLayout->setContentsMargins(0, 0, 0, 0);
m_VLayout->addWidget(m_ListView);
m_ListView->setMaximumSize(m_ListView->width() , 4* m_LineHeight);
......
......@@ -67,7 +67,7 @@ void QtWidgetOutputFilenameParameter::DoUpdateGUI()
void QtWidgetOutputFilenameParameter::DoCreateWidget()
{
// Set up input text edit
m_HLayout = new QHBoxLayout(this);
m_HLayout = new QHBoxLayout;
m_HLayout->setSpacing(0);
m_HLayout->setContentsMargins(0, 0, 0, 0);
m_Input = new QLineEdit(this);
......
......@@ -68,7 +68,7 @@ void QtWidgetOutputImageParameter::DoUpdateGUI()
void QtWidgetOutputImageParameter::DoCreateWidget()
{
// Set up input text edit
m_HLayout = new QHBoxLayout(this);
m_HLayout = new QHBoxLayout;
m_HLayout->setSpacing(0);
m_HLayout->setContentsMargins(0, 0, 0, 0);
m_Input = new QLineEdit(this);
......
......@@ -65,7 +65,7 @@ void QtWidgetOutputProcessXMLParameter::DoUpdateGUI()
void QtWidgetOutputProcessXMLParameter::DoCreateWidget()
{
// Set up input text edit
m_HLayout = new QHBoxLayout(this);
m_HLayout = new QHBoxLayout;
m_HLayout->setSpacing(0);
m_HLayout->setContentsMargins(0, 0, 0, 0);
m_Input = new QLineEdit(this);
......
......@@ -62,7 +62,7 @@ void QtWidgetOutputVectorDataParameter::DoUpdateGUI()
void QtWidgetOutputVectorDataParameter::DoCreateWidget()
{
m_HLayout = new QHBoxLayout(this);
m_HLayout = new QHBoxLayout;
m_HLayout->setSpacing(0);
m_HLayout->setContentsMargins(0, 0, 0, 0);
......
......@@ -49,7 +49,7 @@ void QtWidgetParameterGroup::DoUpdateGUI()
void QtWidgetParameterGroup::DoCreateWidget()
{
// a GridLayout with two columns : parameter label / parameter widget
QGridLayout *gridLayout = new QGridLayout(this);
QGridLayout *gridLayout = new QGridLayout;
gridLayout->setSpacing(1);
gridLayout->setContentsMargins(0, 0, 0, 0);
......@@ -108,7 +108,7 @@ void QtWidgetParameterGroup::DoCreateWidget()
{
QtWidgetParameterBase* specificWidget = QtWidgetParameterFactory::CreateQtWidget( param, GetModel(), this);
QVBoxLayout* vboxLayout = new QVBoxLayout(this);
QVBoxLayout* vboxLayout = new QVBoxLayout;
vboxLayout->addWidget(specificWidget);
QGroupBox* group = new QGroupBox(this);
group->setLayout(vboxLayout);
......
......@@ -34,7 +34,7 @@ QtWidgetParameterLabel::QtWidgetParameterLabel(Parameter* param, QWidget * paren
label->setText(param->GetName());
label->setToolTip(param->GetKey());
QVBoxLayout *labelLayout = new QVBoxLayout(this);
QVBoxLayout *labelLayout = new QVBoxLayout;
labelLayout->setSpacing(0);
labelLayout->setContentsMargins(0, 0, 0, 0);
labelLayout->addWidget(label, 0);
......
......@@ -73,7 +73,7 @@ QtWidgetParameterList
//
// Global Layout
QGridLayout * gLayout = new QGridLayout(this);
QGridLayout * gLayout = new QGridLayout;
gLayout->setSpacing( 1 );
gLayout->setContentsMargins( 2, 2, 2, 2 );
......
......@@ -40,7 +40,7 @@ QtWidgetProgressReport::QtWidgetProgressReport(QtWidgetModel * model, QWidget *
connect(model, &QtWidgetModel::SetProgressReportDone, this, &QtWidgetProgressReport::RemoveLayout );
connect(this, &QtWidgetProgressReport::AddNewProcessToReport, this, &QtWidgetProgressReport::ReportProcess );
m_Layout = new QVBoxLayout(this);
m_Layout = new QVBoxLayout;
this->setLayout(m_Layout);
m_AddProcessCommand = AddProcessCommandType::New();
......
......@@ -38,7 +38,7 @@ QtWidgetRAMParameter::~QtWidgetRAMParameter()
void QtWidgetRAMParameter::DoCreateWidget()
{
// Set up input text edit
m_QHBoxLayout = new QHBoxLayout(this);
m_QHBoxLayout = new QHBoxLayout;
m_QHBoxLayout->setSpacing(0);
m_QHBoxLayout->setContentsMargins(0, 0, 0, 0);
......
......@@ -39,7 +39,7 @@ QtWidgetSimpleProgressReport::QtWidgetSimpleProgressReport(QtWidgetModel * model
connect(model, &QtWidgetModel::SetProgressReportDone, this, &QtWidgetSimpleProgressReport::Init );
connect(this, &QtWidgetSimpleProgressReport::AddNewProcessToReport, this, &QtWidgetSimpleProgressReport::ReportProcess );
m_Layout = new QVBoxLayout(this);
m_Layout = new QVBoxLayout;
this->setLayout(m_Layout);
m_AddProcessCommand = AddProcessCommandType::New();
......
......@@ -52,7 +52,7 @@ void QtWidgetStringParameter::DoUpdateGUI()
void QtWidgetStringParameter::DoCreateWidget()
{
// Set up input text edit
m_HLayout = new QHBoxLayout(this);
m_HLayout = new QHBoxLayout;
m_HLayout->setSpacing(0);
m_HLayout->setContentsMargins(0, 0, 0, 0);
......
......@@ -96,7 +96,7 @@ QtWidgetView::~QtWidgetView()
void QtWidgetView::CreateGui()
{
// Create a VBoxLayout with the header, the input widgets, and the footer
QVBoxLayout *mainLayout = new QVBoxLayout(this);
QVBoxLayout *mainLayout = new QVBoxLayout;
m_TabWidget = new QTabWidget(this);
m_TabWidget->addTab(CreateInputWidgets(), tr("Parameters"));
......@@ -116,7 +116,7 @@ void QtWidgetView::CreateGui()
QWidget* footer = CreateFooter();
QHBoxLayout *footLayout = new QHBoxLayout(this);
QHBoxLayout *footLayout = new QHBoxLayout;
footLayout->addWidget(progressReport);
footLayout->addWidget(footer);
mainLayout->addLayout(footLayout);
......@@ -126,7 +126,7 @@ void QtWidgetView::CreateGui()
QGroupBox *mainGroup = new QGroupBox(this);
mainGroup->setLayout(mainLayout);
QVBoxLayout *finalLayout = new QVBoxLayout(this);
QVBoxLayout *finalLayout = new QVBoxLayout;
finalLayout->addWidget(mainGroup);
// Make the final layout to the widget
......@@ -180,7 +180,7 @@ QWidget* QtWidgetView::CreateFooter()
{
// an HLayout with two buttons : Execute and Quit
QGroupBox *footerGroup = new QGroupBox(this);
QHBoxLayout *footerLayout = new QHBoxLayout(this);
QHBoxLayout *footerLayout = new QHBoxLayout;
footerGroup->setFixedHeight(40);
footerGroup->setContentsMargins(0, 0, 0, 0);
......
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