wxruby3 0.9.2-x64-mingw-ucrt → 0.9.3-x64-mingw-ucrt

data/samples/drawing/bitmap_image.rb

@@ -11,97 +11,101 @@
 
 require 'wx'
 
-# Bitmap sample (rewritten by Chauk-Mean Proum)
-
-# This sample demonstrates how to draw the same image in various forms
-# (original, mirrored, greyscaled and blurred).
-# 
-# This sample uses :
-# - Wx::Image, which allows a wide range of manipulations such as rescaling
-# and writing to files.
-# - Wx::Bitmap, which is a platform-specific representation of an image.
-
-# This is the class that must be used to actually display an image.
-class ImageFrame < Wx::Frame
-  def initialize
-    super(nil, :title => 'Simple image demo', :size => [600, 600])
-
-    # Create the various images from the bitmap file
-    img_file = File.join( File.dirname(__FILE__), 'ruby-logo.jpg')
-    @image = Wx::Image.new(img_file)
-    @mirrored_image = Wx::Image.new(img_file).mirror
-    # load from Ruby IO (File)
-    @greyscaled_image = Wx::Image.new
-    File.open(img_file) { |f| @greyscaled_image.load_stream(f) }
-    @greyscaled_image = @greyscaled_image.convert_to_greyscale
-    # load from Ruby IO-like (at least #read) object
-    klass = Class.new do
-      def initialize(io)
-        @io = io
-      end
-      def read(size)
-        @io.read(size)
+module BitmapImage
+
+  # Bitmap sample (rewritten by Chauk-Mean Proum)
+
+  # This sample demonstrates how to draw the same image in various forms
+  # (original, mirrored, greyscaled and blurred).
+  #
+  # This sample uses :
+  # - Wx::Image, which allows a wide range of manipulations such as rescaling
+  # and writing to files.
+  # - Wx::Bitmap, which is a platform-specific representation of an image.
+
+  # This is the class that must be used to actually display an image.
+  class ImageFrame < Wx::Frame
+    def initialize
+      super(nil, :title => 'Simple image demo', :size => [600, 600])
+
+      # Create the various images from the bitmap file
+      img_file = File.join( File.dirname(__FILE__), 'ruby-logo.jpg')
+      @image = Wx::Image.new(img_file)
+      @mirrored_image = Wx::Image.new(img_file).mirror
+      # load from Ruby IO (File)
+      @greyscaled_image = Wx::Image.new
+      File.open(img_file) { |f| @greyscaled_image.load_stream(f) }
+      @greyscaled_image = @greyscaled_image.convert_to_greyscale
+      # load from Ruby IO-like (at least #read) object
+      klass = Class.new do
+        def initialize(io)
+          @io = io
+        end
+        def read(size)
+          @io.read(size)
+        end
       end
-    end
-    @blurred_image = Wx::Image.new
-    @blurred_image.load_stream(klass.new(File.open(img_file)), 'image/jpeg')
-    @blurred_image = @blurred_image.blur(15)
-
-    # Create the corresponding bitmaps
-    compute_bitmaps
+      @blurred_image = Wx::Image.new
+      @blurred_image.load_stream(klass.new(File.open(img_file)), 'image/jpeg')
+      @blurred_image = @blurred_image.blur(15)
 
-    # Set up event handling
-    evt_size :on_size
-    evt_idle :on_idle
-    evt_paint :on_paint
-  end
+      # Create the corresponding bitmaps
+      compute_bitmaps
 
-  # Create a bitmap for the specified image and size
-  def compute_bitmap image, width, height
-    rescaled_image = image.copy.rescale(width, height)
-    rescaled_image.to_bitmap
-  end
+      # Set up event handling
+      evt_size :on_size
+      evt_idle :on_idle
+      evt_paint :on_paint
+    end
 
-  # Create the bitmaps corresponding to the images and with half the size of the frame
-  def compute_bitmaps
-    width = client_size.width / 2
-    height = client_size.height / 2
-    @bitmap1 = compute_bitmap(@image, width, height)
-    @bitmap2 = compute_bitmap(@mirrored_image, width, height)
-    @bitmap3 = compute_bitmap(@greyscaled_image, width, height)
-    @bitmap4 = compute_bitmap(@blurred_image, width, height)
-    @done = true
-  end
+    # Create a bitmap for the specified image and size
+    def compute_bitmap image, width, height
+      rescaled_image = image.copy.rescale(width, height)
+      rescaled_image.to_bitmap
+    end
 
