Changeset 12166

Timestamp:

06/22/09 18:23:38 (8 months ago)

Author:

dstn

Message:

tilerender: configurable bg color; match files

Location:

trunk/src/astrometry/render

Files:

• render_match.c (modified) (2 diffs)
• render_skdt.c (modified) (2 diffs)
• render_solid.c (modified) (1 diff)
• render_solid.h (modified) (1 diff)
• tilerender.c (modified) (1 diff)

trunk/src/astrometry/render/render_match.c

@@ -28 +28 @@
 int render_match(cairo_t* cairo, render_args_t* args) {
         int i, I;
-
-        cairo_set_source_rgba(cairo, 0,1,0,1);
+        double edge_rgba[] = { 0,1,0,1 };
+        double face_rgba[] = { 1,1,1,0 };
 
         for (I=0; I<sl_size(args->arglist); I++) {
@@ -51 +51 @@
                                         xyzarr2radecdegarr(mo->quadxyz + 3*i, radec + 2*i);
                                 quad_radec_to_xy(args, radec, xy, mo->dimquads);
+
                                 cairoutils_draw_path(cairo, xy, mo->dimquads);
                                 cairo_close_path(cairo);
+                                cairo_set_source_rgba(cairo, face_rgba[0], face_rgba[1], face_rgba[2], face_rgba[3]);
+                                cairo_fill(cairo);
+
+                                cairoutils_draw_path(cairo, xy, mo->dimquads);
+                                cairo_close_path(cairo);
+                                cairo_set_source_rgba(cairo, edge_rgba[0], edge_rgba[1], edge_rgba[2], edge_rgba[3]);
                                 cairo_stroke(cairo);
                         }
-                } else if (starts_with(arg, "matchrgba ")) {
-                        double rgba[4];
-                        if (parse_rgba_arg(arg, rgba)) {
+                } else if (starts_with(arg, "match_edge_rgba ")) {
+                        if (parse_rgba_arg(arg, edge_rgba)) {
                                 return -1;
                         }
-                        cairo_set_source_rgba(cairo, rgba[0], rgba[1], rgba[2], rgba[3]);
+                } else if (starts_with(arg, "match_face_rgba ")) {
+                        if (parse_rgba_arg(arg, face_rgba)) {
+                                return -1;
+                        }
                 }
         }

trunk/src/astrometry/render/render_skdt.c

@@ -26 +26 @@
         double r2;
         double p1[3], p2[3];
+        double rgba[4];
 
         fns = sl_new(256);
         get_string_args_of_type(args, "skdt ", fns);
+
+        if (!get_first_rgba_arg_of_type(args, "skdtrgba ", rgba)) {
+                cairo_set_source_rgba(cairo, rgba[0], rgba[1], rgba[2], rgba[3]);
+        } else {
+                cairo_set_source_rgba(cairo, 0,1,0,1);
+        }
 
     logmsg("got %i skdt files.\n", sl_size(fns));
@@ -36 +43 @@
         star_midpoint(center, p1, p2);
         r2 = distsq(p1, center, 3);
-
-        cairo_set_source_rgba(cairo, 0,1,0,1);
 
         for (i=0; i<sl_size(fns); i++) {

trunk/src/astrometry/render/render_solid.c

@@ -23 +23 @@
 #include "render_solid.h"
 
-static void logmsg(char* format, ...) {
-    va_list args;
-    va_start(args, format);
-    fprintf(stderr, "render_solid: ");
-    vfprintf(stderr, format, args);
-    va_end(args);
-}
-
-int render_solid(unsigned char* img, render_args_t* args) {
-    int i, j;
-
-    logmsg("render_solid: filling with RGBA=(0,0,0,255)\n");
-
-    for (j=0; j<args->H; j++) {
-        for (i=0; i<args->W; i++) {
-            uchar* pix = pixel(i, j, img, args);
-            pix[0] = 0;
-            pix[1] = 0;
-            pix[2] = 0;
-            pix[3] = 255;
-        }
-    }
+int render_solid(cairo_t* cairo, render_args_t* args) {
+        double rgba[] = { 0,0,0,1 };
+        get_first_rgba_arg_of_type(args, "solid_rgba ", rgba);
+        cairo_set_source_rgba(cairo, rgba[0], rgba[1], rgba[2], rgba[3]);
+        cairo_paint(cairo);
     return 0;
 }

trunk/src/astrometry/render/render_solid.h

@@ -21 +21 @@
 #include "tilerender.h"
 
-int render_solid(unsigned char* img, render_args_t* args);
+int render_solid(cairo_t* cairo, render_args_t* args);
 
 #endif

trunk/src/astrometry/render/tilerender.c

@@ -171 +171 @@
         { "clean",     render_usnob,        NULL },
         { "dirty",     render_usnob,        NULL },
-        { "solid",     render_solid,        NULL },
+        { "solid",     NULL,                render_solid },
         { "images",    render_images,       NULL },
         { "userimage", render_images,       NULL },