Commit: 5b764705d89ff165f9d2eed22cfe0c55b740947e - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: 5b764705d89ff165f9d2eed22cfe0c55b740947e (tree)
• Time: 2002-05-19 08:39:18
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Text size change.

Change Summary

• modified: ChangeLog
• modified: objects/ER/attribute.c
• modified: objects/ER/entity.c
• modified: objects/ER/relationship.c

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* objects/ER/entity.c: 
+	* objects/ER/attribute.c: 
+	* objects/ER/relationship.c: Patch to allow text size change from
+	Celso Tetsuo Nagase Suzuki.
+
 2002-05-18  Steffen Macke <[e-mail]>
 
 	* app/app_procs.c: #ifdef'd xmlerror.h (comes with 

--- a/objects/ER/attribute.c
+++ b/objects/ER/attribute.c
@@ -66,6 +66,7 @@ struct _Attribute {
   Element element;
 
   DiaFont *font;
+  real font_height;
   utfchar *name;
   real name_width;
 
@@ -158,6 +159,7 @@ static PropDescription attribute_props[] = {
   PROP_STD_LINE_COLOUR,
   PROP_STD_FILL_COLOUR,
   PROP_STD_TEXT_FONT,
+  PROP_STD_TEXT_HEIGHT,
   PROP_DESC_END
 };
 
@@ -180,6 +182,7 @@ static PropOffset attribute_offsets[] = {
   { "line_colour", PROP_TYPE_COLOUR, offsetof(Attribute, border_color) },
   { "fill_colour", PROP_TYPE_COLOUR, offsetof(Attribute, inner_color) },
   { "text_font", PROP_TYPE_FONT, offsetof(Attribute, font) },
+  { "text_height", PROP_TYPE_REAL, offsetof(Attribute, font_height) },
   { NULL, 0, 0}
 };
 
@@ -276,10 +279,10 @@ attribute_draw(Attribute *attribute, Renderer *renderer)
   }
 
   p.x = elem->corner.x + elem->width / 2.0;
-  p.y = elem->corner.y + (elem->height - FONT_HEIGHT)/2.0 +
-         font_ascent(attribute->font, FONT_HEIGHT);
+  p.y = elem->corner.y + (elem->height - attribute->font_height)/2.0 +
+         font_ascent(attribute->font, attribute->font_height);
 
-  renderer->ops->set_font(renderer,  attribute->font, FONT_HEIGHT);
+  renderer->ops->set_font(renderer,  attribute->font, attribute->font_height);
   renderer->ops->draw_string(renderer, attribute->name, 
 			     &p, ALIGN_CENTER, 
 			     &color_black);
@@ -291,7 +294,7 @@ attribute_draw(Attribute *attribute, Renderer *renderer)
     } else {
       renderer->ops->set_linestyle(renderer, LINESTYLE_SOLID);
     }
-    width = font_string_width(attribute->name, attribute->font, FONT_HEIGHT);
+    width = font_string_width(attribute->name, attribute->font, attribute->font_height);
     start.x = center.x - width / 2;
     start.y = center.y + 0.4;
     end.x = center.x + width / 2;
@@ -310,10 +313,10 @@ attribute_update_data(Attribute *attribute)
   real half_x, half_y;
 
   attribute->name_width =
-    font_string_width(attribute->name, attribute->font, FONT_HEIGHT);
+    font_string_width(attribute->name, attribute->font, attribute->font_height);
 
   elem->width = attribute->name_width + 2*TEXT_BORDER_WIDTH_X;
-  elem->height = FONT_HEIGHT + 2*TEXT_BORDER_WIDTH_Y;
+  elem->height = attribute->font_height + 2*TEXT_BORDER_WIDTH_Y;
 
   center.x = elem->corner.x + elem->width / 2.0;
   center.y = elem->corner.y + elem->height / 2.0;
