fxruby 1.6.22.pre3 → 1.6.22.pre4

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.22.pre3"
+    "1.6.22.pre4"
   end
 end

data/rdoc-sources/FXApp.rb

@@ -223,9 +223,6 @@ module Fox
     # The active top-level window, if any [FXWindow]
     attr_reader :activeWindow
 
-    # The main window, if any [FXWindow]
-    attr_reader :mainWindow
-
     # The window of the current modal loop [FXWindow]
     attr_reader :modalWindow
 

data/rdoc-sources/FXImage.rb

@@ -39,16 +39,20 @@ module Fox
 
   class FXImage < FXDrawable
 
-    # Pixel data [FXMemoryBuffer]
+    # [deprecated] Pixel data [FXMemoryBuffer]
     attr_reader	:data
 
+    # Array of colors of all image pixels. Can also be written as String of raw [RGBA] values.
+    attr_accessor :pixels
+
+
     # Option flags [Integer]
     attr_accessor :options
 
     #
     # Create an image.  If a client-side pixel buffer has been specified,
-    # the image does not own the pixel buffer unless the +IMAGE_OWNED+ flag is
-    # set.  If the +IMAGE_OWNED+ flag is set but a +nil+ pixel buffer is
+    # the image owns the pixel buffer.
+    # If the +IMAGE_OWNED+ flag is set but a +nil+ pixel buffer is
     # passed, a pixel buffer will be automatically created and will be owned
     # by the image. The flags +IMAGE_SHMI+ and +IMAGE_SHMP+ may be specified for
     # large images to instruct #render to use shared memory to communicate
@@ -57,7 +61,7 @@ module Fox
     # ==== Parameters:
     #
     # +a+::		an application instance [FXApp]
-    # +pixels+::	pixels [Array of FXColor values]
+    # +pixels+::	pixels [Array of FXColor values or string of raw [RGBA] values]
     # +opts+::		image options [Integer]
     # +width+::		image width [Integer]
     # +height+::		image height [Integer]
@@ -65,6 +69,31 @@ module Fox
     def initialize(a, pixels=nil, opts=0, width=1, height=1) # :yields: theImage
     end
 
+    #
+    # Populate the image with new pixel data of the same size or of a new size
+    #
+    # Pixel data is copied and IMAGE_OWNED option is set.
+    # If called with +width+ and +height+, the size of the serverside representation
+    # of the image, if it exists, is adjusted but the contents are not updated yet.
+    # This can be done by calling render().
+    #
+    # ==== Parameters:
+    #
+    # +pixels+::  pixels [Array of FXColor values or string of raw [RGBA] values]
+    # +opts+::    image options [Integer]
+    # +width+::   image width [Integer]
+    # +height+::    image height [Integer]
+    #
+    def setPixels(pixels, opts=0, width=nil, height=nil)
+    end
+
+    #
+    # Return a String of the raw color representation of all image pixels.
+    #
+    # Image pixels are stored bytewise as [RGBA] values.
+    #
+    def pixel_string ; end
+
     #
     # Return the color of the pixel at (_x_, _y_).
     #

data/rdoc-sources/FXJPGIcon.rb

@@ -31,8 +31,9 @@ module Fox
     # +opts+::	options [Integer]
     # +width+::	width [Integer]
     # +height+::	height [Integer]
+    # +quality+:: JPEG image quality [Integer]
     #
-    def initialize(a, pix=nil, clr=0, opts=0, width=1, height=1) # :yields: theJPGIcon
+    def initialize(a, pix=nil, clr=0, opts=0, width=1, height=1, quality=75) # :yields: theJPGIcon
     end
   end
   #

data/rdoc-sources/FXJPGImage.rb

@@ -30,8 +30,9 @@ module Fox
     # +opts+::	options [Integer]
     # +width+::	width [Integer]
     # +height+::	height [Integer]
+    # +quality+:: JPEG image quality [Integer]
     #
