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

data/lib/wx/shapes/shapes/curve_shape.rb

@@ -9,26 +9,26 @@ module Wx::SF
   # user to create curved connection line.
   class CurveShape < LineShape
 
-    # @overload initialize()
-    #   default constructor
-    # @overload initialize(src, trg, path, manager)
-    #   @param [Wx::SF::Serializable::ID] src ID of the source shape
-    #   @param [Wx::SF::Serializable::ID] trg ID of the target shape
-    #   @param [Array<Wx::RealPoint>] path List of the line control points (can be empty)
+    # @overload initialize(src = DEFAULT::POINT, trg = DEFAULT::POINT, path: nil, manager: nil)
+    #   Constructor.
+    #   @param [Wx::RealPoint,Wx::Point] src starting line point
+    #   @param [Wx::RealPoint,Wx::Point] trg end line point
+    #   @param [Array<Wx::RealPoint>,nil] path List of the line control points (can be empty or nil)
     #   @param [Diagram] diagram containing diagram
-    # @overload initialize(src, trg, path, manager)
-    #   @param [Wx::RealPoint] src starting line point
-    #   @param [Wx::RealPoint] trg end line point
+    # @overload initialize(src, trg, path: nil, manager: nil)
+    #   Constructor for connecting two shapes.
+    #   @param [Shape] src source shape
+    #   @param [Shape] trg target shape
     #   @param [Array<Wx::RealPoint>,nil] path List of the line control points (can be empty or nil)
     #   @param [Diagram] diagram containing diagram
-    def initialize(*args)
+    def initialize(*args, **kwargs)
       super
     end
 
     # Get line's bounding box. The function can be overridden if necessary.
     # @return [Wx::Rect] Bounding rectangle
     def get_bounding_box
-      super.inflate(20, 20)
+      super.inflate(35, 35)
     end
 
     # Get a line point laying on the given line segment and shifted
@@ -58,17 +58,24 @@ module Wx::SF
         if !@lst_points.empty?
           (0..@lst_points.size).each do |i|
             a,b,c,d = get_segment_quaternion(i)
-            catmul_rom_kubika(a, b, c, d, dc)
+            if i == 0 && @src_arrow
+              src, trg = get_line_segment(i)
+              src = @src_arrow.draw(trg, src, dc)
+              a = b = src.to_real
+            end
+            if i == @lst_points.size && @trg_arrow
+              src, trg = get_line_segment(i)
+              trg = @trg_arrow.draw(src, trg, dc)
+              c = d = trg.to_real
+            end
+            catmul_rom_kubika(a, b, c, d, dc, at_end: i == @lst_points.size)
           end
         else
-          b,c = get_direct_line
-          dc.draw_line(b.to_point, c.to_point)
+          src, trg = get_direct_line.collect(&:to_point)
+          src = @src_arrow.draw(trg, src, dc) if @src_arrow
+          trg = @trg_arrow.draw(src, trg, dc) if @trg_arrow
+          dc.draw_line(src, trg)
         end
-        # draw target arrow
-        @trg_arrow.draw(b, c, dc) if @trg_arrow
-        b, c = get_line_segment(0)
-        # draw source arrow
-        @src_arrow.draw(c, b, dc) if @src_arrow
 
       when LINEMODE::UNDERCONSTRUCTION
         # draw basic line parts
@@ -83,17 +90,14 @@ module Wx::SF
         dc.with_pen(Wx::Pen.new(Wx::BLACK, 1, Wx::PenStyle::PENSTYLE_DOT)) do
           if @lst_points.size > 1
             dc.draw_line(c.to_point, @unfinished_point)
-          elsif @src_shape_id
+          elsif @src_shape
             # draw unfinished line segment if any (for interactive line creation)
             dc.with_pen(Wx::Pen.new(Wx::BLACK, 1, Wx::PenStyle::PENSTYLE_DOT)) do
-              src_shape = @diagram.find_shape(@src_shape_id)
-              if src_shape
-                if src_shape.get_connection_points.empty?
-                  dc.draw_line((src_shape.get_border_point(src_shape.get_center, @unfinished_point.to_real)).to_point,
-                               @unfinished_point)
-                else
-                  dc.draw_line(get_mod_src_point.to_point, @unfinished_point)
-                end
+              if @src_shape.get_connection_points.empty?
+                dc.draw_line((@src_shape.get_border_point(@src_shape.get_center, @unfinished_point.to_real)).to_point,
+                             @unfinished_point)
+              else
+                dc.draw_line(get_mod_src_point.to_point, @unfinished_point)
               end
             end
           end
