modified drawing functions of CvMat, and added some tests

ext/cvmat.cpp

@@ -417,7 +417,6 @@ rb_allocate(VALUE klass)
  * Number of channel is set by <i>channel</i>. <i>channel</i> should be 1..4.
  *
  */
-#include <stdio.h>
 VALUE
 rb_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -2762,32 +2761,35 @@ rb_fill_poly(int argc, VALUE *argv, VALUE self)
 VALUE
 rb_fill_poly_bang(int argc, VALUE *argv, VALUE self)
 {
-  VALUE points, drawing_option;
+  VALUE polygons, drawing_option;
-  rb_scan_args(argc, argv, "11", &points, &drawing_option);
+  VALUE points;
+  int i, j;
+  int num_polygons;
+  int *num_points;
+  CvPoint **p;
+  rb_scan_args(argc, argv, "11", &polygons, &drawing_option);
+  // TODO: Check type of argument
   drawing_option = DRAWING_OPTION(drawing_option);
-  if (!POINT_SET_P(points))
+  num_polygons = RARRAY_LEN(polygons);
-    rb_raise(rb_eTypeError, "argument 1(points) should be %s.", cCvSeq::rb_class());
+  num_points = ALLOCA_N(int, num_polygons);
-  /* // todo : draw multi-sequence polygon
+  p = ALLOCA_N(CvPoint*, num_polygons);
-  CvSeq *seq = CVSEQ(points);
+  for (j = 0; j < num_polygons; j++) {
-  int contours = 1;
+    points = rb_ary_entry(polygons, j);
-  while(seq = seq->h_next)
+    num_points[j] = RARRAY_LEN(points);
-    contours++;
+    p[j] = ALLOCA_N(CvPoint, num_points[j]);
-  int **nps = ALLOCA_N(int*, contours);
+    for (i = 0; i < num_points[j]; i++) {
-  CvPoint **ps = ALLOCA_N(CvPoint*, contours);  
+      p[j][i] = VALUE_TO_CVPOINT(rb_ary_entry(points, i));
-  seq = CVSEQ(points);
-  for (int i = 0; i < contours; i++) {    
     }
-  */
+  }
-  int np = CVSEQ(points)->total;
+  
-  VALUE tmp = cCvMat::new_object(1, np, CV_32SC2);
-  CvPoint *p = (CvPoint*)cvCvtSeqToArray(CVSEQ(points), CVMAT(tmp)->data.ptr, CV_WHOLE_SEQ);
   cvFillPoly(CVARR(self),
-	     &p,
+	     p,
-	     &np,
+	     num_points,
-	     1, //contours
+	     num_polygons,
 	     DO_COLOR(drawing_option),	    
 	     DO_LINE_TYPE(drawing_option),
 	     DO_SHIFT(drawing_option));
+
   return self;
 }
 
@@ -2827,22 +2829,25 @@ rb_fill_convex_poly(int argc, VALUE *argv, VALUE self)
  * Fills convex polygon.
  * Same as CvMat#fill_convex_poly, but modifies the receiver in place.
  *
