Can find each commodity

diff --git a/pctb/convert.c b/pctb/convert.c
index 95e75b3e613b55813df459168da9c55bd939a171..b518dbabf6913e202761dfc9b34cd524d77d4d55 100644 (file)
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -33,6 +33,15 @@ static inline char get(int x, int y) { return image[y * width + x]; }
 static inline char get_p(Point p) { return get(p.x,p.y); }
 
 
+#define START_MAIN {200,200}
+#define INTERESTING_COLUMNS 6
+#define MAX_COLUMNS 7
+
+static Rect mainr = { START_MAIN,START_MAIN };
+static int commbasey, comminty;
+static int colrightx[INTERESTING_COLUMNS];
+
+
 static const CanonColourInfo canoncolourinfos[]= {
   { 0x475A5E, '*' }, /* edge */
   { 0x2C5F7A, '*' }, /* edge just under box heading shadow */
@@ -45,16 +54,17 @@ static const CanonColourInfo canoncolourinfos[]= {
   { 0,0 }
 };
 
-#define START_MAIN {200,200}
-
-static void require_rectangle(int tlx, int tly, int brx, int bry, char c) {
+static void require_rectangle(int tlx, int tly, int brx, int bry,
+                             const char *ok) {
   int x,y;
   for (x=tlx; x<=brx; x++)
-    for (y=tly; y<=bry; y++)
-      eassert(get(x,y) == c);
+    for (y=tly; y<=bry; y++) {
+      int c= get(x,y);
+      assert(strchr(ok,c));
+    }
 }
-static void require_rectangle_r(Rect rr, char c) {
-  require_rectangle(rr.tl.x,rr.tl.y, rr.br.x,rr.br.y, c);
+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 debug_rect(const char *what, int whati, Rect rr) {
@@ -63,7 +73,7 @@ static void debug_rect(const char *what, int whati, Rect rr) {
          rr.tl.x,rr.tl.y, rr.br.x,rr.br.y);
   w= rr.br.x - rr.tl.x + 1;
   for (y=rr.tl.y; y<=rr.br.y; y++) {
-    fprintf(debug, "%4d %4d ",y,y-rr.tl.y);
+    fprintf(debug, "%4d%*s|", y, rr.tl.x,"");
     r= fwrite(image + y*width + rr.tl.x, 1, w, debug);
     eassert(r==w);
     fputc('|',debug);
@@ -72,26 +82,31 @@ static void debug_rect(const char *what, int whati, Rect rr) {
   debug_flush();
 }
 
-static void find_main_rectangle(void) {
-  Rect whole = { {0,0}, {width-1,height-1} };
-  Rect mainr = { START_MAIN,START_MAIN };
-
-#define WALK_UNTIL(point,coord,increm,stop,edge)                       \
+#define WALK_UNTIL(point,coord,increm,last,edge)                       \
   for (;;) {                                                           \
+    if ((point).coord == (last)+(increm)) break;                       \
     if (get_p((point)) == (edge)) { (point).coord -= (increm); break; }        \
-    eassert((point).coord != (stop));                          \
     (point).coord += (increm);                                         \
   }
 
-  WALK_UNTIL(mainr.tl, x,-1, whole.tl.x, '*');
-  WALK_UNTIL(mainr.tl, y,-1, whole.tl.y, '*');
-  WALK_UNTIL(mainr.br, x,+1, whole.br.x, '*');
-  WALK_UNTIL(mainr.br, y,+1, whole.br.y, '*');
+#define WALK_UNTIL_MUST(point,coord,increm,last,edge)  \
+  do {                                                 \
+    WALK_UNTIL(point,coord,increm,last,edge);          \
+    eassert((point).coord != (last)+(increm));         \
+  } while(0)
+
+static void find_structure(void) {
+  Rect whole = { {0,0}, {width-1,height-1} };
+
+  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, '*');
+  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, '*');
+  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 {                                         \
@@ -103,7 +118,7 @@ static void find_main_rectangle(void) {
       csb_r= mainr;                            \
       csb_r.tl.xy= csb_p.xy;                   \
       csb_r.br.xy= csb_p.xy;                   \
-      require_rectangle_r(csb_r, '+');         \
+      require_rectangle_r(csb_r, "+");         \
       mainr.tlbr.xy += increm;                 \
     }                                          \
   } while(0)
@@ -116,8 +131,70 @@ static void find_main_rectangle(void) {
   CHECK_STRIP_BORDER(br,y,-1);
 
   debug_rect("mainr",1, mainr);
+
+  Point up = START_MAIN;
+  WALK_UNTIL_MUST(up, y,-1, mainr.tl.y, '+');
+
+  Point down = START_MAIN;
+  down.y++;
+  WALK_UNTIL_MUST(down, y,+1, mainr.br.y, '+');
+
+  int xscaleunit, y,x;
+  for (y=0, xscaleunit=1; y<4; y++, xscaleunit*=10) {
+    fprintf(debug,"     ");
+    for (x=0; x<=width; 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;
+  fprintf(debug, "up.y=%d down.y=%d commbasey=%d comminty=%d\n",
+         up.y,down.y, commbasey,comminty);
+
+  Point across= { mainr.tl.x, commbasey };
+  int colno=0;
+  for (;;) {
+    eassert(get_p(across) != '+');
+    WALK_UNTIL(across, x,+1, mainr.br.x, '+');
+    eassert(colno < MAX_COLUMNS);
+    int colrx= across.x;
+    if (colrx > mainr.br.x) colrx= mainr.br.x;
+    if (colno < INTERESTING_COLUMNS) {
+      colrightx[colno]= colrx;
+      fprintf(debug,"colrightx[%d]= %d\n",colno,colrx);
+    } else {
+      fprintf(debug,"extra colr %d  %d\n",colno,colrx);
+    }
+      
+    colno++;
+    
+    if (across.x >= mainr.br.x-1)
+      break;
+
+    across.x++;
+    require_rectangle(across.x,mainr.tl.y, across.x,mainr.br.y, "+");
+    across.x++;
+  }
+  
 }                  
 
+static void find_commodity(int offset, Rect *rr) {
+  /* rr->tl.x==-1 if offset out of range */
+  rr->tl.y= commbasey - offset*comminty;
+  rr->br.y= rr->tl.y + comminty-2;
+  if (rr->tl.y < mainr.tl.y || rr->br.y > mainr.br.y) { rr->tl.x=-1; return; }
+  if (rr->tl.y > mainr.tl.y)
+    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, "+");
+  
+  rr->tl.x= mainr.tl.x;
+  rr->br.x= mainr.br.x;
+}
+
 static void load_image_and_canonify(void) {
   struct pam inpam;
   unsigned char rgb[3];
@@ -156,9 +233,14 @@ static void load_image_and_canonify(void) {
 
 int main(void) {
   load_image_and_canonify();
-  find_main_rectangle();
-  /*
-  repeatedly_find_top_thing();
-  */
+  find_structure();
+
+  Rect thisr;
+  int tryrect;
+  for (tryrect= +height; tryrect >= -height; tryrect--) {
+    find_commodity(tryrect, &thisr);
+    if (thisr.tl.x >= 0)
+      debug_rect("commod",tryrect, thisr);
+  }
   return 0;
 }