772 |
|
d = ambval(); |
773 |
|
sprintf(op, " -av %.2g %.2g %.2g", d, d, d); |
774 |
|
op += strlen(op); |
775 |
< |
op = addarg(op, "-lr 6 -lw .01"); |
775 |
> |
op = addarg(op, "-lr 6 -lw .003"); |
776 |
|
} |
777 |
|
|
778 |
|
|
850 |
|
d = ambval(); |
851 |
|
sprintf(op, " -av %.2g %.2g %.2g", d, d, d); |
852 |
|
op += strlen(op); |
853 |
< |
op = addarg(op, "-lr 8 -lw .002"); |
853 |
> |
op = addarg(op, "-lr 8 -lw 1e-4"); |
854 |
|
} |
855 |
|
|
856 |
|
|
926 |
|
d = ambval(); |
927 |
|
sprintf(op, " -av %.2g %.2g %.2g", d, d, d); |
928 |
|
op += strlen(op); |
929 |
< |
op = addarg(op, "-lr 12 -lw .0005"); |
929 |
> |
op = addarg(op, "-lr 12 -lw 1e-5"); |
930 |
|
} |
931 |
|
|
932 |
|
|
1261 |
|
) |
1262 |
|
{ |
1263 |
|
#define do_rpiece (sfile[0]!='\0') |
1264 |
< |
char combuf[4*PATH_MAX+512]; |
1264 |
> |
char combuf[5*PATH_MAX+512]; |
1265 |
|
char rawfile[PATH_MAX], picfile[PATH_MAX]; |
1266 |
|
char zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32]; |
1267 |
< |
char rppopt[128], sfile[64], *pfile = NULL; |
1267 |
> |
char rppopt[32], sfile[PATH_MAX], *pfile = NULL; |
1268 |
|
char pfopts[128]; |
1269 |
|
char vs[32], *vw; |
1270 |
|
int vn, mult; |
1271 |
|
FILE *fp; |
1272 |
|
time_t rfdt, pfdt; |
1273 |
+ |
int xres, yres; |
1274 |
+ |
double aspect; |
1275 |
+ |
int n; |
1276 |
|
/* get pfilt options */ |
1277 |
|
pfiltopts(pfopts); |
1278 |
|
/* get resolution, reporting */ |
1287 |
|
mult = 3; |
1288 |
|
break; |
1289 |
|
} |
1290 |
< |
{ |
1291 |
< |
int xres, yres; |
1292 |
< |
double aspect; |
1293 |
< |
int n; |
1294 |
< |
n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect); |
1295 |
< |
if (n == 3) |
1296 |
< |
sprintf(res, "-x %d -y %d -pa %.3f", |
1297 |
< |
mult*xres, mult*yres, aspect); |
1298 |
< |
else if (n) { |
1299 |
< |
if (n == 1) yres = xres; |
1297 |
< |
sprintf(res, "-x %d -y %d", mult*xres, mult*yres); |
1298 |
< |
} else |
1299 |
< |
badvalue(RESOLUTION); |
1300 |
< |
} |
1290 |
> |
n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect); |
1291 |
> |
if (n == 3) |
1292 |
> |
sprintf(res, "-x %d -y %d -pa %.3f", |
1293 |
> |
mult*xres, mult*yres, aspect); |
1294 |
> |
else if (n) { |
1295 |
> |
aspect = 1.; |
1296 |
> |
if (n == 1) yres = xres; |
1297 |
> |
sprintf(res, "-x %d -y %d", mult*xres, mult*yres); |
1298 |
> |
} else |
1299 |
> |
badvalue(RESOLUTION); |
1300 |
|
rep[0] = '\0'; |
1301 |
|
if (vdef(REPORT)) { |
1302 |
|
double minutes; |
1304 |
– |
int n; |
1303 |
|
n = sscanf(vval(REPORT), "%lf %s", &minutes, rawfile); |
1304 |
|
if (n == 2) |
1305 |
|
sprintf(rep, " -t %d -e %s", (int)(minutes*60), rawfile); |
1314 |
|
getview(0, vs) != NULL) { |
1315 |
|
if (!strcmp(c_rpict, DEF_RPICT_PATH) && |
1316 |
|
getview(1, NULL) == NULL) { |
1317 |
< |
sprintf(sfile, "rpsync_%s.txt", vs); |
1317 |
> |
sprintf(sfile, "%s_%s_rpsync.txt", |
1318 |
> |
vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), |
1319 |
> |
vs); |
1320 |
|
strcpy(rppopt, "-PP pfXXXXXX"); |
1321 |
|
} else { |
1322 |
|
strcpy(rppopt, "-S 1 -PP pfXXXXXX"); |
1359 |
|
if (do_rpiece) { |
1360 |
|
if (rfdt < oct1date || !fdate(sfile)) { |
1361 |
|
int xdiv = 8+nprocs/3, ydiv = 8+nprocs/3; |
1362 |
< |
rfdt = 0; /* start fresh */ |
1362 |
> |
if (rfdt >= oct1date) { |
1363 |
> |
fprintf(stderr, |
1364 |
> |
"%s: partial output not created with rpiece\n", rawfile); |
1365 |
> |
quit(1); |
1366 |
> |
} |
1367 |
> |
if (rfdt) { /* start fresh */ |
1368 |
> |
rmfile(rawfile); |
1369 |
> |
rfdt = 0; |
1370 |
> |
} |
1371 |
|
if (!silent) |
1372 |
|
printf("\techo %d %d > %s\n", |
1373 |
|
xdiv, ydiv, sfile); |
1454 |
|
} |
1455 |
|
if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) { |
1456 |
|
/* build pfilt command */ |
1457 |
< |
if (mult > 1) |
1457 |
> |
if (do_rpiece) |
1458 |
> |
sprintf(combuf, |
1459 |
> |
"%s%s -x %d -y %d -p %.3f %s > %s", |
1460 |
> |
c_pfilt, pfopts, xres, yres, aspect, |
1461 |
> |
rawfile, picfile); |
1462 |
> |
else if (mult > 1) |
1463 |
|
sprintf(combuf, "%s%s -x /%d -y /%d %s > %s", |
1464 |
|
c_pfilt, pfopts, mult, mult, |
1465 |
|
rawfile, picfile); |