ENH: start control on file format for image and vd in Qt

Code/ApplicationEngine/otbWrapperInputVectorDataListParameter.cxx

@@ -158,15 +158,11 @@ InputVectorDataListParameter::SetNthFileName( const unsigned int id, const std::
 std::vector<std::string>
 InputVectorDataListParameter::GetFileNameList() const
 {
-  std::cout<<"InputVectorDataListParameter::GetFileNameList()"<<std::endl;
   if (m_ReaderList)
     {
-    std::cout<<"InputVectorDataListParameter::GetFileNameList().size() "<<m_ReaderList->Size()<<std::endl;
     std::vector<std::string> filenames;
     for(unsigned int i=0; i<m_ReaderList->Size(); i++)
       {    
-      std::cout<<i<<std::endl;
-      
       if( m_ReaderList->GetNthElement(i) )
         filenames.push_back( m_ReaderList->GetNthElement(i)->GetFileName() );
       }
@@ -174,7 +170,7 @@ InputVectorDataListParameter::GetFileNameList() const
     return filenames;
     }
 
-   std::cout<<"InputVectorDataListParameter::GetFileNameList() out"<<std::endl;
+
   itkExceptionMacro(<< "No filename value");
 }
 

Code/Wrappers/QtWidget/otbQtFileSelectionWidget.h

@@ -53,6 +53,11 @@ public:
     return m_Input->text().toStdString();
   }
 
+  void ClearFilename()
+  {
+    m_Input->clear();
+  }
+
   QLineEdit* GetInput()
   {
     return m_Input;

Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.cxx

@@ -345,26 +345,19 @@ void QtWidgetInputImageListParameter::RecreateImageList()
 {
   // save value
   m_InputImageListParam->ClearValue();
-  const unsigned int initSize = m_FileSelectionList.size();
+
   for(unsigned int j=0; j<m_FileSelectionList.size(); j++ )
     {
-    if(m_InputImageListParam->AddFromFileName(m_FileSelectionList[j]->GetFilename()) == true )
-      connect( m_FileSelectionList[j]->GetInput(), SIGNAL(textChanged(const QString&)), this, SLOT(UpdateImageList()) );
-    else
+    if( m_InputImageListParam->AddFromFileName(m_FileSelectionList[j]->GetFilename()) == true )
       {
-      m_FileSelectionList[j]->SetChecked(true);
+      itk::OStringStream oss;
+      oss << "The given file " << m_FileSelectionList[j]->GetFilename() << " is not valid.";
+      this->GetModel()->SendLogWARNING( oss.str() );
+      m_FileSelectionList[j]->ClearFilename();
       }
     }
   
-  if( initSize == m_FileSelectionList.size() )
-    {
     emit Change();
-      // notify of value change
-    QString key( QString::fromStdString(m_InputImageListParam->GetKey()) );
-    emit ParameterChanged(key);
-    }
-  else
-    this->SupressFile();
 }
 
 

Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageParameter.cxx

@@ -70,13 +70,14 @@ void QtWidgetInputImageParameter::SelectFile()
 
   if (fileDialog.exec())
     {
-    this->SetFileName(fileDialog.selectedFiles().at(0));
-    m_Input->setText(fileDialog.selectedFiles().at(0));
+    if ( this->SetFileName(fileDialog.selectedFiles().at(0)) == false )
+      m_Input->setText(fileDialog.selectedFiles().at(0));
     }
 }
 
-void QtWidgetInputImageParameter::SetFileName(const QString& value)
+bool QtWidgetInputImageParameter::SetFileName(const QString& value)
 {
+  bool res = false;
   // save value
   if(m_InputImageParam->SetFromFileName(value.toStdString()) == false )
     {
@@ -84,6 +85,10 @@ void QtWidgetInputImageParameter::SetFileName(const QString& value)
     QString key( QString::fromStdString(m_InputImageParam->GetKey()) );
     emit ParameterChanged(key);
     }
+  else
+    res = true;
+
+  return res;
 }
 
 }

Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageParameter.h

@@ -39,7 +39,7 @@ public:
   virtual ~QtWidgetInputImageParameter();
 
 protected slots:
-  void SetFileName( const QString& value );
+  bool SetFileName( const QString& value );
   void SelectFile();
 
 private:

Code/Wrappers/QtWidget/otbWrapperQtWidgetInputVectorDataListParameter.cxx

