X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FParametersQtDialog.cxx;h=0891a2b5c09c409c9c5d80381ef5114a27b441cd;hb=8e5fd31fd4d280781d8bc27a799361bf9c30b1d4;hp=80d73a265f5499e0d8445ca868f471f6455ed6cd;hpb=022d9ce59bfd6ab97517cba9440429750df6c442;p=cpPlugins.git

diff --git a/lib/cpPlugins/Interface/ParametersQtDialog.cxx b/lib/cpPlugins/Interface/ParametersQtDialog.cxx
index 80d73a2..0891a2b 100644
--- a/lib/cpPlugins/Interface/ParametersQtDialog.cxx
+++ b/lib/cpPlugins/Interface/ParametersQtDialog.cxx
@@ -41,8 +41,8 @@ cpPlugins::Interface::ParametersQtDialog::
 ~ParametersQtDialog( )
 {
   delete this->m_Title;
-  delete this->m_MainLayout;
   delete this->m_ToolsLayout;
+  delete this->m_MainLayout;
 
   for( unsigned int i = 0; i < this->m_Widgets.size( ); ++i )
     this->m_Widgets[ i ]->Delete( );
@@ -202,7 +202,10 @@ exec( )
   QObject::connect( bb, SIGNAL( rejected( ) ), this, SLOT( reject( ) ) );
   this->m_ToolsLayout->addWidget( bb );
 
-  return( this->QDialog::exec( ) );
+  int ret = this->QDialog::exec( );
+  if( ret == 1 )
+    this->syncParameters( );
+  return( ret );
 }
 
 // -------------------------------------------------------------------------