-  # Note to recompute the bitmaps on a resize
-  def on_size(event)
-    @done = false
-    event.skip
-  end
+    # Create the bitmaps corresponding to the images and with half the size of the frame
+    def compute_bitmaps
+      width = client_size.width / 2
+      height = client_size.height / 2
+      @bitmap1 = compute_bitmap(@image, width, height)
+      @bitmap2 = compute_bitmap(@mirrored_image, width, height)
+      @bitmap3 = compute_bitmap(@greyscaled_image, width, height)
+      @bitmap4 = compute_bitmap(@blurred_image, width, height)
+      @done = true
+    end
 
-  # Recompute the bitmaps if needed, then do a refresh
-  def on_idle
-    if not @done
-      compute_bitmaps
-      refresh
+    # Note to recompute the bitmaps on a resize
+    def on_size(event)
+      @done = false
+      event.skip
     end
-  end
 
-  # Paint the frame with the bitmaps
-  def on_paint
-    paint do | dc |
-
-      if @done
-        width = client_size.width / 2
-        height = client_size.height / 2
-        dc.draw_bitmap(@bitmap1, 0, 0, false)
-        dc.draw_bitmap(@bitmap2, width, 0, false)
-        dc.draw_bitmap(@bitmap3, 0, height, false)
-        dc.draw_bitmap(@bitmap4, width, height, false)
+    # Recompute the bitmaps if needed, then do a refresh
+    def on_idle
+      if not @done
+        compute_bitmaps
+        refresh
       end
+    end
+
+    # Paint the frame with the bitmaps
+    def on_paint
+      paint do | dc |
+
+        if @done
+          width = client_size.width / 2
+          height = client_size.height / 2
+          dc.draw_bitmap(@bitmap1, 0, 0, false)
+          dc.draw_bitmap(@bitmap2, width, 0, false)
+          dc.draw_bitmap(@bitmap3, 0, height, false)
+          dc.draw_bitmap(@bitmap4, width, height, false)
+        end
 
+      end
     end
   end
+
 end
 
 module BitmapImageSample
@@ -122,7 +126,7 @@ module BitmapImageSample
   end
 
   def self.activate
-    frame = ImageFrame.new
+    frame = BitmapImage::ImageFrame.new
     frame.show
     frame
   end

data/samples/drawing/graphics_drawing.rb

@@ -11,236 +11,240 @@
 
 require 'wx'
 
-class GfxInfo
-  attr_accessor :font, :w, :h, :x, :y, :x_axis, :y_axis, :txt, :rotation
-  def initialize
-    @font = nil
-    @w = 0
-    @h = 0
-    @x = 0
-    @y = 0
-    @x_axis = 0
-    @y_axis = 0
-    @txt = ""
-    @rotation = 0
-  end
-  
-  def move(max_x,max_y,max_sp)
-    @x += @x_axis
-    @y += @y_axis
-    if @x <= 0
-      @x_axis = rand(max_sp)
+module GraphicsDrawing
+
+  class GfxInfo
+    attr_accessor :font, :w, :h, :x, :y, :x_axis, :y_axis, :txt, :rotation
+    def initialize
+      @font = nil
+      @w = 0
+      @h = 0
       @x = 0
-    elsif (@x+@w) >= max_x
-      @x_axis = (rand(max_sp)*-1)
-      @x = max_x - @w
-    end
-    if @y <= 0
-      @y_axis = rand(max_sp)
       @y = 0
-    elsif (@y+@h) >= max_y
-      @y_axis = (rand(max_sp)*-1)
-      @y = max_y - @h
-    end
-  end
-  
-  def rotate(run)
-    @rotation += run
-    if @rotation > 360
+      @x_axis = 0
+      @y_axis = 0
+      @txt = ""
       @rotation = 0
     end
