Changeset 2062 for lang/ruby/RubyESRIShape/Shape.cpp

Timestamp:

11/27/07 20:09:45 (12 months ago)

Author:

gyuque

Message:

lang/ruby/RubyESRIShape: polyline support

Files:

• lang/ruby/RubyESRIShape/Shape.cpp (modified) (6 diffs)

lang/ruby/RubyESRIShape/Shape.cpp

@@ -5 +5 @@
 #include "Shape.h"
 
-extern "C" VALUE getRubyESRIShapePolygonClass();
-extern "C" VALUE getRubyESRIShapePointClass();
-extern "C" VALUE getRubyESRIShapeBoundingBoxClass();
+extern "C" {
+VALUE getRubyESRIShapePolygonClass();
+VALUE getRubyESRIShapePolylineClass();
+VALUE getRubyESRIShapePointClass();
+VALUE getRubyESRIShapeBoundingBoxClass();
+}
 
 Shape::Shape(void)
@@ -169 +172 @@
                 rv = ESHP_OK;
         }
+        else if (type == ESHT_PolyLine || type == ESHT_PolyLineZ)
+        {
+                ShpPolyline* pln = new ShpPolyline(
+                        (type == ESHT_PolyLineZ) ? SHPRECORD_WITH_Z : 0
+                        );
+                rv = pln->readFromMainFile(fp, rctx);
+                *pCreated = pln;
+                rv = ESHP_OK;
+        }
+
         return rv;
 }
@@ -256 +269 @@
         rctx.readRecordContentSize += 4;
         
-        mPList.mBounds[0] = Shape::freadLittleDouble(fp);
-        mPList.mBounds[1] = Shape::freadLittleDouble(fp);
-        mPList.mBounds[2] = Shape::freadLittleDouble(fp);
-        mPList.mBounds[3] = Shape::freadLittleDouble(fp);
-        rctx.readSize              += 32;
-        rctx.readRecordContentSize += 32;
-
-        mPList.mNParts  = Shape::freadLittle32(fp);
-        mPList.mNPoints = Shape::freadLittle32(fp);
-        rctx.readSize              += 8;
-        rctx.readRecordContentSize += 8;
-
-        mPList.allocBuffers();
-
-        ESInt32 i;
-
-        for (i = 0;i < mPList.mNParts;i++)
-        {
-                mPList.mPartIndexes[i] = Shape::freadLittle32(fp);
-                rctx.readSize              += 4;
-                rctx.readRecordContentSize += 4;
-        }
-
-        for (i = 0;i < mPList.mNPoints;i++)
-        {
-                mPList.mPoints[i].x = Shape::freadLittleDouble(fp);
-                mPList.mPoints[i].y = Shape::freadLittleDouble(fp);
-                rctx.readSize              += 16;
-                rctx.readRecordContentSize += 16;
-        }
-
-        if (mOption & SHPRECORD_WITH_Z)
-        {
-                // Z
-                mPList.mZRange[0] = Shape::freadLittleDouble(fp);
-                mPList.mZRange[1] = Shape::freadLittleDouble(fp);
-                rctx.readSize              += 16;
-                rctx.readRecordContentSize += 16;
-
-                for (i = 0;i < mPList.mNPoints;i++)
-                {
-                        mPList.mPoints[i].z = Shape::freadLittleDouble(fp);
-                        rctx.readSize              += 8;
-                        rctx.readRecordContentSize += 8;
-                }
-
-                // Measure
-                mPList.mMRange[0] = Shape::freadLittleDouble(fp);
-                mPList.mMRange[1] = Shape::freadLittleDouble(fp);
-                rctx.readSize              += 16;
-                rctx.readRecordContentSize += 16;
-
-                for (i = 0;i < mPList.mNPoints;i++)
-                {
-                        mPList.mPoints[i].m = Shape::freadLittleDouble(fp);
-                        rctx.readSize              += 8;
-                        rctx.readRecordContentSize += 8;
-                }
-        }
+        mPList.readFromMainFile(fp, rctx, mOption);
+
 /*
         for (i = 0;i < mNPoints;i++)
@@ -341 +297 @@
 VALUE ShpPolygon::getPartAt(int index)
 {
-        if (index < 0 || index >= mPList.mNParts)
-                return Qnil;
-
-        int len = (index == (mPList.mNParts-1)) ? mPList.mNPoints : mPList.mPartIndexes[index+1];
-        len -= mPList.mPartIndexes[index];
-
-        int start = mPList.mPartIndexes[index];
-
-        VALUE arr = rb_ary_new2(len);
-        for (int i = 0;i < len;i++)
-        {
-                ESPointEx& p = mPList.mPoints[start+i];
-                ShpPoint* shp = new ShpPoint(p.x, p.y, p.z, p.m);
-                rb_ary_push(arr, shp->toRubyObject());
-        }
-
-        return arr;
+        return mPList.getPartAsRubyObj(index);
 }
 
@@ -377 +317 @@
 
         return copy;
+}
+
+// Polyline
+
+ShpPolyline::ShpPolyline(int option)
+{
+        mOption = option;
+}
+
+ShpPolyline::~ShpPolyline()
+{
+}
+
+es_error_t ShpPolyline::readFromMainFile(FILE* fp, ShpReadContext& rctx)
+{
+        es_error_t rv = ESHP_OK;
+
+        mType      = Shape::freadLittle32(fp);
+        rctx.readSize              += 4;
+        rctx.readRecordContentSize += 4;
+        
+        mPList.readFromMainFile(fp, rctx, mOption);
+
+        return rv;
+}
+
+VALUE ShpPolyline::getPartAt(int index)
+{
+        return mPList.getPartAsRubyObj(index);
+}
+
+int ShpPolyline::getPartsLength()
+{
+        return mPList.mNParts;
+}
+
+ShpRecordObject* ShpPolyline::clone()
+{
+        ShpPolyline* copy = new ShpPolyline(mOption);
+        copy->mType = mType;
+        copy->mPList.copyFrom(mPList);
+
+        return copy;
+}
+
+VALUE ShpPolyline::toRubyObject()
+{
+        VALUE klass = getRubyESRIShapePolylineClass();
+        VALUE instance = rb_class_new_instance(0, NULL, klass);
+
+        RPolylineData* indata;
+        Data_Get_Struct(instance, RPolylineData, indata);
+
+        indata->pThis = this;
+
+        return instance;
 }
 
@@ -447 +443 @@
 {return ((ShpPolygon*)pThis)->getBoundingBox();}
 
-void   c_Polyline_delete(void* pThis)
+int c_Polyline_getPartsLength(void* pThis)
+{return ((ShpPolyline*)pThis)->getPartsLength();}
+
+VALUE c_Polyline_getPartAt(void* pThis, int index)
+{return ((ShpPolyline*)pThis)->getPartAt(index);}
+
+void c_Polyline_delete(void* pThis)
 {delete (ShpPolyline*)pThis;}