@@ -141,7 +145,6 @@ module Wx::SF
     # @return [Array(Wx::RealPoint,Wx::RealPoint,Wx::RealPoint,Wx::RealPoint)]
     def get_segment_quaternion(segment)
       quart = [nil,nil,nil,nil]
-      # wxXS::RealPointList::compatibility_iterator node
       index = 2 - segment
 
       quart[index - 1] = get_src_point if (index - 1) >= 0
@@ -165,7 +168,7 @@ module Wx::SF
           elsif index == 3
             if @mode == LINEMODE::UNDERCONSTRUCTION
               quart[3] = @unfinished_point.to_real
-            elsif @trg_shape_id
+            elsif @trg_shape
               quart[3] = get_mod_trg_point
             end
           end
@@ -182,7 +185,7 @@ module Wx::SF
     # @param [Wx::RealPoint] c
     # @param [Wx::RealPoint] d
     # @param [Wx::DC] dc
-    def catmul_rom_kubika(a, b, c, d, dc)
+    def catmul_rom_kubika(a, b, c, d, dc, at_end: false)
       # the beginning of the curve is in the B point
       point0 = b
 
@@ -193,11 +196,15 @@ module Wx::SF
       t = 0.0
       while t <= (1 + (1.0 / optim_steps))
         point1 = coord_catmul_rom_kubika(a,b,c,d,t)
+        # make sure not to overshoot at the target/arrow connection point
+        point1 = c if at_end && point0.distance_to(point1) > point0.distance_to(c)
         dc.draw_line(point0.x.to_i, point0.y.to_i, point1.x.to_i, point1.y.to_i)
         point0 = point1
         t += 1.0 / (optim_steps-1)
       end
       point1 = coord_catmul_rom_kubika(a,b,c,d,1)
+      # make sure not to overshoot at the target/arrow connection point
+      point1 = c if at_end && point0.distance_to(point1) > point0.distance_to(c)
       dc.draw_line(point0.x.to_i, point0.y.to_i, point1.x.to_i, point1.y.to_i)
     end
 

data/lib/wx/shapes/shapes/diamond_shape.rb

@@ -7,28 +7,18 @@ module Wx::SF
 
   class DiamondShape < PolygonShape
 
-    class << self
-      def diamond
-        @diamond ||= [Wx::RealPoint.new(0,25), Wx::RealPoint.new(50,0), Wx::RealPoint.new(100, 25), Wx::RealPoint.new(50, 50)]
-      end
+    module DEFAULT
+      DIAMOND = [Wx::RealPoint.new(0,25), Wx::RealPoint.new(50,0), Wx::RealPoint.new(100, 25), Wx::RealPoint.new(50, 50)]
     end
 
     # do not serialize because the vertices are assigned fixed in ctor
     excludes :vertices
 
-    # @overload initialize()
-    #   Default constructor.
-    # @overload initialize(pos, size, diagram)
-    #   User constructor.
-    #   @param [Wx::RealPoint] pos Initial position
-    #   @param [Wx::SF::Diagram] diagram parent diagram
-    def initialize(*args)
-      if args.empty?
-        super
-        set_vertices(DiamondShape.diamond)
-      else
-        super(DiamondShape.diamond, *args)
-      end
+    # Constructor.
+    # @param [Wx::RealPoint,Wx::Point] pos Initial position
+    # @param [Wx::SF::Diagram] diagram parent diagram
+    def initialize(pos = Shape::DEFAULT::POSITION, diagram: nil)
+      super(pos, vertices: DEFAULT::DIAMOND, diagram: diagram)
     end
 
     # Test whether the given point is inside the shape. The function

data/lib/wx/shapes/shapes/edit_text_shape.rb

@@ -30,7 +30,7 @@ module Wx::SF
       set_insertion_point_end
       if @parent_shape
         # update the font size in accordance to the canvas scale
-        font = @parent_shape.get_font
+        font = @parent_shape.get_font.dup
         font.set_point_size((font.get_point_size * @parent_shape.get_parent_canvas.get_scale).to_i)
 
         set_font(font)
@@ -168,14 +168,11 @@ module Wx::SF
 
     property :force_multiline, :edit_type
 
