X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fconvert.c;h=c8082e697cea3ff4f70b26c1e1d24c9e72e2eafc;hb=7198105eceff39cb71cd432312e0e9c82139d7b1;hp=b518dbabf6913e202761dfc9b34cd524d77d4d55;hpb=2f9b824c735e9174d7cc7d8aea829a85d2276d21;p=ypp-sc-tools.db-test.git diff --git a/pctb/convert.c b/pctb/convert.c index b518dba..c8082e6 100644 --- a/pctb/convert.c +++ b/pctb/convert.c @@ -1,11 +1,5 @@ -#include -#include -#include -#include -#include -#define eassert assert -#define debug stdout +#include "ocr.h" typedef struct { unsigned long rgb; /* on screen */ @@ -15,7 +9,7 @@ typedef struct { static int height, width; static char *image; -static void debug_flush(void) { +void debug_flush(void) { eassert(!fflush(debug)); eassert(!ferror(debug)); } @@ -34,8 +28,9 @@ static inline char get_p(Point p) { return get(p.x,p.y); } #define START_MAIN {200,200} +#define MIN_COLUMNS 6 #define INTERESTING_COLUMNS 6 -#define MAX_COLUMNS 7 +#define MAX_COLUMNS 7 static Rect mainr = { START_MAIN,START_MAIN }; static int commbasey, comminty; @@ -178,7 +173,7 @@ static void find_structure(void) { require_rectangle(across.x,mainr.tl.y, across.x,mainr.br.y, "+"); across.x++; } - + eassert(colno >= MIN_COLUMNS); } static void find_commodity(int offset, Rect *rr) { @@ -195,6 +190,15 @@ static void find_commodity(int offset, Rect *rr) { rr->br.x= mainr.br.x; } +static void find_table_entry(Rect commod, int colno, Rect *cellr) { + cellr->tl.y= commod.tl.y; + cellr->br.y= commod.br.y; + cellr->tl.x= !colno ? commod.tl.x : colrightx[colno-1]+2; + cellr->br.x= colrightx[colno]; + debug_rect("cell", colno, *cellr); + require_rectangle_r(*cellr, " o"); +} + static void load_image_and_canonify(void) { struct pam inpam; unsigned char rgb[3]; @@ -231,16 +235,53 @@ static void load_image_and_canonify(void) { debug_flush(); } +static void ocr_rectangle(Rect r) { + OcrResultGlyph *results, *res; + + int w= r.br.x - r.tl.x + 1; + int h= r.br.y - r.tl.y + 1; + Pixcol cols[w+1]; + int x,y; + for (x=0; xs; res++) + printf("%s",res->s); + printf("\"\n"); + eassert(!ferror(stdout)); + eassert(!fflush(stdout)); +} + int main(void) { + Rect thisr, entryr; + int tryrect, colno; + + ocr_init(); load_image_and_canonify(); find_structure(); - Rect thisr; - int tryrect; for (tryrect= +height; tryrect >= -height; tryrect--) { find_commodity(tryrect, &thisr); - if (thisr.tl.x >= 0) - debug_rect("commod",tryrect, thisr); + if (thisr.tl.x < 0) + continue; + debug_rect("commod",tryrect, thisr); + + for (colno=0; colno