Changeset 9598 for trunk/MagicSoft/Mars

Timestamp:

06/28/10 16:07:08 (14 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MStatusDisplay.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2010/06/28 Thomas Bretz
+
+   * mbase/MStatusDisplay.cc:
+     - Status displays where stored as MStatusArray instead of
+       MStatusDisplay
+     - Read now also can read other StatusDisplays if a key is found in
+       the file
+
+
+
  2010/06/25 Thomas Bretz
 
@@ -60 +70 @@
      - added SetViewCone
 
-   * mmc/MMcEvt.cxx, mmc/MMcEvtBasic.h:
+   * mmc/MMcEvt.[hxx,cxx], mmc/MMcEvtBasic.[h,cc]:
      - moved fPhi and fTheta from MMcEvt to MMcEvtBasic
      - increased class version number accordingly

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -2347 +2347 @@
         while ((key=Next()))
         {
+            MStatusArray *arr=0;
+            gFile->GetObject(key->GetName(), arr);
+            if (arr)
+            {
+                Display(*arr, tab);
+                n++;
+                continue;
+            }
+
+            if (tab && key->GetName()!=(TString)tab)
+                continue;
+
             TCanvas *c=0;
             gFile->GetObject(key->GetName(), c);
@@ -2367 +2379 @@
             }
 
-            // Add teh canvas to the list
+            // Add the canvas to the list
             c->SetTitle(gFile->GetName());
             list.Add(c);
@@ -3094 +3106 @@
     TFile *fsave = gFile;
     TFile file(name, "RECREATE", GetTitle(), 9);
-    const Int_t keys = Write(num, plain ? "plain" : "");
+    const Int_t keys = Write(num, "MStatusDisplay", plain ? "plain" : "");
     gFile = fsave;