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

data/lib/wx/shapes/shape_data_object.rb

@@ -4,9 +4,9 @@
 module Wx::SF
 
   # Class encapsulating data object used during clipboard operations with shapes.
-  class ShapeDataObject < Wx::DataObjectSimpleBase
+  class ShapeDataObject < Wx::DataObject
 
-    DataFormatID = 'ShapeFrameWorkDataFormat1_0'
+    DataFormatID = Wx::DataFormat.new('ShapeFrameWorkDataFormat1_0')
 
     # @overload initialize()
     #   Default constructor
@@ -14,30 +14,111 @@ module Wx::SF
     #   User constructor
     #   @param [Array<Wx::SF::Shape>] selection List of shapes which should be stored in the data object
     def initialize(selection = nil)
-      super(Wx::DataFormat.new(DataFormatID))
-      @data = selection ? selection.serialize : ''
+      unless selection.nil? || (selection.is_a?(Array) && selection.all? { |e| e.is_a?(Shape) })
+        raise SFException, 'Expected nil or Array<Wx::SF::Shape>'
+      end
+      super()
+      @shapes = selection
+      @data = nil
+      @format = DataFormatID.get_type
     end
 
-    # Returns size of the data object
-    # @return [Integer]
-    def _get_data_size
-      @data.bytesize
+    def get_as_text
+      if  @format == DataFormatID.get_type
+        @data ||= (@shapes ? @shapes.serialize(format: :yaml) : nil)
+      end
+      @data || ''
     end
 
-    # Exports data from data object.
-    # @return [Boolean] true on success, otherwise false
-    def _get_data
-      @data
+    def get_as_shapes
+      if @format == Wx::DataFormatId::DF_TEXT || @format == Wx::DataFormatId::DF_UNICODETEXT
+        @shapes ||= (@data && @data.size>0 ? FIRM.deserialize(@data, format: :yaml) : nil)
+      end
+      @shapes || []
     end
 
-    # Function should inport data from data object from given buffer.
-    # @param [String] buf External input data buffer
-    # @return [Boolean] true on success, otherwise false
-    def _set_data(buf)
-      @data = buf ? buf : ''
-      true
+    # List all the formats that we support. By default, the first is
+    # treated as the 'preferred' format; this can be overridden by
+    # providing a get_preferred format.
+    def get_all_formats(direction)
+      [ DataFormatID, Wx::DF_TEXT, Wx::DF_UNICODETEXT ]
     end
 
+    # Do setting the data
+    def set_data(format, the_data)
+      case format.get_type
+      when DataFormatID.get_type
+        @shapes = if the_data.size > 0
+                    begin
+                      FIRM.deserialize(the_data, format: :yaml)
+                    rescue Exception
+                      $stderr.puts "#{$!}\n#{$!.backtrace.join("\n")}"
+                      return false
+                    end
+                  else
+                    nil
+                  end
+        @data = nil
+        @format = format.get_type
+        true
+      when Wx::DataFormatId::DF_TEXT, Wx::DataFormatId::DF_UNICODETEXT
+        @data = the_data
+        @shapes = nil
+        @format = format.get_type
+        true
+      else
+        false
+      end
+    end
+
+    def get_data_size(format)
+      case format.get_type
+      when Wx::DataFormatId::DF_TEXT, Wx::DataFormatId::DF_UNICODETEXT
+        @data ? @data.size : 0
+      when DataFormatID.get_type
+        get_as_text.bytesize
+      else
+        0
+      end
+    end
+
+    # Do getting the data
+    def get_data_here(format)
+      case format.get_type
+      when Wx::DataFormatId::DF_TEXT, Wx::DataFormatId::DF_UNICODETEXT
+        @data
+      when DataFormatID.get_type
+        begin
+          get_as_text
+        rescue Exception
+          $stderr.puts "#{$!}\n#{$!.backtrace.join("\n")}"
+          nil
+        end
+      else
+        nil
+      end
+    end
+
+    # # Returns size of the data object
+    # # @return [Integer]
+    # def _get_data_size
+    #   @data.bytesize
+    # end
+    #
+    # # Exports data from data object.
+    # # @return [Boolean] true on success, otherwise false
+    # def _get_data
+    #   @data
+    # end
+    #
+    # # Function should inport data from data object from given buffer.
+    # # @param [String] buf External input data buffer
+    # # @return [Boolean] true on success, otherwise false
+    # def _set_data(buf)
+    #   @data = buf ? buf : ''
+    #   true
+    # end
+
   end
 
 end

