Reverting previous commit and going back to rev.64119Subversion Repositories:

[u/mrichter/AliRoot.git] / MUON / AliMUONPainterMatrixFrame.cxx

diff --git a/MUON/AliMUONPainterMatrixFrame.cxx b/MUON/AliMUONPainterMatrixFrame.cxx
index feb6f1c32bd346ce17713209cf439cc057082876..69757a1cfad384187128e05821420008c28f6d6a 100644 (file)
--- a/MUON/AliMUONPainterMatrixFrame.cxx
+++ b/MUON/AliMUONPainterMatrixFrame.cxx
@@ -88,8 +88,8 @@ AliMUONPainterMatrixFrame::AliMUONPainterMatrixFrame(const TGWindow* window,
     
     fInterface = new TGHorizontalFrame(this,fCanvasWidth);
     
-    fMainFrame->AddFrame(fView, new TGLayoutHints(kLHintsLeft));
-    fMainFrame->AddFrame(fColorSlider,new TGLayoutHints(kLHintsTop|kLHintsRight|kLHintsExpandX|kLHintsCenterY,kBorderSize/2));
+    fMainFrame->AddFrame(fView, new TGLayoutHints(kLHintsExpandX));
+    fMainFrame->AddFrame(fColorSlider,new TGLayoutHints(kLHintsTop|kLHintsRight|kLHintsCenterY,kBorderSize/2));
 
     AliMUONPainterInterfaceHelper::SetBackgroundColor("MatrixFrame.ColorSlider",*fColorSlider);
     
@@ -178,7 +178,7 @@ AliMUONPainterMatrixFrame::ChangeTitle(AliMUONVPainter* painter,
     
     AliMUONPainterGroup* group = master->PlotterGroup();
 
-    AliDebug(1,Form("Painter is %s plotterGroup is %x %s",
+    AliDebug(1,Form("Painter is %s plotterGroup is %p %s",
                     painter->PathName().Data(),
                     group,
                     ( group ? group->Type() : "")));
@@ -398,7 +398,7 @@ AliMUONPainterMatrixFrame::MouseEnter(AliMUONVPainter* painter)
 {
   /// Emit a signal to notify that mouse pointer is entering a given painter
 
-  AliDebug(1,Form("painter=%x %s",painter,painter->PathName().Data()));
+  AliDebug(1,Form("painter=%p %s",painter,painter->PathName().Data()));
   
   ChangeTitle(painter);
 
@@ -410,7 +410,7 @@ AliMUONPainterMatrixFrame::MouseEnter(AliMUONVPainter* painter)
 
 //_____________________________________________________________________________
 void
-AliMUONPainterMatrixFrame::MouseLeave(AliMUONVPainter* painter)
+AliMUONPainterMatrixFrame::MouseLeave(const AliMUONVPainter* painter)
 {
   /// Emit a signal to notify that mouse pointer is leaving a given painter
   
@@ -476,7 +476,12 @@ void
 AliMUONPainterMatrixFrame::SaveAs(const char* filename, Option_t* option) const
 {
   /// Save painter matrix (in the sense of "print") in filename
-  fView->GetCanvas()->SaveAs(filename,option);
+  
+  TCanvas* d = fPainterMatrix->CreateCanvas();
+  
+  d->SaveAs(filename,option);
+  
+  delete d;
 }
 
 //_____________________________________________________________________________