#include "structure.h"
-static CanonImage *cim;
+static const CanonImage *cim;
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); }
static int text_h=-1, columns=-1;
static OcrReader *rd;
+char *archipelago, *island;
+
#define OTHERCOORD_x y
#define OTHERCOORD_y x
" 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:"
- " %s:%d: requirement failed: %s\n",
+ " %s:%d: requirement failed:\n"
+ " %s\n",
file, line, what);
}
static void mustfail2(void) NORET;
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; \
+ int got=0; \
+ Point p=(search).tl; \
+ for (p.XY=(search).TLBR.XY; \
p.OTHERCOORD_##XY <= (search).br.OTHERCOORD_##XY; \
p.OTHERCOORD_##XY++) \
got += !!strchr(insidechrs, get_p(p)); \
(search).TLBR.XY += increm; \
}
-void find_structure_commod(CanonImage *im, int *max_relevant_y_r) {
+void find_structure(const CanonImage *im, int *max_relevant_y_r) {
cim= im;
Rect whole = { {0,0}, {cim->w-1,cim->h-1} };
struct pam inpam;
unsigned char rgb_buf[3];
CanonImage *im;
+ RgbImage *ri=0;
pnm_readpaminit(f, &inpam, sizeof(inpam));
if (!(inpam.maxval == 255 &&
inpam.format == RPPM_FORMAT))
fatal("PNM screenshot(s) file must be 8bpp 1 byte per sample RGB");
+ if (!npages)
+ page0_rgbimage= ri= alloc_rgb_image(inpam.width, inpam.height);
+
CANONICALISE_IMAGE(im, inpam.width, inpam.height, {
int r= fread(&rgb_buf,1,3,f);
sysassert(!ferror(f));
((unsigned long)rgb_buf[0]<<16) |
((unsigned long)rgb_buf[1]<<8) |
(rgb_buf[2]);
+
+ if (ri)
+ CANONIMG_ALSO_STORERGB(ri);
});
sysassert(!ferror(screenshot_file));
int page, tryrect, colno;
for (page=0; page<npages; page++) {
- find_structure_commod(page_images[page], 0);
+ find_structure(page_images[page], 0);
if (!page)
check_correct_commodities();
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.");
}
-#if 0
-
-static Rect islandnamer;
+//static Rect islandnamer;
-void find_structure_islandname(CanonImage *im, RgbImage *ri) {
+void find_islandname(void) {
Rect sunshiner;
+ char sunshine[MAXIMGIDENT], archisland[MAXIMGIDENT];
+
+ RgbImage *ri= alloc_rgb_image(page0_rgbimage->w, page0_rgbimage->h);
+ 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);
+ }
+ cim= page_images[0];
+
sunshiner.tl.x= cim->w - 1034 + 885;
sunshiner.br.x= cim->w - 1034 + 1020;
sunshiner.tl.y= 227;
- sunshiner.br.y= 227;
+ sunshiner.br.y= 228;
ADJUST_BOX(sunshiner,"o*",30, 100,MUST, tl,y,-1);
- ADJUST_BOX(sunshiner,"o*",30, 100,MUST, tl,y,-1);
+ ADJUST_BOX(sunshiner,"o*",30, 100,MUST, br,y,+1);
debug_rect("sunshiner",0, sunshiner);
- MUST(sunshiner.br.y - sunshiner.tl.y > 20);
- sunshiner.tl.y++;
+ MUST(sunshiner.br.y - sunshiner.tl.y > 20, MR(sunshiner));
sunshiner.br.y--;
ADJUST_BOX(sunshiner,"o",20, (cim->w - 1034 + 700), MUST, tl,x,-1);
- ADJUST_BOX(sunshiner,"o",20, cim->w, MUST, tl,x,+1);
+ ADJUST_BOX(sunshiner,"o",20, cim->w, MUST, br,x,+1);
debug_rect("sunshiner",1, sunshiner);
- lookup_rect();
+ identify_rgbimage(ri, sunshiner, sunshine, "sunshine widget");
+ if (!memcmp(sunshine,"Ship ",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);
+
+ 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;
+ }
+ }
+ }
- 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);
+ identify_rgbimage(ri, islandnamer, archisland, "island");
+ } else {
+ assert(!"not vessel");
+ }
- 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);
+ char *delim= strstr(archisland," - ");
+ assert(delim);
+ archipelago= masprintf("%.*s", delim-archisland, archisland);
+ island= masprintf("%s", delim+3);
- debug_ppmrect("islandnamer",2, islandnamer,ri);
-
- not_in_radar:
-
-
-
- abort();
+ free(ri);
}
-
-#endif
~yarrgweb / ypp-sc-tools.web-live.git / blobdiff