Changeset 29938 for trunk/Ohana/src/kapa2/src/bDrawOverlay.c

Timestamp:

Dec 5, 2010, 10:04:42 PM (16 years ago)

Author:

eugene

Message:

handle errors in dvo I/O functions; better support for DIS images; merge in high-speed mods from Niall; systematic errors in astrometry (somewhat hackish); add fits I/O option to succeed reading a short file (padding as needed); various kapa improvements (frames consistent in X, PS, PNG; fix tick label signif digits; add function for image overlays; better thick box lines; PNG of the image); bDrawBuffer mods to drop static buffer and refer to passed through buffer; ResizeByImage; DefineSectionByImage; buutos to do png & jpeg; add program roc for raid over cluster; support for mosaic photcodes in dvo image plot; densify; section name [-image x y] : width based on current image; resize -by-image; threaded addstar -resort; threaded dvomerge; dvorepair; dvoverify; dvomerge continue; dvomerge from list (of regions)

File:

• trunk/Ohana/src/kapa2/src/bDrawOverlay.c (modified) (6 diffs)

trunk/Ohana/src/kapa2/src/bDrawOverlay.c

@@ -4 +4 @@
 static char name[4][16] = {"red", "green", "blue", "yellow"};
 
-void bDrawOverlay (KapaImageWidget *image, int N) {
+void bDrawOverlay (bDrawBuffer *buffer, KapaImageWidget *image, int N) {
 
   int i;
@@ -14 +14 @@
   /* translate color to bDrawColors : image[0].overlay[N].color */
   color = KapaColorByName (name[N]);
-  bDrawSetStyle (color, 0, 0);
+  bDrawSetStyle (buffer, color, 0, 0);
   
   expand = 1.0;
@@ -57 +57 @@
     switch (image[0].overlay[N].objects[i].type) {
       case KII_OVERLAY_LINE:
-        bDrawLine (X, Y, (X+dX), (Y+dY));
+        bDrawLine (buffer, X, Y, (X+dX), (Y+dY));
         break;
       case KII_OVERLAY_TEXT:
-        bDrawRotText (X, Y, image[0].overlay[N].objects[i].text, 8, 0.0);
+        bDrawRotText (buffer, X, Y, image[0].overlay[N].objects[i].text, 8, 0.0);
         break;
       case KII_OVERLAY_BOX:
         dx = MAX (abs(dX),2) / 2;
         dy = MAX (abs(dY),2) / 2;
-        bDrawRectOpen ((X-dx), (Y-dy), (X+dx), (Y+dy));
-        // bDrawRectOpen ((X-dx), (Y-dy), (X), (Y));
+        bDrawRectOpen (buffer, (X-dx), (Y-dy), (X+dx), (Y+dy));
+        // bDrawRectOpen (buffer, (X-dx), (Y-dy), (X), (Y));
         break;
       case KII_OVERLAY_CIRCLE:
@@ -72 +72 @@
         dy = MAX (abs(dY),2);
         if (image[0].overlay[N].objects[i].angle == 0.0) {
-          bDrawArc (X, Y, dx, dy, 0, 360);
+          bDrawArc (buffer, X, Y, dx, dy, 0, 360);
         } else {
           // moderately-stupid rotated ellipse drawing:
@@ -88 +88 @@
             x1 = X + pX*dx*cos(t)*cs - pX*dy*sin(t)*sn;
             y1 = Y + pY*dx*cos(t)*sn + pY*dy*sin(t)*cs;
-            bDrawLine (x0, y0, x1, y1);
+            bDrawLine (buffer, x0, y0, x1, y1);
             x0 = x1;
             y0 = y1;
@@ -101 +101 @@
   
   /* translate color to bDrawColors : image[0].overlay[N].color */
-  bDrawSetStyle (color, 0, 0);
+  bDrawSetStyle (buffer, color, 0, 0);
 }