Changeset 2484 for trunk/MagicSoft

Timestamp:

11/07/03 14:50:27 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mhist/MHCamera.cc (modified) (3 diffs)
• mhist/MHCamera.h (modified) (1 diff)
• mmain/MEventDisplay.cc (modified) (4 diffs)
• mmain/MStatusDisplay.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
    * mhist/Makefile, mhist/HistLinkDef.h:
      - added MHEvent
+
+   * NEWS:
+     - updated
+     
+   * mhist/MHCamera.[h,cc]:
+     - implemented kNoLegend=BIT(20)
+     - Clear pad before drawing Camera
+
+   * mmain/MStatusDisplay.cc:
+     - print when updating ps-header
 
 

trunk/MagicSoft/Mars/NEWS

@@ -14 +14 @@
      upcomming camera version 0.7. The base for a general support
      is implemented and the star-functionality is proven to work.
+   - Replaced Event-Display in and Camera-Display in the Mars GUI
+     executable by a more convinient display base on MStatusDisplay.
 
 

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -399 +399 @@
     // Maintain aspect ratio
     //
-    const float ratio = 1.15;
+    const float ratio = TestBit(kNoLegend) ? 1 : 1.15;
 
     //
@@ -447 +447 @@
         max += 1;
 
-    UpdateLegend(min, max, islog);
+    if (!TestBit(kNoLegend))
+        UpdateLegend(min, max, islog);
 
     MHexagon hex;
@@ -532 +533 @@
         return;
     }
+
+    gPad->Clear();
 
     // Maintain aspect ratio

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -30 +30 @@
 public:
     enum {
-        kProfile = BIT(18),
-        kFreezed = BIT(19)
+        kProfile  = BIT(18),
+        kFreezed  = BIT(19),
+        kNoLegend = BIT(20)
     };
 private:

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -271 +271 @@
     // Create the gui elements
     //
-    TGTextButton *prevevt = new TGTextButton(top2, "<< Previous Event", kEvtPrev);
+    TGTextButton *prevevt = new TGTextButton(top2, " << ", kEvtPrev);
     prevevt->Associate(this);
 
-    TGLabel *evtnr = new TGLabel(top2, new TGString("Event: "));
+    TGLabel *evtnr = new TGLabel(top2, new TGString("Event:"));
 
     TGTextEntry *entry=new TGTextEntry(top2, new TGTextBuffer(100), kEvtNumber);
@@ -280 +280 @@
     entry->Associate(this);
 
-    fNumOfEvts = new TGLabel(top2, "out of           Events.");
-
-    TGTextButton *nextevt = new TGTextButton (top2, "Next Event >>", kEvtNext);
+    fNumOfEvts = new TGLabel(top2, "of           .");
+
+    TGTextButton *nextevt = new TGTextButton (top2, " >> ", kEvtNext);
     nextevt->Associate(this);
 
@@ -438 +438 @@
     TCanvas &c=AddTab("Geometry");
 
+    c.SetFillColor(16);
+
     MHCamera *cam = new MHCamera(*geom);
-    cam->SetBit(TH1::kNoStats);
+    cam->SetBit(TH1::kNoStats|MHCamera::kNoLegend);
     cam->Draw();
     cam->DrawPixelIndices();
@@ -452 +454 @@
     ReadinEvent();
 
-    TGString *txt = new TGString(Form("out of %d Events", GetReader()->GetEntries()));
+    TGString *txt = new TGString(Form("of %d.", GetReader()->GetEntries()));
     fNumOfEvts->SetText(txt);
 

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -1858 +1858 @@
 
     ps.Close();
+
+    if (num<0)
+        *fLog << inf << " - ";
+
+    SetStatusLine2("Updating Postscript header...");
+    *fLog << inf << "Updating Postscript header..." << flush;
     UpdatePSHeader(name);
+    *fLog << inf << "done." << endl;
+
 
     gVirtualPS = psave;