tmp update

src/CMakeLists.txt

@@ -69,3 +69,18 @@ add_demo(demo)
 add_demo(demo2)
 add_demo(demo3)
 add_demo(demo4)
+
+# 工具的编译方法
+macro(add_tool name)
+	# 添加可执行文件 命令行
+	add_executable(${name} tool/${name}.cpp)
+	# 为安装文件添加动态库的搜索地址 在Windows下并没有什么用 直接忽略
+	set_target_properties(${name} PROPERTIES INSTALL_RPATH /usr/local/lib)
+	# 链接动态库
+	target_link_libraries(${name} PUBLIC tin)
+	# 安装可执行程序
+	install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/sbin)
+endmacro()
+
+add_tool(grd2tin)
+add_tool(rnd2tin)

src/demo/demo.cpp

@@ -17,7 +17,7 @@ int main(int argc, char const *argv[])
 	std::vector<double> err_records;
 	std::vector<vertex2dc*> tin_vert;
 	std::vector<triangle*> tin_ele;
-	dem2tin(topo, 0, 1000, 0, 1000, 10, 10, tin_vert, tin_ele, 1.0, nullptr, &err_records);
+	grd2tin(topo, 0, 1000, 0, 1000, 10, 10, tin_vert, tin_ele, 1.0, nullptr, &err_records);
 
 	// Write a log file
 	std::ofstream logfile("data/topo_TIN.log");

src/demo/demo3.cpp

@@ -28,7 +28,7 @@ int main(int argc, char const *argv[])
 	std::vector<double> err_records;
 	std::vector<vertex2dc*> tin_vert;
 	std::vector<triangle*> tin_ele;
-	dem2tin(topo, 0, 1000, 0, 1000, 10, 10, tin_vert, tin_ele, 1.0, &valid_area, &err_records);
+	grd2tin(topo, 0, 1000, 0, 1000, 10, 10, tin_vert, tin_ele, 1.0, &valid_area, &err_records);
 
 	// Write a log file
 	std::ofstream logfile("data/topo_TIN2.log");

src/lib/tin.cpp

