1
0
mirror of git://projects.qi-hardware.com/ben-scans.git synced 2024-11-22 08:49:42 +02:00

solidify: set the initial height to the median; uncompress .bz2 on the fly.

- solidify/Makefile, solidify/histo.h, solidify/histo.c: generate a Z
  histogram and find the median height
- solidify/face.c (read_face): set z_ref to the median, not the average
- solidify/face.c (read_face): uncompress .bz2 files on the fly
- solidify/face.c (read_face): don't close standard input (for style)
This commit is contained in:
Werner Almesberger 2010-09-22 17:40:03 -03:00
parent 5f84394774
commit ecf993e0f2
4 changed files with 86 additions and 7 deletions

View File

@ -1,7 +1,7 @@
CFLAGS=-Wall -g `pkg-config --cflags gtk+-2.0` CFLAGS=-Wall -g `pkg-config --cflags gtk+-2.0`
LDFLAGS=-lm `pkg-config --libs gtk+-2.0` LDFLAGS=-lm `pkg-config --libs gtk+-2.0`
OBJS=array.o face.o level.o solidify.o OBJS=array.o face.o histo.o level.o solidify.o
.PHONY: all clean .PHONY: all clean

View File

@ -5,6 +5,7 @@
#include "util.h" #include "util.h"
#include "array.h" #include "array.h"
#include "histo.h"
#include "face.h" #include "face.h"
@ -12,14 +13,33 @@ struct face *read_face(const char *name)
{ {
FILE *file; FILE *file;
struct face *f; struct face *f;
struct histo *h;
float x, y, z; float x, y, z;
int xi, yi, zi; int xi, yi, zi;
file = strcmp(name, "-") ? fopen(name, "r") : stdin; if (!strcmp(name, "-")) {
file = stdin;
} else {
int len;
len = strlen(name);
if (len > 4 && !strcmp(name+len-4, ".bz2")) {
char tmp[1000]; /* @@@ enough */
sprintf(tmp, "bzcat \"%s\"", name);
file = popen(tmp, "r");
if (!file) {
perror(tmp);
exit(1);
}
} else {
file = fopen(name, "r");
if (!file) { if (!file) {
perror(name); perror(name);
exit(1); exit(1);
} }
}
}
f = alloc_type(struct face); f = alloc_type(struct face);
f->a = new_array(); f->a = new_array();
@ -30,11 +50,14 @@ struct face *read_face(const char *name)
zi = round(z*40.0); zi = round(z*40.0);
set(f->a, xi, yi, zi); set(f->a, xi, yi, zi);
} }
if (file != stdin)
(void) fclose(file); (void) fclose(file);
f->sx = f->a->max_x-f->a->min_x+1; f->sx = f->a->max_x-f->a->min_x+1;
f->sy = f->a->max_y-f->a->min_y+1; f->sy = f->a->max_y-f->a->min_y+1;
f->z_ref = (f->a->min_z+f->a->max_z)/2; h = make_histo(f->a);
f->z_ref = f->a->min_z+median(h);
free_histo(h);
fprintf(stderr, "%d-%d / %d-%d / %d-%d\n", fprintf(stderr, "%d-%d / %d-%d / %d-%d\n",
f->a->min_x, f->a->max_x, f->a->min_y, f->a->max_y, f->a->min_x, f->a->max_x, f->a->min_y, f->a->max_y,
f->a->min_z, f->a->max_z); f->a->min_z, f->a->max_z);

39
solidify/histo.c Normal file
View File

@ -0,0 +1,39 @@
#include "util.h"
#include "array.h"
#include "histo.h"
struct histo *make_histo(struct array *a)
{
int i;
struct histo *h;
h = alloc_type(struct histo);
h->n = a->max_z-a->min_z+1;
h->b = alloc_size(h->n*sizeof(int));
for (i = 0; i != h->n; i++)
h->b[i] = 0;
for (i = 0; i != (a->max_x-a->min_x+1)*(a->max_y-a->min_y+1); i++)
if (a->data[i] != UNDEF)
h->b[a->data[i]-a->min_z]++;
return h;
}
void free_histo(struct histo *h)
{
free(h);
}
int median(const struct histo *h)
{
int tot = 0, sum = 0;
int i;
for (i = 0; i != h->n; i++)
tot += h->b[i];
for (i = 0; sum < tot/2; i++)
sum += h->b[i];
return i-1;
}

17
solidify/histo.h Normal file
View File

@ -0,0 +1,17 @@
#ifndef HISTO_H
#define HISTO_H
#include "array.h"
struct histo {
int n; /* number of bins */
int *b; /* bins */
};
struct histo *make_histo(struct array *a);
void free_histo(struct histo *h);
int median(const struct histo *h);
#endif /* HISTO_H */