wxruby3-shapes 0.9.0.pre.beta.3 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e87fc628c22cdd597cdffbcd842d207cee3542b4b18c599abb2240b56a1b623f
-  data.tar.gz: aca8560f77c6f20e25a25a9905ea0e2f84b6b2d4293dd8341f772882acf52880
+  metadata.gz: '057851261926749b3b0c1174530f5e98ea2dd9c743ca228c1d8d5d03ef1af6b3'
+  data.tar.gz: affa03b0ac6a1547ddc4d92a3b0a7a031bc6fe93c843428d3f9be81cc2b5c846
 SHA512:
-  metadata.gz: 96cedb90feb6f2bf21044f17c45e55be647e34f20f14035742cf8fa0aa6e9671d732dd8d6f7878900a799d696d29aa1975434674468de15f0038a29c3b68c423
-  data.tar.gz: 95c952c4a3c94e492eac23f854b6465dd185c063266b975ec68ec8929877d4de3302bba71dce5b9e06238ded4828cffbdeb74e258ff23f02cd256e20fa3156a2
+  metadata.gz: 5b5f1f3377fd54a5613023b58c02de7ec451bd50e53a3ac0ebbef1ac2d5fd792458f77a50a6295cf417839f7157853eb8db4ef45203ae1aabe7be5e9a438e973
+  data.tar.gz: 4400bd26bceb8eb6589aaa0571e74986084e0c9774f0a23072330f5d76e50ce81ebae1dee87000bc7069e4f925391beee29c95746017bb563b80b57551f9dcad

data/INSTALL.md

