[GRASS-SVN] r70850 - grass/trunk/imagery/i.ortho.photo/i.ortho.photo

[svn_grass at osgeo.org]

Author: ychemin
Date: 2017-04-07 09:17:00 -0700 (Fri, 07 Apr 2017)
New Revision: 70850

Modified:
   grass/trunk/imagery/i.ortho.photo/i.ortho.photo/menu.c
Log:
Modified to incorporate g.gui.iphoto2target

Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.photo/menu.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.photo/menu.c	2017-04-07 07:40:21 UTC (rev 70849)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.photo/menu.c	2017-04-07 16:17:00 UTC (rev 70850)
@@ -65,7 +65,7 @@
                "i.ortho.camera;%s;"
                "g.gui.iphoto2image;%s;"
                "i.ortho.init;%s;"
-               "i.photo.2target;%s;"
+               "g.gui.iphoto2target;%s;"
                "i.ortho.rectify;%s;",
                _("1 - Select/Modify imagery group"),
                _("2 - Select/Modify imagery group target"),
@@ -76,7 +76,7 @@
                _("7 - Compute ortho-rectification parameters"),
                _("8 - Ortho-rectify imagery files"));
     ortho_opt->descriptions = desc_ortho_opt;
-    ortho_opt->options = "i.group,i.ortho.target,i.ortho.elev,i.ortho.camera,g.gui.iphoto2image,i.ortho.init,i.photo.2target,i.ortho.rectify";
+    ortho_opt->options = "i.group,i.ortho.target,i.ortho.elev,i.ortho.camera,g.gui.iphoto2image,i.ortho.init,g.gui.iphoto2target,i.ortho.rectify";
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
@@ -109,6 +109,9 @@
     if (strcmp(moduletorun, "g.gui.iphoto2image") == 0){
         strcpy(tosystem,"g.gui.iphoto2image");
     	err=system((const char *)tosystem);
+    }else if (strcmp(moduletorun, "g.gui.iphoto2target") == 0){
+        strcpy(tosystem,"g.gui.iphoto2target");
+    	err=system((const char *)tosystem);
     }else{
         if (strcmp(moduletorun, "i.group") == 0)
             strcpy(tosystem,"i.group --ui group=");
@@ -120,8 +123,6 @@
             strcpy(tosystem,"i.ortho.camera --ui group=");
         if (strcmp(moduletorun, "i.ortho.init") == 0)
             strcpy(tosystem,"i.ortho.init --ui group=");
-        if (strcmp(moduletorun, "i.photo.2target") == 0)
-            strcpy(tosystem,"i.photo.2target --ui group=");
         if (strcmp(moduletorun, "i.ortho.rectify") == 0)
             strcpy(tosystem,"i.ortho.rectify --ui group=");
         strcat(tosystem,grname);