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

diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index a191017..4a8cd28 100644
--- a/bbtk/src/bbmaracasvisuViewerNV.cxx
+++ b/bbtk/src/bbmaracasvisuViewerNV.cxx
@@ -57,13 +57,11 @@ 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"));
-
 	wxMaracas_N_ViewersWidget::OnRefreshView(event);
 }
 
@@ -86,38 +84,30 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ViewerNV,bbtk::WxBlackBox);
 void ViewerNV::Process()
 {
 	vtkImageData* img = bbGetInputIn();
-
-
 	std::vector<int> type = bbGetInputnTypeView();
-
-
-	if(img != NULL && _mwxwidget != NULL){
-		if(!compareVectors(type, _currenttype)){
+	if(img != NULL && _mwxwidget != NULL)
+	{
+		if(!compareVectors(type, _currenttype))
+		{
 			_mwxwidget->SetType(&type);
 			_mwxwidget->UpdateLayout(img);
 		}else if (img != _currentimg){
 			_mwxwidget->SetImage(img);
 		}
 		_mwxwidget->RefreshView();
-
 		_currenttype 	= type;
 		_currentimg 	= img;
-
 		_point.clear();
 		_point.push_back((int)_mwxwidget->GetX());
 		_point.push_back((int)_mwxwidget->GetY());
 		_point.push_back((int)_mwxwidget->GetZ());
 		bbSetOutputPoint(_point);
 
-	//    WxBlackBox::Process();
-//		mwxwidget->SetImage(img );
 		wxVtkBaseView *wvbv1 = _mwxwidget->GetwxVtkBaseView(1);
 		wxVtkBaseView *wvbv2 = _mwxwidget->GetwxVtkBaseView(2);
 		wxVtkBaseView *wvbv3 = _mwxwidget->GetwxVtkBaseView(3);
 		wxVtkBaseView *wvbv4 = _mwxwidget->GetwxVtkBaseView(4);
-
 		//wxwidget->RefreshView();
-
 		bbSetOutputwxVtkBaseView1( wvbv1 );
 		bbSetOutputwxVtkBaseView2( wvbv2 );
 		bbSetOutputwxVtkBaseView3( wvbv3 );
@@ -126,19 +116,15 @@ 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( (bbGetInputColorLevel()!=-1) && (bbGetInputWindowLevel()!=-1))
 		{
 			if(bbGetInputColorLevel() == 0)
@@ -148,6 +134,7 @@ void ViewerNV::Process()
 				_mwxwidget->SetColorWindowLevel( bbGetInputWindowLevel() , bbGetInputColorLevel() );
 			}
 		}
+		_mwxwidget->SetInterpolate( bbGetInputInterpolate() );
 	}//  mwxwidget != NULL
 }
 
@@ -174,6 +161,7 @@ void ViewerNV::bbUserSetDefaultValues()
 	bbSetInputObs3(NULL);
 	bbSetInputObs4(NULL);
 	bbSetInputObs5(NULL);
+	bbSetInputInterpolate(true);
 
 	std::vector<int> vecNTypeViwer;
 	vecNTypeViwer.push_back(5);