X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fsrc%2FbbcreaVtkScalarsToColors.cxx;h=17780e12aba3d08fa9263c52e0a951141be5a448;hb=6160eaf805347c71784a11c6e2836730bdbc1f0a;hp=50c2cbc2e8532df3618d09af7bf6955a5390e5ec;hpb=2e8c7cadbf9be911a9621142f95d81807d6c0402;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkScalarsToColors.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkScalarsToColors.cxx
index 50c2cbc..17780e1 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkScalarsToColors.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkScalarsToColors.cxx
@@ -238,8 +238,6 @@ void ScalarsToColors::Process()
 			{
 				colorLookupTable->SetRange( bbGetInputRange()[0],bbGetInputRange()[1]);
 //				colorLookupTable->SetTableRange( bbGetInputRange()[0],bbGetInputRange()[1]);
-				colorLookupTable->SetBelowRangeColor(1,1,1,0);  // White transparent 
-  				colorLookupTable->SetAboveRangeColor(1,1,1,0);  // White transparent 
   				colorLookupTable->UseBelowRangeColorOn();
   				colorLookupTable->UseAboveRangeColorOn();
 			} else {
@@ -268,6 +266,17 @@ void ScalarsToColors::Process()
 	  			colorLookupTable->GetTableValue(0,rgba);
 	  			rgba[3]=0;
 	  			colorLookupTable->SetTableValue(0,rgba);
+
+  				colorLookupTable->UseBelowRangeColorOn();
+  				colorLookupTable->UseAboveRangeColorOn();
+				if (bbGetInputBelowAboveRangeTransparence()==true)
+				{
+					colorLookupTable->SetBelowRangeColor(1,1,1,0);  // White transparent 
+	  				colorLookupTable->SetAboveRangeColor(1,1,1,0);  // White transparent 
+				} else {
+					colorLookupTable->SetBelowRangeColor(1,1,1,1);  // White transparent 
+	  				colorLookupTable->SetAboveRangeColor(1,1,1,1);  // White transparent 
+				}
 	  			
 				// Middle  range
 				int i,iMax=(NumberOfColors/16)*4;
@@ -293,12 +302,19 @@ void ScalarsToColors::Process()
 			if (bbGetInputRange().size()==2)
 			{
 				colorLookupTable->SetRange( bbGetInputRange()[0],bbGetInputRange()[1]);
-//				colorLookupTable->SetTableRange( bbGetInputRange()[0],bbGetInputRange()[1]);
-				colorLookupTable->SetBelowRangeColor(1,1,1,0);  // White transparent 
-  				colorLookupTable->SetAboveRangeColor(1,1,1,0);  // White transparent 
+//				colorLookupTable->SetTableRange( bbGetInputRange()[0],bbGetInputRange()[1]);   ????????
+//				colorLookupTable->SetBelowRangeColor(1,1,1,1);  // White transparent 
+//  				colorLookupTable->SetAboveRangeColor(1,1,1,1);  // White transparent 
   				colorLookupTable->UseBelowRangeColorOn();
   				colorLookupTable->UseAboveRangeColorOn();
-
+				if (bbGetInputBelowAboveRangeTransparence()==true)
+				{
+					colorLookupTable->SetBelowRangeColor(1,1,1,0);  // White transparent 
+	  				colorLookupTable->SetAboveRangeColor(1,1,1,0);  // White transparent 
+				} else {
+					colorLookupTable->SetBelowRangeColor(1,1,1,1);  // White transparent 
+	  				colorLookupTable->SetAboveRangeColor(1,1,1,1);  // White transparent 
+				}
 			} else {
 				colorLookupTable->SetRange(0,255);
 			}
@@ -362,6 +378,7 @@ void ScalarsToColors::bbUserSetDefaultValues()
    range.push_back( 1 );
 	bbSetInputRange(range);
    bbSetInputScalarValue(0);
+   bbSetInputBelowAboveRangeTransparence(true);
 //   firsttime		= true;
    _scalarstocolors	= NULL;
 }