X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Fstructure.c;h=1f3c743319de029d342bbdbaa9bce1ec920047cb;hp=97cbb0739473e0e2fcdc5fb5609a973dd438c1c8;hb=f23577a2c5659be8d42d87da85a6a62beb80cd3c;hpb=0487d41d9c7796c6efebb8235c9aa39fe580ccf9 diff --git a/pctb/structure.c b/pctb/structure.c index 97cbb07..1f3c743 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 @@ -58,6 +58,8 @@ const CanonColourInfo canoncolourinfos[]= { { 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 */ @@ -90,10 +92,16 @@ const CanonColourInfo canoncolourinfos[]= { static void mustfail1(const char *file, int line, const char *what) { fprintf(stderr, - "\n\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" + "\n\n" + "Unable to figure out contents of YPP client display.\n" + "Please check the following:\n" + " * YPP client is showing commodity listing screen\n" + " * YPP client has antialiased text turned off (Ye / Options / General)\n" + " * YPP client window is on top (we try to raise it but your window\n" + " manager might have prevented that from succeeding)\n" + " * Your X display is 24bpp (NB some VNC servers use 16bpp by default)\n" + "\n" + "If all of these are true, please report this as a fault.\n\n" "Technical details:" " %s:%d: requirement failed:\n" " %s\n", @@ -125,20 +133,23 @@ static void mustfail2(void) { #define REQUIRE_RECTANGLE(tlx,tly,brx,bry,ok) \ require_rectangle(tlx, tly, brx, bry, ok, __LINE__); -static void require_rectangle(int tlx, int tly, int brx, int bry, - const char *ok, int lineno) { +#define FOR_P_RECT(p,rect) \ + for ((p).x=(rr).tl.x; (p).x<=(rr).br.x; (p).x++) \ + for ((p).y=(rr).tl.y; (p).y<=(rr).br.y; (p).y++) + +static void require_rectangle_r(Rect rr, const char *ok, int lineno) { Point p; - for (p.x=tlx; p.x<=brx; p.x++) - for (p.y=tly; p.y<=bry; p.y++) { - int c= get_p(p); - MUST( strchr(ok,c), ({ - Rect rm={{tlx,tly},{brx,bry}}; - MI(lineno),MR(rm);MP(p);MS(ok); - })); - } + FOR_P_RECT(p,rr) { + int c= get_p(p); + MUST( strchr(ok,c), ({ + MI(lineno),MR(rr);MP(p);MS(ok); + })); + } } -static void require_rectangle_r(Rect rr, const char *ok, int lineno) { - require_rectangle(rr.tl.x,rr.tl.y, rr.br.x,rr.br.y, ok, lineno); +static void require_rectangle(int tlx, int tly, int brx, int bry, + const char *ok, int lineno) { + Rect rr= {{tlx,tly},{brx,bry}}; + require_rectangle_r(rr, ok, lineno); } static void debug_rect(const char *what, int whati, Rect rr) { @@ -156,6 +167,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; \ @@ -290,7 +327,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_____ ", @@ -303,34 +340,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]); - - 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'."); +#define COMMOD_SELECTOR_MATCHES(all) \ + commod_selector_matches(search, all, \ + sizeof((all))/sizeof((all)[0]), \ + strlen((all)[0])) - 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) { @@ -345,7 +378,6 @@ 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 && @@ -353,9 +385,6 @@ 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)); @@ -366,8 +395,6 @@ static void file_read_image_ppm(FILE *f) { ((unsigned long)rgb_buf[1]<<8) | (rgb_buf[2]); - if (ri) - CANONIMG_ALSO_STORERGB(ri); }); sysassert(!ferror(screenshot_file)); @@ -470,7 +497,7 @@ void analyse(FILE *tsv_output) { if (!rd) rd= ocr_init(text_h); - progress("OCRing page %d...",page); + progress("Scanning page %d...",page); for (tryrect= +cim->h; tryrect >= -cim->h; tryrect--) { find_commodity(tryrect, &thisr); @@ -494,27 +521,16 @@ 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], archisland[MAXIMGIDENT]; +DEBUG_DEFINE_SOME_DEBUGF(structcolon,colondebugf) - 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); - } +Rect find_sunshine_widget(void) { + Rect sunshiner; - cim= page_images[0]; - sunshiner.tl.x= cim->w - 1034 + 885; sunshiner.br.x= cim->w - 1034 + 1020; sunshiner.tl.y= 227; @@ -530,10 +546,28 @@ void find_islandname(void) { 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) { + find_structure(page_images[0], 0); + + Rect sunshiner= find_sunshine_widget(); + char sunshine[MAXIMGIDENT], archisland[MAXIMGIDENT]; + + const unsigned char *srcp; + unsigned char *destp, *endp; + for (srcp=page_images[0]->rgb->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,"Ship ",5)) { + if (!memcmp(sunshine,"Vessel ",5)) { Rect islandnamer; islandnamer.tl.x= cim->w - 1034 + 885; @@ -544,6 +578,9 @@ void find_islandname(void) { 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, @@ -563,12 +600,96 @@ void find_islandname(void) { identify_rgbimage(ri, islandnamer, archisland, "island"); } else { - assert(!"not vessel"); + 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"); } char *delim= strstr(archisland," - "); assert(delim); - archipelago= masprintf("%.*s", delim-archisland, archisland); + archipelago= masprintf("%.*s", (int)(delim-archisland), archisland); island= masprintf("%s", delim+3); free(ri);