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); }
-#define START_MAIN {200,200}
+DEBUG_DEFINE_DEBUGF(struct)
+
+#define START_MAIN {200,100}
#define MIN_COLUMNS 6
#define INTERESTING_COLUMNS 7
#define TEXT_COLUMNS 2
static int text_h=-1, columns=-1;
static OcrReader *rd;
+#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 */
{ 0x7D9094, '+' }, /* interbox */
{ 0xBDC5BF, ' ' }, /* background - pale Sugar cane, etc. */
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:"
); \
}while(0)
-void find_structure(CanonImage *im) {
+#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; \
+ Point p; \
+ for (p=(search).tl, got=0; \
+ 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_commod(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, '*');
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;
SET_ONCE(columns, colno);
SET_ONCE(text_h, comminty - 1);
+ if (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[]= {
+ " ___________________________________ ",
+ " ________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 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'.");
+
+ all_found:;
+}
+
CanonImage *alloc_canon_image(int w, int h) {
CanonImage *im= mmalloc(sizeof(CanonImage) + w*h);
im->w= w;
int page, tryrect, colno;
for (page=0; page<npages; page++) {
- find_structure(page_images[page]);
+ find_structure_commod(page_images[page], 0);
+
+ if (!page)
+ check_correct_commodities();
if (!rd)
rd= ocr_init(text_h);
}
}
}
+
+#if 0
+
+static Rect islandnamer;
+
+void find_structure_islandname(CanonImage *im, RawImage *ri) {
+ Rect sunshiner;
+
+ sunshiner.tl.x= cim->w - 1034 + 885;
+ sunshiner.br.x= cim->w - 1034 + 1020;
+ sunshiner.tl.y= 227;
+ sunshiner.br.y= 227;
+
+ ADJUST_BOX(sunshiner,"o",30, 100,MUST, tl,y,-1);
+ ADJUST_BOX(sunshiner,"o",30, 100,MUST, tl,y,-1);
+
+
+ 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);
+
+ debug_ppmrect("islandnamer",2, islandnamer,ri);
+
+ not_in_radar:
+
+
+
+ abort();
+}
+
+#endif
~yarrgweb / ypp-sc-tools.db-test.git / blobdiff