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

diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index 13444aa..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,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);
 //-------------------------------------------------------------
@@ -58,6 +64,9 @@ void ViewerNV::Process()
 
 	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){
 		
@@ -66,6 +75,7 @@ void ViewerNV::Process()
 			mwxwidget->UpdateLayout(img);
 		}else if (img != currentimg){		
 			mwxwidget->SetImage(img);
+			//mwxwidget->UpdateLayout(img);
 		}
 		currenttype = type;
 		currentimg = img;
@@ -100,6 +110,7 @@ void ViewerNV::Process()
 //-------------------------------------------------------------
 void ViewerNV::CreateWidget(wxWindow* parent)
 {
+
     bbtkDebugMessageInc("Core",9,"ViewerNV::CreateWidget()"<<std::endl);
 	mwxwidget = new bbwxMaracas_N_ViewersWidget( this, parent );	
 	bbtkDebugDecTab("Core",9);
@@ -111,7 +122,7 @@ void ViewerNV::CreateWidget(wxWindow* parent)
 }
 
 //-------------------------------------------------------------
-void ViewerNV::bbUserConstructor()
+void ViewerNV::bbUserSetDefaultValues()
 {
 
 		mwxwidget = NULL;
@@ -135,27 +146,26 @@ void ViewerNV::bbUserConstructor()
 		bbSetOutputRenderer4( NULL );
 }
 
-//-------------------------------------------------------------
-void ViewerNV::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-
-		mwxwidget = NULL;
-		
-}
-
-//-------------------------------------------------------------
-void ViewerNV::bbUserDestructor()
-{
-std::cout << "ViewerNV destroy "<<this<<" vs "<<GetThisPointer<void>()<<std::endl;
-
-}
-
+	//-----------------------------------------------------------------	
+	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 < type.size() && ret; i++){
+		for(int i = 0; i < (int)(type.size()) && ret; i++){
 			if(type[i]!=currenttype[i]){
 				ret = false;
 			}