Changeset 9185 for trunk

Timestamp:

12/02/08 11:12:35 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MEvtLoop.cc (modified) (1 diff)
• mbase/MStatusDisplay.cc (modified) (5 diffs)
• mbase/MStatusDisplay.h (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2008/12/02 Thomas Bretz
+
+   * mbase/MStatusDisplay.[h,cc], mbase/MEvtLoop.cc:
+     - added Pause and Single Step option
+
+
+
  2008/12/01 Daniela Dorner
 
@@ -47 +54 @@
        result fit better
      - added a histogram showing the readin source position of the MCs
+
+   * mcorsika/CorsikaLinkDef.h, mcorsika/Makefile, 
+     mcorsika/MCorsikaEvtHeader.[h,cc], mcorsika/MCorsikaRead.[h,cc],
+     mcorsika/MCorsikaRunHeader.[h,cc]:
+     - addedcc MCorsikaRunHeader.h
 
 

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -296 +296 @@
         switch (fDisplay->CheckStatus())
         {
+        case MStatusDisplay::kLoopPause:
+            fDisplay->SetStatusLine1("Paused.");
+            while (fDisplay && fDisplay->CheckStatus()==MStatusDisplay::kLoopPause)
+            {
+                gSystem->ProcessEvents();
+                gSystem->Sleep(1);
+            }
+            break;
+        case MStatusDisplay::kLoopStep:
+            fDisplay->SetPause();
         case MStatusDisplay::kLoopNone:
             break;

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -326 +326 @@
     //
     MGPopupMenu *loopmenu = new MGPopupMenu(gClient->GetRoot());
-    loopmenu->AddEntry("&Stop", kLoopStop);
+    loopmenu->AddEntry("&Pause",       kLoopPause);
+    loopmenu->AddEntry("Single S&tep", kLoopStep);
+    loopmenu->AddSeparator();
+    loopmenu->AddEntry("&Stop",  kLoopStop);
     loopmenu->Associate(this);
+
+    loopmenu->DisableEntry(kLoopStep);
 
     //
@@ -368 +373 @@
     fList->Add(layitem);
 
-    MGMenuBar *menubar = new MGMenuBar(this, 1, 1, kHorizontalFrame);
-    menubar->AddPopup("&File", filemenu, layitem);
-    menubar->AddPopup("Lo&g",  logmenu,  layitem);
-    menubar->AddPopup("&Size", sizemenu, layitem);
-    menubar->AddPopup("&Tab",  tabmenu,  layitem);
-    menubar->AddPopup("&Loop", loopmenu, layitem);
-    menubar->BindKeys(this);
-    AddFrame(menubar);
+    fMenuBar = new MGMenuBar(this, 1, 1, kHorizontalFrame);
+    fMenuBar->AddPopup("&File", filemenu, layitem);
+    fMenuBar->AddPopup("Lo&g",  logmenu,  layitem);
+    fMenuBar->AddPopup("&Size", sizemenu, layitem);
+    fMenuBar->AddPopup("&Tab",  tabmenu,  layitem);
+    fMenuBar->AddPopup("&Loop", loopmenu, layitem);
+    fMenuBar->BindKeys(this);
+    AddFrame(fMenuBar);
 
     //
@@ -394 +399 @@
     fList->Add(loopmenu);
     fList->Add(sizemenu);
-    fList->Add(menubar);
+    fList->Add(fMenuBar);
     fList->Add(tabmenu);
     fList->Add(logmenu);
@@ -663 +668 @@
 {
     SetStatusLine2(MString::Format("%s: %s", cont.GetDescriptor().Data(), cont.GetTitle()));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get TGPopupMenu as defined by name from fMenuBar
+//
+TGPopupMenu *MStatusDisplay::GetPopup(const char *name)
+{
+    if (!fMenuBar)
+        return 0;
+
+    TGPopupMenu *m = fMenuBar->GetPopup(name);
+    if (!m)
+    {
+        *fLog << warn << name << " doesn't exist in menu bar." << endl;
+        return 0;
+    }
+
+    return m;
 }
 
@@ -1541 +1565 @@
     switch (id)
     {
+    case kLoopPause:
+        {
+            TGPopupMenu *m = GetPopup("Loop");
+            if (!m)
+                return kTRUE;
+
+            if (fStatus==kLoopNone)
+            {
+                fStatus = (Status_t)kLoopPause;
+                m->CheckEntry(kLoopPause);
+                m->EnableEntry(kLoopStep);
+                return kTRUE;
+            }
+            if (fStatus==kLoopPause)
+            {
+                fStatus = (Status_t)kLoopNone;
+                m->UnCheckEntry(kLoopPause);
+                m->DisableEntry(kLoopStep);
+                return kTRUE;
+            }
+        }
+        return kTRUE;
+
+    case kLoopStep:
+        fStatus = (Status_t)kLoopStep;
+        return kTRUE;
+
     case kLoopStop:
     case kFileClose:

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -20 +20 @@
 class MLog;
 class MGList;
+class MGMenuBar;
 class MStatusArray;
 class MParContainer;
@@ -32 +33 @@
 class TGTextView;
 class TGStatusBar;
+class TGPopupMenu;
 class TGTabElement;
 class TGProgressBar;
@@ -51 +53 @@
         kFileClose, kFileExit, kFileReset,
         // kLoop
-        kLoopNone, kLoopStop,
+        kLoopNone, kLoopPause, kLoopStep, kLoopStop,
         // kTab
         kTabSave, kTabSaveAs, kTabSaveAsPS, kTabSaveAsPDF, kTabSaveAsSVG,
@@ -97 +99 @@
     TMutex *fMutex;
 
+    MGMenuBar   *fMenuBar;
     TGStatusBar *fStatusBar;
 
@@ -141 +144 @@
     void RemoveTab(int i);
     void SetStatusLine(const char *txt, Int_t idx);
+
+    // Menu helper functions
+    TGPopupMenu *GetPopup(const char *name);
 
     // Drawing helper
@@ -291 +297 @@
      Status_t CheckStatus() const { return fStatus; }
      void ClearStatus() { fStatus = kLoopNone; }
+     void SetPause() { fStatus = kLoopPause; }
 
      void Lock() { fIsLocked++; }