X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCCalibViewerGUItime.h;h=403e2674d57da2aac4cb6c76ccd4641a05c1d102;hb=44c5ae37f8baf608eaf46f460d89d3809007afb8;hp=154e237dd11fdafb3a4e54dac584ebd30bf5eb5f;hpb=7390f65563d0160da8c835fb4c8570799568ff55;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCCalibViewerGUItime.h b/TPC/AliTPCCalibViewerGUItime.h
index 154e237dd11..403e2674d57 100644
--- a/TPC/AliTPCCalibViewerGUItime.h
+++ b/TPC/AliTPCCalibViewerGUItime.h
@@ -22,15 +22,7 @@
 #include "TGFrame.h"
 #endif
 
-// #include <TGButton.h>
-// #include <TGListBox.h>
-// #include <TGComboBox.h>
-// #include <TGNumberEntry.h>
-// #include <TRootEmbeddedCanvas.h>
-// #include <TGSplitter.h>
-// #include <TGButtonGroup.h>
-// #include <TGLabel.h>
-// #include <TGTab.h>
+#include <TGComboBox.h>
 #include <TString.h>
 #include <TVectorT.h>
 
@@ -41,8 +33,8 @@ class TGListBox;
 class TGRadioButton;
 class TGGroupFrame;
 class TGLabel;
-class TGComboBox;
 class TGTabElement;
+class TGTextEntry;
 
 class TFile;
 class TTree;
@@ -68,21 +60,26 @@ public:
   void DrawGUI(const TGWindow */*p*/, UInt_t w, UInt_t h);
   
   void UseFile(const char* fileName, const char* treeName);
-  void UseChain(TChain *chain);
+  void UseChain(TChain *const chain);
   void UseConfigFile(const char* file="");
   void Reload(Int_t first=1);
   void AddReferenceTree(const char* treeFileName, const char* refName="R");
 
   
-  void SetCalibViewerGUI(AliTPCCalibViewerGUI *gui) {fCalibViewerGUI=gui;}
-  void SetCalibViewerGUItab(TGTabElement *tab) {fCalibViewerGUItab=tab;}
+  void SetCalibViewerGUI(AliTPCCalibViewerGUI *const gui) {fCalibViewerGUI=gui;}
+  void SetCalibViewerGUItab(TGTabElement *const tab) {fCalibViewerGUItab=tab;}
   void SetCacheDir(const char* cachedir) {fOutputCacheDir=cachedir;}
   void SetConfigFileName(const char* file) {fConfigFile=file;}
   
   const char* GetDrawString();
-  const char* GetDrawOption();
+  const char* GetDrawOptionString();
+  const char* GetCustomDrawString() const {return fComboCustomDraw->GetTextEntry()?fComboCustomDraw->GetTextEntry()->GetText():"";}
   void GetCutString(TString &cutStr);
   TChain* GetChain() const {return fTree;}
+  //
+  TGTextEntry* GetDrawEntry() {return fComboCustomDraw->GetTextEntry();}
+  TGTextEntry* GetCutsEntry() {return fComboCustomCuts->GetTextEntry();}
+  TGTextEntry* GetDrawOptEntry() {return fComboAddDrawOpt->GetTextEntry();}
   //Slots
   void DoDraw();
   void DoDumpRuns();
@@ -93,7 +90,11 @@ public:
   void DoChangeSelectionList() {Reload(0);}
   void HandleButtonsDrawSel(Int_t id = -1);              
   void MouseMove(Int_t event, Int_t x, Int_t y, TObject */*selected*/);
-  
+  void DoNewSelectionAliases();
+  void DoAddAlias();
+  void DoDelAlias();
+  void UpdateAliasList();
+  TCanvas * GetCanvas(){ return fCanvMain->GetCanvas();}
  private:
   TFile*  fFile;                          //file that keeps the tree
   TChain*  fTree;                         //internal tree
@@ -153,6 +154,8 @@ public:
   TGLabel             *fLblValueXVal;       // value of the data point hoovered
   TGLabel             *fLblValueYVal;       // value of the data point hoovered
   TGTextButton        *fBtnDumpRuns;        // draw button
+  TGGroupFrame        *fContAliases;         // container to keep data point information
+  TGListBox           *fListAliases;        // list of aliases
   //content bottom
   TGCompositeFrame    *fContCustom;         // container for custom draw command GUI elements
   TGCompositeFrame    *fContCustomCuts;     // container for custom cut options GUI elements
@@ -174,7 +177,7 @@ public:
   void SetInitialValues();
   void CheckDrawGraph();
   Bool_t CheckChain();
-  void UpdateValueArrays(Bool_t withGraph);
+  void UpdateValueArrays(Bool_t withGraph, const Double_t *xArr);
   const char* SubstituteUnderscores(const char* in);
   void GetHistogramTitle(TString &title);
   void AdjustYRange();
@@ -186,4 +189,33 @@ private:
     
 };
 
+////////////////////////////////////////////////////////////////////////
+//
+//   GUI Alias frame
+//
+////////////////////////////////////////////////////////////////////////
+
+class AliTPCCalibViewerGUItimeAddAliasFrame : public TObject {
+public:
+  AliTPCCalibViewerGUItimeAddAliasFrame(const TGWindow *p, const TGWindow *main, UInt_t w, UInt_t h,
+             UInt_t options, AliTPCCalibViewerGUItime *gui, TString strAlias="");
+  virtual ~AliTPCCalibViewerGUItimeAddAliasFrame();
+  
+   // slots
+  void DoOK();
+  void DoCancel();
+  
+
+private:
+  TGTransientFrame    *fMain;           //Main frame
+  TGTextEntry         *fTxt1, *fTxt2;   //text input
+
+  AliTPCCalibViewerGUItime *fGUI;       //pointer to mother process
+
+  AliTPCCalibViewerGUItimeAddAliasFrame(const AliTPCCalibViewerGUItimeAddAliasFrame &r);
+  AliTPCCalibViewerGUItimeAddAliasFrame &operator = (const AliTPCCalibViewerGUItimeAddAliasFrame &r);
+
+  ClassDef(AliTPCCalibViewerGUItimeAddAliasFrame,0)
+};
+
 #endif