Changeset 2015

Timestamp:

11/26/07 02:16:22 (5 years ago)

Author:

gyuque

Message:

/lang/ruby/RubyESRIShape: getter of polygon parts

Location:

lang/ruby/RubyESRIShape

Files:

• RubyESRIShape.c (modified) (9 diffs)
• Shape.cpp (modified) (6 diffs)
• Shape.h (modified) (2 diffs)
• Shape_int.h (modified) (3 diffs)
• ruby_min.h (modified) (1 diff)

lang/ruby/RubyESRIShape/RubyESRIShape.c

@@ -4 +4 @@
 static VALUE rb_cShape   = 0;
 static VALUE rb_cPolygon = 0;
+static VALUE rb_cPoint = 0;
 
 VALUE getRubyESRIShapePolygonClass()
 {
         return rb_cPolygon;
+}
+
+VALUE getRubyESRIShapePointClass()
+{
+        return rb_cPoint;
 }
 
@@ -23 +29 @@
 static VALUE rb_polygon_allocate(VALUE klass);
 static void  rb_polygon_free(void *ptr);
+static void  rb_polygon_mark(void *ptr);
 
 // Shape
@@ -36 +43 @@
 static void rb_shape_free(void *ptr)
 {
-puts("del!");
         if (ptr)
         {
@@ -48 +54 @@
 static void rb_shape_mark(void *ptr)
 {
-puts("mk!");
         if (ptr)
         {
@@ -72 +77 @@
 {
         RShapeData* indata;
-        es_error_t rv;
     Data_Get_Struct(self, RShapeData, indata);
 
@@ -81 +85 @@
 {
         RShapeData* indata;
-        es_error_t rv;
     Data_Get_Struct(self, RShapeData, indata);
 
         return INT2NUM( c_Shape_getLength(indata->pThis) );
+}
+
+static VALUE rb_shape_each(VALUE self)
+{
+        RShapeData* indata;
+        int len, i;
+    Data_Get_Struct(self, RShapeData, indata);
+
+        len = c_Shape_getLength(indata->pThis);
+        for (i = 0;i < len;i++)
+        {
+                VALUE arr = rb_ary_new2(2);
+                rb_ary_push(arr, INT2NUM(i+1) );
+                rb_ary_push(arr, c_Shape_getRecordAt(indata->pThis, i+1) );
+
+                rb_yield(arr);
+        }
+
+        return self;
 }
 
@@ -94 +116 @@
         indata->pThis = NULL;
 
-        return Data_Wrap_Struct(klass, 0, rb_polygon_free, indata);
+        return Data_Wrap_Struct(klass, rb_polygon_mark, rb_polygon_free, indata);
 }
 
@@ -107 +129 @@
 }
 
+static void rb_polygon_mark(void *ptr)
+{
+        if (ptr)
+        {
+                if (((RPolygonData*)ptr)->pThis)
+                        c_Polygon_markRubyGC(((RPolygonData*)ptr)->pThis);
+        }
+}
+
+static VALUE rb_polygon_aref(VALUE self, VALUE index)
+{
+        RPolygonData* indata;
+    Data_Get_Struct(self, RPolygonData, indata);
+
+        return c_Polygon_getPartAt(indata->pThis, NUM2LONG(index));
+}
+
+static VALUE rb_polygon_length(VALUE self)
+{
+        RPolygonData* indata;
+    Data_Get_Struct(self, RPolygonData, indata);
+
+        return INT2NUM( c_Polygon_getPartsLength(indata->pThis) );
+}
+
+static VALUE rb_polygon_each(VALUE self)
+{
+        RPolygonData* indata;
+        int len, i;
+    Data_Get_Struct(self, RPolygonData, indata);
+
+        len = c_Polygon_getPartsLength(indata->pThis);
+        for (i = 0;i < len;i++)
+        {
+                VALUE arr = rb_ary_new2(2);
+                rb_ary_push(arr, INT2NUM(i) );
+                rb_ary_push(arr, c_Polygon_getPartAt(indata->pThis, i) );
+
+                rb_yield(arr);
+        }
+
+        return self;
+}
 
 void Init_RubyESRIShape()
@@ -120 +185 @@
 
         rb_define_private_method(rb_cShape, "initialize", rb_shape_initialize, 1);
-        rb_define_method(rb_cShape, "[]", rb_shape_aref, 1);
+        rb_define_method(rb_cShape, "[]",     rb_shape_aref  , 1);
         rb_define_method(rb_cShape, "length", rb_shape_length, 0);
+        rb_define_method(rb_cShape, "each",   rb_shape_each  , 0);
 
         // class
         rb_cPolygon = rb_define_class_under (rb_mRubyESRIShape, "Polygon", rb_cObject);
         rb_define_alloc_func(rb_cPolygon, rb_polygon_allocate);
+        rb_define_method(rb_cPolygon, "[]"    , rb_polygon_aref  , 1);
+        rb_define_method(rb_cPolygon, "length", rb_polygon_length, 0);
+        rb_define_method(rb_cPolygon, "each"  , rb_polygon_each  , 0);
+
+        // class
+        rb_cPoint = rb_define_class_under (rb_mRubyESRIShape, "Point", rb_cObject);
 
 }

lang/ruby/RubyESRIShape/Shape.cpp

@@ -54 +54 @@
         ShpReadContext rctx;
         rctx.readSize = 0;
-
-        _tprintf(_T("%s\n"), filename);
 
         mSHPFHeader.filecode   = freadBig32(fp);
@@ -191 +189 @@
 void Shape::markRubyGC()
 {
-        RecordList::iterator it;
+        RValueList::iterator it;
         for (it = mRORecords.begin();it != mRORecords.end();it++)
                 rb_gc_mark(*it);
@@ -255 +253 @@
 
         ESInt32 i;
+
         for (i = 0;i < mNParts;i++)
         {
@@ -268 +267 @@
                 rctx.readSize              += 16;
                 rctx.readRecordContentSize += 16;
-
         }
 
@@ -319 +317 @@
 }
 
+void ShpPolygon::markRubyGC()
+{
+}
+
+VALUE ShpPolygon::getPartAt(int index)
+{
+        if (index < 0 || index >= mNParts)
+                return Qnil;
+
+        int len = (index == (mNParts-1)) ? mNPoints : mPartIndexes[index+1];
+        len -= mPartIndexes[index];
+
+        VALUE arr = rb_ary_new2(len);
+        for (int i = 0;i < len;i++)
+                rb_ary_push(arr, INT2FIX(9 /*dmy*/ ));
+
+        return arr;
+}
+
+int ShpPolygon::getPartsLength()
+{
+        return mNParts;
+}
+
+
+
 void* c_Shape_new()
 {return new Shape();}
@@ -339 +363 @@
 void c_Polygon_delete(void* pThis)
 {delete (ShpPolygon*)pThis;}
+
+void c_Polygon_markRubyGC(void* pThis)
+{((ShpPolygon*)pThis)->markRubyGC();}
+
+VALUE c_Polygon_getPartAt(void* pThis, int index)
+{return ((ShpPolygon*)pThis)->getPartAt(index);}
+
+int c_Polygon_getPartsLength(void* pThis)
+{return ((ShpPolygon*)pThis)->getPartsLength();}

lang/ruby/RubyESRIShape/Shape.h

@@ -96 +96 @@
         SHPFileHeader mSHPFHeader;
 
-        RecordList mRORecords;
+        RValueList mRORecords;
 };
 
@@ -110 +110 @@
 
 void* c_Shape_new();
-void c_Shape_delete(void* pThis);
+void  c_Shape_delete(void* pThis);
 es_error_t c_Shape_readFromFile(void* pThis, const TCHAR* filename);
 VALUE c_Shape_getRecordAt(void* pThis, int index);
-int c_Shape_getLength(void* pThis);
-void c_Shape_markRubyGC(void* pThis);
+int   c_Shape_getLength(void* pThis);
+void  c_Shape_markRubyGC(void* pThis);
 
-void c_Polygon_delete(void* pThis);
+void  c_Polygon_delete(void* pThis);
+void  c_Polygon_markRubyGC(void* pThis);
+VALUE c_Polygon_getPartsArray(void* pThis);
+VALUE c_Polygon_getPartAt(void* pThis, int index);
+int   c_Polygon_getPartsLength(void* pThis);
 
 #ifdef __cplusplus

lang/ruby/RubyESRIShape/Shape_int.h

@@ -5 +5 @@
 
 #include <vector>
-typedef std::vector<VALUE> RecordList;
+typedef std::vector<VALUE> RValueList;
 
 typedef struct _ShpReadContext {
@@ -29 +29 @@
         virtual ~ShpPolygon();
         virtual VALUE toRubyObject();
+        VALUE getPartAt(int index);
+        int getPartsLength();
+
+        void markRubyGC();
 
         es_error_t readFromMainFile(FILE* fp, ShpReadContext& rctx);
@@ -49 +53 @@
 };
 
+class ShpPoint : public ShpRecordObject
+{
+public:
+        ShpPoint();
+        virtual ~ShpPoint();
+        virtual VALUE toRubyObject();
+};
+
 #endif

lang/ruby/RubyESRIShape/ruby_min.h

@@ -1 +1 @@
 typedef unsigned long VALUE;
 #define Qnil   ((VALUE)4)
-extern "C" VALUE rb_class_new_instance(int, VALUE*, VALUE);
-extern "C" void rb_gc_mark (VALUE);
+extern "C" {
+VALUE rb_class_new_instance(int, VALUE*, VALUE);
+void rb_gc_mark (VALUE);
+VALUE rb_ary_new2 (long);
+VALUE rb_yield (VALUE);
+VALUE rb_ary_push (VALUE, VALUE);
+}
+
+#define FIXNUM_FLAG 0x01
+#define INT2FIX(i) ((VALUE)(((long)(i))<<1 | FIXNUM_FLAG))
 
 struct RBasic {