Changeset 2158 for trunk/MagicSoft/Mars

Timestamp:

06/03/03 17:45:39 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/sumcurrents.C (modified) (1 diff)
• mgui/MCamDisplay.cc (modified) (9 diffs)
• mgui/MCamDisplay.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -28 +28 @@
    * mhist/Makefile, mhist/HistLinkDef.h:
      - added MHCurrents
+
+   * mgui/MCamDisplay.[h,cc]:
+     - changed number of ItemsLegend to display the maximum, too
+
+   * macros/sumcurrents.C:
+     - added
 
 

trunk/MagicSoft/Mars/macros/sumcurrents.C

@@ -29 +29 @@
 //  This macro shows how to fill and display a histogram using Mars
 //
-void sumcurrents(const char *fname="../currents/dcs_vega.dat")
+void sumcurrents(const char *fname="../currents/dcs_arcturus.dat")
 {
     //

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -66 +66 @@
 #include "MImgCleanStd.h"
 
-#define kItemsLegend 50 // see SetPalette(1,0)
+#define kItemsLegend 48 // see SetPalette(1,0)
 
 ClassImp(MCamDisplay);
@@ -74 +74 @@
 //  Default Constructor. To be used by the root system ONLY.
 //
-MCamDisplay::MCamDisplay()
-    : fGeomCam(NULL), fAutoScale(kTRUE)
+MCamDisplay::MCamDisplay() : fGeomCam(NULL), fAutoScale(kTRUE)
 {
     fNumPixels = 0;
@@ -90 +89 @@
     fMinimum = 0;
     fMaximum = 1;
-
-    //fData.Set(0);
 }
 
@@ -99 +96 @@
 //
 MCamDisplay::MCamDisplay(MGeomCam *geom)
-    : fGeomCam(NULL), fAutoScale(kTRUE), fData(geom->GetNumPixels()), fMinimum(0), fMaximum(1)
+    : fGeomCam(NULL), fAutoScale(kTRUE), fColors(kItemsLegend), fData(geom->GetNumPixels()), fMinimum(0), fMaximum(1)
 {
     fGeomCam = (MGeomCam*)geom->Clone(); 
@@ -139 +136 @@
 
     fLegend  = new TClonesArray("TBox",  kItemsLegend);
-    fLegText = new TClonesArray("TText", kItemsLegend);
-
-    for (Int_t i = 0; i<kItemsLegend; i++)
-    {
-        TBox  &newbox = *new ((*fLegend)[i])  TBox;
-        TText &newtxt = *new ((*fLegText)[i]) TText;
-
+    fLegText = new TClonesArray("TText", kItemsLegend+1);
+
+    for (Int_t i=0; i<kItemsLegend; i++)
+    {
+        TBox &newbox = *new ((*fLegend)[i])  TBox;
         newbox.SetX1(fRange);
         newbox.SetX2(fRange+w);
@@ -154 +149 @@
         newbox.SetBit(/*kNoContextMenu|*/kCannotPick);
 #endif
-
+    }
+
+    for (Int_t i=0; i<kItemsLegend+1; i++)
+    {
+        TText &newtxt = *new ((*fLegText)[i]) TText;
         newtxt.SetTextSize(0.025);
         newtxt.SetTextAlign(12);
@@ -344 +343 @@
     {
         gStyle->SetPalette(51, NULL);
-        Int_t c[50];
-        for (int i=0; i<50; i++)
-            c[49-i] = gStyle->GetColorPalette(i);
-        gStyle->SetPalette(50, c);
+        TArrayI c(kItemsLegend);
+        for (int i=0; i<kItemsLegend; i++)
+            c[kItemsLegend-i-1] = gStyle->GetColorPalette(i);
+        gStyle->SetPalette(kItemsLegend, c.GetArray());
     }
     else
@@ -714 +713 @@
 void MCamDisplay::UpdateLegend(Float_t minphe, Float_t maxphe, Bool_t islog)
 {
-    for (Int_t i=0; i<kItemsLegend; i+=3)
+    for (Int_t i=0; i<kItemsLegend+1; i+=3)
     {
         const Float_t pos = (Float_t)i/kItemsLegend;
@@ -724 +723 @@
             val = minphe + pos * (maxphe-minphe);
 
-        TText &txt = *GetText(i);
+        TText &txt = *(TText*)fLegText->At(i);
         txt.SetText(txt.GetX(), txt.GetY(), Form(val<1e6?"%5.1f":"%5.1e", val));
     }

trunk/MagicSoft/Mars/mgui/MCamDisplay.h

@@ -10 +10 @@
 #ifndef ROOT_TArrayF
 #include <TArrayF.h>
+#endif
+#ifndef ROOT_TArrayI
+#include <TArrayI.h>
 #endif
 #ifndef ROOT_TClonesArray
@@ -40 +43 @@
     Float_t        fRange;       // the range in millimeters of the present geometry
 
-    Int_t          fColors[50];
+    TArrayI        fColors;
 
     TArrow        *fArrowX;      // Coordinate System
@@ -58 +61 @@
 
     TBox  *GetBox(Int_t i)  { return (TBox*) fLegend->At(i); }
-    TText *GetText(Int_t i) { return (TText*)fLegText->At(i); }
 
     MHexagon &operator[](int i) { return *((MHexagon*)fPixels->At(i)); }