X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=labeller.h;h=e0088173446a392a2f6a4661bd17310b3caa423f;hb=e827ddca25fa9660147cac4d4438d7b41b8e342b;hp=d6dfa27d3323d96b98ba41d83b95a772dfbcf708;hpb=eadd63b657be979276b0f7bab89f76a632473ab4;p=leo.git

diff --git a/labeller.h b/labeller.h
index d6dfa27..e008817 100644
--- a/labeller.h
+++ b/labeller.h
@@ -27,22 +27,20 @@ enum term_cond
   TERM_COND_ITERATIONS,
 };
 
-struct point_variant
+struct variant
 {
   int width;
   int height;
+  int offset_x;
+  int offset_y;
   bool *bitmap;
 };
 
-struct line_variant
-{
-  bool *masks;
-};
-
 struct request
 {
   enum request_type type;
   int ind;
+  struct variant *variants;
 };
 
 struct request_point
@@ -55,7 +53,6 @@ struct request_point
   double offset_x;
   double offset_y;
   int num_variants;
-  struct point_variant *variants;
 };
 
 struct request_segment
@@ -66,8 +63,8 @@ struct request_segment
   double y1;
   double x2;
   double y2;
+  double slope;
   struct symbol *label;
-  struct point_variant *variant;
   z_index_t zindex;
 };
 
@@ -83,9 +80,6 @@ struct request_line
   struct request request;
   struct symbol *line;
   int num_variants;
-  int num_segments;
-  struct line_variant *variants;
-  struct request_segment *segments;
   struct request_section *sections;
 };
 
@@ -94,7 +88,6 @@ struct request_area
   struct request request;
   struct osm_multipolygon *o;
   struct symbol *label;
-  struct point_variant *variants;
   z_index_t zindex;
   double cx, cy;
 };
@@ -152,11 +145,30 @@ struct placement
   double x;
   double y;
   int variant_used;
+  int ind;
   bool processed;
+  // FIXME: Replace with clist?
+  struct placement_link *map_links;
+  struct individual *individual;
+};
+
+struct placement_link
+{
+  struct map_placement *mp;
+  struct placement_link *next;
+};
+
+struct map_placement
+{
+  struct placement *placement;
+  struct map_placement *next;
+  struct map_placement *prev;
 };
 
 struct map_part
 {
+  // FIXME: Replace with clist?
+  struct map_placement *placement;
 };
 
 struct individual
@@ -173,45 +185,4 @@ void labeller_label(void);
 void labeller_add_linelabel(struct symbol *sym, struct osm_object *o, z_index_t zindex);
 void labeller_add_arealabel(struct symbol *sym, struct osm_object *o, z_index_t zindex);
 
-void make_bitmap_icon(struct point_variant *v, struct sym_icon *si);
-void make_bitmap_point(struct point_variant *v, struct sym_point *sp);
-void make_bitmap_label(struct point_variant *v, struct sym_text *text);
-
-void make_graph(void);
-void label_graph(void);
-void join_edge(struct graph_edge *e, int dir);
-void bfs(void);
-void make_segments(void);
-
-void make_population(void);
-bool shall_terminate(void);
-void breed(void);
-void mutate(void);
-void elite(void);
-void rank_population(void);
-
-struct individual **perform_crossover(struct individual *parent1, struct individual *parent2);
-void perform_mutation(struct individual *individual);
-
-void init_placement(struct placement *p, struct request *r);
-void init_individual(struct individual *i);
-struct map_part **get_parts(struct placement *symbol, struct individual *individual);
-
-int randint(int min, int max);
-
-struct placement **get_closure(struct placement *placement, struct individual *parent1, struct individual *parent2);
-void copy_symbols(struct placement **closure, struct individual *parent, struct individual *child);
-void move_symbol(struct placement *p);
-void move_symbol_point(struct placement *p);
-
-struct placement **get_overlapping(struct placement *p);
-void filter(struct placement **list, bool *pred);
-
-int flip(int a, int b);
-double randdouble(void);
-
-void cleanup(void);
-
-void copy_individual(struct individual *src, struct individual *dest);
-
 #endif