*** empty log message ***

[creaMaracasVisu.git] / bbtk / src / bbmaracasvisuContourVOI.cxx

diff --git a/bbtk/src/bbmaracasvisuContourVOI.cxx b/bbtk/src/bbmaracasvisuContourVOI.cxx
index 55d64736a473973fe99aab4d9c2a1ff683025635..dfb620215e184217e8afe8316abda565e10ecfb4 100644 (file)
--- a/bbtk/src/bbmaracasvisuContourVOI.cxx
+++ b/bbtk/src/bbmaracasvisuContourVOI.cxx
@@ -22,6 +22,14 @@ END_EVENT_TABLE( );
   {
 //             wxPanel *panel  = this;
 
+               wxFlexGridSizer *sizer=new wxFlexGridSizer(1);          
+               sizer   -> AddGrowableCol(0);
+               this    -> SetSizer(sizer);
+               this    -> SetAutoLayout(true);
+               this->wxvtkbaseview = NULL;
+               mcontourvoiwidget=NULL;
+
+
                if(wxvtkbaseview!=NULL&&imagedata!=NULL){
 
                        setBaseView(wxvtkbaseview);
@@ -32,28 +40,34 @@ END_EVENT_TABLE( );
 
                                
   }
+   void wxWidgetVOI::initializeVOIWidget(){
+          wxSizer* sizer = this->GetSizer();
 
-  void wxWidgetVOI::setBaseView(wxVtkBaseView * wxvtkbaseview){
-         this->wxvtkbaseview = wxvtkbaseview;
-  }
-  void wxWidgetVOI::setImageData(vtkImageData * imagedata){
-         this->imagedata = imagedata;
-  }
+               
+               if(mcontourvoiwidget!=NULL){
+                       sizer->Remove(  mcontourvoiwidget );    
+                       mcontourvoiwidget->Destroy();
+               }
 
-  void wxWidgetVOI::initializeVOIWidget(){
                mcontourvoiwidget = new ContourVOIWidget( this, wxvtkbaseview, imagedata );
                mcontourvoiwidget->ConfigureVTK();
 
-//             wxwidget = new wxMPRWidget2( panel, marimagedata , 1 ); 
-//             wxwidget->ConfigureVTK();
-               wxFlexGridSizer *sizer=new wxFlexGridSizer(1);
+               
                sizer   -> Add( mcontourvoiwidget,1,wxGROW ); 
-               sizer   -> AddGrowableCol(0);
-               this    -> SetSizer(sizer);
-               this    -> SetAutoLayout(true);
-               this    -> Layout();
+//             wxwidget = new wxMPRWidget2( panel, marimagedata , 1 ); 
+//             wxwidget->ConfigureVTK();       
+               
                this->Refresh();
   }
+
+  void wxWidgetVOI::setBaseView(wxVtkBaseView * wxvtkbaseview){
+         this->wxvtkbaseview = wxvtkbaseview;
+  }
+  void wxWidgetVOI::setImageData(vtkImageData * imagedata){
+         this->imagedata = imagedata;
+  }
+
+ 
 //--------------------------------------------------------------------------
   wxWidgetVOI::~wxWidgetVOI()
   {
@@ -150,6 +164,21 @@ void ContourVOI::Process()
 
                std::cout<<"ContourVOI index "<<Index<<" size "<<Size<<std::endl;
 
+               //JCP
+               if(_extract!=NULL){             
+                       _extract->Delete();
+               }
+               _extract = vtkExtractVOI::New();
+               _extract->RemoveAllInputs();
+               _extract->SetInput(img);
+               _extract->SetVOI(voi);  
+               _extract->UpdateWholeExtent();
+               _extract->Update();
+               bbSetOutputVOI(_extract->GetOutput());
+               //JCP
+                
+
+               
                bbSetOutputIndex( Index );
                bbSetOutputSize( Size );
        } 
@@ -169,33 +198,34 @@ void ContourVOI::CreateWidget(wxWindow*  parent)
 }
 
 //------------------------------------------------------
-void ContourVOI::bbUserConstructor()
+void ContourVOI::bbUserSetDefaultValues()
 {
 
        _img = NULL;
        _base = NULL;
+       _extract =NULL;
        bbSetInputwxVtkBaseView(NULL);
        bbSetInputIn(NULL);
        bbSetOutputWidget(NULL);
+       bbSetOutputVOI(NULL);
 
        bbSetInputIn(NULL);
        bbSetInputwxVtkBaseView(NULL);
 
 }
 
-//------------------------------------------------------
-void ContourVOI::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-       _img = NULL;
-       _base = NULL;
-
-}
-
-//------------------------------------------------------
-void ContourVOI::bbUserDestructor()
-{
-}
-
+       //-----------------------------------------------------------------     
+       void ContourVOI::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void ContourVOI::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       
 
 }
 // EO namespace bbcreaMaracasVisu