Changeset 9043 for trunk

Timestamp:

07/27/08 15:02:47 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MParEmulated.cc (modified) (5 diffs)
• mbase/MParEmulated.h (modified) (1 diff)
• mbase/MStatusDisplay.cc (modified) (2 diffs)
• merpp.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MParEmulated.cc

@@ -38 +38 @@
 #include "MParEmulated.h"
 
+#include <TClass.h>   // root >=5.20/00
 #include <TPRegexp.h>
 #include <TMethodCall.h>
 #include <TStreamerElement.h>
+#if ROOT_VERSION_CODE>ROOT_VERSION(5,12,00)
+#include <TVirtualStreamerInfo.h>
+#endif
 
 #include "MLog.h"
@@ -80 +84 @@
 // Get the class with name clsname and its corresponding streamer info
 //
+#if ROOT_VERSION_CODE<ROOT_VERSION(5,18,00)
 TStreamerInfo *MParEmulated::GetStreamerInfo(const TString &clsname) const
+#else
+TVirtualStreamerInfo *MParEmulated::GetStreamerInfo(const TString &clsname) const
+#endif
 {
     TClass *cls = gROOT->GetClass(clsname);
@@ -89 +97 @@
     }
 
+#if ROOT_VERSION_CODE<ROOT_VERSION(5,18,00)
     TStreamerInfo *info = cls->GetStreamerInfo();
+#else
+    TVirtualStreamerInfo *info = cls->GetStreamerInfo();
+#endif
     if (!info)
     {
@@ -118 +130 @@
 TMethodCall *MParEmulated::GetterMethod(const char *name, TString clsname, Int_t offset) const
 {
+#if ROOT_VERSION_CODE<ROOT_VERSION(5,18,00)
     TStreamerInfo *info = GetStreamerInfo(clsname);
+#else
+    TVirtualStreamerInfo *info = GetStreamerInfo(clsname);
+#endif
     if (!info)
         return 0;
@@ -160 +176 @@
 void MParEmulated::Print(TPRegexp &regex, TString clsname, TString prefix, Int_t offset) const
 {
+#if ROOT_VERSION_CODE<ROOT_VERSION(5,18,00)
     TStreamerInfo *info = GetStreamerInfo(clsname);
+#else
+    TVirtualStreamerInfo *info = GetStreamerInfo(clsname);
+#endif
     if (!info)
         return;

trunk/MagicSoft/Mars/mbase/MParEmulated.h

@@ -12 +12 @@
     TString fClassName;
 
-    TStreamerInfo *GetStreamerInfo(const TString &cls) const;
-    TMethodCall   *GetMethodCall(const char *get, Int_t offset) const;
+#ifndef __CINT__
+#if ROOT_VERSION_CODE<ROOT_VERSION(5,18,00)
+    TStreamerInfo *GetStreamerInfo(const TString &clsname) const;
+#else
+    TVirtualStreamerInfo *GetStreamerInfo(const TString &clsname) const;
+#endif
+#endif
+    TMethodCall *GetMethodCall(const char *get, Int_t offset) const;
 
 public:

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -2694 +2694 @@
         // deletion
         //
+
         //const Bool_t store = c->IsBatch();
         //c->SetBatch(kTRUE);
@@ -2700 +2701 @@
 
         //
-        // Use the canvas as coordinate system for the overlaying text
+        // Change/fix the canvas coordinate system for the overlaying text.
+        // This is necessary because root clip everything away which is
+        // outside a predefined area, which is (0,0)/(1,1)
         //
-        const Double_t height = 0.015;
-
-        const Double_t off = 0.005;
+        const Double_t height = 0.015;  // Text height
+        const Double_t off    = 0.005;  // Line offset from Text
+
         const Double_t bot = height+off;
         const Double_t top = 1-bot;
 
         static_cast<MyCanvas*>(c)->Scale(bot);
+
+        // If gPad is not set to c all follwing commands will
+        // get the wrong numbers for alignment
+        gPad = c;
 
         // Separator Lines

trunk/MagicSoft/Mars/merpp.cc

@@ -1 +1 @@
 #include <TObjectTable.h>
+#include <TClass.h>
 
 #include "MArgs.h"