Commit: 6738899880509e7487e1efbbc20cff5d427e63bc - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: 6738899880509e7487e1efbbc20cff5d427e63bc (tree)
• Time: 2003-11-02 19:58:35
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Brown Bag 0.92.2

Change Summary

• modified: ChangeLog
• modified: NEWS
• modified: app/connectionpoint_ops.c
• modified: app/disp_callbacks.c
• modified: app/load_save.c
• modified: config.h.win32
• modified: configure.in
• modified: dia.spec
• modified: doc/en/dia-manual.xml
• modified: doc/pl/dia-manual.sgml
• modified: lib/dynamic_obj.c
• modified: objects/UML/branch.c
• modified: objects/UML/large_package.c
• modified: objects/UML/node.c

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* config.h.win32: 
+	* doc/en/dia-manual.xml: 
+	* dia.spec: 
+	* configure.in: 
+	* NEWS: Another Brown Bag release for parenting problems,
+	including a crash bug fix.
+
+	* app/connectionpoint_ops.c (diagram_update_connections_object):
+	Also update connections when moving children.  This can cause
+	move_handle to be called twice, so it must be idempotent.
+
+	* app/load_save.c: Loading and saving of children totally redone.
+	Now doesn't violate assumption that all objects in a layer are
+	placed in order in XML file.
+
+	* objects/UML/branch.c (branch_create): Don't lie about being
+	resizable. 
+
+	* objects/UML/node.c (node_create): 
+	* objects/UML/large_package.c (largepackage_create): Drag with
+	lower right-hand handle at creation like all other objects.
+
[phone]  Lars Clausen  <[e-mail]>
+
+	* app/disp_callbacks.c (ddisplay_drop_object): Change initial
+	parenting drop to behave like a move inside, i.e. constrain place
+	instead of trying to resize.  'Cause, resizing cannot be done for
+	all objects (e.g. UML Class). Also simplified the algorithm a lot
+	at the same time.
+
+	* app/load_save.c: Saving and loading of connection points for
+	children added.  Prototypes for static functions added.
+
+	* lib/dynamic_obj.c: Removed debugging output.
+
 2003-10-26  Lars Clausen  <[e-mail]>
 
 	* doc/en/dia-manual.xml: 

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+dia-0.92.2: 01-Nov-2003
+
+* Another Brown Bag release.  Parented objects lost all connections, now
+  retained.  Also fixed crash bug that tried to resize unresizable objects
+  and connections update for children.
+
 dia-0.92.1: 26-Oct-2003
 
 * Brown Bag release.  Fixes crashbug in the "Analog Clock" symbol, and bug

--- a/app/connectionpoint_ops.c
+++ b/app/connectionpoint_ops.c
@@ -119,9 +119,14 @@ diagram_update_connections_object(Diagram *dia, Object *obj,
 	
 	list = g_list_next(list);
       }
-      
     }
-    
+  }
+  if (obj->children) {
+    GList *child;
+    for (child = obj->children; child != NULL; child = child->next) {
+      Object *child_obj = (Object *)child->data;
+      diagram_update_connections_object(dia, child_obj, update_nonmoved);
+    }    
   }
 }
 