@@ -137,38 +137,18 @@ void QtWidgetInputVectorDataListParameter::DoCreateWidget()
 void
 QtWidgetInputVectorDataListParameter::UpdateVectorDataList()
 {
-std::cout<<"UpdateVectorDataList"<<std::endl;
-  // save value
-  bool update = false;
-
- std::cout<<m_FileSelectionList.size()<<std::endl;
- std::cout<<m_InputVectorDataListParam<<std::endl;
- std::cout<<"m_InputVectorDataListParam->GetFileNameList().size()"<<std::endl;
-  std::cout<<m_InputVectorDataListParam->GetFileNameList().size()<<std::endl;
-  std::cout<<m_InputVectorDataListParam->GetVectorDataList()->Size()<<std::endl;
-
-
   for(unsigned int j=0; j<m_InputVectorDataListParam->GetVectorDataList()->Size(); j++ )
     {
-    std::cout<<"UpdateVectorDataList,loop "<<j<<std::endl;
     if( m_InputVectorDataListParam->SetNthFileName(j, m_FileSelectionList[j]->GetFilename()) == true )
       {
-      std::cout<<"UpdateVectorDataList, can't create vd"<<std::endl;
-      m_FileSelectionList[j]->SetChecked(true);
-      m_InputVectorDataListParam->AddNullElement();
-      update = true;
+      itk::OStringStream oss;
+      oss << "The given file " << m_FileSelectionList[j]->GetFilename() << " is not valid.";
+      this->GetModel()->SendLogWARNING( oss.str() );
+      m_FileSelectionList[j]->ClearFilename();
       }
     }
 
- std::cout<<m_FileSelectionList.size()<<std::endl;
-  std::cout<<m_InputVectorDataListParam->GetFileNameList().size()<<std::endl;
-  std::cout<<m_InputVectorDataListParam->GetVectorDataList()->Size()<<std::endl;
-
-  if(update)
-    this->SupressFile();
-  else
-    emit Change();
- 
+  emit Change();
 }
 
 
@@ -316,22 +296,16 @@ QtWidgetInputVectorDataListParameter::AddFile()
 void
 QtWidgetInputVectorDataListParameter::SupressFile()
 {
-  std::cout<<"QtWidgetInputVectorDataListParameter::SupressFile "<<m_FileSelectionList.size()<<std::endl;
   m_FileLayout = new QVBoxLayout();
   m_FileLayout->setSpacing(0 );
   std::vector<QtFileSelectionWidget *> tmpList;
   for (unsigned int i = 0; i < m_FileSelectionList.size(); i++)
     {
-    std::cout<<"QtWidgetInputVectorDataListParameter::SupressFile "<<i<<std::endl;
     if (!m_FileSelectionList[i]->IsChecked())
       {
       m_FileLayout->addWidget(m_FileSelectionList[i]);
       tmpList.push_back(m_FileSelectionList[i]);
       }
-    else
-      {
-      //m_InputVectorDataListParam->GetVectorDataList()->Erase(i-count);
-      }
     }
 
   m_FileSelectionList = tmpList;
@@ -340,7 +314,7 @@ QtWidgetInputVectorDataListParameter::SupressFile()
   mainGroup->setLayout(m_FileLayout);
   m_Scroll->setWidget(mainGroup);
 
-  this->update();
+  this->update(); 
   this->RecreateVectorDataList();
 }
 
@@ -370,21 +344,17 @@ QtWidgetInputVectorDataListParameter::EraseFile()
 
 void QtWidgetInputVectorDataListParameter::RecreateVectorDataList()
 {
-  std::cout<<"QtWidgetInputVectorDataListParameter::RecreateVectorDataList"<<std::endl;
   // save value
   m_InputVectorDataListParam->ClearValue();
 
   if( m_FileSelectionList.size() == 0)
     {
-std::cout<<"QtWidgetInputVectorDataListParameter::RecreateVectorDataList:: Addfile"<<std::endl;
     this->AddFile();
     }
   else
     {
-    std::cout<<"QtWidgetInputVectorDataListParameter::RecreateVectorDataList else "<<m_FileSelectionList.size()<<std::endl;
     for (unsigned int j = 0; j < m_FileSelectionList.size(); j++)
       {
-    std::cout<<j<<std::endl;
       m_InputVectorDataListParam->AddFromFileName(m_FileSelectionList[j]->GetFilename());
       connect(m_FileSelectionList[j]->GetInput(), SIGNAL(textChanged(const QString&)), this, SLOT(UpdateVectorDataList()));
       }
@@ -393,10 +363,8 @@ std::cout<<"QtWidgetInputVectorDataListParameter::RecreateVectorDataList:: Addfi
     // notify of value change
     QString key(QString::fromStdString(m_InputVectorDataListParam->GetKey()));
     emit ParameterChanged(key);
-   
+    
     }
- std::cout<<"QtWidgetInputVectorDataListParameter::RecreateVectorDataList done"<<std::endl;
-
 }
 
 

Code/Wrappers/QtWidget/otbWrapperQtWidgetModel.cxx

@@ -73,5 +73,22 @@ void QtWidgetModel::ActivateExecuteButton()
   emit SetProgressReportDone();
 }
 
+void QtWidgetModel::SendLogWARNING( const std::string & mes )
+{
+  m_Application->GetLogger()->Write( itk::LoggerBase::WARNING, mes );
+}
+
+void QtWidgetModel::SendLogINFO( const std::string & mes )
+{
+  m_Application->GetLogger()->Write( itk::LoggerBase::INFO, mes );
+}
+
+void QtWidgetModel::SendLogDEBUG( const std::string & mes )
+{
+  m_Application->GetLogger()->Write( itk::LoggerBase::DEBUG, mes );
+}
+
+
+
 }
 }

Code/Wrappers/QtWidget/otbWrapperQtWidgetModel.h

@@ -86,6 +86,13 @@ public:
     return m_LogOutput;
   }
 
+  /** Logger warning message sender */
+  void SendLogWARNING( const std::string & mes );
+  /** Logger info message sender */
+  void SendLogINFO( const std::string & mes );
+  /** Logger debug message sender */
+  void SendLogDEBUG( const std::string & mes );
+
 signals:
   void SetApplicationReady(bool);
   void SetProgressReportBegin();