data/lib/wx/shapes/shape_handle.rb

@@ -26,6 +26,16 @@ module Wx::SF
         UNDEF = self.new(11)
       end
 
+      class << self
+        def handle_brush
+          if ShapeCanvas.gc_enabled?
+            @gc_brush ||= Wx::Brush.new(Wx::Colour.new(0, 0, 0, 128))
+          else
+            @dc_brush ||= Wx::BLACK_BRUSH.dup
+          end
+        end
+      end
+
       # Constructor
       # @param [Wx::Shape] parent Parent shape
       # @param [TYPE] type Handle type
@@ -131,17 +141,14 @@ module Wx::SF
       # @param [Wx::DC] dc Device context where the handle will be drawn
       def draw_normal(dc)
         dc.with_pen(Wx::PLATFORM == 'WXGTK' ? Wx::TRANSPARENT_PEN : Wx::BLACK_PEN) do
-          if ShapeCanvas::gc_enabled?
-            dc.brush = Wx::Brush.new(Wx::Colour.new(0, 0, 0, 128))
-          else
-            dc.brush = Wx::BLACK_BRUSH
-            # dc.logical_function = Wx::RasterOperationMode::INVERT
-          end
+          dc.with_brush(Handle.handle_brush) do
+            # unless ShapeCanvas::gc_enabled?
+            #   dc.logical_function = Wx::RasterOperationMode::INVERT
+            # end
 
-          dc.draw_rectangle(handle_rect)
-          # dc.logical_function = Wx::RasterOperationMode::COPY
-
-          dc.brush = Wx::NULL_BRUSH
+            dc.draw_rectangle(handle_rect)
+            # dc.logical_function = Wx::RasterOperationMode::COPY
+          end
         end
       end
 
@@ -161,7 +168,7 @@ module Wx::SF
 
       # Set parent shape.
       # @param [Wx::Shape] parent parent shape to set
-      def parent_shape=(parent)
+      def set_parent_shape(parent)
         @parent_shape = parent
       end
 

data/lib/wx/shapes/shape_list.rb

@@ -2,13 +2,14 @@
 # Copyright (c) M.J.N. Corino, The Netherlands
 
 require 'wx/shapes/serializable'
+require 'set'
 
 module Wx::SF
 
   # This class implements an indexed container for unique, non-nil, shapes (no duplicates).
   class ShapeList
 
-    include Serializable
+    include FIRM::Serializable
     include ::Enumerable
 
     property :list
@@ -19,19 +20,15 @@ module Wx::SF
       if enum
         if enum.is_a?(ShapeList)
           @list = enum.instance_variable_get('@list').dup
-          @index = enum.instance_variable_get('@index').dup
         elsif enum.is_a?(::Enumerable)
-          @list = []
-          @index = {}
+          @list = ::Set.new
           enum.each { |elem| self << elem }
         else
-          @list = []
-          @index = {}
+          @list = ::Set.new
           self << enum
         end
       else
-        @list = []
-        @index = {}
+        @list = ::Set.new
       end
     end
 
@@ -42,17 +39,21 @@ module Wx::SF
     # @yieldparam [Shape] shape
     # @return [self]
     def each(&block)
-      @list.each(&block)
-      self
+      if block_given?
+        @list.each(&block)
+        self
+      else
+        @list.each
+      end
     end
 
     # Recursively collects shapes and returns collection.
     # @param [Array<Shape>] collection container to return collected shapes in
     def all(collection = [])
