提交: d1d38486baab68850fe91026705592482db3e737 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• 修订版: d1d38486baab68850fe91026705592482db3e737 (tree)
• 时间: 2004-05-06 05:27:09
• 作者: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Arrow and network things.

更改概述

• modified: ChangeLog
• modified: lib/arrows.c
• modified: lib/arrows.h
• modified: objects/network/Makefile.am
• modified: objects/network/network.c
• modified: sheets/network.sheet.in

差异

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2004-05-05  Lars Clausen  <[e-mail]>
 
+	* objects/network/Makefile.am: 
+	* objects/network/pixmaps/radiocell.xpm: 
+	* objects/network/pixmaps/basestation.xpm: 
+	* objects/network/network.c: 
+	* objects/network/basestation.c: 
+	* objects/network/radiocell.c: 
+	Patch from W. Borgert <[e-mail]>: Radio cell and base
+	station objects.
+
+	* lib/arrows.[ch]: Patch from Anthony <[e-mail]>:
+	Backslash arrow head. 
+
 	* app/pagesetup.c (pagesetup_respond): Do not free ps twice.
 	Notify takes care.  Should maybe use that more.
 

--- a/lib/arrows.c
+++ b/lib/arrows.c
@@ -69,6 +69,7 @@ struct menudesc arrow_types[] =
    {N_("Blanked Concave"),ARROW_BLANKED_CONCAVE},
    {N_("Round"), ARROW_ROUNDED},
    {N_("Open Round"), ARROW_OPEN_ROUNDED},
+   {N_("Backslash"),ARROW_BACKSLASH},
    {NULL,0}};
 
 ///////////// prototypes //////////////
@@ -765,6 +766,8 @@ draw_integral(DiaRenderer *renderer, Point *to, Point *from,
   DIA_RENDERER_GET_CLASS(renderer)->draw_bezier(renderer,bp,sizeof(bp)/sizeof(bp[0]),fg_color);
 }
 
+
+
 static void
 draw_slashed(DiaRenderer *renderer, Point *to, Point *from,
 	     real length, real width, real linewidth,
@@ -1046,6 +1049,51 @@ draw_slashed_cross(DiaRenderer *renderer, Point *to, Point *from,
 }
 
 static void
+draw_backslash(DiaRenderer *renderer, Point *to, Point *from,
+               real length, real width, real linewidth, Color *color)
+{
+  Point point1;
+  Point point2;
+  Point delta;
+  Point orth_delta;
+  real len;
+
+  delta = *to;
+  point_sub(&delta, from);
+  len = sqrt(point_dot(&delta, &delta));
+  if (len <= 0.0001) {
+    delta.x=1.0;
+    delta.y=0.0;
+  } else {
+    delta.x/=len;
+    delta.y/=len;
+  }
+
+  orth_delta.x = delta.y;
+  orth_delta.y = -delta.x;
+
+  point_scale(&delta, length/2.0);
+  point_scale(&orth_delta, width/2.0);
+
+  point1 = *to;
+  point_sub(&point1, &delta);
+  point_sub(&point1, &delta);
+  point_sub(&point1, &delta);
+  point_add(&point1, &orth_delta);
+
+  point2 = *to;
+  point_sub(&point2, &delta);
+  point_sub(&point2, &orth_delta);
+
+  DIA_RENDERER_GET_CLASS(renderer)->set_linewidth(renderer, linewidth);
+  DIA_RENDERER_GET_CLASS(renderer)->set_linestyle(renderer, LINESTYLE_SOLID);
+  DIA_RENDERER_GET_CLASS(renderer)->set_linejoin(renderer, LINEJOIN_MITER);
+  DIA_RENDERER_GET_CLASS(renderer)->set_linecaps(renderer, LINECAPS_BUTT);
+
+  DIA_RENDERER_GET_CLASS(renderer)->draw_line(renderer, &point1,&point2, color);
+}
+
+static void
 draw_cross(DiaRenderer *renderer, Point *to, Point *from,
 	   real length, real width, real linewidth, Color *color)
 {
@@ -1399,6 +1447,9 @@ arrow_draw(DiaRenderer *renderer, ArrowType type,
     draw_filled_dot_n_triangle(renderer, to, from, length, width, linewidth,
 			       fg_color, bg_color);
     break;
+  case ARROW_BACKSLASH:
+    draw_backslash(renderer,to,from,length,width,linewidth,fg_color);
+    break;
   } 
 }
 

--- a/lib/arrows.h
+++ b/lib/arrows.h
@@ -61,6 +61,7 @@ typedef enum {
   ARROW_NONE_OR_MANY,           /* ER-model: 0 or many*/
   ARROW_ONE_OR_NONE,            /* ER-model: 1 or 0 */
   ARROW_ONE_EXACTLY,            /* ER-model: exactly one*/
+  ARROW_BACKSLASH,                  /* -\----  */
 } ArrowType;
 
 struct menudesc {

--- a/objects/network/Makefile.am
+++ b/objects/network/Makefile.am
@@ -5,6 +5,8 @@ libnetwork_objects_la_SOURCES = \
 			      network.h \
 			      network.c \
 			      bus.c \
+			      radiocell.c \
+			      basestation.c \
 			      wanlink.c 
 
 libnetwork_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
@@ -17,6 +19,8 @@ EXTRA_DIST = \
 	pixmaps/computer.xpm \
 	pixmaps/disc.xpm \
 	pixmaps/flash.xpm \
+	pixmaps/radiocell.xpm \
+	pixmaps/basestation.xpm \
 	pixmaps/wanlink.xpm \
 	pixmaps/hub.xpm \
 	pixmaps/modem.xpm \

--- a/objects/network/network.c
+++ b/objects/network/network.c
@@ -31,6 +31,8 @@ Color computer_color = { 0.7, 0.7, 0.7 };
 
 extern DiaObjectType bus_type;
 extern DiaObjectType bus_type_std;
+extern DiaObjectType radiocell_type;
+extern DiaObjectType basestation_type;
 extern DiaObjectType wanlink_type;
 
 DIA_PLUGIN_CHECK_INIT
@@ -44,6 +46,8 @@ dia_plugin_init(PluginInfo *info)
 
   object_register_type(&bus_type_std);
   object_register_type(&bus_type);
+  object_register_type(&radiocell_type);
+  object_register_type(&basestation_type);
   object_register_type(&wanlink_type);
 
   return DIA_PLUGIN_INIT_OK;

--- a/sheets/network.sheet.in
+++ b/sheets/network.sheet.in
@@ -42,9 +42,15 @@
     <object name="Network - Antenna">
       <_description>Antenna for wireless transmission</_description>
     </object>
+    <object name="Network - Base Station">
+      <_description>Mobile telephony base station</_description>
+    </object>
     <object name="Network - Cloud">
       <_description>Network cloud</_description>
     </object>
+    <object name="Network - Radio Cell">
+      <_description>Mobile telephony cell</_description>
+    </object>
     <object name="Network - Router Symbol">
       <_description>Router symbol</_description>
     </object>