Commit 89b88e1d authored by Jérémie Dudouet's avatar Jérémie Dudouet
Browse files

Add icons and two small corrections

parent c3929e7a
......@@ -237,6 +237,8 @@ void CXGuiLSPlayer::UpdateGammaRays()
fLSPlayer->DrawArrows(fListOfNucleus->GetText(),fMainWindow->GetHisto());
fMainWindow->GetCanvas()->DisableClass("TBox");
}
fMainWindow->RefreshPads();
}
......
......@@ -76,17 +76,17 @@ void CXMainWindow::Init()
fMenuView->Connect("Activated(Int_t)", "CXMainWindow", this, "HandleMenu(Int_t)");
fMenuView->AddEntry("Browse Files", M_FileListUtility,0,gClient->GetPicture("ed_open.png"));
// fMenuView->CheckEntry(M_FileListUtility);
// fMenuView->CheckEntry(M_FileListUtility);
IsFileListUtilityEnabled = true;
fMenuView->AddEntry("Saved list", M_SavedList,0,gClient->GetPicture("bld_listbox.xpm"));
// fMenuView->CheckEntry(M_SavedList);
// fMenuView->CheckEntry(M_SavedList);
IsSavedListEnabled = true;
fMenuView->AddSeparator();
fMenuView->AddEntry("Show editor", M_Editor,0,gClient->GetPicture("bld_edit.png"));
// fMenuView->CheckEntry(M_Editor);
// fMenuView->CheckEntry(M_Editor);
IsEditorEnabled = true;
//---------------- Menu Tools --------------------
......@@ -97,15 +97,15 @@ void CXMainWindow::Init()
fMenuTools->AddSeparator();
fMenuTools->AddEntry("LS Player", M_LSPlayerUtility,0,gClient->GetPicture("levelscheme_t.png"));
// fMenuTools->CheckEntry(M_LSPlayerUtility);
// fMenuTools->CheckEntry(M_LSPlayerUtility);
IsLSPlayerToolEnabled = true;
fMenuTools->AddEntry("Hist1D Player", M_Hist1DPlayer,0,gClient->GetPicture("FitTool.xpm"));
// fMenuTools->CheckEntry(M_Hist1DPlayer);
// fMenuTools->CheckEntry(M_Hist1DPlayer);
IsHist1DPlayerEnabled= true;
fMenuTools->AddEntry("background utility", M_BkdUtility,0,gClient->GetPicture("h1_t.xpm"));
// fMenuTools->CheckEntry(M_BkdUtility);
// fMenuTools->CheckEntry(M_BkdUtility);
IsBkdUtilityEnabled = true;
fMenuTools->AddSeparator();
......@@ -113,11 +113,11 @@ void CXMainWindow::Init()
fMenuTools->AddSeparator();
fMenuTools->AddEntry("Hist2D Player", M_Hist2DPlayer,0,gClient->GetPicture("h2_t.xpm"));
// fMenuTools->CheckEntry(M_Hist2DPlayer);
// fMenuTools->CheckEntry(M_Hist2DPlayer);
IsHist2DPlayerEnabled= true;
fMenuTools->AddEntry("Rad2D Player", M_Rad2DPlayer,0,gClient->GetPicture("rw3.gif"));
// fMenuTools->CheckEntry(M_Rad2DPlayer);
// fMenuTools->CheckEntry(M_Rad2DPlayer);
IsRad2DPlayerEnabled= true;
fMenuTools->AddSeparator();
......@@ -125,7 +125,7 @@ void CXMainWindow::Init()
fMenuTools->AddSeparator();
fMenuTools->AddEntry("RadCube Player", M_RadCubePlayer,0,gClient->GetPicture("rw3.gif"));
// fMenuTools->CheckEntry(M_RadCubePlayer);
// fMenuTools->CheckEntry(M_RadCubePlayer);
IsRadCubePlayerEnabled= true;
fMenuTools->AddSeparator();
......@@ -367,7 +367,7 @@ void CXMainWindow::HandleMovement(Int_t EventType, Int_t EventX, Int_t EventY, T
fHist1DPlayer->NewFit();
}
if((EKeySym)EventY==kKey_f && fCTRL) {
fHist1DPlayer->DoFit();
fHist1DPlayer->DoFit();
}
if((EKeySym)EventY==kKey_s && !fCTRL) {
if(IsHist1DPlayerEnabled==false)
......@@ -698,10 +698,10 @@ void CXMainWindow::ToggleTab(Bool_t &Enable, ETestCommandIdentifiers id, TGCompo
{
if(!Enable)
{
// if(fMenuView->GetEntry(id))
// fMenuView->CheckEntry(id);
// if(fMenuTools->GetEntry(id))
// fMenuTools->CheckEntry(id);
// if(fMenuView->GetEntry(id))
// fMenuView->CheckEntry(id);
// if(fMenuTools->GetEntry(id))
// fMenuTools->CheckEntry(id);
fMainTab->AddTab(name,tab);
......@@ -739,10 +739,10 @@ void CXMainWindow::ToggleTab(Bool_t &Enable, ETestCommandIdentifiers id, TGCompo
}
else
{
// if(fMenuView->GetEntry(id))
// fMenuView->UnCheckEntry(id);
// if(fMenuTools->GetEntry(id))
// fMenuTools->UnCheckEntry(id);
// if(fMenuView->GetEntry(id))
// fMenuView->UnCheckEntry(id);
// if(fMenuTools->GetEntry(id))
// fMenuTools->UnCheckEntry(id);
fMainTab->SetTab(name);
fMainTab->RemoveTab(fMainTab->GetCurrent());
......@@ -1289,27 +1289,28 @@ void CXMainWindow::DoDraw(TObject *obj, TString DrawOpt)
if(o->InheritsFrom(TPad::Class())) {
o->DrawClone();
}
if(idraw==0) {
idraw++;
if(o->InheritsFrom(TH2::Class()))
o->Draw("col");
else if(o->InheritsFrom(TH1::Class()))
o->Draw("hist");
else if(o->InheritsFrom(TGraph::Class()))
o->Draw("APL");
else
o->Draw();
}
else{
if(o->InheritsFrom(TH2::Class()))
o->Draw("col same");
else if(o->InheritsFrom(TH1::Class()))
o->Draw("hist same");
else if(o->InheritsFrom(TGraph::Class()))
o->Draw("PL");
else
o->Draw("same");
else {
if(idraw==0) {
idraw++;
if(o->InheritsFrom(TH2::Class()))
o->Draw("col");
else if(o->InheritsFrom(TH1::Class()))
o->Draw("hist");
else if(o->InheritsFrom(TGraph::Class()))
o->Draw("APL");
else
o->Draw();
}
else{
if(o->InheritsFrom(TH2::Class()))
o->Draw("col same");
else if(o->InheritsFrom(TH1::Class()))
o->Draw("hist same");
else if(o->InheritsFrom(TGraph::Class()))
o->Draw("PL");
else
o->Draw("same");
}
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment