Commit: 77b98855973cc616da59392e2617209f1667642c - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Révision: 77b98855973cc616da59392e2617209f1667642c (tree)
• l'heure: 1998-09-30 07:57:30
• Auteur: Alexander Larsson <alexl@src....>
• Commiter: Alexander Larsson

Message de Log

Changed handle->connectable to handle->connect_type.
Now handles can be HANDLE_CONNECTABLE_NOBREAK, which means
that their connections don't break when moving objects.

Change Summary

• modified: app/connectionpoint_ops.c
• modified: app/create_object.c
• modified: app/group.c
• modified: app/handle_ops.c
• modified: app/modify_tool.c
• modified: lib/connection.c
• modified: lib/element.c
• modified: lib/handle.h
• modified: lib/object.c
• modified: lib/object.h
• modified: lib/orth_conn.c
• modified: objects/UML/constraint.c
• modified: objects/UML/implements.c
• modified: objects/standard/arc.c
• modified: objects/standard/textobj.c
• modified: objects/standard/zigzagline.c

Modification

--- a/app/connectionpoint_ops.c
+++ b/app/connectionpoint_ops.c
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -135,8 +135,9 @@ ddisplay_connect_selected(DDisplay *ddisp)
     selected_obj = (Object *) list->data;
     
     for (i=0; i<selected_obj->num_handles; i++) {
-      if (selected_obj->handles[i]->connectable)
+      if (selected_obj->handles[i]->connect_type != HANDLE_NONCONNECTABLE) {
 	object_connect_display(ddisp, selected_obj, selected_obj->handles[i]);
+      }
     }
     
     list = g_list_next(list);