-      @list.inject(collection) { |list, shape| shape.instance_variable_get('@child_shapes').all(list << shape) }
+      @list.inject(collection.concat(@list.to_a)) { |list, shape| shape.instance_variable_get('@child_shapes').all(list) }
     end
 
-    # Returns true if the no shapes are contained, false otherwise.
+    # Returns true if no shapes are contained, false otherwise.
     # @return [Boolean]
     def empty?
       @list.empty?
@@ -62,97 +63,63 @@ module Wx::SF
     # @return [self]
     def clear
       @list.clear
-      @index.clear
       self
     end
 
     # Appends a new shape to the list if not yet in list.
+    # Does *not* perform a recursive check.
     # @param [Shape] shape shape to add
     # @return [self]
     def append(shape)
-      unless @index.has_key?(check_elem(shape).id)
+      unless @list.include?(check_elem(shape))
         @list << shape
-        @index[shape.id] = shape
       end
       self
     end
     alias :push :append
     alias :<< :append
 
-    # Removes the first shape from the list (if any) and returns that.
-    # @return [Shape,nil] removed shape or nil if list empty
-    def shift
-      return nil if @list.empty?
-      @index.delete(@list.shift.id)
-    end
-
-    # Removes the last shape from the list (if any) and returns that.
-    # @return [Shape,nil] removed shape or nil if list empty
-    def pop
-      return nil if @list.empty?
-      @index.delete(@list.pop.id)
-    end
-
-    # Removes a shape matching the key given from the list and returns that.
-    # @param [Shape,Serializable::ID] key shape or shape ID to match
+    # Removes the given shape from the list and returns that.
+    # @param [Shape] shape shape to match
     # @return [Shape,nil] removed shape or nil if none matched
-    def delete(key)
-      if key.is_a?(Shape)
-        return @list.delete(key) if @index.delete(key.id)
-      elsif key.is_a?(Serializable::ID)
-        return @list.delete(@index.delete(key)) if @index.has_key?(key)
+    def delete(shape)
+      if @list.include?(check_elem(shape))
+        @list.delete(shape)
+        shape
+      else
+        nil
       end
-      nil
     end
 
-    # Returns true if a shape matches the given key or false if no shape matches.
-    # @param [Shape,Serializable::ID] key shape or shape ID to match
+    # Returns true if the given shape is included in the list.
+    # Performs a recursive search in case :recursive is true.
+    # @param [Shape] shape shape to match
     # @param [Boolean] recursive pass true to search recursively, false for non-recursive
     # @return [Boolean]
-    def include?(key, recursive = false)
-      found = if key.is_a?(Serializable::ID)
-                @index.has_key?(key)
-              else
-                @list.include?(key)
-              end
-      found || (recursive && @list.any? { |child| child.instance_variable_get('@child_shapes').include?(key, recursive) })
-    end
-
-    # Returns the shape matching the given key or nil if no shape matches.
-    # Does not modify the list.
-    # @param [Integer,Serializable::ID] key shape list index or shape ID to match
-    # @param [Boolean] recursive pass true to search recursively, false for non-recursive
-    # @return [Shape,nil] matched shape or nil if none matched
-    def get(key, recursive = false)
-      shape = if key.is_a?(Serializable::ID)
-                @index[key]
-              else
-                @list.at(key.to_i)
-              end
-      shape || (recursive && @list.find { |child| child.get(key, recursive) })
+    def include?(shape, recursive = false)
+      found = @list.include?(check_elem(shape))
+      found || (recursive && @list.any? { |child| child.include_child_shape?(shape, recursive) })
     end
-    alias :[] :get
 
     private
 
-    # Get shape array. Serialization only.
-    # @return [Array<Shape>]
+    # Get shape set. Serialization only.
+    # @return [Set<Shape>]
     def get_list
       @list
     end
 
-    # Set shape array from deserialization.
-    # @param [Array<Shape>] list
+    # Set shape set from deserialization.
+    # @param [Set<Shape>] list
     def set_list(list)
       @list = list
-      @list.each { |shape| @index[shape.id] = shape }
     end
 
     # Check intended list item
     # @param [Shape] shape intended list item
     # @return [Shape] checked shape
     def check_elem(shape)
