Changeset 1030 for trunk/MagicSoft/Mars/meventdisp

Timestamp:

11/05/01 10:35:36 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/meventdisp

Files:

• MGCamDisplay.cc (modified) (4 diffs)
• MGEvtDisplay.cc (modified) (6 diffs)
• MGEvtDisplay.h (modified) (2 diffs)
• MGFadcDisp.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

@@ -115 +115 @@
     plist->AddToList(pedest);
 
-    fInitOk = fEvtLoop->PreProcess();
-
-    if (fInitOk)
-        GetTaskList()->Process();
-
     return geom;
 }
@@ -147 +142 @@
     fDisplay = new MCamDisplay(geom);
     fDisplay->Draw();
-
     fList->Add(fDisplay);
+
+    ReadFirstEvent();
 
     //
@@ -161 +157 @@
     SetWindowName("Hillas Event Display");
     SetIconName("Hillas");
-
-    UpdateDisplay();
-    UpdateNumOfEvts();
-    UpdateEventCounter();
 
     MapWindow();
@@ -177 +169 @@
 void MGCamDisplay::UpdateDisplay()
 {
-    if (!fInitOk)
+    if (!IsInitOk())
         return;
 

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

@@ -139 +139 @@
 // --------------------------------------------------------------------------
 //
-//  Show the correct number of events
-//
-void MGEvtDisplay::UpdateNumOfEvts()
-{
-    char txt[100];
-    sprintf(txt, "out of %d Events", GetReader()->GetEntries());
-
-    fNumOfEvts->SetText(new TGString(txt));
-}
-
-// --------------------------------------------------------------------------
-//
 //  Add the second part of the top frame: This are the event number controls
 //
@@ -405 +393 @@
     AddMenuBar();
     AddFrames(fname, tname);
-    UpdateEventCounter();
 }
 
@@ -435 +422 @@
 //  and updates the display
 //
