Changeset 1481 for trunk/MagicSoft/Mars/mdata

Timestamp:

08/05/02 14:30:21 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mdata

Files:

• MDataChain.cc (modified) (1 diff)
• MDataChain.h (modified) (1 diff)
• MDataList.cc (modified) (1 diff)
• MDataList.h (modified) (2 diffs)
• MDataMember.cc (modified) (7 diffs)
• MDataMember.h (modified) (2 diffs)
• MDataValue.h (modified) (1 diff)

trunk/MagicSoft/Mars/mdata/MDataChain.cc

@@ -496 +496 @@
     switch (fOperatorType)
     {
-    case kEAbs:      str += "abs"   ; break;
-    case kELog:      str += "log"   ; break;
-    case kELog10:    str += "log10" ; break;
-    case kESin:      str += "sin"   ; break;
-    case kECos:      str += "cos"   ; break;
-    case kETan:      str += "tan"   ; break;
-    case kESinH:     str += "sinh"  ; break;
-    case kECosH:     str += "cosh"  ; break;
-    case kETanH:     str += "tanh"  ; break;
-    case kEASin:     str += "asin"  ; break;
-    case kEACos:     str += "acos"  ; break;
-    case kEATan:     str += "atan"  ; break;
-    case kESqrt:     str += "sqrt"  ; break;
-    case kEExp:      str += "exp"   ; break;
-    case kEPow10:    str += "pow10" ; break;
-    case kESgn:      str += "sgn"   ; break;
-    case kENegative: str += "-"     ; break;
-    case kEPositive: str += "+"     ; break;
+    case kEAbs:      str += "abs"  ; break;
+    case kELog:      str += "log"  ; break;
+    case kELog10:    str += "log10"; break;
+    case kESin:      str += "sin"  ; break;
+    case kECos:      str += "cos"  ; break;
+    case kETan:      str += "tan"  ; break;
+    case kESinH:     str += "sinh" ; break;
+    case kECosH:     str += "cosh" ; break;
+    case kETanH:     str += "tanh" ; break;
+    case kEASin:     str += "asin" ; break;
+    case kEACos:     str += "acos" ; break;
+    case kEATan:     str += "atan" ; break;
+    case kESqrt:     str += "sqrt" ; break;
+    case kEExp:      str += "exp"  ; break;
+    case kEPow10:    str += "pow10"; break;
+    case kESgn:      str += "sgn"  ; break;
+    case kENegative: str += "-"    ; break;
+    case kEPositive: str += "+"    ; break;
     case kENoop:
         break;

trunk/MagicSoft/Mars/mdata/MDataChain.h

@@ -67 +67 @@
     TString GetRule() const;
 
-    ClassDef(MDataChain, 0) // A chain/concatenation of MData objects
+    ClassDef(MDataChain, 1) // A chain/concatenation of MData objects
 };
 

trunk/MagicSoft/Mars/mdata/MDataList.cc

@@ -38 +38 @@
 // --------------------------------------------------------------------------
 //
+//   Default Constructor. Not for usage!
+//
+MDataList::MDataList()
+{
+    fSign = kENone;
+}
+
+// --------------------------------------------------------------------------
+//
 //   Constructor.
 //
-//   Specify the boolean operation which is used to evaluate the
-//   result of this list. If no operation is specified "land" is
-//   used.
+//   Specify the operation which is used to evaluate the
+//   result of this list.
 //
 //   Options:
-//      and, &   : is a bitwise and
-//      or, |    : is a bitwise or
-//      xor, ^   : is a bitwise exclusive or
-//      land, && : is a logical and
-//      lor, ||  : is a logical or
+//      *,  /,  -,  +
 //
 MDataList::MDataList(char type)

trunk/MagicSoft/Mars/mdata/MDataList.h

@@ -29 +29 @@
 
 public:
+    MDataList();
     MDataList(char type);
     MDataList(MDataList &ts);
@@ -49 +50 @@
     TString GetRule() const;
 
-    ClassDef(MDataList, 0) // A concatenation of MData objects by one operator
+    ClassDef(MDataList, 1) // A concatenation of MData objects by one operator
 };
 

trunk/MagicSoft/Mars/mdata/MDataMember.cc

@@ -36 +36 @@
 //
 /////////////////////////////////////////////////////////////////////////////
+#include "MDataMember.h"
 
-#include "MDataMember.h"
+#include <fstream.h>
 
 #include <TMethodCall.h>
@@ -59 +60 @@
     fObject = obj;
     fCall   = call;
+
+    fDataMember = (TString)obj->GetName() + "." + call->GetName();
 }
 
@@ -72 +75 @@
     fObject = obj;
     fCall   = obj->GetterMethod(call);
+
+    fDataMember = (TString)obj->GetName() + "." + call;
 }
 
@@ -82 +87 @@
     if (!fCall)
     {
-        *fLog << err << "No TMethodCall for " << fName << " of ";
+        *fLog << err << "No TMethodCall for " << fDataMember << " of ";
         *fLog << fObject->GetName() << " available... returning 0." << endl;
         return 0;
@@ -100 +105 @@
 
     default:
-        *fLog << err << "DataMember " << fName << " of ";
+        *fLog << err << "DataMember " << fDataMember << " of ";
         *fLog << fObject->GetName() << " neither int nor float... returning 0." << endl;
         return 0;
@@ -120 +125 @@
         return kTRUE;
 
-    TString cname(fName);
-    TString mname(fName);
+    TString cname(fDataMember);
+    TString mname(fDataMember);
 
     const char *dot = strrchr(cname, '.');
@@ -167 +172 @@
 TString MDataMember::GetRule() const
 {
-    return fName;
+    return fDataMember;
 }

trunk/MagicSoft/Mars/mdata/MDataMember.h

@@ -15 +15 @@
 {
 private:
+    TString fDataMember;
+
     MParContainer *fObject;
     TMethodCall   *fCall;
 
 public:
-    MDataMember(const char *member) : fObject(NULL), fCall(NULL)
+    MDataMember(const char *member=NULL) : fObject(NULL), fCall(NULL)
     {
-        fName = member;
+        fDataMember = member;
     }
+
     MDataMember(MParContainer *obj, TMethodCall *call);
     MDataMember(MParContainer *obj, const TString call);
@@ -35 +38 @@
     TString GetRule() const;
 
-    ClassDef(MDataMember, 0) // MData object corresponding to a single data member of a Mars container
+    ClassDef(MDataMember, 1) // MData object corresponding to a single data member of a Mars container
 };
 

trunk/MagicSoft/Mars/mdata/MDataValue.h

@@ -31 +31 @@
     TString GetRule() const;
 
-    ClassDef(MDataValue, 0) // MData object corresponding to a single value
+    ClassDef(MDataValue, 1) // MData object corresponding to a single value
 };