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

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

@@ -0,0 +1,57 @@
+# Wx::SF::CrossBarArrow - crossbar arrow class
+# Copyright (c) M.J.N. Corino, The Netherlands
+
+require 'wx/shapes/arrows/line_arrow'
+
+module Wx::SF
+
+  # Class extends the Wx::LineArrow class and encapsulates
+  # arrow shape consisting of single crossbar before the end of the
+  # parent line shape.
+  class CrossBarArrow < LineArrow
+
+    class << self
+      def arrow(ratio)
+        x = ratio*6; y = ratio*6
+        [[Wx::RealPoint.new(x,y), Wx::RealPoint.new(x, -y), Wx::RealPoint.new(x, 0)]]
+      end
+    end
+
+    # Constructor
+    # @param [Wx::SF::Shape] parent parent shape
+    def initialize(parent=nil)
+      super(parent)
+      scale
+    end
+
+    def lines
+      @lines ||= CrossBarArrow.arrow(@ratio)
+    end
+    private :lines
+
+    def scale
+      @lines = nil
+      @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
+    # @return [Wx::Point] translated connection point for arrow
+    def draw(from, to, dc)
+      bar_cp = nil
+      dc.with_pen(pen) do |dc|
+        lines.each do |line|
+          bar_from, bar_to, bar_cp = translate_arrow(line, from, to)
+          dc.draw_line(bar_from, bar_to)
+        end
+        dc.draw_line(bar_cp, to.to_point)
+      end
+      bar_cp
+    end
+
+  end
+
+end

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

@@ -0,0 +1,56 @@
+# Wx::SF::CrossBarCircleArrow - crossbar with circle 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
+  # circle arrow shapes with a crossbar.
+  class CrossBarCircleArrow < CircleArrow
+
+    class << self
+      def arrow(ratio)
+        x = ratio*6; y = ratio*6
+        [Wx::RealPoint.new(x,y), Wx::RealPoint.new(x, -y), Wx::RealPoint.new(x, 0)]
+      end
+    end
+
+    # Default circle radius.
+    RADIUS = 4
+
+    # Constructor
+    # @param [Wx::SF::Shape] parent parent shape
+    def initialize(parent=nil)
+      super
+      scale
+    end
+
+    def line
+      @line ||= CrossBarCircleArrow.arrow(@ratio)
+    end
+    private :line
+
+    def scale
+      @line = 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
+    def draw(from, to, dc)
+      dc.with_pen(pen) do |dc|
+        bar_from, bar_to, bar_mid = translate_arrow(line, from, to)
+        dc.draw_line(bar_from, bar_to)
+        dc.draw_line(bar_mid, to.to_point)
+        to = bar_mid
+      end
+      super(from, to, dc)
+    end
+
+  end
+
+end

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

@@ -0,0 +1,49 @@
+# Wx::SF::CrossBarProngArrow - crossbar with prong arrow class
+# Copyright (c) M.J.N. Corino, The Netherlands
+
+require 'wx/shapes/arrows/prong_arrow'
+
+module Wx::SF
+
+  # Class extends the Wx::ProngArrow class and encapsulates
+  # arrow shape consisting of single two lines bisecting before the end of the
+  # parent line shape with a crossbar at the intersection point.
+  class CrossBarProngArrow < ProngArrow
+
+    class << self
+      def arrow(ratio)
+        x = ratio*6; y = ratio*6
+        [Wx::RealPoint.new(0,y), Wx::RealPoint.new(0, -y), Wx::RealPoint.new(0, 0)]
+      end
+    end
+
+    def line
+      @line ||= CrossBarProngArrow.arrow(@ratio)
+    end
+    private :line
+
+    def scale
+      @line = 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)
+      to = super
+      dc.with_pen(pen) do |dc|
+        bar_from, bar_to, bar_mid = translate_arrow(line, from, to)
+        dc.draw_line(bar_from, bar_to)
+        dc.draw_line(bar_mid, to.to_point)
+        to = bar_mid
+      end
+      to
+    end
+
+  end
+
+end

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

@@ -0,0 +1,46 @@
+# Wx::SF::CrossedCircleArrow - circle with cross 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 a crossed circle.
+  class CrossedCircleArrow < CircleArrow
+
+    class << self
+      def crossbar(radius)
+        [Wx::RealPoint.new(radius,radius), Wx::RealPoint.new(radius, -radius)]
+      end
+    end
+
+    def crossbar
+      @crossbar ||= CrossedCircleArrow.crossbar(radius)
+    end
+    private :crossbar
+
+    def scale
+      @crossbar = 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 = super
+      cb = translate_arrow(crossbar, from, to)
+      dc.with_pen(pen) do |dc|
+        dc.draw_line(cb[0], cb[1])
+        dc.draw_line(cp, to.to_point)
+      end
+      cp
+    end
+
+  end
+
+end

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

