Commit 447e1151 authored by Manuel Grizonnet's avatar Manuel Grizonnet

Merge remote-tracking branch 'origin/develop' into opengl_glvnd_preferences

parents 866f099b 8f948ac6
......@@ -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