@@ -578,7 +578,7 @@ bool location_inside_polygon(double x, double y, std::vector<vertex2dc> *poly_ve
  * @param[in]  maxi_err     Threshold to quit the algorithm. The default is 1e-0
  * @param[in]  err_records  If this pointer is not NULL, record maximal error values after each insertion of vertex.
  */
-void dem2tin(const std::vector<double> &dem, double xmin, double xmax, double ymin, double ymax, double dx, 
+void grd2tin(const std::vector<double> &dem, double xmin, double xmax, double ymin, double ymax, double dx, 
 	double dy, std::vector<vertex2dc*> &out_verts, std::vector<triangle*> &out_tris, double maxi_err, 
 	std::vector<vertex2dc> *outline_poly, std::vector<double> *err_records)
 {

src/lib/tin.h

@@ -200,7 +200,7 @@ struct triangle
  * @param[in]  outline_poly If this pointer is not NULL, Cut triangle outside of or intersected with the polygon.
  * @param[in]  err_records  If this pointer is not NULL, record maximal error values after each insertion of vertex.
  */
-void dem2tin(const std::vector<double> &dem, double xmin, double xmax, double ymin, double ymax, 
+void grd2tin(const std::vector<double> &dem, double xmin, double xmax, double ymin, double ymax, 
 	double dx, double dy, std::vector<vertex2dc*> &out_verts, std::vector<triangle*> &out_tris, 
 	double maxi_err = 1e-0, std::vector<vertex2dc> *outline_poly = nullptr, std::vector<double> *err_records = nullptr);
 

src/tool/getopt_win.h

@@ -0,0 +1,230 @@
+/******************************************************//**
+ *  ██████╗  ██████╗████████╗██╗
+ * ██╔════╝ ██╔════╝╚══██╔══╝██║
+ * ██║  ███╗██║        ██║   ██║
+ * ██║   ██║██║        ██║   ██║
+ * ╚██████╔╝╚██████╗   ██║   ███████╗
+ *  ╚═════╝  ╚═════╝   ╚═╝   ╚══════╝
+ * Geophysical Computational Tools & Library
+ *
+ * Copyright (c) 2019-2029 The GCTL developing team.
+ * Correspondents: Dr. Yi Zhang (zhangyiss@icloud.com)
+ * All rights reserved.
+ *
+ * This file is part of the GCTL software. Permission is hereby granted to any 
+ * person obtaining a copy of this software and associated documentation files 
+ * (the "Software"), to deal in the Software and to permit persons to whom the 
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 1. The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 2. The GCTL is only free of charge for academic and non-profit purpose. For 
+ * commercial purpose, A commercial license must be obtained by contacting the 
+ * developing team.
+ * 3. Publications which have used the GCTL must include a reference to the GCTL 
+ * package.
+ * 4. Bugs and fixings shall be sent to the developing team for review.
+ * 5. Updated affiliations shall be sent to the developing team for review.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *********************************************************/
+
+/* Declarations for getopt.
+   Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2009,2010
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _GETOPT_H
+
+#ifndef __need_getopt
+# define _GETOPT_H 1
+#endif
+
+/* If __GNU_LIBRARY__ is not already defined, either we are being used
+   standalone, or this is the first header included in the source file.
+   If we are being used with glibc, we need to include <features.h>, but
+   that does not exist if we are standalone.  So: if __GNU_LIBRARY__ is
+   not defined, include <ctype.h>, which will pull in <features.h> for us
+   if it's from glibc.  (Why ctype.h?  It's guaranteed to exist and it
+   doesn't flood the namespace with stuff the way some other headers do.)  */
+#if !defined __GNU_LIBRARY__
+# include <ctype.h>
+#endif
+
+#ifndef __THROW
+# ifndef __GNUC_PREREQ
+#  define __GNUC_PREREQ(maj, min) (0)
+# endif
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+#  define __THROW	throw ()
+# else
+#  define __THROW
+# endif
+#endif
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message `getopt' prints
+   for unrecognized options.  */
+
+extern int opterr;
+
+/* Set to an option character which was unrecognized.  */
+
+extern int optopt;
+
+#ifndef __need_getopt
+/* Describe the long-named options requested by the application.
+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+   of `struct option' terminated by an element containing a name which is
+   zero.
+
+   The field `has_arg' is:
+   no_argument		(or 0) if the option does not take an argument,
+   required_argument	(or 1) if the option requires an argument,
+   optional_argument 	(or 2) if the option takes an optional argument.
+
+   If the field `flag' is not NULL, it points to a variable that is set
+   to the value given in the field `val' when the option is found, but
+   left unchanged if the option is not found.
+
+   To have a long-named option do something other than set an `int' to
+   a compiled-in constant, such as set a value from `optarg', set the
+   option's `flag' field to zero and its `val' field to a nonzero
+   value (the equivalent single-letter option character, if there is
+   one).  For long options that have a zero `flag' field, `getopt'
+   returns the contents of the `val' field.  */
+
+struct option
+{
+  const char *name;
+  /* has_arg can't be an enum because some compilers complain about
+     type mismatches in all the code that assumes it is an int.  */
+  int has_arg;
+  int *flag;
+  int val;
+};
+
+/* Names for the values of the `has_arg' field of `struct option'.  */
+
+# define no_argument		0
+# define required_argument	1
+# define optional_argument	2
+#endif	/* need getopt */
+
+
+/* Get definitions and prototypes for functions to process the
+   arguments in ARGV (ARGC of them, minus the program name) for
+   options given in OPTS.
+
+   Return the option character from OPTS just read.  Return -1 when
+   there are no more options.  For unrecognized options, or options
+   missing arguments, `optopt' is set to the option letter, and '?' is
+   returned.
+
+   The OPTS string is a list of characters which are recognized option
+   letters, optionally followed by colons, specifying that that letter
+   takes an argument, to be placed in `optarg'.
+
+   If a letter in OPTS is followed by two colons, its argument is
+   optional.  This behavior is specific to the GNU `getopt'.
+
+   The argument `--' causes premature termination of argument
+   scanning, explicitly telling `getopt' that there are no more
+   options.
+
+   If OPTS begins with `--', then non-option arguments are treated as
+   arguments to the option '\0'.  This behavior is specific to the GNU
+   `getopt'.  */
+
+#ifdef __GNU_LIBRARY__
+/* Many other libraries have conflicting prototypes for getopt, with
+   differences in the consts, in stdlib.h.  To avoid compilation
+   errors, only prototype getopt for the GNU C library.  */
+extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
+       __THROW;
+
+# if defined __need_getopt && defined __USE_POSIX2 \
+  && !defined __USE_POSIX_IMPLICITLY && !defined __USE_GNU
+/* The GNU getopt has more functionality than the standard version.  The
+   additional functionality can be disable at runtime.  This redirection
+   helps to also do this at runtime.  */
+#  ifdef __REDIRECT
+  extern int __REDIRECT_NTH (getopt, (int ___argc, char *const *___argv,
+				      const char *__shortopts),
+			     __posix_getopt);
+#  else
+extern int __posix_getopt (int ___argc, char *const *___argv,
+			   const char *__shortopts) __THROW;
+#   define getopt __posix_getopt
+#  endif
+# endif
+#else /* not __GNU_LIBRARY__ */
+extern int getopt ();
+#endif /* __GNU_LIBRARY__ */
+
+#ifndef __need_getopt
+extern int getopt_long (int ___argc, char *const *___argv,
+			const char *__shortopts,
+		        const struct option *__longopts, int *__longind)
+       __THROW;
+extern int getopt_long_only (int ___argc, char *const *___argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind)
+       __THROW;
+
+#endif
+
+#ifdef	__cplusplus
+}
+#endif
+
+/* Make sure we later can get all the definitions and declarations.  */
+#undef __need_getopt
+
+#endif /* getopt.h */

src/tool/grd2tin.cpp

@@ -0,0 +1,51 @@
+#include "../lib/tin.h"
+
+#include "iostream"
+#include "fstream"
+#include "sstream"
+#include "string"
+
+#ifdef _WINDOWS
+#include "getopt_win.h"
+#else
+#include "getopt.h"
+#endif
+
+void display_help(std::string exe_name)
+{
+    std::clog << exe_name << " - Generating the Triangular Irregular Networks (TIN) from regular DEM grids\n\n";
+    std::clog << "Usage: -z<xyz-file> -r<xmin>/<xmax>/<ymin>/<ymax> -i<dx>/<dy> -m<mesh-file> [-p<poly-file>] [-t<threshold>] [-l<log-file>] [-n<neighbor-file>]\n\n";
+    std::clog << "Options:\n";
+    std::clog << "  -z  --xyz-file\tinput DEM grid file.\n";
+    std::clog << "  -r  --range\tinput DEM grid's range.\n";
+    std::clog << "  -i  --interval\tinput DEM grid's interval.\n";
+    std::clog << "  -m  --mesh-file\toutput a Gmsh's .msh file of the generated TIN.\n";
+    std::clog << "  -p  --poly-file\tinput a polygon file to control the outline shape of the generated TIN.\n";
+    std::clog << "  -t  --threshold\tthreshold of the maximal error of the generated TIN with respect to the input DEM grid.\n";
+    std::clog << "  -l  --log-file\toutput a .log file of the maximal error of the generated TIN.\n";
+    std::clog << "  -n  --neighbor-file\toutput a .neigh file of the maximal error of the generated TIN.\n";
+    return;
+}
+
+int main(int argc, char const *argv[])
+{
+    static struct option long_opts[] = 
+    {
+        {"xyz-file", required_argument, NULL, 'z'},
+        {"range", required_argument, NULL, 'r'},
+        {"interval", required_argument, NULL, 'i'},
+        {"mesh-file", required_argument, NULL, 'm'},
+        {"poly-file", required_argument, NULL, 'p'},
+        {"threshold", required_argument, NULL, 't'},
+        {"log-file", required_argument, NULL, 'l'},
+        {"neighbor-file", required_argument, NULL, 'n'},
+        {0, 0, 0, 0},
+    };
+
+    if (argc == 1)
+    {
+        display_help(argv[0]);
+        return 0;
+    }
+    return 0;
+}

src/tool/rnd2tin.cpp

@@ -0,0 +1,47 @@
+#include "../lib/tin.h"
+
+#include "iostream"
+#include "fstream"
+#include "sstream"
+#include "string"
+
+#ifdef _WINDOWS
+#include "getopt_win.h"
+#else
+#include "getopt.h"
+#endif
+
+void display_help(std::string exe_name)
+{
+    std::clog << exe_name << " - Generating the Triangular Irregular Networks (TIN) from random DEM points\n\n";
+    std::clog << "Usage: -z<xyz-file> -m<mesh-file> [-p<poly-file>] [-t<threshold>] [-l<log-file>] [-n<neighbor-file>]\n\n";
+    std::clog << "Options:\n";
+    std::clog << "  -z  --xyz-file\tinput .xyz file.\n";
+    std::clog << "  -m  --mesh-file\toutput a Gmsh's .msh file of the generated TIN.\n";
+    std::clog << "  -p  --poly-file\tinput a polygon file to control the outline shape of the generated TIN.\n";
+    std::clog << "  -t  --threshold\tthreshold of the maximal error of the generated TIN with respect to the input DEM grid.\n";
+    std::clog << "  -l  --log-file\toutput a .log file of the maximal error of the generated TIN.\n";
+    std::clog << "  -n  --neighbor-file\toutput a .neigh file of the maximal error of the generated TIN.\n";
+    return;
+}
+
+int main(int argc, char const *argv[])
+{
+    static struct option long_opts[] = 
+    {
+        {"xyz-file", required_argument, NULL, 'z'},
+        {"mesh-file", required_argument, NULL, 'm'},
+        {"poly-file", required_argument, NULL, 'p'},
+        {"threshold", required_argument, NULL, 't'},
+        {"log-file", required_argument, NULL, 'l'},
+        {"neighbor-file", required_argument, NULL, 'n'},
+        {0, 0, 0, 0},
+    };
+
+    if (argc == 1)
+    {
+        display_help(argv[0]);
+        return 0;
+    }
+    return 0;
+}