Changeset 0a67548 in git for display

Timestamp:

Nov 6, 2014, 10:58:31 AM (10 years ago)

Author:

Christophe Delaere <christophe.delaere@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

53b78e8

Parents:

6301e02

Message:

Use signal/slot to communicate with GUI elements

This removes the need to keep pointers to widgets in the class itself.
Next: do something similar to communicate the progress of the summary
plot initialization.

Location:

display

Files:

• DelphesEventDisplay.cc (modified) (3 diffs)
• DelphesEventDisplay.h (modified) (6 diffs)

display/DelphesEventDisplay.cc

@@ -73 +73 @@
    delete chain_;
 }
+
+void DelphesEventDisplay::EventChanged(Int_t e)
+{
+  if( e!= event_id_ ) {
+    event_id_ = e;
+    Emit("EventChanged(Int_t)",e);
+    load_event();
+  }
+}
+
 
 DelphesEventDisplay::DelphesEventDisplay(const char *configFile, const char *inputFile, Delphes3DGeometry& det3D)
@@ -370 +380 @@
         b->Connect("Clicked()", "DelphesEventDisplay", this, "Bck()");
 
-        numberEntry_ = new TGNumberEntry(hf,0,9,-1,TGNumberFormat::kNESInteger, TGNumberFormat::kNEANonNegative, TGNumberFormat::kNELLimitMinMax, 0, treeReader_->GetEntries());
-        hf->AddFrame(numberEntry_, new TGLayoutHints(kLHintsCenterX | kLHintsCenterY , 2, 0, 10, 10));
-        numberEntry_->Connect("ValueSet(Long_t)", "DelphesEventDisplay", this, "GoTo(Long_t)");
+        TGNumberEntry* numberEntry = new TGNumberEntry(hf,0,9,-1,TGNumberFormat::kNESInteger, TGNumberFormat::kNEANonNegative, TGNumberFormat::kNELLimitMinMax, 0, treeReader_->GetEntries());
+        hf->AddFrame(numberEntry, new TGLayoutHints(kLHintsCenterX | kLHintsCenterY , 2, 0, 10, 10));
+        this->Connect("EventChanged(Int_t)","TGNumberEntry",numberEntry,"SetIntNumber(Long_t)");
+        numberEntry->GetNumberEntry()->Connect("TextChanged(char*)", "DelphesEventDisplay", this, "PreSetEv(char*)");
+        numberEntry->GetNumberEntry()->Connect("ReturnPressed()", "DelphesEventDisplay", this, "GoTo()");
         
         b = new TGPictureButton(hf, gClient->GetPicture(icondir+"GoForward.gif"));
@@ -381 +393 @@
      vf->AddFrame(hf, new TGLayoutHints(kLHintsExpandX , 2, 2, 2, 2));
 
-     progress_ = new TGHProgressBar(frmMain, TGProgressBar::kFancy, 100);
-     progress_->SetMax( treeReader_->GetEntries());
-     progress_->ShowPosition(kTRUE, kFALSE, "Event %.0f");
-     progress_->SetBarColor("green");
-     vf->AddFrame(progress_, new TGLayoutHints(kLHintsExpandX, 10, 10, 5, 5));
+     TGHProgressBar* progress = new TGHProgressBar(frmMain, TGProgressBar::kFancy, 100);
+     progress->SetMax( treeReader_->GetEntries());
+     progress->ShowPosition(kTRUE, kFALSE, "Event %.0f");
+     progress->SetBarColor("green");
+     vf->AddFrame(progress, new TGLayoutHints(kLHintsExpandX, 10, 10, 5, 5));
+     this->Connect("EventChanged(Int_t)","TGHProgressBar",progress,"SetPosition(Float_t)");
    }
    frmMain->AddFrame(vf, new TGLayoutHints(kLHintsExpandX , 5, 5, 5, 5));

display/DelphesEventDisplay.h

@@ -34 +34 @@
 #include "TGNumberEntry.h"
 #include "TGProgressBar.h"
+#include <RQ_OBJECT.h>
 
 
@@ -46 +47 @@
 class DelphesEventDisplay
 {
+    RQ_OBJECT("DelphesEventDisplay")
   public:
     DelphesEventDisplay();
     DelphesEventDisplay(const char *configFile, const char *inputFile, Delphes3DGeometry& det3D);
     ~DelphesEventDisplay();
+    void EventChanged(Int_t); // *SIGNAL*
 
   private:
@@ -59 +62 @@
     // Configuration and global variables.
     Int_t event_id_;
+    Int_t event_id_tmp_;
     ExRootTreeReader *treeReader_;
     Double_t tkRadius_, totRadius_, tkHalfLength_, muHalfLength_, bz_;
@@ -69 +73 @@
     DelphesPlotSummary *plotSummary_;
     TGStatusBar* fStatusBar_;
-    TGNumberEntry* numberEntry_; // event_id
-    TGHProgressBar* progress_; // event_id
     
-
     // gui controls
   public:
      void Fwd() {  
         if (event_id_ < treeReader_->GetEntries() - 2) {
-           ++event_id_;
-           numberEntry_->SetIntNumber(event_id_);
-           progress_->SetPosition(event_id_);
-           load_event();
+           EventChanged(event_id_+1);
         } else {
            printf("Already at last event.\n");
@@ -88 +86 @@
      void Bck() {
         if (event_id_ > 0) {
-           --event_id_;
-           numberEntry_->SetIntNumber(event_id_);
-           progress_->SetPosition(event_id_);
-           load_event();
+           EventChanged(event_id_-1);
         } else {
            printf("Already at first event.\n");
@@ -97 +92 @@
      }
 
-    void GoTo(Long_t ev) {
-      Int_t event = Int_t(numberEntry_->GetNumber());
-      if (event < treeReader_->GetEntries()-1) {
-        event_id_ = event;
-        progress_->SetPosition(event_id_);  //TODO we could provide a signal related to event_id changes
-        load_event();
+    void PreSetEv(char* ev) {
+      event_id_tmp_ = Int_t(atoi(ev));
+    }
+
+    void GoTo() {
+      if (event_id_tmp_>=0 && event_id_tmp_ < treeReader_->GetEntries()-1) {
+        EventChanged(event_id_tmp_);
       } else {
         printf("Error: no such event.\n");