Changeset 12330 for issm/trunk/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp

Timestamp:

06/01/12 17:26:03 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12326M

File:

• issm/trunk/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp (modified) (3 diffs)

issm/trunk/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp ¶

@@ -26 +26 @@
 
         /*Contour:*/
-        Contour* contouri=NULL;
-        int      numnodes;
-        double*  xc=NULL;
-        double*  yc=NULL;
-
+        DataSet* contours=NULL;
 
         /*parameters: */
-        int numcontours;
-        Contour** contours=NULL;
         int nods;
         int edgevalue;
@@ -49 +43 @@
 
         /*recover parameters :*/
-        numcontours=gate->numcontours;
         contours=gate->contours;
         nods=gate->nods;
@@ -61 +54 @@
 
         /*Loop through all contours: */
-        for (i=0;i<numcontours;i++){
-                contouri=*(contours+i);
-                numnodes=contouri->nods;
-                xc=contouri->x;
-                yc=contouri->y;
-                IsInPoly(in_nod,xc,yc,numnodes,x,y,i0,i1,edgevalue);
+        for (i=0;i<contours->Size();i++){
+                Contour* contour=(Contour*)contours->GetObjectByOffset(i);
+                IsInPoly(in_nod,contour->x,contour->y,contour->nods,x,y,i0,i1,edgevalue);
         }