Changeset 1816 for trunk

Timestamp:

03/12/03 14:05:24 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• gui/MGPngReader.cc (modified) (3 diffs)
• gui/MGStarguider.cc (modified) (1 diff)
• videodev/Writer.cc (modified) (2 diffs)
• videodev/Writer.h (modified) (1 diff)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2003/03/12 - Daniela Dorner, Thomas Bretz:
+
+   * gui/MGPngReader.cc, gui/MGStarguider.cc, videodev/Writer.[h,cc]:
+     - changed output file names to contain mjd
+     - fixed a cast warning
+
+
+
  2003/03/11 - Daniela Dorner, Thomas Bretz:
 

trunk/MagicSoft/Cosy/gui/MGPngReader.cc

@@ -553 +553 @@
     }
 
-    fFile = new TFile("leds.root", "RECREATE");
+    fFile = new TFile(name, "RECREATE");
 
     if (!fFile->IsOpen())
@@ -999 +999 @@
     {
         if (fFileType->IsEntryChecked(IDM_kPNG))
-        {
-            static int num = 0;
-            char name[80];
-            sprintf(name, "pix/file%04d.png", num++);
-            Writer::Png(name, c, tm);
-        }
+            Writer::Png("pix/file", c, tm);
 
         if (fFileType->IsEntryChecked(IDM_kPPM))
-        {
-            static int num = 0;
-            char name[80];
-            sprintf(name, "pix/file%04d.ppm", num++);
-            Writer::Ppm(name, c);
-        }
+            Writer::Ppm("pix/file", c, tm);
 
         if (fWriteType->IsEntryChecked(IDM_kOnce))
@@ -1149 +1139 @@
 void MGPngReader::DrawCircle(byte *img, double r)
 {
-    const double rpix = (int)(r*60*60/fSao->GetPixSize()+1);
+    const double rpix = r*60*60/fSao->GetPixSize()+1;
     const int cx = 768/2;
     const int cy = 576/2;
-    for (int dx=-rpix*0.7; dx<rpix*0.7; dx++)
+    for (int dx=-(int)(rpix*0.7); dx<(int)(rpix*0.7); dx++)
     {
         const int dy = (int)sqrt(rpix*rpix-dx*dx);

trunk/MagicSoft/Cosy/gui/MGStarguider.cc

@@ -572 +572 @@
     {
         if (fFileType->IsEntryChecked(IDM_kPNG))
-        {
-            static int num = 0;
-            char name[80];
-            sprintf(name, "pix/file%04d.png", num++);
-            Writer::Png(name, c, tm);
-        }
+            Writer::Png("pix/file", c, tm);
 
         if (fFileType->IsEntryChecked(IDM_kPPM))
-        {
-            static int num = 0;
-            char name[80];
-            sprintf(name, "pix/file%04d.ppm", num++);
-            Writer::Ppm(name, c);
-        }
+            Writer::Ppm("pix/file", c, tm);
 
         if (fWriteType->IsEntryChecked(IDM_kOnce))

trunk/MagicSoft/Cosy/videodev/Writer.cc

@@ -14 +14 @@
                  struct timeval *date)
 {
-    cout << "Writing PNG '" << fname << "'" << endl;
+    TString name = fname;
+
+    Timer t(date);
+
+    name += "_";
+    name += t.GetMjd()-52000;
+    name += ".png";
+
+    cout << "Writing PNG '" << name << "'" << endl;
 
     //
     // open file
     //
-    FILE *fd = fopen(fname, "w");
+    FILE *fd = fopen(name, "w");
     if (!fd)
     {
@@ -113 +121 @@
 }
 
-void Writer::Ppm(const char *fname, const byte *img)
+void Writer::Ppm(const char *fname, const byte *img, struct timeval *date)
 {
-    cout << "Writing PPM '" << fname << "'" << endl;
+    TString name = fname;
+
+    Timer t(date);
+
+    name += "_";
+    name += t.GetMjd()-52000;
+    name += ".ppm";
+
+    cout << "Writing PPM '" << name << "'" << endl;
 
     //
     // open file for writing
     //
-    ofstream fout(fname);
+    ofstream fout(name);
     if (!fout)
     {

trunk/MagicSoft/Cosy/videodev/Writer.h

@@ -17 +17 @@
 public:
 
-    static void Ppm(const char *fname, const byte *img);
+    static void Ppm(const char *fname, const byte *img, struct timeval *date);
     static void Png(const char *fname, const byte *buf, struct timeval *date);