Changeset 6932 for trunk/MagicSoft/Mars/mbase

Timestamp:

04/12/05 17:05:49 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MStatusArray.cc (modified) (3 diffs)
• MStatusArray.h (modified) (2 diffs)
• MStatusDisplay.cc (modified) (4 diffs)
• MStatusDisplay.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MStatusArray.cc

@@ -61 +61 @@
     delete d;
     return 0;
+}
+
+void MStatusArray::DisplayIn(MStatusDisplay &d, const char *tab) const
+{
+    d.Display(*this, tab);
 }
 
@@ -149 +154 @@
     {
         if (!c)
+        {
+            gLog << warn << "Canvas '" << canvas << "' not found..." << endl;
             return 0;
+        }
 
         TObject *o = FindObjectInPad(c, object, cls);
         if (!o)
+        {
+            gLog << warn << "Object '" << object << "' [" << base << "] not found in canvas '" << canvas << "'..." << endl;
             return 0;
+        }
 
-        return o->InheritsFrom(cls) ? o : 0;
+        return o; //o->InheritsFrom(cls) ? o : 0;
     }
 
@@ -169 +180 @@
     }
 
+    gLog << warn << "Object '" << object << "' [" << base << "] not found in canvas '" << canvas << "'..." << endl;
     return NULL;
 }

trunk/MagicSoft/Mars/mbase/MStatusArray.h

@@ -10 +10 @@
 class TVirtualPad;
 
+class MStatusDisplay;
+
 class MStatusArray : public TObjArray
 {
@@ -18 +20 @@
 public:
     TObject *DisplayIn(Option_t *o=0) const;         // *MENU*
+    void     DisplayIn(MStatusDisplay &d, const char *tab=0) const;
     TObject *Display() const { return DisplayIn(); } // *MENU*
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -1686 +1686 @@
 }
 
-Bool_t MStatusDisplay::Display(const TObjArray &list)
+Bool_t MStatusDisplay::Display(const TObjArray &list, const char *tab)
 {
     TIter Next(&list);
@@ -1702 +1702 @@
     while ((c=(TCanvas*)Next()))
         //if (!GetCanvas(c->GetName()))
+        if (!tab || c->GetName()==(TString)tab)
             DrawClonePad(AddTab(c->GetName()), *c);
 
@@ -1711 +1712 @@
 // Reads the contents of a saved MStatusDisplay from a file.
 //
-Int_t MStatusDisplay::Read(const char *name)
+Int_t MStatusDisplay::Read(const char *name, const char *tab)
 {
     if (!gFile)
@@ -1734 +1735 @@
     }
 
-    if (!Display(list))
+    if (!Display(list, tab))
     {
         *fLog << err << "MStatusDisplay::Display: No entry in " << name << "." << endl;

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -122 +122 @@
     void DrawClonePad(TCanvas &newc, TCanvas &oldc) const;
     void CanvasSetFillColor(TPad &c, Int_t col) const;
-    Bool_t Display(const TObjArray &list);
+    Bool_t Display(const TObjArray &list, const char *tab=0);
 
     void AddExtension(TString &name, const TString &ext, Int_t num) const;
@@ -167 +167 @@
      Int_t Write(Int_t num, const char *name="MStatusDisplay", Int_t option=0, Int_t bufsize=0) const;
 
-     Int_t Read(const char *name="MStatusDisplay");
+     Int_t Read(const char *name, const char *tab);
+     Int_t Read(const char *name="MStatusDisplay")
+     {
+         return Read(name, 0);
+     }
      Int_t Write(const char *name="MStatusDisplay", Int_t option=0, Int_t bufsize=0)
      {