--- ray/src/px/ximage.c 1989/02/02 10:49:43 1.1 +++ ray/src/px/ximage.c 1989/11/29 17:42:27 1.16 @@ -29,6 +29,8 @@ static char SCCSid[] = "$SunId$ LBL"; #include "pic.h" +#include "random.h" + #define controlshift(e) (((XButtonEvent *)(e))->detail & (ShiftMask|ControlMask)) #define FONTNAME "9x15" /* text font we'll use */ @@ -38,9 +40,9 @@ static char SCCSid[] = "$SunId$ LBL"; #define BORWIDTH 5 /* border width */ #define BARHEIGHT 25 /* menu bar size */ -double gamcor = 2.0; /* gamcor correction */ +double gamcor = 2.2; /* gamma correction */ -XRASTER ourras; /* our stored raster image */ +XRASTER *ourras = NULL; /* our stored raster image */ int dither = 1; /* dither colors? */ int fast = 0; /* keep picture in Pixmap? */ @@ -51,6 +53,8 @@ Font fontid; /* our font */ int maxcolors = 0; /* maximum colors */ int greyscale = 0; /* in grey */ +int scale = 0; /* scalefactor; power of two */ + int xoff = 0; /* x image offset */ int yoff = 0; /* y image offset */ @@ -82,7 +86,7 @@ extern long ftell(); extern char *malloc(), *calloc(); -extern double atof(); +extern double atof(), pow(), log(); main(argc, argv) @@ -112,6 +116,11 @@ char *argv[]; case 'f': fast = !fast; break; + case 'e': + if (argv[i+1][0] != '+' && argv[i+1][0] != '-') + goto userr; + scale = atoi(argv[++i]); + break; case 'g': gamcor = atof(argv[++i]); break; @@ -130,13 +139,11 @@ char *argv[]; sprintf(errmsg, "can't open file \"%s\"", fname); quiterr(errmsg); } - } else - goto userr; - + } /* get header */ getheader(fin, headline); /* get picture dimensions */ - if (fscanf(fin, "-Y %d +X %d\n", &ymax, &xmax) != 2) + if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR)) quiterr("bad picture size"); /* set view parameters */ if (gotview) { @@ -154,7 +161,7 @@ char *argv[]; getevent(); /* main loop */ userr: fprintf(stderr, - "Usage: %s [=geometry][-b][-m][-d][-f][-c ncolors] file\n", + "Usage: %s [=geometry][-b][-m][-d][-f][-c ncolors][-e +/-stops] file\n", progname); quit(1); } @@ -163,7 +170,7 @@ userr: headline(s) /* get relevant info from header */ char *s; { - static char *altname[] = {"rview","rpict","VIEW=",NULL}; + static char *altname[] = {"rview","rpict",VIEWSTR,NULL}; register char **an; if (!strncmp(s, "EXPOSURE=", 9)) @@ -191,7 +198,6 @@ register char *s; init() /* get data and open window */ { register int i; - colormap ourmap; OpaqueFrame mainframe; char defgeom[32]; @@ -213,25 +219,9 @@ init() /* get data and open window */ maxcolors = 1< 4) maxcolors -= 2; } - ourras.width = xmax; - ourras.height = ymax; /* store image */ - if (maxcolors <= 2) { /* monochrome */ - ourras.data.m = (unsigned short *)malloc(BitmapSize(xmax,ymax)); - if (ourras.data.m == NULL) - goto memerr; - getmono(); - } else { - ourras.data.bz = (unsigned char *)malloc(BZPixmapSize(xmax,ymax)); - if (ourras.data.bz == NULL) - goto memerr; - if (greyscale) - biq(dither,maxcolors,1,ourmap); - else - ciq(dither,maxcolors,1,ourmap); - if (init_rcolors(&ourras, ourmap) == 0) - goto memerr; - } + getras(); + mainframe.bdrwidth = BORWIDTH; mainframe.border = WhitePixmap; mainframe.background = BlackPixmap; @@ -284,6 +274,37 @@ int code; } +getras() /* get raster file */ +{ + colormap ourmap; + + ourras = (XRASTER *)calloc(1, sizeof(XRASTER)); + if (ourras == NULL) + goto memerr; + ourras->width = xmax; + ourras->height = ymax; + if (maxcolors <= 2) { /* monochrome */ + ourras->data.m = (unsigned short *)malloc(BitmapSize(xmax,ymax)); + if (ourras->data.m == NULL) + goto memerr; + getmono(); + } else { + ourras->data.bz = (unsigned char *)malloc(BZPixmapSize(xmax,ymax)); + if (ourras->data.bz == NULL) + goto memerr; + if (greyscale) + biq(dither,maxcolors,1,ourmap); + else + ciq(dither,maxcolors,1,ourmap); + if (init_rcolors(ourras, ourmap) == 0) + goto memerr; + } + return; +memerr: + quit("out of memory"); +} + + getevent() /* process the next event */ { WindowInfo info; @@ -303,7 +324,7 @@ getevent() /* process the next event */ fixwindow(&e); break; case UnmapWindow: - unmap_rcolors(&ourras); + unmap_rcolors(ourras); break; case ButtonPressed: if (controlshift(&e)) @@ -326,10 +347,13 @@ redraw(x, y, w, h) /* redraw section of window */ int x, y; int w, h; { - map_rcolors(&ourras); + if (ourras->ncolors && map_rcolors(ourras) == NULL) { + fprintf(stderr, "%s: cannot allocate colors\n", progname); + return(-1); + } if (fast) - make_rpixmap(&ourras); - return(patch_raster(wind,x-xoff,y-yoff,x,y,w,h,&ourras) ? 0 : -1); + make_rpixmap(ourras); + return(patch_raster(wind,x-xoff,y-yoff,x,y,w,h,ourras) ? 0 : -1); } @@ -338,8 +362,10 @@ XKeyEvent *ekey; { char buf[80]; COLOR cval; + Color cvx; char *cp; int n; + double comp; FVECT rorg, rdir; cp = XLookupMapping(ekey, &n); @@ -347,7 +373,7 @@ XKeyEvent *ekey; return(0); switch (*cp) { /* interpret command */ case 'q': - case CTRL(D): /* quiterr */ + case CTRL(D): /* quit */ quit(0); case '\n': case '\r': @@ -361,18 +387,30 @@ XKeyEvent *ekey; sprintf(buf, "%-3g", intens(cval)/exposure); break; case 'l': /* luminance */ - sprintf(buf, "%-3gL", bright(cval)*683.0/exposure); + sprintf(buf, "%-3gn", bright(cval)*683.0/exposure); break; case 'c': /* color */ + comp = pow(2.0, (double)scale); sprintf(buf, "(%.2f,%.2f,%.2f)", - colval(cval,RED), - colval(cval,GRN), - colval(cval,BLU)); + colval(cval,RED)*comp, + colval(cval,GRN)*comp, + colval(cval,BLU)*comp); break; } XText(wind, box.xmin, box.ymin, buf, strlen(buf), fontid, BlackPixel, WhitePixel); return(0); + case 'i': /* identify (contour) */ + if (ourras->pixels == NULL) + return(-1); + n = ourras->data.bz[ekey->x-xoff+BZPixmapSize(xmax,ekey->y-yoff)]; + n = ourras->pmap[n]; + cvx.pixel = ourras->cdefs[n].pixel; + cvx.red = random() & 65535; + cvx.green = random() & 65535; + cvx.blue = random() & 65535; + XStoreColor(&cvx); + return(0); case 'p': /* position */ sprintf(buf, "(%d,%d)", ekey->x-xoff, ymax-1-ekey->y+yoff); XText(wind, ekey->x, ekey->y, buf, strlen(buf), @@ -389,7 +427,24 @@ XKeyEvent *ekey; printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]); fflush(stdout); return(0); + case '=': /* adjust exposure */ + if (avgbox(cval) == -1) + return(-1); + n = log(.5/bright(cval))/.69315 - scale; /* truncate */ + if (n == 0) + return(0); + scale_rcolors(ourras, pow(2.0, (double)n)); + scale += n; + sprintf(buf, "%+d", scale); + XText(wind, box.xmin, box.ymin, buf, strlen(buf), + fontid, BlackPixel, WhitePixel); + XFlush(); + free_raster(ourras); + getras(); + /* fall through */ case CTRL(R): /* redraw */ + case CTRL(L): + unmap_rcolors(ourras); XClear(wind); return(redraw(0, 0, width, height)); case ' ': /* clear */ @@ -507,7 +562,7 @@ getmono() /* get monochrome data */ if ((inline = (rgbpixel *)malloc(xmax*sizeof(rgbpixel))) == NULL || (cerr = (short *)calloc(xmax,sizeof(short))) == NULL) quit("out of memory in getmono"); - dp = ourras.data.m - 1; + dp = ourras->data.m - 1; for (y = 0; y < ymax; y++) { picreadline3(y, inline); err = 0; @@ -527,7 +582,7 @@ getmono() /* get monochrome data */ } -init_rcolors(xr, cmap) /* assign color values */ +init_rcolors(xr, cmap) /* (re)assign color values */ register XRASTER *xr; colormap cmap; { @@ -558,6 +613,34 @@ colormap cmap; } +scale_rcolors(xr, sf) /* scale color map */ +register XRASTER *xr; +double sf; +{ + register int i; + long maxv; + + if (xr->pixels == NULL) + return; + + sf = pow(sf, 1.0/gamcor); + maxv = 65535/sf; + + for (i = xr->ncolors; i--; ) { + xr->cdefs[i].red = xr->cdefs[i].red > maxv ? + 65535 : + xr->cdefs[i].red * sf; + xr->cdefs[i].green = xr->cdefs[i].green > maxv ? + 65535 : + xr->cdefs[i].green * sf; + xr->cdefs[i].blue = xr->cdefs[i].blue > maxv ? + 65535 : + xr->cdefs[i].blue * sf; + } + XStoreColors(xr->ncolors, xr->cdefs); +} + + getscan(y) int y; { @@ -582,35 +665,20 @@ picreadline3(y, l3) /* read in 3-byte scanline */ int y; register rgbpixel *l3; { - register BYTE *l4; - register int shift, c; - int i; - + register int i; + /* read scanline */ if (getscan(y) < 0) quiterr("cannot seek for picreadline"); /* convert scanline */ - for (l4=scanline[0], i=xmax; i--; l4+=4, l3++) { - shift = l4[EXP] - COLXS; - if (shift >= 8) { - l3->r = l3->g = l3->b = 255; - } else if (shift <= -8) { - l3->r = l3->g = l3->b = 0; - } else if (shift > 0) { - c = l4[RED] << shift; - l3->r = c > 255 ? 255 : c; - c = l4[GRN] << shift; - l3->g = c > 255 ? 255 : c; - c = l4[BLU] << shift; - l3->b = c > 255 ? 255 : c; - } else if (shift < 0) { - l3->r = l4[RED] >> -shift; - l3->g = l4[GRN] >> -shift; - l3->b = l4[BLU] >> -shift; - } else { - l3->r = l4[RED]; - l3->g = l4[GRN]; - l3->b = l4[BLU]; - } + if (scale != 0) + for (i = 0; i < xmax; i++) + if (scanline[i][EXP]+scale >= 0) + scanline[i][EXP] += scale; + normcolrs(scanline, xmax); + for (i = 0; i < xmax; i++) { + l3[i].r = scanline[i][RED]; + l3[i].g = scanline[i][GRN]; + l3[i].b = scanline[i][BLU]; } } @@ -619,11 +687,11 @@ picwriteline(y, l) /* add 8-bit scanline to image */ int y; pixel *l; { - bcopy(l, ourras.data.bz+BZPixmapSize(xmax,y), BZPixmapSize(xmax,1)); + bcopy(l, ourras->data.bz+BZPixmapSize(xmax,y), BZPixmapSize(xmax,1)); } -picreadcm(map) /* do gamcor correction */ +picreadcm(map) /* do gamma correction */ colormap map; { extern double pow(); @@ -639,4 +707,10 @@ colormap map; picwritecm(map) /* handled elsewhere */ colormap map; { +#ifdef DEBUG + register int i; + + for (i = 0; i < 256; i++) + printf("%d %d %d\n", map[0][i],map[1][i],map[2][i]); +#endif }