X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuTransferFunctionView.cxx;h=c02ccc6f7820ea06211bb84a7b8cb2a80cceebab;hb=24937478048aca664712bb708240bff79879e0d9;hp=fb08960103c2527342858756b5930475927995cd;hpb=6e940f8b87d85a90438f01d56c3c6c92da2bc14a;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
index fb08960..c02ccc6 100644
--- a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
+++ b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
@@ -10,13 +10,7 @@ BBTK_BLACK_BOX_IMPLEMENTATION(TransferFunctionView,bbtk::WxBlackBox);
 void TransferFunctionView::Process()
 {
 
-	std::vector<double> greylevel;
-	std::vector<double> value;
-
-	std::vector<double> greylevelcolors;
-	std::vector<double> red;
-	std::vector<double> green;
-	std::vector<double> blue;
+	
 
 	
 
@@ -24,28 +18,13 @@ void TransferFunctionView::Process()
 
 		if(_currentimg != bbGetInputIn()){
 			_currentimg =  bbGetInputIn();
-			mwxwidget->initializeHistogram(_currentimg);	
-			mwxwidget->Refresh();	
+			//mwxwidget->initializeHistogram(_currentimg);			
+			mwxwidget->setImageData(_currentimg);	
+			//mwxwidget->Refresh();	
 		}		
 
-		mwxwidget->GetValuesPointsFunction(greylevel, value);
-		mwxwidget->GetValuesColorPointsFunction(greylevelcolors,red, green,blue);
-
-
-		_tfun->RemoveAllPoints();
-		for(int i = 0; i < greylevel.size();i++){
-			_tfun->AddPoint(greylevel[i], value[i]);
-//			std::cout<<"transfer function "<<greylevel[i]<<" "<< value[i]<<std::endl;
-		}
-		_ctfun->RemoveAllPoints();
-		for(int i = 0; i < greylevelcolors.size();i++){
-			_ctfun->AddRGBPoint(greylevelcolors[i], red[i],green[i], blue[i]);
-//			std::cout<<"transfer color function "<<greylevelcolors[i]<<" "<<red[i]<<" "<<green[i]<<" "<<blue[i]<<std::endl;
-		}		
-
-
-		bbSetOutputOpacityFunction(_tfun);
-		bbSetOutputColorFunction(_ctfun);
+		onColorChange();
+		
 		/*bbSetOutputGreyLevel(greylevel);
 		bbSetOutputValue(value);
 		bbSetOutputGreyLevelColors(greylevelcolors);
@@ -59,19 +38,95 @@ void TransferFunctionView::Process()
 	}
        	
     
+}
+
+void TransferFunctionView::onColorChange(){
+
+	std::vector<double> greylevel;
+	std::vector<double> value;
+
+	std::vector<double> greylevelcolors;
+	std::vector<double> red;
+	std::vector<double> green;
+	std::vector<double> blue;
+
+	mwxwidget->GetValuesPointsFunction(greylevel, value);
+	mwxwidget->GetValuesColorPointsFunction(greylevelcolors,red, green,blue);
+
+
+	_tfun->RemoveAllPoints();
+	for(int i = 0; i < greylevel.size();i++){
+		_tfun->AddPoint(greylevel[i], value[i]);
+		std::cout<<"TransferFunctionView::Process()transfer function "<<greylevel[i]<<" "<< value[i]<<std::endl;
+	}
+	_ctfun->RemoveAllPoints();
+	_ctfun->SetScaleToLinear ();
+	_ctfun->ClampingOff();
+	_ctfun->AllowDuplicateScalarsOn();
+	double w=mwxwidget->GetWindowLevel();
+	double c=mwxwidget->GetColorLevel();
+
+	if (greylevelcolors.size()>1)
+	{
+	    double min = greylevelcolors[0];
+		double max = greylevelcolors[greylevelcolors.size()-1];
+		double dif = max-min;
+		if (dif==0) dif=0.0001;
+		double nc;
+		int i;
+		i=0;
+		_ctfun->AddRGBPoint(greylevelcolors[i], red[i],green[i], blue[i]);
+		for(i = 0; i < greylevelcolors.size();i++)
+		{
+			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;
+		}
+		i=greylevelcolors.size()-1;
+		_ctfun->AddRGBPoint( greylevelcolors[i] , red[i],green[i], blue[i]);
+	}		
+
+	bbSignalOutputModification();
+	
+	_tfun->Update();
+	bbSetOutputOpacityFunction(_tfun);
+	bbSetOutputColorFunction(_ctfun);
+}
+
+void TransferFunctionView::onSliderChange()
+	{
+	
+		//EED
+		onColorChange();
+
+		bbSignalOutputModification();
+
+
+//	bbSetOutputWindowLevel(mwxwidget->GetWindowLevel());
+//	bbSetOutputColorLevel(mwxwidget->GetColorLevel());
+
 }
 
 //-----------------------------------------------------
 void TransferFunctionView::CreateWidget(wxWindow* parent)
 {
 	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::onColorChange),NULL,handler);
+	parent->Connect(mwxwidget->GetId(), wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction) (&HandlerTransferFunctionView::onSliderChange),NULL,handler);
 
-	mwxwidget = new HistogramWidget(parent, -1);
     bbtkDebugDecTab("Core",9);
-	bbSetOutputWidget( mwxwidget );	
+	bbSetOutputWidget( mwxwidget );				
 }
 
 //-----------------------------------------------------
+
 void TransferFunctionView::bbUserSetDefaultValues()
 {
 	mwxwidget = NULL;
@@ -90,7 +145,8 @@ void TransferFunctionView::bbUserSetDefaultValues()
 	void TransferFunctionView::bbUserInitializeProcessing()
 	{
 		_tfun = vtkPiecewiseFunction::New();
-		_ctfun = vtkColorTransferFunction::New();   
+		_ctfun = vtkColorTransferFunction::New();  
+		_ctfun->SetClamping(-1);
 		bbSetInputIn(NULL);
 	}
 	
@@ -98,10 +154,33 @@ void TransferFunctionView::bbUserSetDefaultValues()
 	void TransferFunctionView::bbUserFinalizeProcessing()
 	{
 	}
-	
+
+		
 	//-----------------------------------------------------------------	
+	
+
+	HandlerTransferFunctionView::HandlerTransferFunctionView(TransferFunctionView* box)
+	{
+		_box = box;		
+	}
+	
+	HandlerTransferFunctionView::~HandlerTransferFunctionView()
+	{
+	}	
+	
+	void HandlerTransferFunctionView::onColorChange(wxCommandEvent& event)
+	{
+		_box->onColorChange();
+	}
+	
+	void HandlerTransferFunctionView::onSliderChange(wxCommandEvent& event)
+	{
+		_box->onSliderChange();
+	}
 
 }
+
+
 // EO namespace bbcreaMaracasVisu