Added parameter 'Width_t fWidth' to TrackRnrStyle and a method to change width of...

diff --git a/EVE/Reve/Track.cxx b/EVE/Reve/Track.cxx
index 7bd7235fe5c92499804ee977d4f3b65899be85a0..d43d1964c1cd027dc37304351bc53f6acfcd7986 100644 (file)
--- a/EVE/Reve/Track.cxx
+++ b/EVE/Reve/Track.cxx
@@ -260,6 +260,7 @@ TrackRnrStyle::TrackRnrStyle() :
   TObject(),
 
   fColor(1),
+  fWidth(1),
   fMagField(fgDefMagField),
 
   fMaxR  (350),
@@ -395,6 +396,17 @@ void TrackList::MakeMarkers()
 /**************************************************************************/
 /*************************************************************************/
 
+void TrackList::SetWidth(Width_t w)
+{
+  Width_t oldw = fRnrStyle->fWidth;
+  fRnrStyle->fWidth = w;
+  for (lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+    Track& t = *((Track*)(*i));
+    if (t.GetLineWidth() == oldw)
+      t.SetLineWidth(w);
+  }
+}
+
 void TrackList::SetMaxR(Float_t x)
 {
   fRnrStyle->fMaxR = x;

diff --git a/EVE/Reve/Track.h b/EVE/Reve/Track.h
index c835ef9121996b6c301f5280aa573ab665738acb..b6d6d00e570842bd24f6615bf320be57697d6840 100644 (file)
--- a/EVE/Reve/Track.h
+++ b/EVE/Reve/Track.h
@@ -92,6 +92,7 @@ class TrackRnrStyle : public TObject
 {
 public:
   Color_t                  fColor;
+  Width_t                  fWidth;
   Float_t                  fMagField;  
   // track limits
   Float_t                  fMaxR;       
@@ -168,6 +169,9 @@ public:
   void   MakeTracks();
   void   MakeMarkers();
 
+  Width_t GetWidth() const { return fRnrStyle->fWidth; }
+  void SetWidth(Width_t w);
+
   Float_t GetMaxR()         const { return fRnrStyle->fMaxZ; }
   Float_t GetMaxZ()         const { return fRnrStyle->fMaxR; }
   Float_t GetMaxOrbs()      const { return fRnrStyle->fMaxOrbs; }

diff --git a/EVE/Reve/TrackEditors.cxx b/EVE/Reve/TrackEditors.cxx
index 2bab8e469a3ae0299bf3621def9cf16ed8529433..c63e42044e877d70f107facf62b1e265e4770c4e 100644 (file)
--- a/EVE/Reve/TrackEditors.cxx
+++ b/EVE/Reve/TrackEditors.cxx
@@ -13,6 +13,7 @@
 #include <TGNumberEntry.h>
 #include <TGColorSelect.h>
 #include <TGDoubleSlider.h>
+#include "TGComboBox.h"
 
 using namespace Reve;
 
@@ -119,14 +120,23 @@ TrackListEditor::TrackListEditor(const TGWindow *p,
 
   // --- Rendering control
 
-  fRnrTracks = new TGCheckButton(this, "Render tracks");
-  AddFrame(fRnrTracks, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0));
-  fRnrTracks->Connect
-    ("Toggled(Bool_t)",
-     "Reve::TrackListEditor", this, "DoRnrTracks()");
+  {
+    TGHorizontalFrame* f = new TGHorizontalFrame(this);
+    fRnrTracks = new TGCheckButton(f, "Render tracks");
+    f->AddFrame(fRnrTracks, new TGLayoutHints(kLHintsLeft, 3, 1, 2, 0));
+    fRnrTracks->Connect
+      ("Toggled(Bool_t)", "Reve::TrackListEditor", this, "DoRnrTracks()");
+    fWidthCombo = new TGLineWidthComboBox(f);
+    fWidthCombo->Resize(80, 18);
+    f->AddFrame(fWidthCombo, new TGLayoutHints(kLHintsLeft, 8, 1, 0, 0));
+
+    fWidthCombo->Connect
+      ("Selected(Int_t)", "Reve::TrackListEditor", this, "DoLineWidth(Int_t)"); 
+    AddFrame(f, new TGLayoutHints(kLHintsTop, 1, 1, 3, 0));
+  }
 
   fRnrMarkers = new TGCheckButton(this, "Render markers");
-  AddFrame(fRnrMarkers, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0));
+  AddFrame(fRnrMarkers, new TGLayoutHints(kLHintsTop, 3, 1, 2, 0));
   fRnrMarkers->Connect
     ("Toggled(Bool_t)",
      "Reve::TrackListEditor", this, "DoRnrMarkers()");  
@@ -134,11 +144,11 @@ TrackListEditor::TrackListEditor(const TGWindow *p,
   // --- Kinematics fitting
 
   fFitDaughters = new TGCheckButton(this, "Fit daughters");
-  AddFrame(fFitDaughters, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0));
+  AddFrame(fFitDaughters, new TGLayoutHints(kLHintsTop, 3, 1, 2, 0));
   fFitDaughters->Connect("Toggled(Bool_t)","Reve::TrackListEditor", this, "DoFitDaughters()");
 
   fFitDecay = new TGCheckButton(this, "Fit decay");
-  AddFrame(fFitDecay, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0));
+  AddFrame(fFitDecay, new TGLayoutHints(kLHintsTop, 3, 1, 2, 0));
   fFitDecay->Connect("Toggled(Bool_t)","Reve::TrackListEditor", this, "DoFitDecay()");  
 
   // --- Selectors
@@ -168,6 +178,8 @@ void TrackListEditor::SetModel(TObject* obj)
   fMinAng->SetNumber(fTC->GetMinAng());
   fDelta->SetNumber(fTC->GetDelta());
 
+  fWidthCombo->Select(fTC->GetWidth());
+
   fRnrTracks->SetState(fTC->GetRnrTracks() ? kButtonDown : kButtonUp);
   fRnrMarkers->SetState(fTC->GetRnrMarkers() ? kButtonDown : kButtonUp);
 
@@ -212,6 +224,14 @@ void TrackListEditor::DoDelta()
 
 /**************************************************************************/
 
+void TrackListEditor::DoLineWidth(Int_t width)
+{
+  fTC->SetWidth(width);
+  Update();
+}
+
+/**************************************************************************/
+
 void TrackListEditor::DoRnrTracks()
 {
   fTC->SetRnrTracks(fRnrTracks->IsOn());

diff --git a/EVE/Reve/TrackEditors.h b/EVE/Reve/TrackEditors.h
index 6b8a2f14ab58cc6bb4d9f0c3730abed5a2d3f965..3b510bec904f283e6a3accc6d03edc784355628e 100644 (file)
--- a/EVE/Reve/TrackEditors.h
+++ b/EVE/Reve/TrackEditors.h
@@ -8,6 +8,7 @@
 class TGCheckButton;
 class TGNumberEntry;
 class TGColorSelect;
+class TGLineWidthComboBox;
 
 namespace Reve {
 
@@ -30,6 +31,8 @@ protected:
   TGNumberEntry*     fMinAng;
   TGNumberEntry*     fDelta;
 
+  TGLineWidthComboBox* fWidthCombo;
+
   TGCheckButton*     fRnrTracks;
   TGCheckButton*     fRnrMarkers;
 
@@ -51,6 +54,8 @@ public:
   void DoMinAng();
   void DoDelta();
 
+  void DoLineWidth(Int_t width);
+
   void DoRnrTracks();
   void DoRnrMarkers();