-    # @overload initialize()
-    #   Default constructor.
-    # @overload initialize(pos, txt, diagram)
-    #   User constructor.
-    #   @param [Wx::RealPoint] pos Initial position
-    #   @param [String] txt Initial content
-    #   @param [Wx::SF::Diagram] diagram parent diagram
-    def initialize(*args)
+    # Constructor.
+    # @param [Wx::RealPoint,Wx::Point] pos Initial position
+    # @param [String] txt Text content
+    # @param [Wx::SF::Diagram] diagram parent diagram
+    def initialize(pos = Shape::DEFAULT::POSITION, txt = TextShape::DEFAULT::TEXT, diagram: nil)
       super
       @text_ctrl = nil
       @force_multiline = DEFAULT::FORCE_MULTILINE

data/lib/wx/shapes/shapes/ellipse_shape.rb

@@ -6,14 +6,11 @@ module Wx::SF
   # Class encapsulating the ellipse shape. It extends the basic rectangular shape.
   class EllipseShape < RectShape
 
-    # @overload initialize()
-    #   Default constructor.
-    # @overload initialize(pos, size, diagram)
-    #   User constructor.
-    #   @param [Wx::RealPoint] pos Initial position
-    #   @param [Wx::RealPoint] size Initial size
-    #   @param [Wx::SF::Diagram] diagram parent diagram
-    def initialize(*args)
+    # Constructor.
+    # @param [Wx::RealPoint,Wx::Point] pos Initial position
+    # @param [Wx::RealPoint,Wx::Size,Wx::Point] size Initial size
+    # @param [Wx::SF::Diagram] diagram parent diagram
+    def initialize(pos = Shape::DEFAULT::POSITION, size = RectShape::DEFAULT::SIZE, diagram: nil)
       super
     end
 
@@ -58,8 +55,8 @@ module Wx::SF
     # Draw the shape in the normal way. The function can be overridden if necessary.
     # @param [Wx::DC] dc Reference to device context where the shape will be drawn to
     def draw_normal(dc)
-      dc.with_pen(@border) do
-        dc.with_brush(@fill) do
+      dc.with_pen(border) do
+        dc.with_brush(fill) do
           dc.draw_ellipse(get_absolute_position.to_point, @rect_size.to_size)
         end
       end
@@ -69,8 +66,8 @@ module Wx::SF
     # The function can be overridden if necessary.
     # @param [Wx::DC] dc Reference to device context where the shape will be drawn to
     def draw_hover(dc)
-      dc.with_pen(Wx::Pen.new(@hover_color, 1)) do
-        dc.with_brush(@fill) do
+      dc.with_pen(Wx::Pen.new(hover_colour, 1)) do
+        dc.with_brush(fill) do
           dc.draw_ellipse(get_absolute_position.to_point, @rect_size.to_size)
         end
       end
@@ -81,8 +78,8 @@ module Wx::SF
     # The function can be overridden if necessary.
     # @param [Wx::DC] dc Reference to device context where the shape will be drawn to
     def draw_highlighted(dc)
-      dc.with_pen(Wx::Pen.new(@hover_color, 2)) do
-        dc.with_brush(@fill) do
+      dc.with_pen(Wx::Pen.new(hover_colour, 2)) do
+        dc.with_brush(fill) do
           dc.draw_ellipse(get_absolute_position.to_point, @rect_size.to_size)
         end
       end
@@ -91,7 +88,7 @@ module Wx::SF
     # Draw shadow under the shape. The function can be overridden if necessary.
     # @param [Wx::DC] dc Reference to device context where the shadow will be drawn to
     def draw_shadow(dc)