@@ -0,0 +1,65 @@
+# Wx::SF::SquareArrow - square arrow class
+# Copyright (c) M.J.N. Corino, The Netherlands
+
+require 'wx/shapes/arrows/line_arrow'
+
+module Wx::SF
+
+  # Class extends the Wx::SolidArrow class and encapsulates
+  # cup arrow shapes.
+  class CupArrow < LineArrow
+
+    # Default arc radius size
+    RADIUS = 7
+
+    class << self
+
+      def arrow(radius)
+        [Wx::RealPoint.new(0, radius), Wx::RealPoint.new(0, -radius), Wx::RealPoint.new(0, 0), Wx::RealPoint.new(radius, 0)]
+      end
+
+    end
+
+    # Constructor
+    # @param [Wx::SF::Shape] parent parent shape
+    def initialize(parent=nil)
+      super
+      scale
+    end
+
+    # Get the circle radius
+    def get_radius
+      (RADIUS * @ratio).to_i
+    end
+    alias :radius :get_radius
+
+    def coords
+      @coords ||= CupArrow.arrow(get_radius)
+    end
+    protected :coords
+
+    def scale
+      @coords = nil
+      @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
+    # @return [Wx::Point] translated connection point for arrow
+    def draw(from, to, dc)
+      rarrow = translate_arrow(coords, from, to)
+      cp = rarrow.pop
+      dc.with_pen(pen) do |dc|
+        dc.with_brush(Wx::TRANSPARENT_BRUSH) do |dc|
+          dc.draw_arc(*rarrow)
+        end
+      end
+      cp
+    end
+
+  end
+
+end

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

@@ -5,28 +5,23 @@ require 'wx/shapes/arrows/solid_arrow'
 
 module Wx::SF
 
+  # Class extends the Wx::SolidArrow class and encapsulates
+  # solid diamond arrow shapes.
   class DiamondArrow < SolidArrow
 
     class << self
 
-      def diamond_arrow
-        @diamond_arrow ||= [Wx::RealPoint.new(0,0), Wx::RealPoint.new(10,4), Wx::RealPoint.new(20,0), Wx::RealPoint.new(10,-4)]
+      def arrow(ratio)
+        x = ratio*10; y = ratio*5
+        [Wx::RealPoint.new(0,0), Wx::RealPoint.new(x, y), Wx::RealPoint.new(2*x,0), Wx::RealPoint.new(x,-y), Wx::RealPoint.new(2*x,0)]
       end
 
     end
 
-    # 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)
-      rarrow = translate_arrow(DiamondArrow.diamond_arrow, from, to)
-      dc.with_pen(@pen) do |dc|
-        dc.with_brush(@fill) do |dc|
-          dc.draw_polygon(rarrow)
-        end
-      end
+    def vertices
+      @vertices ||= DiamondArrow.arrow(@ratio)
     end
+    protected :vertices
 
   end
 

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

@@ -0,0 +1,27 @@
+# Wx::SF::DoubleCrossBarArrow - double crossbar arrow class
+# Copyright (c) M.J.N. Corino, The Netherlands
+
+require 'wx/shapes/arrows/cross_bar_arrow'
+
+module Wx::SF
+
+  # Class extends the Wx::CrossBarArrow class and encapsulates
+  # arrow shape consisting of double crossbar before the end of the
+  # parent line shape.
+  class DoubleCrossBarArrow < CrossBarArrow
+
+    class << self
+      def arrow(ratio)
+        x = ratio*7; y = ratio*6
+        [[Wx::RealPoint.new(2+x/2,y), Wx::RealPoint.new(2+x/2, -y)],[Wx::RealPoint.new(2+x,y), Wx::RealPoint.new(2+x, -y), Wx::RealPoint.new(2+x, 0)]]
+      end
+    end
+
+    def lines
+      @lines ||= DoubleCrossBarArrow.arrow(@ratio)
+    end
+    private :lines
+
+  end
+
+end

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

