[dia] [substitute] Upgrade of Standard - Line to PolyLine or ZigZagLine
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] [substitute] Upgrade of Standard - Line to PolyLine or ZigZagLine
- Date: Sun, 16 Sep 2012 18:11:49 +0000 (UTC)
commit 2280d03a43b9a70de36a85fd85aa66b1686471d3
Author: Hans Breuer <hans breuer org>
Date: Sun Sep 16 14:23:30 2012 +0200
[substitute] Upgrade of Standard - Line to PolyLine or ZigZagLine
Use object_substitute() to allow conversions to Polyline and Zigzagline.
Add a corresponding diagram to test and showcase.
objects/standard/line.c | 115 +++++-
samples/Self/dia-object.dia | 1066 ++++++++++++++++++++++++-------------------
2 files changed, 703 insertions(+), 478 deletions(-)
---
diff --git a/objects/standard/line.c b/objects/standard/line.c
index b212c0d..2aac244 100644
--- a/objects/standard/line.c
+++ b/objects/standard/line.c
@@ -17,6 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+/*! \file line.c -- Implements the "Standard - Line" object */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -33,6 +34,7 @@
#include "arrows.h"
#include "connpoint_line.h"
#include "properties.h"
+#include "create.h"
#include "tool-icons.h"
@@ -41,7 +43,12 @@
typedef struct _LineProperties LineProperties;
/*!
- * \brief Standard - Line
+ * \brief Standard - Line: a straight _Connection
+ *
+ * The Standard - Line object implements a straight connection between two points.
+ * The object can grow addtional _ConnectionPoint though the internal use
+ * of ConnPointLine.
+ *
* \extends _Connection
* \ingroup StandardObjects
*/
@@ -208,6 +215,11 @@ line_init_defaults() {
}
}
+/*!
+ * \brief Add a connection point to the line
+ *
+ * \memberof Line
+ */
static ObjectChange *
line_add_connpoint_callback(DiaObject *obj, Point *clicked, gpointer data)
{
@@ -217,6 +229,11 @@ line_add_connpoint_callback(DiaObject *obj, Point *clicked, gpointer data)
return oc;
}
+/*!
+ * \brief Remove a connection point from the line
+ *
+ * \memberof Line
+ */
static ObjectChange *
line_remove_connpoint_callback(DiaObject *obj, Point *clicked, gpointer data)
{
@@ -226,10 +243,95 @@ line_remove_connpoint_callback(DiaObject *obj, Point *clicked, gpointer data)
return oc;
}
+/*!
+ * \brief Upgrade the Line to a Polyline
+ *
+ * Convert the _Line to a _Polyline with the position clicked as third point.
+ * Further object properties are preserved by the use of object_substitute()
+ *
+ * @param obj self pointer
+ * @param clicked last clicked point on canvas or NULL
+ * @param data here unuesed user_data pointer
+ * @return an _ObjectChange to support undo/redo
+ *
+ * \memberof Line
+ */
+static ObjectChange *
+_convert_to_polyline_callback (DiaObject *obj, Point *clicked, gpointer data)
+{
+ DiaObject *poly;
+ Line *line = (Line *)obj;
+ Point points[3];
+
+ points[0] = line->connection.endpoints[0];
+ points[2] = line->connection.endpoints[1];
+ if (clicked) {
+ points[1] = *clicked;
+ } else {
+ points[1].x = (points[0].x + points[2].x) / 2;
+ points[1].y = (points[0].y + points[2].y) / 2;
+ }
+
+ poly = create_standard_polyline (3, points, &line->end_arrow, &line->start_arrow);
+ g_return_val_if_fail (poly != NULL, NULL);
+ return object_substitute (obj, poly);
+}
+
+/*!
+ * \brief Upgrade the Line to a Zigzagline
+ *
+ * Convert the _Line to a _Zigzagline with the position clicked (if near enough)
+ * for the new segment. The result of this function is more favorable for connected
+ * lines by autorouting.
+ *
+ * Further object properties are preserved by the use of object_substitute()
+ *
+ * @param obj self pointer
+ * @param clicked last clicked point on canvas or NULL
+ * @param data here unuesed user_data pointer
+ * @return an _ObjectChange to support undo/redo
+ *
+ * \memberof Line
+ */
+static ObjectChange *
+_convert_to_zigzagline_callback (DiaObject *obj, Point *clicked, gpointer data)
+{
+ DiaObject *zigzag;
+ Line *line = (Line *)obj;
+ Point points[4];
+
+ if (clicked) {
+ points[0] = line->connection.endpoints[0];
+ points[3] = line->connection.endpoints[1];
+ /* not sure if we really want to give it a direction at all */
+ if (fabs(((points[0].x + points[3].x)/2) - clicked->x) > fabs(((points[0].y + points[3].y)/2) - clicked->y)) {
+ points[1].x = points[2].x = clicked->x;
+ points[1].y = points[0].y;
+ points[2].y = points[3].y;
+ } else {
+ points[1].y = points[2].y = clicked->y;
+ points[1].x = points[0].x;
+ points[2].x = points[3].x;
+ }
+ zigzag = create_standard_zigzagline (4, points, &line->end_arrow, &line->start_arrow);
+ } else {
+ points[0] = line->connection.endpoints[0];
+ points[3] = line->connection.endpoints[1];
+ points[1].x = points[2].x = (points[0].x + points[3].x) / 2.0;
+ points[1].y = points[0].y;
+ points[2].y = points[3].y;
+ zigzag = create_standard_zigzagline (4, points, &line->end_arrow, &line->start_arrow);
+ }
+
+ g_return_val_if_fail (zigzag != NULL, NULL);
+ return object_substitute (obj, zigzag);
+}
+
static DiaMenuItem object_menu_items[] = {
{ N_("Add connection point"), line_add_connpoint_callback, NULL, 1 },
- { N_("Delete connection point"), line_remove_connpoint_callback,
- NULL, 1 },
+ { N_("Delete connection point"), line_remove_connpoint_callback, NULL, 1 },
+ { N_("Upgrade to Polyline"), _convert_to_polyline_callback, NULL, 1 },
+ { N_("Upgrade to Zigzagline"), _convert_to_zigzagline_callback, NULL, 1 }
};
static DiaMenu object_menu = {
@@ -255,9 +357,14 @@ line_get_object_menu(Line *line, Point *clickedpoint)
-/** Calculate the absolute gap -- this gap is 'transient', in that
+/*!
+ * \brief Gap calculation for _Line
+ *
+ * Calculate the absolute gap -- this gap is 'transient', in that
* the actual end of the line is not moved, but it is made to look like
* it is shorter.
+ *
+ * \protected \memberof Line
*/
static void
line_adjust_for_absolute_gap(Line *line, Point *gap_endpoints)
diff --git a/samples/Self/dia-object.dia b/samples/Self/dia-object.dia
index 55d5112..bbee901 100644
--- a/samples/Self/dia-object.dia
+++ b/samples/Self/dia-object.dia
@@ -2,10 +2,10 @@
<dia:diagram xmlns:dia="http://www.lysator.liu.se/~alla/dia/";>
<dia:diagramdata>
<dia:attribute name="background">
- <dia:color val="#ffffff"/>
+ <dia:color val="#ffffffff"/>
</dia:attribute>
<dia:attribute name="pagebreak">
- <dia:color val="#000099"/>
+ <dia:color val="#000099ff"/>
</dia:attribute>
<dia:attribute name="paper">
<dia:composite type="paper">
@@ -56,7 +56,7 @@
</dia:composite>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#d8e5e5"/>
+ <dia:color val="#d8e5e5ff"/>
</dia:attribute>
<dia:attribute name="guides">
<dia:composite type="guides">
@@ -64,6 +64,25 @@
<dia:attribute name="vguides"/>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="display">
+ <dia:composite type="display">
+ <dia:attribute name="antialiased">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="snap-to-grid">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="snap-to-object">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="show-grid">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="show-connection-points">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
</dia:diagramdata>
<dia:layer name="Background" visible="true" active="true">
<dia:object type="UML - Class" version="0" id="O0">
@@ -128,13 +147,13 @@
<dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="fill_color">
- <dia:color val="#ffffff"/>
+ <dia:color val="#ffffffff"/>
</dia:attribute>
<dia:attribute name="text_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="normal_font">
<dia:font family="monospace" style="0" name="Courier"/>
@@ -647,7 +666,7 @@
<dia:point val="1,5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="1,5;10.67,7.5"/>
+ <dia:rectangle val="0.95,4.95;10.72,7.55"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -661,15 +680,6 @@
<dia:attribute name="elem_height">
<dia:real val="2.5"/>
</dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffc0cb"/>
- </dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
@@ -686,13 +696,22 @@ has a different signature!#</dia:string>
<dia:point val="1.35,6.23"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000149011612"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffc0cbff"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O2">
<dia:attribute name="obj_pos">
@@ -730,7 +749,7 @@ has a different signature!#</dia:string>
<dia:point val="1,9"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="1,9;10.815,12.3"/>
+ <dia:rectangle val="0.95,8.95;10.8625,12.35"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -739,20 +758,11 @@ has a different signature!#</dia:string>
<dia:point val="1,9"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="9.8150000000000013"/>
+ <dia:real val="9.8125"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3.3000000000000003"/>
</dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffbf80"/>
- </dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
@@ -770,23 +780,32 @@ Why is this a type function?#</dia:string>
<dia:point val="1.35,10.23"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000149011612"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffbf80ff"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O4">
<dia:attribute name="obj_pos">
- <dia:point val="10.8152,12.1377"/>
+ <dia:point val="10.8118,12.1368"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="10.784,12.1065;13.0312,12.9094"/>
+ <dia:rectangle val="10.7806,12.1056;13.0312,12.9095"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
- <dia:point val="10.8152,12.1377"/>
+ <dia:point val="10.8118,12.1368"/>
<dia:point val="13,12.8"/>
</dia:attribute>
<dia:attribute name="numcp">
@@ -814,7 +833,7 @@ Why is this a type function?#</dia:string>
<dia:point val="1,14"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="1,14;10.3225,17.3"/>
+ <dia:rectangle val="0.95,13.95;10.3675,17.35"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -823,20 +842,11 @@ Why is this a type function?#</dia:string>
<dia:point val="1,14"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="9.3224999999999998"/>
+ <dia:real val="9.3175000000000008"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3.3000000000000003"/>
</dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffff80"/>
- </dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
@@ -854,23 +864,32 @@ anywhere any longer.#</dia:string>
<dia:point val="1.35,15.23"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000149011612"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffff80ff"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O6">
<dia:attribute name="obj_pos">
- <dia:point val="10.3214,14.8562"/>
+ <dia:point val="10.3174,14.8568"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="10.2926,14.2112;13.0288,14.8851"/>
+ <dia:rectangle val="10.2885,14.2112;13.0288,14.8856"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
- <dia:point val="10.3214,14.8562"/>
+ <dia:point val="10.3174,14.8568"/>
<dia:point val="13,14.4"/>
</dia:attribute>
<dia:attribute name="numcp">
@@ -895,13 +914,13 @@ anywhere any longer.#</dia:string>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O7">
<dia:attribute name="obj_pos">
- <dia:point val="10.3214,15.3642"/>
+ <dia:point val="10.3174,15.3644"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="10.2949,14.9456;13.0265,15.5255"/>
+ <dia:rectangle val="10.2909,14.9456;13.0265,15.5254"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
- <dia:point val="10.3214,15.3642"/>
+ <dia:point val="10.3174,15.3644"/>
<dia:point val="13,15.2"/>
</dia:attribute>
<dia:attribute name="numcp">
@@ -929,7 +948,7 @@ anywhere any longer.#</dia:string>
<dia:point val="37,1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="37,1;44.165,2.7"/>
+ <dia:rectangle val="36.95,0.95;44.21,2.75"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -938,20 +957,11 @@ anywhere any longer.#</dia:string>
<dia:point val="37,1"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="7.1649999999999991"/>
+ <dia:real val="7.1599999999999993"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="1.7000000000000002"/>
</dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffff80"/>
- </dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
@@ -967,23 +977,32 @@ anywhere any longer.#</dia:string>
<dia:point val="37.35,2.23"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000149011612"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffff80ff"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O9">
<dia:attribute name="obj_pos">
- <dia:point val="38.6368,2.70031"/>
+ <dia:point val="38.6351,2.70031"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="34.2571,2.66739;38.6698,4.63938"/>
+ <dia:rectangle val="34.2571,2.66739;38.668,4.6393"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
- <dia:point val="38.6368,2.70031"/>
+ <dia:point val="38.6351,2.70031"/>
<dia:point val="34.29,4.6"/>
</dia:attribute>
<dia:attribute name="numcp">
@@ -1011,7 +1030,7 @@ anywhere any longer.#</dia:string>
<dia:point val="45,2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="45,2;50.41,3.7"/>
+ <dia:rectangle val="44.95,1.95;50.4625,3.75"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -1020,20 +1039,11 @@ anywhere any longer.#</dia:string>
<dia:point val="45,2"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="5.4099999999999993"/>
+ <dia:real val="5.4124999999999996"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="1.7000000000000002"/>
</dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffff80"/>
- </dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
@@ -1049,23 +1059,32 @@ anywhere any longer.#</dia:string>
<dia:point val="45.35,3.23"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000149011612"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffff80ff"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O11">
<dia:attribute name="obj_pos">
- <dia:point val="45.003,3.52474"/>
+ <dia:point val="44.9999,3.52577"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="34.2597,3.49443;45.0333,6.34106"/>
+ <dia:rectangle val="34.2597,3.49545;45.0302,6.34107"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
- <dia:point val="45.003,3.52474"/>
+ <dia:point val="44.9999,3.52577"/>
<dia:point val="34.29,6.2"/>
</dia:attribute>
<dia:attribute name="numcp">
@@ -1093,7 +1112,7 @@ anywhere any longer.#</dia:string>
<dia:point val="51,3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="51,3;55.03,4.7"/>
+ <dia:rectangle val="50.95,2.95;55.075,4.75"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -1102,20 +1121,11 @@ anywhere any longer.#</dia:string>
<dia:point val="51,3"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="4.0299999999999994"/>
+ <dia:real val="4.0249999999999995"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="1.7000000000000002"/>
</dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffff80"/>
- </dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
@@ -1131,23 +1141,32 @@ anywhere any longer.#</dia:string>
<dia:point val="51.35,4.23"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000149011612"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffff80ff"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O13">
<dia:attribute name="obj_pos">
- <dia:point val="50.9998,4.2751"/>
+ <dia:point val="51.0002,4.27456"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="34.2604,4.24548;51.0294,7.9643"/>
+ <dia:rectangle val="34.2604,4.24494;51.0298,7.96428"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
- <dia:point val="50.9998,4.2751"/>
+ <dia:point val="51.0002,4.27456"/>
<dia:point val="34.29,7.8"/>
</dia:attribute>
<dia:attribute name="numcp">
@@ -1175,7 +1194,7 @@ anywhere any longer.#</dia:string>
<dia:point val="48,6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="48,6;57.035,9.3"/>
+ <dia:rectangle val="47.95,5.95;57.085,9.35"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -1189,15 +1208,6 @@ anywhere any longer.#</dia:string>
<dia:attribute name="elem_height">
<dia:real val="3.3000000000000003"/>
</dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffff80"/>
- </dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
@@ -1215,13 +1225,22 @@ by a sheet parameter.#</dia:string>
<dia:point val="48.35,7.23"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000149011612"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffff80ff"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O15">
<dia:attribute name="obj_pos">
@@ -1316,31 +1335,31 @@ by a sheet parameter.#</dia:string>
<dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="fill_color">
- <dia:color val="#ffffff"/>
+ <dia:color val="#ffffffff"/>
</dia:attribute>
<dia:attribute name="text_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="normal_font">
<dia:font family="monospace" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="abstract_font">
- <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+ <dia:font family="monospace" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="polymorphic_font">
- <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+ <dia:font family="monospace" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="classname_font">
<dia:font family="sans" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font">
- <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+ <dia:font family="sans" style="0" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="comment_font">
- <dia:font family="sans" style="8" name="Helvetica-Oblique"/>
+ <dia:font family="sans" style="0" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="normal_font_height">
<dia:real val="0.80000000000000004"/>
@@ -1643,7 +1662,7 @@ by a sheet parameter.#</dia:string>
</dia:composite>
<dia:composite type="umlparameter">
<dia:attribute name="name">
- <dia:string>#ddisp#</dia:string>
+ <dia:string>#render#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#Renderer*#</dia:string>
@@ -2550,7 +2569,7 @@ by a sheet parameter.#</dia:string>
<dia:point val="22,44"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="22,44;35.7125,47.3"/>
+ <dia:rectangle val="21.95,43.95;35.8425,47.35"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -2559,20 +2578,11 @@ by a sheet parameter.#</dia:string>
<dia:point val="22,44"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="13.7125"/>
+ <dia:real val="13.792500000000002"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3.3000000000000003"/>
</dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffff80"/>
- </dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
@@ -2590,13 +2600,22 @@ methods in the base class this is needed.#</dia:string>
<dia:point val="22.35,45.23"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000149011612"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffff80ff"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O18">
<dia:attribute name="obj_pos">
@@ -2691,13 +2710,13 @@ methods in the base class this is needed.#</dia:string>
<dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="fill_color">
- <dia:color val="#ffffff"/>
+ <dia:color val="#ffffffff"/>
</dia:attribute>
<dia:attribute name="text_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="normal_font">
<dia:font family="monospace" style="0" name="Courier"/>
@@ -3003,13 +3022,13 @@ methods in the base class this is needed.#</dia:string>
<dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="fill_color">
- <dia:color val="#ffffff"/>
+ <dia:color val="#ffffffff"/>
</dia:attribute>
<dia:attribute name="text_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="normal_font">
<dia:font family="monospace" style="0" name="Courier"/>
@@ -3220,6 +3239,33 @@ methods in the base class this is needed.#</dia:string>
<dia:attribute name="templates"/>
</dia:object>
<dia:object type="UML - Association" version="2" id="O21">
+ <dia:attribute name="obj_pos">
+ <dia:point val="17.975,36.2"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="1.95,20.9;22.05,37.05"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
+ </dia:attribute>
+ <dia:attribute name="orth_points">
+ <dia:point val="17.975,36.2"/>
+ <dia:point val="22,36.2"/>
+ <dia:point val="22,29.95"/>
+ <dia:point val="2,29.95"/>
+ <dia:point val="2,21.7"/>
+ <dia:point val="4,21.7"/>
+ </dia:attribute>
+ <dia:attribute name="orth_orient">
+ <dia:enum val="0"/>
+ <dia:enum val="1"/>
+ <dia:enum val="0"/>
+ <dia:enum val="1"/>
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="orth_autoroute">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -3256,45 +3302,50 @@ methods in the base class this is needed.#</dia:string>
<dia:attribute name="show_arrow_b">
<dia:boolean val="true"/>
</dia:attribute>
+ <dia:attribute name="text_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="text_height">
+ <dia:real val="0.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O20" connection="13"/>
+ <dia:connection handle="1" to="O19" connection="3"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="UML - Association" version="2" id="O22">
<dia:attribute name="obj_pos">
- <dia:point val="17.975,36.2"/>
+ <dia:point val="39,40"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="1.95,20.9;22.05,37"/>
+ <dia:rectangle val="1.95,32.25;39.05,40.85"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="17.975,36.2"/>
- <dia:point val="22,36.2"/>
- <dia:point val="22,29.95"/>
- <dia:point val="2,29.95"/>
- <dia:point val="2,21.7"/>
- <dia:point val="4,21.7"/>
+ <dia:point val="39,40"/>
+ <dia:point val="2,40"/>
+ <dia:point val="2,33.05"/>
+ <dia:point val="4,33.05"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
<dia:enum val="1"/>
<dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="text_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O20" connection="13"/>
- <dia:connection handle="1" to="O19" connection="3"/>
- </dia:connections>
- </dia:object>
- <dia:object type="UML - Association" version="2" id="O22">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -3331,34 +3382,20 @@ methods in the base class this is needed.#</dia:string>
<dia:attribute name="show_arrow_b">
<dia:boolean val="true"/>
</dia:attribute>
- <dia:attribute name="obj_pos">
- <dia:point val="39,40"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="1.95,32.25;39.05,40.8"/>
- </dia:attribute>
- <dia:attribute name="meta">
- <dia:composite type="dict"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="39,40"/>
- <dia:point val="2,40"/>
- <dia:point val="2,33.05"/>
- <dia:point val="4,33.05"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
+ <dia:attribute name="text_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
</dia:attribute>
- <dia:attribute name="orth_autoroute">
- <dia:boolean val="false"/>
+ <dia:attribute name="text_height">
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="text_colour">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_colour">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O16" connection="42"/>
@@ -3370,13 +3407,13 @@ methods in the base class this is needed.#</dia:string>
<dia:point val="60,6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="59.95,5.95;71.2875,9.65"/>
+ <dia:rectangle val="59.95,5.95;71.2975,9.65"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="60,6"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="11.237500000000001"/>
+ <dia:real val="11.247499999999999"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3.5999999999999996"/>
@@ -3427,13 +3464,13 @@ methods in the base class this is needed.#</dia:string>
<dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="fill_color">
- <dia:color val="#ffffff"/>
+ <dia:color val="#ffffffff"/>
</dia:attribute>
<dia:attribute name="text_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="normal_font">
<dia:font family="monospace" style="0" name="Courier"/>
@@ -3479,6 +3516,29 @@ methods in the base class this is needed.#</dia:string>
<dia:attribute name="templates"/>
</dia:object>
<dia:object type="UML - Association" version="2" id="O24">
+ <dia:attribute name="obj_pos">
+ <dia:point val="68.375,40.8"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="68.325,6.6;74.725,41.65"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
+ </dia:attribute>
+ <dia:attribute name="orth_points">
+ <dia:point val="68.375,40.8"/>
+ <dia:point val="74.625,40.8"/>
+ <dia:point val="74.625,7.4"/>
+ <dia:point val="71.2375,7.4"/>
+ </dia:attribute>
+ <dia:attribute name="orth_orient">
+ <dia:enum val="0"/>
+ <dia:enum val="1"/>
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="orth_autoroute">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -3515,34 +3575,20 @@ methods in the base class this is needed.#</dia:string>
<dia:attribute name="show_arrow_b">
<dia:boolean val="true"/>
</dia:attribute>
- <dia:attribute name="obj_pos">
- <dia:point val="68.375,40.8"/>
+ <dia:attribute name="text_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
</dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="68.325,6.6;74.725,41.6"/>
+ <dia:attribute name="text_height">
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
- <dia:attribute name="meta">
- <dia:composite type="dict"/>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000ff"/>
</dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="68.375,40.8"/>
- <dia:point val="74.625,40.8"/>
- <dia:point val="74.625,7.4"/>
- <dia:point val="71.2375,7.4"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="orth_autoroute">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="text_colour">
- <dia:color val="#000000"/>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_colour">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O16" connection="45"/>
@@ -3554,7 +3600,7 @@ methods in the base class this is needed.#</dia:string>
<dia:point val="9,41"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="9,41;20.88,44.3"/>
+ <dia:rectangle val="8.95,40.95;20.925,44.35"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -3563,20 +3609,11 @@ methods in the base class this is needed.#</dia:string>
<dia:point val="9,41"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="11.880000000000001"/>
+ <dia:real val="11.875"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3.3000000000000003"/>
</dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffc0cb"/>
- </dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
@@ -3594,23 +3631,32 @@ duplicate something from selectf()#</dia:string>
<dia:point val="9.35,42.23"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000149011612"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffc0cbff"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O26">
<dia:attribute name="obj_pos">
- <dia:point val="20.8794,42.7858"/>
+ <dia:point val="20.8746,42.7857"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="20.8538,42.7602;39.0256,43.4771"/>
+ <dia:rectangle val="20.849,42.7601;39.0256,43.4771"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
- <dia:point val="20.8794,42.7858"/>
+ <dia:point val="20.8746,42.7857"/>
<dia:point val="39,43.2"/>
</dia:attribute>
<dia:attribute name="numcp">
@@ -3695,13 +3741,13 @@ duplicate something from selectf()#</dia:string>
<dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="fill_color">
- <dia:color val="#ffffff"/>
+ <dia:color val="#ffffffff"/>
</dia:attribute>
<dia:attribute name="text_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="normal_font">
<dia:font family="monospace" style="0" name="Courier"/>
@@ -3926,6 +3972,29 @@ duplicate something from selectf()#</dia:string>
<dia:attribute name="templates"/>
</dia:object>
<dia:object type="UML - Association" version="2" id="O28">
+ <dia:attribute name="obj_pos">
+ <dia:point val="68.375,38.4"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="68.155,11.25;73.725,39.25"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
+ </dia:attribute>
+ <dia:attribute name="orth_points">
+ <dia:point val="68.375,38.4"/>
+ <dia:point val="73.625,38.4"/>
+ <dia:point val="73.625,12.05"/>
+ <dia:point val="68.205,12.05"/>
+ </dia:attribute>
+ <dia:attribute name="orth_orient">
+ <dia:enum val="0"/>
+ <dia:enum val="1"/>
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="orth_autoroute">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -3962,19 +4031,40 @@ duplicate something from selectf()#</dia:string>
<dia:attribute name="show_arrow_b">
<dia:boolean val="true"/>
</dia:attribute>
+ <dia:attribute name="text_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="text_height">
+ <dia:real val="0.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O16" connection="41"/>
+ <dia:connection handle="1" to="O27" connection="4"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="UML - Association" version="2" id="O29">
<dia:attribute name="obj_pos">
- <dia:point val="68.375,38.4"/>
+ <dia:point val="68.375,36"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="68.155,11.25;73.725,39.2"/>
+ <dia:rectangle val="68.155,11.25;72.725,36.85"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="68.375,38.4"/>
- <dia:point val="73.625,38.4"/>
- <dia:point val="73.625,12.05"/>
+ <dia:point val="68.375,36"/>
+ <dia:point val="72.625,36"/>
+ <dia:point val="72.625,12.05"/>
<dia:point val="68.205,12.05"/>
</dia:attribute>
<dia:attribute name="orth_orient">
@@ -3985,18 +4075,6 @@ duplicate something from selectf()#</dia:string>
<dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="text_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O16" connection="41"/>
- <dia:connection handle="1" to="O27" connection="4"/>
- </dia:connections>
- </dia:object>
- <dia:object type="UML - Association" version="2" id="O29">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -4033,19 +4111,40 @@ duplicate something from selectf()#</dia:string>
<dia:attribute name="show_arrow_b">
<dia:boolean val="true"/>
</dia:attribute>
+ <dia:attribute name="text_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="text_height">
+ <dia:real val="0.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O16" connection="37"/>
+ <dia:connection handle="1" to="O27" connection="4"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="UML - Association" version="2" id="O30">
<dia:attribute name="obj_pos">
- <dia:point val="68.375,36"/>
+ <dia:point val="68.375,35.2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="68.155,11.25;72.725,36.8"/>
+ <dia:rectangle val="68.155,11.25;71.725,36.05"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="68.375,36"/>
- <dia:point val="72.625,36"/>
- <dia:point val="72.625,12.05"/>
+ <dia:point val="68.375,35.2"/>
+ <dia:point val="71.625,35.2"/>
+ <dia:point val="71.625,12.05"/>
<dia:point val="68.205,12.05"/>
</dia:attribute>
<dia:attribute name="orth_orient">
@@ -4056,18 +4155,6 @@ duplicate something from selectf()#</dia:string>
<dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="text_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O16" connection="37"/>
- <dia:connection handle="1" to="O27" connection="4"/>
- </dia:connections>
- </dia:object>
- <dia:object type="UML - Association" version="2" id="O30">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -4104,34 +4191,20 @@ duplicate something from selectf()#</dia:string>
<dia:attribute name="show_arrow_b">
<dia:boolean val="true"/>
</dia:attribute>
- <dia:attribute name="obj_pos">
- <dia:point val="68.375,35.2"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="68.155,11.25;71.725,36"/>
- </dia:attribute>
- <dia:attribute name="meta">
- <dia:composite type="dict"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="68.375,35.2"/>
- <dia:point val="71.625,35.2"/>
- <dia:point val="71.625,12.05"/>
- <dia:point val="68.205,12.05"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
+ <dia:attribute name="text_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
</dia:attribute>
- <dia:attribute name="orth_autoroute">
- <dia:boolean val="false"/>
+ <dia:attribute name="text_height">
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="text_colour">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_colour">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O16" connection="35"/>
@@ -4143,7 +4216,7 @@ duplicate something from selectf()#</dia:string>
<dia:point val="61,19"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="61,19;70.3075,20.7"/>
+ <dia:rectangle val="60.95,18.95;70.3675,20.75"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -4152,20 +4225,11 @@ duplicate something from selectf()#</dia:string>
<dia:point val="61,19"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="9.307500000000001"/>
+ <dia:real val="9.3175000000000008"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="1.7000000000000002"/>
</dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffff80"/>
- </dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
@@ -4181,13 +4245,22 @@ duplicate something from selectf()#</dia:string>
<dia:point val="61.35,20.23"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000149011612"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffff80ff"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O32">
<dia:attribute name="obj_pos">
@@ -4250,7 +4323,7 @@ duplicate something from selectf()#</dia:string>
<dia:point val="53.6875,30.2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="47.9813,29.8263;59.3938,30.5738"/>
+ <dia:rectangle val="47.9775,29.8275;59.3975,30.5725"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -4264,10 +4337,10 @@ duplicate something from selectf()#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="53.6875,30.4213"/>
+ <dia:point val="53.6875,30.4225"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#ff0000"/>
+ <dia:color val="#ff0000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="1"/>
@@ -4278,7 +4351,7 @@ duplicate something from selectf()#</dia:string>
<dia:enum val="2"/>
</dia:attribute>
<dia:attribute name="fill_color">
- <dia:color val="#ffffff"/>
+ <dia:color val="#ffffffff"/>
</dia:attribute>
<dia:attribute name="show_background">
<dia:boolean val="true"/>
@@ -4317,7 +4390,7 @@ duplicate something from selectf()#</dia:string>
<dia:point val="23.645,7"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="17.9387,6.62625;29.3513,7.37375"/>
+ <dia:rectangle val="17.935,6.6275;29.355,7.3725"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -4331,10 +4404,10 @@ duplicate something from selectf()#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="23.645,7.22125"/>
+ <dia:point val="23.645,7.2225"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#ff0000"/>
+ <dia:color val="#ff0000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="1"/>
@@ -4345,7 +4418,7 @@ duplicate something from selectf()#</dia:string>
<dia:enum val="2"/>
</dia:attribute>
<dia:attribute name="fill_color">
- <dia:color val="#ffffff"/>
+ <dia:color val="#ffffffff"/>
</dia:attribute>
<dia:attribute name="show_background">
<dia:boolean val="true"/>
@@ -4359,7 +4432,7 @@ duplicate something from selectf()#</dia:string>
<dia:point val="24,36"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="24,36;35.985,39.3"/>
+ <dia:rectangle val="23.95,35.95;36.0375,39.35"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -4368,20 +4441,11 @@ duplicate something from selectf()#</dia:string>
<dia:point val="24,36"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="11.984999999999999"/>
+ <dia:real val="11.987500000000001"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3.3000000000000003"/>
</dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffff80"/>
- </dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
@@ -4399,23 +4463,32 @@ object_apply_props_from_dialog()#</dia:string>
<dia:point val="24.35,37.23"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000149011612"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffff80ff"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O38">
<dia:attribute name="obj_pos">
- <dia:point val="35.9839,38.1489"/>
+ <dia:point val="35.9855,38.149"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="35.957,38.0623;39.027,38.6412"/>
+ <dia:rectangle val="35.9585,38.0623;39.027,38.6412"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
- <dia:point val="35.9839,38.1489"/>
+ <dia:point val="35.9855,38.149"/>
<dia:point val="39,38.4"/>
</dia:attribute>
<dia:attribute name="numcp">
@@ -4440,13 +4513,13 @@ object_apply_props_from_dialog()#</dia:string>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O39">
<dia:attribute name="obj_pos">
- <dia:point val="35.9839,37.6167"/>
+ <dia:point val="35.9855,37.6167"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="35.9588,37.3128;39.0251,37.8937"/>
+ <dia:rectangle val="35.9603,37.3128;39.0251,37.8937"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
- <dia:point val="35.9839,37.6167"/>
+ <dia:point val="35.9855,37.6167"/>
<dia:point val="39,37.6"/>
</dia:attribute>
<dia:attribute name="numcp">
@@ -4474,7 +4547,7 @@ object_apply_props_from_dialog()#</dia:string>
<dia:point val="24,31.4667"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="24,31.4667;33.595,34.7667"/>
+ <dia:rectangle val="23.95,31.4167;33.6525,34.8167"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -4483,20 +4556,11 @@ object_apply_props_from_dialog()#</dia:string>
<dia:point val="24,31.4667"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="9.5950000000000006"/>
+ <dia:real val="9.6025000000000009"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3.3000000000000003"/>
</dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffff80"/>
- </dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
@@ -4514,23 +4578,32 @@ element_*() or orthconn_*()#</dia:string>
<dia:point val="24.35,32.6967"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000149011612"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffff80ff"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O41">
<dia:attribute name="obj_pos">
- <dia:point val="33.5952,34.4726"/>
+ <dia:point val="33.6025,34.4741"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="33.5643,34.4417;39.0309,36.1215"/>
+ <dia:rectangle val="33.5716,34.4432;39.0309,36.1215"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
- <dia:point val="33.5952,34.4726"/>
+ <dia:point val="33.6025,34.4741"/>
<dia:point val="39,36"/>
</dia:attribute>
<dia:attribute name="numcp">
@@ -4555,13 +4628,13 @@ element_*() or orthconn_*()#</dia:string>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O42">
<dia:attribute name="obj_pos">
- <dia:point val="33.5952,34.0964"/>
+ <dia:point val="33.6025,34.0974"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="33.5657,34.0669;39.0295,35.3684"/>
+ <dia:rectangle val="33.573,34.0679;39.0295,35.3683"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
- <dia:point val="33.5952,34.0964"/>
+ <dia:point val="33.6025,34.0974"/>
<dia:point val="39,35.2"/>
</dia:attribute>
<dia:attribute name="numcp">
@@ -4586,13 +4659,13 @@ element_*() or orthconn_*()#</dia:string>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O43">
<dia:attribute name="obj_pos">
- <dia:point val="33.5952,32.9678"/>
+ <dia:point val="33.6025,32.9676"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="33.5694,32.5277;39.0258,33.1083"/>
+ <dia:rectangle val="33.5767,32.5277;39.0258,33.1083"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
- <dia:point val="33.5952,32.9678"/>
+ <dia:point val="33.6025,32.9676"/>
<dia:point val="39,32.8"/>
</dia:attribute>
<dia:attribute name="numcp">
@@ -4620,7 +4693,7 @@ element_*() or orthconn_*()#</dia:string>
<dia:point val="24,27.7333"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="24,27.7333;33.81,30.2333"/>
+ <dia:rectangle val="23.95,27.6833;33.8625,30.2833"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -4629,20 +4702,11 @@ element_*() or orthconn_*()#</dia:string>
<dia:point val="24,27.7333"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="9.8100000000000005"/>
+ <dia:real val="9.8125"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="2.5"/>
</dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffff80"/>
- </dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
@@ -4659,13 +4723,22 @@ object_copy_using_properties()#</dia:string>
<dia:point val="24.35,28.9633"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000149011612"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffff80ff"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - BezierLine" version="0" id="O45">
<dia:attribute name="obj_pos">
@@ -4706,7 +4779,7 @@ object_copy_using_properties()#</dia:string>
<dia:point val="24,24"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="24,24;35.06,26.5"/>
+ <dia:rectangle val="23.95,23.95;35.11,26.55"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -4720,15 +4793,6 @@ object_copy_using_properties()#</dia:string>
<dia:attribute name="elem_height">
<dia:real val="2.5"/>
</dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffff80"/>
- </dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
@@ -4745,13 +4809,22 @@ handling for Text* members#</dia:string>
<dia:point val="24.35,25.23"/>
</dia:attribute>
<dia:attribute name="color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000149011612"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffff80ff"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - BezierLine" version="0" id="O47">
<dia:attribute name="obj_pos">
@@ -4788,6 +4861,33 @@ handling for Text* members#</dia:string>
</dia:connections>
</dia:object>
<dia:object type="UML - Association" version="2" id="O48">
+ <dia:attribute name="obj_pos">
+ <dia:point val="19.515,27.1"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="19.465,11.25;55.05,27.95"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
+ </dia:attribute>
+ <dia:attribute name="orth_points">
+ <dia:point val="19.515,27.1"/>
+ <dia:point val="22,27.1"/>
+ <dia:point val="22,18"/>
+ <dia:point val="52.485,18"/>
+ <dia:point val="52.485,12.05"/>
+ <dia:point val="55,12.05"/>
+ </dia:attribute>
+ <dia:attribute name="orth_orient">
+ <dia:enum val="0"/>
+ <dia:enum val="1"/>
+ <dia:enum val="0"/>
+ <dia:enum val="1"/>
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="orth_autoroute">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -4824,45 +4924,50 @@ handling for Text* members#</dia:string>
<dia:attribute name="show_arrow_b">
<dia:boolean val="true"/>
</dia:attribute>
+ <dia:attribute name="text_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="text_height">
+ <dia:real val="0.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O19" connection="19"/>
+ <dia:connection handle="1" to="O27" connection="3"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="UML - Association" version="2" id="O49">
<dia:attribute name="obj_pos">
- <dia:point val="19.515,27.1"/>
+ <dia:point val="34.29,9.6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="19.465,11.25;55.05,27.9"/>
+ <dia:rectangle val="34.24,8.85;39.05,23.9"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="19.515,27.1"/>
- <dia:point val="22,27.1"/>
- <dia:point val="22,18"/>
- <dia:point val="52.485,18"/>
- <dia:point val="52.485,12.05"/>
- <dia:point val="55,12.05"/>
+ <dia:point val="34.29,9.6"/>
+ <dia:point val="37,9.6"/>
+ <dia:point val="37,23.05"/>
+ <dia:point val="39,23.05"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
<dia:enum val="1"/>
<dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="text_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O19" connection="19"/>
- <dia:connection handle="1" to="O27" connection="3"/>
- </dia:connections>
- </dia:object>
- <dia:object type="UML - Association" version="2" id="O49">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -4899,19 +5004,40 @@ handling for Text* members#</dia:string>
<dia:attribute name="show_arrow_b">
<dia:boolean val="true"/>
</dia:attribute>
+ <dia:attribute name="text_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="text_height">
+ <dia:real val="0.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O0" connection="21"/>
+ <dia:connection handle="1" to="O16" connection="3"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="UML - Association" version="2" id="O50">
<dia:attribute name="obj_pos">
- <dia:point val="34.29,9.6"/>
+ <dia:point val="34.29,11.2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="34.24,8.8;39.05,23.85"/>
+ <dia:rectangle val="34.24,10.45;39.05,23.9"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="34.29,9.6"/>
- <dia:point val="37,9.6"/>
- <dia:point val="37,23.05"/>
+ <dia:point val="34.29,11.2"/>
+ <dia:point val="36.5,11.2"/>
+ <dia:point val="36.5,23.05"/>
<dia:point val="39,23.05"/>
</dia:attribute>
<dia:attribute name="orth_orient">
@@ -4922,18 +5048,6 @@ handling for Text* members#</dia:string>
<dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="text_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O0" connection="21"/>
- <dia:connection handle="1" to="O16" connection="3"/>
- </dia:connections>
- </dia:object>
- <dia:object type="UML - Association" version="2" id="O50">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -4970,34 +5084,20 @@ handling for Text* members#</dia:string>
<dia:attribute name="show_arrow_b">
<dia:boolean val="true"/>
</dia:attribute>
- <dia:attribute name="obj_pos">
- <dia:point val="34.29,11.2"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="34.24,10.4;39.05,23.85"/>
- </dia:attribute>
- <dia:attribute name="meta">
- <dia:composite type="dict"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="34.29,11.2"/>
- <dia:point val="36.5,11.2"/>
- <dia:point val="36.5,23.05"/>
- <dia:point val="39,23.05"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
+ <dia:attribute name="text_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
</dia:attribute>
- <dia:attribute name="orth_autoroute">
- <dia:boolean val="false"/>
+ <dia:attribute name="text_height">
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="text_colour">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_colour">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O0" connection="23"/>
@@ -5066,13 +5166,13 @@ handling for Text* members#</dia:string>
<dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="fill_color">
- <dia:color val="#ffffff"/>
+ <dia:color val="#ffffffff"/>
</dia:attribute>
<dia:attribute name="text_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="normal_font">
<dia:font family="monospace" style="0" name="Courier"/>
@@ -5318,13 +5418,13 @@ handling for Text* members#</dia:string>
<dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="fill_color">
- <dia:color val="#ffffff"/>
+ <dia:color val="#ffffffff"/>
</dia:attribute>
<dia:attribute name="text_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="normal_font">
<dia:font family="monospace" style="0" name="Courier"/>
@@ -5487,6 +5587,29 @@ handling for Text* members#</dia:string>
<dia:attribute name="templates"/>
</dia:object>
<dia:object type="UML - Association" version="2" id="O53">
+ <dia:attribute name="obj_pos">
+ <dia:point val="68.375,27.8"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="67.625,14.25;79.05,28.65"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
+ </dia:attribute>
+ <dia:attribute name="orth_points">
+ <dia:point val="68.375,27.8"/>
+ <dia:point val="77,27.8"/>
+ <dia:point val="77,15.05"/>
+ <dia:point val="79,15.05"/>
+ </dia:attribute>
+ <dia:attribute name="orth_orient">
+ <dia:enum val="0"/>
+ <dia:enum val="1"/>
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="orth_autoroute">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -5523,20 +5646,41 @@ handling for Text* members#</dia:string>
<dia:attribute name="show_arrow_b">
<dia:boolean val="true"/>
</dia:attribute>
+ <dia:attribute name="text_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="text_height">
+ <dia:real val="0.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O16" connection="17"/>
+ <dia:connection handle="1" to="O52" connection="3"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="UML - Association" version="2" id="O54">
<dia:attribute name="obj_pos">
- <dia:point val="68.375,27.8"/>
+ <dia:point val="68.375,29.4"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="67.625,14.25;79.05,28.6"/>
+ <dia:rectangle val="67.625,28.65;79.05,31.9"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="68.375,27.8"/>
- <dia:point val="77,27.8"/>
- <dia:point val="77,15.05"/>
- <dia:point val="79,15.05"/>
+ <dia:point val="68.375,29.4"/>
+ <dia:point val="77,29.4"/>
+ <dia:point val="77,31.05"/>
+ <dia:point val="79,31.05"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -5546,18 +5690,6 @@ handling for Text* members#</dia:string>
<dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="text_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O16" connection="17"/>
- <dia:connection handle="1" to="O52" connection="3"/>
- </dia:connections>
- </dia:object>
- <dia:object type="UML - Association" version="2" id="O54">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -5594,34 +5726,20 @@ handling for Text* members#</dia:string>
<dia:attribute name="show_arrow_b">
<dia:boolean val="true"/>
</dia:attribute>
- <dia:attribute name="obj_pos">
- <dia:point val="68.375,29.4"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="67.625,28.6;79.05,31.85"/>
- </dia:attribute>
- <dia:attribute name="meta">
- <dia:composite type="dict"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="68.375,29.4"/>
- <dia:point val="77,29.4"/>
- <dia:point val="77,31.05"/>
- <dia:point val="79,31.05"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
+ <dia:attribute name="text_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
</dia:attribute>
- <dia:attribute name="orth_autoroute">
- <dia:boolean val="false"/>
+ <dia:attribute name="text_height">
+ <dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="text_colour">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_colour">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O16" connection="21"/>
@@ -5690,13 +5808,13 @@ handling for Text* members#</dia:string>
<dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="fill_color">
- <dia:color val="#ffffff"/>
+ <dia:color val="#ffffffff"/>
</dia:attribute>
<dia:attribute name="text_color">
- <dia:color val="#000000"/>
+ <dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="normal_font">
<dia:font family="monospace" style="0" name="Courier"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
