Changeset 2204 for trunk/MagicSoft

Timestamp:

06/20/03 10:48:34 (21 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mgui/MCamDisplay.cc (modified) (5 diffs)
• mgui/MCamDisplay.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/06/19: Thomas Bretz
+ 
+   * mgui/MCamDisplay.[h,cc]:
+     - fixed color palette when loading MCamDisplay
+
+
 
  2003/06/18: Thomas Bretz

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -78 +78 @@
 //  Default Constructor. To be used by the root system ONLY.
 //
-MCamDisplay::MCamDisplay() : fGeomCam(NULL), fAutoScale(kTRUE)
+MCamDisplay::MCamDisplay() : fGeomCam(NULL), fAutoScale(kTRUE), fColors(kItemsLegend)
 {
     fNumPixels = 0;
@@ -96 +96 @@
 
     fNotify  = NULL;
+
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,01,06)
+    SetPalette(1, 0);
+#else
+    SetPalette(51, 0);
+#endif
 }
 
@@ -409 +415 @@
         gStyle->SetPalette(ncolors, colors);
 
+    if (!fPixels)
+    {
+        for (int i=0; i<kItemsLegend; i++)
+            fColors[i] = gStyle->GetColorPalette(i);
+        return;
+    }
+
     //
     // Change the colors of the pixels
@@ -446 +459 @@
 
     //
-    // Store the color palette used for a leter reverse lookup
+    // Store the color palette used for a later reverse lookup
     //
     for (int i=0; i<kItemsLegend; i++)
@@ -454 +467 @@
     }
 }
+
 
 void MCamDisplay::SetPrettyPalette()

trunk/MagicSoft/Mars/mgui/MCamDisplay.h

@@ -45 +45 @@
     Float_t        fRange;       // the range in millimeters of the present geometry
 
-    TArrayI        fColors;      // Color conversion table
+    TArrayI        fColors;      //! Color conversion table
 
     TArrow        *fArrowX;      // Coordinate System