Changeset 9495 for trunk

Timestamp:

08/17/09 12:19:59 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• tpoint/TPointGui.cc (modified) (13 diffs)
• tpoint/TPointGui.h (modified) (3 diffs)
• tpoint/bending090817_m1.mod (added)
• tpoint/bending090817_m2.mod (added)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2009/08/17 Thomas Bretz
+
+   * tpoint/TPointGui.[h,cc]:
+     - keep different paths in memory for collections and models
+     - show kept collection in window title
+     - added option to set a limiting magnitude for the fit
+     - setup a new default for the coefficients
+     - set new icon and window names
+
+
 
  2009/05/12 Thomas Bretz (La Palma)

trunk/MagicSoft/Cosy/tpoint/TPointGui.cc

@@ -34 +34 @@
 
 TPointGui::TPointGui(const char *fname, const char *mod) : TGMainFrame(gClient->GetRoot(), 750, 435, kHorizontalFrame), fExitLoopOnClose(kFALSE),
-   fAzMin(-180), fAzMax(180), fZdMin(0), fZdMax(90), fLimit(0.05)
+   fAzMin(-180), fAzMax(180), fZdMin(0), fZdMax(90), fMagMin(0), fLimit(0.05)
 {
     fCoordinates.SetOwner();
@@ -192 +192 @@
     TGLabel *label1 = new TGLabel(v1, "Az min/°");
     TGLabel *label2 = new TGLabel(v2, "Az max/°");
-    TGLabel *label3 = new TGLabel(v3, "Limit/°");
+    TGLabel *label3 = new TGLabel(v3, "Mag min");
     TGLabel *label4 = new TGLabel(v1, "Zd min/°");
     TGLabel *label5 = new TGLabel(v2, "Zd max/°");
@@ -209 +209 @@
     fList->Add(label6);
 
-    TGTextEntry *entry1 = new TGTextEntry(v1, Form("%.1f", fAzMin), kIdAzMin);
-    TGTextEntry *entry2 = new TGTextEntry(v2, Form("%.1f", fAzMax), kIdAzMax);
-    TGTextEntry *entry3 = new TGTextEntry(v3, " ", -1);
-    TGTextEntry *entry4 = new TGTextEntry(v1, Form("%.1f", fZdMin), kIdZdMin);
-    TGTextEntry *entry5 = new TGTextEntry(v2, Form("%.1f", fZdMax), kIdZdMax);
-    TGTextEntry *entry6 = new TGTextEntry(v3, Form("%.3f", fLimit), kIdLimit);
-    entry3->SetEnabled(kFALSE);
+    TGTextEntry *entry1 = new TGTextEntry(v1, Form("%.1f", fAzMin),  kIdAzMin);
+    TGTextEntry *entry2 = new TGTextEntry(v2, Form("%.1f", fAzMax),  kIdAzMax);
+    TGTextEntry *entry3 = new TGTextEntry(v3, Form("%.1f", fMagMin), kIdMagMin);
+    TGTextEntry *entry4 = new TGTextEntry(v1, Form("%.1f", fZdMin),  kIdZdMin);
+    TGTextEntry *entry5 = new TGTextEntry(v2, Form("%.1f", fZdMax),  kIdZdMax);
+    TGTextEntry *entry6 = new TGTextEntry(v3, Form("%.3f", fLimit),  kIdLimit);
     entry1->SetToolTipText("TPoints with a real star located at Az<Az min are ignored in the fit.");
     entry2->SetToolTipText("TPoints with a real star located at Az>Az max are ignored in the fit.");
+    entry2->SetToolTipText("TPoints with a artifiical magnitude Mag<Mag min are ignored in the fit.");
     entry4->SetToolTipText("TPoints with a real star located at Zd<Zd min are ignored in the fit.");
     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);
     ((TGCheckButton*)fList->FindWidget(1))->SetState(kButtonDown);
+    ((TGCheckButton*)fList->FindWidget(5))->SetState(kButtonDown);
     ((TGCheckButton*)fList->FindWidget(6))->SetState(kButtonDown);
