X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FImageMPR%2FImageMPR.cxx;h=ce1f2fc769c7f39232d3902adbb18353cb367936;hb=31e4cf1f3580efa059d3ffad14ba6a15d2372f5c;hp=47c3622e4e7430af2663940ea6a32de22d1e7de2;hpb=a02d2e4b730e0a8c7709856c9c47eb7ad19edda0;p=cpPlugins.git diff --git a/appli/ImageMPR/ImageMPR.cxx b/appli/ImageMPR/ImageMPR.cxx index 47c3622..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,11 +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.SetWidget( this ); + this->m_Plugins.SetApplication( this ); // Connect actions ImageMPR_ConnectAction( OpenImage ); @@ -33,11 +34,19 @@ ImageMPR( QWidget* parent ) ImageMPR_ConnectAction( LoadPlugins ); ImageMPR_ConnectAction( ShowPlugins ); + // Associate model with view + for( unsigned int i = 0; i < 4; ++i ) + this->m_Plugins.AddInteractor( this->m_UI->MPR->GetInteractor( i ) ); + // Try to load default plugins - this->m_Plugins->LoadPluginsConfigurationFile( "Plugins.cfg" ); - this->m_Plugins->AssociatePluginsToMenu( - this->m_UI->MenuFilters, this, SLOT( _execPlugin( ) ) + QStringList args = QApplication::arguments( ); + QFileInfo info( args.at( 0 ) ); + this->m_Plugins.LoadPluginsPath( + info.absolutePath( ).toStdString( ), true ); + + // Put loaded plugins into menu + this->_AssociatePluginsToMenu( ); } // ------------------------------------------------------------------------- @@ -45,79 +54,133 @@ ImageMPR:: ~ImageMPR( ) { delete this->m_UI; - delete this->m_Plugins; } // ------------------------------------------------------------------------- void ImageMPR:: -_aOpenImage( ) +UpdateActualFilter( ) { - // Clear all, since we are loading the main image - if( this->m_Objects.size( ) > 0 ) - { - this->m_UI->MPR->ClearAll( ); - this->m_Objects.clear( ); - - } // fi - - // Read and show image, if possible - TPlugins::TImage::Pointer image; - if( this->m_Plugins->ReadImage( image, true ) ) - { - vtkImageData* vimage = image->GetVTK< vtkImageData >( ); - if( vimage == NULL ) - QMessageBox::critical( - this, - QMessageBox::tr( "Error showing image." ), - QMessageBox::tr( - "Image was read, but no valid VTK conversion was found." - ) - ); - else - this->m_UI->MPR->ShowImage( vimage, image->GetName( ) ); + if( !( this->m_Plugins.HasActiveFilter( ) ) ) + return; - // Keep a track on a local data tree - this->m_Objects[ image->GetName( ) ] = - TTreeNode( "", image.GetPointer( ) ); + // 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:: -_aOpenDICOMSeries( ) +_AssociatePluginsToMenu( ) { - // Clear all, since we are loading the main image - if( this->m_Objects.size( ) > 0 ) - { - this->m_UI->MPR->ClearAll( ); - this->m_Objects.clear( ); - - } // fi + this->m_UI->MenuFilters->clear( ); - // Read and show image, if possible - TPlugins::TImage::Pointer image; - if( this->m_Plugins->ReadDicomSeries( image ) ) + TPlugins::TStringContainer categories; + this->m_Plugins.GetLoadedCategories( categories ); + for( auto cIt = categories.begin( ); cIt != categories.end( ); ++cIt ) { - vtkImageData* vimage = image->GetVTK< vtkImageData >( ); - if( vimage == NULL ) - QMessageBox::critical( - this, - QMessageBox::tr( "Error showing image." ), - QMessageBox::tr( - "Image was read, but no valid VTK conversion was found." - ) + 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 ) + { + QAction* filter = category->addAction( fIt->c_str( ) ); + this->connect( + filter, SIGNAL( triggered( ) ), + this, SLOT( _execPlugin( ) ) ); - else - this->m_UI->MPR->ShowImage( vimage, image->GetName( ) ); - // Keep a track on a local data tree - this->m_Objects[ image->GetName( ) ] = - TTreeNode( "", image.GetPointer( ) ); + } // rof - } // fi + } // rof } +// ------------------------------------------------------------------------- +#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( ) ) \ + ); \ + } + +void ImageMPR::_aOpenImage( ) { ImageMPR_ReadImage( Image ) } +void ImageMPR::_aOpenDICOMSeries( ) { ImageMPR_ReadImage( DicomSeries ) } + // ------------------------------------------------------------------------- void ImageMPR:: _aOpenSegmentation( ) @@ -139,8 +202,8 @@ void ImageMPR:: _aSaveImage( ) { /* - if( this->m_MainImage.IsNotNull( ) ) - this->m_Plugins->WriteImage( this->m_MainImage, true ); + std::string data_name = this->m_UI->MPR->GetSelectedData( ); + this->m_Plugins->WriteImage( data_name ); */ } @@ -172,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( ); } // ------------------------------------------------------------------------- @@ -188,193 +249,49 @@ _aShowPlugins( ) void ImageMPR:: _execPlugin( ) { - /* - typedef std::map< std::string, TPlugins::TImage::Pointer > _TImages; - typedef std::map< std::string, TPlugins::TMesh::Pointer > _TMeshes; - - // Get selected data - // std::string data_name = this->m_UI->MPR->GetSelectedData( ); - - // Get filter name + // 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( ); - // Create filter - TPlugins::TProcessObject::Pointer filter; - if( !( this->m_Plugins->CreateFilter( filter, filter_name ) ) ) - { - QMessageBox::critical( - this, - tr( "Error creating filter" ), - tr( ( - std::string( "No valid filter \"" ) + - filter_name + - std::string( "\"defined." ) - ).c_str( ) ) - ); + // Activate filter + if( !( this->m_Plugins.ActivateFilter( filter_name ) ) ) return; - } // fi + // Get IO names + TPlugins::TStringContainer inputs; + this->m_Plugins.GetActiveFilterInputsNames( inputs ); - // Assign inputs - std::vector< std::string > inputs_names = filter->GetInputsNames( ); - if( inputs_names.size( ) == 1 ) + // Configure inputs + if( inputs.size( ) > 1 ) { - std::string data_name = this->m_UI->MPR->GetSelectedData( ); - _TImages::iterator iIt = this->m_Images.find( data_name ); - _TImages::iterator mIt = this->m_Meshes.find( data_name ); - filter->SetInput( inputs_names[ 0 ]); + // TODO } - else if( inputs_names.size( ) > 1 ) + else if( inputs.size( ) == 1 ) { - } // fi - - // Get outputs - std::vector< std::string > outputs_names = filter->GetOutputsNames( ); - */ - - /* - - // Choose inputs - if( filter_cate == "ImageToMeshFilter" ) - { - // Check inputs - _TImages::iterator iIt = this->m_Images.find( data_name ); - if( iIt == this->m_Images.end( ) ) - { - QMessageBox::critical( - this, - tr( "Error creating filter" ), - tr( "No valid input selected." ) - ); - return; - - } // fi - - // Execute configuration dialog - if( !( filter->ExecConfigurationDialog( this ) ) ) - return; - - // Execute filter - filter->SetInput( "Input", iIt->second ); - this->_Block( ); - std::string filter_err = filter->Update( ); - this->_Unblock( ); - if( filter_err != "" ) - { - QMessageBox::critical( - this, - tr( "Error executing" ), - tr( filter_err.c_str( ) ) - ); - return; - - } // fi - - // Keep and show results - TPlugins::TMesh::Pointer mesh = - filter->GetOutput< TPlugins::TMesh >( "Output" ); - this->m_Meshes[ filter_name ] = mesh; - this->_Block( ); - this->m_UI->MPR->ShowMesh( - mesh->GetVTK< vtkPolyData >( ), - filter_name, - data_name + this->m_ActiveFilterMainInput = this->m_UI->MPR->GetSelectedData( ); + this->m_Plugins.ConnectInputInActiveFilter( + this->m_ActiveFilterMainInput, *( inputs.begin( ) ) ); - this->_Unblock( ); } // fi - */ - /* - if( this->m_Plugins->CreateFilter( filter, name ) ) - { - if( filter->ExecConfigurationDialog( this ) ) - { - filter->SetInput( "Input", this->m_MainImage ); - this->_Block( ); - err = filter->Update( ); - this->_Unblock( ); - TPlugins::TMesh::Pointer mesh = - filter->GetOutput< TPlugins::TMesh >( "Output" ); - this->m_Meshes.push_back( mesh ); - mesh->CreateVTKActor( ); - vtkActor* actor = mesh->GetVTKActor( ); - if( actor != NULL ) - this->m_UI->MPR->Add3DActor( actor ); - - } // fi - - } // fi - } - else - QMessageBox::critical( - this, - tr( "Error creating filter" ), - tr( "No valid filter defined." ) - ); - */ - /* - if( name == "cpPlugins::BasicFilters::FloodFillImageFilter" ) - { - this->m_Flooding = true; - } - else - { - this->m_Flooding = false; - this->m_UI->MPR->ExecuteFilter( - name, this->m_ImageLoaded, "SegmentedImage" - ); - - } // fi - */ - - // Configure filter - /* - TPluginFilter::Pointer filter = - this->m_Plugins.CreateProcessObject( name ); - bool dlg_ok = filter->ExecConfigurationDialog( NULL ); - if( !dlg_ok ) + // Configure paramereters + auto dlg_res = this->m_Plugins.ConfigureActiveFilter( ); + if( dlg_res == TPlugins::TProcessObject::DialogResult_Cancel ) + { + // Just deactivate filter, since it was canceled + this->m_Plugins.DeactivateFilter( ); return; + } + else if( dlg_res == TPlugins::TProcessObject::DialogResult_NoModal ) + { + // Execute automatic filter and associate outputs + this->UpdateActualFilter( ); + this->m_Plugins.DeactivateFilter( ); - // Execute filter - QApplication::setOverrideCursor( Qt::WaitCursor ); - this->setEnabled( false ); - filter->SetInput( 0, this->m_Image ); - std::string err = filter->Update( ); - QApplication::restoreOverrideCursor( ); - this->setEnabled( true ); - - // Update image - if( err == "" ) - { - TPluginImage* result = filter->GetOutput< TPluginImage >( 0 ); - result->DisconnectPipeline( ); - this->m_Image = result; - if( this->m_Image.IsNotNull( ) ) - this->m_MPRObjects->SetImage( - this->m_Image->GetVTK< vtkImageData >( ) - ); - MementoState(this->m_state, this->m_Image); - this->m_state++; - if (this->m_state > this->m_max_state) - { - this->m_max_state = this->m_state; - } - } - else - QMessageBox::critical( - this, - tr( "Error executing filter" ), - tr( err.c_str( ) ) - ); - */ + } // fi } // -------------------------------------------------------------------------