Changeset 1021 for trunk/MagicSoft/Mars

Timestamp:

10/31/01 14:47:58 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MAnalysis.cc (modified) (7 diffs)
• MAnalysis.h (modified) (1 diff)

trunk/MagicSoft/Mars/mmain/MAnalysis.cc

@@ -31 +31 @@
 #include <TGButton.h>      // TGTextButton
 #include <TGTextEntry.h>   // TGNumberEntry
+#include <TGProgressBar.h> // TGHProgressBar
+
 
 ClassImp(MAnalysis)
 
 enum {
-    M_BUTTON_HILLAS
+    kButHillas
 };
 
 void MAnalysis::AddButtons()
 {
-    TGTextButton *hillas = new TGTextButton(fTop2, "Calculate Standard Hillas", M_BUTTON_HILLAS);
+    TGTextButton *hillas = new TGTextButton(fTop2, "Calculate Standard Hillas", kButHillas);
 
     hillas->Associate(this);
@@ -183 +185 @@
 #include "MHillas.h"
 
-void MAnalysis::CalculateHillas() const
+void MAnalysis::CalculateHillas()
 {
     //
@@ -207 +209 @@
     }
 
+    TGHProgressBar bar(fTop2);
+    TGLayoutHints laybar(kLHintsExpandX|kLHintsCenterY|kLHintsRight, 10, 10, 5, 5); //, 10); //, 5, 5);
+    bar.SetWidth(150);
+    fTop2->AddFrame(&bar, &laybar);
+    Layout();
+    MapSubwindows();
+
     //
     // Create a empty Parameter List and an empty Task List
@@ -242 +251 @@
     //   CalEvents:  Calibration Events
     //
-    MReadTree    read("Events", fInputFile);
+    MReadTree read("Events", fInputFile);
+    read.SetProgressBar(&bar);
+
     MCerPhotCalc ncalc;
     MImgCleanStd clean(cleanlvl1, cleanlvl2);
@@ -266 +277 @@
     MEvtLoop evtloop;
     evtloop.SetParList(&plist);
-
+    evtloop.SetProgressBar(&bar);
     //
     // Execute your analysis
     //
-    if (!evtloop.Eventloop())
+    Bool_t rc = evtloop.Eventloop();
+
+    fTop2->RemoveFrame(&bar);
+    Layout();
+    MapSubwindows();
+
+    if (!rc)
         return;
-
     //
     // After the analysis is finished we can display the histograms
@@ -297 +313 @@
     switch (parm1)
     {
-    case M_BUTTON_HILLAS:
+    case kButHillas:
         if (!InputFileSelected())
         {
@@ -306 +322 @@
         switch (parm1)
         {
-        case M_BUTTON_HILLAS:
+        case kButHillas:
             CalculateHillas();
             return kTRUE;

trunk/MagicSoft/Mars/mmain/MAnalysis.h

@@ -18 +18 @@
     TGTextEntry   *fNumEntry2;
 
-    void CalculateHillas() const;
+    void CalculateHillas();
 
     void AddButtons();