-    ((TGCheckButton*)fList->FindWidget(10))->SetState(kButtonDown);
-    ((TGCheckButton*)fList->FindWidget(12))->SetState(kButtonDown);
+    ((TGCheckButton*)fList->FindWidget(9))->SetState(kButtonDown);
+    ((TGCheckButton*)fList->FindWidget(11))->SetState(kButtonDown);
+    ((TGCheckButton*)fList->FindWidget(15))->SetState(kButtonDown);
+    ((TGCheckButton*)fList->FindWidget(16))->SetState(kButtonDown);
     ((TGCheckButton*)fList->FindWidget(17))->SetState(kButtonDown);
 
@@ -266 +269 @@
     ((TGCheckButton*)fList->FindWidget(22+2*MPointing::GetNumPar()))->SetState(kButtonDisabled);
 
-    SetWindowName("TPoint Fitting Window");
-    SetIconName("TPoint++");
+    SetWindowName("Telesto");
+    SetIconName("Telesto");
 
     Layout();
@@ -306 +309 @@
 
         if (set.GetStarZd()<fZdMin || set.GetStarZd()>fZdMax ||
-            set.GetStarAz()<fAzMin || set.GetStarAz()>fAzMax)
+            set.GetStarAz()<fAzMin || set.GetStarAz()>fAzMax ||
+            set.GetMag()   <fMagMin)
             continue;
 
@@ -582 +586 @@
 }
 
-TString TPointGui::OpenDialog(EFileDialogMode mode)
+TString TPointGui::OpenDialog(TString &dir, EFileDialogMode mode)
 {
     static const char *gOpenTypes[] =
@@ -593 +597 @@
     };
 
-    static TString dir("tpoint/");
+    //static TString dir("tpoint/");
 
     TGFileInfo fi; // fFileName and fIniDir deleted in ~TGFileInfo
@@ -648 +652 @@
         LoadCollection(fname);
         fFileNameStars = fname;
+        SetWindowName(Form("Telesto (%s)", fFileNameStars.Data()));
         return;
     }
@@ -683 +688 @@
 
     fFileNameStars = fname;
+    SetWindowName(Form("Telesto (%s)", fFileNameStars.Data()));
 }
 
@@ -694 +700 @@
     // cout << "Msg: " << hex << GET_MSG(msg) << endl;
     // cout << "SubMsg: " << hex << GET_SUBMSG(msg) << dec << endl;
+
+    static TString dirmod("tpoint/");
+    static TString dircol("tpoint/");
+
     switch (GET_MSG(msg))
     {
@@ -713 +723 @@
                 return kTRUE;
             case kTbLoad:
-                fBending.Load(OpenDialog());
+                fBending.Load(OpenDialog(dirmod));
                 DisplayBending();
                 return kTRUE;
             case kTbSave:
-                fBending.Save(OpenDialog(kFDSave));
+                fBending.Save(OpenDialog(dirmod, kFDSave));
                 return kTRUE;
             case kTbLoadStars:
-                LoadStars(OpenDialog());
+                LoadStars(OpenDialog(dircol));
                 DisplayData();
                 return kTRUE;
@@ -762 +772 @@
             case kIdZdMax:
                 fZdMax = GetFloat(kIdZdMax);
+                return kTRUE;
+            case kIdMagMin:
+                fMagMin = GetFloat(kIdMagMin);
                 return kTRUE;
             case kIdLimit:

trunk/MagicSoft/Cosy/tpoint/TPointGui.h

@@ -33 +33 @@
         kIdZdMin,
         kIdZdMax,
+        kIdMagMin,
         kIdLimit,
     };
@@ -54 +55 @@
     Float_t fZdMin;
     Float_t fZdMax;
+    Float_t fMagMin;
 
     Float_t fLimit;
@@ -74 +76 @@
     void DrawHorizon(TVirtualPad *pad, const char *fname="horizon.dat") const;
 
-    TString OpenDialog(EFileDialogMode mode=kFDOpen);
+    TString OpenDialog(TString &dir, EFileDialogMode mode=kFDOpen);
 
     void LoadCollection(TString fname);