[GRASS-SVN] r30394 - grass/trunk/gui/wxpython/vdigit

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-02-28 13:31:32 -0500 (Thu, 28 Feb 2008)
New Revision: 30394

Modified:
   grass/trunk/gui/wxpython/vdigit/digit.h
   grass/trunk/gui/wxpython/vdigit/grass6_wxvdigit_wrap.cpp
   grass/trunk/gui/wxpython/vdigit/vertex.cpp
Log:
wxGUI: vdigit updated (veditlib, r30385)

Modified: grass/trunk/gui/wxpython/vdigit/digit.h
===================================================================
--- grass/trunk/gui/wxpython/vdigit/digit.h	2008-02-28 18:08:13 UTC (rev 30393)
+++ grass/trunk/gui/wxpython/vdigit/digit.h	2008-02-28 18:31:32 UTC (rev 30394)
@@ -43,7 +43,8 @@
 
     int MoveVertex(double, double, double,
 		   double, double, double,
-		   const char*, int, double);
+		   const char*, int,
+		   double, double);
     int ModifyLineVertex(int, double, double, double,
 			 double);
 

Modified: grass/trunk/gui/wxpython/vdigit/grass6_wxvdigit_wrap.cpp
===================================================================
--- grass/trunk/gui/wxpython/vdigit/grass6_wxvdigit_wrap.cpp	2008-02-28 18:08:13 UTC (rev 30393)
+++ grass/trunk/gui/wxpython/vdigit/grass6_wxvdigit_wrap.cpp	2008-02-28 18:31:32 UTC (rev 30394)
@@ -11430,6 +11430,7 @@
   char *arg8 = (char *) 0 ;
   int arg9 ;
   double arg10 ;
+  double arg11 ;
   int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11452,6 +11453,8 @@
   int ecode9 = 0 ;
   double val10 ;
   int ecode10 = 0 ;
+  double val11 ;
+  int ecode11 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
@@ -11462,8 +11465,9 @@
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
   PyObject * obj9 = 0 ;
+  PyObject * obj10 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOO:Digit_MoveVertex",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOO:Digit_MoveVertex",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Digit, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Digit_MoveVertex" "', argument " "1"" of type '" "Digit *""'"); 
@@ -11514,7 +11518,12 @@
     SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "Digit_MoveVertex" "', argument " "10"" of type '" "double""'");
   } 
   arg10 = static_cast< double >(val10);
-  result = (int)(arg1)->MoveVertex(arg2,arg3,arg4,arg5,arg6,arg7,(char const *)arg8,arg9,arg10);
+  ecode11 = SWIG_AsVal_double(obj10, &val11);
+  if (!SWIG_IsOK(ecode11)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "Digit_MoveVertex" "', argument " "11"" of type '" "double""'");
+  } 
+  arg11 = static_cast< double >(val11);
+  result = (int)(arg1)->MoveVertex(arg2,arg3,arg4,arg5,arg6,arg7,(char const *)arg8,arg9,arg10,arg11);
   resultobj = SWIG_From_int(static_cast< int >(result));
   if (alloc8 == SWIG_NEWOBJ) delete[] buf8;
   return resultobj;

Modified: grass/trunk/gui/wxpython/vdigit/vertex.cpp
===================================================================
--- grass/trunk/gui/wxpython/vdigit/vertex.cpp	2008-02-28 18:08:13 UTC (rev 30393)
+++ grass/trunk/gui/wxpython/vdigit/vertex.cpp	2008-02-28 18:31:32 UTC (rev 30394)
@@ -27,7 +27,8 @@
    \param move_x,move_y,move_z direction for moving vertex
    \param bgmap  map of background map or NULL
    \param snap snap mode (see vector/v.edit/lib/vedit.h)
-   \param thresh threshold value to identify vertex position
+   \param thresh_coords threshold value to identify vertex position
+   \param thresh_snap threshold value to snap moved vertex
 
    \param 1 vertex moved
    \param 0 nothing changed
@@ -35,7 +36,8 @@
 */
 int Digit::MoveVertex(double x, double y, double z,
 		      double move_x, double move_y, double move_z,
-		      const char *bgmap, int snap, double thresh) {
+		      const char *bgmap, int snap,
+		      double thresh_coords, double thresh_snap) {
 
     int ret;
     struct line_pnts *point;
@@ -63,7 +65,7 @@
     /* move only first found vertex in bbox */
     ret = Vedit_move_vertex(display->mapInfo, BgMap, nbgmaps, 
 			    display->selected,
-			    point, thresh,
+			    point, thresh_coords, thresh_snap,
 			    move_x, move_y, move_z,
 			    1, snap);