#define TEXT_COLUMNS 2
#define MAX_COLUMNS 7
-static Rect mainr = { START_MAIN,START_MAIN };
+static Rect mainr;
static int commbasey, comminty;
static int colrightx[INTERESTING_COLUMNS];
static int text_h=-1, columns=-1;
#define OTHERCOORD_x y
#define OTHERCOORD_y x
-const CanonColourInfo canoncolourinfos[]= {
+typedef struct {
+ Rgb rgb; /* on screen */
+ char c; /* canonical */
+} CanonColourInfo;
+
+const CanonColourInfo canoncolourinfo_table[]= {
{ 0x475A5E, '*' }, /* edge */
{ 0x2C5F7A, '*' }, /* edge just under box heading shadow */
{ 0xC5C7AE, '*' }, /* blank area of partial commodities list */
{ 0,0 }
};
+CanonColourInfoReds canoncolourinfo_tree;
+
+void canon_colour_prepare(void) {
+ const CanonColourInfo *cci;
+ for (cci=canoncolourinfo_table; cci->c; cci++) {
+ unsigned char r= cci->rgb >> 16;
+ unsigned char g= cci->rgb >> 8;
+ unsigned char b= cci->rgb;
+
+ CanonColourInfoGreens *greens= canoncolourinfo_tree.red2[r];
+ if (!greens) {
+ greens= canoncolourinfo_tree.red2[r]= mmalloc(sizeof(*greens));
+ FILLZERO(*greens);
+ }
+
+ CanonColourInfoBlues *blues= greens->green2[g];
+ if (!blues) {
+ blues= greens->green2[g]= mmalloc(sizeof(*blues));
+ memset(blues, '?', sizeof(*blues));
+ }
+
+ blues->blue2[b]= cci->c;
+ }
+}
+
static void mustfail1(const char *file, int line, const char *what) {
fprintf(stderr,
" * YPP client is showing commodity listing screen\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:"
#define MRGB(v) fprintf(stderr," %s=%06lx", #v,(v))
#define MC(v) fprintf(stderr," %s='%c'", #v,(v))
#define MS(v) fprintf(stderr," %s=\"%s\"", #v,(v))
-#define MF(v) fprintf(stderr," %s=\"%f\"", #v,(v))
+#define MF(v) fprintf(stderr," %s=%f", #v,(v))
#define MSB(v) fprintf(stderr," %s", (v))
#define MR(v) fprintf(stderr," %s=%d,%d..%d,%d",\
#v,(v).tl.x,(v).tl.y,(v).br.x,(v).br.y)
#define ADJUST_BOX(search,insidechrs,OP,want, lim,LIMIT_MUST, TLBR,XY,increm) \
for (;;) { \
LIMIT_MUST( (search).tl.XY != (search).br.XY && \
- (search).tl.XY != (lim), \
+ (search).TLBR.XY != (lim), \
MR((search));MSB(#TLBR);MSB(#XY) ); \
int got=0; \
Point p=(search).tl; \
(search).TLBR.XY += increm; \
}
-void find_structure(CanonImage *im, int *max_relevant_y_r) {
+void find_structure(CanonImage *im, int *max_relevant_y_r,
+ Point *commod_focus_point_r,
+ Point *commod_page_point_r,
+ Point *commod_focuslast_point_r) {
cim= im;
Rect whole = { {0,0}, {cim->w-1,cim->h-1} };
}
}
+ Point mainr_tl= START_MAIN;
+ mainr.tl= mainr_tl;
+ WALK_UNTIL_MUST(mainr.tl, y,-1, whole.tl.y, ' ');
+ mainr.br= mainr.tl;
+
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, '*');
Point csb_p; \
Rect csb_r; \
csb_p= mainr.tl; \
+ csb_p.x++; csb_p.y++; \
csb_p.xy= mainr.tlbr.xy; \
if (get_p(csb_p)=='+') { \
csb_r= mainr; \
debug_rect("mainr",1, mainr);
- Point up = START_MAIN;
- WALK_UNTIL_MUST(up, y,-1, mainr.tl.y, '+');
+ Rect updown= {START_MAIN,START_MAIN};
+ const int chkw= 100;
+ updown.br.x += chkw-1;
+ updown.br.y++;
+ debug_rect("updown",__LINE__,updown);
- Point down = START_MAIN;
- down.y++;
- WALK_UNTIL_MUST(down, y,+1, mainr.br.y, '+');
+ ADJUST_BOX(updown, "+", >=,chkw, mainr.tl.y, MUST, tl,y,-1);
+ debug_rect("updown",__LINE__,updown);
+ updown.br.y= updown.tl.y;
+ updown.tl.y= updown.tl.y-1;
- commbasey= up.y;
- comminty= down.y - up.y + 2;
+ ADJUST_BOX(updown, "+*",>=,chkw, mainr.tl.y-1, MUST, tl,y,-1);
+ debug_rect("updown",__LINE__,updown);
- Point across= { mainr.tl.x, commbasey };
+ commbasey= updown.tl.y + 1;
+ comminty= updown.br.y - updown.tl.y;
+
+ Rect across= {{ mainr.tl.x - 1, commbasey },
+ { mainr.tl.x, commbasey + comminty-2 }};
int colno=0;
for (;;) {
- MUST( get_p(across) != '+', MI(colno);MP(across);MR(mainr);MI(commbasey) );
- WALK_UNTIL(across, x,+1, mainr.br.x, '+');
- MUST( colno < MAX_COLUMNS, MP(across);MR(mainr);MI(commbasey); );
- int colrx= across.x;
- if (colrx > mainr.br.x) colrx= mainr.br.x;
+
+#define LIMIT_QUITEQ(cond,mp) { if (!(cond)) break; }
+ debug_rect("across",colno*1000000+__LINE__, across);
+ ADJUST_BOX(across, "+",>=,comminty-1, mainr.br.x, LIMIT_QUITEQ, br,x,+1);
+ debug_rect("across",colno*1000000+__LINE__, across);
+
+ MUST( colno < MAX_COLUMNS, MI(colno);MR(across);MR(mainr);MI(commbasey); );
+ int colrx= across.br.x-1;
+ if (colrx >= mainr.br.x) colrx= mainr.br.x;
if (colno < INTERESTING_COLUMNS)
colrightx[colno]= colrx;
colno++;
- if (across.x >= mainr.br.x-1)
+ if (across.br.x >= mainr.br.x)
break;
- across.x++;
- REQUIRE_RECTANGLE(across.x,mainr.tl.y, across.x,mainr.br.y, "+");
- across.x++;
+ REQUIRE_RECTANGLE(across.br.x,mainr.tl.y, across.br.x,mainr.br.y, "+");
+ across.br.x++;
}
- MUST( colno >= MIN_COLUMNS, MI(colno);MR(mainr);MP(across); );
+ MUST( colno >= MIN_COLUMNS, MI(colno);MR(mainr);MR(across); );
+
+ const int pagerh= 6;
+ Rect pager= {{ mainr.br.x, mainr.br.y - (pagerh-1) },
+ { mainr.br.x + 1, mainr.br.y }};
+
+ debug_rect("pager",__LINE__,pager);
+ ADJUST_BOX(pager, "o",>=,pagerh-2, whole.br.x,MUST, br,x,+1);
+ debug_rect("pager",__LINE__,pager);
+
+ pager.tl.x= pager.br.x;
+ pager.br.x= pager.br.x + 1;
+ debug_rect("pager",__LINE__,pager);
+ ADJUST_BOX(pager, "o",>=,pagerh-2, whole.br.x,MUST, br,x,+1);
+ debug_rect("pager",__LINE__,pager);
+
+ ADJUST_BOX(pager, "o",>=,RECT_W(pager)-2, mainr.tl.y,LIMIT_QUITEQ, tl,y,-1);
+ debug_rect("pager",__LINE__,pager);
#define SET_ONCE(var,val) do{ \
int v= (val); \
if (max_relevant_y_r)
SET_ONCE(*max_relevant_y_r, mainr.br.y + 10);
+ if (commod_focus_point_r) {
+ *commod_focus_point_r= mainr.tl;
+ commod_focus_point_r->x += 10;
+ commod_focus_point_r->y += comminty/3;
+ }
+ if (commod_focuslast_point_r) {
+ *commod_focuslast_point_r= mainr.br;
+ commod_focuslast_point_r->x -= 10;
+ commod_focuslast_point_r->y -= comminty/3;
+ }
+ if (commod_page_point_r) {
+ commod_page_point_r->x= (pager.tl.x + pager.br.x) / 2;
+ commod_page_point_r->y= pager.tl.y - 1;
+ }
+
MUST( text_h <= OCR_MAX_H, MI(text_h) );
}
fatal("PNM screenshot(s) file must be 8bpp 1 byte-per-sample RGB raw");
CANONICALISE_IMAGE(im, inpam.width, inpam.height, {
- int r= fread(&rgb_buf,1,3,f);
+ int rr= fread(&rgb_buf,1,3,f);
sysassert(!ferror(f));
- if (r!=3) fatal("PNM screenshot(s) file ends unexpectedly");
-
- rgb=
- ((unsigned long)rgb_buf[0]<<16) |
- ((unsigned long)rgb_buf[1]<<8) |
- (rgb_buf[2]);
+ if (rr!=3) fatal("PNM screenshot(s) file ends unexpectedly");
+ r= rgb_buf[0];
+ g= rgb_buf[1];
+ b= rgb_buf[2];
});
sysassert(!ferror(screenshot_file));
progress_log("read %d screenshots.",npages);
}
+static double find_aa_density(const RgbImage *ri, Point p, long background,
+ long foreground, int fg_extra) {
+ Rgb here= ri_rgb(ri, p.x, p.y);
+
+ double alpha[3], alpha_mean=0;
+ int i;
+ for (i=0; i<3; i++) {
+ unsigned char here_chan= here >> (i*8);
+ unsigned char bg_chan= background >> (i*8);
+ unsigned char fg_chan= foreground >> (i*8);
+ double alpha_chan=
+ ((double)here_chan - (double)bg_chan) /
+ ((fg_chan + fg_extra) - (double)bg_chan);
+ alpha[i]= alpha_chan;
+ alpha_mean += alpha_chan * (1/3.0);
+ }
+
+ double thresh= 1.5/AAMAXVAL;
+ double alpha_min= alpha_mean - thresh;
+ double alpha_max= alpha_mean + thresh;
+ for (i=0; i<3; i++)
+ MUST( alpha_min <= alpha[i] && alpha[i] <= alpha_max,
+ MP(p);
+ MRGB(here);MRGB(background);MRGB(foreground);MI(fg_extra);
+ MF(alpha_min); MI(i);MF(alpha[i]);MF(alpha_max) );
+
+ if ( -1e-5 < alpha_mean && alpha_mean <= 0.0 ) alpha_mean= 0.0;
+ if (1.0 <= alpha_mean && alpha_mean <= 1.0+1e-5) alpha_mean= 1.0;
+
+ MUST( 0 <= alpha_mean &&
+ (fg_extra ? (alpha_mean < 0.999) : (alpha_mean <= 1.0)),
+ MP(p);
+ MRGB(here);MRGB(background);MRGB(foreground);MI(fg_extra);
+ MF(alpha_mean); MF(alpha[0]);MF(alpha[1]);MF(alpha[2]); );
+
+ return alpha_mean;
+}
+
static void find_commodity(int offset, Rect *rr) {
/* rr->tl.x==-1 if offset out of range */
rr->tl.y= commbasey - offset*comminty;
const RgbImage *ri= cim->rgb;
- Rgb background= ri_rgb(ri, cell->br.x, cell->br.y);
+ Rgb background;
+ unsigned char chanbg[3];
long bg_count=0, light_count=0, dark_count=0;
Point p;
+
+ background= ri_rgb(ri, cell->br.x, cell->br.y);
+ memcpy(chanbg, RI_PIXEL(ri, cell->br.x, cell->br.y), 3);
+
FOR_P_RECT(p,*cell) {
- Rgb here= ri_rgb(ri, p.x, p.y);
- if (here == background) bg_count++;
- else if (here < background) dark_count++;
- else if (here > background) light_count++;
+ const unsigned char *here_pixel= RI_PIXEL(ri, p.x, p.y);
+ int i;
+ for (i=0; i<3; i++) {
+ unsigned here= here_pixel[i];
+ if (here == chanbg[i]) bg_count++;
+ else if (here < chanbg[i]) dark_count += (chanbg[i] - here)/4 + 1;
+ else if (here > chanbg[i]) light_count += (here - chanbg[i])/4 + 1;
+ }
}
- long total_count= RECT_W(*cell) * RECT_H(*cell);
+ long total_count= RECT_W(*cell) * RECT_H(*cell) * 3;
+
MUST( bg_count > total_count / 2,
MR(*cell);MIL(total_count);MIL(bg_count);
MIL(light_count);MIL(dark_count) );
+
if (bg_count == total_count)
return;
- MUST( !!dark_count != !!light_count,
- MR(*cell);MIL(total_count);MIL(bg_count);
- MIL(light_count);MIL(dark_count) );
-
- debugf("TABLEENTRY col=%d %d,%d..%d,%d bg=%ld light=%ld dark=%ld\n",
- colno, cell->tl.x,cell->tl.y, cell->br.x,cell->br.y,
- bg_count, light_count, dark_count);
-
Rgb foreground;
double fg_extra;
- if (light_count) {
+
+ if (light_count/16 > dark_count) {
foreground= 0xffffffU;
fg_extra= +1;
- } else {
+ } else if (dark_count/16 > light_count) {
foreground= 0;
fg_extra= -1;
+ } else {
+ MUST( !"tell light from dark",
+ MR(*cell);MIL(total_count);MIL(bg_count);
+ MIL(light_count);MIL(dark_count);MRGB(background); );
}
+
+ debugf("TABLEENTRY col=%d %d,%d..%d,%d bg=%ld light=%ld dark=%ld\n",
+ colno, cell->tl.x,cell->tl.y, cell->br.x,cell->br.y,
+ bg_count, light_count, dark_count);
+
int monochrome= 1;
FOR_P_RECT(p,*cell) {
- Rgb here= ri_rgb(ri, p.x, p.y);
- double alpha[3], alpha_mean=0;
- int i;
- for (i=0; i<3; i++) {
- unsigned char here_chan= here >> (i*8);
- unsigned char bg_chan= background >> (i*8);
- unsigned char fg_chan= foreground >> (i*8);
- double alpha_chan=
- ((double)here_chan - (double)bg_chan) /
- ((fg_chan + fg_extra) - (double)bg_chan);
- alpha[i]= alpha_chan;
- alpha_mean += alpha_chan * (1/3.0);
- }
+ double alpha= find_aa_density(ri,p,background,foreground,fg_extra);
- double thresh= 1.5/AAMAXVAL;
- double alpha_min= alpha_mean - thresh;
- double alpha_max= alpha_mean + thresh;
- for (i=0; i<3; i++)
- MUST( alpha_min <= alpha[i] && alpha[i] <= alpha_max,
- MI(i);MRGB(here);MRGB(background);MRGB(foreground);
- MF(alpha_min);MF(alpha[i]);MF(alpha_max) );
-
- MUST( 0 <= alpha_mean && alpha_mean < 0.999,
- MRGB(here);MRGB(background);MRGB(foreground);
- MF(alpha_mean); MF(alpha[0]);MF(alpha[1]);MF(alpha[2]); );
- int here_int= floor((AAMAXVAL+1)*alpha_mean);
+ int here_int= floor((AAMAXVAL+1)*alpha);
assert(here_int <= AAMAXVAL);
if (!(here_int==0 || here_int==AAMAXVAL)) monochrome=0;
cim->d[p.y * cim->w + p.x]= '0' + here_int;
int page, tryrect, colno;
for (page=0; page<npages; page++) {
- find_structure(page_images[page], 0);
+ find_structure(page_images[page], 0,0,0,0);
if (!page)
check_correct_commodities();
return sunshiner;
}
-void find_islandname(RgbImage *ri) {
- find_structure(page_images[0], 0);
+void find_islandname(void) {
+ find_structure(page_images[0], 0,0,0,0);
+ RgbImage *ri= alloc_rgb_image(page_images[0]->rgb->w,
+ page_images[0]->rgb->h);
+ memcpy(ri->data, page_images[0]->rgb->data, ri->w * ri->h * 3);
+
Rect sunshiner= find_sunshine_widget();
char sunshine[MAXIMGIDENT], archisland[MAXIMGIDENT];
for (p.y=islandnamer.tl.y; p.y<=islandnamer.br.y; p.y++) {
pattern <<= 1;
- switch (get_p(p)) {
- case '*': if (runs[nruns]) { nruns++; runs[nruns]=0; } break;
- case 'O': runs[nruns]++; pattern |= 1u; break;
- default: pattern |= 1UL<<31; break;
+ double alpha= find_aa_density(ri,p, 0xCCCCAA,0x002255,0);
+ if (alpha >= 0.49) {
+ runs[nruns]++;
+ pattern |= 1u;
+ } else {
+ if (runs[nruns]) {
+ nruns++;
+ runs[nruns]=0;
+ }
}
}
nspaces++;
might_be_colon=0;
} else {
- if (!(pattern & 1UL<<31) && nruns==2 && runs[1]==runs[0]) {
+ if (nruns==2 && runs[1]==runs[0]) {
if (!nspaces) {
if (pattern==colon_pattern)
goto ok_might_be_colon;
might_be_colon=1;
goto ok_might_be_colon;
}
+ } else if (nruns==1 && runs[0]==1 && might_be_colon) {
+ goto colon_found;
}
might_be_colon=0;
ok_might_be_colon:
~yarrgweb / ypp-sc-tools.db-test.git / blobdiff