From 0baf0c17015f405a08960cecd2adc6cd88fb3044 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Tue, 28 Jul 2015 19:27:29 +0100 Subject: [PATCH] Fix problem with disparity module --- app/ModulesHandleOptDialog.cpp | 6 +++--- modules/DisparityStereoSGBM.cpp | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/ModulesHandleOptDialog.cpp b/app/ModulesHandleOptDialog.cpp index 5b3f18f..4548a93 100644 --- a/app/ModulesHandleOptDialog.cpp +++ b/app/ModulesHandleOptDialog.cpp @@ -43,19 +43,19 @@ public: m_pcDescription = new QLabel; m_pcDescription->setText( QString::fromStdString( option->opt_desc ) ); QHBoxLayout* layout = new QHBoxLayout; - layout->addWidget( m_pcDescription, Qt::AlignLeft ); + layout->addWidget( m_pcDescription, 0, Qt::AlignLeft ); if( !option->isBinary() ) { m_pcValue = new QLineEdit; m_pcValue->setMinimumWidth( 40 ); m_pcValue->setMaximumWidth( 65 ); - layout->addWidget( m_pcValue, Qt::AlignRight ); + layout->addWidget( m_pcValue, 0, Qt::AlignRight ); } else { m_pcChecked = new QCheckBox; m_pcChecked->setChecked( false ); - layout->addWidget( m_pcChecked, Qt::AlignRight ); + layout->addWidget( m_pcChecked, 0, Qt::AlignRight ); } layout->setContentsMargins( 1, 1, 1, 1 ); setLayout( layout ); diff --git a/modules/DisparityStereoSGBM.cpp b/modules/DisparityStereoSGBM.cpp index 610bdc0..53e26ef 100644 --- a/modules/DisparityStereoSGBM.cpp +++ b/modules/DisparityStereoSGBM.cpp @@ -41,11 +41,12 @@ DisparityStereoSGBM::DisparityStereoSGBM() m_uiModuleRequirements = MODULE_REQUIRES_SKIP_WHILE_PLAY | MODULE_REQUIRES_NEW_WINDOW | MODULE_REQUIRES_OPTIONS; m_cModuleOptions.addOptions()/**/ - ( "block_size", m_uiBlockSize, "Block Size (positive odd number) [3]" ); - //( "HHAlgorithm", m_bUseHH, "Use HH algorithm [false]" ); + ( "block_size", m_uiBlockSize, "Block Size (positive odd number) [3]" ) + ( "HHAlgorithm", m_bUseHH, "Use HH algorithm [false]" ); m_pcDisparityFrame = NULL; - m_uiBlockSize = 9; + m_uiBlockSize = 3; + m_uiNumberOfDisparities = 0; } @@ -75,6 +76,7 @@ Bool DisparityStereoSGBM::create( std::vector apcFrameList ) #endif return true; } + PlaYUVerFrame* DisparityStereoSGBM::process( std::vector apcFrameList ) { PlaYUVerFrame* InputLeft = apcFrameList[0];