-      if @fill.style != Wx::BrushStyle::BRUSHSTYLE_TRANSPARENT
+      if fill.style != Wx::BrushStyle::BRUSHSTYLE_TRANSPARENT
         dc.with_pen(Wx::TRANSPARENT_PEN) do
           dc.with_brush(get_parent_canvas.get_shadow_fill) do
             dc.draw_ellipse((get_absolute_position + get_parent_canvas.get_shadow_offset).to_point,

data/lib/wx/shapes/shapes/flex_grid_shape.rb

@@ -11,38 +11,59 @@ module Wx::SF
   class FlexGridShape < GridShape
 
 
-    # @overload initialize()
-    #   Default constructor.
-    # @overload initialize(pos, size, rows, cols, cell_space, diagram)
-    #   User constructor.
-    #   @param [Wx::RealPoint] pos Initial position
-    #   @param [Wx::RealPoint] size Initial size
-    #   @param [Integer] cols Number of grid rows
-    #   @param [Integer] rows Number of grid columns
-    #   @param [Integer] cell_space Additional space between managed shapes
-    #   @param [Wx::SF::Diagram] diagram parent diagram
-    def initialize(*args)
+    # Constructor.
+    # @param [Wx::RealPoint,Wx::Point] pos Initial position
+    # @param [Wx::RealPoint,Wx::Size,Wx::Point] size Initial size
+    # @param [Integer] cols Number of grid columns
+    # @param [Integer] max_rows Maximum number of grid rows
+    # @param [Integer] cell_space Additional space between managed shapes
+    # @param [Wx::SF::Diagram] diagram parent diagram
+    def initialize(pos = Shape::DEFAULT::POSITION, size = RectShape::DEFAULT::SIZE,
+                   cols: DEFAULT::COLUMNS, max_rows: 0, cell_space: DEFAULT::CELLSPACE, diagram: nil)
       super
     end
 
+    protected
+
     # Do layout of assigned child shapes
     def do_children_layout
       return if @cols == 0 || @rows == 0
 
+      # get maximum size of all managed (child) shapes per row and column
+      row_sizes, col_sizes = get_max_child_sizes
+      total_x = total_y = 0
+
+      # put managed shapes to appropriate positions
+      @cells.each_with_index do |shape, i|
+        col = (i % @cols)
+        row = (i / @cols)
+        if col == 0
+          total_x = 0
+          total_y += row_sizes[row-1] if row > 0
+        else
+          total_x += col_sizes[col-1]
+        end
+
+        if shape
+          fit_shape_to_rect(shape,
+                            Wx::Rect.new(total_x + (col+1)*@cell_space,
+                                         total_y + (row+1)*@cell_space,
+                                         col_sizes[col], row_sizes[row]))
+        end
+      end
+    end
+
+    def get_max_child_sizes
       # initialize size arrays
       row_sizes = ::Array.new(@rows, 0)
       col_sizes = ::Array.new(@cols, 0)
 
-      # prepare a storage for processed shapes pointers
-      grid_shapes = ::Array.new(@cells.size)
-
       # get maximum size of all managed (child) shapes per row and column
-      @cells.each_with_index do |id, i|
-        if id
+      @cells.each_with_index do |shape, i|
+        if shape
           col = (i % @cols)
           row = (i / @cols)
 
-          grid_shapes[i] = shape = @child_shapes[id]
           curr_rect = shape.get_bounding_box
 
           # update maximum rows and columns sizes
@@ -50,26 +71,30 @@ module Wx::SF
           row_sizes[row] = curr_rect.height if (shape.get_v_align != VALIGN::EXPAND) && (curr_rect.height > row_sizes[row])
         end
       end
+      [row_sizes, col_sizes]
+    end
 
-      total_x = total_y = 0
+    def find_cell(child_rect)
+      # get maximum size of all managed (child) shapes per row and column
+      row_sizes, col_sizes = get_max_child_sizes
 
-      # put managed shapes to appropriate positions
-      grid_shapes.each_with_index do |shape, i|
-        if shape
-          col = (i % @cols)
-          row = (i / @cols)
-          if col == 0
-            total_x = 0
-            total_y += row_sizes[row-1] if row > 0
-          else
-            total_x += col_sizes[col-1]
-          end
+      total_x = total_y = 0
 
-          fit_shape_to_rect(shape,
-                            Wx::Rect.new(total_x + (col+1)*@cell_space,
-                                         total_y + (row+1)*@cell_space,
-                                         col_sizes[col], row_sizes[row]))
+      # find the cell index where the new or dragged child is positioned above and in front of
+      offset = get_bounding_box.top_left
+      cell_count.times.find do |cell|
+        col = (cell % @cols)
+        row = (cell / @cols)
+        if col == 0
+          total_x = 0
+          total_y += row_sizes[row-1] if row > 0
+        else
+          total_x += col_sizes[col-1]
         end
+        cell_rct = Wx::Rect.new(total_x + (col+1)*@cell_space,
+                                total_y + (row+1)*@cell_space,
+                                col_sizes[col], row_sizes[row]).offset!(offset)
+        child_rect.right <= cell_rct.right && child_rect.bottom <= cell_rct.bottom
       end
     end