--- a/app/disp_callbacks.c
+++ b/app/disp_callbacks.c
@@ -799,19 +799,28 @@ ddisplay_drop_object(DDisplay *ddisp, gint x, gint y, ObjectType *otype,
 
   click_distance = ddisplay_untransform_length(ddisp, 3.0);
 
+  /* Notice that using diagram_find_clicked_object doesn't allow any object
+   * below the first to be a parent.  This should be fixed.
+   * -Lars
+   */
   p_obj = diagram_find_clicked_object(ddisp->diagram, &droppoint_orig,
 				    click_distance);
 
   if (p_obj && p_obj->can_parent) /* the tool was dropped inside an object that takes children*/
   {
     Rectangle *p_ext, *c_ext;
-    int new_height = 0, new_width = 0;
     real parent_height, child_height, parent_width, child_width;
+    real vadjust = 0.0, hadjust = 0.0;
     Point new_pos;
 
     obj->parent = p_obj;
     p_obj->children = g_list_append(p_obj->children, obj);
 
+    /* This is not really what we want.  We want the box containing all
+     * rendered parts of the object (not the bbox).  But it'll do for now,
+     * since we don't have the 'rendered bbox'.
+     * -Lars
+     */
     p_ext = parent_handle_extents(p_obj);
     c_ext = parent_handle_extents(obj);
 
@@ -821,64 +830,40 @@ ddisplay_drop_object(DDisplay *ddisp, gint x, gint y, ObjectType *otype,
     parent_width = p_ext->right - p_ext->left;
     child_width = c_ext->right - c_ext->left;
 
-    /* we need the pre-snap position */
-    c_ext->left = droppoint_orig.x;
-    c_ext->top = droppoint_orig.y;
+    /* we need the pre-snap position, but must remember that handles can
+     * be to the left of the droppoint */
+    c_ext->left = droppoint_orig.x - (obj->position.x - c_ext->left);
+    c_ext->top  = droppoint_orig.y - (obj->position.y - c_ext->top);
     c_ext->right = c_ext->left + child_width;
     c_ext->bottom = c_ext->top + child_height;
 
-    /* check if the top of the child is inside the parent, but the bottom is not */
-    if (c_ext->top < p_ext->bottom && c_ext->bottom > p_ext->bottom)
-    {
-      /* check if child is smaller than parent height wise */
-      if (child_height < parent_height)
-        new_height = child_height;
-      /* check if parent is bigger than 1 in height */
-      else if (parent_height  > 1)
-        new_height = round_up(parent_height) - 1;
+    if (c_ext->left < p_ext->left) {
+      hadjust = p_ext->left - c_ext->left;
+    } else if (c_ext->right > p_ext->right) {
+      hadjust = p_ext->right - c_ext->right;
     }
-    else
-    {
-      new_height = child_height;
-    }
-    /* check if the left of the child is inside the partent, but the right is not */
-    if (c_ext->left < p_ext->right && c_ext->right > p_ext->right)
-    {
-      /* check if child is smaller than parent width wise */
-      if (child_width < parent_width)
-        new_width = child_width;
-      /* check if parent is bigger than 1 in width */
-      else if (parent_width > 1)
-        new_width = round_up(parent_width) - 1;
-    }
-    else
-    {
-      new_width = child_width;
+    if (c_ext->top < p_ext->top) {
+      vadjust = p_ext->top - c_ext->top;
+    } else if (c_ext->bottom > p_ext->bottom) {
+      vadjust = p_ext->bottom - c_ext->bottom;
     }
 
     g_free(p_ext);
     g_free(c_ext);
 
-    /* if we can't fit in both directions, produce an error */
-    if (!new_height && !new_width)
-    {
+    if (child_width > parent_width ||
+	child_height > parent_height) {
       message_error(_("The object you dropped cannot fit into its parent. \nEither expand the parent object, or drop the object elsewhere."));
       obj->parent->children = g_list_remove(obj->parent->children, obj);
       obj->ops->destroy (obj);
       return NULL;
     }
-    /* if we can't fit height wise, make height same as of the parent */
-    else if (!new_height)
-      new_height = parent_height;
-    /* if we can't fit width wise, make the width same as of the parent */
-    else if (!new_width)
-      new_width = parent_width;
-
-    new_pos.x = droppoint.x + new_width;
-    new_pos.y = droppoint.y + new_height;
-    obj->ops->move_handle(obj, handle2, &new_pos, NULL,
-			  HANDLE_MOVE_USER, 0);
 
+    if (hadjust || vadjust) {
+      new_pos.x = droppoint.x + hadjust;
+      new_pos.y = droppoint.y + vadjust;
+      obj->ops->move(obj, &new_pos);
+    }
   }
 
 

--- a/app/load_save.c
+++ b/app/load_save.c
@@ -55,6 +55,30 @@
 #define fchmod(f,m) (0)
 #endif
 
+static void read_connections(GList *objects, xmlNodePtr layer_node,
+			     GHashTable *objects_hash);
+static void GHFuncUnknownObjects(gpointer key,
+				 gpointer value,
+				 gpointer user_data);
+static GList *read_objects(xmlNodePtr objects, Layer *layer,
+			   GHashTable *objects_hash,
+			   const char *filename, Object *parent);
+static void hash_free_string(gpointer       key,
+			     gpointer       value,
+			     gpointer       user_data);
+static xmlNodePtr find_node_named (xmlNodePtr p, const char *name);
+static gboolean diagram_data_load(const char *filename, DiagramData *data,
+				  void* user_data);
+static gboolean write_objects(GList *objects, xmlNodePtr objects_node,
+			      GHashTable *objects_hash, int *obj_nr, 
+			      const char *filename);
+static gboolean write_connections(GList *objects, xmlNodePtr layer_node,
+				  GHashTable *objects_hash);
+static xmlDocPtr diagram_data_write_doc(DiagramData *data, const char *filename);
+static int diagram_data_raw_save(DiagramData *data, const char *filename);
+static int diagram_data_save(DiagramData *data, const char *filename);
+
+
 static void
 GHFuncUnknownObjects(gpointer key,
                      gpointer value,
@@ -134,7 +158,8 @@ read_objects(xmlNodePtr objects, Layer *layer,
         {
           if (strcmp(child_node->name, "children") == 0)
           {
-            list = g_list_concat(list, read_objects(child_node, layer, objects_hash, filename, obj));
+	    GList *children_read = read_objects(child_node, layer, objects_hash, filename, obj);
+            list = g_list_concat(list, children_read);
             break;
           }
           child_node = child_node->next;
@@ -185,7 +210,7 @@ read_connections(GList *objects, xmlNodePtr layer_node,
   obj_node = layer_node->xmlChildrenNode;
   while ((list != NULL) && (obj_node != NULL)) {
     Object *obj = (Object *) list->data;
-    
+
     while (obj_node && xmlIsBlankNode(obj_node)) obj_node = obj_node->next;
     if (!obj_node) break;
     
@@ -233,9 +258,26 @@ read_connections(GList *objects, xmlNodePtr layer_node,
 	  connection = connection->next;
 	}
       }
-      
     }
     
+    /* Now set up parent relationships. */
+    connections = obj_node->xmlChildrenNode;
+    while ((connections!=NULL) &&
+	   (strcmp(connections->name, "childnode")!=0))
+      connections = connections->next;
+    if (connections != NULL) {
+      tostr = xmlGetProp(connections, "parent");
+      if (tostr) {
+	obj->parent = g_hash_table_lookup(objects_hash, tostr);
+	if (obj->parent == NULL) {
+	  message_error(_("Can't find parent %s of %s object\n"), 
+			tostr, obj->type->name);
+	} else {
+	  obj->parent->children = g_list_prepend(obj->parent->children, obj);
+	}
+      }
+    }
+
     list = g_list_next(list);
     obj_node = obj_node->next;
   }
@@ -515,14 +557,13 @@ diagram_data_load(const char *filename, DiagramData *data, void* user_data)
   return TRUE;
 }
 
-static void
+static gboolean
 write_objects(GList *objects, xmlNodePtr objects_node,
 	      GHashTable *objects_hash, int *obj_nr, const char *filename)
 {
   char buffer[31];
   ObjectNode obj_node;
   xmlNodePtr group_node;
-  xmlNodePtr parent_node;
   GList *list;
 
   list = objects;
@@ -543,7 +584,6 @@ write_objects(GList *objects, xmlNodePtr objects_node,
       obj_node = xmlNewChild(objects_node, NULL, "object", NULL);
     
       xmlSetProp(obj_node, "type", obj->type->name);
-      
       g_snprintf(buffer, 30, "%d", obj->type->version);
       xmlSetProp(obj_node, "version", buffer);
       
@@ -555,20 +595,29 @@ write_objects(GList *objects, xmlNodePtr objects_node,
       /* Add object -> obj_nr to hash table */
       g_hash_table_insert(objects_hash, obj, GINT_TO_POINTER(*obj_nr));
       (*obj_nr)++;
-
+      
+      /*
       if (obj->can_parent && obj->children)
       {
+	int res;
+	xmlNodePtr parent_node;
         parent_node = xmlNewChild(obj_node, NULL, "children", NULL);
-        write_objects(obj->children, parent_node,
-      	  	objects_hash, obj_nr, filename);
+        res = write_objects(obj->children, parent_node, objects_hash, obj_nr, filename);
+	if (!res) return FALSE;
       }
+      */
     }
 
     list = g_list_next(list);
   }
+  return TRUE;
 }
 
-static int
+/* Parents broke assumption that both objects and xml nodes are laid out
+ * linearly.  
+ */
+
+static gboolean
 write_connections(GList *objects, xmlNodePtr layer_node,
 		  GHashTable *objects_hash)
 {
@@ -625,13 +674,25 @@ write_connections(GList *objects, xmlNodePtr layer_node,
 	  g_snprintf(buffer, 30, "O%d",
 		     GPOINTER_TO_INT(g_hash_table_lookup(objects_hash,
 							 other_obj)));
+
 	  xmlSetProp(connection, "to", buffer);
 	  /* to what connection_point on that object */
 	  g_snprintf(buffer, 30, "%d", con_point_nr);
 	  xmlSetProp(connection, "connection", buffer);
+
+
 	}
       }
     }
+
+    if (obj->parent) {
+      Object *other_obj = obj->parent;
+      xmlNodePtr parent;
+      g_snprintf(buffer, 30, "O%d",
+		 GPOINTER_TO_INT(g_hash_table_lookup(objects_hash, other_obj)));
+      parent = xmlNewChild(obj_node, NULL, "childnode", NULL);
+      xmlSetProp(parent, "parent", buffer);
+    }
     
     list = g_list_next(list);
     obj_node = obj_node->next;
@@ -648,7 +709,7 @@ diagram_data_write_doc(DiagramData *data, const char *filename)
   xmlNodePtr pageinfo, gridinfo, guideinfo;
   xmlNodePtr layer_node;
   GHashTable *objects_hash;
-  int res;
+  gboolean res;
   int obj_nr;
   int i;
   Layer *layer;

--- a/config.h.win32
+++ b/config.h.win32
@@ -14,7 +14,7 @@
 #define GETTEXT_PACKAGE "dia"
 #define LOCALEDIR "../lib/locale"
 
-#define VERSION "0.92.1"
+#define VERSION "0.92.2"
 
 /*
  * We are linking libxml as DLL with either msvc or mingw, but this

--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this -*- autoconf -*- file with autoconf to produce a 
 dnl configure script.
-AC_INIT(dia, 0.92.1, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.92.2, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
 AC_CONFIG_SRCDIR(app/diagram.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 

--- a/dia.spec
+++ b/dia.spec
@@ -1,6 +1,6 @@
 %define name dia
 # This is the full Dia version
-%define ver 0.92.1
+%define ver 0.92.2
 
 Summary: A gtk+ based diagram creation program.
 Name: %name

--- a/doc/en/dia-manual.xml
+++ b/doc/en/dia-manual.xml
@@ -8,7 +8,7 @@
 
   [
 
-    <!ENTITY VERSION "0.92.1">
+    <!ENTITY VERSION "0.92.2">
 
     <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 

--- a/doc/pl/dia-manual.sgml
+++ b/doc/pl/dia-manual.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook V4.1//EN"[
-<!ENTITY VERSION "0.92.1">
+<!ENTITY VERSION "0.92.2">
 <!ENTITY INTRODUCTION SYSTEM "intro.sgml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.sgml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.sgml">

--- a/lib/dynamic_obj.c
+++ b/lib/dynamic_obj.c
@@ -51,12 +51,8 @@ void dynobj_list_remove_object(Object* obj) {
 
     if (item) {
         DynobjRec* dor = item->data;
-	printf("Removing obj %p from list of len %d\n",
-	       obj, g_list_length(dyn_obj_list));
         dyn_obj_list = g_list_remove(dyn_obj_list,dor);
         g_free(dor);
-    } else {
-      printf("Dying object %p not found\n", obj);
     }
 }
 

--- a/objects/UML/branch.c
+++ b/objects/UML/branch.c
@@ -166,8 +166,14 @@ branch_move_handle(Branch *branch, Handle *handle,
 
   assert(handle->id < 8);
   
+  /* It smashes size info in update_data anyway.  And none of its siblings
+   * resizable, so until that changes, this should be properly unresizable
+   */
+    
+  /*
   element_move_handle(&branch->element, handle->id, to, cp, reason, modifiers);
   branch_update_data(branch);
+  */
 
   return NULL;
 }
@@ -262,8 +268,12 @@ static Object *branch_create(Point *startpoint, void *user_data, Handle **handle
   elem->extra_spacing.border_trans = BRANCH_BORDERWIDTH / 2.0;
   branch_update_data(branch);
 
+  for (i=0;i<8;i++) {
+    obj->handles[i]->type = HANDLE_NON_MOVABLE;
+  }
+
   *handle1 = NULL;
-  *handle2 = obj->handles[0];
+  *handle2 = NULL;
   return &branch->element.object;
 }
 

--- a/objects/UML/large_package.c
+++ b/objects/UML/large_package.c
@@ -374,7 +374,7 @@ largepackage_create(Point *startpoint,
   largepackage_update_data(pkg);
 
   *handle1 = NULL;
-  *handle2 = obj->handles[0];
+  *handle2 = obj->handles[7];
   return &pkg->element.object;
 }
 

--- a/objects/UML/node.c
+++ b/objects/UML/node.c
@@ -361,7 +361,7 @@ static Object *node_create(Point *startpoint, void *user_data, Handle **handle1,
   node_update_data(node);
 
   *handle1 = NULL;
-  *handle2 = obj->handles[0];
+  *handle2 = obj->handles[7];
   return &node->element.object;
 }