-    def initialize(a, pix=nil, opts=0, width=1, height=1) # :yields: theJPGImage
+    def initialize(a, pix=nil, opts=0, width=1, height=1, quality=75) # :yields: theJPGImage
     end
   end
 end

data/rdoc-sources/FXMemoryBuffer.rb

@@ -1,4 +1,5 @@
 module Fox
+  # This class is deprecated. Use FXImage methods instead.
   class FXMemoryBuffer
 
     #

data/swig-interfaces/FXImage.i

@@ -55,29 +55,28 @@ public:
     * large images to instruct render() to use shared memory to communicate
     * with the server.
     */
-    FXImage(FXApp* a,VALUE ary=Qnil,FXuint opts=0,FXint w=1,FXint h=1){
+    FXImage(FXApp* a,VALUE string_or_ary=Qnil,FXuint opts=0,FXint w=1,FXint h=1){
       FXColor* pix=0;
-      if(!NIL_P(ary)){
-        Check_Type(ary,T_ARRAY);
-        if(FXMALLOC(&pix,FXColor,RARRAY_LEN(ary))){
-          for(long i=0; i<RARRAY_LEN(ary); i++){
-            pix[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(ary,i)));
-	    }
-          }
-	  opts&=IMAGE_OWNED;
+      if(!NIL_P(string_or_ary)){
+        FXuint len=FXRbNumberOfFXColors(string_or_ary);
+        if(w*h != len){
+          rb_raise( rb_eArgError, "Array size does not match image size" );
         }
-      return new FXRbImage(a,pix,opts,w,h);
+        pix=FXRbConvertToFXColors(string_or_ary);
+        opts|=IMAGE_OWNED;
       }
+      return new FXRbImage(a,pix,opts,w,h);
+    }
 
     /// To get to the pixel data
     FXMemoryBuffer *getData() const {
       if(self->getData()){
         return new FXMemoryBuffer(self->getData(),self->getWidth()*self->getHeight());
-	}
+      }
       else{
         return 0;
-	}
       }
+    }
   }
 
   /// To get to the option flags
@@ -86,21 +85,51 @@ public:
   /// Change options
   void setOptions(FXuint opts);
 
-  /**
-  * Populate the image with new pixel data of the same size; it will assume
-  * ownership of the pixel data if image IMAGE_OWNED option is passed.
-  * The server-side representation of the image, if it exists, is not updated.
-  * This can be done by calling render().
-  */
-  virtual void setData(FXColor *pix,FXuint opts=0);
-
-  /**
-  * Populate the image with new pixel data of a new size; it will assume ownership
-  * of the pixel data if image IMAGE_OWNED option is passed.  The size of the server-
-  * side representation of the image, if it exists, is adjusted but the contents are
-  * not updated yet. This can be done by calling render().
-  */
-  virtual void setData(FXColor *pix,FXuint opts,FXint w,FXint h);
+  %extend {
+    /**
+    * Populate the image with new pixel data of the same size; it will assume
+    * ownership of the pixel data if image IMAGE_OWNED option is passed.
+    * The server-side representation of the image, if it exists, is not updated.
+    * This can be done by calling render().
+    */
+    void setPixels(VALUE string_or_ary,FXuint opts=0,VALUE w=Qnil,VALUE h=Qnil){
+      FXuint len=FXRbNumberOfFXColors(string_or_ary);
+      if( ( (NIL_P(w) || NIL_P(h)) && self->getWidth()*self->getHeight() != len) ||
+          (!(NIL_P(w) || NIL_P(h)) && NUM2UINT(w)*NUM2UINT(h) != len)){
+        rb_raise( rb_eArgError, "Array size does not match image size" );
+      }
+
+      FXColor* pix=FXRbConvertToFXColors(string_or_ary);
+      opts|=IMAGE_OWNED;
+      if( NIL_P(w) || NIL_P(h) ){
+        self->setData(pix,opts);
+      }else{
+        self->setData(pix,opts,NUM2UINT(w),NUM2UINT(h));
+      }
+    }
+
+    VALUE pixels(){
+      FXColor* data = self->getData();
+      if (data) {
+        FXuint size = self->getWidth()*self->getHeight();
+        VALUE ary = rb_ary_new2(size);
+        for (int i = 0; i < size; i++)
+          rb_ary_store(ary, i, UINT2NUM(data[i]));
+        return ary;
+      } else {
+        return Qnil;
+      }
+    }
+
+    VALUE pixel_string(){
+      FXColor* data = self->getData();
+      if (data) {
+        return rb_str_new((char*)data, self->getWidth()*self->getHeight()*sizeof(FXColor));
+      } else {
+        return Qnil;
+      }
+    }
+  }
 
   /// Get pixel at x,y
   FXColor getPixel(FXint x,FXint y) const;