-void MGEvtDisplay::ReadinEvent(UInt_t iEvt)
-{
-    if (!fInitOk)
-        return;
-
-    Int_t buttons = 4;
-    Int_t retval  = 0;
-
-    //
-    //  first check if the new event is in the range of possible events
-    //
-    if (iEvt >= GetReader()->GetEntries())
+void MGEvtDisplay::ReadinEvent()
+{
+    if (GetTaskList()->Process())
     {
-        new TGMsgBox(gClient->GetRoot(), this, "WARNING!",
-                     "The event number is out of range!!!",
-                     kMBIconExclamation, buttons, &retval);
+        GetReader()->DecEventNum();
+        UpdateDisplay();
     }
-    else
-    {
-        GetReader()->SetEventNum(iEvt);
-
-        if (GetTaskList()->Process())
-            UpdateDisplay();
-    }
-
-    UpdateEventCounter();
-}
-
-// --------------------------------------------------------------------------
-//
-//  Update the event counter
-//
-void MGEvtDisplay::UpdateEventCounter()
-{
-    char txt[256];
-
-    sprintf(txt, "%d", GetReader()->GetEventNum());
-
-    fTxtEvtNr->SetText(txt);
+
+    fTxtEvtNr->SetText(Form("%d", GetReader()->GetEventNum()+1));
+}
+
+void MGEvtDisplay::ReadFirstEvent()
+{
+    fInitOk = fEvtLoop->PreProcess();
+
+    if (fInitOk)
+        ReadinEvent();
+
+    TGString *txt = new TGString(Form("out of %d Events", GetReader()->GetEntries()));
+    fNumOfEvts->SetText(txt);
 }
 
@@ -526 +494 @@
 // --------------------------------------------------------------------------
 //
-//    ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2)
+//  ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2)
 //
 // Processes information from all GUI items.
@@ -535 +503 @@
 Bool_t MGEvtDisplay::ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2)
 {
-    switch(GET_MSG(msg))
+    if (GET_MSG(msg)!=kC_TEXTENTRY && GET_MSG(msg)!=kC_COMMAND)
+        return kTRUE;
+
+    switch(GET_SUBMSG(msg))
     {
-    case kC_COMMAND:
+    case kTE_ENTER:
+    case kCM_BUTTON:
+        if (parm1==kClose)
+        {
+            CloseWindow();
+            return kTRUE;
+        }
+
+        if (!fInitOk)
+            return kTRUE;
+
         switch(GET_SUBMSG(msg))
         {
+        case kTE_ENTER:
+            if (GetReader()->SetEventNum(atoi(fTxtEvtNr->GetText())-1))
+                ReadinEvent();
+            return kTRUE;
+
         case kCM_BUTTON:
             switch (parm1)
             {
             case kEvtPrev:
-                //
-                // '-2' is because MReadTree::Process increases the
-                // Event number by one - this is the natural behaviour
-                // after reading one event
-                //
-                ReadinEvent(GetReader()->GetEventNum()-2);
+                if (GetReader()->DecEventNum())
+                    ReadinEvent();
                 return kTRUE;
 
             case kEvtNext:
-                //
-                // '+0' is because MReadTree::Process increases the
-                // Event number by one - this is the natural behaviour
-                // after reading one event
-                //
-                ReadinEvent(GetReader()->GetEventNum());
-                return kTRUE;
-
-            case kClose:
-                CloseWindow();
-                return kTRUE;
-            }
-            return kTRUE;
-
-        case kCM_MENU:
-            switch (parm1)
-            {
-            case kFileSaveAs:
-                SaveAsDialog();
-                return kTRUE;
-            case kFileSaveAsRoot:
-                fCanvas->SaveAs("display.root");
-                return kTRUE;
-            case kFileSaveAsC:
-                fCanvas->SaveSource("display.C");
-                return kTRUE;
-            case kFileSaveAsPS:
-                fCanvas->SaveAs("display.ps");
-                return kTRUE;
-            case kFileSaveAsEPS:
-                fCanvas->SaveAs("display.eps");
-                return kTRUE;
-            case kFileSaveAsGIF:
-                fCanvas->SaveAs("display.gif");
-                return kTRUE;
-            case kFilePrint:
-                fCanvas->Print();
-                return kTRUE;
-            case kClose:
-                CloseWindow();
+                if (GetReader()->IncEventNum())
+                    ReadinEvent();
                 return kTRUE;
             }
@@ -599 +543 @@
         return kTRUE;
 
-    case kC_TEXTENTRY:
-        if (GET_SUBMSG(msg) == kTE_ENTER)
-            ReadinEvent(atoi(fTxtEvtNr->GetText())-1);
+    case kCM_MENU:
+        switch (parm1)
+            {
+            case kFileSaveAs:
+                SaveAsDialog();
+                return kTRUE;
+            case kFileSaveAsRoot:
+                fCanvas->SaveAs("display.root");
+                return kTRUE;
+            case kFileSaveAsC:
+                // FIXME: The line opening the canvas is wrong.
+                fCanvas->SaveSource("display.C");
+                return kTRUE;
+            case kFileSaveAsPS:
+                fCanvas->SaveAs("display.ps");
+                return kTRUE;
+            case kFileSaveAsEPS:
+                fCanvas->SaveAs("display.eps");
+                return kTRUE;
+            case kFileSaveAsGIF:
+                fCanvas->SaveAs("display.gif");
+                return kTRUE;
+            case kFilePrint:
+                fCanvas->Print();
+                return kTRUE;
+            case kClose:
+                CloseWindow();
+                return kTRUE;
+            }
         return kTRUE;
     }
-
     return kTRUE;
 }

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.h

@@ -40 +40 @@
 
     void SaveAsDialog() const;
+    void ReadinEvent();
 
-    void ReadinEvent(UInt_t iEvt);
+    Bool_t fInitOk;
 
 protected:
@@ -54 +55 @@
     TGVerticalFrame  *fMidFrame;
 
-    Bool_t fInitOk;
-
     MParList  *GetParList() const;
     MTaskList *GetTaskList() const;
     MReadTree *GetReader() const;
 
-    void UpdateEventCounter();
-    void UpdateNumOfEvts();
+    void   ReadFirstEvent();
+    Bool_t IsInitOk() { return fInitOk; }
 
     virtual void UpdateDisplay() = 0;

trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.cc

@@ -125 +125 @@
     // preprocess eventloop and read in first event (process)
     //
-    fInitOk = fEvtLoop->PreProcess();
-
-    if (fInitOk)
-        GetTaskList()->Process();
+    GetReader()->DisableAutoScheme();
+    ReadFirstEvent();
 
     //
@@ -144 +142 @@
     SetWindowName("Fadc Event Display");
     SetIconName("Fadc");
-
-    UpdateDisplay();
-    UpdateNumOfEvts();
-    UpdateEventCounter();
 
     MapWindow();
@@ -220 +214 @@
 void MGFadcDisp::UpdateDisplay()
 {
-    if (!fInitOk)
+    if (!IsInitOk())
         return;