*** empty log message ***

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

diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index 8ada8677c85fb0b6e3adb2a60dc47d32c9758f78..48b69e5da1d4eb06e22cbdb31c7c5c60033503ca 100644 (file)
--- a/bbtk/src/bbmaracasvisuViewerNV.cxx
+++ b/bbtk/src/bbmaracasvisuViewerNV.cxx
@@ -27,13 +27,20 @@ bbwxMaracas_N_ViewersWidget::bbwxMaracas_N_ViewersWidget(ViewerNV* box,
 bbwxMaracas_N_ViewersWidget::~bbwxMaracas_N_ViewersWidget()
 {
 }
-           
+
 //-------------------------------------------------------------
 void bbwxMaracas_N_ViewersWidget::OnRefreshView(wxCommandEvent & event)
 {
-       wxMaracas_N_ViewersWidget::OnRefreshView(event);
+       printf("CPR: bbwxMaracas_N_ViewersWidget::OnRefreshView -> actualiza X, Y y Z\n");
+       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"));    
 
+       wxMaracas_N_ViewersWidget::OnRefreshView(event);
 }
 
 //-------------------------------------------------------------
@@ -49,7 +56,6 @@ void bbwxMaracas_N_ViewersWidget::OnDClickLeft(wxCommandEvent & event)
 
 
 
-
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ViewerNV)
 BBTK_BLACK_BOX_IMPLEMENTATION(ViewerNV,bbtk::WxBlackBox);
 //-------------------------------------------------------------
@@ -57,20 +63,36 @@ void ViewerNV::Process()
 {      
 
        vtkImageData* img = bbGetInputIn();
+/*
+       double spc[3];
+       img->GetSpacing(spc);
+    printf ("EED ViewerNV::Process A %f %f %f \n", spc[0], spc[1], spc[2] );
+       img->SetSpacing( 1,1,1 );
+       img->Update(  );
+       img->GetSpacing(spc);
+       img->PrintSelf(std::cout,(vtkIndent)2);
+       img->Print(std::cout);
+    printf ("EED ViewerNV::Process B %f %f %f \n", spc[0], spc[1], spc[2] );
+*/
        std::vector<int> type = bbGetInputnTypeView();
 
-       std::cout<<"img "<<img<<std::endl;
-       std::cout<<"widget "<<mwxwidget<<std::endl;
+//     std::cout<<"img "<<img<<std::endl;
+//     std::cout<<"widget "<<mwxwidget<<std::endl;
        
-       if(img != NULL && mwxwidget != NULL){// && !enter){
+//     if(img != NULL && mwxwidget != NULL){// && !enter){
+       if( mwxwidget != NULL){// && !enter){
                
                if(!compareVectors(type, currenttype)){
                        mwxwidget->SetType(&type);
-                       mwxwidget->UpdateLayout(img);
+                       mwxwidget->UpdateLayout(img);                   
                }else if (img != currentimg){           
                        mwxwidget->SetImage(img);
                        //mwxwidget->UpdateLayout(img);
                }
+
+               mwxwidget->ConfigureVTK();
+               mwxwidget->RefreshView();
+
                currenttype = type;
                currentimg = img;
                
@@ -98,7 +120,27 @@ void ViewerNV::Process()
                if (wvbv2!=NULL) { bbSetOutputRenderer2( wvbv2->GetRenderer() ); }
                if (wvbv3!=NULL) { bbSetOutputRenderer3( wvbv3->GetRenderer() ); }
                if (wvbv4!=NULL) { bbSetOutputRenderer4( wvbv4->GetRenderer() ); }
-       }       
+
+               if (wvbv1!=NULL) { bbSetOutputInteractor1( wvbv1->GetWxVTKRenderWindowInteractor() ); }
+
+               if(bbGetInputColorFunction()!=NULL){
+                       mwxwidget->setColorTransferFunction(bbGetInputColorFunction());
+               }
+
+               if(bbGetInputWindowLevel()!=-1){
+            mwxwidget->setWindowLevel(bbGetInputWindowLevel());
+               }
+
+               if(bbGetInputColorLevel()!=-1){
+                       if(bbGetInputColorLevel() == 0){
+                               std::cout<<"colorlevel "<<bbGetInputColorLevel()<<std::endl;
+                               mwxwidget->setColorLevel(0.1);
+                       }else{
+                               mwxwidget->setColorLevel(bbGetInputColorLevel());
+                       }
+               }
+
+       }//  mwxwidget != NULL
 }
 
 //-------------------------------------------------------------
@@ -138,6 +180,9 @@ void ViewerNV::bbUserSetDefaultValues()
                bbSetOutputRenderer2( NULL );
                bbSetOutputRenderer3( NULL );
                bbSetOutputRenderer4( NULL );
+               bbSetInputColorFunction(NULL);
+               bbSetInputWindowLevel(-1);
+               bbSetInputColorLevel(-1);
 }
 
        //-----------------------------------------------------------------