---

yaml --- r: 74751 b: "refs/heads/CMSSW_7_1_X" c: 7cbeced h: "refs/heads/CMSSW_7_1_X" i: 74749: 43e44f9 74747: 552d1ce 74743: fbdd3dc 74735: 02ef71c 74719: f550046 74687: 583ddbf 74623: da8927c 74495: 780b5aa 74239: b7e2e1e 73727: 3d41126 v: v3
cms-sw · Oct 5, 2009 · d597845 · d597845
1 parent c84af17
commit d597845
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 55 deletions.
diff --git a/[refs] b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": c3554a5f223c87c45dd6eded214b719c2435128e
+"refs/heads/CMSSW_7_1_X": 7cbecedf4f0e53b31a0093b5cab730e016c8867e
diff --git a/trunk/Fireworks/Core/src/FWColorManager.cc b/trunk/Fireworks/Core/src/FWColorManager.cc
@@ -8,7 +8,7 @@
 //
 // Original Author:  Chris Jones
 //         Created:  Tue Mar 24 10:10:01 CET 2009
-// $Id: FWColorManager.cc,v 1.18 2009/10/04 19:37:00 amraktad Exp $
+// $Id: FWColorManager.cc,v 1.19 2009/10/05 08:08:06 amraktad Exp $
 //
 
 // system include files
@@ -57,50 +57,30 @@ enum {
 };
 
 static const float s_forWhite[][3] ={
-{ 0.64, 0.64, 0.02 }, //yellow (made it a bit darker)
-{ 0.24, 0.00, 0.43 }, //purple
-{ 0.96, 0.51, 0.00 }, //yellowish-orange
-{ 0.04, 0.00, 0.37 }, //purplish-blue
-{ 0.96, 0.32, 0.00 }, //orange
-{ 0.00, 0.06, 1.00 }, //blue
-{ 0.97, 0.08, 0.00 }, //dark orange
-{ 0.00, 0.66, 0.62 }, //cyan
-{ 1.00, 0.00, 0.00 }, //red
-{ 0.13, 0.43, 0.03 }, //green
-{ 0.38, 0.01, 0.06 }, //burgundy
-{ 0.38, 0.84, 0.02 }, //lime
-/*
-{ 1.00, 0.00, 0.00 }, //red
-{ 0.00, 0.00, 1.00 }, //blue
-{ 0.00, 1.00, 1.00 },  //cyan
-{ 0.00, 1.00, 0.00 }, //green
-{ 1.00, 0.00, 1.00 }, //magenta
-{ 1.00, 0.21, 0.00 }, //orange
-{ 1.00, 1.00, 0.00 }, //yellow
-{ 0.21, 0.21, 0.21 }, //gray
-*/
-{ 0.97, 1.00, 0.18 },
-{ 0.77, 0.54, 0.85 },
-{ 0.97, 0.78, 0.37 },
-{ 0.64, 0.54, 0.84 },
-{ 1.00, 0.69, 0.37 },
-{ 0.52, 0.64, 0.97 },
-{ 1.00, 0.66, 0.54 },
-{ 0.52, 0.96, 0.92 },
-{ 0.97, 0.57, 0.51 },
-{ 0.61, 0.76, 0.46 },
-{ 0.84, 0.57, 0.64 },
-{ 0.48, 0.92, 0.30 }
-/*
-{1.,0.3,0.3},
-{0.3,0.3,1.},
-{0.3,1.,1.},
-{0.3,1.,0.3},
-{1.,0.3,1.},
-{1.,0.7,0.0},
-{1.,1.,0.3},
-{0.7,0.7,0.7}
- */
+{ 0.79, 0.79, 0.12 }, //yellow (made it a bit darker)
+{ 0.47, 0.00, 0.64 }, //purple
+{ 0.98, 0.70, 0.00 }, //yellowish-orange
+{ 0.18, 0.00, 0.59 }, //purplish-blue
+{ 0.98, 0.54, 0.00 }, //orange
+{ 0.00, 0.22, 1.00 }, //blue
+{ 0.99, 0.26, 0.01 }, //dark orange
+{ 0.00, 0.80, 0.78 }, //cyan
+{ 1.00, 0.06, 0.00 }, //red
+{ 0.33, 0.64, 0.14 }, //green
+{ 0.60, 0.06, 0.23 }, //burgundy
+{0.65, 0.92, 0.17}, //lime{ 0.99, 1.00, 0.39 },
+
+{ 0.87, 0.72, 0.92 },
+{ 0.99, 0.88, 0.59 },
+{ 0.79, 0.72, 0.90 },
+{ 1.00, 0.82, 0.59 },
+{ 0.71, 0.79, 0.99 },
+{ 1.00, 0.80, 0.72 },
+{ 0.71, 0.98, 0.95 },
+{ 0.99, 0.74, 0.70 },
+{ 0.77, 0.86, 0.65 },
+{ 0.90, 0.74, 0.79 },
+{ 0.67, 0.95, 0.52 }
 };
 
 static const float s_forBlack[][3] ={
@@ -153,15 +133,15 @@ static const float s_forBlack[][3] ={
 static const unsigned int s_size = sizeof(s_forBlack)/sizeof(s_forBlack[0]);
 
 static const float s_geomForWhite[][3] ={
-{ 1.00, 0.30, 0.30 },
-{ 1.00, 0.30, 0.30 },
-{ 0.25, 0.51, 1.00 },
-{ 0.07, 0.20, 1.00 },
-{ 0.38, 1.00, 0.10 },
-{ 0.60, 0.60, 0.60 }, // calo3d grid
-{ 0.66, 0.66, 0.66 }, // lego grid
-{ 0.39, 0.39, 0.39 }, // lego boundrary
-{ 0.15, 0.15, 0.15 } // lego font
+{ 1.00, 0.44, 0.44 },
+{ 1.00, 0.44, 0.44 },
+{ 0.38, 0.63, 1.00 },
+{ 0.14, 0.33, 1.00 },
+{ 0.51, 1.00, 0.20 },
+{ 0.77, 0.77, 0.77 }, // calo3d grid
+{ 0.77, 0.77, 0.77 }, // lego grid
+{ 0.54, 0.54, 0.54 }, // lego boundrary
+{ 0.33, 0.33, 0.33 } // lego font
 };
 
 static const float s_geomForBlack[][3] ={