Changeset 1218 for trunk/MagicSoft/Mars/mbase

Timestamp:

02/21/02 12:08:03 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MFilterList.cc (modified) (1 diff)
• MGList.cc (modified) (1 diff)
• MParContainer.cc (modified) (3 diffs)
• MParContainer.h (modified) (2 diffs)
• MWriteAsciiFile.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/mbase/MFilterList.cc

@@ -143 +143 @@
     const char *name = filter->GetName();
 
-    // FIXME: We agreed to put the task into list in an ordered way.
-
     if (fFilters.FindObject(filter))
     {

trunk/MagicSoft/Mars/mbase/MGList.cc

@@ -98 +98 @@
     //      Is this another bug in root?
     //
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,02,07)
     if (!obj->IsA()->InheritsFrom(TGWidget::Class()))
         return NULL;
+#endif
 
     return (TGWidget*)obj->IsA()->DynamicCast(TGWidget::Class(), obj);

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -214 +214 @@
 // --------------------------------------------------------------------------
 //
+//  Write out a data member given as a TDataMember object to an output stream.
+//
+Bool_t MParContainer::WriteDataMember(ostream &out, TDataMember *member) const
+{
+    if (!member)
+        return kFALSE;
+
+    if (!member->IsPersistent())
+        return kFALSE;
+
+    /*const*/ TMethodCall *call = member->GetterMethod(); //FIXME: Root
+    if (!call)
+        return kFALSE;
+
+    switch (call->ReturnType())
+    {
+    case TMethodCall::kLong:
+        Long_t l;
+        call->Execute((void*)this, l); // FIXME: const, root
+        out << l << " ";
+        return kTRUE;
+
+    case TMethodCall::kDouble:
+        Double_t d;
+        call->Execute((void*)this, d); // FIXME: const, root
+        out << d << " ";
+        return kTRUE;
+
+    case TMethodCall::kOther:
+        /* someone may want to enhance this? */
+        return kFALSE;
+    }
+
+    return kFALSE;
+}
+
+// --------------------------------------------------------------------------
+//
+//  Write out a data member given by name to an output stream.
+//
+Bool_t MParContainer::WriteDataMember(ostream &out, const char *member) const
+{
+    return WriteDataMember(out, IsA()->GetDataMember(member));
+}
+
+// --------------------------------------------------------------------------
+//
 //  If you want to use Ascii-Input/-Output (eg. MWriteAsciiFile) of a
 //  container, you may overload this function. If you don't overload it
@@ -221 +268 @@
 //  floating point (Float_t, Double_t, ...) type are written.
 //
-void MParContainer::AsciiWrite(ofstream &fout) const
+void MParContainer::AsciiWrite(ostream &out) const
 {
     // *fLog << warn << "To use the the ascii output of " << GetName();
@@ -230 +277 @@
     TIter Next(IsA()->GetListOfDataMembers());
     while ((data=(TDataMember*)Next()))
-    {
-        if (!data->IsPersistent())
-            continue;
-
-        /*const*/ TMethodCall *call = data->GetterMethod(); //FIXME: Root
-        if (!call)
-            continue;
-
-        switch (call->ReturnType())
-        {
-        case TMethodCall::kLong:
-            Long_t l;
-            call->Execute((void*)this, l); // FIXME: const, root
-            fout << l << " ";
-            continue;
-
-        case TMethodCall::kDouble:
-            Double_t d;
-            call->Execute((void*)this, d); // FIXME: const, root
-            fout << d << " ";
-            continue;
-
-        case TMethodCall::kOther:
-            /* someone may want to enhance this? */
-            continue;
-        }
-    }
-}
+        WriteDataMember(out, data);
+}

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -22 +22 @@
 class ofstream;
 class ifstream;
+
+class TDataMember;
 
 class MParContainer : public TObject
@@ -64 +66 @@
     virtual void   SetReadyToSave(Bool_t flag=kTRUE) { fReadyToSave=flag; }
 
+    Bool_t WriteDataMember(ostream &out, const char *member) const;
+    Bool_t WriteDataMember(ostream &out, TDataMember *member) const;
+
     virtual void AsciiRead(ifstream &fin);
-    virtual void AsciiWrite(ofstream &fout) const;
+    virtual void AsciiWrite(ostream &out) const;
 
     ClassDef(MParContainer, 0)  //The basis for all parameter containers

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.cc

@@ -44 +44 @@
 #include <fstream.h>
 
+#include <TClass.h>      // IsA
+#include <TMethodCall.h> // TMethodCall, AsciiWrite
+#include <TDataMember.h> // TDataMember, AsciiWrite
+
 #include "MLog.h"
 #include "MLogManip.h"
@@ -81 +85 @@
     Init(filename, name, title);
 
-    AddContainer(contname);
+    if (contname)
+        AddContainer(contname);
 }
 
@@ -100 +105 @@
     Init(filename, name, title);
 
-    AddContainer(cont);
+    if (cont)
+        AddContainer(cont);
 }
 
@@ -111 +117 @@
 {
     fContNames.SetOwner();
+    fMembers.SetOwner();
 
     delete fOut;
@@ -130 +137 @@
     Int_t num = fContainer.GetEntries();
 
-    TIter Next(&fContainer);
-
-    while ((cont=(MParContainer*)Next()))
+    TIter NextCont(&fContainer);
+    TIter NextMemb(&fMembers);
+
+    while ((cont=(MParContainer*)NextCont()))
     {
+        const TObject *memb = NextMemb();
+
         if (!cont->IsReadyToSave())
             continue;
 
-        cont->AsciiWrite(*fOut);
+        if (memb->GetName()[0]=='\0')
+            cont->AsciiWrite(*fOut);
+        else
+        {
+            if (!cont->WriteDataMember(*fOut, memb->GetName()))
+                continue;
+        }
+
         *fOut << " ";
         written = kTRUE;
@@ -183 +200 @@
         }
 
-        AddContainer(cont);
+        AddContainer(cont, obj->GetTitle());
     }
 
@@ -193 +210 @@
 // Add another container (by name) to be written to the ascii file.
 // The container will be output one after each other in one line.
-//
-void MWriteAsciiFile::AddContainer(const char *cname)
-{
-    TNamed *named = new TNamed(cname, "");
+// If you want to write only one data member of the container
+// specify the name of the data member (eg. fAlpha) Make sure,
+// that a "GetteMethod" for this data type exists (strif the f and
+// replace it by Get)
+//
+void MWriteAsciiFile::AddContainer(const char *cname, const char *member)
+{
+    TNamed *named = new TNamed(cname, member);
     fContNames.AddLast(named);
 }
@@ -204 +225 @@
 // Add another container (by pointer) to be written to the ascii file.
 // The container will be output one after each other in one line.
-//
-void MWriteAsciiFile::AddContainer(MParContainer *cont)
+// If you want to write only one data member of the container
+// specify the name of the data member (eg. fAlpha) Make sure,
+// that a "GetteMethod" for this data type exists (strif the f and
+// replace it by Get)
+//
+void MWriteAsciiFile::AddContainer(MParContainer *cont, const char *member)
 {
     fContainer.AddLast(cont);
-}
-
+
+    TNamed *named = new TNamed(member, "");
+    fMembers.AddLast(named);
+}
+