Changeset 1715 for trunk/MagicSoft/Mars/mgui

Timestamp:

01/19/03 14:52:29 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgui

Files:

• MCamDisplay.cc (modified) (9 diffs)
• MCamDisplay.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -42 +42 @@
 #include <TStyle.h>
 #include <TCanvas.h>
-#include <TButton.h>
+//#include <TButton.h>
 #include <TClonesArray.h>
 
@@ -167 +167 @@
 }
 
-inline void MCamDisplay::SetPixColor(const MCerPhotPix &pix, const Int_t i, Float_t min, Float_t max)
-{
+inline void MCamDisplay::SetPixColor(const MCerPhotPix &pix, const UInt_t i, Float_t min, Float_t max)
+{
+    if (i>=fNumPixels)
+        return;
+
     //
     // Fixme: Use absolute value per mm^2. Needs another scaling algorithm.
@@ -178 +181 @@
 }
 
-inline void MCamDisplay::SetPixColorPedestal(const MPedestalPix &pix, const Int_t i, Float_t min, Float_t max)
-{
+inline void MCamDisplay::SetPixColorPedestal(const MPedestalPix &pix, const UInt_t i, Float_t min, Float_t max)
+{
+    if (i>=fNumPixels)
+        return;
+
     //
     // Fixme: Use absolute value per mm^2. Needs another scaling algorithm.
@@ -189 +195 @@
 }
 
-inline void MCamDisplay::SetPixColorError(const MCerPhotPix &pix, const Int_t i, Float_t min, Float_t max)
-{
+inline void MCamDisplay::SetPixColorError(const MCerPhotPix &pix, const UInt_t i, Float_t min, Float_t max)
+{
+    if (i>=fNumPixels)
+        return;
+
     //
     // Fixme: Use absolute value per mm^2. Needs another scaling algorithm.
@@ -378 +387 @@
 }
 
+void MCamDisplay::SetPrettyPalette()
+{
+    SetPalette(1, 0);
+}
+
+void MCamDisplay::SetDeepBlueSeaPalette()
+{
+    SetPalette(51, 0);
+}
+
+void MCamDisplay::SetInvDeepBlueSeaPalette()
+{
+    SetPalette(52, 0);
+}
+
 // ------------------------------------------------------------------------
 //
@@ -418 +442 @@
     Paint();
 
-    //
-    // Create and draw the buttons which allows changing the
-    // color palette of the display
-    //
-    TButton *but;
-    char txt[100];
-    sprintf(txt, "((MCamDisplay*)0x%lx)->SetPalette(1,0);", this);
-    but = new TButton("Pretty", txt, 0.01, 0.95, 0.15, 0.99);
-    but->Draw();
-    sprintf(txt, "((MCamDisplay*)0x%lx)->SetPalette(51,0);", this);
-    but = new TButton("Deap Sea", txt, 0.16, 0.95, 0.30, 0.99);
-    but->Draw();
-    sprintf(txt, "((MCamDisplay*)0x%lx)->SetPalette(52,0);", this);
-    but = new TButton("Blue Inv", txt, 0.31, 0.95, 0.45, 0.99);
-    but->Draw();
+    /*
+     //
+     // Create and draw the buttons which allows changing the
+     // color palette of the display
+     //
+     TButton *but;
+     char txt[100];
+     sprintf(txt, "((MCamDisplay*)0x%lx)->SetPalette(1,0);", this);
+     but = new TButton("Pretty", txt, 0.01, 0.95, 0.15, 0.99);
+     but->Draw();
+     sprintf(txt, "((MCamDisplay*)0x%lx)->SetPalette(51,0);", this);
+     but = new TButton("Deap Sea", txt, 0.16, 0.95, 0.30, 0.99);
+     but->Draw();
+     sprintf(txt, "((MCamDisplay*)0x%lx)->SetPalette(52,0);", this);
+     but = new TButton("Blue Inv", txt, 0.31, 0.95, 0.45, 0.99);
+     but->Draw();
+     */
 
     //
@@ -441 +467 @@
     {
 #if ROOT_VERSION_CODE > ROOT_VERSION(3,01,06)
-        (*this)[i].SetBit(kNoContextMenu|kCannotPick);
+        (*this)[i].SetBit(/*kNoContextMenu|*/kCannotPick);
 #endif
         (*this)[i].SetFillColor(22);
@@ -470 +496 @@
         box->SetFillColor(22);
 #if ROOT_VERSION_CODE > ROOT_VERSION(3,01,06)
-        box->SetBit(kNoContextMenu|kCannotPick);
+        box->SetBit(/*kNoContextMenu|*/kCannotPick);
 #endif
         box->Draw();
@@ -478 +504 @@
         txt->SetY(H*((i+0.5)*h - 1.));
 #if ROOT_VERSION_CODE > ROOT_VERSION(3,01,06)
-        txt->SetBit(kNoContextMenu|kCannotPick);
+        txt->SetBit(/*kNoContextMenu|*/kCannotPick);
 #endif
         txt->Draw();

trunk/MagicSoft/Mars/mgui/MCamDisplay.h

@@ -54 +54 @@
     MHexagon &operator[](int i) { return *((MHexagon*)fPixels->At(i)); }
 
-    void  SetPixColor(const MCerPhotPix &pix, const Int_t i, Float_t min, Float_t max);
+    void  SetPixColor(const MCerPhotPix &pix, const UInt_t i, Float_t min, Float_t max);
     void  SetPixColorRatio(const MCerPhotPix &pix, Float_t min, Float_t max);
     void  SetPixColorLevel(const MCerPhotPix &pix, Float_t lvl1, Float_t lvl2);
-    void  SetPixColorError(const MCerPhotPix &pix, const Int_t i, Float_t min, Float_t max);
-    void  SetPixColorPedestal(const MPedestalPix &pix, const Int_t i, Float_t min, Float_t max);
+    void  SetPixColorError(const MCerPhotPix &pix, const UInt_t i, Float_t min, Float_t max);
+    void  SetPixColorPedestal(const MPedestalPix &pix, const UInt_t i, Float_t min, Float_t max);
     Int_t GetColor(Float_t val, Float_t min, Float_t max);
 
@@ -86 +86 @@
     void SetPalette(Int_t ncolors, Int_t *colors);
 
+    void SetPrettyPalette(); // *MENU*
+    void SetDeepBlueSeaPalette(); // *MENU*
+    void SetInvDeepBlueSeaPalette(); // *MENU*
+
     ClassDef(MCamDisplay, 0) // Displays the magic camera
 };