Changeset 14714

Timestamp:

04/23/13 08:09:48 (12 years ago)

Author:

Eric.Larour

Message:

CHG: new EdgeDetection wrapper

Location:

issm/trunk-jpl/src

Files:

• c/Makefile.am (modified) (1 diff)
• c/modules/EdgeDetectionx (added)
• c/modules/EdgeDetectionx/CMakeLists.txt (added)
• c/modules/EdgeDetectionx/EdgeDetectionx.cpp (added)
• c/modules/EdgeDetectionx/EdgeDetectionx.h (added)
• c/modules/modules.h (modified) (1 diff)
• wrappers/EdgeDetection (added)
• wrappers/EdgeDetection/EdgeDetection.cpp (added)
• wrappers/EdgeDetection/EdgeDetection.h (added)
• wrappers/matlab/Makefile.am (modified) (2 diffs)
• wrappers/matlab/io/WriteMatlabData.cpp (modified) (2 diffs)
• wrappers/matlab/io/matlabio.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -804 +804 @@
                         ./modules/HoleFillerx/HoleFillerx.cpp\
                         ./modules/HoleFillerx/HoleFillerx.h\
+                        ./modules/EdgeDetectionx/EdgeDetectionx.cpp\
+                        ./modules/EdgeDetectionx/EdgeDetectionx.h\
                         ./modules/AverageFilterx/AverageFilterx.cpp\
                         ./modules/AverageFilterx/AverageFilterx.h\

issm/trunk-jpl/src/c/modules/modules.h

@@ -25 +25 @@
 #include "./DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h"
 #include "./ElementConnectivityx/ElementConnectivityx.h"
+#include "./EdgeDetectionx/EdgeDetectionx.h"
 #include "./EnumToStringx/EnumToStringx.h"
 #include "./StringToEnumx/StringToEnumx.h"

issm/trunk-jpl/src/wrappers/matlab/Makefile.am

@@ -46 +46 @@
                                                  ContourToMesh.la\
                                                  ContourToNodes.la\
+                                                 EdgeDetection.la\
                                                  ElementConnectivity.la\
                                                  EnumToString.la\
@@ -216 +217 @@
 Ll2xy_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
 
+EdgeDetection_la_SOURCES = ../EdgeDetection/EdgeDetection.cpp\
+                                                        ../EdgeDetection/EdgeDetection.h
+
 ExpSimplify_la_SOURCES = ../ExpSimplify/ExpSimplify.cpp\
                                                         ../ExpSimplify/ExpSimplify.h

issm/trunk-jpl/src/wrappers/matlab/io/WriteMatlabData.cpp

@@ -360 +360 @@
 }
 /*}}}*/
+/*FUNCTION WriteData(mxArray** pdataref,DataSet* contours){{{*/
+void WriteData(mxArray** pdataref,DataSet* contours){
+
+        /*Intermediary*/
+
+        int         i;
+        mxArray    *dataref           = NULL;
+        const int   numfields         = 6;
+        const char *fnames[numfields];
+        mwSize      ndim              = 2;
+        mwSize      dimensions[2]     = {1,1};
+        char        id[100];
+
+
+        /*Initialize field names*/
+        i=0;
+        fnames[i++] = "name";
+        fnames[i++] = "nods";
+        fnames[i++] = "density";
+        fnames[i++] = "x";
+        fnames[i++] = "y";
+        fnames[i++] = "closed";
+        _assert_(i==numfields);
+
+        /*Initialize matlab structure of dimension numrifts*/
+        dimensions[0]=contours->Size();
+        dataref=mxCreateStructArray(ndim,dimensions,numfields,fnames);
+
+        /*set each matlab each field*/
+        for(int i=0;i<contours->Size();i++){
+                Contour<IssmPDouble>* contour=(Contour<IssmPDouble>*)contours->GetObjectByOffset(i);
+                
+                /*create a name for this contour from the contour id and set it: */
+                sprintf(id,"%i",contour->id);
+                SetStructureFieldi(dataref,i,"name",id);
+
+                /*number of nods: */
+                SetStructureFieldi(dataref,i,"nods"         ,contour->nods);
+                
+                /*density: */
+                SetStructureFieldi(dataref,i,"density"            ,1);
+                
+                /*x and y: */
+                SetStructureFieldi(dataref,i,"x"             ,contour->nods, 1,contour->x);
+                SetStructureFieldi(dataref,i,"y"             ,contour->nods, 1,contour->y);
+
+                /*closed: */
+                SetStructureFieldi(dataref,i,"closed"         ,(int)contour->closed);
+        }
+
+        /*Assign output*/
+        *pdataref=dataref;
+}
+/*}}}*/
 
 /*Toolkit*/
-/*FUNCTION SetStructureField{{{*/
+/*FUNCTION SetStructureField(mxArray* dataref,const char* fieldname,int M,int N,double* fieldpointer){{{*/
 void SetStructureField(mxArray* dataref,const char* fieldname,int M,int N,double* fieldpointer){
 
@@ -372 +426 @@
         /*Assign to structure*/
         mxSetField(dataref,0,fieldname,field);
+}
+/*}}}*/
+/*FUNCTION SetStructureFieldi(mxArray* dataref,const char* fieldname,char* string) {{{*/
+void SetStructureFieldi(mxArray* dataref,int i,const char* fieldname,char* string){
+
+        mxArray* field = NULL;
+
+        /*Convert field*/
+        WriteData(&field,string);
+
+        /*Assign to structure*/
+        mxSetField(dataref,i,fieldname,field);
 }
 /*}}}*/

issm/trunk-jpl/src/wrappers/matlab/io/matlabio.h

@@ -69 +69 @@
 void SetStructureFieldi(mxArray* dataref,int i,const char* fieldname,int field);
 void SetStructureFieldi(mxArray* dataref,int i,const char* fieldname,double field);
+void SetStructureFieldi(mxArray* dataref,int i,const char* fieldname,char* string);
 int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, const char* THISFUNCTION, void (*function)( void ));