- * see CvMat#fill_cnovex_poly
+ * see CvMat#fill_convex_poly
  */
 VALUE
 rb_fill_convex_poly_bang(int argc, VALUE *argv, VALUE self)
 {
   VALUE points, drawing_option;
+  int i, num_points;
+  CvPoint *p;
   rb_scan_args(argc, argv, "11", &points, &drawing_option);
+  // TODO: Check type of argument
   drawing_option = DRAWING_OPTION(drawing_option);
-  if (!POINT_SET_P(points))
+  num_points = RARRAY_LEN(points);
-    rb_raise(rb_eTypeError, "argument 1(points) should be %s.", cCvSeq::rb_class());
+  p = ALLOCA_N(CvPoint, num_points);
-  int np = CVSEQ(points)->total;
+  for (i = 0; i < num_points; i++)
-  VALUE tmp = cCvMat::new_object(1, np, CV_32SC2);
+    p[i] = VALUE_TO_CVPOINT(rb_ary_entry(points, i));
-  CvPoint *p = (CvPoint*)cvCvtSeqToArray(CVSEQ(points), CVMAT(tmp)->data.ptr, CV_WHOLE_SEQ);
+
   cvFillConvexPoly(CVARR(self),
 		   p,
-		   np,
+		   num_points,
 		   DO_COLOR(drawing_option),	    
 		   DO_LINE_TYPE(drawing_option),
 		   DO_SHIFT(drawing_option));
@@ -2893,32 +2898,31 @@ rb_poly_line(int argc, VALUE *argv, VALUE self)
 VALUE
 rb_poly_line_bang(int argc, VALUE *argv, VALUE self)
 {
-  VALUE points, drawing_option;
+  VALUE polygons, drawing_option;
-  rb_scan_args(argc, argv, "11", &points, &drawing_option);
+  VALUE points;
+  int i, j;
+  int num_polygons;
+  int *num_points;
+  CvPoint **p;
+  rb_scan_args(argc, argv, "11", &polygons, &drawing_option);
+  // TODO: Check type of argument
   drawing_option = DRAWING_OPTION(drawing_option);
-  /*
+  num_polygons = RARRAY_LEN(polygons);
-  if (!POINT_SET_P(points))
+  num_points = ALLOCA_N(int, num_polygons);
-    rb_raise(rb_eTypeError, "argument 1(points) should be %s.", cCvSeq::rb_class());
+  p = ALLOCA_N(CvPoint*, num_polygons);
-  int np = CVSEQ(points)->total;
+  for (j = 0; j < num_polygons; j++) {
-  VALUE tmp = cCvMat::new_object(1, np, CV_32SC2);
+    points = rb_ary_entry(polygons, j);
-  CvPoint *p = (CvPoint*)cvCvtSeqToArray(CVSEQ(points), CVMAT(tmp)->data.ptr, CV_WHOLE_SEQ);
+    num_points[j] = RARRAY_LEN(points);
-  // todo: multi-sequence polygon
+    p[j] = ALLOCA_N(CvPoint, num_points[j]);
+    for (i = 0; i < num_points[j]; i++) {
+      p[j][i] = VALUE_TO_CVPOINT(rb_ary_entry(points, i));
+    }
+  }
+
   cvPolyLine(CVARR(self),
-	     &p,
+	     p,
-	     &np,
+	     num_points,
-	     1, //contour
+	     num_polygons,
-	     DO_IS_CLOSED(drawing_option),
-	     DO_COLOR(drawing_option),
-	     DO_THICKNESS(drawing_option),
-	     DO_LINE_TYPE(drawing_option),
-	     DO_SHIFT(drawing_option));
-  */
-  CvPoint *pointset = 0;
-  int length = CVPOINTS_FROM_POINT_SET(points, &pointset);
-  cvPolyLine(CVARR(self),
-	     &pointset,
-	     &length,
-	     1, //contour
 	     DO_IS_CLOSED(drawing_option),
 	     DO_COLOR(drawing_option),	  
 	     DO_THICKNESS(drawing_option),  
@@ -2928,6 +2932,7 @@ rb_poly_line_bang(int argc, VALUE *argv, VALUE self)
   return self;
 }
 
+
 /*
  * call-seq:
  *   put_text(<i>str, point, font[,color]</i>) -> cvmat

test/test_cvmat.rb

@@ -39,15 +39,6 @@ class TestCvMat < OpenCVTestCase
     }
   end
 
-  def test_DRAWING_OPTION
-    CvMat::DRAWING_OPTION[:color].to_ary.each { |c|
-      assert_in_delta(0, c, 0.01)
-    }
-    assert_equal(1, CvMat::DRAWING_OPTION[:thickness])
-    assert_equal(8, CvMat::DRAWING_OPTION[:line_type])
-    assert_equal(0, CvMat::DRAWING_OPTION[:shift])
-  end
-
   def test_GOOD_FEATURES_TO_TRACK_OPTION
     assert_equal(0xff, CvMat::GOOD_FEATURES_TO_TRACK_OPTION[:max])
     assert_nil(CvMat::GOOD_FEATURES_TO_TRACK_OPTION[:mask])
@@ -56,12 +47,6 @@ class TestCvMat < OpenCVTestCase
     assert_in_delta(0.04, CvMat::GOOD_FEATURES_TO_TRACK_OPTION[:k], 0.01)
   end
 
-  def test_FLOOD_FILL_OPTION
-    assert_equal(4, CvMat::FLOOD_FILL_OPTION[:connectivity])
-    assert((not CvMat::FLOOD_FILL_OPTION[:fixed_range]))
-    assert((not CvMat::FLOOD_FILL_OPTION[:mask_only]))
-  end
-
   def test_FIND_CONTOURS_OPTION
     assert_equal(1, CvMat::FIND_CONTOURS_OPTION[:mode])
     assert_equal(2, CvMat::FIND_CONTOURS_OPTION[:method])

test/test_cvmat_drawing.rb

@@ -0,0 +1,141 @@
+#!/usr/bin/env ruby
+# -*- mode: ruby; coding: utf-8-unix -*- 
+require 'test/unit'
+require 'opencv'
+require 'pp'
+require File.expand_path(File.dirname(__FILE__)) + '/helper'
+
+include OpenCV
+
+# Tests for drawing functions of OpenCV::CvMat
+class TestCvMat_drawing < OpenCVTestCase
+  def test_DRAWING_OPTION
+    CvMat::DRAWING_OPTION[:color].to_ary.each { |c|
+      assert_in_delta(0, c, 0.01)
+    }
+    assert_equal(1, CvMat::DRAWING_OPTION[:thickness])
+    assert_equal(8, CvMat::DRAWING_OPTION[:line_type])
+    assert_equal(0, CvMat::DRAWING_OPTION[:shift])
+  end
+
+  def test_FLOOD_FILL_OPTION
+    assert_equal(4, CvMat::FLOOD_FILL_OPTION[:connectivity])
+    assert((not CvMat::FLOOD_FILL_OPTION[:fixed_range]))
+    assert((not CvMat::FLOOD_FILL_OPTION[:mask_only]))
+  end
+
+  def test_line
+    m0 = create_cvmat(240, 320, :cv8u, 3) { CvColor::White }
+    m1 = m0.clone
+    m2 = m0.line(CvPoint.new(1, 0), CvPoint.new(m0.width - 1, m0.height - 1),
+                 :color => CvColor::Red, :thickness => 3, :line_type => :aa)
+    m1.line!(CvPoint.new(1, 0), CvPoint.new(m0.width - 1, m0.height - 1),
+             :color => CvColor::Blue, :thickness => 1, :line_type => :aa)
+
+    # Uncomment the following lines to view the image
+    # GUI::Window.new('Line: Blue, thickness = 1').show(m1)
+    # GUI::Window.new('Line: Red, thickness = 3').show(m2)
+    # GUI::wait_key
+  end
+
+  def test_rectangle
+    m0 = create_cvmat(240, 320, :cv8u, 3) { CvColor::White }
+    m1 = m0.clone
+    m2 = m0.rectangle(CvPoint.new(20, 20), CvPoint.new(m0.width - 20, m0.height - 20),
+                      :color => CvColor::Red, :thickness => 3, :line_type => :aa)
+    m1.rectangle!(CvPoint.new(20, 20), CvPoint.new(m0.width - 20, m0.height - 20),
+                  :color => CvColor::Blue, :thickness => 1, :line_type => :aa)
+
+    # Uncomment the following lines to view the image
+    # GUI::Window.new('Rectangle: Blue, thickness = 1').show(m1)
+    # GUI::Window.new('Rectangle: Red, thickness = 3').show(m2)
+    # GUI::wait_key
+  end
+
+  def test_circle
+    m0 = create_cvmat(240, 320, :cv8u, 3) { CvColor::White }
+    m1 = m0.clone
+    m2 = m0.circle(CvPoint.new(m0.width / 2, m0.height / 2), 80,
+                   :color => CvColor::Red, :thickness => 3, :line_type => :aa)
+    m1.circle!(CvPoint.new(m0.width / 2, m0.height / 2), 80,
+               :color => CvColor::Blue, :thickness => 1, :line_type => :aa)
+    # Uncomment the following lines to view the image
+    # GUI::Window.new('Circle: Blue, thickness = 1').show(m1)
+    # GUI::Window.new('Circle: Red, thickness = 3').show(m2)
+    # GUI::wait_key
+  end
+
+  def test_ellipse
+    m0 = create_cvmat(240, 320, :cv8u, 3) { CvColor::White }
+    m1 = m0.clone
+    m2 = m0.ellipse(CvPoint.new(m0.width / 2, m0.height / 2), CvSize.new(100, 60), 30, 0, 360,
+                    :color => CvColor::Red, :thickness => 3, :line_type => :aa)
+    m1.ellipse!(CvPoint.new(m0.width / 2, m0.height / 2), CvSize.new(100, 60), 30, 0, 360,
+                :color => CvColor::Blue, :thickness => 1, :line_type => :aa)
+
+    # Uncomment the following lines to view the image
+    # GUI::Window.new('Ellipse: Blue, thickness = 1').show(m1)
+    # GUI::Window.new('Ellipse: Red, thickness = 3').show(m2)
+    # GUI::wait_key
+  end
+
+  def test_ellipse_box
+    m0 = create_cvmat(240, 320, :cv8u, 3) { CvColor::White }
+    box = CvBox2D.new(CvPoint2D32f.new(m0.width / 2, m0.height / 2), CvSize2D32f.new(120, 160), 30)
+    m1 = m0.clone
+    m2 = m0.ellipse_box(box, :color => CvColor::Red, :thickness => 3, :line_type => :aa)
+    m1.ellipse_box!(box, :color => CvColor::Blue, :thickness => 1, :line_type => :aa)
+
+    # Uncomment the following lines to view the image
+    # GUI::Window.new('Ellipse box: Blue, thickness = 1').show(m1)
+    # GUI::Window.new('Ellipse box: Red, thickness = 3').show(m2)
+    # GUI::wait_key
+  end
+
+  def test_fill_poly
+    m0 = create_cvmat(240, 320, :cv8u, 3) { CvColor::White }
+    pt = [[CvPoint.new(10, 20), CvPoint.new(10, 150), CvPoint.new(100, 50)],
+          [CvPoint.new(200, 10), CvPoint.new(200, 200), CvPoint.new(170, 200)],
+          [CvPoint.new(30, 10), CvPoint.new(0, 0), CvPoint.new(90, 150)]]
+
+    m1 = m0.clone
+    m2 = m0.fill_poly(pt, :color => CvColor::Red, :line_type => :aa)
+    m1.fill_poly!(pt, :color => CvColor::Blue, :line_type => :aa)
+
+    # Uncomment the following lines to view the image
+    # GUI::Window.new('Fill poly: Blue, thickness = 1').show(m1)
+    # GUI::Window.new('Fill poly: Red, thickness = 3').show(m2)
+    # GUI::wait_key
+  end
+
+  def test_fill_convex_poly
+    m0 = create_cvmat(240, 320, :cv8u, 3) { CvColor::White }
+    pt = [CvPoint.new(10, 20), CvPoint.new(10, 150), CvPoint.new(100, 50)]
+    
+    m1 = m0.clone
+    m2 = m0.fill_convex_poly(pt, :color => CvColor::Red, :line_type => :aa)
+    m1.fill_convex_poly!(pt, :color => CvColor::Blue, :line_type => :aa)
+
+    # Uncomment the following lines to view the image
+    # GUI::Window.new('Fill convex poly: Blue, thickness = 1').show(m1)
+    # GUI::Window.new('Fill convex poly: Red, thickness = 3').show(m2)
+    # GUI::wait_key
+  end
+
+  def test_poly_line
+    m0 = create_cvmat(240, 320, :cv8u, 3) { CvColor::White }
+    pt = [[CvPoint.new(10, 20), CvPoint.new(10, 150), CvPoint.new(100, 150), CvPoint.new(10, 20)],
+          [CvPoint.new(100, 200), CvPoint.new(200, 190), CvPoint.new(180, 50), CvPoint.new(100, 200)]]
+
+    m1 = m0.clone
+    m2 = m0.poly_line(pt, :color => CvColor::Red, :thickness => 3, :line_type => :aa)
+    m1.poly_line!(pt, :color => CvColor::Blue, :thickness => 1, :line_type => :aa)
+
+    # Uncomment the following lines to view the image
+    # GUI::Window.new('Poly line: Blue, thickness = 1').show(m1)
+    # GUI::Window.new('Poly line: Red, thickness = 3').show(m2)
+    # GUI::wait_key
+  end
+end
+
+