Changeset 8899 for trunk

Timestamp:

05/25/08 11:42:34 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MClone.cc (modified) (2 diffs)
• MClone.h (modified) (3 diffs)
• MStatusDisplay.cc (modified) (6 diffs)
• MStatusDisplay.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mbase/MClone.cc

@@ -66 +66 @@
 // constructors.
 //
-void MClone::Init(const char *name, const char *title)
+void MClone::Init(const char *name, const char *title) : fForceClone(kFALSE)
 {
     fName  = name  ? name  : "MClone";
@@ -160 +160 @@
 Int_t MClone::Process()
 {
-    //
-    // Delete an existing clone
-    //
+    if (fClone && !fForceClone)
+    {
+        fObject->Copy(*fClone);
+        return kTRUE;
+    }
+
     Clear();
 
-    //
-    // Clone the given parameter container
-    //
     fClone = fObject->Clone();
+    return kTRUE;
+}
 
-    return kTRUE;
-} 
-

trunk/MagicSoft/Mars/mbase/MClone.h

@@ -1 +1 @@
 #ifndef MARS_MClone
 #define MARS_MClone
-
-#ifndef MARS_MAGIC
-#include "MAGIC.h"
-#endif
 
 #ifndef MARS_MTask
@@ -20 +16 @@
     TObject* fClone;        // pointer to the cloned object. deletion is handled by MClone
 
+    Bool_t fForceClone;
+
+    // MClone
     void Init(const char *name, const char *title);
+
+    // MTask
+    Int_t PreProcess(MParList *pList);
+    Int_t Process();
 
 public:
@@ -27 +30 @@
     ~MClone();
 
-    Int_t PreProcess(MParList *pList);
-    Int_t Process();
+    // TObject
+    void Clear(Option_t *opt=NULL);
 
+    // MClone
     TObject *GetClone() const  { return fClone; }
     const TObject *GetObject() const { return fObject; }
 
-    void Clear(Option_t *opt=NULL);
+    void SetForceClone(Bool_t b=kTRUE) { fForceClone = b; }
 
     ClassDef(MClone, 0) // Task to clone (duplicate) an object in memory

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -825 +825 @@
 // to the corresponding TCanvas. If it isn't found NULL is returned.
 //
-TRootEmbeddedCanvas *MStatusDisplay::GetEmbeddedCanvas(TGCompositeFrame *cf) const
-{
-    TIter Next(cf->GetList());
+TRootEmbeddedCanvas *MStatusDisplay::GetEmbeddedCanvas(TGCompositeFrame &cf)
+{
+    TIter Next(cf.GetList());
 
     TGFrameElement *f;
@@ -843 +843 @@
 // to the corresponding TCanvas. If it isn't found NULL is returned.
 //
-TCanvas *MStatusDisplay::GetCanvas(TGCompositeFrame *cf) const
+TCanvas *MStatusDisplay::GetCanvas(TGCompositeFrame &cf)
 {
     TRootEmbeddedCanvas *ec = GetEmbeddedCanvas(cf);
@@ -877 +877 @@
     }
 
-    return GetCanvas(fTab->GetTabContainer(i));
+    return GetCanvas(*fTab->GetTabContainer(i));
 }
 
@@ -938 +938 @@
         TObject *frame = f->fFrame;
         if (frame->InheritsFrom(TGCompositeFrame::Class()))
-            return GetCanvas((TGCompositeFrame*)frame);
+            return GetCanvas(*(TGCompositeFrame*)frame);
     }
 
@@ -1113 +1113 @@
         return;
 
-    TCanvas *c=GetCanvas(f);
+    TCanvas *c=GetCanvas(*f);
     if (!c)
         return;
@@ -1315 +1315 @@
         return;
 
-    TRootEmbeddedCanvas *ec = GetEmbeddedCanvas(f);
+    TRootEmbeddedCanvas *ec = GetEmbeddedCanvas(*f);
     if (!ec)
         return;

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -118 +118 @@
     void AddLogTab();
 
-    TCanvas *GetCanvas(TGCompositeFrame *f) const;
-
     Bool_t ProcessMessageCommandMenu(Long_t mp1);
     Bool_t ProcessMessageCommand(Long_t submsg, Long_t mp1, Long_t mp2);
@@ -146 +144 @@
     void RemoveTab(int i);
     void SetStatusLine(const char *txt, Int_t idx);
-
-    TRootEmbeddedCanvas *GetEmbeddedCanvas(TGCompositeFrame *cf) const;
 
     Bool_t SaveAsImage(Int_t num, TString name, TImage::EImageFileTypes type);
@@ -274 +270 @@
      void EventInfo(Int_t event, Int_t px, Int_t py, TObject *selected);
 
+     // Public helper functions
+     static TRootEmbeddedCanvas *GetEmbeddedCanvas(TGCompositeFrame &cf);
+     static TCanvas *GetCanvas(TGCompositeFrame &f);
+
      ClassDef(MStatusDisplay, 0)   // Window for a status display
 };