-  end
-  
-  def draw(gdc)
-    gdc.set_font(font)
-    gdc.draw_text(txt,x,y,rotation)
-  end
-  
-  def [](symbol)
-    self.__send__(symbol,*[])
-  end
-  
-  def []=(symbol,val)
-    self.__send__((symbol.to_s + "=").to_sym,*[val])
-  end
-end
 
+    def move(max_x,max_y,max_sp)
+      @x += @x_axis
+      @y += @y_axis
+      if @x <= 0
+        @x_axis = rand(max_sp)
+        @x = 0
+      elsif (@x+@w) >= max_x
+        @x_axis = (rand(max_sp)*-1)
+        @x = max_x - @w
+      end
+      if @y <= 0
+        @y_axis = rand(max_sp)
+        @y = 0
+      elsif (@y+@h) >= max_y
+        @y_axis = (rand(max_sp)*-1)
+        @y = max_y - @h
+      end
+    end
 
-class GraphicsWindow < Wx::Window
-  # Create Needed Brushes and Pens
-  RED_BRUSH = Wx::Brush.new
-  GREEN_BRUSH = Wx::Brush.new
-  BLUE_BRUSH = Wx::Brush.new
-  RED_PEN = Wx::Pen.new
-  GREEN_PEN = Wx::Pen.new
-  BLUE_PEN = Wx::Pen.new
-  
-  # Instance Methods to keep track of toggle for corner, rect, and counter for frames per second
-  attr_accessor :corner, :rect, :fps
-  
-  def initialize(parent)
-    super(parent)
-    # Create the font we'll use to create our pre-defined fonts for the painting
-    @font = Wx::Font.new(32,
-                         Wx::FONTFAMILY_TELETYPE,
-                         Wx::FONTSTYLE_NORMAL,
-                         Wx::FONTWEIGHT_NORMAL)
-    # Setup the actual data to be stored in Brushes and Pens
-    RED_BRUSH.set_colour(Wx::RED)
-    RED_PEN.set_colour(Wx::RED)
-    GREEN_BRUSH.set_colour(Wx::GREEN)
-    GREEN_PEN.set_colour(Wx::GREEN)
-    BLUE_BRUSH.set_colour(Wx::BLUE)
-    BLUE_PEN.set_colour(Wx::BLUE)
-    # Create our Animation Timer
-    @timer = Wx::Timer.new(self,1000)
-    @fps = 0
-    # Set it to run every 25 milliseconds, you can set this value higher, to get
-    # higher frame rates, however, it may cause non-responsiveness of normal
-    # gui controls.
-    @timer.start(25)
-    # Setup the event Handler to do the drawing on this window.
-    evt_paint :on_paint
-    evt_timer 1000, :animate
-    set_background_style(Wx::BG_STYLE_PAINT)
-  end
-  
-  def create_resources(gdc)
-    # Create our Resource Class for holding the Text to be displayed
-    @rtxt = GfxInfo.new
-    @gtxt = GfxInfo.new
-    @btxt = GfxInfo.new
-    # Store our fonts, and strings into the classes
-    @rtxt[:font] = gdc.create_font(@font,Wx::RED); @rtxt[:txt] = "This is a red string"
-    @gtxt[:font] = gdc.create_font(@font,Wx::GREEN); @gtxt[:txt] = "This is a green string"
-    @btxt[:font] = gdc.create_font(@font,Wx::BLUE); @btxt[:txt] = "This is a blue string"
-    # Create the GraphicsContext resources.
-    @rbrush = gdc.create_brush(RED_BRUSH)
-    @gbrush = gdc.create_brush(GREEN_BRUSH)
-    @bbrush = gdc.create_brush(BLUE_BRUSH)
-    @rpen = gdc.create_pen(RED_PEN)
-    @gpen = gdc.create_pen(GREEN_PEN)
-    @bpen = gdc.create_pen(BLUE_PEN)
-  end
-  
-  def get_extents(gdc)
-    # Since we need a GDC and the text to get the extents, we do this in a
-    # separate method, though we should be able to do it with create_resources
-    width,height,*garbage = gdc.get_text_extent(@rtxt[:txt])
-    @rtxt[:w] = width.to_i; @rtxt[:h] = height.to_i
-    width,height,*garbage = gdc.get_text_extent(@gtxt[:txt])
-    @gtxt[:w] = width.to_i; @gtxt[:h] = height.to_i
-    width,height,*garbage = gdc.get_text_extent(@btxt[:txt])
-    @btxt[:w] = width.to_i; @btxt[:h] = height.to_i
-  end
-  
-  def setup_positions
-    # Setup our initial positions for drawing.
-    @rtxt[:x] = @rtxt[:y] = 0
-    size = self.get_client_size
-    pos_x = (size.width / 2) #- (@gtxt[:w] / 2)
-    pos_y = (size.height / 2) #- (@gtxt[:h] / 2)
-    @gtxt[:x] = pos_x
-    @gtxt[:y] = pos_y
-    @btxt[:x] = (size.width - @btxt[:w])
-    @btxt[:y] = (size.height - @btxt[:h])
-  end
-  
-  def animate
-    # This routine manily animates the Text, which is also is handled by the
-    # GfxInfo class as well.  Mainly in #rotate and #move.
-    rect = self.get_client_size
-    @rtxt.move(rect.width,rect.height,8) unless @rtxt.nil?
-    @gtxt.rotate(-0.01) unless @gtxt.nil?
-    @btxt.move(rect.width,rect.height,5) unless @btxt.nil?
-    # We're now ready to draw our stuff to the window
-    refresh
+    def rotate(run)
+      @rotation += run
+      if @rotation > 360
+        @rotation = 0
+      end
+    end
+
+    def draw(gdc)
+      gdc.set_font(font)
+      gdc.draw_text(txt,x,y,rotation)
+    end
+
+    def [](symbol)
+      self.__send__(symbol,*[])
+    end
+
+    def []=(symbol,val)
+      self.__send__((symbol.to_s + "=").to_sym,*[val])
+    end
   end
