Bug #1679

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

diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index e404aaf4a0d2eabf7b24a5d64f6807dc0dc6e0d9..c8e287fc0216756afa12b68bd1e2f048a967133e 100644 (file)
--- a/bbtk/src/bbmaracasvisuViewerNV.cxx
+++ b/bbtk/src/bbmaracasvisuViewerNV.cxx
@@ -31,13 +31,13 @@ bbwxMaracas_N_ViewersWidget::~bbwxMaracas_N_ViewersWidget()
 void bbwxMaracas_N_ViewersWidget::OnRefreshView(wxCommandEvent & event)
 {
        //printf("CPR: bbwxMaracas_N_ViewersWidget::OnRefreshView -> actualiza X, Y y Z\n");
-       mbbViewerNV->point.clear();
+       mbbViewerNV->_point.clear();
 
-       mbbViewerNV->point.push_back( (int)GetX() );
-       mbbViewerNV->point.push_back( (int)GetY() );
-       mbbViewerNV->point.push_back( (int)GetZ() );
-       mbbViewerNV->bbSetOutputPoint( mbbViewerNV->point );
-       mbbViewerNV->bbSignalOutputModification(std::string("Point"));    
+       mbbViewerNV->_point.push_back( (int)GetX() );
+       mbbViewerNV->_point.push_back( (int)GetY() );
+       mbbViewerNV->_point.push_back( (int)GetZ() );
+       mbbViewerNV->bbSetOutputPoint( mbbViewerNV->_point );
+       mbbViewerNV->bbSignalOutputModification(std::string("Point"));
 
        wxMaracas_N_ViewersWidget::OnRefreshView(event);
 }
@@ -46,7 +46,7 @@ void bbwxMaracas_N_ViewersWidget::OnRefreshView(wxCommandEvent & event)
 void bbwxMaracas_N_ViewersWidget::OnDClickLeft(wxCommandEvent & event)
 {
        wxMaracas_N_ViewersWidget::OnDClickLeft(event);
-       mbbViewerNV->bbSignalOutputModification(std::string("Point"));    
+       mbbViewerNV->bbSignalOutputModification(std::string("Point"));
 }
 
 //-------------------------------------------------------------
@@ -59,8 +59,8 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ViewerNV)
 BBTK_BLACK_BOX_IMPLEMENTATION(ViewerNV,bbtk::WxBlackBox);
 //-------------------------------------------------------------
 void ViewerNV::Process()
