Changeset 9495 for trunk/MagicSoft
- Timestamp:
- 08/17/09 12:19:59 (15 years ago)
- Location:
- trunk/MagicSoft/Cosy
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Cosy/Changelog
r9445 r9495 1 1 -*-*- END -*-*- 2 3 2009/08/17 Thomas Bretz 4 5 * tpoint/TPointGui.[h,cc]: 6 - keep different paths in memory for collections and models 7 - show kept collection in window title 8 - added option to set a limiting magnitude for the fit 9 - setup a new default for the coefficients 10 - set new icon and window names 11 12 2 13 3 14 2009/05/12 Thomas Bretz (La Palma) -
trunk/MagicSoft/Cosy/tpoint/TPointGui.cc
r8982 r9495 34 34 35 35 TPointGui::TPointGui(const char *fname, const char *mod) : TGMainFrame(gClient->GetRoot(), 750, 435, kHorizontalFrame), fExitLoopOnClose(kFALSE), 36 fAzMin(-180), fAzMax(180), fZdMin(0), fZdMax(90), f Limit(0.05)36 fAzMin(-180), fAzMax(180), fZdMin(0), fZdMax(90), fMagMin(0), fLimit(0.05) 37 37 { 38 38 fCoordinates.SetOwner(); … … 192 192 TGLabel *label1 = new TGLabel(v1, "Az min/°"); 193 193 TGLabel *label2 = new TGLabel(v2, "Az max/°"); 194 TGLabel *label3 = new TGLabel(v3, " Limit/°");194 TGLabel *label3 = new TGLabel(v3, "Mag min"); 195 195 TGLabel *label4 = new TGLabel(v1, "Zd min/°"); 196 196 TGLabel *label5 = new TGLabel(v2, "Zd max/°"); … … 209 209 fList->Add(label6); 210 210 211 TGTextEntry *entry1 = new TGTextEntry(v1, Form("%.1f", fAzMin), kIdAzMin); 212 TGTextEntry *entry2 = new TGTextEntry(v2, Form("%.1f", fAzMax), kIdAzMax); 213 TGTextEntry *entry3 = new TGTextEntry(v3, " ", -1); 214 TGTextEntry *entry4 = new TGTextEntry(v1, Form("%.1f", fZdMin), kIdZdMin); 215 TGTextEntry *entry5 = new TGTextEntry(v2, Form("%.1f", fZdMax), kIdZdMax); 216 TGTextEntry *entry6 = new TGTextEntry(v3, Form("%.3f", fLimit), kIdLimit); 217 entry3->SetEnabled(kFALSE); 211 TGTextEntry *entry1 = new TGTextEntry(v1, Form("%.1f", fAzMin), kIdAzMin); 212 TGTextEntry *entry2 = new TGTextEntry(v2, Form("%.1f", fAzMax), kIdAzMax); 213 TGTextEntry *entry3 = new TGTextEntry(v3, Form("%.1f", fMagMin), kIdMagMin); 214 TGTextEntry *entry4 = new TGTextEntry(v1, Form("%.1f", fZdMin), kIdZdMin); 215 TGTextEntry *entry5 = new TGTextEntry(v2, Form("%.1f", fZdMax), kIdZdMax); 216 TGTextEntry *entry6 = new TGTextEntry(v3, Form("%.3f", fLimit), kIdLimit); 218 217 entry1->SetToolTipText("TPoints with a real star located at Az<Az min are ignored in the fit."); 219 218 entry2->SetToolTipText("TPoints with a real star located at Az>Az max are ignored in the fit."); 219 entry2->SetToolTipText("TPoints with a artifiical magnitude Mag<Mag min are ignored in the fit."); 220 220 entry4->SetToolTipText("TPoints with a real star located at Zd<Zd min are ignored in the fit."); 221 221 entry5->SetToolTipText("TPoints with a real star located at Zd>Zd max are ignored in the fit."); … … 251 251 ((TGCheckButton*)fList->FindWidget(0))->SetState(kButtonDown); 252 252 ((TGCheckButton*)fList->FindWidget(1))->SetState(kButtonDown); 253 ((TGCheckButton*)fList->FindWidget(5))->SetState(kButtonDown); 253 254 ((TGCheckButton*)fList->FindWidget(6))->SetState(kButtonDown); 254 ((TGCheckButton*)fList->FindWidget(10))->SetState(kButtonDown); 255 ((TGCheckButton*)fList->FindWidget(12))->SetState(kButtonDown); 255 ((TGCheckButton*)fList->FindWidget(9))->SetState(kButtonDown); 256 ((TGCheckButton*)fList->FindWidget(11))->SetState(kButtonDown); 257 ((TGCheckButton*)fList->FindWidget(15))->SetState(kButtonDown); 258 ((TGCheckButton*)fList->FindWidget(16))->SetState(kButtonDown); 256 259 ((TGCheckButton*)fList->FindWidget(17))->SetState(kButtonDown); 257 260 … … 266 269 ((TGCheckButton*)fList->FindWidget(22+2*MPointing::GetNumPar()))->SetState(kButtonDisabled); 267 270 268 SetWindowName("T Point Fitting Window");269 SetIconName("T Point++");271 SetWindowName("Telesto"); 272 SetIconName("Telesto"); 270 273 271 274 Layout(); … … 306 309 307 310 if (set.GetStarZd()<fZdMin || set.GetStarZd()>fZdMax || 308 set.GetStarAz()<fAzMin || set.GetStarAz()>fAzMax) 311 set.GetStarAz()<fAzMin || set.GetStarAz()>fAzMax || 312 set.GetMag() <fMagMin) 309 313 continue; 310 314 … … 582 586 } 583 587 584 TString TPointGui::OpenDialog( EFileDialogMode mode)588 TString TPointGui::OpenDialog(TString &dir, EFileDialogMode mode) 585 589 { 586 590 static const char *gOpenTypes[] = … … 593 597 }; 594 598 595 static TString dir("tpoint/");599 //static TString dir("tpoint/"); 596 600 597 601 TGFileInfo fi; // fFileName and fIniDir deleted in ~TGFileInfo … … 648 652 LoadCollection(fname); 649 653 fFileNameStars = fname; 654 SetWindowName(Form("Telesto (%s)", fFileNameStars.Data())); 650 655 return; 651 656 } … … 683 688 684 689 fFileNameStars = fname; 690 SetWindowName(Form("Telesto (%s)", fFileNameStars.Data())); 685 691 } 686 692 … … 694 700 // cout << "Msg: " << hex << GET_MSG(msg) << endl; 695 701 // cout << "SubMsg: " << hex << GET_SUBMSG(msg) << dec << endl; 702 703 static TString dirmod("tpoint/"); 704 static TString dircol("tpoint/"); 705 696 706 switch (GET_MSG(msg)) 697 707 { … … 713 723 return kTRUE; 714 724 case kTbLoad: 715 fBending.Load(OpenDialog( ));725 fBending.Load(OpenDialog(dirmod)); 716 726 DisplayBending(); 717 727 return kTRUE; 718 728 case kTbSave: 719 fBending.Save(OpenDialog( kFDSave));729 fBending.Save(OpenDialog(dirmod, kFDSave)); 720 730 return kTRUE; 721 731 case kTbLoadStars: 722 LoadStars(OpenDialog( ));732 LoadStars(OpenDialog(dircol)); 723 733 DisplayData(); 724 734 return kTRUE; … … 762 772 case kIdZdMax: 763 773 fZdMax = GetFloat(kIdZdMax); 774 return kTRUE; 775 case kIdMagMin: 776 fMagMin = GetFloat(kIdMagMin); 764 777 return kTRUE; 765 778 case kIdLimit: -
trunk/MagicSoft/Cosy/tpoint/TPointGui.h
r8973 r9495 33 33 kIdZdMin, 34 34 kIdZdMax, 35 kIdMagMin, 35 36 kIdLimit, 36 37 }; … … 54 55 Float_t fZdMin; 55 56 Float_t fZdMax; 57 Float_t fMagMin; 56 58 57 59 Float_t fLimit; … … 74 76 void DrawHorizon(TVirtualPad *pad, const char *fname="horizon.dat") const; 75 77 76 TString OpenDialog( EFileDialogMode mode=kFDOpen);78 TString OpenDialog(TString &dir, EFileDialogMode mode=kFDOpen); 77 79 78 80 void LoadCollection(TString fname);
Note:
See TracChangeset
for help on using the changeset viewer.