Changeset 5620 for trunk/MagicSoft/Mars/mbase

Timestamp:

12/17/04 13:27:08 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MStatusDisplay.cc (modified) (2 diffs)
• MStatusDisplay.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -1588 +1588 @@
 // Draws a clone of a canvas into a new canvas. Taken from TCanvas.
 //
-void MStatusDisplay::DrawClonePad(TCanvas &newc, const TCanvas &oldc) const
+void MStatusDisplay::DrawClonePad(TCanvas &newc, TCanvas &oldc) const
 {
     //copy pad attributes
@@ -1605 +1605 @@
     ((TAttPad&)oldc).Copy((TAttPad&)newc);
 
+    // This must be there: Otherwise GetDrawOption() won't work
+    TVirtualPad *padsav = gPad;
+    oldc.cd();
+
     //copy primitives
     TObject *obj;
     TIter next(oldc.GetListOfPrimitives());
-    while ((obj=next())) {
-        gROOT->SetSelectedPad(&newc);
-        newc.GetListOfPrimitives()->Add(obj->Clone(),obj->GetDrawOption());
+    while ((obj=next()))
+    {
+        // Old line - I think it is not necessary anymore because of the cd()
+        //gROOT->SetSelectedPad(&newc);
+
+        // Now make a clone of the object
+        TObject *clone = obj->Clone();
+
+        // Clone also important bits (FIXME: Is this correct)
+        clone->SetBit(obj->TestBits(kMustCleanup|kCannotPick|kNoContextMenu));
+
+        // Now make sure that the clones are deleted at a later time
+        clone->SetBit(kCanDelete);
+
+        // Add the clone and its draw-option to the current pad
+        newc.GetListOfPrimitives()->Add(clone, obj->GetDrawOption());
     }
     newc.Modified();
     newc.Update();
+
+    padsav->cd();
 }
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -117 +117 @@
     void UpdateTab(TGCompositeFrame *f);
 
-    void DrawClonePad(TCanvas &newc, const TCanvas &oldc) const;
+    void DrawClonePad(TCanvas &newc, TCanvas &oldc) const;
     void CanvasSetFillColor(TPad &c, Int_t col) const;
     Bool_t Display(const TObjArray &list);