diff --git a/Modules/Visualization/MonteverdiGui/include/mvdQtWidgetView.h b/Modules/Visualization/MonteverdiGui/include/mvdQtWidgetView.h
index c55664e2dcbf8871e6510a930f564b1372afd8e9..08ead75886afef2b4b57f26e5359f1df37895dda 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdQtWidgetView.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdQtWidgetView.h
@@ -37,16 +37,10 @@
#include <QtGui>
#include <QShortcut>
-//
-// System includes (sorted by alphabetic order)
-
-//
-// ITK includes (sorted by alphabetic order)
-
//
// OTB includes (sorted by alphabetic order)
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
-#include "otbWrapperApplication.h"
+#include "otbWrapperQtWidgetView.h"
#include "otbWrapperQtWidgetModel.h"
#endif //tag=QT4-boost-compatibility
#include "OTBMonteverdiGUIExport.h"
@@ -57,18 +51,8 @@
#include "mvdTypes.h"
#endif //tag=QT4-boost-compatibility
-/*****************************************************************************/
-/* PRE-DECLARATION SECTION */
-
-//
-// External classes pre-declaration.
-namespace
-{
-}
-
namespace mvd
{
-
namespace Wrapper
{
@@ -84,16 +68,12 @@ namespace Wrapper
*/
class OTBMonteverdiGUI_EXPORT QtWidgetView :
- public QWidget
+ public otb::Wrapper::QtWidgetView
{
/*-[ QOBJECT SECTION ]-----------------------------------------------------*/
Q_OBJECT
- Q_PROPERTY( bool isClosable
- READ IsClosable
- WRITE SetClosable );
-
/*-[ PUBLIC SECTION ]------------------------------------------------------*/
//
@@ -112,29 +92,6 @@ public:
/** \brief Destructor. */
~QtWidgetView() override;
- /** \brief Gui Creation. */
- void CreateGui();
-
- /** \brief Model Accessor */
- inline otb::Wrapper::QtWidgetModel* GetModel()
- {
- return m_Model;
- }
-
- /**
- * \return The OTB-application pointer of this view.
- */
- otb::Wrapper::Application::ConstPointer GetApplication() const
- {
- return otb::ConstCast< otb::Wrapper::Application >(
- m_Application
- );
- }
-
- /**
- */
- inline bool IsClosable() const;
-
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
//
@@ -146,12 +103,9 @@ public slots:
//
// Signals.
signals:
- void QuitSignal();
void OTBApplicationOutputImageChanged( const QString &, const QString &);
- void ExecuteAndWriteOutput();
-
void ExecutionDone( int nbOutputs );
/*-[ PROTECTED SECTION ]---------------------------------------------------*/
@@ -160,14 +114,16 @@ signals:
// Protected methods.
protected:
- //
- // QWidget overloads.
+ QWidget* CreateInputWidgets() override;
- void closeEvent( QCloseEvent * event ) override;
+protected slots:
-//
-// Protected attributes.
-protected:
+ /** extend the behaviour of base class OnExecButtonClicked */
+ void OnExecButtonClicked();
+
+ /** modify the behaviour of base class OnExceptionRaised
+ */
+ void OnExceptionRaised( QString what );
/*-[ PRIVATE SECTION ]-----------------------------------------------------*/
@@ -178,12 +134,6 @@ private:
QtWidgetView(const QtWidgetView&); //purposely not implemented
void operator=(const QtWidgetView&); //purposely not implemented
- QWidget* CreateFooter();
-
- QWidget* CreateInputWidgets();
-
- QWidget* CreateDoc();
-
/**
*/
void SetupParameterWidgets( QWidget* widget );
@@ -192,21 +142,6 @@ private:
*/
void SetupFileSelectionWidget( QWidget * );
-//
-// Private attributes.
-
-private:
-
- otb::Wrapper::Application::Pointer m_Application;
- otb::Wrapper::QtWidgetModel* m_Model;
-
- QPushButton* m_ExecButton;
- QPushButton* m_QuitButton;
- QShortcut* m_QuitShortcut;
- QLabel* m_Message;
-
- bool m_IsClosable : 1;
-
/*-[ PRIVATE SLOTS SECTION ]-----------------------------------------------*/
//
@@ -218,30 +153,6 @@ private slots:
// image filename{s} set by the user in this OTB application (if any).
void OnApplicationExecutionDone( int );
- void UpdateMessageAfterApplicationReady(bool val);
-
- void UpdateMessageAfterExecution(int status);
-
- /**
- */
- void OnExecButtonClicked();
-
- /**
- */
- inline void OnProgressReportBegin();
-
- /**
- */
- inline void OnProgressReportEnd( int status );
-
- /**
- */
- void OnExceptionRaised( QString what );
-
- /**
- */
- inline void SetClosable( bool );
-
/**
*/
inline void OnFileSelectionWidgetAdded0( QWidget * );
@@ -264,47 +175,6 @@ namespace mvd
namespace Wrapper
{
-/*****************************************************************************/
-inline
-bool
-QtWidgetView
-::IsClosable() const
-{
- return m_IsClosable;
-}
-
-/*****************************************************************************/
-inline
-void
-QtWidgetView
-::SetClosable( bool enabled )
-{
- m_IsClosable = enabled;
-
- setEnabled( true );
-
- if( m_QuitButton!=NULL )
- m_QuitButton->setEnabled( m_IsClosable );
-}
-
-/*******************************************************************************/
-inline
-void
-QtWidgetView
-::OnProgressReportBegin()
-{
- SetClosable( false );
-}
-
-/*******************************************************************************/
-inline
-void
-QtWidgetView
-::OnProgressReportEnd( int )
-{
- SetClosable( true );
-}
-
/*******************************************************************************/
inline
void
diff --git a/Modules/Visualization/MonteverdiGui/src/mvdQtWidgetView.cxx b/Modules/Visualization/MonteverdiGui/src/mvdQtWidgetView.cxx
index 3c33015a5bde59b586340e7fc5155ed3166c4c84..252c6043797f53d43bfa40cbf5c8dde1abc3421c 100644
--- a/Modules/Visualization/MonteverdiGui/src/mvdQtWidgetView.cxx
+++ b/Modules/Visualization/MonteverdiGui/src/mvdQtWidgetView.cxx
@@ -23,28 +23,16 @@
/*****************************************************************************/
/* INCLUDE SECTION */
-//
-// Qt includes (sorted by alphabetic order)
-//// Must be included before system/custom includes.
-
//
// System includes (sorted by alphabetic order)
#include <functional>
-//
-// ITK includes (sorted by alphabetic order)
-
//
// OTB includes (sorted by alphabetic order)
#include "otbWrapperApplicationHtmlDocGenerator.h"
-// #include "otbWrapperComplexOutputImageParameter.h"
#include "otbWrapperOutputFilenameParameter.h"
-// #include "otbWrapperOutputImageParameter.h"
#include "otbWrapperOutputVectorDataParameter.h"
-// #include "otbWrapperQtWidgetOutputImageParameter.h"
-// #include "otbWrapperQtWidgetProgressReport.h"
#include "otbWrapperQtWidgetSimpleProgressReport.h"
-// #include "otbWrapperTypes.h"
//
// Monteverdi includes (sorted by alphabetic order)
@@ -140,208 +128,43 @@ QtWidgetView
::QtWidgetView( const otb::Wrapper::Application::Pointer & otbApp,
QWidget* p,
Qt::WindowFlags flags ) :
- QWidget( p, flags ),
- m_Application( otbApp ),
- m_Model( NULL ),
- m_ExecButton( NULL ),
- m_QuitButton( NULL ),
- m_Message( NULL ),
- m_IsClosable( true )
+ otb::Wrapper::QtWidgetView( otbApp, p, flags )
{
setObjectName( QtWidgetView::OBJECT_NAME );
- m_Model = new otb::Wrapper::QtWidgetModel( otbApp );
- m_QuitShortcut = new QShortcut(QKeySequence("Ctrl+Q"), this);
-
- QObject::connect(
- m_Model, SIGNAL( SetProgressReportBegin() ),
- this, SLOT( OnProgressReportBegin() )
- );
-
- QObject::connect(
- m_Model, SIGNAL( SetProgressReportDone( int ) ),
- this, SLOT( OnProgressReportEnd( int ) )
- );
-
- QObject::connect(
- m_Model, SIGNAL( ExceptionRaised( QString ) ),
- this, SLOT( OnExceptionRaised( QString ) )
- );
-}
-
-/*******************************************************************************/
-QtWidgetView
-::~QtWidgetView()
-{
- // m_Application is smart-pointed and will be automatically deleted.
-
- delete m_Model;
- m_Model = NULL;
-}
-
-/*******************************************************************************/
-void
-QtWidgetView
-::CreateGui()
-{
- // Create a VBoxLayout with the header, the input widgets, and the footer
- QVBoxLayout *mainLayout = new QVBoxLayout();
- QTabWidget *tab = new QTabWidget();
- tab->addTab(CreateInputWidgets(), tr("Parameters"));
-
- //otb::Wrapper::QtWidgetProgressReport* prog = new otb::Wrapper::QtWidgetProgressReport(m_Model);
- //prog->SetApplication(m_Application);
- //tab->addTab(prog, "Progress");
- tab->addTab(CreateDoc(), tr("Documentation"));
- mainLayout->addWidget(tab);
-
- QTextEdit *log = new QTextEdit();
- connect( m_Model->GetLogOutput(), SIGNAL(NewContentLog(QString)), log, SLOT(append(QString) ) );
- tab->addTab(log, tr("Logs"));
-
- m_Message = new QLabel("<center><font color=\"#FF0000\">"+tr("Select parameters")+"</font></center>");
- connect(
- m_Model,
- SIGNAL( SetApplicationReady( bool ) ),
- this, SLOT( UpdateMessageAfterApplicationReady( bool ) )
- );
- connect(
- m_Model,
- SIGNAL(SetProgressReportDone(int)),
- this, SLOT(UpdateMessageAfterExecution(int)) );
- mainLayout->addWidget(m_Message);
-
- otb::Wrapper::QtWidgetSimpleProgressReport* progressReport =
- new otb::Wrapper::QtWidgetSimpleProgressReport(m_Model);
- progressReport->SetApplication(m_Application);
-
- QWidget* footer = CreateFooter();
-
- QHBoxLayout *footLayout = new QHBoxLayout;
- footLayout->addWidget(progressReport);
- footLayout->addWidget(footer);
- mainLayout->addLayout(footLayout);
-
- footLayout->setAlignment(footer, Qt::AlignBottom);
-
- QGroupBox *mainGroup = new QGroupBox();
- mainGroup->setLayout(mainLayout);
-
- QVBoxLayout *finalLayout = new QVBoxLayout();
- finalLayout->addWidget(mainGroup);
-
- // Make the final layout to the widget
- this->setLayout(finalLayout);
-}
-
-/*******************************************************************************/
-QWidget*
-QtWidgetView
-::CreateInputWidgets()
-{
- QScrollArea *scrollArea = new QScrollArea;
-
- QWidget * widget =
- otb::Wrapper::QtWidgetParameterFactory::CreateQtWidget(
- m_Model->GetApplication()->GetParameterList(),
- m_Model
- );
-
- scrollArea->setWidget( widget );
- scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
- scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
- scrollArea->setWidgetResizable(true);
+ m_IconPathDone = std::string("<img src=\":/icons/done\" width=\"16\" height=\"16\" />");
+ m_IconPathFailed = std::string("<img src=\":/icons/failed\" width=\"16\" height=\"16\" />");
//
// need to be connected to the end of a process
QObject::connect(
- m_Model,
+ GetModel(),
SIGNAL( SetProgressReportDone( int ) ),
// to:
this,
SLOT ( OnApplicationExecutionDone( int ) )
);
-
- SetupParameterWidgets( widget );
-
- return scrollArea;
}
/*******************************************************************************/
-QWidget*
QtWidgetView
-::CreateFooter()
+::~QtWidgetView()
{
- // an HLayout with two buttons : Execute and Quit
- QGroupBox *footerGroup = new QGroupBox;
- QHBoxLayout *footerLayout = new QHBoxLayout;
-
- footerGroup->setFixedHeight(40);
- footerGroup->setContentsMargins(0, 0, 0, 0);
- footerLayout->setContentsMargins(5, 5, 5, 5);
-
- m_ExecButton = new QPushButton(footerGroup);
- m_ExecButton->setDefault(true);
- m_ExecButton->setEnabled(false);
- m_ExecButton->setText(QObject::tr("Execute"));
- connect(
- m_Model, SIGNAL( SetApplicationReady( bool ) ),
- m_ExecButton, SLOT( setEnabled( bool ) )
- );
-
- QObject::connect(
- m_ExecButton, SIGNAL( clicked() ),
- // to:
- this, SLOT( OnExecButtonClicked() )
- );
- QObject::connect(
- this, SIGNAL( ExecuteAndWriteOutput() ),
- // to:
- m_Model, SLOT( ExecuteAndWriteOutputSlot() )
- );
-
- m_QuitButton = new QPushButton(footerGroup);
- m_QuitButton->setText(QObject::tr("Quit"));
- connect(
- m_QuitButton,
- SIGNAL( clicked() ),
- // to:
- this,
- SLOT( close() )
- );
-
- // Add Ctrl-Q shortcut to quit
- connect( m_QuitShortcut, SIGNAL(activated()), this, SLOT(close()) );
-
-
- // Put the buttons on the right
- footerLayout->addStretch();
- footerLayout->addWidget(m_ExecButton);
- footerLayout->addWidget(m_QuitButton);
-
- footerGroup->setLayout(footerLayout);
-
- return footerGroup;
}
/*******************************************************************************/
QWidget*
QtWidgetView
-::CreateDoc()
+::CreateInputWidgets()
{
- QTextEdit *text = new QTextEdit;
- text->setReadOnly(true);
-
- QTextDocument * doc = new QTextDocument();
+ QWidget * widget = otb::Wrapper::QtWidgetView::CreateInputWidgets();
- std::string docContain;
- otb::Wrapper::ApplicationHtmlDocGenerator::GenerateDoc( m_Application, docContain);
+ otb::Wrapper::QtWidgetParameterBase *paramWidget =
+ widget->findChild<otb::Wrapper::QtWidgetParameterBase*>();
- doc->setHtml(docContain.c_str());
+ SetupParameterWidgets(paramWidget);
- text->setDocument(doc);
-
- return text;
+ return widget;
}
/*******************************************************************************/
@@ -369,11 +192,11 @@ QtWidgetView
SetupWidget(
widget,
- OutputImageInitializer( m_Application->GetName() )
+ OutputImageInitializer( GetModel()->GetApplication()->GetName() )
);
SetupWidget(
widget,
- ComplexOutputImageInitializer( m_Application->GetName() )
+ ComplexOutputImageInitializer( GetModel()->GetApplication()->GetName() )
);
SetupWidget( widget, OutputVectorDataInitializer() );
@@ -394,36 +217,6 @@ QtWidgetView
initialize( qobject_cast< FileSelectionInitializer::argument_type >( widget ) );
}
-/*******************************************************************************/
-void
-QtWidgetView
-::closeEvent( QCloseEvent * e )
-{
- assert( e!=NULL );
-
- if( !IsClosable() )
- {
- assert( !m_Application.IsNull() );
-
- QMessageBox::warning(
- this,
- tr( "Warning!" ),
- tr( "OTB-Application '%1' cannot be closed while running!")
- .arg( m_Application->GetDocName() )
- );
-
- e->ignore();
-
- return;
- }
-
- QWidget::closeEvent( e );
-
- emit QuitSignal();
-
- deleteLater();
-}
-
/*******************************************************************************/
/* SLOTS */
/*******************************************************************************/
@@ -431,226 +224,180 @@ void
QtWidgetView
::OnExecButtonClicked()
{
- assert( m_Model!=NULL );
- assert( m_Model->GetApplication()!=NULL );
-
-
- assert( I18nCoreApplication::Instance()!=NULL );
-
- //
- // Get layer-stack, if any.
- StackedLayerModel * layerStack =
- I18nCoreApplication::Instance()->GetModel< StackedLayerModel >();
-
- otb::Wrapper::Application::Pointer otbApp( m_Model->GetApplication() );
-
- //
- // Check output parameters of OTB-application.
- StringVector paramKeys( otbApp->GetParametersKeys() );
- QStringList filenames1;
-
- KeyLayerAccumulator::KeyLayerPairList layers;
- QStringList filenames2;
-
- for( StringVector::const_iterator it( paramKeys.begin() );
- it!=paramKeys.end();
- ++it )
+ if ( !IsRunning() )
{
- if( otbApp->IsParameterEnabled( *it, true ) &&
- otbApp->HasValue( *it ) )
+ assert( GetModel()!=NULL );
+ assert( GetModel()->GetApplication()!=NULL );
+
+
+ assert( I18nCoreApplication::Instance()!=NULL );
+
+ //
+ // Get layer-stack, if any.
+ StackedLayerModel * layerStack =
+ I18nCoreApplication::Instance()->GetModel< StackedLayerModel >();
+
+ otb::Wrapper::Application::Pointer otbApp( GetModel()->GetApplication() );
+
+ //
+ // Check output parameters of OTB-application.
+ StringVector paramKeys( otbApp->GetParametersKeys() );
+ QStringList filenames1;
+
+ KeyLayerAccumulator::KeyLayerPairList layers;
+ QStringList filenames2;
+
+ for( StringVector::const_iterator it( paramKeys.begin() );
+ it!=paramKeys.end();
+ ++it )
{
- otb::Wrapper::Parameter::Pointer param( otbApp->GetParameterByKey( *it ) );
- assert( !param.IsNull() );
-
- // qDebug()
- // << it->c_str() << ": type" << otbApp->GetParameterType( *it );
-
- // const char* filename = NULL;
- std::string filename;
-
- switch( otbApp->GetParameterType( *it ) )
- {
- case otb::Wrapper::ParameterType_OutputFilename:
- filename =
- otb::DynamicCast< otb::Wrapper::OutputFilenameParameter >( param )
- ->GetValue();
- break;
- //
- // FILENAME.
- //
- // IMAGE.
- case otb::Wrapper::ParameterType_OutputImage:
- filename =
- otb::DynamicCast< otb::Wrapper::OutputImageParameter >( param )
- ->GetFileName();
- break;
- //
- // VECTOR-DATA.
- case otb::Wrapper::ParameterType_OutputVectorData:
- filename =
- otb::DynamicCast< otb::Wrapper::OutputVectorDataParameter >( param )
- ->GetFileName();
- break;
- //
- // COMPLEX IMAGE.
- case otb::Wrapper::ParameterType_ComplexOutputImage:
- filename =
- otb::DynamicCast< otb::Wrapper::ComplexOutputImageParameter >( param )
- ->GetFileName();
- break;
- //
- // NONE.
- default:
- break;
- }
-
- if( QFileInfo( filename.c_str() ).exists() )
- filenames1.push_back( filename.c_str() );
-
- if( layerStack!=NULL )
- {
- KeyLayerAccumulator accumulator(
- std::for_each(
- layerStack->Begin(),
- layerStack->End(), KeyLayerAccumulator( filename, layers )
- )
- );
-
- if( accumulator.GetCount()>0 )
- filenames2.push_back( filename.c_str() );
- }
- }
- }
-
- {
- QString message;
-
- if( filenames1.size()==1 )
- {
- // qDebug()
- // << it->c_str() << ":" << QString( filename.c_str() );
-
- message =
- tr( "Are you sure you want to overwrite file '%1'?" )
- .arg( filenames1.front() );
- }
- else if( filenames1.size()>1 )
- {
- message =
- tr( "Following files will be overwritten. Are you sure you want to continue?\n- %1" )
- .arg( filenames1.join( "\n- " ) );
- }
-
- if( !message.isEmpty() )
+ if( otbApp->IsParameterEnabled( *it, true ) &&
+ otbApp->HasValue( *it ) )
+ {
+ otb::Wrapper::Parameter::Pointer param( otbApp->GetParameterByKey( *it ) );
+ assert( !param.IsNull() );
+
+ // qDebug()
+ // << it->c_str() << ": type" << otbApp->GetParameterType( *it );
+
+ // const char* filename = NULL;
+ std::string filename;
+
+ switch( otbApp->GetParameterType( *it ) )
{
- QMessageBox::StandardButton button =
- QMessageBox::question(
- this,
- PROJECT_NAME,
- message,
- QMessageBox::Yes | QMessageBox::No,
- QMessageBox::No
- );
-
- if( button==QMessageBox::No )
- return;
+ case otb::Wrapper::ParameterType_OutputFilename:
+ filename =
+ otb::DynamicCast< otb::Wrapper::OutputFilenameParameter >( param )
+ ->GetValue();
+ break;
+ //
+ // FILENAME.
+ //
+ // IMAGE.
+ case otb::Wrapper::ParameterType_OutputImage:
+ filename =
+ otb::DynamicCast< otb::Wrapper::OutputImageParameter >( param )
+ ->GetFileName();
+ break;
+ //
+ // VECTOR-DATA.
+ case otb::Wrapper::ParameterType_OutputVectorData:
+ filename =
+ otb::DynamicCast< otb::Wrapper::OutputVectorDataParameter >( param )
+ ->GetFileName();
+ break;
+ //
+ // COMPLEX IMAGE.
+ case otb::Wrapper::ParameterType_ComplexOutputImage:
+ filename =
+ otb::DynamicCast< otb::Wrapper::ComplexOutputImageParameter >( param )
+ ->GetFileName();
+ break;
+ //
+ // NONE.
+ default:
+ break;
}
- }
-
- {
- QString message;
-
- if( filenames2.size()==1 )
+
+ if( QFileInfo( filename.c_str() ).exists() )
+ filenames1.push_back( filename.c_str() );
+
+ if( layerStack!=NULL )
{
- // qDebug()
- // << it->c_str() << ":" << QString( filename.c_str() );
-
- message =
- tr( "File '%1' is being viewed in " PROJECT_NAME " and will be concurrently overwritten by running this %2. File will be removed from layer-stack before running %2 and reloaded after.\n\nDo you want to continue?" )
- .arg( filenames2.front() )
- .arg( otbApp->GetDocName() );
+ KeyLayerAccumulator accumulator(
+ std::for_each(
+ layerStack->Begin(),
+ layerStack->End(), KeyLayerAccumulator( filename, layers )
+ )
+ );
+
+ if( accumulator.GetCount()>0 )
+ filenames2.push_back( filename.c_str() );
}
- else if( filenames2.size()>1 )
+ }
+ }
+
{
- message =
- tr( "Following files are being viewed in " PROJECT_NAME " and will be concurrently overwritter by running %2. Files will be removed from layer-stack before running %2. Do you want to continue?\n- %1" )
- .arg( filenames2.join( "\n- " ) )
- .arg( otbApp->GetDocName() );
+ QString message;
+
+ if( filenames1.size()==1 )
+ {
+ // qDebug()
+ // << it->c_str() << ":" << QString( filename.c_str() );
+
+ message =
+ tr( "Are you sure you want to overwrite file '%1'?" )
+ .arg( filenames1.front() );
+ }
+ else if( filenames1.size()>1 )
+ {
+ message =
+ tr( "Following files will be overwritten. Are you sure you want to continue?\n- %1" )
+ .arg( filenames1.join( "\n- " ) );
+ }
+
+ if( !message.isEmpty() )
+ {
+ QMessageBox::StandardButton button =
+ QMessageBox::question(
+ this,
+ PROJECT_NAME,
+ message,
+ QMessageBox::Yes | QMessageBox::No,
+ QMessageBox::No
+ );
+
+ if( button==QMessageBox::No )
+ return;
+ }
}
-
- if( !message.isEmpty() )
+
{
- QMessageBox::StandardButton button =
- QMessageBox::question(
- this,
- PROJECT_NAME,
- message,
- QMessageBox::Yes | QMessageBox::No,
- QMessageBox::No
- );
-
- if( button==QMessageBox::No )
- return;
-
- while( !layers.empty() )
+ QString message;
+
+ if( filenames2.size()==1 )
{
- layerStack->Delete( layers.front().first );
-
- layers.pop_front();
+ // qDebug()
+ // << it->c_str() << ":" << QString( filename.c_str() );
+
+ message =
+ tr( "File '%1' is being viewed in " PROJECT_NAME " and will be concurrently overwritten by running this %2. File will be removed from layer-stack before running %2 and reloaded after.\n\nDo you want to continue?" )
+ .arg( filenames2.front() )
+ .arg( otbApp->GetDocName() );
+ }
+ else if( filenames2.size()>1 )
+ {
+ message =
+ tr( "Following files are being viewed in " PROJECT_NAME " and will be concurrently overwritter by running %2. Files will be removed from layer-stack before running %2. Do you want to continue?\n- %1" )
+ .arg( filenames2.join( "\n- " ) )
+ .arg( otbApp->GetDocName() );
+ }
+
+ if( !message.isEmpty() )
+ {
+ QMessageBox::StandardButton button =
+ QMessageBox::question(
+ this,
+ PROJECT_NAME,
+ message,
+ QMessageBox::Yes | QMessageBox::No,
+ QMessageBox::No
+ );
+
+ if( button==QMessageBox::No )
+ return;
+
+ while( !layers.empty() )
+ {
+ layerStack->Delete( layers.front().first );
+
+ layers.pop_front();
+ }
}
}
}
-
- /* U N S A F E
- // BUGFIX: Mantis-750
- //
- // Remove files which will be overwritten in order to use
- // file-existence to check whether to emit the OutputImageChanged
- // signal (see ::OnApplicationExecutionDone()).
- for( FileInfoVector::const_iterator it( fileInfos.begin() );
- it!=fileInfos.end();
- ++it )
- {
- qDebug() << "Removing:" << it->filePath();
-
- it->dir().remove( it->fileName() );
- }
- */
-
- emit ExecuteAndWriteOutput();
-
- m_Message->setText("<center><font color=\"#FF0000\">"+tr("Running")+"</font></center>");
-}
-
-/******************************************************************************/
-void
-QtWidgetView
-::UpdateMessageAfterExecution(int status)
-{
- if (status >= 0)
- {
- m_Message->setText("<center>"
- "<img src=\":/icons/done\" width=\"16\" height=\"16\" />"
- "<font color=\"#00A000\">"+tr("Done")+"</font></center>");
- }
- else
- {
- m_Message->setText("<center>"
- "<img src=\":/icons/failed\" width=\"16\" height=\"16\" />"
- "<font color=\"#FF0000\">"+tr("Failed")+"</font></center>");
- }
-}
-
-/*******************************************************************************/
-void
-QtWidgetView
-::UpdateMessageAfterApplicationReady( bool val )
-{
- if(val == true)
- m_Message->setText("<center><font color=\"#00A000\">"+tr("Ready to run")+"</font></center>");
- else
- m_Message->setText("<center><font color=\"#FF0000\">"+tr("Select parameters")+"</font></center>");
+ otb::Wrapper::QtWidgetView::OnExecButtonClicked();
}
/*******************************************************************************/
@@ -675,7 +422,7 @@ void
QtWidgetView
::OnApplicationExecutionDone( int status )
{
- otb::Wrapper::Application::Pointer otbApp( m_Model->GetApplication() );
+ otb::Wrapper::Application::Pointer otbApp( GetModel()->GetApplication() );
if( status!=0 )
{
@@ -765,6 +512,5 @@ QtWidgetView
emit ExecutionDone( status );
}
-}
-
-}
+} // end of namespace Wrapper
+} // end of namespace mvd