X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONPainterMatrixFrame.cxx;h=69757a1cfad384187128e05821420008c28f6d6a;hb=9224fec22bc299775964d827bebbf17a3fea73bd;hp=25147a8016e5a3db8284efba8245789e80d46bcf;hpb=0145e89abcfc92979b59eb1e7514739f1f945d05;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONPainterMatrixFrame.cxx b/MUON/AliMUONPainterMatrixFrame.cxx
index 25147a8016e..69757a1cfad 100644
--- a/MUON/AliMUONPainterMatrixFrame.cxx
+++ b/MUON/AliMUONPainterMatrixFrame.cxx
@@ -82,14 +82,14 @@ AliMUONPainterMatrixFrame::AliMUONPainterMatrixFrame(const TGWindow* window,
     
     const Int_t kColorWidth = 100;
     
-    fColorSlider = new AliMUONPainterColorSlider(fMainFrame,kColorWidth,hi);
+    fColorSlider = new AliMUONPainterColorSlider(fMainFrame,kColorWidth,fCanvasHeight);
     
     fView = new TRootEmbeddedCanvas("ec",fMainFrame,fCanvasWidth-kColorWidth,fCanvasHeight,kChildFrame);
     
     fInterface = new TGHorizontalFrame(this,fCanvasWidth);
     
-    fMainFrame->AddFrame(fView, new TGLayoutHints(kLHintsLeft));
-    fMainFrame->AddFrame(fColorSlider,new TGLayoutHints(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() : "")));
@@ -283,7 +283,10 @@ AliMUONPainterMatrixFrame::DataRangeWasChanged(Double_t* range)
 
   fPainterMatrix->SetDataRange(range[0],range[1]);
   
-  Update();
+  if ( !fColorSlider->IsLocked() )
+  {
+    Update();
+  }
 }
 
 //_____________________________________________________________________________
@@ -325,8 +328,7 @@ AliMUONPainterMatrixFrame::EventInfo(Int_t event, Int_t px ,Int_t py, TObject* o
   
 //  cout << "EventInfo : event " << event << " px " << px << " py " << py
 //    << " object " << object << " " << object->GetName() << endl;
-//  
-//  
+// 
   if ( event == 7 ) 
   {
     if ( object->InheritsFrom("AliMUONVPainter") )
@@ -396,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);
 
@@ -408,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
   
@@ -469,6 +471,19 @@ AliMUONPainterMatrixFrame::OutlineButtonWasClicked(Int_t id)
   UpdateInterface(kFALSE);
 }
 
+//_____________________________________________________________________________
+void 
+AliMUONPainterMatrixFrame::SaveAs(const char* filename, Option_t* option) const
+{
+  /// Save painter matrix (in the sense of "print") in filename
+  
+  TCanvas* d = fPainterMatrix->CreateCanvas();
+  
+  d->SaveAs(filename,option);
+  
+  delete d;
+}
+
 //_____________________________________________________________________________
 void
 AliMUONPainterMatrixFrame::TitleHasChanged(const char* title)
@@ -516,6 +531,12 @@ void
 AliMUONPainterMatrixFrame::UpdateDataRange()
 {
   /// Update the data range
+
+  if ( fColorSlider->IsLocked() ) 
+  {
+    fColorSlider->SetRange(0,0,kTRUE);
+    return;
+  }
   
   Double_t min, max;