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
static int text_h=-1, columns=-1;
static OcrReader *rd;
+char *archipelago, *island;
+
#define OTHERCOORD_x y
#define OTHERCOORD_y x
{ 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 */
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",
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<allw; x++)
+ for (y=0; y<allh; y++) {
+ int want= all[y][x];
+ if (want==' ') continue;
+ if (get(alloffx+x, alloffy+y) == want)
+ good++;
+ else
+ bad++;
+ }
+ debugf("CHECKCOMMOD alloff=%d,%d good=%d bad=%d\n",
+ alloffx,alloffy, good,bad);
+ if (good > 20*bad)
+ return 1;
+ }
+ }
+ return 0;
+}
+
#define WALK_UNTIL(point,coord,increm,last,edge) \
for (;;) { \
if ((point).coord == (last)+(increm)) break; \
debug_rect("commodselr",1, search);
- static const char *all[]= {
+ static const char *all_small[]= {
" ___________________________________ ",
" ________X____X__X____________________ ",
" ________ X___ X_ X_____XXXXXXXXXXX_____ ",
" ____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<allw; x++)
- for (y=0; y<allh; y++) {
- int want= all[y][x];
- if (want==' ') continue;
- if (get(alloffx+x, alloffy+y) == want)
- good++;
- else
- bad++;
- }
- debugf("CHECKCOMMOD alloff=%d,%d good=%d bad=%d\n",
- alloffx,alloffy, good,bad);
- if (good > 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) {
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)
sysassert(!fflush(tsv_output));
}
}
+ progress("Commodity table scan complete.");
}
//static Rect islandnamer;
-void find_islandname(void) {
+DEBUG_DEFINE_SOME_DEBUGF(structcolon,colondebugf)
+
+Rect find_sunshine_widget(void) {
Rect sunshiner;
- char sunshine[MAXIMGIDENT];
- const RgbImage *ri= page0_rgbimage;
- cim= page_images[0];
-
sunshiner.tl.x= cim->w - 1034 + 885;
sunshiner.br.x= cim->w - 1034 + 1020;
sunshiner.tl.y= 227;
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=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");
- fprintf(stderr,"sunshine: `%s'\n",sunshine);
-#if 0
+ 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= cim->w - 1034 + 885;
- islandnamer.br.x= cim->w - 1034 + 1020;
- islandnamer.tl.y= 128;
- islandnamer.br.y= 156;
+ 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);
-#define IR_VSHRINK_MUST(CONDMUST,PRWHY) \
- do{ if (!(CONDMUST)) goto not_in_radar; }while(0)
+ require_rectangle_r(islandnamer, "O*", __LINE__);
- ADJUST_BOX(islandnamer,"o",5, IR_VSHRINK_MUST, tl,y,+1);
- ADJUST_BOX(islandnamer,"o",5, IR_VSHRINK_MUST, br,y,-1);
+ int rw= RECT_W(islandnamer);
+ ADJUST_BOX(islandnamer,"O",rw-4, cim->h, MUST,br,y,+1);
+ debug_rect("islandnamer",__LINE__, islandnamer);
- 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);
+ islandnamer.br.y += 2;
+ ADJUST_BOX(islandnamer,"O",1, cim->h, MUST,br,y,+1);
+ debug_rect("islandnamer",__LINE__, islandnamer);
- debug_ppmrect("islandnamer",2, islandnamer,ri);
-
- not_in_radar:
-
+ 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);
-
- abort();
+ 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", (int)(delim-archisland), archisland);
+ island= masprintf("%s", delim+3);
-#endif
+ free(ri);
}
~yarrgweb / ypp-sc-tools.db-live.git / blobdiff