-  
-  def on_paint
-    # We do our drawing now
-    rect = self.get_client_size
-    paint_buffered do |paint_dc|
-      Wx::GCDC.draw_on(paint_dc) do |gcdc|
-        gdc = gcdc.get_graphics_context
-        unless @rtxt
-          create_resources(gdc)
-        end
 
-        gcdc.clear
 
-        unless @rtxt[:w] != 0
-          gdc.set_font(@rtxt[:font])
-          get_extents(gdc)
-          setup_positions
-        end
-        @rtxt.draw(gdc)
-        @gtxt.draw(gdc)
-        @btxt.draw(gdc)
-        # Draw our rectangles, if they are checked
-        15.times do
-          pen = gdc.create_pen(Wx::Pen.new(Wx::Colour.new(rand(256),rand(256),rand(256),rand(256))))
-          if @corner.is_checked
-            x = rand(rect.width)
-            y = rand(rect.height)
-            gdc.set_pen(pen)
-            gdc.draw_rectangle(x,y,x,1)
-            gdc.draw_rectangle(x,y,1,y)
+  class GraphicsWindow < Wx::Window
+    # Create Needed Brushes and Pens
+    RED_BRUSH = Wx::Brush.new
+    GREEN_BRUSH = Wx::Brush.new
+    BLUE_BRUSH = Wx::Brush.new
+    RED_PEN = Wx::Pen.new
+    GREEN_PEN = Wx::Pen.new
+    BLUE_PEN = Wx::Pen.new
+
+    # Instance Methods to keep track of toggle for corner, rect, and counter for frames per second
+    attr_accessor :corner, :rect, :fps
+
+    def initialize(parent)
+      super(parent)
+      # Create the font we'll use to create our pre-defined fonts for the painting
+      @font = Wx::Font.new(32,
+                           Wx::FONTFAMILY_TELETYPE,
+                           Wx::FONTSTYLE_NORMAL,
+                           Wx::FONTWEIGHT_NORMAL)
+      # Setup the actual data to be stored in Brushes and Pens
+      RED_BRUSH.set_colour(Wx::RED)
+      RED_PEN.set_colour(Wx::RED)
+      GREEN_BRUSH.set_colour(Wx::GREEN)
+      GREEN_PEN.set_colour(Wx::GREEN)
+      BLUE_BRUSH.set_colour(Wx::BLUE)
+      BLUE_PEN.set_colour(Wx::BLUE)
+      # Create our Animation Timer
+      @timer = Wx::Timer.new(self,1000)
+      @fps = 0
+      # Set it to run every 25 milliseconds, you can set this value higher, to get
+      # higher frame rates, however, it may cause non-responsiveness of normal
+      # gui controls.
+      @timer.start(25)
+      # Setup the event Handler to do the drawing on this window.
+      evt_paint :on_paint
+      evt_timer 1000, :animate
+      set_background_style(Wx::BG_STYLE_PAINT)
+    end
+
+    def create_resources(gdc)
+      # Create our Resource Class for holding the Text to be displayed
+      @rtxt = GfxInfo.new
+      @gtxt = GfxInfo.new
+      @btxt = GfxInfo.new
+      # Store our fonts, and strings into the classes
+      @rtxt[:font] = gdc.create_font(@font,Wx::RED); @rtxt[:txt] = "This is a red string"
+      @gtxt[:font] = gdc.create_font(@font,Wx::GREEN); @gtxt[:txt] = "This is a green string"
+      @btxt[:font] = gdc.create_font(@font,Wx::BLUE); @btxt[:txt] = "This is a blue string"
+      # Create the GraphicsContext resources.
+      @rbrush = gdc.create_brush(RED_BRUSH)
+      @gbrush = gdc.create_brush(GREEN_BRUSH)
+      @bbrush = gdc.create_brush(BLUE_BRUSH)
+      @rpen = gdc.create_pen(RED_PEN)
+      @gpen = gdc.create_pen(GREEN_PEN)
+      @bpen = gdc.create_pen(BLUE_PEN)
+    end
+
+    def get_extents(gdc)
+      # Since we need a GDC and the text to get the extents, we do this in a
+      # separate method, though we should be able to do it with create_resources
+      width,height,*garbage = gdc.get_text_extent(@rtxt[:txt])
+      @rtxt[:w] = width.to_i; @rtxt[:h] = height.to_i
+      width,height,*garbage = gdc.get_text_extent(@gtxt[:txt])
+      @gtxt[:w] = width.to_i; @gtxt[:h] = height.to_i
+      width,height,*garbage = gdc.get_text_extent(@btxt[:txt])
+      @btxt[:w] = width.to_i; @btxt[:h] = height.to_i
+    end
+
+    def setup_positions
+      # Setup our initial positions for drawing.
+      @rtxt[:x] = @rtxt[:y] = 0
+      size = self.get_client_size
+      pos_x = (size.width / 2) #- (@gtxt[:w] / 2)
+      pos_y = (size.height / 2) #- (@gtxt[:h] / 2)
+      @gtxt[:x] = pos_x
+      @gtxt[:y] = pos_y
+      @btxt[:x] = (size.width - @btxt[:w])
+      @btxt[:y] = (size.height - @btxt[:h])
+    end
+
+    def animate
+      # This routine manily animates the Text, which is also is handled by the
+      # GfxInfo class as well.  Mainly in #rotate and #move.
+      rect = self.get_client_size
+      @rtxt.move(rect.width,rect.height,8) unless @rtxt.nil?
+      @gtxt.rotate(-0.01) unless @gtxt.nil?
+      @btxt.move(rect.width,rect.height,5) unless @btxt.nil?
+      # We're now ready to draw our stuff to the window
+      refresh
+    end
+
+    def on_paint
+      # We do our drawing now
+      rect = self.get_client_size
+      paint_buffered do |paint_dc|
+        Wx::GCDC.draw_on(paint_dc) do |gcdc|
+          gdc = gcdc.get_graphics_context
+          unless @rtxt
+            create_resources(gdc)
+          end
+
+          gcdc.clear
+
+          unless @rtxt[:w] != 0
+            gdc.set_font(@rtxt[:font])
+            get_extents(gdc)
+            setup_positions
           end
