X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FPlugins%2FIO%2FMeshReader.cxx;h=27d8f559e7601e352be172245a76fe2f768c46ca;hb=273699a71c538630c162de031f0c95014319311d;hp=397b644ef10b402d267a5e0fadd98a7571e239fd;hpb=e9143845b476fc8b86c1706fb140ebee770a650b;p=cpPlugins.git diff --git a/lib/cpPlugins/Plugins/IO/MeshReader.cxx b/lib/cpPlugins/Plugins/IO/MeshReader.cxx index 397b644..27d8f55 100644 --- a/lib/cpPlugins/Plugins/IO/MeshReader.cxx +++ b/lib/cpPlugins/Plugins/IO/MeshReader.cxx @@ -4,15 +4,17 @@ #include #include +/* TODO #ifdef cpPlugins_Interface_QT4 #include #endif // cpPlugins_Interface_QT4 // ------------------------------------------------------------------------- -bool cpPlugins::IO::MeshReader:: +cpPlugins::IO::MeshReader:: +DialogResult cpPlugins::IO::MeshReader:: ExecConfigurationDialog( QWidget* parent ) { - bool r = false; + DialogResult r = Self::DialogResult_Cancel; #ifdef cpPlugins_Interface_QT4 @@ -28,7 +30,7 @@ ExecConfigurationDialog( QWidget* parent ) this->m_Parameters->SetSelectedChoice( "PixelType", "float" ); this->m_Parameters->SetUint( "Dimension", 3 ); - r = true; + r = Self::DialogResult_NoModal; } // fi @@ -36,21 +38,23 @@ ExecConfigurationDialog( QWidget* parent ) return( r ); } +*/ // ------------------------------------------------------------------------- cpPlugins::IO::MeshReader:: MeshReader( ) : Superclass( ) { - this->SetNumberOfOutputs( 1 ); - this->_MakeOutput< cpPlugins::Interface::Mesh >( 0 ); + this->_AddOutput< cpPlugins::Interface::Mesh >( "Output" ); std::vector< TParameters::TString > valid_types; valid_types.push_back( "float" ); valid_types.push_back( "double" ); - this->m_Parameters->ConfigureAsString( "FileName", "" ); + this->m_Parameters->ConfigureAsOpenFileName( "FileName" ); this->m_Parameters->ConfigureAsChoices( "PixelType", valid_types ); - this->m_Parameters->ConfigureAsUint( "Dimension", 3 ); + this->m_Parameters->ConfigureAsUint( "Dimension" ); + + this->m_Parameters->SetUint( "Dimension", 3 ); } // ------------------------------------------------------------------------- @@ -93,14 +97,14 @@ std::string cpPlugins::IO::MeshReader:: _GD1( ) { // Get filename - std::string fname = this->m_Parameters->GetString( "FileName" ); + std::string fname = this->m_Parameters->GetOpenFileName( "FileName" ); vtkPolyDataReader* pdr = this->_CreateVTK< vtkPolyDataReader >( ); pdr->SetFileName( fname.c_str( ) ); pdr->Update( ); cpPlugins::Interface::Mesh* out = - this->GetOutput< cpPlugins::Interface::Mesh >( 0 ); + this->GetOutput< cpPlugins::Interface::Mesh >( "Output" ); if( out != NULL ) out->SetVTK( pdr->GetOutput( ) ); else