@@ -159,7 +160,9 @@ diagram_unconnect_selected(Diagram *dia)
     for (i=0; i<selected_obj->num_handles; i++) {
       handle = selected_obj->handles[i];
       
-      if (handle->connected_to != NULL) {
+      if ((handle->connected_to != NULL) &&
+	  (handle->connect_type == HANDLE_CONNECTABLE)){
+	  /* don't do this if type is HANDLE_CONNECTABLE_BREAK */
 	if (!diagram_is_selected(dia, handle->connected_to->object)) {
 	  object_unconnect(selected_obj, handle);
 	}

--- a/app/create_object.c
+++ b/app/create_object.c
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -59,7 +59,8 @@ create_object_button_press(CreateObjectTool *tool, GdkEventButton *event,
 		   (Renderer *)ddisp->renderer);
 
   /* Connect first handle if possible: */
-  if ((handle1!= NULL) && (handle1->connectable)) {
+  if ((handle1!= NULL) &&
+      (handle1->connect_type != HANDLE_NONCONNECTABLE)) {
     object_connect_display(ddisp, obj, handle1);
   }
 
@@ -99,7 +100,7 @@ create_object_button_release(CreateObjectTool *tool, GdkEventButton *event,
     object_add_updates(tool->obj, ddisp->diagram);
 
 
-    if (tool->handle->connectable) {
+    if (tool->handle->connect_type != HANDLE_NONCONNECTABLE) {
       object_connect_display(ddisp, tool->obj, tool->handle);
       diagram_update_connections_selection(ddisp->diagram);
       diagram_flush(ddisp->diagram);
@@ -126,7 +127,8 @@ create_object_motion(CreateObjectTool *tool, GdkEventMotion *event,
   /* Move to ConnectionPoint if near: */
   connectionpoint =
     object_find_connectpoint_display(ddisp, &to);
-  if ( (tool->handle->connectable) && (connectionpoint != NULL) ) {
+  if ( (tool->handle->connect_type != HANDLE_NONCONNECTABLE) &&
+       (connectionpoint != NULL) ) {
     to = connectionpoint->pos;
   } else {
     /* No connectionopoint near, then snap to grid (if enabled) */

--- a/app/group.c
+++ b/app/group.c
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -307,7 +307,7 @@ group_create(GList *objects)
   for (i=0;i<8;i++) {
     obj->handles[i] = &group->resize_handles[i];
     obj->handles[i]->type = HANDLE_NON_MOVABLE;
-    obj->handles[i]->connectable = FALSE;
+    obj->handles[i]->connect_type = HANDLE_NONCONNECTABLE;
     obj->handles[i]->connected_to = NULL;
   }
   

--- a/app/handle_ops.c
+++ b/app/handle_ops.c
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -83,7 +83,7 @@ handle_draw(Handle *handle, DDisplay *ddisp)
 		      HANDLE_SIZE-1, HANDLE_SIZE-1);
 
   
-  if (handle->connectable) {
+  if (handle->connect_type != HANDLE_NONCONNECTABLE) {
     gdk_draw_line (ddisp->pixmap,
 		   handle_gc,
 		   x - HANDLE_SIZE/2, y - HANDLE_SIZE/2,

--- a/app/modify_tool.c
+++ b/app/modify_tool.c
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -213,7 +213,6 @@ modify_double_click(ModifyTool *tool, GdkEventButton *event,
 {
   Point clickedpoint;
   Object *clicked_obj;
-  GtkWidget *properties;
   
   ddisplay_untransform_coords(ddisp,
 			      (int)event->x, (int)event->y,
@@ -265,7 +264,8 @@ modify_motion(ModifyTool *tool, GdkEventMotion *event,
     /* Move to ConnectionPoint if near: */
     connectionpoint =
       object_find_connectpoint_display(ddisp, &to);
-    if ( (tool->handle->connectable) && (connectionpoint != NULL) ) {
+    if ( (tool->handle->connect_type != HANDLE_NONCONNECTABLE) &&
+	 (connectionpoint != NULL) ) {
       to = connectionpoint->pos;
     } else {
       /* No connectionopoint near, then snap to grid (if enabled) */
@@ -352,7 +352,7 @@ modify_button_release(ModifyTool *tool, GdkEventButton *event,
     object_add_updates(tool->object, ddisp->diagram);
 
     /* Connect if possible: */
-    if (tool->handle->connectable) {
+    if (tool->handle->connect_type != HANDLE_NONCONNECTABLE) {
       object_connect_display(ddisp, tool->object, tool->handle);
       diagram_update_connections_selection(ddisp->diagram);
     }

--- a/lib/connection.c
+++ b/lib/connection.c
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -95,7 +95,7 @@ connection_init(Connection *conn, int num_handles, int num_connections)
   for (i=0;i<2;i++) {
     obj->handles[i] = &conn->endpoint_handles[i];
     obj->handles[i]->type = HANDLE_MAJOR_CONTROL;
-    obj->handles[i]->connectable = TRUE;
+    obj->handles[i]->connect_type = HANDLE_CONNECTABLE;
     obj->handles[i]->connected_to = NULL;
   }
 }

--- a/lib/element.c
+++ b/lib/element.c
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -257,7 +257,7 @@ element_init(Element *elem, int num_handles, int num_connections)
 
   for (i=0;i<8;i++) {
     obj->handles[i] = &elem->resize_handles[i];
-    obj->handles[i]->connectable = FALSE;
+    obj->handles[i]->connect_type = HANDLE_NONCONNECTABLE;
     obj->handles[i]->connected_to = NULL;
     obj->handles[i]->type = HANDLE_MAJOR_CONTROL;
   }

--- a/lib/handle.h
+++ b/lib/handle.h
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,7 @@ typedef struct _Handle Handle;
 typedef enum _HandleId HandleId;
 typedef enum _HandleType HandleType;
 typedef enum _HandleMoveReason HandleMoveReason;
+typedef enum _HandleConnectType HandleConnectType;
 
 /* Is this needed? */
 enum _HandleId {
@@ -62,6 +63,12 @@ enum _HandleMoveReason {
   HANDLE_MOVE_CONNECTED
 };
 
+enum _HandleConnectType {
+  HANDLE_NONCONNECTABLE,
+  HANDLE_CONNECTABLE,
+  HANDLE_CONNECTABLE_NOBREAK /* Don't break connection on object move */
+};
+
 #include "geometry.h"
 #include "object.h"
 
@@ -70,7 +77,7 @@ struct _Handle {
   HandleType type;
   Point pos;
   
-  int connectable;
+  HandleConnectType connect_type;
   ConnectionPoint *connected_to; /* NULL if not connected */
 };
 

--- a/lib/object.c
+++ b/lib/object.c
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -126,8 +126,8 @@ void
 object_connect(Object *obj, Handle *handle,
 	       ConnectionPoint *connectionpoint)
 {
-  if (!handle->connectable) {
-    message_error("Error? trying to connect a non conectable handle.\n"
+  if (handle->connect_type==HANDLE_NONCONNECTABLE) {
+    message_error("Error? trying to connect a non connectable handle.\n"
 		  "Check this out...\n");
     return;
   }

--- a/lib/object.h
+++ b/lib/object.h
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify

--- a/lib/orth_conn.c
+++ b/lib/orth_conn.c
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@ static void setup_midpoint_handle(Handle *handle)
 {
   handle->id = HANDLE_MIDPOINT;
   handle->type = HANDLE_MINOR_CONTROL;
-  handle->connectable = FALSE;
+  handle->connect_type = HANDLE_NONCONNECTABLE;
   handle->connected_to = NULL;
 }
 
@@ -416,13 +416,13 @@ orthconn_init(OrthConn *orth, Point *startpoint)
   orth->orientation = g_malloc(2*sizeof(Orientation));
 
   obj->handles[0] = &orth->endpoint_handles[0];
-  obj->handles[0]->connectable = TRUE;
+  obj->handles[0]->connect_type = HANDLE_CONNECTABLE;
   obj->handles[0]->connected_to = NULL;
   obj->handles[0]->type = HANDLE_MAJOR_CONTROL;
   obj->handles[0]->id = HANDLE_MOVE_STARTPOINT;
   
   obj->handles[1] = &orth->endpoint_handles[1];
-  obj->handles[1]->connectable = TRUE;
+  obj->handles[1]->connect_type = HANDLE_CONNECTABLE;
   obj->handles[1]->connected_to = NULL;
   obj->handles[1]->type = HANDLE_MAJOR_CONTROL;
   obj->handles[1]->id = HANDLE_MOVE_ENDPOINT;
@@ -544,14 +544,14 @@ orthconn_load(OrthConn *orth, int fd) /* NOTE: Does object_init() */
   }
 
   obj->handles[0] = &orth->endpoint_handles[0];
-  obj->handles[0]->connectable = TRUE;
+  obj->handles[0]->connect_type = HANDLE_CONNECTABLE;
   obj->handles[0]->connected_to = NULL;
   obj->handles[0]->type = HANDLE_MAJOR_CONTROL;
   obj->handles[0]->id = HANDLE_MOVE_STARTPOINT;
   obj->handles[0]->pos = orth->points[0];
   
   obj->handles[1] = &orth->endpoint_handles[1];
-  obj->handles[1]->connectable = TRUE;
+  obj->handles[1]->connect_type = HANDLE_CONNECTABLE;
   obj->handles[1]->connected_to = NULL;
   obj->handles[1]->type = HANDLE_MAJOR_CONTROL;
   obj->handles[1]->id = HANDLE_MOVE_ENDPOINT;

--- a/objects/UML/constraint.c
+++ b/objects/UML/constraint.c
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -256,7 +256,7 @@ constraint_create(Point *startpoint,
 
   constraint->text_handle.id = HANDLE_MOVE_TEXT;
   constraint->text_handle.type = HANDLE_MINOR_CONTROL;
-  constraint->text_handle.connectable = FALSE;
+  constraint->text_handle.connect_type = HANDLE_NONCONNECTABLE;
   constraint->text_handle.connected_to = NULL;
   obj->handles[2] = &constraint->text_handle;
   
@@ -381,7 +381,7 @@ constraint_load(int fd, int version)
 
   constraint->text_handle.id = HANDLE_MOVE_TEXT;
   constraint->text_handle.type = HANDLE_MINOR_CONTROL;
-  constraint->text_handle.connectable = FALSE;
+  constraint->text_handle.connect_type = HANDLE_NONCONNECTABLE;
   constraint->text_handle.connected_to = NULL;
   obj->handles[2] = &constraint->text_handle;
   

--- a/objects/UML/implements.c
+++ b/objects/UML/implements.c
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -268,13 +268,13 @@ implements_create(Point *startpoint,
 
   implements->text_handle.id = HANDLE_MOVE_TEXT;
   implements->text_handle.type = HANDLE_MINOR_CONTROL;
-  implements->text_handle.connectable = FALSE;
+  implements->text_handle.connect_type = HANDLE_NONCONNECTABLE;
   implements->text_handle.connected_to = NULL;
   obj->handles[2] = &implements->text_handle;
   
   implements->circle_handle.id = HANDLE_CIRCLE_SIZE;
   implements->circle_handle.type = HANDLE_MINOR_CONTROL;
-  implements->circle_handle.connectable = FALSE;
+  implements->circle_handle.connect_type = HANDLE_NONCONNECTABLE;
   implements->circle_handle.connected_to = NULL;
   obj->handles[3] = &implements->circle_handle;
 
@@ -435,13 +435,13 @@ implements_load(int fd, int version)
 
   implements->text_handle.id = HANDLE_MOVE_TEXT;
   implements->text_handle.type = HANDLE_MINOR_CONTROL;
-  implements->text_handle.connectable = FALSE;
+  implements->text_handle.connect_type = HANDLE_NONCONNECTABLE;
   implements->text_handle.connected_to = NULL;
   obj->handles[2] = &implements->text_handle;
   
   implements->circle_handle.id = HANDLE_CIRCLE_SIZE;
   implements->circle_handle.type = HANDLE_MINOR_CONTROL;
-  implements->circle_handle.connectable = FALSE;
+  implements->circle_handle.connect_type = HANDLE_NONCONNECTABLE;
   implements->circle_handle.connected_to = NULL;
   obj->handles[3] = &implements->circle_handle;
 

--- a/objects/standard/arc.c
+++ b/objects/standard/arc.c
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -286,7 +286,7 @@ arc_create(Point *startpoint,
   obj->handles[2] = &arc->middle_handle;
   arc->middle_handle.id = HANDLE_MIDDLE;
   arc->middle_handle.type = HANDLE_MINOR_CONTROL;
-  arc->middle_handle.connectable = FALSE;
+  arc->middle_handle.connect_type = HANDLE_NONCONNECTABLE;
   arc->middle_handle.connected_to = NULL;
 
   arc_update_data(arc);
@@ -437,7 +437,7 @@ arc_load(int fd, int version)
   obj->handles[2] = &arc->middle_handle;
   arc->middle_handle.id = HANDLE_MIDDLE;
   arc->middle_handle.type = HANDLE_MINOR_CONTROL;
-  arc->middle_handle.connectable = FALSE;
+  arc->middle_handle.connect_type = HANDLE_NONCONNECTABLE;
   arc->middle_handle.connected_to = NULL;
 
   arc_update_data(arc);

--- a/objects/standard/textobj.c
+++ b/objects/standard/textobj.c
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -277,7 +277,7 @@ textobj_create(Point *startpoint,
   obj->handles[0] = &textobj->text_handle;
   textobj->text_handle.id = HANDLE_TEXT;
   textobj->text_handle.type = HANDLE_MAJOR_CONTROL;
-  textobj->text_handle.connectable = TRUE;
+  textobj->text_handle.connect_type = HANDLE_CONNECTABLE;
   textobj->text_handle.connected_to = NULL;
 
   textobj_update_data(textobj);
@@ -354,7 +354,7 @@ textobj_load(int fd, int version)
   obj->handles[0] = &textobj->text_handle;
   textobj->text_handle.id = HANDLE_TEXT;
   textobj->text_handle.type = HANDLE_MINOR_CONTROL;
-  textobj->text_handle.connectable = TRUE;
+  textobj->text_handle.connect_type = HANDLE_CONNECTABLE;
   textobj->text_handle.connected_to = NULL;
 
   textobj_update_data(textobj);

--- a/objects/standard/zigzagline.c
+++ b/objects/standard/zigzagline.c
@@ -1,4 +1,4 @@
-/* xxxxxx -- an diagram creation/manipulation program
+/* Dia -- an diagram creation/manipulation program
  * Copyright (C) 1998 Alexander Larsson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -281,7 +281,7 @@ zigzagline_create(Point *startpoint,
   obj->handles[2] = &zigzagline->middle_handle;
   zigzagline->middle_handle.id = HANDLE_MIDDLE;
   zigzagline->middle_handle.type = HANDLE_MINOR_CONTROL;
-  zigzagline->middle_handle.connectable = FALSE;
+  zigzagline->middle_handle.connect_type = HANDLE_NONCONNECTABLE;
   zigzagline->middle_handle.connected_to = NULL;
   
   zigzagline_update_data(zigzagline);
@@ -381,7 +381,7 @@ zigzagline_load(int fd, int version)
   obj->handles[2] = &zigzagline->middle_handle;
   zigzagline->middle_handle.id = HANDLE_MIDDLE;
   zigzagline->middle_handle.type = HANDLE_MINOR_CONTROL;
-  zigzagline->middle_handle.connectable = FALSE;
+  zigzagline->middle_handle.connect_type = HANDLE_NONCONNECTABLE;
   zigzagline->middle_handle.connected_to = NULL;
   
   zigzagline_update_data(zigzagline);