@@ -0,0 +1,60 @@
+# Wx::SF::FilledArrow - closed line drawn arrow class
+# Copyright (c) M.J.N. Corino, The Netherlands
+
+require 'wx/shapes/arrows/line_arrow'
+
+module Wx::SF
+
+  # Class extends the Wx::LineArrow class and encapsulates
+  # enclosed and filled arrow shapes.
+  class FilledArrow < LineArrow
+
+    module DEFAULT
+      class << self
+        def fill; @fill ||= Wx::WHITE_BRUSH.dup; end
+      end
+    end
+
+    property fill: :serialize_arrow_fill
+
+    # Constructor
+    # @param [Wx::SF::Shape] parent parent shape
+    def initialize(parent=nil)
+      super
+      @fill = DEFAULT.fill
+    end
+
+    # Get arrow fill brush
+    # @return [Wx::Brush]
+    def get_fill
+      @fill || (@diagram&.shape_canvas ? @diagram.shape_canvas.arrow_fill : DEFAULT.fill)
+    end
+    alias :fill :get_fill
+
+    # Set arrow fill brush
+    # @overload set_fill(brush)
+    #   @param [Wx::Brush] brush
+    # @overload set_fill(color, style=Wx::BrushStyle::BRUSHSTYLE_SOLID)
+    #   @param [Wx::Colour,Symbol,String] color brush color
+    #   @param [Wx::BrushStyle] style
+    # @overload set_fill(stipple_bitmap)
+    #   @param [Wx::Bitmap] stipple_bitmap
+    def set_fill(brush)
+      @fill = if args.size == 1 && Wx::Brush === args.first
+                args.first
+              else
+                Wx::Brush.new(*args)
+              end
+    end
+    alias :fill= :set_fill
+
+    # (de-)serialize only
+    def serialize_arrow_fill(*val)
+      @fill = val.first unless val.empty?
+      @fill
+    end
+    private :serialize_arrow_fill
+
+  end
+
+end

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

@@ -0,0 +1,67 @@
+# Wx::SF::LineArrow - line drawn arrow base class
+# Copyright (c) M.J.N. Corino, The Netherlands
+
+require 'wx/shapes/arrow_base'
+
+module Wx::SF
+
+  # Class extends the Wx::ArrowBase class and encapsulates
+  # line drawn arrow shapes.
+  # The shapes are automatically scaled based on the line width used.
+  class LineArrow < ArrowBase
+
+    property pen: :serialize_pen
+
+    # Constructor
+    # @param [Wx::SF::Shape] parent parent shape
+    def initialize(parent=nil)
+      super
+      @pen = nil
+    end
+
+    # Get arrow border pen
+    # @return [Wx::Pen,nil]
+    def get_pen
+      @pen || @parent_shape&.line_pen
+    end
+    alias :pen :get_pen
+
+    # Set arrow border pen (when nil restore the default).
+    # @param [Wx::Pen,nil] pen
+    def set_pen(pen)
+      @pen = pen
+      scale
+    end
+    alias :pen= :set_pen
+
+    # Return current pen width.
+    # @return [Integer]
+    def get_pen_width
+      get_pen&.width || 1
+    end
+    alias :pen_width :get_pen_width
+
+    # Set a parent of the arrow shape.
+    # @param [Wx::SF::Shape] parent parent shape
+    def set_parent_shape(parent)
+      super
+      scale
+    end
+    alias :parent_shape= :set_parent_shape
+
+    # Scale the arrow.
+    # Does nothing by default.
+    def scale
+      # noop
+    end
+    protected :scale
+
+    def serialize_pen(*arg)
+      @pen = arg.shift unless arg.empty?
+      @pen
+    end
+    private :serialize_pen
+
+  end
+
+end

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

@@ -1,54 +1,53 @@
 # Wx::SF::OpenArrow - open arrow class
 # Copyright (c) M.J.N. Corino, The Netherlands
 
-require 'wx/shapes/arrow_base'
+require 'wx/shapes/arrows/line_arrow'
 
 module Wx::SF
 
-  # Class extends the wxSFArrowBase class and encapsulates
+  # Class extends the Wx::LineArrow class and encapsulates
   # arrow shape consisting of single two lines leading from the end of the
   # parent line shape.
-  class OpenArrow < ArrowBase
+  class OpenArrow < LineArrow
 
     class << self
-      def open_arrow
-        @open_arrow ||= [Wx::RealPoint.new(0,0), Wx::RealPoint.new(10,4), Wx::RealPoint.new(10,-4)]
+      def arrow(ratio)
+        x = ratio*11; y = ratio*5
+        [Wx::RealPoint.new(0,0), Wx::RealPoint.new(x, y), Wx::RealPoint.new(x,-y), Wx::RealPoint.new(x, 0)]
       end
     end
 
-    property :arrow_pen
-
     # Constructor
     # @param [Wx::SF::Shape] parent parent shape
     def initialize(parent=nil)
