X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fsrc%2FbbcreaVtkScalarsToColors.cxx;h=4aceca30aee008ced73ee882ba39ed697c223b28;hb=500bc2ff1c3fe51a9ce94324dee722fb2f7bfd36;hp=17780e12aba3d08fa9263c52e0a951141be5a448;hpb=dccc47ebcfa2ad7a2a6a8770f6975336897d7d06;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkScalarsToColors.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkScalarsToColors.cxx
index 17780e1..4aceca3 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkScalarsToColors.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkScalarsToColors.cxx
@@ -238,11 +238,17 @@ void ScalarsToColors::Process()
 			{
 				colorLookupTable->SetRange( bbGetInputRange()[0],bbGetInputRange()[1]);
 //				colorLookupTable->SetTableRange( bbGetInputRange()[0],bbGetInputRange()[1]);
-  				colorLookupTable->UseBelowRangeColorOn();
-  				colorLookupTable->UseAboveRangeColorOn();
-			} else {
+            } else if (bbGetInputWindowColorLevel().size()==2) {
+                double w    = bbGetInputWindowColorLevel()[0] / 2;
+                double c    = bbGetInputWindowColorLevel()[1];
+                colorLookupTable->SetRange( c-w , c+w );
+            }else {
 				colorLookupTable->SetRange(0,255);
 			}
+            
+            colorLookupTable->UseBelowRangeColorOn();
+            colorLookupTable->UseAboveRangeColorOn();
+
 			int NumberOfColors=1000;
 			int NumberOfColorsHalf=NumberOfColors/2;
   			colorLookupTable->SetNumberOfTableValues( NumberOfColors );
@@ -274,7 +280,7 @@ void ScalarsToColors::Process()
 					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->SetBelowRangeColor(0,0,0,1);  // White transparent
 	  				colorLookupTable->SetAboveRangeColor(1,1,1,1);  // White transparent 
 				}
 	  			
@@ -299,25 +305,29 @@ void ScalarsToColors::Process()
 		if ((bbGetInputType()==1) || (bbGetInputType()==101) )
 		{
 			vtkLookupTable *colorLookupTable = vtkLookupTable::New();
-			if (bbGetInputRange().size()==2)
-			{
-				colorLookupTable->SetRange( bbGetInputRange()[0],bbGetInputRange()[1]);
-//				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);
-			}
+            if (bbGetInputRange().size()==2)
+            {
+                colorLookupTable->SetRange( bbGetInputRange()[0],bbGetInputRange()[1]);
+//                colorLookupTable->SetTableRange( bbGetInputRange()[0],bbGetInputRange()[1]);
+            } else if (bbGetInputWindowColorLevel().size()==2) {
+                double w    = bbGetInputWindowColorLevel()[0] / 2;
+                double c    = bbGetInputWindowColorLevel()[1];
+                colorLookupTable->SetRange( c-w , c+w );
+            }else {
+                colorLookupTable->SetRange(0,255);
+            }
+            
+            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(0,0,0,1);  // White transparent
+                colorLookupTable->SetAboveRangeColor(1,1,1,1);  // White transparent
+            }
+
  			colorLookupTable->SetValueRange(0.0, 1.0); // from black to white
  			colorLookupTable->SetSaturationRange(0.0, 0.0); // no color saturation
  			colorLookupTable->SetRampToLinear();
@@ -351,7 +361,6 @@ void ScalarsToColors::Process()
 			_scalarstocolors = _LutEED;
 		} // If Type 3
 
-
 // 	} // firsttime
 	double rgb[3];
   	std::vector<double>colorRGB;
@@ -361,53 +370,48 @@ void ScalarsToColors::Process()
   	colorRGB.push_back( rgb[2] );
   	bbSetOutputColor( colorRGB );
 	bbSetOutputLookupTable( _scalarstocolors );
-
-
 }
+
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 void ScalarsToColors::bbUserSetDefaultValues()
 {
-
 //  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX 
 //    Here we initialize the input 'In' to 0
    bbSetInputType(0);
-   std::vector<double>range;
-   range.push_back( 0 );
-   range.push_back( 1 );
-	bbSetInputRange(range);
+//   std::vector<double>range;
+//   range.push_back( 0 );
+//   range.push_back( 1 );
+//	bbSetInputRange(range);
    bbSetInputScalarValue(0);
    bbSetInputBelowAboveRangeTransparence(true);
 //   firsttime		= true;
    _scalarstocolors	= NULL;
 }
+
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 void ScalarsToColors::bbUserInitializeProcessing()
 {
-
 //  THE INITIALIZATION METHOD BODY :
 //    Here does nothing 
 //    but this is where you should allocate the internal/output pointers 
-//    if any 
-
-  
+//    if any
 }
+
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 void ScalarsToColors::bbUserFinalizeProcessing()
 {
-
 //  THE FINALIZATION METHOD BODY :
 //    Here does nothing 
 //    but this is where you should desallocate the internal/output pointers 
 //    if any
-  
 }
-}
-// EO namespace bbcreaVtk
+
+}// EO namespace bbcreaVtk