-{      
-       vtkImageData* img = bbGetInputIn();     
+{
+       vtkImageData* img = bbGetInputIn();
 /*
        double spc[3];
        img->GetSpacing(spc);
@@ -75,37 +75,31 @@ void ViewerNV::Process()
        std::vector<int> type = bbGetInputnTypeView();
 
 
-       if(img != NULL && mwxwidget != NULL){
-               if(!compareVectors(type, currenttype)){
-                       mwxwidget->SetType(&type);
-                       mwxwidget->UpdateLayout(img);                   
-               }else if (img != currentimg){           
-                       mwxwidget->SetImage(img);                       
-                       //mwxwidget->UpdateLayout(img);
+       if(img != NULL && _mwxwidget != NULL){
+               if(!compareVectors(type, _currenttype)){
+                       _mwxwidget->SetType(&type);
+                       _mwxwidget->UpdateLayout(img);
+               }else if (img != _currentimg){
+                       _mwxwidget->SetImage(img);
                }
 
-               if (firsttime==true)  // EED  21 aout 2010
-               {
-                       firsttime=false;
-                       mwxwidget->ConfigureVTK();
-               }
-               mwxwidget->RefreshView();
+               _mwxwidget->RefreshView();
 
-               currenttype = type;
-               currentimg = img;
+               _currenttype = type;
+               _currentimg = img;
 
-               point.clear();
-               point.push_back((int)mwxwidget->GetX());
-               point.push_back((int)mwxwidget->GetY());
-               point.push_back((int)mwxwidget->GetZ());
-               bbSetOutputPoint(point);
+               _point.clear();
+               _point.push_back((int)_mwxwidget->GetX());
+               _point.push_back((int)_mwxwidget->GetY());
+               _point.push_back((int)_mwxwidget->GetZ());
+               bbSetOutputPoint(_point);
 
-       //    WxBlackBox::Process(); 
+       //    WxBlackBox::Process();
 //             mwxwidget->SetImage(img );
-               wxVtkBaseView *wvbv1 = mwxwidget->GetwxVtkBaseView(1);
-               wxVtkBaseView *wvbv2 = mwxwidget->GetwxVtkBaseView(2);
-               wxVtkBaseView *wvbv3 = mwxwidget->GetwxVtkBaseView(3);
-               wxVtkBaseView *wvbv4 = mwxwidget->GetwxVtkBaseView(4);
+               wxVtkBaseView *wvbv1 = _mwxwidget->GetwxVtkBaseView(1);
+               wxVtkBaseView *wvbv2 = _mwxwidget->GetwxVtkBaseView(2);
+               wxVtkBaseView *wvbv3 = _mwxwidget->GetwxVtkBaseView(3);
+               wxVtkBaseView *wvbv4 = _mwxwidget->GetwxVtkBaseView(4);
 
                //wxwidget->RefreshView();
 
@@ -118,20 +112,20 @@ void ViewerNV::Process()
                if (wvbv3!=NULL) { bbSetOutputRenderer3( wvbv3->GetRenderer() ); }
                if (wvbv4!=NULL) { bbSetOutputRenderer4( wvbv4->GetRenderer() ); }
 
-               if (wvbv1!=NULL) 
-               { 
-                       bbSetOutputInteractor1( wvbv1->GetWxVTKRenderWindowInteractor() ); 
+               if (wvbv1!=NULL)
+               {
+                       bbSetOutputInteractor1( wvbv1->GetWxVTKRenderWindowInteractor() );
                        updateObservers();
                }
 
                if(bbGetInputColorFunction()!=NULL)
                {
-                       mwxwidget->setColorTransferFunction(bbGetInputColorFunction());
+                       _mwxwidget->setColorTransferFunction(bbGetInputColorFunction());
                }
 
                if(bbGetInputWindowLevel()!=-1)
                {
-                   mwxwidget->setWindowLevel(bbGetInputWindowLevel());
+                       _mwxwidget->setWindowLevel(bbGetInputWindowLevel());
                }
 
                if(bbGetInputColorLevel()!=-1)
@@ -139,9 +133,9 @@ void ViewerNV::Process()
                        if(bbGetInputColorLevel() == 0)
                        {
                                std::cout<<"colorlevel "<<bbGetInputColorLevel()<<std::endl;
-                               mwxwidget->setColorLevel(0.1);
+                               _mwxwidget->setColorLevel(0.1);
                        }else{
-                               mwxwidget->setColorLevel(bbGetInputColorLevel());
+                               _mwxwidget->setColorLevel(bbGetInputColorLevel());
                        }
                }
        }//  mwxwidget != NULL
@@ -150,13 +144,10 @@ void ViewerNV::Process()
 //-------------------------------------------------------------
 void ViewerNV::CreateWidget(wxWindow* parent)
 {
-
     bbtkDebugMessageInc("Core",9,"ViewerNV::CreateWidget()"<<std::endl);
-       mwxwidget = new bbwxMaracas_N_ViewersWidget( this, parent );    
+       _mwxwidget = new bbwxMaracas_N_ViewersWidget( this, parent );
        bbtkDebugDecTab("Core",9);
-    bbSetOutputWidget( mwxwidget );    
-
-       
+    bbSetOutputWidget( _mwxwidget );
        //this->bbSignalOutputModification();
        //Process();
 }
@@ -164,8 +155,8 @@ void ViewerNV::CreateWidget(wxWindow* parent)
 //-------------------------------------------------------------
 void ViewerNV::bbUserSetDefaultValues()
 {
-       firsttime=true;
-       mwxwidget = NULL;
+       _currentimg                             =       NULL;
+       _mwxwidget                              =       NULL;
        bbSetInputIn(NULL);
 
        bbSetInputObs1(NULL);
@@ -176,9 +167,9 @@ void ViewerNV::bbUserSetDefaultValues()
 
        std::vector<int> vecNTypeViwer;
        vecNTypeViwer.push_back(5);
-       vecNTypeViwer.push_back(0);
        vecNTypeViwer.push_back(1);
-       vecNTypeViwer.push_back(3);
+       vecNTypeViwer.push_back(2);
+       vecNTypeViwer.push_back(0);
        bbSetInputnTypeView(vecNTypeViwer);
 
        bbSetOutputwxVtkBaseView1( NULL );
@@ -194,20 +185,20 @@ void ViewerNV::bbUserSetDefaultValues()
        bbSetInputColorLevel(-1);
 }
 
-//-----------------------------------------------------------------    
+//-----------------------------------------------------------------
 void ViewerNV::bbUserInitializeProcessing()
 {
 }
-       
-//-----------------------------------------------------------------    
+
+//-----------------------------------------------------------------
 void ViewerNV::bbUserFinalizeProcessing()
 {
 }
-       
-//-----------------------------------------------------------------    
-       
-       
-       
+
+//-----------------------------------------------------------------
+
+
+
 bool ViewerNV::compareVectors(std::vector<int> type,std::vector<int> currenttype){
 
        bool ret = true;
@@ -229,30 +220,30 @@ void ViewerNV::updateObservers(){
        interactor = bbGetOutputInteractor1();
        if(interactor){
                if (bbGetInputObs1()!=NULL){
-                 bbGetInputObs1()->SetInteractor(interactor);            
-                 bbGetInputObs1()->EnabledOn();                  
+                 bbGetInputObs1()->SetInteractor(interactor);
+                 bbGetInputObs1()->EnabledOn();
                }
-               if (bbGetInputObs2()!=NULL) 
+               if (bbGetInputObs2()!=NULL)
                {
                  bbGetInputObs2()->SetInteractor(interactor);
-                 bbGetInputObs2()->EnabledOn();                  
+                 bbGetInputObs2()->EnabledOn();
                }
-               if (bbGetInputObs3()!=NULL) 
+               if (bbGetInputObs3()!=NULL)
                {
                  bbGetInputObs3()->SetInteractor(interactor);
-                 bbGetInputObs3()->EnabledOn();                  
+                 bbGetInputObs3()->EnabledOn();
                }
-               if (bbGetInputObs4()!=NULL) 
+               if (bbGetInputObs4()!=NULL)
                {
                  bbGetInputObs4()->SetInteractor(interactor);
-                 bbGetInputObs4()->EnabledOn();                  
+                 bbGetInputObs4()->EnabledOn();
                }
-               if (bbGetInputObs5()!=NULL) 
+               if (bbGetInputObs5()!=NULL)
                {
                  bbGetInputObs5()->SetInteractor(interactor);
-                 bbGetInputObs5()->EnabledOn();                  
+                 bbGetInputObs5()->EnabledOn();
                }
-       }       
+       }
 }
 
 }