#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;
+#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 */
+ { 0x934405, '*' }, /* border of ship 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:"
- " %s:%d: requirement failed: %s\n",
+ " %s:%d: requirement failed:\n"
+ " %s\n",
file, line, what);
}
static void mustfail2(void) NORET;
); \
}while(0)
-void find_structure(CanonImage *im, int *max_relevant_y_r) {
+#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=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)); \
+ if (got >= (want)) \
+ break; \
+ (search).TLBR.XY += increm; \
+ }
+
+void find_structure(const 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;
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);
+ ADJUST_BOX(search,"_",10, cim->h, MUST, tl,y,+1);
+ ADJUST_BOX(search,"_",10, 0, MUST, br,y,-1);
debug_rect("commodselr",1, search);
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));
}
}
}
+
+//static Rect islandnamer;
+
+void find_islandname(void) {
+ Rect sunshiner;
+ char sunshine[MAXIMGIDENT];
+ const RgbImage *ri= page0_rgbimage;
+
+ 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= 228;
+
+ 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, 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, br,x,+1);
+ debug_rect("sunshiner",1, sunshiner);
+
+ identify_rgbimage(ri, sunshiner, sunshine, "sunshine widget");
+ fprintf(stderr,"sunshine: `%s'",sunshine);
+
+#if 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);
+
+ 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