X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuViewerNV.cxx;h=4dfa24f457ab4461afc5360d90db87e94ebf4d01;hb=91a98a871f86ac13d5899661298b7badbfb442ad;hp=8c034d82d46b26bf2410e0ef857e3b374f2fc0b0;hpb=57eb2bb8542bcd8c2cc3e5d03621df2b7298af79;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index 8c034d8..4dfa24f 100644
--- 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);
+	
+	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,14 +56,31 @@ void bbwxMaracas_N_ViewersWidget::OnDClickLeft(wxCommandEvent & event)
 
 
 
-
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ViewerNV)
 BBTK_BLACK_BOX_IMPLEMENTATION(ViewerNV,bbtk::WxBlackBox);
 //-------------------------------------------------------------
 void ViewerNV::Process()
-{
-	if (mwxwidget != NULL)
-	{
+{	
+
+	vtkImageData* img = bbGetInputIn();
+	std::vector<int> type = bbGetInputnTypeView();
+
+//	std::cout<<"img "<<img<<std::endl;
+//	std::cout<<"widget "<<mwxwidget<<std::endl;
+	
+	if(img != NULL && mwxwidget != NULL){// && !enter){
+		
+		if(!compareVectors(type, currenttype)){
+			mwxwidget->SetType(&type);
+			mwxwidget->UpdateLayout(img);
+		}else if (img != currentimg){		
+			mwxwidget->SetImage(img);
+			//mwxwidget->UpdateLayout(img);
+		}
+		currenttype = type;
+		currentimg = img;
+		
+
 		point.clear();
 		point.push_back((int)mwxwidget->GetX());
 		point.push_back((int)mwxwidget->GetY());
@@ -64,7 +88,7 @@ void ViewerNV::Process()
 		bbSetOutputPoint(point);
 
 	//    WxBlackBox::Process(); 
-		mwxwidget->SetImage( bbGetInputIn() );
+//		mwxwidget->SetImage(img );
 		wxVtkBaseView *wvbv1 = mwxwidget->GetwxVtkBaseView(1);
 		wxVtkBaseView *wvbv2 = mwxwidget->GetwxVtkBaseView(2);
 		wxVtkBaseView *wvbv3 = mwxwidget->GetwxVtkBaseView(3);
@@ -80,21 +104,27 @@ void ViewerNV::Process()
 		if (wvbv2!=NULL) { bbSetOutputRenderer2( wvbv2->GetRenderer() ); }
 		if (wvbv3!=NULL) { bbSetOutputRenderer3( wvbv3->GetRenderer() ); }
 		if (wvbv4!=NULL) { bbSetOutputRenderer4( wvbv4->GetRenderer() ); }
-	}
+	}	
 }
 
 //-------------------------------------------------------------
 void ViewerNV::CreateWidget(wxWindow* parent)
 {
+
     bbtkDebugMessageInc("Core",9,"ViewerNV::CreateWidget()"<<std::endl);
-	mwxwidget = new bbwxMaracas_N_ViewersWidget( this, parent , bbGetInputIn() , &(bbGetInputnTypeView())	);
+	mwxwidget = new bbwxMaracas_N_ViewersWidget( this, parent );	
 	bbtkDebugDecTab("Core",9);
-    bbSetOutputWidget( mwxwidget );
+    bbSetOutputWidget( mwxwidget );	
+
+	
+	//this->bbSignalOutputModification();
+	//Process();
 }
 
 //-------------------------------------------------------------
-void ViewerNV::bbUserConstructor()
+void ViewerNV::bbUserSetDefaultValues()
 {
+
 		mwxwidget = NULL;
 		bbSetInputIn(NULL);
 
@@ -116,14 +146,36 @@ void ViewerNV::bbUserConstructor()
 		bbSetOutputRenderer4( NULL );
 }
 
-//-------------------------------------------------------------
-void ViewerNV::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-}
+	//-----------------------------------------------------------------	
+	void ViewerNV::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void ViewerNV::bbUserFinalizeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	
+	
+	
+bool ViewerNV::compareVectors(std::vector<int> type,std::vector<int> currenttype){
+
+	bool ret = true;
+
+	if(type.size()==currenttype.size()){
+		for(int i = 0; i < (int)(type.size()) && ret; i++){
+			if(type[i]!=currenttype[i]){
+				ret = false;
+			}
+		}
+	}else{
+		ret=false;
+	}
+	return ret;
+
 
-//-------------------------------------------------------------
-void ViewerNV::bbUserDestructor()
-{
 }
 
 }