Changeset 13364 for trunk/Mars

Timestamp:

04/17/12 14:51:20 (13 years ago)

Author:

tbretz

Message:

Implemented the possibility to start an eventloop in a step-by-step mode which stops at each event which is not flagged with kCONTINUE.

Location:

trunk/Mars/mbase

Files:

• MEvtLoop.cc (modified) (4 diffs)
• MEvtLoop.h (modified) (1 diff)
• MStatusDisplay.h (modified) (1 diff)

trunk/Mars/mbase/MEvtLoop.cc

@@ -283 +283 @@
 }
 
-Bool_t MEvtLoop::ProcessGuiEvents(Int_t num)
+Bool_t MEvtLoop::ProcessGuiEvents(Int_t num, Int_t looprc)
 {
     if (gROOT->IsBatch())
@@ -305 +305 @@
             // FALLTHROUGH
         case MStatusDisplay::kLoopStep:
-            if (fDisplay && fDisplay->CheckStatus()==MStatusDisplay::kLoopStep)
+            if (fDisplay && fDisplay->CheckStatus()==MStatusDisplay::kLoopStep && looprc!=kCONTINUE)
+            {
+                //fDisplay->ClearStatus();
                 fDisplay->SetPause();
+            }
             // FALLTHROUGH
         case MStatusDisplay::kLoopNone:
@@ -501 +504 @@
 
             numcnts++;
-            if (!ProcessGuiEvents(++dummy))
+            if (!ProcessGuiEvents(++dummy, rc))
                 break;
         }
@@ -513 +516 @@
 
             numcnts++;
-            if (!ProcessGuiEvents(maxcnt - dummy))
+            if (!ProcessGuiEvents(maxcnt - dummy, rc))
                 break;
         }

trunk/Mars/mbase/MEvtLoop.h

@@ -39 +39 @@
     void StreamPrimitive(ostream &out) const;
 
-    Bool_t ProcessGuiEvents(Int_t num);
+    Bool_t ProcessGuiEvents(Int_t num, Int_t rc);
 
 public:

trunk/Mars/mbase/MStatusDisplay.h

@@ -298 +298 @@
      // Eventloop interface
      Status_t CheckStatus() const { return fStatus; }
-     void ClearStatus() { fStatus = kLoopNone; }
-     void SetPause() { fStatus = kLoopPause; }
+     void ClearStatus() { fStatus=kLoopPause; ProcessMessageCommandMenu(kLoopPause); }
+     void SetPause() { fStatus=kLoopNone; ProcessMessageCommandMenu(kLoopPause); }
+     void SetLoopStep() { SetPause(); fStatus = kLoopStep; }
 
      void Lock() { fIsLocked++; }