-      super
-      @pen = DEFAULT::BORDER
+      super(parent)
+      scale
     end
 
-    # Get arrow border pen
-    # @return [Wx::Pen]
-    def get_arrow_pen
-      @pen
+    def vertices
+      @vertices ||= OpenArrow.arrow(@ratio)
     end
-    alias :arrow_pen :get_arrow_pen
+    private :vertices
 
-    # Set arrow border pen
-    # @param [Wx::Pen] pen
-    def set_arrow_pen(pen)
-      @pen = pen
+    def scale
+      @vertices = nil
+      @ratio = 1 + (pen_width / 2) * 0.5
     end
-    alias :arrow_pen= :set_arrow_pen
+    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)
-      rarrow = translate_arrow(OpenArrow.open_arrow, from, to)
-      dc.with_pen(@pen) do |dc|
-        dc.draw_line(rarrow[0], rarrow[1])
-        dc.draw_line(rarrow[0], rarrow[2])
+      tip, wing1, wing2, cp = translate_arrow(vertices, from, to)
+      dc.with_pen(pen) do |dc|
+        dc.draw_line(tip, wing1)
+        dc.draw_line(tip, wing2)
+        dc.draw_line(tip, cp)
       end
+      cp
     end
 
   end

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

@@ -0,0 +1,42 @@
+# Wx::SF::ProngArrow - prong arrow class
+# Copyright (c) M.J.N. Corino, The Netherlands
+
+require 'wx/shapes/arrows/open_arrow'
+
+module Wx::SF
+
+  # Class extends the Wx::OpenArrow class and encapsulates
+  # arrow shape consisting of single two lines bisecting before the end of the
+  # parent line shape.
+  class ProngArrow < OpenArrow
+
+    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 ||= ProngArrow.arrow(@ratio)
+    end
+    private :vertices
+
+    # 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
+      cp
+    end
+
+  end
+
+end

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

@@ -1,67 +1,53 @@
 # Wx::SF::SolidArrow - solid arrow class
 # Copyright (c) M.J.N. Corino, The Netherlands
 
-require 'wx/shapes/arrow_base'
+require 'wx/shapes/arrows/filled_arrow'
 
 module Wx::SF
 
-  class SolidArrow < ArrowBase
+  # Class extends the Wx::FilledArrow class and encapsulates
+  # solid arrow shapes.
+  class SolidArrow < FilledArrow
 
     class << self
-      def solid_arrow
-        @solid_arrow ||= [Wx::RealPoint.new(0,0), Wx::RealPoint.new(10,4), Wx::RealPoint.new(10,-4)]
+      def arrow(ratio)
+        x = ratio*11; y = ratio*5
+        [Wx::RealPoint.new(0,0), Wx::RealPoint.new(x, y), Wx::RealPoint.new(x,-y), Wx::RealPoint.new(x,0)]
       end
     end
 
-    property :arrow_fill, :arrow_pen
-
     # Constructor
     # @param [Wx::SF::Shape] parent parent shape
     def initialize(parent=nil)
       super
-      @fill = DEFAULT::FILL
-      @pen = DEFAULT::BORDER
-    end
-
-    # Get arrow fill brush
-    # @return [Wx::Brush]
-    def get_arrow_fill
-      @fill
-    end
-    alias :arrow_fill :get_arrow_fill
-    
-    # Set arrow fill brush
-    # @param [Wx::Brush] brush
-    def set_arrow_fill(brush)
-      @fill = brush
+      scale
     end
-    alias :arrow_fill= :set_arrow_fill
 
-    # Get arrow border pen
-    # @return [Wx::Pen]
-    def get_arrow_pen
-      @pen
+    def vertices
+      @vertices ||= SolidArrow.arrow(@ratio)
     end
-    alias :arrow_pen :get_arrow_pen
+    protected :vertices
 
-    # Set arrow border pen
-    # @param [Wx::Pen] pen
-    def set_arrow_pen(pen)
-      @pen = pen
+    def scale
+      @vertices = nil
+      @ratio = 1 + (pen_width / 2) * 0.5
     end
-    alias :arrow_pen= :set_arrow_pen
+    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)
-      rarrow = translate_arrow(SolidArrow.solid_arrow, from, to)
-      dc.with_pen(@pen) do |dc|
-        dc.with_brush(@fill) do |dc|
+      rarrow = translate_arrow(vertices, from, to)
+      cp = rarrow.pop # get connection point
+      dc.with_pen(pen) do |dc|
+        dc.with_brush(fill) do |dc|
           dc.draw_polygon(rarrow)
         end
       end
+      cp
     end
 
   end