X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuViewerNV.cxx;h=1363744cb970cb6dfe92c0b39a0754ff5af1536c;hb=4b2a99534d79424c7892e09160a1488604741064;hp=262107d1ba0ee8f63f44fd481b6970533d8d7e64;hpb=80b04dc9e3b981e24fe9ae0d81cdeb8af6e6f8c1;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index 262107d..1363744 100644
--- a/bbtk/src/bbmaracasvisuViewerNV.cxx
+++ b/bbtk/src/bbmaracasvisuViewerNV.cxx
@@ -45,6 +45,9 @@ bbwxMaracas_N_ViewersWidget::bbwxMaracas_N_ViewersWidget(ViewerNV* box,
 :wxMaracas_N_ViewersWidget(parent,imagedata,nTypeView)
 {
 	mbbViewerNV=box;
+	backX=-9999;
+	backY=-9999;
+	backZ=-9999;
 }
 
 //-------------------------------------------------------------
@@ -55,13 +58,18 @@ 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() );
-	mbbViewerNV->_point.push_back( (int)GetY() );
-	mbbViewerNV->_point.push_back( (int)GetZ() );
-	mbbViewerNV->bbSetOutputPoint( mbbViewerNV->_point );
-	mbbViewerNV->bbSignalOutputModification(std::string("Point"));
+	if ( (backX!=(int)GetX()) || (backY!=(int)GetY()) || (backZ!=(int)GetZ()) )
+	{
+		backX = GetX();
+		backY = GetY();
+		backZ = GetZ();
+		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"));
+	} // if
 	wxMaracas_N_ViewersWidget::OnRefreshView(event);
 }
 
@@ -94,7 +102,7 @@ void ViewerNV::Process()
 		}else if (img != _currentimg){
 			_mwxwidget->SetImage(img);
 		}
-		_mwxwidget->RefreshView();
+//		_mwxwidget->RefreshView();
 		_currenttype 	= type;
 		_currentimg 	= img;
 		_point.clear();
@@ -135,7 +143,6 @@ void ViewerNV::Process()
 			}
 		}
 		_mwxwidget->SetInterpolate( bbGetInputInterpolate() );
-
 /* Borrame
 		if (wvbv1!=NULL) 
 		{
@@ -149,10 +156,6 @@ void ViewerNV::Process()
 		}
 
 */
-
-
-
-
 	}//  mwxwidget != NULL
 }
 
@@ -213,29 +216,32 @@ void ViewerNV::bbUserFinalizeProcessing()
 
 //-----------------------------------------------------------------
 
-
-
-bool ViewerNV::compareVectors(std::vector<int> type,std::vector<int> currenttype){
-
+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]){
+	if(type.size()==currenttype.size())
+	{
+		for(int i = 0; i < (int)(type.size()) && ret; i++)
+		{
+			if(type[i]!=currenttype[i])
+			{
 				ret = false;
-			}
-		}
+			} // if
+		} // for
 	}else{
 		ret=false;
-	}
+	} // type size
 	return ret;
 }
 
-void ViewerNV::updateObservers(){
+void ViewerNV::updateObservers()
+{
 	vtkRenderWindowInteractor* interactor;
 	interactor = bbGetOutputInteractor1();
-	if(interactor){
-		if (bbGetInputObs1()!=NULL){
+	if(interactor)
+	{
+		if (bbGetInputObs1()!=NULL)
+		{
 		  bbGetInputObs1()->SetInteractor(interactor);
 		  bbGetInputObs1()->EnabledOn();
 		}
@@ -259,7 +265,7 @@ void ViewerNV::updateObservers(){
 		  bbGetInputObs5()->SetInteractor(interactor);
 		  bbGetInputObs5()->EnabledOn();
 		}
-	}
+	} // if interactor
 }
 
 }