Merge branch 'master' into root6

2016-08-25 13:38:57 +02:00
parent 2471b76ec0 e32d0e912c
commit 333eaea7f1
27 changed files with 270 additions and 165 deletions
--- a/src/classes/PMusrCanvas.cpp
+++ b/src/classes/PMusrCanvas.cpp
@ -1140,6 +1140,13 @@ void PMusrCanvas::HandleCmdKey(Int_t event, Int_t x, Int_t y, TObject *selected)
      cout << "**INFO** averaging of a single data set doesn't make any sense, will ignore 'a' ..." << endl;
      return;
    }
+  } else if (x == 'c') {
+    Int_t state = fDataTheoryPad->GetCrosshair();
+    if (state == 0)
+      fDataTheoryPad->SetCrosshair(2);
+    else
+      fDataTheoryPad->SetCrosshair(0);
+    fMainCanvas->Update();
  } else {
    fMainCanvas->Update();
  }