Labelling: bitmaps for labels are still somewhat dummy (no rotation)

[leo.git] / labeller.c

diff --git a/labeller.c b/labeller.c
index ff4e4a0abd749a65e33ad5a612649e4e68884923..0942f073d826788166d232f13ae4842e19176e5e 100644 (file)
--- a/labeller.c
+++ b/labeller.c
@@ -139,7 +139,7 @@ struct individual **perform_crossover(struct individual *parent1, struct individ
 void perform_mutation(struct individual *individual);
 
 void hide_segment_labels(struct individual *individual);
-void init_placement(struct placement *p, struct request *r);
+void init_placement(struct placement *p, struct individual *individual, struct request *r);
 void init_individual(struct individual *i);
 struct map_part **get_parts(struct placement *symbol, struct individual *individual);
 
@@ -247,28 +247,13 @@ void make_bitmap_point(struct point_variant *v, struct sym_point *sp)
 
 void make_bitmap_label(struct point_variant *v, struct sym_text *text)
 {
-  int x_ld = 0;
-  int y_ld = 0;
-  int x_lu = 0;
-  int y_lu = 0;
-  int x_rd = 0;
-  int y_rd = 0;
-  int x_ru = 0;
-  int y_ru = 0;
-
-  v->width = max4(x_ld, x_lu, x_rd, x_ru) - min4(x_ld, x_lu, x_rd, x_ru);
-  v->height = max4(y_ld, y_lu, y_rd, y_ru) - min4(y_ld, y_lu, y_rd, y_ru);
-  //v->bitmap = malloc((int) (ceil(v->width) * ceil(v->height) * sizeof(bool)));
-
   v->width = ceil(text->tw);
   v->height = ceil(text->th);
   v->bitmap = malloc(v->width * v->height * sizeof(bool));
-//  printf("Allocated bitmap of %d bools for %d x %d label\n", v->width * v->height, v->width, v->height);
   for (int i=0; i<v->height; i++)
     for (int j=0; j<v->width; j++)
     {
       v->bitmap[i*v->width + j] = 1;
-//      printf("Writing at %d\n", i*v->width + j);
     }
 }
 
@@ -1062,27 +1047,27 @@ void make_population(void)
     int p = 0;
     for (uns j=0; j<GARY_SIZE(requests_point); j++)
     {
-      init_placement(&(individual->placements[p++]), (struct request *) &requests_point[j]);
+      init_placement(&(individual->placements[p++]), individual, (struct request *) &requests_point[j]);
     }
 
     for (uns j=0; j<GARY_SIZE(requests_line); j++)
     {
-      init_placement(&(individual->placements[p++]), (struct request *) &requests_line[j]);
+      init_placement(&(individual->placements[p++]), individual, (struct request *) &requests_line[j]);
 
       for (uns k=0; k<GARY_SIZE(requests_line[j].sections); k++)
       {
-        init_placement(&(individual->placements[p++]), (struct request *) &requests_line[j].sections[k]);
+        init_placement(&(individual->placements[p++]), individual, (struct request *) &requests_line[j].sections[k]);
 
         for (uns l=0; l<GARY_SIZE(requests_line[j].sections[k].segments); l++)
         {
-          init_placement(&(individual->placements[p++]), (struct request *) &requests_line[j].sections[k].segments[l]);
+          init_placement(&(individual->placements[p++]), individual, (struct request *) &requests_line[j].sections[k].segments[l]);
         }
       }
     }
 
     for (uns j=0; j<GARY_SIZE(requests_area); j++)
     {
-      init_placement(&(individual->placements[p++]), (struct request *) &requests_area[j]);
+      init_placement(&(individual->placements[p++]), individual, (struct request *) &requests_area[j]);
     }
 
     hide_segment_labels(individual);
@@ -1418,13 +1403,14 @@ void hide_segment_labels(struct individual *individual)
   }
 }
 
-void init_placement(struct placement *p, struct request *r)
+void init_placement(struct placement *p, struct individual *individual, struct request *r)
 {
   // FIXME
   p->request = r;
   p->processed = 0;
   p->x = p->y = 0; // To prevent valgrind from complaining
   p->variant_used = 0;
+  p->individual = individual;
   switch (r->type)
   {
     case REQUEST_POINT: ;