X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuViewerNV.cxx;h=fa98991abab773e8bc646b4befa1fbb5a02a76bf;hb=2a69bae264c4dc43a7189f16b53a66dcd3a774dc;hp=4dfa24f457ab4461afc5360d90db87e94ebf4d01;hpb=4df00b156385a2dd881c35fd7561ef9eb0885ee0;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index 4dfa24f..fa98991 100644
--- a/bbtk/src/bbmaracasvisuViewerNV.cxx
+++ b/bbtk/src/bbmaracasvisuViewerNV.cxx
@@ -31,7 +31,7 @@ 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.push_back( (int)GetX() );
@@ -62,21 +62,37 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ViewerNV,bbtk::WxBlackBox);
 void ViewerNV::Process()
 {	
 
-	vtkImageData* img = bbGetInputIn();
+	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;
 	
-	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->SetImage(img);			
 			//mwxwidget->UpdateLayout(img);
 		}
+
+		mwxwidget->ConfigureVTK();
+		mwxwidget->RefreshView();
+
 		currenttype = type;
 		currentimg = img;
 		
@@ -104,7 +120,30 @@ 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() ); 
+			updateObservers();
+		}
+
+		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
 }
 
 //-------------------------------------------------------------
@@ -128,6 +167,12 @@ void ViewerNV::bbUserSetDefaultValues()
 		mwxwidget = NULL;
 		bbSetInputIn(NULL);
 
+		bbSetInputObs1(NULL);
+		bbSetInputObs2(NULL);
+		bbSetInputObs3(NULL);
+		bbSetInputObs4(NULL);
+		bbSetInputObs5(NULL);
+
 		std::vector<int> vecNTypeViwer;
 		vecNTypeViwer.push_back(5);
 		vecNTypeViwer.push_back(0);
@@ -144,6 +189,9 @@ void ViewerNV::bbUserSetDefaultValues()
 		bbSetOutputRenderer2( NULL );
 		bbSetOutputRenderer3( NULL );
 		bbSetOutputRenderer4( NULL );
+		bbSetInputColorFunction(NULL);
+		bbSetInputWindowLevel(-1);
+		bbSetInputColorLevel(-1);
 }
 
 	//-----------------------------------------------------------------	
@@ -178,6 +226,37 @@ bool ViewerNV::compareVectors(std::vector<int> type,std::vector<int> currenttype
 
 }
 
+void ViewerNV::updateObservers(){
+	vtkRenderWindowInteractor* interactor;
+	interactor = bbGetOutputInteractor1();
+	if(interactor){
+		if (bbGetInputObs1()!=NULL){
+		  bbGetInputObs1()->SetInteractor(interactor);
+		  bbGetInputObs1()->EnabledOn();
+		}
+		if (bbGetInputObs2()!=NULL) 
+		{
+		  bbGetInputObs2()->SetInteractor(interactor);
+		  bbGetInputObs2()->EnabledOn();
+		}
+		if (bbGetInputObs3()!=NULL) 
+		{
+		  bbGetInputObs3()->SetInteractor(interactor);
+		  bbGetInputObs3()->EnabledOn();
+		}
+		if (bbGetInputObs4()!=NULL) 
+		{
+		  bbGetInputObs4()->SetInteractor(interactor);
+		  bbGetInputObs4()->EnabledOn();
+		}
+		if (bbGetInputObs5()!=NULL) 
+		{
+		  bbGetInputObs5()->SetInteractor(interactor);
+		  bbGetInputObs5()->EnabledOn();
+		}
+	}	
+}
+
 }
 // EO namespace bbcreaMaracasVisu