Changeset 748 for trunk

Timestamp:

04/10/01 12:20:13 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (added)
• Makefile (modified) (1 diff)
• Starguider.cc (modified) (4 diffs)
• Starguider.h (modified) (1 diff)
• base/File.cc (modified) (1 diff)
• base/File.h (modified) (1 diff)
• catalog/SaoFile.cc (modified) (1 diff)
• catalog/StarCatalog.cc (modified) (2 diffs)
• sao (added)
• sao/link (added)

trunk/MagicSoft/Cosy/Makefile

@@ -57 +57 @@
 
 #------------------------------------------------------------------------------
-#.SILENT:
+.SILENT:
 
 .SUFFIXES: .c .cc .h .o 

trunk/MagicSoft/Cosy/Starguider.cc

@@ -30 +30 @@
     IDM_kRate30s,
     IDM_kRate1m,
-    IDM_kRate5m
+    IDM_kRate5m,
+    IDM_kSetup,
+    IDM_kLimMag3,
+    IDM_kLimMag4,
+    IDM_kLimMag5,
+    IDM_kLimMag6,
+    IDM_kLimMag7,
+    IDM_kLimMag8,
+    IDM_kLimMag9
 };
 
@@ -88 +96 @@
     fList.Add(fWrite);
 
+    fLimMag = new TGPopupMenu(p);
+    fLimMag->AddEntry("3", IDM_kLimMag3);
+    fLimMag->AddEntry("4", IDM_kLimMag4);
+    fLimMag->AddEntry("5", IDM_kLimMag5);
+    fLimMag->AddEntry("6", IDM_kLimMag6);
+    fLimMag->AddEntry("7", IDM_kLimMag7);
+    fLimMag->AddEntry("8", IDM_kLimMag8);
+    fLimMag->AddEntry("9", IDM_kLimMag9);
+    fLimMag->CheckEntry(IDM_kLimMag8);
+    fLimMag->Associate(this);
+    fList.Add(fLimMag);
+
+    fSao.SetLimitMag(8.0);
+
+    fSetup = new TGPopupMenu(p);
+    fSetup->AddPopup("Lim. &Magnitude", fLimMag);
+    fSetup->Associate(this);
+    fList.Add(fSetup);
+
     fMenu = new TGMenuBar(this, 0, 0, kHorizontalFrame);
     fMenu->AddPopup("&Display", fDisplay, NULL);
     fMenu->AddPopup("&Write",   fWrite,   NULL);
+    fMenu->AddPopup("&Setup",   fSetup,   NULL);
     fMenu->Resize(fMenu->GetDefaultSize());
     AddFrame(fMenu); //, new TGLayoutHints (kLHintsNormal, 0, 4, 0, 0));
@@ -128 +156 @@
     MapWindow();
 
-
-    fSao.SetLimitMag(9.0);
     fSao.SetPixSize(0.006);
 }
@@ -243 +269 @@
                 }
                 return kTRUE;
+
+            case IDM_kLimMag3:
+            case IDM_kLimMag4:
+            case IDM_kLimMag5:
+            case IDM_kLimMag6:
+            case IDM_kLimMag7:
+            case IDM_kLimMag8:
+            case IDM_kLimMag9:
+                for (int i=IDM_kLimMag3; i<=IDM_kLimMag9; i++)
+                    if (mp1==i)
+                        fLimMag->CheckEntry(i);
+                    else
+                        fLimMag->UnCheckEntry(i);
+
+                fSao.SetLimitMag(mp1-IDM_kLimMag3+3);
+                return kTRUE;
             }
             break;

trunk/MagicSoft/Cosy/Starguider.h

@@ -32 +32 @@
     TGPopupMenu   *fWriteType;
     TGPopupMenu   *fWriteRate;
+    TGPopupMenu   *fSetup;
+    TGPopupMenu   *fLimMag;
 
     MGCoordinates *fCRaDec;

trunk/MagicSoft/Cosy/base/File.cc

@@ -6 +6 @@
 {
     f = fopen(name, flags);
+    if (!f)
+        printf("WARNING: Cannot open '%s'\n", name);
 }
 

trunk/MagicSoft/Cosy/base/File.h

@@ -27 +27 @@
     void Newline() const;
     void Skip(int cnt) const;
+
+    int operator!() { return !f; }
 };
 

trunk/MagicSoft/Cosy/catalog/SaoFile.cc

@@ -66 +66 @@
 {
     file = new File(name, "r");
+
+    if (!*file)
+        exit(0);
 
     compressed = !strcasecmp(name+strlen(name)-4, ".cmp");

trunk/MagicSoft/Cosy/catalog/StarCatalog.cc

@@ -28 +28 @@
     // read index file
     //
-    File idx("sao-sort.idx", "r");
+    File idx("sao/sao-sort.idx", "r");
+
+    if (!idx)
+        exit(0);
+
     while (!idx.Eof())
     {
@@ -50 +54 @@
     // open catalog
     //
-    fSao = new SaoFile("sao-sort.cmp");
+    fSao = new SaoFile("sao/sao-sort.cmp");
 }