Changeset 8892 for trunk/MagicSoft/Mars/mdata

Timestamp:

05/19/08 15:04:36 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mdata

Files:

• MDataMember.cc (modified) (2 diffs)
• MDataMember.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mdata/MDataMember.cc

@@ -93 +93 @@
 // --------------------------------------------------------------------------
 //
+// Check if accessing fCall is safe
+//
+Bool_t MDataMember::CheckGet() const
+{
+    if (!fObject)
+    {
+        *fLog << err << "ERROR - MDataMember::Get: fObject not initialized ";
+        *fLog << "(not PreProcessed)... returning 0." << endl;
+        return kFALSE;
+    }
+
+    if (!fCall)
+    {
+        *fLog << err << "ERROR - MDataMemberGet: No TMethodCall for " << fDataMember << " of ";
+        *fLog << fObject->GetName() << " available... returning 0." << endl;
+        return kFALSE;
+    }
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
 // Returns the value you requested
 //
 Double_t MDataMember::GetValue() const
 {
-    if (!fObject)
-    {
-        *fLog << err << "ERROR - MDataMember::GetValue: fObject not initialized ";
-        *fLog << "(not PreProcessed)... returning 0." << endl;
+    if (!CheckGet())
         return 0;
-    }
-
-    if (!fCall)
-    {
-        *fLog << err << "No TMethodCall for " << fDataMember << " of ";
-        *fLog << fObject->GetName() << " available... returning 0." << endl;
-        return 0;
-    }
 
     switch (fCall->ReturnType())
@@ -127 +139 @@
         *fLog << fObject->GetName() << " neither int nor float... returning 0." << endl;
         return 0;
+    }
+}
+
+// --------------------------------------------------------------------------
+//
+// Returns the string you requested
+//
+const char *MDataMember::GetString() const
+{
+    if (!CheckGet())
+        return NULL;
+
+    switch (fCall->ReturnType())
+    {
+    case TMethodCall::kString:
+        {
+            char *c=NULL;
+            fCall->Execute(fObject, &c);
+            return c;
+        }
+
+    default:
+        *fLog << err << "DataMember " << fDataMember << " of ";
+        *fLog << fObject->GetName() << " not a char*... returning NULL." << endl;
+        return NULL;
     }
 }

trunk/MagicSoft/Mars/mdata/MDataMember.h

@@ -22 +22 @@
     enum { kIsInt = BIT(14) };
 
+    Bool_t CheckGet() const;
+
 public:
     MDataMember(const char *member=NULL) : fObject(NULL), fCall(NULL)
@@ -32 +34 @@
 
     Double_t GetValue() const;
+    const char *GetString() const;
     Bool_t PreProcess(const MParList *plist);