/*
- */
+ * Parsing of the structure of the YPP client's displayed image
+ */
+/*
+ * This is part of ypp-sc-tools, a set of third-party tools for assisting
+ * players of Yohoho Puzzle Pirates.
+ *
+ * Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
+ * are used without permission. This program is not endorsed or
+ * sponsored by Three Rings.
+ */
#include "structure.h"
const CanonColourInfo canoncolourinfos[]= {
{ 0x475A5E, '*' }, /* edge */
{ 0x2C5F7A, '*' }, /* edge just under box heading shadow */
+ { 0xC5C7Ae, '*' }, /* blank area of partial commodities list */
{ 0x7D9094, '+' }, /* interbox */
{ 0xBDC5BF, ' ' }, /* background - pale Sugar cane, etc. */
#v,(v).tl.x,(v).tl.y,(v).br.x,(v).br.y)
+#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) {
+ 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}};
- MR(rm);MP(p);MS(ok);
+ MI(lineno),MR(rm);MP(p);MS(ok);
}));
}
}
-static void require_rectangle_r(Rect rr, const char *ok) {
- require_rectangle(rr.tl.x,rr.tl.y, rr.br.x,rr.br.y, 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 debug_rect(const char *what, int whati, Rect rr) {
); \
}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} };
WALK_UNTIL_MUST(mainr.br, x,+1, whole.br.x, '*');
WALK_UNTIL_MUST(mainr.br, y,+1, whole.br.y, '*');
- require_rectangle(mainr.tl.x-1, mainr.tl.y, mainr.tl.x-1, mainr.br.y, "*");
- require_rectangle(mainr.br.x+1, mainr.tl.y, mainr.br.x+1, mainr.br.y, "*");
- require_rectangle(mainr.tl.x, mainr.tl.y-1, mainr.br.x, mainr.tl.y-1, "*");
- require_rectangle(mainr.tl.x, mainr.br.y+1, mainr.br.x, mainr.br.y+1, "*");
-
-#define CHECK_STRIP_BORDER(tlbr,xy,increm) \
- do { \
- Point csb_p; \
- Rect csb_r; \
- csb_p= mainr.tl; \
- csb_p.xy= mainr.tlbr.xy; \
- if (get_p(csb_p)=='+') { \
- csb_r= mainr; \
- csb_r.tl.xy= csb_p.xy; \
- csb_r.br.xy= csb_p.xy; \
- require_rectangle_r(csb_r, "+"); \
- mainr.tlbr.xy += increm; \
- } \
+ REQUIRE_RECTANGLE(mainr.tl.x-1, mainr.tl.y, mainr.tl.x-1, mainr.br.y, "*");
+ REQUIRE_RECTANGLE(mainr.br.x+1, mainr.tl.y, mainr.br.x+1, mainr.br.y, "*");
+ REQUIRE_RECTANGLE(mainr.tl.x, mainr.tl.y-1, mainr.br.x, mainr.tl.y-1, "*");
+ REQUIRE_RECTANGLE(mainr.tl.x, mainr.br.y+1, mainr.br.x, mainr.br.y+1, "*");
+
+#define CHECK_STRIP_BORDER(tlbr,xy,increm) \
+ do { \
+ Point csb_p; \
+ Rect csb_r; \
+ csb_p= mainr.tl; \
+ csb_p.xy= mainr.tlbr.xy; \
+ if (get_p(csb_p)=='+') { \
+ csb_r= mainr; \
+ csb_r.tl.xy= csb_p.xy; \
+ csb_r.br.xy= csb_p.xy; \
+ require_rectangle_r(csb_r, "+", __LINE__); \
+ mainr.tlbr.xy += increm; \
+ } \
} while(0)
debug_rect("mainr",0, mainr);
break;
across.x++;
- require_rectangle(across.x,mainr.tl.y, across.x,mainr.br.y, "+");
+ REQUIRE_RECTANGLE(across.x,mainr.tl.y, across.x,mainr.br.y, "+");
across.x++;
}
MUST( colno >= MIN_COLUMNS, MI(colno);MR(mainr);MP(across); );
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);
}
CanonImage *alloc_canon_image(int w, int h) {
(rgb_buf[2]);
});
- sysassert(!ferror(screenshots_file));
+ sysassert(!ferror(screenshot_file));
if (!(npages < MAX_PAGES))
fatal("Too many images in screenshots file; max is %d.\n", MAX_PAGES);
void read_one_screenshot(void) {
progress("reading screenshot...");
- file_read_image_ppm(screenshots_file);
+ file_read_image_ppm(screenshot_file);
progress_log("read screenshot.");
}
void read_screenshots(void) {
struct stat stab;
- sysassert(! fstat(fileno(screenshots_file), &stab) );
+ sysassert(! fstat(fileno(screenshot_file), &stab) );
for (;;) {
if (S_ISREG(stab.st_mode)) {
- long pos= ftell(screenshots_file);
+ long pos= ftell(screenshot_file);
if (pos == stab.st_size) break;
} else {
- int c= fgetc(screenshots_file);
+ int c= fgetc(screenshot_file);
if (c==EOF) break;
- ungetc(c, screenshots_file);
+ ungetc(c, screenshot_file);
}
progress("reading screenshot %d...",npages);
- file_read_image_ppm(screenshots_file);
+ file_read_image_ppm(screenshot_file);
}
- sysassert(!ferror(screenshots_file));
+ sysassert(!ferror(screenshot_file));
progress_log("read %d screenshots.",npages);
}
rr->br.x= mainr.br.x;
if (rr->tl.y > mainr.tl.y)
- require_rectangle(rr->tl.x,rr->tl.y-1, rr->br.x,rr->tl.y-1, "+");
+ REQUIRE_RECTANGLE(rr->tl.x,rr->tl.y-1, rr->br.x,rr->tl.y-1, "+");
if (rr->br.y < mainr.tl.y)
- require_rectangle(rr->tl.x,rr->br.y+1, rr->br.x,rr->br.y+1, "+");
+ REQUIRE_RECTANGLE(rr->tl.x,rr->br.y+1, rr->br.x,rr->br.y+1, "+");
}
static void find_table_entry(Rect commod, int colno, Rect *cellr) {
cellr->tl.x= !colno ? commod.tl.x : colrightx[colno-1]+2;
cellr->br.x= colrightx[colno];
debug_rect("cell", colno, *cellr);
- require_rectangle_r(*cellr, " o");
+ require_rectangle_r(*cellr, " o", __LINE__);
}
-static void ocr_rectangle(Rect r, const OcrCellType ct) {
+static void ocr_rectangle(Rect r, const OcrCellType ct, FILE *tsv_output) {
OcrResultGlyph *results, *res;
int w= r.br.x - r.tl.x + 1;
results= ocr(rd,ct,w,cols);
for (res=results; res->s; res++)
- printf("%s",res->s);
+ fputs(res->s,tsv_output);
}
-void analyse(void) {
+void analyse(FILE *tsv_output) {
Rect thisr, entryr;
int page, tryrect, colno;
for (page=0; page<npages; page++) {
- find_structure(page_images[page]);
+ find_structure(page_images[page], 0);
if (!rd)
rd= ocr_init(text_h);
const char *tab= "";
for (colno=0; colno<columns; colno++) {
find_table_entry(thisr,colno,&entryr);
- fputs(tab, stdout);
+ fputs(tab, tsv_output);
ocr_rectangle(entryr,
colno<TEXT_COLUMNS
? &ocr_celltype_text
- : &ocr_celltype_number);
+ : &ocr_celltype_number,
+ tsv_output);
tab= "\t";
}
- fputs("\n", stdout);
- sysassert(!ferror(stdout));
- sysassert(!fflush(stdout));
+ fputs("\n", tsv_output);
+ sysassert(!ferror(tsv_output));
+ sysassert(!fflush(tsv_output));
}
}
}