X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuTransferFunctionView.cxx;h=640d4f02c7ce13642dacee0ecb9f36cbd7249ece;hb=542063db4a06b1a74587bcab7d5c450ebdd53272;hp=d829ab0132116d39157955adbe22a68fee364fa6;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
index d829ab0..640d4f0 100644
--- a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
+++ b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
@@ -34,38 +34,31 @@ BBTK_BLACK_BOX_IMPLEMENTATION(TransferFunctionView,bbtk::WxBlackBox);
 //-----------------------------------------------------
 void TransferFunctionView::Process()
 {
+	if(bbGetInputIn()!=NULL)
+	{
 
-	
-
-	
-
-	if(bbGetInputIn()!=NULL){
-
-		if(_currentimg != bbGetInputIn()){
+//		if(_currentimg != bbGetInputIn())
+//		{
 			_currentimg =  bbGetInputIn();
 			//mwxwidget->initializeHistogram(_currentimg);			
 			mwxwidget->setImageData(_currentimg);	
 			//mwxwidget->Refresh();	
-		}		
+//		}		
 
-		onColorChange();
-		
-		/*bbSetOutputGreyLevel(greylevel);
+//		onColorChange();
+		/*
+		bbSetOutputGreyLevel(greylevel);
 		bbSetOutputValue(value);
 		bbSetOutputGreyLevelColors(greylevelcolors);
 		bbSetOutputRed(red);
 		bbSetOutputGreen(green);
-		bbSetOutputBlue(blue);*/
-
-
-
-
-	}
-       	
-    
+		bbSetOutputBlue(blue);
+		*/
+	} // if In
 }
 
-void TransferFunctionView::onColorChange(){
+void TransferFunctionView::onColorChange()
+{
 
 	std::vector<double> greylevel;
 	std::vector<double> value;
@@ -80,9 +73,10 @@ void TransferFunctionView::onColorChange(){
 
 
 	_tfun->RemoveAllPoints();
-	for(int i = 0; i < greylevel.size();i++){
+	unsigned int i;
+	for(i = 0; i < greylevel.size();i++){
 		_tfun->AddPoint(greylevel[i], value[i]);
-		std::cout<<"TransferFunctionView::Process()transfer function "<<greylevel[i]<<" "<< value[i]<<std::endl;
+//		std::cout<<"TransferFunctionView::Process()transfer function "<<greylevel[i]<<" "<< value[i]<<std::endl;
 	}
 	_ctfun->RemoveAllPoints();
 	_ctfun->SetScaleToLinear ();
@@ -98,7 +92,7 @@ void TransferFunctionView::onColorChange(){
 		double dif = max-min;
 		if (dif==0) dif=0.0001;
 		double nc;
-		int i;
+		unsigned int i;
 		i=0;
 		_ctfun->AddRGBPoint(greylevelcolors[i], red[i],green[i], blue[i]);
 		for(i = 0; i < greylevelcolors.size();i++)
@@ -106,65 +100,59 @@ void TransferFunctionView::onColorChange(){
 			nc = ((greylevelcolors[i]-min)/dif)*w + c-w/2;
 //			_ctfun->AddRGBPoint(greylevelcolors[i], red[i],green[i], blue[i]);
 			_ctfun->AddRGBPoint( nc , red[i],green[i], blue[i]);
-		std::cout<<"EED TransferFunctionView::Process()transfer color function <<"<<nc<<" "<<red[i]<<" "<<green[i]<<" "<<blue[i]<<std::endl;
+//		std::cout<<"EED TransferFunctionView::Process()transfer color function <<"<<nc<<" "<<red[i]<<" "<<green[i]<<" "<<blue[i]<<std::endl;
 		}
 		i=greylevelcolors.size()-1;
 		_ctfun->AddRGBPoint( greylevelcolors[i] , red[i],green[i], blue[i]);
 	}		
 
-	bbSignalOutputModification();
-	
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_tfun->Update();
+#else
+  //...
+#endif
 	bbSetOutputOpacityFunction(_tfun);
-	bbSetOutputColorFunction(_ctfun);
+	bbSetOutputColorFunction(_ctfun );
+	bbSetOutputActive( mwxwidget->GetActive() );
+
+	bbSignalOutputModification();
+
 }
 
 void TransferFunctionView::onSliderChange()
-	{
-	
-		//EED
+{
 		onColorChange();
-
 		bbSignalOutputModification();
-
-
 //	bbSetOutputWindowLevel(mwxwidget->GetWindowLevel());
 //	bbSetOutputColorLevel(mwxwidget->GetColorLevel());
-
 }
 
+
 //-----------------------------------------------------
 void TransferFunctionView::CreateWidget(wxWindow* parent)
 {
-	bbtkDebugMessageInc("Core",9,"TransferFunctionView::CreateWxWindow()"<<std::endl);
-	
+	bbtkDebugMessageInc("Core",9,"TransferFunctionView::CreateWxWindow()"<<std::endl);	
 	mwxwidget = new HistogramDialogComboBox(parent);				
-
-
 	HandlerTransferFunctionView* handler = new HandlerTransferFunctionView(this);
-
+//	parent->Connect(mwxwidget->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction) (&HandlerTransferFunctionView::onActive),NULL,handler);
 	parent->Connect(mwxwidget->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction) (&HandlerTransferFunctionView::onColorChange),NULL,handler);
 	parent->Connect(mwxwidget->GetId(), wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction) (&HandlerTransferFunctionView::onSliderChange),NULL,handler);
-
-    bbtkDebugDecTab("Core",9);
 	bbSetOutputWidget( mwxwidget );				
+    bbtkDebugDecTab("Core",9);
 }
 
 //-----------------------------------------------------
 
 void TransferFunctionView::bbUserSetDefaultValues()
 {
-	mwxwidget = NULL;
+	mwxwidget 	= NULL;
 	_currentimg = NULL;
-
-	_tfun = NULL;
-	_ctfun = NULL;   
-
+	_tfun 		= NULL;
+	_ctfun 		= NULL;   
 	bbSetOutputOpacityFunction(0);
 	bbSetOutputColorFunction(0);
-
 }
-
 	
 	//-----------------------------------------------------------------	
 	void TransferFunctionView::bbUserInitializeProcessing()
@@ -180,10 +168,7 @@ void TransferFunctionView::bbUserSetDefaultValues()
 	{
 	}
 
-		
 	//-----------------------------------------------------------------	
-	
-
 	HandlerTransferFunctionView::HandlerTransferFunctionView(TransferFunctionView* box)
 	{
 		_box = box;		
@@ -205,7 +190,6 @@ void TransferFunctionView::bbUserSetDefaultValues()
 
 }
 
-
 // EO namespace bbcreaMaracasVisu