X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fstructure.c;h=66a669e5ae5d6ba30332c68676c2d6ba8a33a956;hb=a0695472f2c33e386f5591e1b3c49e2f3b772828;hp=5a21f0cc4a94b8488ebca7892f8dd1a2e2d5c95b;hpb=8360f12a6a457b73ebb18dbeedbb15e6ed91318b;p=ypp-sc-tools.db-test.git diff --git a/pctb/structure.c b/pctb/structure.c index 5a21f0c..66a669e 100644 --- a/pctb/structure.c +++ b/pctb/structure.c @@ -34,7 +34,7 @@ static inline char get_p(Point p) { return get(p.x,p.y); } DEBUG_DEFINE_DEBUGF(struct) -#define START_MAIN {200,100} +#define START_MAIN {200,200} #define MIN_COLUMNS 6 #define INTERESTING_COLUMNS 7 #define TEXT_COLUMNS 2 @@ -46,6 +46,8 @@ static int colrightx[INTERESTING_COLUMNS]; static int text_h=-1, columns=-1; static OcrReader *rd; +char *archipelago, *island; + #define OTHERCOORD_x y #define OTHERCOORD_y x @@ -154,6 +156,32 @@ static void debug_rect(const char *what, int whati, Rect rr) { debug_flush(); } +static int commod_selector_matches(Rect search, const char *const *all, + int allh, int allw) { + int alloffy, alloffx; + for (alloffy=0; alloffy < search.br.y; alloffy++) { + if (alloffy+allh-1 < search.tl.y) continue; + for (alloffx=search.tl.x; alloffx+allw-1 <= search.br.x; alloffx++) { + int good=0, bad=0; + int x,y; + for (x=0; x 20*bad) + return 1; + } + } + return 0; +} + #define WALK_UNTIL(point,coord,increm,last,edge) \ for (;;) { \ if ((point).coord == (last)+(increm)) break; \ @@ -288,7 +316,7 @@ void check_correct_commodities(void) { debug_rect("commodselr",1, search); - static const char *all[]= { + static const char *all_small[]= { " ___________________________________ ", " ________X____X__X____________________ ", " ________ X___ X_ X_____XXXXXXXXXXX_____ ", @@ -301,34 +329,30 @@ void check_correct_commodities(void) { " ____X_____ _XX_ X______________________", " __ _______ __ ______________________ ", }; + static const char *all_big[]= { + "???_______________________________________???", + "??_________________________________________??", + "?_________X______X___X______________________?", + "_________?X_____?X__?X______XXXXXXXXXXX______", + "_________X_X____?X__?X_______XXXXXXXXX_______", + "________?X?X____?X__?X________XXXXXXX________", + "________X_?_X___?X__?X_________XXXXX_________", + "_______?X__?X___?X__?X__________XXX__________", + "_______?XXXXX___?X__?X___________X___________", + "_______X????_X__?X__?X_______________________", + "?_____?X____?X__?X__?X_______________________", + "??____X_____?_X_?X__?X_______________________", + "???__?_______?__?___?_______________________?", + }; - static int allh= sizeof(all)/sizeof(all[0]); - const int allw= strlen(all[0]); +#define COMMOD_SELECTOR_MATCHES(all) \ + commod_selector_matches(search, all, \ + sizeof((all))/sizeof((all)[0]), \ + strlen((all)[0])) - int alloffy, alloffx; - for (alloffy=0; alloffy < search.br.y; alloffy++) { - if (alloffy+allh-1 < search.tl.y) continue; - for (alloffx=search.tl.x; alloffx+allw-1 <= search.br.x; alloffx++) { - int good=0, bad=0; - int x,y; - for (x=0; x 20*bad) - goto all_found; - } - } - fatal("Commodities selector not set to `All'."); - - all_found:; + if (!(COMMOD_SELECTOR_MATCHES(all_small) || + COMMOD_SELECTOR_MATCHES(all_big))) + fatal("Commodities selector not set to `All'."); } CanonImage *alloc_canon_image(int w, int h) { @@ -468,6 +492,8 @@ void analyse(FILE *tsv_output) { if (!rd) rd= ocr_init(text_h); + progress("Scanning page %d...",page); + for (tryrect= +cim->h; tryrect >= -cim->h; tryrect--) { find_commodity(tryrect, &thisr); if (thisr.tl.x < 0) @@ -490,14 +516,25 @@ void analyse(FILE *tsv_output) { sysassert(!fflush(tsv_output)); } } + progress("Commodity table scan complete."); } //static Rect islandnamer; void find_islandname(void) { Rect sunshiner; - char sunshine[MAXIMGIDENT]; - const RgbImage *ri= page0_rgbimage; + char sunshine[MAXIMGIDENT], archisland[MAXIMGIDENT]; + + RgbImage *ri= alloc_rgb_image(page0_rgbimage->w, page0_rgbimage->h); + const unsigned char *srcp; + unsigned char *destp, *endp; + for (srcp=page0_rgbimage->data, destp=ri->data, + endp= ri->data + 3 * ri->w * ri->h; + destp < endp; + srcp++, destp++) { + unsigned char c= *srcp & 0xf0; + *destp= c | (c>>4); + } cim= page_images[0]; @@ -518,36 +555,47 @@ void find_islandname(void) { debug_rect("sunshiner",1, sunshiner); identify_rgbimage(ri, sunshiner, sunshine, "sunshine widget"); - fprintf(stderr,"sunshine: `%s'",sunshine); -#if 0 - - - islandnamer.tl.x= cim->w - 1034 + 885; - islandnamer.br.x= cim->w - 1034 + 1020; - islandnamer.tl.y= 128; - islandnamer.br.y= 156; - -#define IR_VSHRINK_MUST(CONDMUST,PRWHY) \ - do{ if (!(CONDMUST)) goto not_in_radar; }while(0) - - ADJUST_BOX(islandnamer,"o",5, IR_VSHRINK_MUST, tl,y,+1); - ADJUST_BOX(islandnamer,"o",5, IR_VSHRINK_MUST, br,y,-1); - - debug_rect("islandnamer",0, islandnamer); - static int larger_islandnamebry= islandname.tl.y + 25; - if (islandnamer.br.y < larger_islandnamebry) - goto not_in_radar; - islandnamer.br.y = larger_islandnamebry; - debug_rect("islandnamer",1, islandnamer); + if (!memcmp(sunshine,"Vessel ",5)) { + Rect islandnamer; + + islandnamer.tl.x= cim->w - 1034 + 885; + islandnamer.br.x= cim->w - 1034 + 1020; + islandnamer.tl.y= 128; + islandnamer.br.y= 156; + + ADJUST_BOX(islandnamer,"o",5, 0, MUST, tl,y,+1); + ADJUST_BOX(islandnamer,"o",5, cim->h, MUST, br,y,-1); + + ADJUST_BOX(islandnamer,"o",1, 0, MUST, tl,x,+1); + ADJUST_BOX(islandnamer,"o",1, cim->w, MUST, br,x,-1); + + debug_rect("islandnamer",0, islandnamer); +// int larger_islandnamebry= islandnamer.tl.y + 25; +// MUST(islandnamer.br.y < larger_islandnamebry, +// MR(islandnamer);MI(larger_islandnamebry)); +// islandnamer.br.y = larger_islandnamebry; + debug_rect("islandnamer",1, islandnamer); + + int x,y,i; + for (x=islandnamer.tl.x; x<=islandnamer.br.x; x++) + for (y=islandnamer.tl.y; y<=islandnamer.br.y; y++) { + if (RI_PIXEL(ri,x,y)[0] < 0x40) { + for (i=0; i<3; i++) { + RI_PIXEL(ri,x,y)[i]= 0; + } + } + } - debug_ppmrect("islandnamer",2, islandnamer,ri); - - not_in_radar: - + identify_rgbimage(ri, islandnamer, archisland, "island"); + } else { + assert(!"not vessel"); + } - - abort(); + char *delim= strstr(archisland," - "); + assert(delim); + archipelago= masprintf("%.*s", delim-archisland, archisland); + island= masprintf("%s", delim+3); -#endif + free(ri); }