data/test/TC_FXImage.rb

@@ -11,7 +11,7 @@ class TC_FXImage < Fox::TestCase
 
   def test_default_constructor_args_1
     img = FXImage.new(app)
-    assert_same(nil, img.data)
+    assert_same(nil, img.pixels)
     assert_equal(0, img.options)
     assert_equal(1, img.width)
     assert_equal(1, img.height)
@@ -19,7 +19,7 @@ class TC_FXImage < Fox::TestCase
 
   def test_default_constructor_args_2
     img = FXImage.new(app, nil)
-    assert_same(nil, img.data)
+    assert_same(nil, img.pixels)
     assert_equal(0, img.options)
     assert_equal(1, img.width)
     assert_equal(1, img.height)
@@ -27,7 +27,7 @@ class TC_FXImage < Fox::TestCase
 
   def test_default_constructor_args_3
     img = FXImage.new(app, nil, 0)
-    assert_same(nil, img.data)
+    assert_same(nil, img.pixels)
     assert_equal(0, img.options)
     assert_equal(1, img.width)
     assert_equal(1, img.height)
@@ -35,7 +35,7 @@ class TC_FXImage < Fox::TestCase
 
   def test_default_constructor_args_4
     img = FXImage.new(app, nil, 0, 1)
-    assert_same(nil, img.data)
+    assert_same(nil, img.pixels)
     assert_equal(0, img.options)
     assert_equal(1, img.width)
     assert_equal(1, img.height)
@@ -43,7 +43,7 @@ class TC_FXImage < Fox::TestCase
 
   def test_default_constructor_args_5
     img = FXImage.new(app, nil, 0, 1, 1)
-    assert_same(nil, img.data)
+    assert_same(nil, img.pixels)
     assert_equal(0, img.options)
     assert_equal(1, img.width)
     assert_equal(1, img.height)
@@ -59,24 +59,57 @@ class TC_FXImage < Fox::TestCase
     assert_equal(IMAGE_OWNED, img.options)
   end
 
+  def test_setPixels
+    img = FXImage.new(app, nil, 0, 2, 2)
+    img.pixels = [0x12345678, 2, 3, 4]
+    assert_equal(IMAGE_OWNED, img.options)
+    assert_equal([0x12345678, 2, 3, 4], img.pixels)
+  end
+
+  def test_setPixels2
+    img = FXImage.new(app)
+    img.setPixels([0x12345678, 2], 0, 2, 1)
+    assert_equal(IMAGE_OWNED, img.options)
+    assert_equal([0x12345678, 2], img.pixels)
+  end
+
+  def test_setPixels_string
+    img = FXImage.new(app, nil, 0, 2, 1)
+    img.pixels = "rgbaRGBA"
+    assert_equal(IMAGE_OWNED, img.options)
+    assert_equal("rgbaRGBA", img.pixel_string)
+  end
+
   def test_create
     #
     # If the image owns its pixel data and IMAGE_KEEP was not specified,
     # the data should go away after we call create.
     #
     img = FXImage.new(app, nil, IMAGE_OWNED)
-    assert_not_nil(img.data)
+    assert_not_nil(img.pixels)
     img.create
