X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FImageMPR%2FImageMPR.cxx;h=ce1f2fc769c7f39232d3902adbb18353cb367936;hb=31e4cf1f3580efa059d3ffad14ba6a15d2372f5c;hp=6c7e11918031325cbc9fbc1e3975495227129caf;hpb=b099c70da465fb2066928a0977899a40bdfff8e3;p=cpPlugins.git diff --git a/appli/ImageMPR/ImageMPR.cxx b/appli/ImageMPR/ImageMPR.cxx index 6c7e119..ce1f2fc 100644 --- a/appli/ImageMPR/ImageMPR.cxx +++ b/appli/ImageMPR/ImageMPR.cxx @@ -1,6 +1,7 @@ #include "ImageMPR.h" #include "ui_ImageMPR.h" +#include #include // ------------------------------------------------------------------------- @@ -14,12 +15,11 @@ ImageMPR:: ImageMPR( QWidget* parent ) : QMainWindow( parent ), - m_UI( new Ui::ImageMPR ), - m_Plugins( new TPlugins ) + m_UI( new Ui::ImageMPR ) { this->m_UI->setupUi( this ); - this->m_Plugins->SetWidget( this ); - this->m_Plugins->SetApplication( this ); + this->m_Plugins.SetWidget( this ); + this->m_Plugins.SetApplication( this ); // Connect actions ImageMPR_ConnectAction( OpenImage ); @@ -36,18 +36,17 @@ ImageMPR( QWidget* parent ) // Associate model with view for( unsigned int i = 0; i < 4; ++i ) - this->m_Plugins->AddInteractor( this->m_UI->MPR->GetInteractor( i ) ); + this->m_Plugins.AddInteractor( this->m_UI->MPR->GetInteractor( i ) ); - // Try to load default plugins -#ifdef WIN32 - this->m_Plugins->LoadPlugins( "cpPluginsIO.dll" ); - this->m_Plugins->LoadPlugins( "cpPluginsBasicFilters.dll" ); -#else - this->m_Plugins->LoadPluginsConfigurationFile( "Plugins.cfg" ); -#endif - this->m_Plugins->AssociatePluginsToMenu( - this->m_UI->MenuFilters, this, SLOT( _execPlugin( ) ) + // Try to load default plugins + QStringList args = QApplication::arguments( ); + QFileInfo info( args.at( 0 ) ); + this->m_Plugins.LoadPluginsPath( + info.absolutePath( ).toStdString( ), true ); + + // Put loaded plugins into menu + this->_AssociatePluginsToMenu( ); } // ------------------------------------------------------------------------- @@ -55,125 +54,132 @@ ImageMPR:: ~ImageMPR( ) { delete this->m_UI; - delete this->m_Plugins; } // ------------------------------------------------------------------------- void ImageMPR:: UpdateActualFilter( ) { - if( !( this->m_Plugins->HasActiveFilter( ) ) ) + if( !( this->m_Plugins.HasActiveFilter( ) ) ) return; - - std::vector< std::string > outputs; - std::string err = this->m_Plugins->UpdateActiveFilter( outputs ); - if( err == "" ) - { - for( auto oIt = outputs.begin( ); oIt != outputs.end( ); ++oIt ) - { - TPlugins::TImage* image = this->m_Plugins->GetImage( *oIt ); - if( image != NULL ) - { - vtkImageData* vimage = image->GetVTK< vtkImageData >( ); - if( vimage != NULL ) - { - this->m_UI->MPR->AddImage( - vimage, *oIt, this->m_Plugins->GetParent( *oIt ) - ); - this->m_UI->MPR->ShowData( *oIt ); - } // fi - continue; - - } // fi - - TPlugins::TMesh* mesh = this->m_Plugins->GetMesh( *oIt ); - if( mesh != NULL ) - { - this->m_Plugins->BlockWidget( ); - this->m_UI->MPR->AddMesh( - mesh->GetVTK< vtkPolyData >( ), - *oIt, - this->m_Plugins->GetParent( *oIt ) - ); - this->m_UI->MPR->ShowData( *oIt ); - this->m_Plugins->UnblockWidget( ); - - } // fi - - } // rof - } - else - { - QMessageBox::critical( - this, - tr( "Error executing filter" ), - tr( ( std::string( "Error caught: " ) + err ).c_str( ) ) - ); + // Update filter + TPlugins::TStringContainer outputs; + if( + !( + this->m_Plugins.UpdateActiveFilter( + outputs, this->m_ActiveFilterMainInput + ) + ) + ) return; - } // fi + // Show outputs + for( auto oIt = outputs.begin( ); oIt != outputs.end( ); ++oIt ) + std::cout << *oIt << std::endl; + + /* TODO + std::vector< std::string > outputs; + std::string err = this->m_Plugins->UpdateActiveFilter( outputs ); + if( err == "" ) + { + for( auto oIt = outputs.begin( ); oIt != outputs.end( ); ++oIt ) + { + TPlugins::TImage* image = this->m_Plugins->GetImage( *oIt ); + if( image != NULL ) + { + vtkImageData* vimage = image->GetVTK< vtkImageData >( ); + if( vimage != NULL ) + { + this->m_UI->MPR->AddImage( + vimage, *oIt, this->m_Plugins->GetParent( *oIt ) + ); + this->m_UI->MPR->ShowData( *oIt ); + + } // fi + continue; + + } // fi + + TPlugins::TMesh* mesh = this->m_Plugins->GetMesh( *oIt ); + if( mesh != NULL ) + { + this->m_Plugins->BlockWidget( ); + this->m_UI->MPR->AddMesh( + mesh->GetVTK< vtkPolyData >( ), + *oIt, + this->m_Plugins->GetParent( *oIt ) + ); + this->m_UI->MPR->ShowData( *oIt ); + this->m_Plugins->UnblockWidget( ); + + } // fi + + } // rof + } + else + { + QMessageBox::critical( + this, + tr( "Error executing filter" ), + tr( ( std::string( "Error caught: " ) + err ).c_str( ) ) + ); + return; + + } // fi + */ } // ------------------------------------------------------------------------- void ImageMPR:: -_aOpenImage( ) +_AssociatePluginsToMenu( ) { - std::string name = this->m_Plugins->ReadImage( "" ); - if( name != "" ) - { - // Since we are opening an image, clear view - this->m_UI->MPR->DeleteAllData( ); + this->m_UI->MenuFilters->clear( ); - // Prepare visualization - TPlugins::TImage* image = this->m_Plugins->GetImage( name ); - vtkImageData* vimage = image->GetVTK< vtkImageData >( ); - if( vimage != NULL ) + TPlugins::TStringContainer categories; + this->m_Plugins.GetLoadedCategories( categories ); + for( auto cIt = categories.begin( ); cIt != categories.end( ); ++cIt ) + { + QMenu* category = this->m_UI->MenuFilters->addMenu( cIt->c_str( ) ); + const TPlugins::TStringContainer& filters = + this->m_Plugins.GetLoadedFilters( *cIt ); + for( auto fIt = filters.begin( ); fIt != filters.end( ); ++fIt ) { - this->m_UI->MPR->AddImage( vimage, name ); - this->m_UI->MPR->ShowData( name ); - } - else - QMessageBox::critical( - this, - QMessageBox::tr( "Error showing image." ), - QMessageBox::tr( - "Image was read, but no valid VTK conversion was found." - ) + QAction* filter = category->addAction( fIt->c_str( ) ); + this->connect( + filter, SIGNAL( triggered( ) ), + this, SLOT( _execPlugin( ) ) ); - } // fi + } // rof + + } // rof } // ------------------------------------------------------------------------- -void ImageMPR:: -_aOpenDICOMSeries( ) -{ - std::string name = this->m_Plugins->ReadDicomSeries( "" ); - if( name != "" ) - { - // Since we are opening an image, clear view - this->m_UI->MPR->DeleteAllData( ); - - // Prepare visualization - TPlugins::TImage* image = this->m_Plugins->GetImage( name ); - vtkImageData* vimage = image->GetVTK< vtkImageData >( ); - if( vimage != NULL ) - { - this->m_UI->MPR->AddImage( vimage, name ); - this->m_UI->MPR->ShowData( name ); - } - else - QMessageBox::critical( - this, - QMessageBox::tr( "Error showing image." ), - QMessageBox::tr( - "Image was read, but no valid VTK conversion was found." - ) - ); +#define ImageMPR_ReadImage( F ) \ + this->m_UI->MPR->DeleteAllData( ); \ + this->m_Plugins.ClearDataObjects( ); \ + try \ + { \ + std::string name = this->m_Plugins.Read##F( "" ); \ + if( name == "" ) \ + return; \ + TImage* image = this->m_Plugins.GetData< TImage >( name ); \ + this->m_UI->MPR->AddData( image, name, "" ); \ + this->m_UI->MPR->ShowData( name ); \ + } \ + catch( std::exception& err ) \ + { \ + QMessageBox::critical( \ + this, \ + QMessageBox::tr( "Error reading image." ), \ + QMessageBox::tr( err.what( ) ) \ + ); \ + } - } // fi -} +void ImageMPR::_aOpenImage( ) { ImageMPR_ReadImage( Image ) } +void ImageMPR::_aOpenDICOMSeries( ) { ImageMPR_ReadImage( DicomSeries ) } // ------------------------------------------------------------------------- void ImageMPR:: @@ -195,8 +201,10 @@ _aOpenPolyData( ) void ImageMPR:: _aSaveImage( ) { - std::string data_name = this->m_UI->MPR->GetSelectedData( ); - this->m_Plugins->WriteImage( data_name ); + /* + std::string data_name = this->m_UI->MPR->GetSelectedData( ); + this->m_Plugins->WriteImage( data_name ); + */ } // ------------------------------------------------------------------------- @@ -227,10 +235,8 @@ _aRedo( ) void ImageMPR:: _aLoadPlugins( ) { - this->m_Plugins->DialogLoadPlugins( ); - this->m_Plugins->AssociatePluginsToMenu( - this->m_UI->MenuFilters, this, SLOT( _execPlugin( ) ) - ); + this->m_Plugins.DialogLoadPlugins( ); + this->_AssociatePluginsToMenu( ); } // ------------------------------------------------------------------------- @@ -243,62 +249,47 @@ _aShowPlugins( ) void ImageMPR:: _execPlugin( ) { - // Get filter's name and category + // Get filter's name QAction* action = dynamic_cast< QAction* >( this->sender( ) ); if( action == NULL ) return; - QMenu* menu = dynamic_cast< QMenu* >( action->parentWidget( ) ); - if( menu == NULL ) - return; - std::string filter_cate = menu->title( ).toStdString( ); std::string filter_name = action->text( ).toStdString( ); // Activate filter - if( !( this->m_Plugins->ActivateFilter( filter_name ) ) ) + if( !( this->m_Plugins.ActivateFilter( filter_name ) ) ) return; - // Associate inputs - std::vector< std::string > inputs = - this->m_Plugins->GetActiveFilterInputsNames( ); - if( inputs.size( ) == 1 ) + // Get IO names + TPlugins::TStringContainer inputs; + this->m_Plugins.GetActiveFilterInputsNames( inputs ); + + // Configure inputs + if( inputs.size( ) > 1 ) { - std::string data_name = this->m_UI->MPR->GetSelectedData( ); - this->m_Plugins->ConnectInputInActiveFilter( data_name, inputs[ 0 ] ); + // TODO } - else if( inputs.size( ) > 1 ) + else if( inputs.size( ) == 1 ) { - QMessageBox::critical( - this, - tr( "Error executing" ), - tr( "Filter has multiple inputs: NOT YET IMPLEMENTED!!!" ) + this->m_ActiveFilterMainInput = this->m_UI->MPR->GetSelectedData( ); + this->m_Plugins.ConnectInputInActiveFilter( + this->m_ActiveFilterMainInput, *( inputs.begin( ) ) ); - return; } // fi - // Associate outputs - std::vector< std::string > outputs = - this->m_Plugins->GetActiveFilterOutputsNames( ); - for( auto oIt = outputs.begin( ); oIt != outputs.end( ); ++oIt ) - this->m_Plugins->SetOutputNameInActiveFilter( - filter_name + "_" + *oIt, *oIt - ); - - // Configure filter - TPlugins::TProcessObject::DialogResult dlg_res = - this->m_Plugins->ConfigureActiveFilter( ); + // Configure paramereters + auto dlg_res = this->m_Plugins.ConfigureActiveFilter( ); if( dlg_res == TPlugins::TProcessObject::DialogResult_Cancel ) { - this->m_Plugins->DeactivateFilter( ); + // Just deactivate filter, since it was canceled + this->m_Plugins.DeactivateFilter( ); return; - - } // fi - - // Execute filter and associate outputs - if( dlg_res == TPlugins::TProcessObject::DialogResult_NoModal ) + } + else if( dlg_res == TPlugins::TProcessObject::DialogResult_NoModal ) { + // Execute automatic filter and associate outputs this->UpdateActualFilter( ); - this->m_Plugins->DeactivateFilter( ); + this->m_Plugins.DeactivateFilter( ); } // fi }