Index: /trunk/MagicSoft/Cosy/Changelog =================================================================== --- /trunk/MagicSoft/Cosy/Changelog (revision 7784) +++ /trunk/MagicSoft/Cosy/Changelog (revision 7785) @@ -1,3 +1,15 @@ -*-*- END -*-*- + 2006/07/11 Daniela Dorner + + * main/MStarguider.[h,cc]: + - implemented function to disable and uncheck an entry in the menu + + * main/MStarguider.cc: + - fixed bugs in (un)checking and en/disabeling items + - removed not needed if-clauses + - rearranged menu + + + 2006/07/10 Thomas Bretz (La Palma) Index: /trunk/MagicSoft/Cosy/main/MStarguider.cc =================================================================== --- /trunk/MagicSoft/Cosy/main/MStarguider.cc (revision 7784) +++ /trunk/MagicSoft/Cosy/main/MStarguider.cc (revision 7785) @@ -144,6 +144,6 @@ fChannel = new MGPopupMenu(p); fChannel->AddEntry("Starfield Camera", IDM_kChannel1); - fChannel->AddEntry("TPoint Camera", IDM_kChannel2); - fChannel->AddEntry("Read from File", IDM_kChannel3); + fChannel->AddEntry("TPoint Camera", IDM_kChannel2); + fChannel->AddEntry("Read from File", IDM_kChannel3); if (channel<0) fChannel->CheckEntry(IDM_kChannel3); @@ -157,10 +157,11 @@ // fDisplay = new MGPopupMenu(p); - fDisplay->AddEntry("&Filter", IDM_kFilter); - fDisplay->AddEntry("Find &Star", IDM_kFindStar); - fDisplay->AddEntry("C&aos Filter", IDM_kCaosFilter); - fDisplay->AddEntry("SAO &Catalog", IDM_kCatalog); - fDisplay->AddEntry("Stretch", IDM_kStretch); + fDisplay->AddEntry("&Filter", IDM_kFilter); + fDisplay->AddEntry("Stretch", IDM_kStretch); fDisplay->AddSeparator(); + fDisplay->AddEntry("Find &Star", IDM_kFindStar); + fDisplay->AddEntry("C&aos Filter", IDM_kCaosFilter); + fDisplay->AddSeparator(); + fDisplay->AddEntry("SAO &Catalog", IDM_kCatalog); fDisplay->AddEntry("Starguider", IDM_kStarguider); fDisplay->AddEntry("Starguider LED Filter", IDM_kStargCaosFilter); @@ -175,6 +176,6 @@ fMode = new MGPopupMenu(p); - fMode->AddEntry("Starguider", IDM_kStarguiderMode); - fMode->AddEntry("Tpoint", IDM_kTpointMode); + fMode->AddEntry("Starguider", IDM_kStarguiderMode); + fMode->AddEntry("Tpoint", IDM_kTpointMode); fMode->Associate(this); fList->Add(fMode); @@ -182,5 +183,5 @@ fOperations = new MGPopupMenu(p); fOperations->AddEntry("Roque Lamp Analysis", IDM_kRoqueLampAna); - fOperations->AddEntry("Starguider Analysis", IDM_kStargAnalysis); + fOperations->AddEntry("Starguider Analysis", IDM_kStargAnalysis); fOperations->DisableEntry(IDM_kStargAnalysis); fOperations->Associate(this); @@ -291,5 +292,5 @@ fCaosAnalyse = new MGPopupMenu(p); fCaosAnalyse->AddEntry("S&tart Analysis", IDM_kCaosAnalStart); - fCaosAnalyse->AddEntry("St&op Analysis", IDM_kCaosAnalStop); + fCaosAnalyse->AddEntry("St&op Analysis", IDM_kCaosAnalStop); fCaosAnalyse->DisableEntry(IDM_kCaosAnalStop); // fCaosAnalyse->AddEntry("&Reset Histograms", IDM_kResetHistograms); @@ -582,4 +583,10 @@ } +void MStarguider::SwitchOff(MGPopupMenu *p, UInt_t id) +{ + p->UnCheckEntry(id); + p->DisableEntry(id); +} + void MStarguider::Toggle(MGPopupMenu *p, UInt_t id) { @@ -615,12 +622,8 @@ fLastBright = 0xff; - if (!fChannel->IsEntryEnabled(IDM_kChannel1)) - fChannel->EnableEntry(IDM_kChannel1); - if (fDisplay->IsEntryEnabled(IDM_kFindStar)) - fDisplay->DisableEntry(IDM_kFindStar); - if (fDisplay->IsEntryEnabled(IDM_kCaosFilter)) - fDisplay->DisableEntry(IDM_kCaosFilter); - if (!fOperations->IsEntryEnabled(IDM_kStargAnalysis)) - fOperations->EnableEntry(IDM_kStargAnalysis); + fChannel->EnableEntry(IDM_kChannel1); + fDisplay->DisableEntry(IDM_kFindStar); + fDisplay->DisableEntry(IDM_kCaosFilter); + fOperations->EnableEntry(IDM_kStargAnalysis); fStargTPoint->MapWindow(); @@ -631,8 +634,10 @@ fSao->SetLimitMag(8.3); + for (int i=IDM_kInterpol250; i<=IDM_kInterpol1; i++) + fInterpol->UnCheckEntry(i); + fInterpol->CheckEntry(IDM_kInterpol125); fIntRate = 125; - if (!fDisplay->IsEntryChecked(IDM_kCatalog)) - fDisplay->CheckEntry(IDM_kCatalog); + fDisplay->CheckEntry(IDM_kCatalog); fGStarg->MapWindow(); @@ -655,10 +660,6 @@ } - if (fChannel->IsEntryChecked(IDM_kChannel2)) - fChannel->UnCheckEntry(IDM_kChannel2); - if (fChannel->IsEntryEnabled(IDM_kChannel2)) - fChannel->DisableEntry(IDM_kChannel2); - if (!fChannel->IsEntryChecked(IDM_kChannel1)) - fChannel->CheckEntry(IDM_kChannel1); + SwitchOff(fChannel, IDM_kChannel2); + fChannel->CheckEntry(IDM_kChannel1); } @@ -674,12 +675,9 @@ fSkyBright->UnmapWindow(); fGStarg->UnmapWindow(); - if (!fChannel->IsEntryEnabled(IDM_kChannel2)) - fChannel->EnableEntry(IDM_kChannel2); - if (!fDisplay->IsEntryEnabled(IDM_kFindStar)) - fDisplay->EnableEntry(IDM_kFindStar); - if (!fDisplay->IsEntryEnabled(IDM_kCaosFilter)) - fDisplay->EnableEntry(IDM_kCaosFilter); - if (fOperations->IsEntryEnabled(IDM_kStargAnalysis)) - fOperations->DisableEntry(IDM_kStargAnalysis); + + fChannel->EnableEntry(IDM_kChannel2); + fDisplay->EnableEntry(IDM_kFindStar); + fDisplay->EnableEntry(IDM_kCaosFilter); + fOperations->DisableEntry(IDM_kStargAnalysis); } //gSystem->Unlink("tracking_error.txt"); @@ -693,11 +691,14 @@ && !fMode->IsEntryChecked(IDM_kTpointMode)) fMenu->AddPopup("&CaOs", fCaOs, NULL); + + SwitchOff(fDisplay, IDM_kStarguider); + SwitchOff(fDisplay, IDM_kStargCaosFilter); + fDisplay->DisableEntry(IDM_kStargFindStar); } else { - if (fCaosWrite->IsEntryChecked(IDM_kCaosPrintLeds)) - fCaosWrite->UnCheckEntry(IDM_kCaosPrintLeds); - if (fCaosWrite->IsEntryChecked(IDM_kCaosPrintRings)) - fCaosWrite->UnCheckEntry(IDM_kCaosPrintRings); + fCaosWrite->UnCheckEntry(IDM_kCaosPrintLeds); + fCaosWrite->UnCheckEntry(IDM_kCaosPrintRings); + if (fCaosAnalyse->IsEntryEnabled(IDM_kCaosAnalStop)) { @@ -713,4 +714,7 @@ } fMenu->RemovePopup("CaOs"); + + fDisplay->EnableEntry(IDM_kStargCaosFilter); + fDisplay->EnableEntry(IDM_kStarguider); } fMenu->Resize(fMenu->GetDefaultSize()); @@ -759,16 +763,8 @@ case IDM_kCatalog: Toggle(fDisplay, IDM_kCatalog); -// if (!fDisplay->IsEntryChecked(IDM_kCatalog)) -// { -// fDisplay->UnCheckEntry(IDM_kStarguider); -// fDisplay->DisableEntry(IDM_kStarguider); -// } else { -// fDisplay->EnableEntry(IDM_kStarguider); -// } return kTRUE; case IDM_kRoqueLampAna: Toggle(fOperations, IDM_kRoqueLampAna); - // if (!fDisplay->IsEntryChecked(IDM_kCatalog)) if (fOperations->IsEntryChecked(IDM_kRoqueLampAna)) fDisplay->CheckEntry(IDM_kStargCaosFilter); @@ -801,94 +797,45 @@ if (fMode->IsEntryChecked(IDM_kStarguiderMode)) { - //uncheck not needed items //general - if (fDisplay->IsEntryChecked(IDM_kStargFindStar)) - fDisplay->UnCheckEntry(IDM_kStargFindStar); - - if (fDisplay->IsEntryChecked(IDM_kFilter)) - fDisplay->UnCheckEntry(IDM_kFilter); - if (fDisplay->IsEntryEnabled(IDM_kFilter)) - fDisplay->DisableEntry(IDM_kFilter); - - if (fOperations->IsEntryChecked(IDM_kRoqueLampAna)) - fOperations->UnCheckEntry(IDM_kRoqueLampAna); - if (fOperations->IsEntryEnabled(IDM_kRoqueLampAna)) - fOperations->DisableEntry(IDM_kRoqueLampAna); - - if (fChannel->IsEntryChecked(IDM_kChannel3)) - fChannel->UnCheckEntry(IDM_kChannel3); - if (fChannel->IsEntryEnabled(IDM_kChannel3)) - fChannel->DisableEntry(IDM_kChannel3); + fDisplay->UnCheckEntry(IDM_kStargFindStar); + SwitchOff(fDisplay, IDM_kFilter); + SwitchOff(fChannel, IDM_kChannel3); + SwitchOff(fOperations, IDM_kRoqueLampAna); + SwitchOff(fOperations, IDM_kStargAnalysis); //tpoint - if (fDisplay->IsEntryChecked(IDM_kFindStar)) - fDisplay->UnCheckEntry(IDM_kFindStar); + SwitchOff(fDisplay, IDM_kFindStar); ToggleFindStar(); - - if (fDisplay->IsEntryChecked(IDM_kCaosFilter)) - fDisplay->UnCheckEntry(IDM_kCaosFilter); + SwitchOff(fDisplay, IDM_kCaosFilter); ToggleCaosFilter(); - - if (fMode->IsEntryChecked(IDM_kTpointMode)) - fMode->UnCheckEntry(IDM_kTpointMode); + fMode->UnCheckEntry(IDM_kTpointMode); //enable starguider items -// if (!fOperations->IsEntryEnabled(IDM_kStargAnalysis)) -// fOperations->EnableEntry(IDM_kStargAnalysis); - if (!fDisplay->IsEntryEnabled(IDM_kStargCaosFilter)) - fDisplay->EnableEntry(IDM_kStargCaosFilter); - if (!fDisplay->IsEntryEnabled(IDM_kStarguider)) - fDisplay->EnableEntry(IDM_kStarguider); - if (!fDisplay->IsEntryEnabled(IDM_kCatalog)) - fDisplay->EnableEntry(IDM_kCatalog); + fDisplay->EnableEntry(IDM_kStargCaosFilter); + fDisplay->EnableEntry(IDM_kStarguider); + fDisplay->EnableEntry(IDM_kCatalog); //check needed items - if (!fDisplay->IsEntryChecked(IDM_kStretch)) - fDisplay->CheckEntry(IDM_kStretch); - - if (!fDisplay->IsEntryChecked(IDM_kStarguider)) - fDisplay->CheckEntry(IDM_kStarguider); + fDisplay->CheckEntry(IDM_kStretch); + fDisplay->CheckEntry(IDM_kStargCaosFilter); + fDisplay->CheckEntry(IDM_kStarguider); ToggleStarguider(); - - if (!fDisplay->IsEntryChecked(IDM_kStargCaosFilter)) - fDisplay->CheckEntry(IDM_kStargCaosFilter); - -// if (!fOperations->IsEntryChecked(IDM_kStargAnalysis)) -// fOperations->CheckEntry(IDM_kStargAnalysis); -// ToggleStargAnalysis(); - if (fOperations->IsEntryChecked(IDM_kStargAnalysis)) - fOperations->UnCheckEntry(IDM_kStargAnalysis); - if (fOperations->IsEntryEnabled(IDM_kStargAnalysis)) - fOperations->DisableEntry(IDM_kStargAnalysis); - - } else { - //uncheck starguider items -// if (fOperations->IsEntryChecked(IDM_kStargAnalysis)) -// fOperations->UnCheckEntry(IDM_kStargAnalysis); -// ToggleStargAnalysis(); - - if (fDisplay->IsEntryChecked(IDM_kStargCaosFilter)) - fDisplay->UnCheckEntry(IDM_kStargCaosFilter); - - if (fDisplay->IsEntryChecked(IDM_kStarguider)) - fDisplay->UnCheckEntry(IDM_kStarguider); + //uncheck + //starguider items + fDisplay->UnCheckEntry(IDM_kStargCaosFilter); + fDisplay->UnCheckEntry(IDM_kStarguider); ToggleStarguider(); - if (fDisplay->IsEntryChecked(IDM_kCatalog)) - fDisplay->UnCheckEntry(IDM_kCatalog); - - if (!fChannel->IsEntryEnabled(IDM_kChannel3)) - fChannel->EnableEntry(IDM_kChannel3); - - if (!fOperations->IsEntryEnabled(IDM_kRoqueLampAna)) - fOperations->EnableEntry(IDM_kRoqueLampAna); - - if (!fDisplay->IsEntryEnabled(IDM_kFilter)) - fDisplay->EnableEntry(IDM_kFilter); - + //general + fDisplay->UnCheckEntry(IDM_kCatalog); + fDisplay->EnableEntry(IDM_kFilter); + fDisplay->EnableEntry(IDM_kCaosFilter); + fDisplay->EnableEntry(IDM_kFindStar); + fChannel->EnableEntry(IDM_kChannel3); + fOperations->EnableEntry(IDM_kRoqueLampAna); } return kTRUE; @@ -901,47 +848,17 @@ //unchecking not needed items //general - if (fDisplay->IsEntryChecked(IDM_kStargFindStar)) - fDisplay->UnCheckEntry(IDM_kStargFindStar); - - if (fDisplay->IsEntryChecked(IDM_kFilter)) - fDisplay->UnCheckEntry(IDM_kFilter); - if (fDisplay->IsEntryEnabled(IDM_kFilter)) - fDisplay->DisableEntry(IDM_kFilter); - - if (fOperations->IsEntryChecked(IDM_kRoqueLampAna)) - fOperations->UnCheckEntry(IDM_kRoqueLampAna); - if (fOperations->IsEntryEnabled(IDM_kRoqueLampAna)) - fOperations->DisableEntry(IDM_kRoqueLampAna); - - if (fChannel->IsEntryChecked(IDM_kChannel3)) - fChannel->UnCheckEntry(IDM_kChannel3); - if (fChannel->IsEntryEnabled(IDM_kChannel3)) - fChannel->DisableEntry(IDM_kChannel3); + fDisplay->UnCheckEntry(IDM_kStargFindStar); + SwitchOff(fDisplay, IDM_kFilter); + SwitchOff(fChannel, IDM_kChannel3); + SwitchOff(fOperations, IDM_kRoqueLampAna); //from starguider - if (fOperations->IsEntryChecked(IDM_kStargAnalysis)) - fOperations->UnCheckEntry(IDM_kStargAnalysis); + SwitchOff(fDisplay, IDM_kStargCaosFilter); + SwitchOff(fDisplay, IDM_kCatalog); + SwitchOff(fDisplay, IDM_kStarguider); + ToggleStarguider(); + fMode->UnCheckEntry(IDM_kStarguiderMode); + SwitchOff(fOperations, IDM_kStargAnalysis); ToggleStargAnalysis(); - if (fOperations->IsEntryEnabled(IDM_kStargAnalysis)) - fOperations->DisableEntry(IDM_kStargAnalysis); - - if (fDisplay->IsEntryChecked(IDM_kStargCaosFilter)) - fDisplay->UnCheckEntry(IDM_kStargCaosFilter); - if (fDisplay->IsEntryEnabled(IDM_kStargCaosFilter)) - fDisplay->DisableEntry(IDM_kStargCaosFilter); - - if (fDisplay->IsEntryChecked(IDM_kStarguider)) - fDisplay->UnCheckEntry(IDM_kStarguider); - ToggleStarguider(); - if (fDisplay->IsEntryEnabled(IDM_kStarguider)) - fDisplay->DisableEntry(IDM_kStarguider); - - if (fDisplay->IsEntryChecked(IDM_kCatalog)) - fDisplay->UnCheckEntry(IDM_kCatalog); - if (fDisplay->IsEntryEnabled(IDM_kCatalog)) - fDisplay->DisableEntry(IDM_kCatalog); - - if (fMode->IsEntryChecked(IDM_kStarguiderMode)) - fMode->UnCheckEntry(IDM_kStarguiderMode); //switch camera @@ -959,54 +876,34 @@ } - if (fChannel->IsEntryChecked(IDM_kChannel1)) - fChannel->UnCheckEntry(IDM_kChannel1); - if (fChannel->IsEntryEnabled(IDM_kChannel1)) - fChannel->DisableEntry(IDM_kChannel1); - if (!fChannel->IsEntryChecked(IDM_kChannel2)) - fChannel->CheckEntry(IDM_kChannel2); + SwitchOff(fChannel, IDM_kChannel1); + fChannel->CheckEntry(IDM_kChannel2); //checking needed items - if (!fDisplay->IsEntryChecked(IDM_kStretch)) - fDisplay->CheckEntry(IDM_kStretch); - - if (!fDisplay->IsEntryChecked(IDM_kCaosFilter)) - fDisplay->CheckEntry(IDM_kCaosFilter); + fDisplay->CheckEntry(IDM_kStretch); + fDisplay->CheckEntry(IDM_kCaosFilter); ToggleCaosFilter(); - - if (!fDisplay->IsEntryChecked(IDM_kFindStar)) - fDisplay->CheckEntry(IDM_kFindStar); + fDisplay->CheckEntry(IDM_kFindStar); ToggleFindStar(); - } else { - //enable starguider items - if (!fOperations->IsEntryEnabled(IDM_kStargAnalysis)) - fOperations->EnableEntry(IDM_kStargAnalysis); - if (!fDisplay->IsEntryEnabled(IDM_kStargCaosFilter)) - fDisplay->EnableEntry(IDM_kStargCaosFilter); - if (!fDisplay->IsEntryEnabled(IDM_kStarguider)) - fDisplay->EnableEntry(IDM_kStarguider); - if (!fDisplay->IsEntryEnabled(IDM_kCatalog)) - fDisplay->EnableEntry(IDM_kCatalog); - - if (!fDisplay->IsEntryEnabled(IDM_kFilter)) - fDisplay->EnableEntry(IDM_kFilter); - if (!fOperations->IsEntryEnabled(IDM_kRoqueLampAna)) - fOperations->EnableEntry(IDM_kRoqueLampAna); - if (!fChannel->IsEntryEnabled(IDM_kChannel3)) - fChannel->EnableEntry(IDM_kChannel3); - - if (fDisplay->IsEntryChecked(IDM_kFindStar)) - fDisplay->UnCheckEntry(IDM_kFindStar); + //enable + //starguider items + fDisplay->EnableEntry(IDM_kStargCaosFilter); + fDisplay->EnableEntry(IDM_kCatalog); + fDisplay->EnableEntry(IDM_kStarguider); + fOperations->EnableEntry(IDM_kStargAnalysis); + + //general + fDisplay->EnableEntry(IDM_kFilter); + fChannel->EnableEntry(IDM_kChannel1); + fChannel->EnableEntry(IDM_kChannel3); + fOperations->EnableEntry(IDM_kRoqueLampAna); + + //tpoint + fDisplay->UnCheckEntry(IDM_kCaosFilter); + ToggleCaosFilter(); + fDisplay->UnCheckEntry(IDM_kFindStar); ToggleFindStar(); - - if (fDisplay->IsEntryChecked(IDM_kCaosFilter)) - fDisplay->UnCheckEntry(IDM_kCaosFilter); - ToggleCaosFilter(); - - if (!fChannel->IsEntryEnabled(IDM_kChannel1)) - fChannel->EnableEntry(IDM_kChannel1); - } return kTRUE; @@ -1015,15 +912,4 @@ Toggle(fDisplay, IDM_kFilter); return kTRUE; - -// case IDM_kFilterStarg: -// Toggle(fDisplay, IDM_kFilterStarg); -// if (fDisplay->IsEntryChecked(IDM_kFilterStarg)) -// fDisplay->EnableEntry(IDM_kStarguider); -// else -// { -// fDisplay->UnCheckEntry(IDM_kStarguider); -// fDisplay->DisableEntry(IDM_kStarguider); -// } -// return kTRUE; case IDM_kFindStar: @@ -1037,16 +923,24 @@ case IDM_kCaosFilter: - //if (!fDisplay->IsEntryChecked(IDM_kCaosFilter)) - // fCaos->OpenFile(); Toggle(fDisplay, IDM_kCaosFilter); ToggleCaosFilter(); return kTRUE; - case IDM_kStargCaosFilter: + case IDM_kStargCaosFilter: Toggle(fDisplay, IDM_kStargCaosFilter); - if (fDisplay->IsEntryEnabled(IDM_kStargCaosFilter)) + if (fDisplay->IsEntryChecked(IDM_kStargCaosFilter)) + { fDisplay->EnableEntry(IDM_kStargFindStar); + SwitchOff(fDisplay, IDM_kCaosFilter); + SwitchOff(fDisplay, IDM_kFindStar); + SwitchOff(fDisplay, IDM_kFilter); + } else + { + fDisplay->EnableEntry(IDM_kFilter); + fDisplay->EnableEntry(IDM_kFindStar); + fDisplay->EnableEntry(IDM_kCaosFilter); fDisplay->DisableEntry(IDM_kStargFindStar); + } return kTRUE; @@ -1805,13 +1699,4 @@ f.Execute(); - /* ---------------------------------- - // Visual StarFilter for Starguider - if (fDisplay->IsEntryChecked(IDM_kFilterStarg) && !fDisplay->IsEntryChecked(IDM_kStarguider)) { - f.SetBox(230); - f.AddIgnoreRegion(295,112,384,204); - f.Execute(530, 292); - } - ------------------------------------- */ - // Find Center of Camera for Caos and Tpoints Ring center(768/2, 576/2); Index: /trunk/MagicSoft/Cosy/main/MStarguider.h =================================================================== --- /trunk/MagicSoft/Cosy/main/MStarguider.h (revision 7784) +++ /trunk/MagicSoft/Cosy/main/MStarguider.h (revision 7785) @@ -124,4 +124,5 @@ void SetPixSize(const double pixsize); void Toggle(MGPopupMenu *p, UInt_t id); + void SwitchOff(MGPopupMenu *p, UInt_t id); void ToggleStargAnalysis(); void ToggleFindStar();