Changeset 3504 for trunk

Timestamp:

03/15/04 16:15:51 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/BaseLinkDef.h (modified) (1 diff)
• mbase/MStatusArray.cc (added)
• mbase/MStatusArray.h (added)
• mbase/MStatusDisplay.cc (modified) (6 diffs)
• mbase/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -73 +73 @@
    * mmain/MCameraDisplay.cc, mmain/MEventDisplay.[h,cc]:
      - added preliminary mode to display F1/F2/F3-files
+
+   * mbase/MStatusArray.[h,cc]:
+     - added
+
+   * mbase/Makefile, mbase/BaseLinkDef.h:
+     - added MStatusArray
+
+   * mbase/MStatusDisplay.cc:
+     - read and store MStatusArray to and from files
 
 

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -39 +39 @@
 
 // Mars core (GUI part)
+#pragma link C++ class MStatusArray+;
 #pragma link C++ class MStatusDisplay+;
 #pragma link C++ class MProgressBar+;

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -98 +98 @@
 #include "MSearch.h"              // MSearch
 #include "MParContainer.h"        // MParContainer::GetDescriptor
+#include "MStatusArray.h"         // MStatusArray
 
 #undef DEBUG
@@ -169 +170 @@
 #define MGTextView TGTextView
 #endif
+
 // --------------------------------------------------------------------------
 
@@ -1540 +1542 @@
 }
 
-// --------------------------------------------------------------------------
-//
-// Reads the contents of a saved MStatusDisplay from a file.
-//
-Int_t MStatusDisplay::Read(const char *name)
-{
-    if (!gFile)
-    {
-        *fLog << warn << "MStatusDisplay::Read: No file found. Please create a TFile first." << endl;
-        return 0;
-    }
-
-    if (!gFile->IsOpen())
-    {
-        *fLog << warn << "MStatusDisplay::Read: File not open. Please open the TFile first." << endl;
-        return 0;
-    }
-
-    TObjArray list;
-
-    const Int_t n = list.Read(name);
-    if (n==0)
-    {
-        *fLog << warn << "MStatusDisplay::Read: No objects read." << endl;
-        return 0;
-    }
-
+Bool_t MStatusDisplay::Display(const TObjArray &list)
+{
     TIter Next(&list);
 
@@ -1572 +1549 @@
     if (!o)
     {
-        *fLog << err << "MStatusDisplay: First entry missing in " << name << "." << endl;
-        return 0;
+        *fLog << err << "MStatusDisplay::Display: No entry in TObjArray." << endl;
+        return kFALSE;
     }
 
@@ -1583 +1560 @@
             DrawClonePad(AddTab(c->GetName()), *c);
 
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Reads the contents of a saved MStatusDisplay from a file.
+//
+Int_t MStatusDisplay::Read(const char *name)
+{
+    if (!gFile)
+    {
+        *fLog << warn << "MStatusDisplay::Read: No file found. Please create a TFile first." << endl;
+        return 0;
+    }
+
+    if (!gFile->IsOpen())
+    {
+        *fLog << warn << "MStatusDisplay::Read: File not open. Please open the TFile first." << endl;
+        return 0;
+    }
+
+    TObjArray list;
+
+    const Int_t n = list.Read(name);
+    if (n==0)
+    {
+        *fLog << warn << "MStatusDisplay::Read: No objects read." << endl;
+        return 0;
+    }
+
+    if (!Display(list))
+    {
+        *fLog << err << "MStatusDisplay::Display: No entry in " << name << "." << endl;
+        return 0;
+    }
+
     *fLog << inf << "MStatusDisplay: Key " << name << " with " << n << " keys read from file." << endl;
 
@@ -1629 +1642 @@
     }
 
-    TObjArray list;
+    MStatusArray list;
 
     TNamed named;

trunk/MagicSoft/Mars/mbase/Makefile

@@ -59 +59 @@
            MGList.cc \
            MGTask.cc \
+           MStatusArray.cc \
            MStatusDisplay.cc \
            MArray.cc \