Commit: bf8a5f53be87af155cb8cd2777eeff7406eb21ff - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revisión: bf8a5f53be87af155cb8cd2777eeff7406eb21ff (tree)
• Tiempo: 2007-03-17 20:08:26
• Autor: Hans Breuer <hans@breu...>
• Commiter: Hans Breuer

Log Message

Self Documenation Part III and stress test, creates all Dia Objects

2007-03-17 Hans Breuer <[e-mail]>

* plug-ins/python/aobjects.py plug-ins/python/Makefile.am :
Self Documenation Part III and stress test, creates all Dia Objects
* objects/FS/flow-ortho.c objects/FS/flow.c : removed partial
left over of 'static DiaFont*' which caused a crash on creation

* objects/UML/umlattribute.c objects/UML/umlformalparameter.c
objects/UML/umloperation.c : don't crash on name being NULL

* objects/custom/custom_object.c : call *_update_data in *_copy
Fixes the disappearance of object drawing after cut&paste
(bug #416414, Stein Somers)

* plug-ins/python/pydia-font.c : cmpfunc is supposed to return out
of (-1, 0, 1)

* lib/utils.h lib/message.h : added C++ guards

svn path=/trunk/; revision=3636

Cambiar Resumen

• modified: ChangeLog
• modified: lib/message.h
• modified: lib/utils.h
• modified: objects/FS/flow-ortho.c
• modified: objects/FS/flow.c
• modified: objects/UML/umlattribute.c
• modified: objects/UML/umlformalparameter.c
• modified: objects/UML/umloperation.c
• modified: objects/custom/custom_object.c
• modified: plug-ins/python/Makefile.am
• add: plug-ins/python/aobjects.py
• modified: plug-ins/python/pydia-font.c

Diferencia incremental

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
[phone]  Hans Breuer  <[e-mail]>
+
+	* plug-ins/python/aobjects.py plug-ins/python/Makefile.am : 
+	Self Documenation Part III and stress test, creates all Dia Objects
+	* objects/FS/flow-ortho.c objects/FS/flow.c : removed partial
+	left over of 'static DiaFont*' which caused a crash on creation
+
+	* objects/UML/umlattribute.c objects/UML/umlformalparameter.c
+	  objects/UML/umloperation.c : don't crash on name being NULL
+
+	* objects/custom/custom_object.c : call *_update_data in *_copy
+	Fixes the disappearance of object drawing after cut&paste
+	(bug #416414, Stein Somers)
+
+	* plug-ins/python/pydia-font.c : cmpfunc is supposed to return out
+	of (-1, 0, 1)
+
+	* lib/utils.h lib/message.h : added C++ guards
+
 2007-03-17  Steffen Macke <[e-mail]>
 
 	* installer/win32/locale/slovak.nsh: Use Codepage 1250, fixed errors
@@ -148,7 +167,7 @@
         * objects/UML/state.c
         * objects/UML/small_package.c
         * objects/GRAFCET/boolequation.c: Make sure to call set_font
-	before calling draw_string
+	before calling draw_string, fixes bug #408519
 
 	* objects/UML/class.c (umlclass_set_props): #ifdef out debugging
 	statement. 

--- a/lib/message.h
+++ b/lib/message.h
@@ -20,6 +20,8 @@
 
 #include <stdarg.h>
 
+G_BEGIN_DECLS
+
 typedef void (*MessageInternal)(const char *title, const char *fmt,
                                 va_list *args,  va_list *args2);
 
@@ -32,6 +34,8 @@ void message_error(const char *format, ...);
 /* also declared in dia_dirs.h, where I think it does not belong! --hb */
 const gchar *dia_message_filename (const gchar *filename);
 
+G_END_DECLS
+
 #endif /* MESSAGES_H */
 
 

--- a/lib/utils.h
+++ b/lib/utils.h
@@ -20,6 +20,8 @@
 
 #include <stdarg.h>
 
+G_BEGIN_DECLS
+
 int nearest_pow (int num);
 int format_string_length_upper_bound (const char* fmt,
 				      va_list *args);
@@ -28,6 +30,8 @@ int format_string_length_upper_bound (const char* fmt,
 int snprintf ( char *str, size_t n, const char *format, ... );
 #endif
 
+G_END_DECLS
+
 #endif /* UTILS_H */
 
 

--- a/objects/FS/flow-ortho.c
+++ b/objects/FS/flow-ortho.c
@@ -91,8 +91,6 @@ Color orthflow_color_signal   = { 0.0f, 0.0f, 1.0f };
 #define ORTHFLOW_ARROWWIDTH 0.5
 #define HANDLE_MOVE_TEXT (HANDLE_CUSTOM2)
 
-static DiaFont *orthflow_font = NULL;
-
 static ObjectChange* orthflow_move_handle(Orthflow *orthflow, Handle *handle,
 					  Point *to, ConnectionPoint *cp,
 					  HandleMoveReason reason, 
@@ -389,9 +387,6 @@ orthflow_draw(Orthflow *orthflow, DiaRenderer *renderer)
 					  render_color,
 					  NULL, &arrow); 
 
-  renderer_ops->set_font(renderer, orthflow_font,
-                          ORTHFLOW_FONTHEIGHT);
-
   text_draw(orthflow->text, renderer);
 }
 
@@ -435,11 +430,6 @@ orthflow_create(Point *startpoint,
   } else {
     Color* color = &orthflow_color_signal;
 
-    if (orthflow_font == NULL) {
-	    orthflow_font = dia_font_new_from_style(DIA_FONT_SANS|DIA_FONT_ITALIC,
-                                              1.0);
-    }
-
     switch (orthflow->type) {
     case ORTHFLOW_ENERGY:
       color = &orthflow_color_energy ;
@@ -452,8 +442,6 @@ orthflow_create(Point *startpoint,
       break ;
     }
 
-    orthflow->text = new_text("", orthflow_font, ORTHFLOW_FONTHEIGHT, 
-                              &p, color, ALIGN_CENTER);
   }
 #endif
 
@@ -566,11 +554,6 @@ orthflow_load(ObjectNode obj_node, int version, const char *filename)
   DiaObject *obj;
   PolyBBExtras *extra;
 
-  if (orthflow_font == NULL) {
-    orthflow_font = dia_font_new_from_style(DIA_FONT_SANS|DIA_FONT_ITALIC,
-                                            1.0);
-  }
-
   orthflow = g_malloc0(sizeof(Orthflow));
 
   orth = &orthflow->orth;

--- a/objects/FS/flow.c
+++ b/objects/FS/flow.c
@@ -70,8 +70,6 @@ struct _Flow {
 #define FLOW_ARROWWIDTH 0.5
 #define HANDLE_MOVE_TEXT (HANDLE_CUSTOM1)
 
-static DiaFont *flow_font = NULL;
-
 static ObjectChange* flow_move_handle(Flow *flow, Handle *handle,
 				      Point *to, ConnectionPoint *cp,
 				      HandleMoveReason reason, 
@@ -355,8 +353,6 @@ flow_draw(Flow *flow, DiaRenderer *renderer)
 				       render_color,
 				       &arrow, NULL); 
 
-  renderer_ops->set_font(renderer, flow_font,FLOW_FONTHEIGHT);
-
   text_draw(flow->text, renderer);
 }
 
@@ -523,11 +519,6 @@ flow_load(ObjectNode obj_node, int version, const char *filename)
   DiaObject *obj;
   LineBBExtras *extra;
 
-  if (flow_font == NULL) {
-	  flow_font = dia_font_new_from_style (DIA_FONT_SANS|DIA_FONT_ITALIC,
-                                         FLOW_FONTHEIGHT);
-  }
-
   flow = g_malloc0(sizeof(Flow));
 
   conn = &flow->connection;

--- a/objects/UML/umlattribute.c
+++ b/objects/UML/umlattribute.c
@@ -193,8 +193,9 @@ uml_get_attribute_string (UMLAttribute *attribute)
   int len;
   char *str;
 
-  len = 1 + strlen (attribute->name) + strlen (attribute->type);
-  if (attribute->name[0] && attribute->type[0]) {
+  len = 1 + (attribute->name ? strlen (attribute->name) : 0) 
+          + (attribute->type ? strlen (attribute->type) : 0);
+  if (attribute->name && attribute->name[0] && attribute->type && attribute->type[0]) {
     len += 2;
   }
   if (attribute->value != NULL && attribute->value[0] != '\0') {
@@ -206,11 +207,11 @@ uml_get_attribute_string (UMLAttribute *attribute)
   str[0] = visible_char[(int) attribute->visibility];
   str[1] = 0;
 
-  strcat (str, attribute->name);
-  if (attribute->name[0] && attribute->type[0]) {
+  strcat (str, attribute->name ? attribute->name : "");
+  if (attribute->name && attribute->name[0] && attribute->type && attribute->type[0]) {
     strcat (str, ": ");
   }
-  strcat (str, attribute->type);
+  strcat (str, attribute->type ? attribute->type : "");
   if (attribute->value != NULL && attribute->value[0] != '\0') {
     strcat (str, " = ");
     strcat (str, attribute->value);

--- a/objects/UML/umlformalparameter.c
+++ b/objects/UML/umlformalparameter.c
@@ -109,7 +109,7 @@ uml_get_formalparameter_string (UMLFormalParameter *parameter)
   char *str;
 
   /* Calculate length: */
-  len = strlen (parameter->name);
+  len = parameter->name ? strlen (parameter->name) : 0;
   
   if (parameter->type != NULL) {
     len += 1 + strlen (parameter->type);
@@ -117,7 +117,7 @@ uml_get_formalparameter_string (UMLFormalParameter *parameter)
 
   /* Generate string: */
   str = g_malloc (sizeof (char) * (len + 1));
-  strcpy (str, parameter->name);
+  strcpy (str, parameter->name ? parameter->name : "");
   if (parameter->type != NULL) {
     strcat (str, ":");
     strcat (str, parameter->type);

--- a/objects/UML/umloperation.c
+++ b/objects/UML/umloperation.c
@@ -310,7 +310,7 @@ uml_get_operation_string (UMLOperation *operation)
   UMLParameter *param;
 
   /* Calculate length: */
-  len = 1 + strlen (operation->name)  + 1;
+  len = 1 + (operation->name ? strlen (operation->name) : 0) + 1;
   if(operation->stereotype != NULL && operation->stereotype[0] != '\0') {
     len += 5 + strlen (operation->stereotype);
   }   
@@ -334,7 +334,7 @@ uml_get_operation_string (UMLOperation *operation)
 	len += 6;
 	break;	  
       }
-    len += strlen (param->name);
+    len += (param->name ? strlen (param->name) : 0);
     if (param->type != NULL) {
       len += strlen (param->type);
       if (param->type[0] && param->name[0]) {
@@ -371,7 +371,7 @@ uml_get_operation_string (UMLOperation *operation)
     strcat(str, " ");
   }
 
-  strcat (str, operation->name);
+  strcat (str, operation->name ? operation->name : "");
   strcat (str, "(");
   
   list = operation->parameters;
@@ -393,7 +393,7 @@ uml_get_operation_string (UMLOperation *operation)
 	strcat (str, "inout ");
 	break;
       }
-    strcat (str, param->name);
+    strcat (str, param->name ? param->name : "");
 
     if (param->type != NULL) {
       if (param->type[0] && param->name[0]) {

--- a/objects/custom/custom_object.c
+++ b/objects/custom/custom_object.c
@@ -656,6 +656,7 @@ custom_draw(Custom *custom, DiaRenderer *renderer)
 
   renderer_ops->set_fillstyle(renderer, FILLSTYLE_SOLID);
   renderer_ops->set_linewidth(renderer, custom->border_width);
+  cur_line = custom->border_width;
   renderer_ops->set_linestyle(renderer, cur_style);
   renderer_ops->set_dashlength(renderer, custom->dashlength);
   renderer_ops->set_linecaps(renderer, cur_caps);
@@ -1347,6 +1348,8 @@ custom_copy(Custom *custom)
     newcustom->connections[i].flags = custom->connections[i].flags;
   }
 
+  custom_update_data(newcustom, ANCHOR_MIDDLE, ANCHOR_MIDDLE);
+
   return &newcustom->element.object;
 }
 

--- a/plug-ins/python/Makefile.am
+++ b/plug-ins/python/Makefile.am
@@ -58,37 +58,41 @@ pkgdata_DATA = python-startup.py
 
 pyplugindir = $(pkgdatadir)/python
 pyplugin_DATA = \
-	gtkcons.py \
+	aobjects.py \
 	codegen.py \
 	diasvg.py \
 	diasvg_import.py \
+	dot.py \
+	doxrev.py \
 	group_props.py \
+	gtkcons.py \
 	otypes.py \
-	scascale.py \
-	select_by.py \
 	pydiadoc.py \
-	dot.py
+	scascale.py \
+	select_by.py
 
 endif
 
 EXTRA_DIST = \
 	python-startup.py \
-	debug_objects.py \
+	\
+	aobjects.py \
 	codegen.py \
-	export-object.py \
-	export-render.py \
 	diasvg.py \
 	diasvg_import.py \
+	dot.py \
+	doxrev.py \
 	group_props.py \
+	gtkcons.py \
 	otypes.py \
-	scascale.py \
-	select_by.py \
 	pydiadoc.py \
-	dot.py \
+	scascale.py \
 	scascale.py \
 	select_by.py \
-	gtkcons.py \
+	\
 	bbox.py \
-	doxrev.py \
+	debug_objects.py \
+	export-object.py \
+	export-render.py \
+	\
 	makefile.msc
-

--- /dev/null
+++ b/plug-ins/python/aobjects.py
@@ -0,0 +1,89 @@
+#    PyDia Self Documentation Series - Part III : All Objects
+#    Copyright (c) 2007, Hans Breuer <[e-mail]>
+#
+#        generates a new diagram which contains all the currently
+#    registered objects sorted to layers by their containing package
+#
+
+#    This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sys, dia, string
+
+def aobjects_cb(data, flags) :
+
+	# copied from otypes.py
+	if data :
+		diagram = None # we may be running w/o GUI
+	else :
+		diagram = dia.new("All Objects.dia")
+		data = diagram.data
+	layer = data.active_layer
+
+	otypes = dia.registered_types()
+	keys = otypes.keys()
+	keys.sort()
+
+	packages = {}
+	for s in keys :
+		kt = string.split(s, " - ")
+		if len(kt) == 2 :
+			if len(kt[0]) == 0 :
+				sp = "<unnamed>"
+			else :
+				sp = kt[0]
+			st = kt[1]
+		else :
+			sp = "<broken>"
+			st = kt[0]
+		if packages.has_key(sp) :
+			packages[sp].append(s)
+		else :
+			packages[sp] = [s] 
+
+	for sp in packages.keys() :
+		# add a layer per package
+		layer = data.add_layer (sp)
+
+		cx = 0.0
+		cy = 0.0
+		n = 0 # counting objects
+		my = 0.0
+		pkg = packages[sp]
+		for st in pkg :
+			if st == "Group" :
+				continue # can't create empty group
+			#print st
+			o, h1, h2 = dia.get_object_type(st).create (cx, cy)
+			w = o.bounding_box.right - o.bounding_box.left
+			h = o.bounding_box.bottom - o.bounding_box.top
+			o.move (cx, cy)
+			cx += w * 1.5
+			if h > my : my = h
+			n += 1
+			if n % 10 == 0 :
+				cx = 0.0
+				cy += my * 1.5
+				my = 0
+			layer.add_object (o)
+		layer.update_extents()
+	data.update_extents()
+	if diagram :
+		diagram.updated_extents()
+		diagram.flush()
+	return data
+
+dia.register_action ("HelpAObjects", "All Objects",
+                     "/ToolboxMenu/Help/HelpExtensionStart", 
+                     aobjects_cb)

--- a/plug-ins/python/pydia-font.c
+++ b/plug-ins/python/pydia-font.c
@@ -73,7 +73,7 @@ PyDiaFont_Compare(PyDiaFont *self,
     return ret;
 
   ret = dia_font_get_style (self->font) - dia_font_get_style (other->font);
-  return ret;
+  return ret > 0 ? 1 : (ret < 0 ? -1 : 0);
 }
 
 /*