-          if @rect.is_checked
-            x = rand(rect.width)
-            y = rand(rect.height)
-            w = rand(rect.width)
-            h = rand(rect.height)
-            w + x > rect.width ? (w -= x; w -= rand(150)) : 0
-            h + y > rect.height ? (h -= y; h -= rand(150)) : 0
-            gdc.set_pen(pen)
-            gdc.draw_rectangle(x,y,w,h)
+          @rtxt.draw(gdc)
+          @gtxt.draw(gdc)
+          @btxt.draw(gdc)
+          # Draw our rectangles, if they are checked
+          15.times do
+            pen = gdc.create_pen(Wx::Pen.new(Wx::Colour.new(rand(256),rand(256),rand(256),rand(256))))
+            if @corner.is_checked
+              x = rand(rect.width)
+              y = rand(rect.height)
+              gdc.set_pen(pen)
+              gdc.draw_rectangle(x,y,x,1)
+              gdc.draw_rectangle(x,y,1,y)
+            end
+            if @rect.is_checked
+              x = rand(rect.width)
+              y = rand(rect.height)
+              w = rand(rect.width)
+              h = rand(rect.height)
+              w + x > rect.width ? (w -= x; w -= rand(150)) : 0
+              h + y > rect.height ? (h -= y; h -= rand(150)) : 0
+              gdc.set_pen(pen)
+              gdc.draw_rectangle(x,y,w,h)
+            end
           end
         end
       end
