Changeset 2076

Timestamp:

11/28/07 01:28:58 (5 years ago)

Author:

gyuque

Message:

/lang/ruby/RubyESRIShape: added getter of shape type

Location:

lang/ruby/RubyESRIShape

Files:

• RubyESRIShape.c (modified) (3 diffs)
• Shape.cpp (modified) (3 diffs)
• Shape.h (modified) (4 diffs)

lang/ruby/RubyESRIShape/RubyESRIShape.c

@@ -85 +85 @@
                 rb_raise(rb_eIOError, "shape types unmatched between files.");
 
+        /* ESHP_NOINDEXFILE doesn't raise any errors */
+
         return Qnil;
 }
@@ -121 +123 @@
 
         return self;
+}
+
+static VALUE rb_shape_type(VALUE self)
+{
+        RShapeData* indata;
+    Data_Get_Struct(self, RShapeData, indata);
+
+        return INT2NUM( c_Shape_getType(indata->pThis) );
 }
 
@@ -367 +377 @@
         rb_define_method(rb_cShape, "length", rb_shape_length, 0);
         rb_define_method(rb_cShape, "each",   rb_shape_each  , 0);
+        rb_define_method(rb_cShape, "type",   rb_shape_type  , 0);
 
         // class

lang/ruby/RubyESRIShape/Shape.cpp

@@ -27 +27 @@
 {
         return (ESRIShapeType)mSHPFHeader.shapetype;
+}
+
+int Shape::getTypeAsInt() const
+{
+        return mSHPFHeader.shapetype;
 }
 
@@ -44 +49 @@
                 _tcscpy(actualName + orgLen, ".shx");
                 rv = readIndexFile(actualName);
-
-                //_tcscpy(actualName + orgLen, ".dbf");
         }
 
@@ -423 +426 @@
 {return ((Shape*)pThis)->getLength();}
 
+int c_Shape_getType(void* pThis)
+{return ((Shape*)pThis)->getTypeAsInt();}
+
 void c_Shape_markRubyGC(void* pThis)
 {((Shape*)pThis)->markRubyGC();}

lang/ruby/RubyESRIShape/Shape.h

@@ -16 +16 @@
 
 typedef long ESInt32;
+typedef short ESInt16;
 typedef unsigned long ESUInt32;
 typedef double ESDouble; // MSVC
@@ -57 +58 @@
 } SHPFileHeader;
 
-
 typedef struct _SHPRecordHeader {
         ESInt32 index;
@@ -84 +84 @@
         VALUE getRecordAt(int index);
         int getLength() const;
+        int getTypeAsInt() const;
         void markRubyGC();
 
@@ -144 +145 @@
 int   c_Shape_getLength(void* pThis);
 void  c_Shape_markRubyGC(void* pThis);
+int   c_Shape_getType(void* pThis);
 
 void  c_Polygon_delete(void* pThis);