X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Fstructure.c;h=35cf0d9507da3335dbe47df403e9992808bc8e85;hp=37ac8c8a38fe989a1790b4f3071a9fed070d84ec;hb=f8488ba218ce448dc5c02c8d83e85b6c551332eb;hpb=261c1f193e8fea0983d8fb33a7310ddec34f15e8

diff --git a/pctb/structure.c b/pctb/structure.c
index 37ac8c8..35cf0d9 100644
--- a/pctb/structure.c
+++ b/pctb/structure.c
@@ -46,6 +46,8 @@ static int colrightx[INTERESTING_COLUMNS];
 static int text_h=-1, columns=-1;
 static OcrReader *rd;
 
+char *archipelago, *island;
+
 #define OTHERCOORD_x y
 #define OTHERCOORD_y x
 
@@ -468,6 +470,8 @@ void analyse(FILE *tsv_output) {
     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)
@@ -490,6 +494,7 @@ void analyse(FILE *tsv_output) {
       sysassert(!fflush(tsv_output));
     }
   }
+  progress("Commodity table scan complete.");
 }
 
 //static Rect islandnamer;
@@ -497,7 +502,17 @@ void analyse(FILE *tsv_output) {
 void find_islandname(void) {
   Rect sunshiner;
   char sunshine[MAXIMGIDENT], archisland[MAXIMGIDENT];
-  const RgbImage *ri= page0_rgbimage;
+
+  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];
   
@@ -518,7 +533,6 @@ void find_islandname(void) {
   debug_rect("sunshiner",1, sunshiner);
 
   identify_rgbimage(ri, sunshiner, sunshine, "sunshine widget");
-  fprintf(stderr,"sunshine: `%s'\n",sunshine);
   
   if (!memcmp(sunshine,"Ship ",5)) {
     Rect islandnamer;
@@ -528,11 +542,8 @@ void find_islandname(void) {
     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, 0,      IR_VSHRINK_MUST, tl,y,+1);
-    ADJUST_BOX(islandnamer,"o",5, cim->h, IR_VSHRINK_MUST, br,y,-1);
+    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;
@@ -541,15 +552,25 @@ void find_islandname(void) {
 //    islandnamer.br.y = larger_islandnamebry;
     debug_rect("islandnamer",1, islandnamer);
 
-    identify_rgbimage(ri, islandnamer, archisland, "island");
-    fprintf(stderr,"radar: `%s'\n",archisland);
+    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;
+	  }
+	}
+      }
 
-    assert(!"radar ok");
-  
-  not_in_radar:
-    assert(!"not in radar?");
+    identify_rgbimage(ri, islandnamer, archisland, "island");
   } else {
     assert(!"not vessel");
   }
 
+  char *delim= strstr(archisland," - ");
+  assert(delim);
+  archipelago= masprintf("%.*s", delim-archisland, archisland);
+  island= masprintf("%s", delim+3);
+
+  free(ri);
 }