@@ -389,6 +392,7 @@ attribute_create(Point *startpoint,
   /* choose default font name for your locale. see also font_data structure
      in lib/font.c. if "Courier" works for you, it would be better.  */
   attribute->font = font_getfont(_("Courier"));
+  attribute->font_height = FONT_HEIGHT;
 #ifdef GTK_DOESNT_TALK_UTF8_WE_DO
   attribute->name = charconv_local8_to_utf8 (_("Attribute"));
 #else
@@ -396,7 +400,7 @@ attribute_create(Point *startpoint,
 #endif
 
   attribute->name_width =
-    font_string_width(attribute->name, attribute->font, FONT_HEIGHT);
+    font_string_width(attribute->name, attribute->font, attribute->font_height);
 
   attribute_update_data(attribute);
 
@@ -445,6 +449,7 @@ attribute_copy(Attribute *attribute)
   }
 
   newattribute->font = attribute->font;
+  newattribute->font_height = attribute->font_height;
   newattribute->name = strdup(attribute->name);
   newattribute->name_width = attribute->name_width;
 
@@ -481,6 +486,8 @@ attribute_save(Attribute *attribute, ObjectNode obj_node,
 		   attribute->multivalue);
   data_add_font (new_attribute (obj_node, "font"),
 		 attribute->font);
+  data_add_real(new_attribute(obj_node, "font_height"),
+		attribute->font_height);
 }
 
 static Object *attribute_load(ObjectNode obj_node, int version,
@@ -542,6 +549,11 @@ static Object *attribute_load(ObjectNode obj_node, int version,
   if (attr != NULL)
 	  attribute->font = data_font (attribute_first_data (attr));
 
+  attribute->font_height = FONT_HEIGHT;
+  attr = object_find_attribute (obj_node, "font_height");
+  if (attr != NULL)
+    attribute->font_height = data_real( attribute_first_data(attr) );
+
   element_init(elem, 8, 8);
 
   for (i=0;i<8;i++) {
@@ -556,8 +568,7 @@ static Object *attribute_load(ObjectNode obj_node, int version,
 	  attribute->font = font_getfont(_("Courier"));
   }
 
-  attribute->name_width = font_string_width(attribute->name, attribute->font, FONT_HEIGHT);
-
+  attribute->name_width = font_string_width(attribute->name, attribute->font, attribute->font_height);
   attribute_update_data(attribute);
 
   for (i=0;i<8;i++) {

--- a/objects/ER/entity.c
+++ b/objects/ER/entity.c
@@ -55,6 +55,7 @@ struct _Entity {
   Color inner_color;
   
   DiaFont *font;
+  real font_height;
   utfchar *name;
   real name_width;
   
@@ -130,6 +131,7 @@ static PropDescription entity_props[] = {
   PROP_STD_LINE_COLOUR,
   PROP_STD_FILL_COLOUR,
   PROP_STD_TEXT_FONT,
+  PROP_STD_TEXT_HEIGHT,
   PROP_DESC_END
 };
 
@@ -149,6 +151,7 @@ static PropOffset entity_offsets[] = {
   { "line_colour", PROP_TYPE_COLOUR, offsetof(Entity, border_color) },
   { "fill_colour", PROP_TYPE_COLOUR, offsetof(Entity, inner_color) },
   { "text_font", PROP_TYPE_FONT, offsetof (Entity, font) },
+  { "text_height", PROP_TYPE_REAL, offsetof(Entity, font_height) },
   { NULL, 0, 0}
 };
 
@@ -255,9 +258,9 @@ entity_draw(Entity *entity, Renderer *renderer)
   }
 
   p.x = elem->corner.x + elem->width / 2.0;
-  p.y = elem->corner.y + (elem->height - FONT_HEIGHT)/2.0 + font_ascent(entity->font, FONT_HEIGHT);
+  p.y = elem->corner.y + (elem->height - entity->font_height)/2.0 + font_ascent(entity->font, entity->font_height);
   renderer->ops->set_font(renderer, 
-			  entity->font, FONT_HEIGHT);
+			  entity->font, entity->font_height);
   renderer->ops->draw_string(renderer, 
 			     entity->name, 
 			     &p, ALIGN_CENTER, 
@@ -272,10 +275,10 @@ entity_update_data(Entity *entity)
   ElementBBExtras *extra = &elem->extra_spacing;
 
   entity->name_width =
-    font_string_width(entity->name, entity->font, FONT_HEIGHT);
+    font_string_width(entity->name, entity->font, entity->font_height);
 
   elem->width = entity->name_width + 2*TEXT_BORDER_WIDTH_X;
-  elem->height = FONT_HEIGHT + 2*TEXT_BORDER_WIDTH_Y;
+  elem->height = entity->font_height + 2*TEXT_BORDER_WIDTH_Y;
 
   /* Update connections: */
   entity->connections[0].pos = elem->corner;
@@ -341,6 +344,7 @@ entity_create(Point *startpoint,
   /* choose default font name for your locale. see also font_data structure
      in lib/font.c. if "Courier" works for you, it would be better.  */
   entity->font = font_getfont(_("Courier"));
+  entity->font_height = FONT_HEIGHT;
 #ifdef GTK_DOESNT_TALK_UTF8_WE_DO
   entity->name = charconv_local8_to_utf8 (_("Entity"));
 #else
@@ -348,7 +352,7 @@ entity_create(Point *startpoint,
 #endif
 
   entity->name_width =
-    font_string_width(entity->name, entity->font, FONT_HEIGHT);
+    font_string_width(entity->name, entity->font, entity->font_height);
   
   entity_update_data(entity);
 
@@ -397,6 +401,7 @@ entity_copy(Entity *entity)
   }
 
   newentity->font = entity->font;
+  newentity->font_height = entity->font_height;
   newentity->name = strdup(entity->name);
   newentity->name_width = entity->name_width;
 
@@ -422,6 +427,8 @@ entity_save(Entity *entity, ObjectNode obj_node, const char *filename)
 		   entity->weak);
   data_add_font (new_attribute (obj_node, "font"),
 		 entity->font);
+  data_add_real(new_attribute(obj_node, "font_height"),
+  		entity->font_height);
 }
 
 static Object *
@@ -471,6 +478,11 @@ entity_load(ObjectNode obj_node, int version, const char *filename)
   if (attr != NULL)
 	  entity->font = data_font (attribute_first_data (attr));
 
+  entity->font_height = FONT_HEIGHT;
+  attr = object_find_attribute(obj_node, "font_height");
+  if (attr != NULL)
+    entity->font_height = data_real(attribute_first_data(attr));
+
   element_init(elem, 8, 8);
 
   for (i=0;i<8;i++) {
@@ -486,7 +498,7 @@ entity_load(ObjectNode obj_node, int version, const char *filename)
   }
 
   entity->name_width =
-    font_string_width(entity->name, entity->font, FONT_HEIGHT);
+    font_string_width(entity->name, entity->font, entity->font_height);
 
   entity_update_data(entity);
 

--- a/objects/ER/relationship.c
+++ b/objects/ER/relationship.c
@@ -50,6 +50,7 @@ struct _Relationship {
   Element element;
 
   DiaFont *font;
+  real font_height;
   utfchar *name;
   utfchar *left_cardinality;
   utfchar *right_cardinality;
@@ -145,6 +146,7 @@ static PropDescription relationship_props[] = {
   PROP_STD_LINE_COLOUR,
   PROP_STD_FILL_COLOUR,
   PROP_STD_TEXT_FONT,
+  PROP_STD_TEXT_HEIGHT,
   PROP_DESC_END
 };
 
@@ -167,6 +169,7 @@ static PropOffset relationship_offsets[] = {
   { "line_colour", PROP_TYPE_COLOUR, offsetof(Relationship, border_color) },
   { "fill_colour", PROP_TYPE_COLOUR, offsetof(Relationship, inner_color) },
   { "text_font", PROP_TYPE_FONT, offsetof (Relationship, font) },
+  { "text_height", PROP_TYPE_REAL, offsetof(Relationship, font_height) },
   { NULL, 0, 0}
 };
 
@@ -268,7 +271,7 @@ relationship_draw(Relationship *relationship, Renderer *renderer)
     lc.x = corners[1].x + 0.2;
     lc.y = corners[1].y - 0.3;
     rc.x = corners[3].x + 0.2;
-    rc.y = corners[3].y + 0.3 + FONT_HEIGHT;
+    rc.y = corners[3].y + 0.3 + relationship->font_height;
     left_align = ALIGN_LEFT;
   } else {
     lc.x = corners[0].x - CARDINALITY_DISTANCE;
@@ -289,7 +292,7 @@ relationship_draw(Relationship *relationship, Renderer *renderer)
 				&relationship->border_color);
   }
 
-  renderer->ops->set_font(renderer, relationship->font, FONT_HEIGHT);
+  renderer->ops->set_font(renderer, relationship->font, relationship->font_height);
   renderer->ops->draw_string(renderer,
 			     relationship->left_cardinality,
 			     &lc, left_align,
@@ -300,8 +303,8 @@ relationship_draw(Relationship *relationship, Renderer *renderer)
 			     &color_black);
 
   p.x = elem->corner.x + elem->width / 2.0;
-  p.y = elem->corner.y + (elem->height - FONT_HEIGHT)/2.0 +
-         font_ascent(relationship->font, FONT_HEIGHT);
+  p.y = elem->corner.y + (elem->height - relationship->font_height)/2.0 +
+         font_ascent(relationship->font, relationship->font_height);
   
   renderer->ops->draw_string(renderer, 
 			     relationship->name, 
@@ -317,11 +320,11 @@ relationship_update_data(Relationship *relationship)
   ElementBBExtras *extra = &elem->extra_spacing;
 
   relationship->name_width =
-    font_string_width(relationship->name, relationship->font, FONT_HEIGHT);
+    font_string_width(relationship->name, relationship->font, relationship->font_height);
   relationship->left_card_width =
-    font_string_width(relationship->left_cardinality, relationship->font, FONT_HEIGHT);
+    font_string_width(relationship->left_cardinality, relationship->font, relationship->font_height);
   relationship->right_card_width =
-    font_string_width(relationship->right_cardinality, relationship->font, FONT_HEIGHT);
+    font_string_width(relationship->right_cardinality, relationship->font, relationship->font_height);
 
   elem->width = relationship->name_width + 2*TEXT_BORDER_WIDTH_X;
   elem->height = elem->width * DIAMOND_RATIO;
@@ -370,8 +373,8 @@ relationship_update_data(Relationship *relationship)
   
   /* fix boundingrelationship for line_width: */
   if(relationship->rotate) {
-    obj->bounding_box.top -= FONT_HEIGHT + CARDINALITY_DISTANCE;
-    obj->bounding_box.bottom += FONT_HEIGHT + CARDINALITY_DISTANCE;
+    obj->bounding_box.top -= relationship->font_height + CARDINALITY_DISTANCE;
+    obj->bounding_box.bottom += relationship->font_height + CARDINALITY_DISTANCE;
   }
   else {
     obj->bounding_box.left -= CARDINALITY_DISTANCE + relationship->left_card_width;
@@ -419,6 +422,7 @@ relationship_create(Point *startpoint,
   /* choose default font name for your locale. see also font_data structure
      in lib/font.c. if "Courier" works for you, it would be better.  */
   relationship->font = font_getfont(_("Courier"));
+  relationship->font_height = FONT_HEIGHT;
 #ifdef GTK_DOESNT_TALK_UTF8_WE_DO
   relationship->name = charconv_local8_to_utf8 (_("Relationship"));
 #else
@@ -430,11 +434,11 @@ relationship_create(Point *startpoint,
   relationship->rotate = FALSE;
 
   relationship->name_width =
-    font_string_width(relationship->name, relationship->font, FONT_HEIGHT);
+    font_string_width(relationship->name, relationship->font, relationship->font_height);
   relationship->left_card_width =
-    font_string_width(relationship->left_cardinality, relationship->font, FONT_HEIGHT);
+    font_string_width(relationship->left_cardinality, relationship->font, relationship->font_height);
   relationship->right_card_width =
-    font_string_width(relationship->right_cardinality, relationship->font, FONT_HEIGHT);
+    font_string_width(relationship->right_cardinality, relationship->font, relationship->font_height);
 
   relationship_update_data(relationship);
 
@@ -485,6 +489,7 @@ relationship_copy(Relationship *relationship)
   }
 
   newrelationship->font = relationship->font;
+  newrelationship->font_height = relationship->font_height;
   newrelationship->name = strdup(relationship->name);
   newrelationship->left_cardinality =
     strdup(relationship->left_cardinality);
@@ -524,6 +529,8 @@ relationship_save(Relationship *relationship, ObjectNode obj_node,
 		   relationship->rotate);
   data_add_font (new_attribute (obj_node, "font"),
 		 relationship->font);
+  data_add_real(new_attribute(obj_node, "font_height"),
+  		relationship->font_height);
 }
 
 static Object *
@@ -587,6 +594,11 @@ relationship_load(ObjectNode obj_node, int version, const char *filename)
   if (attr != NULL)
 	  relationship->font = data_font (attribute_first_data (attr));
 
+  relationship->font_height = FONT_HEIGHT;
+  attr = object_find_attribute(obj_node, "font_height");
+  if (attr != NULL)
+    relationship->font_height = data_real(attribute_first_data(attr));
+
   element_init(elem, 8, 8);
 
   for (i=0;i<8;i++) {
@@ -602,11 +614,11 @@ relationship_load(ObjectNode obj_node, int version, const char *filename)
   }
 
   relationship->name_width =
-    font_string_width(relationship->name, relationship->font, FONT_HEIGHT);
+    font_string_width(relationship->name, relationship->font, relationship->font_height);
   relationship->left_card_width =
-    font_string_width(relationship->left_cardinality, relationship->font, FONT_HEIGHT);
+    font_string_width(relationship->left_cardinality, relationship->font, relationship->font_height);
   relationship->right_card_width =
-    font_string_width(relationship->right_cardinality, relationship->font, FONT_HEIGHT);
+    font_string_width(relationship->right_cardinality, relationship->font, relationship->font_height);
 
   relationship_update_data(relationship);