X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuViewerNV.cxx;h=c1f8149ea20b0a1f56f2f1433a6c8d79f6d6a336;hb=63b453426272f66364dcd0b6c6a5b5b3d4b715f3;hp=3fd608fa890169a10b1fba86546d0ebbca1799e5;hpb=0639da4f50de993c0234f26f18ac0528e537017a;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index 3fd608f..c1f8149 100644
--- a/bbtk/src/bbmaracasvisuViewerNV.cxx
+++ b/bbtk/src/bbmaracasvisuViewerNV.cxx
@@ -3,7 +3,6 @@
 namespace bbcreaMaracasVisu
 {
 
-
 BEGIN_EVENT_TABLE( bbwxMaracas_N_ViewersWidget, wxPanel )
 	EVT_MENU( 12121, bbwxMaracas_N_ViewersWidget::OnRefreshView )
 	EVT_MENU( 12122, bbwxMaracas_N_ViewersWidget::OnDClickLeft  )
@@ -15,9 +14,9 @@ END_EVENT_TABLE( );
 //-------------------------------------------------------------
 
 bbwxMaracas_N_ViewersWidget::bbwxMaracas_N_ViewersWidget(ViewerNV* box,
-														 wxWindow *parent, 
-														 vtkImageData* imagedata, 
-														 std::vector<int> *nTypeView)
+                                                         wxWindow *parent,
+                                                         vtkImageData* imagedata,
+                                                         std::vector<int> *nTypeView)
 :wxMaracas_N_ViewersWidget(parent,imagedata,nTypeView)
 {
 	mbbViewerNV=box;
@@ -31,7 +30,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() );
@@ -46,7 +45,6 @@ void bbwxMaracas_N_ViewersWidget::OnRefreshView(wxCommandEvent & event)
 //-------------------------------------------------------------
 void bbwxMaracas_N_ViewersWidget::OnDClickLeft(wxCommandEvent & event)
 {
-printf("EED bbwxMaracas_N_ViewersWidget::OnDClickLeft \n");
 	wxMaracas_N_ViewersWidget::OnDClickLeft(event);
 	mbbViewerNV->bbSignalOutputModification(std::string("Point"));    
 }
@@ -57,31 +55,45 @@ printf("EED bbwxMaracas_N_ViewersWidget::OnDClickLeft \n");
 
 
 
-
 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);
+    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( 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;
-		
 
 		point.clear();
 		point.push_back((int)mwxwidget->GetX());
@@ -106,7 +118,28 @@ 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
 }
 
 //-------------------------------------------------------------
@@ -126,10 +159,15 @@ void ViewerNV::CreateWidget(wxWindow* parent)
 //-------------------------------------------------------------
 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);
@@ -137,7 +175,6 @@ void ViewerNV::bbUserSetDefaultValues()
 		vecNTypeViwer.push_back(3);
 		bbSetInputnTypeView(vecNTypeViwer);
 
-
 		bbSetOutputwxVtkBaseView1( NULL );
 		bbSetOutputwxVtkBaseView2( NULL );
 		bbSetOutputwxVtkBaseView3( NULL );
@@ -146,6 +183,9 @@ void ViewerNV::bbUserSetDefaultValues()
 		bbSetOutputRenderer2( NULL );
 		bbSetOutputRenderer3( NULL );
 		bbSetOutputRenderer4( NULL );
+		bbSetInputColorFunction(NULL);
+		bbSetInputWindowLevel(-1);
+		bbSetInputColorLevel(-1);
 }
 
 	//-----------------------------------------------------------------	
@@ -176,11 +216,39 @@ bool ViewerNV::compareVectors(std::vector<int> type,std::vector<int> currenttype
 		ret=false;
 	}
 	return ret;
+}
 
-
+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
 
-