X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuViewerNV.cxx;h=fd98d87ccc46eabadd54fd74bc173c32989c82ff;hb=3283472f764535492122c3b2ade020a749c1bd2a;hp=0dae95ab6fdbfce86b6db3606eddecc04da14065;hpb=63e29db9f3acfd1893ee3314de1bafb6d3475beb;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index 0dae95a..fd98d87 100644
--- a/bbtk/src/bbmaracasvisuViewerNV.cxx
+++ b/bbtk/src/bbmaracasvisuViewerNV.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "bbmaracasvisuViewerNV.h"
 #include "bbcreaMaracasVisuPackage.h"
 namespace bbcreaMaracasVisu
@@ -31,12 +56,12 @@ 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.clear();
 
-	mbbViewerNV->point.push_back( (int)GetX() );
-	mbbViewerNV->point.push_back( (int)GetY() );
-	mbbViewerNV->point.push_back( (int)GetZ() );
-	mbbViewerNV->bbSetOutputPoint( mbbViewerNV->point );
+	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);
@@ -61,54 +86,31 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ViewerNV,bbtk::WxBlackBox);
 void ViewerNV::Process()
 {
 	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();
-
-
-	if(img != NULL && mwxwidget != NULL){
-		if(!compareVectors(type, currenttype)){
-			mwxwidget->SetType(&type);
-			mwxwidget->UpdateLayout(img);
-		}else if (img != currentimg){
-			mwxwidget->SetImage(img);
-			//mwxwidget->UpdateLayout(img);
-		}
-
-		if (firsttime==true)  // EED  21 aout 2010
+	if(img != NULL && _mwxwidget != NULL)
+	{
+		if(!compareVectors(type, _currenttype))
 		{
-			firsttime=false;
-			mwxwidget->ConfigureVTK();
+			_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);
-
+		_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);
-
+		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 );
@@ -117,46 +119,35 @@ 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());
+			_mwxwidget->setColorTransferFunction(bbGetInputColorFunction());
 		}
-
-		if(bbGetInputWindowLevel()!=-1)
-		{
-	            mwxwidget->setWindowLevel(bbGetInputWindowLevel());
-		}
-
-		if(bbGetInputColorLevel()!=-1)
+		if( (bbGetInputColorLevel()!=-1) && (bbGetInputWindowLevel()!=-1))
 		{
 			if(bbGetInputColorLevel() == 0)
 			{
-				std::cout<<"colorlevel "<<bbGetInputColorLevel()<<std::endl;
-				mwxwidget->setColorLevel(0.1);
+				_mwxwidget->SetColorWindowLevel( bbGetInputWindowLevel() , 0.1 );
 			}else{
-				mwxwidget->setColorLevel(bbGetInputColorLevel());
+				_mwxwidget->SetColorWindowLevel( bbGetInputWindowLevel() , bbGetInputColorLevel() );
 			}
 		}
+		_mwxwidget->SetInterpolate( bbGetInputInterpolate() );
 	}//  mwxwidget != NULL
 }
 
 //-------------------------------------------------------------
 void ViewerNV::CreateWidget(wxWindow* parent)
 {
-
     bbtkDebugMessageInc("Core",9,"ViewerNV::CreateWidget()"<<std::endl);
-	mwxwidget = new bbwxMaracas_N_ViewersWidget( this, parent );
+	_mwxwidget = new bbwxMaracas_N_ViewersWidget( this, parent );
 	bbtkDebugDecTab("Core",9);
-    bbSetOutputWidget( mwxwidget );
-
-
+    bbSetOutputWidget( _mwxwidget );
 	//this->bbSignalOutputModification();
 	//Process();
 }
@@ -164,8 +155,8 @@ void ViewerNV::CreateWidget(wxWindow* parent)
 //-------------------------------------------------------------
 void ViewerNV::bbUserSetDefaultValues()
 {
-	firsttime=true;
-	mwxwidget = NULL;
+	_currentimg				=	NULL;
+	_mwxwidget				=	NULL;
 	bbSetInputIn(NULL);
 
 	bbSetInputObs1(NULL);
@@ -173,6 +164,7 @@ void ViewerNV::bbUserSetDefaultValues()
 	bbSetInputObs3(NULL);
 	bbSetInputObs4(NULL);
 	bbSetInputObs5(NULL);
+	bbSetInputInterpolate(true);
 
 	std::vector<int> vecNTypeViwer;
 	vecNTypeViwer.push_back(5);