@@ -219,51 +222,10 @@ show( )
 void cpPlugins::Interface::ParametersQtDialog::
 syncParameters( )
 {
-  std::cout << "TODO: SyncParameters" << std::endl;
-}
-
-
-
-
-
-
-
-
-
-    /* TODO
-       enum Type
-       {
-       Index,
-       Point,
-       StringList,
-       BoolList,
-       IntList,
-       UintList,
-       IndexList,
-       PointList,
-       Choices,
-       NoType
-       };
-    */
-/*
-bool cpPlugins::Interface::
-ParametersQtDialog(
-  Parameters* parameters, const std::string& title, QWidget* parent
-  )
-{
-  // Create dialog with a simple layout
-  QDialog* dlg = new QDialog( parent );
-  dlg->setWindowFlags( Qt::FramelessWindowHint ); 
-  dlg->setWindowFlags( Qt::WindowTitleHint );
-  QGridLayout* gridLayout = new QGridLayout( dlg );
-  QVBoxLayout* verticalLayout = new QVBoxLayout( );
-
-  // Put a title
-  QLabel* dlg_title = new QLabel( dlg );
-  dlg_title->setText( title.c_str( ) );
-  verticalLayout->addWidget( dlg_title );
+  if( this->m_Parameters == NULL )
+    return;
 
-  // Put values
+  // Get values
   std::vector< std::string > names;
   this->m_Parameters->GetNames( names );
   std::vector< std::string >::const_iterator nIt = names.begin( );
@@ -271,44 +233,35 @@ ParametersQtDialog(
   {
     Parameters::Type pt = this->m_Parameters->GetType( *nIt );
 
-    QWidget* w_input = NULL;
     if( pt == Parameters::String )
     {
-      QLineEdit* v_string = new QLineEdit( dlg );
-      v_string->setText( "Enter some text!!!" );
-      w_input = v_string;
+      QLineEdit* v = this->findChild< QLineEdit* >( nIt->c_str( ) );
+      if( v != NULL )
+        this->m_Parameters->SetString( *nIt, v->text( ).toStdString( ) );
     }
     else if( pt == Parameters::Bool )
     {
-      QCheckBox* v_bool = new QCheckBox( dlg );
-      v_bool->setText( "[ON/OFF]" );
-      v_bool->setChecked( this->m_Parameters->GetBool( *nIt ) );
-      w_input = v_bool;
+      QCheckBox* v = this->findChild< QCheckBox* >( nIt->c_str( ) );
+      if( v != NULL )
+        this->m_Parameters->SetBool( *nIt, v->isChecked( ) );
     }
     else if( pt == Parameters::Uint )
     {
-      QSpinBox* v_uint = new QSpinBox( dlg );
-      v_uint->setMinimum( 0 );
-      v_uint->setMaximum( std::numeric_limits< int >::max( ) );
-      v_uint->setValue( this->m_Parameters->GetUint( *nIt ) );
-      w_input = v_uint;
+      QSpinBox* v = this->findChild< QSpinBox* >( nIt->c_str( ) );
+      if( v != NULL )
+        this->m_Parameters->SetUint( *nIt, v->value( ) );
     }
     else if( pt == Parameters::Int )
     {
-      QSpinBox* v_int = new QSpinBox( dlg );
-      v_int->setMinimum( -std::numeric_limits< int >::max( ) );
-      v_int->setMaximum(  std::numeric_limits< int >::max( ) );
-      v_int->setValue( this->m_Parameters->GetInt( *nIt ) );
-      w_input = v_int;
+      QSpinBox* v = this->findChild< QSpinBox* >( nIt->c_str( ) );
+      if( v != NULL )
+        this->m_Parameters->SetInt( *nIt, v->value( ) );
     }
     else if( pt == Parameters::Real )
     {
-      QDoubleSpinBox* v_double = new QDoubleSpinBox( dlg );
-      v_double->setDecimals( 3 );
-      v_double->setMinimum( -std::numeric_limits< double >::max( ) );
-      v_double->setMaximum(  std::numeric_limits< double >::max( ) );
-      v_double->setValue( this->m_Parameters->GetReal( *nIt ) );
-      w_input = v_double;
+      QDoubleSpinBox* v = this->findChild< QDoubleSpinBox* >( nIt->c_str( ) );
+      if( v != NULL )
+        this->m_Parameters->SetReal( *nIt, v->value( ) );
     }
     else if(
       pt == Parameters::StringList ||
@@ -317,124 +270,122 @@ ParametersQtDialog(
       pt == Parameters::RealList
       )
     {
-      cpPlugins::Interface::ParametersListWidget* l_double =
-        new cpPlugins::Interface::ParametersListWidget( *nIt, dlg );
-      w_input = l_double;
-
-    } // fi
-
-    // Ok, a representation was created
-    if( w_input != NULL )
-    {
-      w_input->setObjectName( QString( nIt->c_str( ) ) );
-
-      QHBoxLayout* horizontalLayout = new QHBoxLayout( );
-      QLabel* label = new QLabel( dlg );
-      label->setText( QString( nIt->c_str( ) ) );
-      horizontalLayout->addWidget( label );
-      horizontalLayout->addWidget( w_input );
-      verticalLayout->addLayout( horizontalLayout );
-
-    } // fi
-
-  } // rof
-
-  // Add buttons
-  QDialogButtonBox* bb = new QDialogButtonBox(
-    QDialogButtonBox::Ok | QDialogButtonBox::Cancel
-    );
-  QObject::connect( bb, SIGNAL( accepted( ) ), dlg, SLOT( accept( ) ) );
-  QObject::connect( bb, SIGNAL( rejected( ) ), dlg, SLOT( reject( ) ) );
-  verticalLayout->addWidget( bb );
-  gridLayout->addLayout( verticalLayout, 0, 0, 1, 1 );
-
-  // Execute
-  QMetaObject::connectSlotsByName( dlg );
-  if( !( dlg->exec( ) ) )
-    return( false );
-
-  // Get values back
-  nIt = names.begin( );
-  for( ; nIt != names.end( ); ++nIt )
-  {
-    Parameters::Type pt = this->m_Parameters->GetType( *nIt );
-    if( pt == Parameters::String )
-    {
-      QLineEdit* v_string = dlg->findChild< QLineEdit* >( nIt->c_str( ) );
-      if( v_string != NULL )
-        this->m_Parameters->SetString( *nIt, v_string->text( ).toStdString( ) );
-    }
-    else if( pt == Parameters::Bool )
-    {
-      QCheckBox* v_bool = dlg->findChild< QCheckBox* >( nIt->c_str( ) );
-      if( v_bool != NULL )
-        this->m_Parameters->SetBool( *nIt, v_bool->isChecked( ) );
-    }
-    else if( pt == Parameters::Uint )
-    {
-      QSpinBox* v_uint = dlg->findChild< QSpinBox* >( nIt->c_str( ) );
-      if( v_uint != NULL )
-        this->m_Parameters->SetUint( *nIt, v_uint->value( ) );
-    }
-    else if( pt == Parameters::Int )
-    {
-      QSpinBox* v_int = dlg->findChild< QSpinBox* >( nIt->c_str( ) );
-      if( v_int != NULL )
-        this->m_Parameters->SetInt( *nIt, v_int->value( ) );
-    }
-    else if( pt == Parameters::Real )
-    {
-      QDoubleSpinBox* v_double =
-        dlg->findChild< QDoubleSpinBox* >( nIt->c_str( ) );
-      if( v_double != NULL )
-        this->m_Parameters->SetReal( *nIt, v_double->value( ) );
-    }
-    else if(
-      pt == Parameters::StringList ||
-      pt == Parameters::IntList ||
-      pt == Parameters::UintList ||
-      pt == Parameters::RealList
-      )
-    {
-      cpPlugins::Interface::ParametersListWidget* l_double =
-        dlg->findChild< cpPlugins::Interface::ParametersListWidget* >(
+      cpPlugins::Interface::ParametersListWidget* lst =
+        this->findChild< cpPlugins::Interface::ParametersListWidget* >(
           nIt->c_str( )
           );
-      if( l_double != NULL )
+      if( lst != NULL )
       {
         if( pt == Parameters::StringList )
         {
-          std::vector< std::string > values = l_double->GetStringValues( );
+          this->m_Parameters->ClearStringList( *nIt );
+          std::vector< std::string > values = lst->GetStringValues( );
           for( int r = 0; r < values.size( ); ++r )
             this->m_Parameters->AddToStringList( *nIt, values[ r ] );
         }
         else if( pt == Parameters::IntList )
         {
-          std::vector< int > values = l_double->GetIntValues( );
+          this->m_Parameters->ClearIntList( *nIt );
+          std::vector< int > values = lst->GetIntValues( );
           for( int r = 0; r < values.size( ); ++r )
             this->m_Parameters->AddToIntList( *nIt, values[ r ] );
         }
         else if( pt == Parameters::UintList )
         {
-          std::vector< unsigned int > values = l_double->GetUintValues( );
+          this->m_Parameters->ClearUintList( *nIt );
+          std::vector< unsigned int > values = lst->GetUintValues( );
           for( int r = 0; r < values.size( ); ++r )
             this->m_Parameters->AddToUintList( *nIt, values[ r ] );
         }
         else if( pt == Parameters::RealList )
         {
-          std::vector< double > values = l_double->GetDoubleValues( );
+          this->m_Parameters->ClearRealList( *nIt );
+          std::vector< double > values = lst->GetDoubleValues( );
           for( int r = 0; r < values.size( ); ++r )
             this->m_Parameters->AddToRealList( *nIt, values[ r ] );
 
         } // fi
 
       } // fi
-
+    }
+    else if( pt == Parameters::Point || pt == Parameters::Index )
+    {
     } // fi
 
   } // rof
-  return( true );
 }
+
+
+
+
+
+
+
+
+
+/* TODO
+   enum Type
+   {
+   Index,
+   Point,
+   StringList,
+   BoolList,
+   IntList,
+   UintList,
+   IndexList,
+   PointList,
+   Choices,
+   NoType
+   };
+*/
+/*
+    }
+    else if(
+    pt == Parameters::StringList ||
+    pt == Parameters::IntList ||
+    pt == Parameters::UintList ||
+    pt == Parameters::RealList
+    )
+    {
+    cpPlugins::Interface::ParametersListWidget* lst =
+    this->findChild< cpPlugins::Interface::ParametersListWidget* >(
+    nIt->c_str( )
+    );
+    if( lst != NULL )
+    {
+    if( pt == Parameters::StringList )
+    {
+    std::vector< std::string > values = lst->GetStringValues( );
+    for( int r = 0; r < values.size( ); ++r )
+    this->m_Parameters->AddToStringList( *nIt, values[ r ] );
+    }
+    else if( pt == Parameters::IntList )
+    {
+    std::vector< int > values = lst->GetIntValues( );
+    for( int r = 0; r < values.size( ); ++r )
+    this->m_Parameters->AddToIntList( *nIt, values[ r ] );
+    }
+    else if( pt == Parameters::UintList )
+    {
+    std::vector< unsigned int > values = lst->GetUintValues( );
+    for( int r = 0; r < values.size( ); ++r )
+    this->m_Parameters->AddToUintList( *nIt, values[ r ] );
+    }
+    else if( pt == Parameters::RealList )
+    {
+    std::vector< double > values = lst->GetDoubleValues( );
+    for( int r = 0; r < values.size( ); ++r )
+    this->m_Parameters->AddToRealList( *nIt, values[ r ] );
+
+    } // fi
+
+    } // fi
+
+    } // fi
+
+    } // rof
+    return( true );
+    }
 */
 
 #endif // cpPlugins_Interface_QT4