merge dks to master

2016-08-25 08:40:40 +02:00
parent 8f20d2fd4c e32d0e912c
commit 6aea6473ab
43 changed files with 745 additions and 261 deletions
--- a/src/classes/PMusrCanvas.cpp
+++ b/src/classes/PMusrCanvas.cpp
@@ -1142,6 +1142,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();
  }