]> Creatis software - creaMaracasVisu.git/commitdiff
TODO : fix deprecated
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Wed, 27 Jul 2011 13:57:42 +0000 (13:57 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Wed, 27 Jul 2011 13:57:42 +0000 (13:57 +0000)
bbtk/src/bbmaracasvisuContourVOI.cxx

index 8c3fbaaf00e2d79d6ef59bf527e3671debbbb1c3..8ba853d224d780da7fe5edf9d817861ecbf5f64f 100644 (file)
@@ -32,21 +32,18 @@ END_EVENT_TABLE( );
                this->wxvtkbaseview = NULL;
                mcontourvoiwidget=NULL;
 
-
                if(wxvtkbaseview!=NULL&&imagedata!=NULL){
 
                        setBaseView(wxvtkbaseview);
                        setImageData(imagedata);
                        initializeVOIWidget();
-
-               }
-
-                               
+               }                       
   }
    void wxWidgetVOI::initializeVOIWidget(){
           wxSizer* sizer = this->GetSizer();
 
-               
+
+/// \TODO fix deprecated warning: virtual bool wxSizer::Remove(wxWindow*) is deprecated (declared at /usr/include/wx-2.8/wx/sizer.h:513)               
                if(mcontourvoiwidget!=NULL){
                        sizer->Remove(  mcontourvoiwidget );    
                        mcontourvoiwidget->Destroy();
@@ -55,7 +52,6 @@ END_EVENT_TABLE( );
                mcontourvoiwidget = new ContourVOIWidget( this, wxvtkbaseview, imagedata );
                mcontourvoiwidget->ConfigureVTK();
 
-               
                sizer   -> Add( mcontourvoiwidget,1,wxGROW ); 
 //             wxwidget = new wxMPRWidget2( panel, marimagedata , 1 ); 
 //             wxwidget->ConfigureVTK();       
@@ -137,7 +133,6 @@ void ContourVOI::Process()
       wxMessageDialog(NULL,  bbtk::std2wx("(ContourVOI) Input 'In' is not set"),  bbtk::std2wx(bbGetFullName()) ).ShowModal();
     }*/
 
-
        vtkImageData* img = bbGetInputIn();
        wxVtkBaseView* base = bbGetInputwxVtkBaseView();
 
@@ -153,7 +148,6 @@ void ContourVOI::Process()
                wxwidgetvoi->initializeVOIWidget();             
        }
 
-       
        if (wxwidgetvoi!=NULL && _img!=NULL && _base != NULL){
                ContourVOIWidget* contourvoiwidget = wxwidgetvoi->GetContourVOIWidget();
                
@@ -183,12 +177,10 @@ void ContourVOI::Process()
                bbSetOutputVOI(_extract->GetOutput());
                //JCP
   */
-
-               
+       
                bbSetOutputIndex( Index );
                bbSetOutputSize( Size );
        } 
-
 }
 
 //------------------------------------------------------
@@ -206,7 +198,6 @@ void ContourVOI::CreateWidget(wxWindow*  parent)
 //------------------------------------------------------
 void ContourVOI::bbUserSetDefaultValues()
 {
-
        _img = NULL;
        _base = NULL;
 //EED 20Juin2011       _extract =NULL;
@@ -220,20 +211,17 @@ void ContourVOI::bbUserSetDefaultValues()
 
 }
 
-       //-----------------------------------------------------------------     
-       void ContourVOI::bbUserInitializeProcessing()
-       {
-       }
+//-----------------------------------------------------------------    
+void ContourVOI::bbUserInitializeProcessing()
+{
+}
        
-       //-----------------------------------------------------------------     
-       void ContourVOI::bbUserFinalizeProcessing()
-       {
-       }
+//-----------------------------------------------------------------    
+void ContourVOI::bbUserFinalizeProcessing()
+{
+}
        
-       //-----------------------------------------------------------------     
+//-----------------------------------------------------------------    
        
-
 }
 // EO namespace bbcreaMaracasVisu
-
-