-      ::Kernel.raise TypeError, 'Expected a Wx::SF::Shape' unless shape.is_a?(Wx::SF::Shape)
+      ::Kernel.raise TypeError, "Expected a Wx::SF::Shape, got #{shape}" unless shape.is_a?(Wx::SF::Shape)
       shape
     end
 

data/lib/wx/shapes/shapes/bitmap_shape.rb

@@ -13,32 +13,22 @@ module Wx::SF
 
     property :can_scale, :bitmap
 
-    # @overload initialize()
-    #   Default constructor.
-    # @overload initialize(pos, bmp_path, diagram)
-    #   User constructor.
-    #   @param [Wx::RealPoint] pos Initial position
-    #   @param [String] bmp_path Bitmap path
-    #   @param [Wx::SF::Diagram] diagram parent diagram
-    def initialize(*args)
+    # Constructor.
+    # @param [Wx::RealPoint,Wx::Point] pos Initial position
+    # @param [String] bmp_path Bitmap path
+    # @param [Wx::SF::Diagram] diagram parent diagram
+    def initialize(pos = Shape::DEFAULT::POSITION, bmp_path = nil, diagram: nil)
+      super(pos, diagram: diagram)
       @bitmap = Wx::NULL_BITMAP
       @art_path = @art_section = nil
-      if args.empty?
-        super
-        @bitmap_path = nil
-        @original_bitmap = @bitmap = nil
-        @bitmap_type = nil
-      else
-        pos, bmp_path, diagram = args
-        super(pos, RectShape::DEFAULT::SIZE.dup, diagram)
-        create_from_file(bmp_path)
-      end
+      @bitmap_path = bmp_path
+      create_from_file(bmp_path) if bmp_path
       @rescale_in_progress = false
       @can_scale = true
     end
 
-	  # Get full name of a source BMP file.
-	  # @return [String] String containing full file name
+	  # Get full name of a source BMP file (if set).
+	  # @return [String,nil] String containing full file name
     def get_bitmap_path
       @bitmap_path
     end
@@ -80,7 +70,16 @@ module Wx::SF
           success = @bitmap.load_file(path, type ? type : Wx::BITMAP_TYPE_ANY)
           if success
             p = Pathname.new(art_path)
-            @art_path = p.relative? ? art_path : p.relative_path_from(Dir.getwd).to_s
+            if Wx::PLATFORM == 'WXMSW'
+              # take possibility of different drive into account
+              @art_path = if p.relative? || art_path[0] != Dir.getwd[0]
+                            art_path
+                          else
+                            p.relative_path_from(Dir.getwd).to_s
+                          end
+            else
+              @art_path = p.relative? ? art_path : p.relative_path_from(Dir.getwd).to_s
+            end
             @art_section = art_section
           end
         else
@@ -143,7 +142,7 @@ module Wx::SF
     def do_begin_handle
       if @can_scale
         @rescale_in_progress = true
-        @prev_pos = get_absolute_position
+        @prev_pos = get_absolute_position.dup
       end
     end
 
@@ -197,7 +196,7 @@ module Wx::SF
       _draw_bitmap(dc, get_absolute_position.to_point)
 
       dc.with_brush(Wx::TRANSPARENT_BRUSH) do
-        dc.with_pen(Wx::Pen.new(@hover_color, 1)) do
+        dc.with_pen(Wx::Pen.new(hover_colour, 1)) do
           dc.draw_rectangle(get_absolute_position.to_point, @rect_size.to_size)
         end
       end
@@ -210,7 +209,7 @@ module Wx::SF
       _draw_bitmap(dc, get_absolute_position.to_point)
 
       dc.with_brush(Wx::TRANSPARENT_BRUSH) do
-        dc.with_pen(Wx::Pen.new(@hover_color, 2)) do
+        dc.with_pen(Wx::Pen.new(hover_colour, 2)) do
           dc.draw_rectangle(get_absolute_position.to_point, @rect_size.to_size)
         end
       end