Changeset 1816 for trunk/MagicSoft/Cosy/gui

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/gui

Files:

• MGPngReader.cc (modified) (3 diffs)
• MGStarguider.cc (modified) (1 diff)

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))