@@ -14,13 +14,11 @@ gem install wxruby3-shapes
  ```
 
 This will install the wxruby3-shapes gem on any system supporting Ruby and wxRuby.
-As wxRuby3/Shapes has a dependency on wxRuby3 the wxRuby3 gem will be attempted to be installed if (the required version is) 
-not yet installed. This will be attempted using a default installation of the wxRuby3 gem. As this is a gem building 
-a native extension (except for Windows where the default install will be a prebuilt binary extension gem) this can take quite a
-while. 
-
-Due to the dependencies of the wxRuby3 gem itself it might be preferable to install that gem separately beforehand. See the
-[INSTALL](https://github.com/mcorino/wxRuby3/blob/master/INSTALL.md) document of the wxRuby3 project for more details.
+As wxRuby3/Shapes has a dependency on wxRuby3 the wxRuby3 gem will be installed as well if not yet installed. 
+Depending on your system this may install a prebuilt binary package (see the [wxRuby3](https://github.com/mcorino/wxRuby3) 
+project for more information about supported platforms) or require you to run a post-install step to build the wxRuby3
+extension library binaries before you can use wxRuby3/Shapes (see the
+[INSTALL](https://github.com/mcorino/wxRuby3/blob/master/INSTALL.md) document of the wxRuby3 project for more details).
 
 ## Building from source
 

data/README.md

@@ -7,7 +7,7 @@
 
 # wxRuby3/Shapes - A wxRuby3 2D shapes and diagramming framework
 
-![wxRuby3/Shapes demo](assets/screenshot.png)
+![Logo](assets/logo.svg)
 
 ## Introduction
 
@@ -21,7 +21,7 @@ The library consists of several classes encapsulating a so called 'Shape canvas'
 GUI control used for management of diagrams) providing the following features:
 
 - Create charts (diagrams) interactively in your wxRuby3 applications
-- Serialize/deserialize charts to file or any io stream in multiple formats (currently supported formats are JSON and YAML)
+- Serialize/deserialize charts to file or any io stream in multiple formats (currently supported formats are JSON, YAML and XML)
 - Support for Clipboard operations (Cut/Paste) and Drag&Drop of diagram components (shapes)
 - Support for Undo/Redo operations
 - Support for alignment of diagram components.
@@ -29,9 +29,10 @@ GUI control used for management of diagrams) providing the following features:
 - Support for diagram export to bitmap (any supported type)
 - Support for Thumbnail view of diagram
 - A standard collection of diagram components
-  - Shapes: basic rectangular, square, circle, ellipse, rounded rectangle, grid, flexible grid, text, editable text, polygonal, diamond, bitmap
+  - Shapes: basic rectangular, square, circle, ellipse, rounded rectangle, grid, flexible grid, horizontal box, 
+            vertical box, text, editable text, polygonal, diamond, bitmap
   - Lines: straight, curved, orthogonal, rounded orthogonal
-  - Line arrows: solid, open, diamond, circle
+  - Line arrows: solid, open, diamond, circle, cup, prong, square, crossbar, etc.
 - Highly customizable and extendable
 
 The shape framework (and shape canvas) allows to define the relationship between various
@@ -43,6 +44,37 @@ of diagrams.
 More over, the library source code is pure Ruby based on wxRuby3 GUI toolkit, so it will
 run on any platform that supports Ruby and wxRuby3.
 
+![Screenshot](assets/screenshot.png)
+
+### To install
+
+The wxRuby3/Shapes project provides gems on [RubyGems](https://rubygems.org) which can be installed with the
+standard `gem install` command line this:
+
+```shell
+gem install wxruby3-shapes
+ ```
+
+See [INSTALL](INSTALL.md) for more details. 
+
+### To test
+
+After installation run this:
+
+```shell
+wx-shapes test
+```
+
+### To run a demonstration application
+
+After installation run this:
+
+```shell
+wx-shapes sampler
+```
+
+See the output of `wx-shapes --help` for more options.
+
 ## wxRuby3/Shapes licence
 
 wxruby3/shapes is free and open-source. It is distributed under the liberal
@@ -102,13 +134,13 @@ This documentation (for the latest release) is also available online
 with the following major implementation differences:
 
 - wxRuby3/Shapes implements a totally different serialization scheme in which none of the XML serializer 
-code has been ported. In fact wxRuby3/Shapes does not offer any XML serialization out of the box but instead 
-provides a more adaptable implementation with (for now) two supported output formats; JSON and YAML.
+code has been ported but instead relies on the [FIRM](https://github.com/mcorino/firm) gem for serialization support.
 - Related to this the internal management of shape references has been changed as well as this was tightly 
 linked to the serialization implementation.
 - The API has been Ruby-fied with respect to constant names, method names and argument passing and return
 values.
 - The ScaledDC class has been integrated with wxRuby3 and is not part of wxRuby3/Shapes.
+- The implementation has been noticeably improved and extended compared to the wxShapeFramework implementation.  
 
 In addition many small tweaks, improvements and also bugfixes have been implemented as part of the port. 
 

data/assets/logo.svg

@@ -0,0 +1,339 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:ooo="http://xml.openoffice.org/svg/export"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.2"
+   width="105.83334mm"
+   height="105.83334mm"
+   viewBox="0 0 10583.333 10583.333"
+   preserveAspectRatio="xMidYMid"
+   fill-rule="evenodd"
+   stroke-width="28.222"
+   stroke-linejoin="round"
+   xml:space="preserve"
+   id="svg107"
+   sodipodi:docname="logo.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"><metadata
+   id="metadata111"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="3440"
+   inkscape:window-height="1368"
+   id="namedview109"
+   showgrid="false"
+   inkscape:zoom="1.2611806"
+   inkscape:cx="186.73746"
+   inkscape:cy="181.67313"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="g105"
+   inkscape:document-rotation="0" />
+ <defs
+   class="ClipPathGroup"
+   id="defs8">
+  <clipPath
+   id="presentation_clip_path"
+   clipPathUnits="userSpaceOnUse">
+   <rect
+   x="0"
+   y="0"
+   width="15000"
+   height="15000"
+   id="rect2" />
+  </clipPath>
+  <clipPath
+   id="presentation_clip_path_shrink"
+   clipPathUnits="userSpaceOnUse">
+   <rect
+   x="15"
+   y="15"
+   width="14970"
+   height="14970"
+   id="rect5" />
+  </clipPath>
+ 
+   
+  </defs>
+ <defs
+   class="TextShapeIndex"
+   id="defs12">
+  <g
+   ooo:slide="id1"
+   ooo:id-list="id3 id4 id5 id6 id7 id8"
+   id="g10" />
+ </defs>
+ <defs
+   class="EmbeddedBulletChars"
+   id="defs44">
+  <g
+   id="bullet-char-template-57356"
+   transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)">
+   <path
+   d="M 580,1141 1163,571 580,0 -4,571 Z"
+   id="path14" />
+  </g>
+  <g
+   id="bullet-char-template-57354"
+   transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)">
+   <path
+   d="M 8,1128 H 1137 V 0 H 8 Z"
+   id="path17" />
+  </g>
+  <g
+   id="bullet-char-template-10146"
+   transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)">
+   <path
+   d="M 174,0 602,739 174,1481 1456,739 Z M 1358,739 309,1346 659,739 Z"
+   id="path20" />
+  </g>
+  <g
+   id="bullet-char-template-10132"
+   transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)">
+   <path
+   d="M 2015,739 1276,0 H 717 l 543,543 H 174 v 393 h 1086 l -543,545 h 557 z"
+   id="path23" />
+  </g>
+  <g
+   id="bullet-char-template-10007"
+   transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)">
+   <path
+   d="m 0,-2 c -7,16 -16,29 -25,39 l 381,530 c -94,256 -141,385 -141,387 0,25 13,38 40,38 9,0 21,-2 34,-5 21,4 42,12 65,25 l 27,-13 111,-251 280,301 64,-25 24,25 c 21,-10 41,-24 62,-43 C 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 c 0,-27 -21,-55 -63,-84 l 16,-20 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 c -22,-34 -53,-51 -92,-51 -42,0 -63,17 -64,51 -7,9 -10,24 -10,44 0,9 1,19 2,30 z"
+   id="path26" />
+  </g>
+  <g
+   id="bullet-char-template-10004"
+   transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)">
+   <path
+   d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 c 0,78 14,145 41,201 34,71 87,106 158,106 53,0 88,-31 106,-94 l 23,-176 c 8,-64 28,-97 59,-98 l 735,706 c 11,11 33,17 66,17 42,0 63,-15 63,-46 V 965 c 0,-36 -10,-64 -30,-84 L 442,47 C 390,-6 338,-33 285,-33 Z"
+   id="path29" />
+  </g>
+  <g
+   id="bullet-char-template-9679"
+   transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)">
+   <path
+   d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 c 0,181 53,324 160,431 106,107 249,161 430,161 179,0 323,-54 432,-161 108,-107 162,-251 162,-431 0,-180 -54,-324 -162,-431 C 1136,54 992,0 813,0 Z"
+   id="path32" />
+  </g>
+  <g
+   id="bullet-char-template-8226"
+   transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)">
+   <path
+   d="m 346,457 c -73,0 -137,26 -191,78 -54,51 -81,114 -81,188 0,73 27,136 81,188 54,52 118,78 191,78 73,0 134,-26 185,-79 51,-51 77,-114 77,-187 0,-75 -25,-137 -76,-188 -50,-52 -112,-78 -186,-78 z"
+   id="path35" />
+  </g>
+  <g
+   id="bullet-char-template-8211"
+   transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)">
+   <path
+   d="M -4,459 H 1135 V 606 H -4 Z"
+   id="path38" />
+  </g>
+  <g
+   id="bullet-char-template-61548"
+   transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)">
+   <path
+   d="m 173,740 c 0,163 58,303 173,419 116,115 255,173 419,173 163,0 302,-58 418,-173 116,-116 174,-256 174,-419 0,-163 -58,-303 -174,-418 C 1067,206 928,148 765,148 601,148 462,206 346,322 231,437 173,577 173,740 Z"
+   id="path41" />
+  </g>
+ </defs>
+ <g
+   id="g49"
+   transform="matrix(1.1969142,0,0,1.1920121,-2057.6568,-2303.8129)">
+  <g
+   id="id2"
+   class="Master_Slide">
+   <g
+   id="bg-id2"
+   class="Background" />
+   <g
+   id="bo-id2"
+   class="BackgroundObjects" />
+  </g>
+ </g>
+ <g
+   class="SlideGroup"
+   id="g105"
+   transform="matrix(1.1969142,0,0,1.1920121,-2057.6568,-2303.8129)">
+  <g
+   id="container-id1"
+   transform="matrix(0.63636359,0,0,0.63636355,1523.6329,1517.9165)">
+    <g
+   id="id1"
+   class="Slide"
+   clip-path="url(#presentation_clip_path)">
+     <g
+   class="Page"
+   id="g99">
+      <g
+   class="com.sun.star.drawing.LineShape"
+   id="g58">
+       <g
+   id="id3">
+        <rect
+   class="BoundingBox"
+   stroke="none"
+   fill="none"
+   x="1979"
+   y="6330"
+   width="1013"
+   height="3098"
+   id="rect51" />
+        <path
+   fill="none"
+   stroke="#818181"
+   stroke-width="353"
+   stroke-linejoin="round"
+   d="M 2500,9250 2485,7391"
+   id="path53" />
+        <path
+   fill="#818181"
+   stroke="none"
+   d="m 2986,7375 -456,-1003 -22,-29 -30,-12 -33,12 -21,26 -440,1014 -5,13 v 8 l 5,21 13,21 17,13 21,3 901,-7 21,-4 21,-13 8,-21 4,-21 v -8 z"
+   id="path55" />
+       </g>
+      </g>
+      <g
+   class="com.sun.star.drawing.CustomShape"
+   id="g65">
+       <g
+   id="id4">
+        <rect
+   class="BoundingBox"
+   stroke="none"
+   fill="none"
+   x="1397"
+   y="1397"
+   width="4957"
+   height="4957"
+   id="rect60" />
+        <path
+   fill="none"
+   stroke="#ffd700"
+   stroke-width="706"
+   stroke-linejoin="round"
+   d="M 3875,6000 H 1750 V 1750 h 4250 v 4250 z"
+   id="path62" />
+       </g>
+      </g>
+      <g
+   class="com.sun.star.drawing.CustomShape"
+   id="g72">
+       <g
+   id="id5">
+        <rect
+   class="BoundingBox"
+   stroke="none"
+   fill="none"
+   x="7647"
+   y="4197"
+   width="5708"
+   height="5708"
+   id="rect67" />
+        <path
+   fill="none"
+   stroke="#b22222"
+   stroke-width="706"
+   stroke-linejoin="round"
+   d="m 13001,7051 c 0,438 -116,870 -335,1250 -219,380 -535,696 -915,915 -380,219 -812,335 -1250,335 -439,0 -871,-116 -1251,-335 -380,-219 -696,-535 -915,-915 -219,-380 -335,-812 -335,-1250 0,-439 116,-871 335,-1251 219,-380 535,-696 915,-915 380,-219 812,-335 1251,-335 438,0 870,116 1250,335 380,219 696,535 915,915 219,380 335,812 335,1250 z"
+   id="path69" />
+       </g>
+      </g>
+      <g
+   class="com.sun.star.drawing.CustomShape"
+   id="g79">
+       <g
+   id="id6">
+        <rect
+   class="BoundingBox"
+   stroke="none"
+   fill="none"
+   x="1197"
+   y="7397"
+   width="6208"
+   height="6208"
+   id="rect74" />
+        <path
+   fill="none"
+   stroke="#00008b"
+   stroke-width="706"
+   stroke-linejoin="round"
+   d="M 4300,7750 7051,10500 4300,13251 1550,10500 Z"
+   id="path76" />
+       </g>
+      </g>
+      <g
+   class="com.sun.star.drawing.PolyLineShape"
+   id="g88">
+       <g
+   id="id7">
+        <rect
+   class="BoundingBox"
+   stroke="none"
+   fill="none"
+   x="6173"
+   y="2373"
+   width="4584"
+   height="1869"
+   id="rect81" />
+        <path
+   fill="none"
+   stroke="#818181"
+   stroke-width="353"
+   stroke-linejoin="round"
+   d="m 6350,2550 h 3900 v 631"
+   id="path83" />
+        <path
+   fill="#818181"
+   stroke="none"
+   d="m 9748,3193 449,1006 22,30 29,12 33,-12 21,-26 449,-1010 5,-13 v -8 l -5,-21 -12,-21 -17,-13 -21,-4 h -902 l -21,4 -21,13 -9,21 -3,21 v 8 z"
+   id="path85" />
+       </g>
+      </g>
+      <g
+   class="com.sun.star.drawing.PolyLineShape"
+   id="g97">
+       <g
+   id="id8">
+        <rect
+   class="BoundingBox"
+   stroke="none"
+   fill="none"
+   x="5595"
+   y="9707"
+   width="5083"
+   height="3150"
+   id="rect90" />
+        <path
+   fill="none"
+   stroke="#818181"
+   stroke-width="353"
+   stroke-linejoin="round"
+   d="m 6655,12350 h 3845 V 9884"
+   id="path92" />
+        <path
+   fill="#818181"
+   stroke="none"
+   d="m 6643,11848 -1006,449 -30,22 -12,29 12,33 26,21 1010,449 13,5 h 8 l 21,-5 21,-12 13,-17 4,-21 v -902 l -4,-21 -13,-21 -21,-9 -21,-3 h -8 z"
+   id="path94" />
+       </g>
+      </g>
+     </g>
+    </g>
+   </g>
+ </g>
+</svg>

data/assets/logo.xpm

@@ -0,0 +1,60 @@
+/* XPM */
+static char * logo_xpm[] = {
+"32 32 25 1",
+" 	c None",
+".	c #FFD700",
+"+	c #000000",
+"@	c #B22222",
+"#	c #060400",
+"$	c #052092",
+"%	c #041C91",
+"&	c #051F92",
+"*	c #062594",
+"=	c #041E91",
+"-	c #000004",
+";	c #052192",
+">	c #051F8F",
+",	c #052293",
+"'	c #B22323",
+")	c #751616",
+"!	c #062393",
+"~	c #02128F",
+"{	c #041B91",
+"]	c #000021",
+"^	c #00000D",
+"/	c #052091",
+"(	c #000002",
+"_	c #041D91",
+":	c #041D92",
+"                                ",
+"  ............                  ",
+"  ............                  ",
+"  ............+++++++++         ",
+"  ............        +         ",
+"  ....    ....      +++++       ",
+"  ....    ....       +++        ",
+"  ....    ....        +         ",
+"  ....    ....       @@@@@      ",
+"  ............      @@@@@@@@    ",
+"  ............    @@@@@@@@@@@   ",
+"  ............    @@@     @@@   ",
+"  ............   @@@       @@@  ",
+"    #            @@@       @@@  ",
+"   +++           @@@       @@@  ",
+"  +++++          @@@       @@@  ",
+"    +   $%       @@@       @@@  ",
+"    +  &**=      @@@@     @@@@  ",
+"    + &****$      @@@@@@@@@@@   ",
+"    -&******;      @@@@@@@@@    ",
+"    >***  ***,      '@@@@@@     ",
+"   &***    ***,        )        ",
+"  &***      ***!       +        ",
+" ~***        **;       +        ",
+"  {***      **;        +        ",
+"   %***    **$]        +        ",
+"    %***  **$^+        +        ",
+"     %*****/(+++++++++++        ",
+"      _***$  ++                 ",
+"       :*$    +                 ",
+"        *                       ",
+"                                "};

data/bin/wx-shapes

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby3.0
 #---------------------------------
 # This file is generated
 #---------------------------------

data/lib/wx/shapes/arrow_base.rb

@@ -8,14 +8,7 @@ module Wx::SF
 
   class ArrowBase
 
-    include Wx::SF::Serializable
-
-    module DEFAULT
-      FILL = Wx::Brush.new(Wx::WHITE) if Wx::App.is_main_loop_running
-      Wx.add_delayed_constant(self, :FILL) { Wx::Brush.new(Wx::WHITE) }
-      BORDER = Wx::Pen.new(Wx::BLACK) if Wx::App.is_main_loop_running
-      Wx.add_delayed_constant(self, :BORDER) { Wx::Pen.new(Wx::BLACK) }
-    end
+    include FIRM::Serializable
 
     # Constructor
     # @param [Wx::SF::Shape] parent parent shape
@@ -31,7 +24,7 @@ module Wx::SF
     alias :parent_shape= :set_parent_shape
 
 	  # Get pointer to a parent shape.
-	  # @return [Wx::SF::Shape] parent shape if exists, otherwise nil
+	  # @return [Wx::SF::Shape, nil] parent shape if exists, otherwise nil
     def get_parent_shape
       @parent_shape
     end
@@ -40,9 +33,9 @@ module Wx::SF
 	  # Draw arrow shape at the end of a virtual line.
 	  # @param [Wx::RealPoint] from Start of the virtual line
 	  # @param [Wx::RealPoint] to End of the virtual line
-	  # @param [Wx::DC] dc Device context for drawing
+    # @return [Wx::Point] translated connection point for arrow
     def draw(from, to, dc)
-      # needs to be overridden
+      raise NotImplementedError, 'Overload missing'
     end
 
     protected

data/lib/wx/shapes/arrows/circle_arrow.rb

@@ -1,37 +1,48 @@
 # Wx::SF::CircleArrow - circle arrow class
 # Copyright (c) M.J.N. Corino, The Netherlands
 
-require 'wx/shapes/arrows/solid_arrow'
+require 'wx/shapes/arrows/filled_arrow'
 
 module Wx::SF
 
-  class CircleArrow < SolidArrow
+  # Class extends the Wx::FilledArrow class and encapsulates
+  # circle arrow shapes.
+  class CircleArrow < FilledArrow
 
     # Default circle radius.
-    RADIUS = 4
-
-    property :radius
+    RADIUS = 6
 
     # Constructor
     # @param [Wx::SF::Shape] parent parent shape
     def initialize(parent=nil)
       super
-      @radius = 4
+      scale
+    end
+
+    # Get the circle radius
+    def get_radius
+      (RADIUS * @ratio).to_i
     end
+    alias :radius :get_radius
 
-    # Get or set the circle radius
-    attr_accessor :radius
+    def scale
+      @ratio = 1 + (pen_width / 2) * 0.5
+    end
+    protected :scale
 
     # Draw arrow shape at the end of a virtual line.
     # @param [Wx::RealPoint] from Start of the virtual line
     # @param [Wx::RealPoint] to End of the virtual line
     # @param [Wx::DC] dc Device context for drawing
     def draw(from, to, dc)
-      dc.with_pen(@pen) do |dc|
-        dc.with_brush(@fill) do |dc|
-          dc.draw_circle(to.to_point, @radius)
+      r = radius
+      centre, cp = translate_arrow([Wx::RealPoint.new(r, 0), Wx::RealPoint.new(2*r, 0)], from, to)
+      dc.with_pen(pen) do |dc|
+        dc.with_brush(fill) do |dc|
+          dc.draw_circle(centre, r)
         end
       end
+      cp
     end
 
   end

data/lib/wx/shapes/arrows/circle_prong_arrow.rb

@@ -0,0 +1,48 @@
+# Wx::SF::CircleProngArrow - circle with prong arrow class
+# Copyright (c) M.J.N. Corino, The Netherlands
+
+require 'wx/shapes/arrows/circle_arrow'
+
+module Wx::SF
+
+  # Class extends the Wx::CircleArrow class and encapsulates
+  # arrow shape consisting of single two lines bisecting before the end of the
+  # parent line shape with a preceding circle.
+  class CircleProngArrow < CircleArrow
+
+    class << self
+      def arrow(ratio)
+        x = ratio*11; y = ratio*5
+        [Wx::RealPoint.new(x,0), Wx::RealPoint.new(0, y), Wx::RealPoint.new(0,-y), Wx::RealPoint.new(0, 0)]
+      end
+    end
+
+    def vertices
+      @vertices ||= CircleProngArrow.arrow(@ratio)
+    end
+    private :vertices
+
+    def scale
+      @vertices = nil
+      super
+    end
+    protected :scale
+
+    # Draw arrow shape at the end of a virtual line.
+    # @param [Wx::RealPoint] from Start of the virtual line
+    # @param [Wx::RealPoint] to End of the virtual line
+    # @param [Wx::DC] dc Device context for drawing
+    # @return [Wx::Point] translated connection point for arrow
+    def draw(from, to, dc)
+      cp, wing1, wing2, tip = translate_arrow(vertices, from, to)
+      dc.with_pen(pen) do |dc|
+        dc.draw_line(cp, wing1)
+        dc.draw_line(cp, wing2)
+        dc.draw_line(cp, tip)
+      end
+      super(from, cp, dc)
+    end
+
+  end
+
+end