-    assert_nil(img.data)
+    assert_nil(img.pixels)
 
     #
     # If the image owns its pixel data and IMAGE_KEEP was specified,
     # the data should stay after we call create.
     #
     img = FXImage.new(app, nil, IMAGE_KEEP|IMAGE_OWNED)
-    assert_not_nil(img.data)
+    assert_not_nil(img.pixels)
+    img.create
+    assert_not_nil(img.pixels)
+  end
+
+  def test_create_with_data
+    img = FXImage.new(app, "rgbaRGBA", 0, 1, 2)
+    assert_equal("rgbaRGBA", img.pixel_string)
+    img.create
+    assert_nil(img.pixels)
+
+    img = FXImage.new(app, [0x12345678], IMAGE_KEEP|IMAGE_OWNED)
+    assert_equal([0x12345678], img.pixels)
     img.create
-    assert_not_nil(img.data)
+    assert_not_nil(img.pixels)
   end
 
   #
@@ -90,10 +123,10 @@ class TC_FXImage < Fox::TestCase
     #
     img = FXImage.new(app)
     img.create
-    assert_nil(img.data)
+    assert_nil(img.pixels)
     assert_equal(0, img.options&IMAGE_OWNED)
     img.restore
-    assert_not_nil(img.data)
+    assert_not_nil(img.pixels)
     assert_not_equal(0, img.options&IMAGE_OWNED)
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: fxruby
 version: !ruby/object:Gem::Version 
-  hash: 854953483
+  hash: 1923831889
   prerelease: 7
   segments: 
   - 1
   - 6
   - 22
   - pre
-  - 3
-  version: 1.6.22.pre3
+  - 4
+  version: 1.6.22.pre4
 platform: ruby
 authors: 
 - Lyle Johnson
@@ -17,36 +17,36 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 Z
+date: 2012-02-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: hoe
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 27
         segments: 
-        - 3
-        - 10
-        version: "3.10"
+        - 2
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rdoc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 19
         segments: 
-        - 2
-        - 13
-        version: "2.13"
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id002
 description: FXRuby is the Ruby binding to the FOX GUI toolkit.
@@ -1022,84 +1022,84 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fxruby
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: FXRuby is the Ruby binding to the FOX GUI toolkit.
 test_files: 
-- test/TC_FXMenuRadio.rb
-- test/TC_FXLight.rb
-- test/TC_FXMainWindow.rb
-- test/TC_FXFont.rb
-- test/TC_FXMenuCheck.rb
-- test/TC_FXAccelTable.rb
-- test/TC_FXHiliteStyle.rb
-- test/TC_FXTreeListBox.rb
-- test/TC_FXComboBox.rb
-- test/TC_FXVec2f.rb
-- test/TC_FXDialogBox.rb
-- test/TC_FXStream.rb
-- test/TC_FXVec3d.rb
-- test/TC_Misc.rb
+- test/TC_FXVec2d.rb
+- test/TC_FXListBox.rb
+- test/TC_FXCheckButton.rb
+- test/TC_FXVec4f.rb
 - test/TC_FXIconList.rb
+- test/TC_FXXPMIcon.rb
+- test/TC_FXSegment.rb
 - test/TC_FXMemoryStream.rb
-- test/TC_FXExtentd.rb
-- test/TC_downcast.rb
-- test/TC_FXList.rb
+- test/TC_FXComboBox.rb
 - test/TC_FXShell.rb
-- test/TC_FXRadioButton.rb
-- test/TC_FXDCPrint.rb
-- test/TC_FXTableItem.rb
-- test/TC_FXIconDict.rb
-- test/TC_FXXBMImage.rb
-- test/TC_FXVec4f.rb
-- test/TC_FXId.rb
-- test/TC_FXQuatf.rb
-- test/TC_FXTable.rb
-- test/TC_FXSize.rb
-- test/TC_FXVec3f.rb
-- test/TC_FXViewport.rb
-- test/TC_FXUndoList.rb
-- test/TC_FXText.rb
-- test/TC_FXMessageBox.rb
-- test/TC_FXScrollArea.rb
-- test/TC_FXTreeList.rb
-- test/TC_FXVec2d.rb
-- test/TC_FXSettings.rb
+- test/TC_FXRangef.rb
+- test/TC_FXTreeListBox.rb
+- test/TC_Misc.rb
+- test/TC_FXMaterial.rb
+- test/TC_FXMenuCommand.rb
 - test/TC_FXRectangle.rb
