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 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) {
+void find_structure(CanonImage *im, int *max_relevant_y_r) {
cim= im;
Rect whole = { {0,0}, {cim->w-1,cim->h-1} };
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 } };
+
+#define SEARCH_UPDOWN(this,increm) \
+ for (;;) { \
+ MUST( search.tl.y != search.br.y, MR(search);MSB(#this); ); \
+ int x, got=0; \
+ for (x=search.tl.x; x<=search.br.x; x++) \
+ got += (get(x,this.y) == '_'); \
+ if (got > 10) \
+ break; \
+ this.y += increm; \
+ }
+
+ SEARCH_UPDOWN(search.tl, +1);
+ SEARCH_UPDOWN(search.br, -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(page_images[page], 0);
+
+ if (!page)
+ check_correct_commodities();
if (!rd)
rd= ocr_init(text_h);