+      @fps += 1
     end
-    @fps += 1
   end
-end
 
-class GraphicsFrame < Wx::Frame
-  def initialize
-    super(nil, title: "Graphics Context example", size: [500,400])
+  class GraphicsFrame < Wx::Frame
+    def initialize
+      super(nil, title: "Graphics Context example", size: [500,400])
 
-    @win = GraphicsWindow.new(self)
+      @win = GraphicsWindow.new(self)
 
-    create_status_bar(3)
-    status_bar.set_status_text("Frames per sec: 0", 0)
-    @win.rect = Wx::CheckBox.new(status_bar,:label=>"Draw Rectangles")
-    @win.corner = Wx::CheckBox.new(status_bar,:label=>"Draw Corners")
+      create_status_bar(3)
+      status_bar.set_status_text("Frames per sec: 0", 0)
+      @win.rect = Wx::CheckBox.new(status_bar,:label=>"Draw Rectangles")
+      @win.corner = Wx::CheckBox.new(status_bar,:label=>"Draw Corners")
 
-    @fps_timer = Wx::Timer.every(1000) { fps_display }
+      @fps_timer = Wx::Timer.every(1000) { fps_display }
 
-    evt_size :on_size
-    evt_close { |evt| @fps_timer.stop; evt.skip }
+      evt_size :on_size
+      evt_close { |evt| @fps_timer.stop; evt.skip }
 
-    centre
-  end
+      centre
+    end
 
 
-  # Place the two control checkboxes within the StatusBar
-  def on_size
-    cli_rect = self.client_rect
-    @win.size = [cli_rect.width, cli_rect.height]
-    rect = status_bar.field_rect(1)
-    @win.rect.move [ rect.x + 2, rect.y + 2]
-    @win.rect.size = [ rect.width - 4, rect.height - 4 ]
+    # Place the two control checkboxes within the StatusBar
+    def on_size
+      cli_rect = self.client_rect
+      @win.size = [cli_rect.width, cli_rect.height]
+      rect = status_bar.field_rect(1)
+      @win.rect.move [ rect.x + 2, rect.y + 2]
+      @win.rect.size = [ rect.width - 4, rect.height - 4 ]
 
-    rect = status_bar.field_rect(2)
-    @win.corner.move [ rect.x + 2, rect.y + 2]
-    @win.corner.size = [ rect.width - 4, rect.height - 4 ]
-  end
+      rect = status_bar.field_rect(2)
+      @win.corner.move [ rect.x + 2, rect.y + 2]
+      @win.corner.size = [ rect.width - 4, rect.height - 4 ]
+    end
 
-  def fps_display
-    get_status_bar.set_status_text("Frames per sec: #{@win.fps}", 0)
-    @win.fps = 0
+    def fps_display
+      get_status_bar.set_status_text("Frames per sec: #{@win.fps}", 0)
+      @win.fps = 0
+    end
   end
+
 end
 
 module GraphicsSample
@@ -254,7 +258,7 @@ module GraphicsSample
   end
 
   def self.activate
-    frame = GraphicsFrame.new
+    frame = GraphicsDrawing::GraphicsFrame.new
     frame.show
     frame
   end