+- test/TC_FXGLShape.rb
+- test/TC_FXTreeList.rb
 - test/TC_FXGradientBar.rb
-- test/TC_FXMaterial.rb
+- test/TC_FXUndoList.rb
 - test/TC_FXImage.rb
-- test/TC_FXScrollWindow.rb
-- test/TC_FXFileStream.rb
-- test/TC_FXFoldingList.rb
+- test/TC_FXTableItem.rb
+- test/TC_FXVec3f.rb
+- test/TC_FXIconDict.rb
+- test/TC_FXStream.rb
+- test/TC_FXBMPImage.rb
+- test/TC_FXGLGroup.rb
+- test/TC_FXRanged.rb
 - test/TC_FXTopWindow.rb
+- test/TC_FXHiliteStyle.rb
+- test/TC_FXHeader.rb
+- test/TC_FXPoint.rb
+- test/TC_FXRegistry.rb
+- test/TC_FXFileStream.rb
 - test/TC_FXXBMIcon.rb
-- test/TC_FXMenuCommand.rb
-- test/TC_FXRegion.rb
-- test/TC_FXRanged.rb
-- test/TC_FXListBox.rb
+- test/TC_FXScrollArea.rb
+- test/TC_FXSettings.rb
+- test/TC_FXSize.rb
+- test/TC_FXApp.rb
+- test/TC_FXVec3d.rb
+- test/TC_FXExtentd.rb
+- test/TC_FXDC.rb
+- test/TC_FXMenuCheck.rb
 - test/TC_FXDCWindow.rb
-- test/TC_FXSegment.rb
+- test/TC_FXFont.rb
+- test/TC_FXTable.rb
+- test/TC_FXMenuRadio.rb
+- test/TC_FXExtentf.rb
+- test/TC_FXFontDesc.rb
+- test/TC_FXGLViewer.rb
+- test/TC_FXViewport.rb
 - test/TC_FXArc.rb
+- test/TC_FXText.rb
+- test/TC_FXId.rb
+- test/TC_FXXPMImage.rb
+- test/TC_FXMessageBox.rb
+- test/TC_FXLight.rb
+- test/TC_FXVec2f.rb
+- test/TC_downcast.rb
+- test/TC_FXQuatf.rb
+- test/TC_FXRadioButton.rb
+- test/TC_FXDCPrint.rb
+- test/TC_FXRegion.rb
+- test/TC_FXFoldingList.rb
 - test/TC_FXMat4f.rb
-- test/TC_FXCheckButton.rb
-- test/TC_FXPoint.rb
-- test/TC_FXRegistry.rb
-- test/TC_FXDC.rb
+- test/TC_FXAccelTable.rb
 - test/TC_FXButton.rb
+- test/TC_FXList.rb
+- test/TC_FXDialogBox.rb
+- test/TC_FXBMPIcon.rb
+- test/TC_FXMainWindow.rb
+- test/TC_FXXBMImage.rb
 - test/TC_FXFileAssoc.rb
-- test/TC_FXGLGroup.rb
-- test/TC_FXBMPImage.rb
+- test/TC_FXScrollWindow.rb
 - test/TC_FXDirList.rb
-- test/TC_FXBMPIcon.rb
-- test/TC_FXGLViewer.rb
-- test/TC_FXExtentf.rb
-- test/TC_FXHeader.rb
-- test/TC_FXGLShape.rb
-- test/TC_FXXPMIcon.rb
-- test/TC_FXFontDesc.rb
-- test/TC_FXRangef.rb
-- test/TC_FXXPMImage.rb
-- test/TC_FXApp.rb
 - test/TC_FXDataTarget.rb