X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Fstructure.c;h=d053b448bf458b9f1c4f5d45559ccd8482f3b92a;hp=8fabe1887b9063b12715843046afe9ef72556110;hb=0d97db81eec48d6aeead17a27376f73888b6f6b9;hpb=a2a2f9d982ee233f3d89fb7137f532c9eec3b97c diff --git a/pctb/structure.c b/pctb/structure.c index 8fabe18..d053b44 100644 --- a/pctb/structure.c +++ b/pctb/structure.c @@ -27,11 +27,13 @@ #include "structure.h" -static CanonImage *cim; +static const CanonImage *cim; static inline char get(int x, int y) { return cim->d[y * cim->w + x]; } static inline char get_p(Point p) { return get(p.x,p.y); } +DEBUG_DEFINE_DEBUGF(struct) + #define START_MAIN {200,200} #define MIN_COLUMNS 6 #define INTERESTING_COLUMNS 7 @@ -44,11 +46,20 @@ 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 + const CanonColourInfo canoncolourinfos[]= { { 0x475A5E, '*' }, /* edge */ { 0x2C5F7A, '*' }, /* edge just under box heading shadow */ - { 0xC5C7Ae, '*' }, /* blank area of partial commodities list */ + { 0xC5C7AE, '*' }, /* blank area of partial commodities list */ + { 0x6B828C, '*' }, /* background of ship status meter area */ + { 0x934405, '*' }, /* border of ship meter area */ { 0x7D9094, '+' }, /* interbox */ + { 0x022158, 'O' }, /* ahoy /w output foreground */ + { 0xB5B686, 'H' }, /* ahoy /w output heading background */ { 0xBDC5BF, ' ' }, /* background - pale Sugar cane, etc. */ { 0xADB5AF, ' ' }, /* background - dark */ @@ -82,11 +93,12 @@ const CanonColourInfo canoncolourinfos[]= { static void mustfail1(const char *file, int line, const char *what) { fprintf(stderr, "\n\n" - "Unable to figure out contents YPP client display.\n" + "Unable to figure out contents of YPP client display.\n" " Check that your client is logged in has the correct display.\n" " If that isn't the problem, please report this as a fault.\n\n" "Technical details:" - " %s:%d: requirement failed: %s\n", + " %s:%d: requirement failed:\n" + " %s\n", file, line, what); } static void mustfail2(void) NORET; @@ -146,6 +158,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; \ @@ -161,11 +199,39 @@ static void debug_rect(const char *what, int whati, Rect rr) { ); \ }while(0) -void find_structure(CanonImage *im, int *max_relevant_y_r) { +#define ADJUST_BOX(search,insidechrs,want, lim,LIMIT_MUST, TLBR,XY,increm) \ + for (;;) { \ + LIMIT_MUST( (search).tl.XY != (search).br.XY && \ + (search).tl.XY != (lim), \ + MR((search));MSB(#TLBR);MSB(#XY) ); \ + int got=0; \ + Point p=(search).tl; \ + for (p.XY=(search).TLBR.XY; \ + p.OTHERCOORD_##XY <= (search).br.OTHERCOORD_##XY; \ + p.OTHERCOORD_##XY++) \ + got += !!strchr(insidechrs, get_p(p)); \ + if (got >= (want)) \ + break; \ + (search).TLBR.XY += increm; \ + } + +void find_structure(const CanonImage *im, int *max_relevant_y_r) { cim= im; Rect whole = { {0,0}, {cim->w-1,cim->h-1} }; + if (DEBUGP(rect)) { + int xscaleunit, y,x; + for (y=0, xscaleunit=1; y<4; y++, xscaleunit*=10) { + fprintf(debug," "); + for (x=0; x<=cim->w; x++) { + if (x % xscaleunit) fputc(' ',debug); + else fprintf(debug,"%d",(x / xscaleunit)%10); + } + fputc('\n',debug); + } + } + WALK_UNTIL_MUST(mainr.tl, x,-1, whole.tl.x, '*'); WALK_UNTIL_MUST(mainr.tl, y,-1, whole.tl.y, '*'); WALK_UNTIL_MUST(mainr.br, x,+1, whole.br.x, '*'); @@ -207,18 +273,6 @@ void find_structure(CanonImage *im, int *max_relevant_y_r) { down.y++; WALK_UNTIL_MUST(down, y,+1, mainr.br.y, '+'); - if (DEBUGP(rect)) { - int xscaleunit, y,x; - for (y=0, xscaleunit=1; y<4; y++, xscaleunit*=10) { - fprintf(debug," "); - for (x=0; x<=cim->w; x++) { - if (x % xscaleunit) fputc(' ',debug); - else fprintf(debug,"%d",(x / xscaleunit)%10); - } - fputc('\n',debug); - } - } - commbasey= up.y; comminty= down.y - up.y + 2; @@ -256,6 +310,53 @@ void find_structure(CanonImage *im, int *max_relevant_y_r) { SET_ONCE(*max_relevant_y_r, mainr.br.y + 10); } +void check_correct_commodities(void) { + Rect search= { { 50,39 }, { 130,59 } }; + + ADJUST_BOX(search,"_",10, cim->h, MUST, tl,y,+1); + ADJUST_BOX(search,"_",10, 0, MUST, br,y,-1); + + debug_rect("commodselr",1, search); + + static const char *all_small[]= { + " ___________________________________ ", + " ________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__________", + "_______XXXXXXX X_ X__________X___________", + " _____ X X X_ X______________________", + " ____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_______________________", + "???__?_______?__?___?_______________________?", + }; + +#define COMMOD_SELECTOR_MATCHES(all) \ + commod_selector_matches(search, all, \ + sizeof((all))/sizeof((all)[0]), \ + strlen((all)[0])) + + 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) { CanonImage *im= mmalloc(sizeof(CanonImage) + w*h); im->w= w; @@ -268,6 +369,7 @@ static void file_read_image_ppm(FILE *f) { struct pam inpam; unsigned char rgb_buf[3]; CanonImage *im; + RgbImage *ri=0; pnm_readpaminit(f, &inpam, sizeof(inpam)); if (!(inpam.maxval == 255 && @@ -275,6 +377,9 @@ static void file_read_image_ppm(FILE *f) { inpam.format == RPPM_FORMAT)) fatal("PNM screenshot(s) file must be 8bpp 1 byte per sample RGB"); + if (!npages) + page0_rgbimage= ri= alloc_rgb_image(inpam.width, inpam.height); + CANONICALISE_IMAGE(im, inpam.width, inpam.height, { int r= fread(&rgb_buf,1,3,f); sysassert(!ferror(f)); @@ -284,6 +389,9 @@ static void file_read_image_ppm(FILE *f) { ((unsigned long)rgb_buf[0]<<16) | ((unsigned long)rgb_buf[1]<<8) | (rgb_buf[2]); + + if (ri) + CANONIMG_ALSO_STORERGB(ri); }); sysassert(!ferror(screenshot_file)); @@ -380,9 +488,14 @@ void analyse(FILE *tsv_output) { for (page=0; pageh; tryrect >= -cim->h; tryrect--) { find_commodity(tryrect, &thisr); if (thisr.tl.x < 0) @@ -405,4 +518,176 @@ void analyse(FILE *tsv_output) { sysassert(!fflush(tsv_output)); } } + progress("Commodity table scan complete."); +} + +//static Rect islandnamer; + +DEBUG_DEFINE_SOME_DEBUGF(structcolon,colondebugf) + +Rect find_sunshine_widget(void) { + Rect sunshiner; + + sunshiner.tl.x= cim->w - 1034 + 885; + sunshiner.br.x= cim->w - 1034 + 1020; + sunshiner.tl.y= 227; + sunshiner.br.y= 228; + + ADJUST_BOX(sunshiner,"o*",30, 100,MUST, tl,y,-1); + ADJUST_BOX(sunshiner,"o*",30, 100,MUST, br,y,+1); + debug_rect("sunshiner",0, sunshiner); + + MUST(sunshiner.br.y - sunshiner.tl.y > 20, MR(sunshiner)); + sunshiner.br.y--; + + ADJUST_BOX(sunshiner,"o",20, (cim->w - 1034 + 700), MUST, tl,x,-1); + ADJUST_BOX(sunshiner,"o",20, cim->w, MUST, br,x,+1); + debug_rect("sunshiner",1, sunshiner); + return sunshiner; +} + +void find_islandname(RgbImage *ri) { + Rect sunshiner= find_sunshine_widget(); + char sunshine[MAXIMGIDENT], archisland[MAXIMGIDENT]; + + 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); + } + + identify_rgbimage(ri, sunshiner, sunshine, "sunshine widget"); + + 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; + } + } + } + + identify_rgbimage(ri, islandnamer, archisland, "island"); + } else { + Rect islandnamer; + + islandnamer.tl.x= (sunshiner.tl.x + sunshiner.br.x) / 2; + islandnamer.tl.y= sunshiner.tl.y + 100; + islandnamer.br= islandnamer.tl; + debug_rect("islandnamer",__LINE__, islandnamer); + + WALK_UNTIL_MUST(islandnamer.tl,y, -1, sunshiner.br.y, 'H'); + WALK_UNTIL_MUST(islandnamer.tl,x, -1, 0, 'o'); + WALK_UNTIL_MUST(islandnamer.br,x, +1, cim->w, 'o'); + debug_rect("islandnamer",__LINE__, islandnamer); + + require_rectangle_r(islandnamer, "O*", __LINE__); + + int rw= RECT_W(islandnamer); + ADJUST_BOX(islandnamer,"O",rw-4, cim->h, MUST,br,y,+1); + debug_rect("islandnamer",__LINE__, islandnamer); + + islandnamer.br.y += 2; + ADJUST_BOX(islandnamer,"O",1, cim->h, MUST,br,y,+1); + debug_rect("islandnamer",__LINE__, islandnamer); + + islandnamer.tl.y= islandnamer.br.y-1; + islandnamer.br.y= islandnamer.br.y+1; + ADJUST_BOX(islandnamer,"*",rw, cim->h, MUST,br,y,+1); + ADJUST_BOX(islandnamer,"O",1, cim->w, MUST,tl,x,+1); + debug_rect("islandnamer",__LINE__, islandnamer); + + MUST( RECT_H(islandnamer) <= 31, MR(islandnamer)); + + Point p; + int nspaces=1, might_be_colon=0; + uint32_t colon_pattern= 0; + p.y=-1; + + for (p.x=islandnamer.br.x; p.x>islandnamer.tl.x; p.x--) { + colondebugf("structcolon: x=%4d nsp=%2d mbc=%d cp=%08"PRIx32" ", + p.x, nspaces, might_be_colon, colon_pattern); + + uint32_t pattern=0; + int runs[32], nruns=0; + runs[0]=0; runs[1]=0; + + for (p.y=islandnamer.tl.y; p.y<=islandnamer.br.y; p.y++) { + pattern <<= 1; + switch (get_p(p)) { + case 'O': runs[nruns]++; pattern |= 1u; break; + case '*': if (runs[nruns]) { nruns++; runs[nruns]=0; } break; + default: abort(); + } + } + + colondebugf(" pat=%08"PRIx32" nruns=%d runs[]={%d,%d..} ", + pattern, nruns, runs[0],runs[1]); + + if (!pattern) { + if (might_be_colon) + /* omg it _is_ a colon */ + goto colon_found; + nspaces++; + might_be_colon=0; + } else { + if (nruns==2 && runs[1]==runs[0]) { + if (!nspaces) { + if (pattern==colon_pattern) + goto ok_might_be_colon; + } else if (nspaces>=2) { + colon_pattern= pattern; + might_be_colon=1; + goto ok_might_be_colon; + } + } + might_be_colon=0; + ok_might_be_colon: + nspaces= 0; + } + colondebugf(" nsp=%2d mbc=%d\n", nspaces, might_be_colon); + } + MUST(!"colon found", MP(p);MR(islandnamer) ); + + colon_found: + colondebugf(" found\n"); + islandnamer.br.x= p.x; + + identify_rgbimage(ri, islandnamer, archisland, "island"); + + assert(!"not vessel"); + } + + char *delim= strstr(archisland," - "); + assert(delim); + archipelago= masprintf("%.*s", delim-archisland, archisland); + island= masprintf("%s", delim+3); + + free(ri); }