From 79b32a95a6a8ea87f001c5a5a0f6da927d68657e Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Thu, 14 Jun 2018 13:04:05 +1200 Subject: [PATCH] Rename cad3d to survexport The old name was increasingly misleading as it accepts input formats other than .3d, and most of the output formats now supported aren't CAD formats, --- .gitignore | 4 ++-- Makefile.am | 2 +- debian/survex.install | 4 ++-- doc/Makefile.am | 14 +++++++------- doc/diffpos.sgml | 4 ++-- doc/man_aven.sgml | 4 ++-- doc/man_cavern.sgml | 4 ++-- doc/man_diffpos.sgml | 4 ++-- doc/man_dump3d.sgml | 4 ++-- doc/man_extend.sgml | 4 ++-- doc/man_sorterr.sgml | 4 ++-- doc/{man_cad3d.sgml => man_survexport.sgml} | 2 +- doc/manual.sgml | 10 +++++----- doc/survex.7.in | 14 +++++++------- doc/survex.ent | 2 +- doc/{cad3d.sgml => survexport.sgml} | 23 +++++++++++++++-------- lib/INSTALL.OSX | 11 +++++------ src/Makefile.am | 12 ++++++------ src/{cad3d.cc => survexport.cc} | 5 ++--- tests/3dtopos.tst | 6 +++--- tests/cavern.tst | 8 ++++---- tests/smoke.tst | 2 +- 22 files changed, 76 insertions(+), 71 deletions(-) rename doc/{man_cad3d.sgml => man_survexport.sgml} (98%) rename doc/{cad3d.sgml => survexport.sgml} (60%) rename src/{cad3d.cc => survexport.cc} (98%) diff --git a/.gitignore b/.gitignore index 516f380d..0538c8ec 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,7 @@ doc/Makefile.in doc/NEWS.htm doc/OLDNEWS.htm doc/aven.1 -doc/cad3d.1 +doc/survexport.1 doc/cavern.1 doc/diffpos.1 doc/extend.1 @@ -68,7 +68,6 @@ src/Makefile src/Makefile.in src/aven src/avenpal.h -src/cad3d src/cavern src/diffpos src/dump3d @@ -76,6 +75,7 @@ src/extend src/img2aven.h src/imgtest src/sorterr +src/survexport src/thgeomagdata.h src/z_getopt.c stamp-h1 diff --git a/Makefile.am b/Makefile.am index c0b99fd7..490426b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,7 @@ extra_txt = lib/*.svx extra_files = $(extra_bin) $(extra_txt) # FIXME: need to keep in step with bin_PROGRAMS in src/Makefile.am -mingw_progs = cad3d cavern diffpos extend sorterr dump3d aven +mingw_progs = cavern diffpos dump3d extend sorterr survexport aven AUTHORS: doc/AUTHORS.htm w3m -dump doc/AUTHORS.htm > AUTHORS diff --git a/debian/survex.install b/debian/survex.install index c3680f11..26dc29de 100644 --- a/debian/survex.install +++ b/debian/survex.install @@ -4,18 +4,18 @@ debian/tmp/usr/share/survex/bcra3.svx debian/tmp/usr/share/survex/bcra5.svx debian/tmp/usr/share/survex/*.msg debian/tmp/usr/share/mime -debian/tmp/usr/bin/cad3d debian/tmp/usr/bin/cavern debian/tmp/usr/bin/diffpos debian/tmp/usr/bin/dump3d debian/tmp/usr/bin/extend debian/tmp/usr/bin/sorterr -debian/tmp/usr/share/man/man1/cad3d.1 +debian/tmp/usr/bin/survexport debian/tmp/usr/share/man/man1/cavern.1 debian/tmp/usr/share/man/man1/diffpos.1 debian/tmp/usr/share/man/man1/dump3d.1 debian/tmp/usr/share/man/man1/extend.1 debian/tmp/usr/share/man/man1/sorterr.1 +debian/tmp/usr/share/man/man1/survexport.1 debian/tmp/usr/share/man/man7/survex.7 debian/tmp/usr/share/doc/survex vim/ftdetect/survex.vim usr/share/vim/addons/ftdetect diff --git a/doc/Makefile.am b/doc/Makefile.am index e8ed3f30..b9b00b8d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,11 +2,11 @@ pkgdocdir = @PKGDOCDIR@ -other_mans = cad3d.1 cavern.1 diffpos.1 dump3d.1 extend.1 sorterr.1 \ +other_mans = cavern.1 diffpos.1 dump3d.1 extend.1 sorterr.1 survexport.1 \ aven.1 -manual_sources = manual.sgml cad3d.sgml cavern.sgml\ - diffpos.sgml dump3d.sgml extend.sgml sorterr.sgml aven.sgml +manual_sources = manual.sgml cavern.sgml\ + diffpos.sgml dump3d.sgml extend.sgml sorterr.sgml survexport.sgml aven.sgml manual_alt = manual.txt manual.pdf @@ -17,8 +17,8 @@ EXTRA_DIST = $(HTMLFILES) manual $(manual_alt)\ custom.dsl survex.ent\ caution.png note.png\ $(manual_sources) $(other_mans)\ - man_aven.sgml man_cad3d.sgml man_cavern.sgml\ - man_diffpos.sgml man_dump3d.sgml man_extend.sgml man_sorterr.sgml\ + man_aven.sgml man_cavern.sgml man_diffpos.sgml man_dump3d.sgml \ + man_extend.sgml man_sorterr.sgml man_survexport.sgml\ news2html.pl NEWS.htm: ../NEWS news2html.pl @@ -37,8 +37,8 @@ aven.1: $(srcdir)/aven.sgml $(srcdir)/man_aven.sgml $(srcdir)/survex.ent $(DOCBOOK2MAN) $(srcdir)/man_aven.sgml rm -f manpage.links manpage.refs -cad3d.1: $(srcdir)/cad3d.sgml $(srcdir)/man_cad3d.sgml $(srcdir)/survex.ent - $(DOCBOOK2MAN) $(srcdir)/man_cad3d.sgml +survexport.1: $(srcdir)/survexport.sgml $(srcdir)/man_survexport.sgml $(srcdir)/survex.ent + $(DOCBOOK2MAN) $(srcdir)/man_survexport.sgml rm -f manpage.links manpage.refs cavern.1: $(srcdir)/cavern.sgml $(srcdir)/man_cavern.sgml $(srcdir)/survex.ent diff --git a/doc/diffpos.sgml b/doc/diffpos.sgml index 66b05f41..ad48ccb7 100644 --- a/doc/diffpos.sgml +++ b/doc/diffpos.sgml @@ -31,8 +31,8 @@ specified. For backward compatibility diffpos will also read the .pos files produced by earlier versions of cavern, by -the (now removed) 3dtopos tool, by modern versions of cad3d, or by aven's -export feature (requires 1.2.19 or later). +the (now removed) 3dtopos tool, by survexport, or by aven's export feature +(requires 1.2.19 or later). diff --git a/doc/man_aven.sgml b/doc/man_aven.sgml index 11f581b5..8ccb338c 100644 --- a/doc/man_aven.sgml +++ b/doc/man_aven.sgml @@ -10,12 +10,12 @@ See Also -cad3d1, cavern1, diffpos1, dump3d1, extend1, -sorterr1 +sorterr1, +survexport1 diff --git a/doc/man_cavern.sgml b/doc/man_cavern.sgml index 4fcf7343..781a9a84 100644 --- a/doc/man_cavern.sgml +++ b/doc/man_cavern.sgml @@ -11,11 +11,11 @@ aven1, -cad3d1, diffpos1, dump3d1, extend1, -sorterr1 +sorterr1, +survexport1 diff --git a/doc/man_diffpos.sgml b/doc/man_diffpos.sgml index 591c981b..5b3c74d2 100644 --- a/doc/man_diffpos.sgml +++ b/doc/man_diffpos.sgml @@ -11,11 +11,11 @@ aven1, -cad3d1, cavern1, dump3d1, extend1, -sorterr1 +sorterr1, +survexport1 diff --git a/doc/man_dump3d.sgml b/doc/man_dump3d.sgml index a48749c9..3b0d09bc 100644 --- a/doc/man_dump3d.sgml +++ b/doc/man_dump3d.sgml @@ -11,11 +11,11 @@ aven1, -cad3d1, cavern1, diffpos1, extend1, -sorterr1 +sorterr1, +survexport1 diff --git a/doc/man_extend.sgml b/doc/man_extend.sgml index 722c94ba..2ff4a6dd 100644 --- a/doc/man_extend.sgml +++ b/doc/man_extend.sgml @@ -11,11 +11,11 @@ aven1, -cad3d1, cavern1, diffpos1, dump3d1, -sorterr1 +sorterr1, +survexport1 diff --git a/doc/man_sorterr.sgml b/doc/man_sorterr.sgml index 4ccfb60b..31c20869 100644 --- a/doc/man_sorterr.sgml +++ b/doc/man_sorterr.sgml @@ -11,11 +11,11 @@ aven1, -cad3d1, cavern1, diffpos1, dump3d1, -extend1 +extend1, +survexport1 diff --git a/doc/man_cad3d.sgml b/doc/man_survexport.sgml similarity index 98% rename from doc/man_cad3d.sgml rename to doc/man_survexport.sgml index 623d7d56..9cf1169f 100644 --- a/doc/man_cad3d.sgml +++ b/doc/man_survexport.sgml @@ -5,7 +5,7 @@ %entities; ]> -&man.cad3d; +&man.survexport; See Also diff --git a/doc/manual.sgml b/doc/manual.sgml index ec7d7b4c..b7e914fd 100644 --- a/doc/manual.sgml +++ b/doc/manual.sgml @@ -1,11 +1,11 @@ - + ]> -Cad3d can currently output DXF, Skencil, or SVG files for import into CAD -packages. It can also produce Compass .plt files, which are primarily intended -for importing into Carto, but can also be used with Compass itself, and a number -of other formats (POS, ...). +The input formats supports are all those supported by Survex's "img" +library - Survex .3d, Survex .pos, Compass PLT and CMAP XYZ files. + + + +Currently the output formats supported are +DXF, EPS (Encapsulated PostScript), GPX, HPGL for plotters, JSON, KML, +Survex POS files, Skencil, and SVG. +Also survexport can produce Compass .plt files, which are primarily intended +for importing into Carto, but can also be used with Compass itself. diff --git a/lib/INSTALL.OSX b/lib/INSTALL.OSX index 9de3bfda..6e9d6a68 100644 --- a/lib/INSTALL.OSX +++ b/lib/INSTALL.OSX @@ -15,19 +15,18 @@ Terminal.app): However the command line tool allows you to specify a spec file to control how the survey is extended, which you can't currently do via Aven. - * cad3d turns .3d files into various formats, but Aven's "Export" function - can do almost everything cad3d can, plus some extra formats. The main - benefit of cad3d is that it can be easily used in scripts. - * cavern processes survey data, but since version 1.2.3 you can process .svx files by simply opening them with Aven.app, so you no longer need to run - cavern from the command line. As with cad3d, the main reason to run cavern - directly is for use in scripts. + cavern from the command line. The main reason to run cavern directly is for + use in scripts. * diffpos compares the positions of stations in two .3d, .pos, etc files. * sorterr sorts a .err file by a specified field. + * survexport provides access to Aven's "Export" functionality from the command + line which can be useful in scripts. + * dump3d dumps out a list of the items in a .3d file - it's mainly useful for debugging. diff --git a/src/Makefile.am b/src/Makefile.am index 00f0890f..f81478c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,7 @@ noinst_HEADERS = cavern.h commands.h cmdline.h date.h datain.h debug.h\ LDADD = $(LIBOBJS) # FIXME: mingw_progs in top level Makefile.am needs keeping in step with this -bin_PROGRAMS = cad3d cavern diffpos extend sorterr dump3d aven +bin_PROGRAMS = cavern diffpos dump3d extend sorterr survexport aven check_PROGRAMS = imgtest @@ -55,9 +55,9 @@ aven_CFLAGS = $(AM_CFLAGS) $(WX_CFLAGS) -DAVEN aven_CXXFLAGS = $(AM_CXXFLAGS) $(PROJ_CFLAGS) $(LIBAV_CFLAGS) $(WX_CXXFLAGS) aven_LDFLAGS = -cad3d_CXXFLAGS = $(AM_CXXFLAGS) $(PROJ_CFLAGS) $(WX_CXXFLAGS) -cad3d_LDFLAGS = -cad3d_LDADD = $(LIBOBJS) $(WX_LIBS) $(PROJ_LIBS) +survexport_CXXFLAGS = $(AM_CXXFLAGS) $(PROJ_CFLAGS) $(WX_CXXFLAGS) +survexport_LDFLAGS = +survexport_LDADD = $(LIBOBJS) $(WX_LIBS) $(PROJ_LIBS) if MACOSX # FIXME: It looks like modern wx-config should give us this... @@ -70,7 +70,7 @@ sorterr_SOURCES = sorterr.c $(COMMONSRC) extend_SOURCES = extend.c img_hosted.c useful.c hash.c \ $(COMMONSRC) -cad3d_SOURCES = cad3d.cc model.cc export.cc namecompare.cc \ +survexport_SOURCES = survexport.cc model.cc export.cc namecompare.cc \ useful.c hash.c img_hosted.c \ gpx.cc hpgl.cc json.cc kml.cc pos.cc vector3.cc $(COMMONSRC) @@ -87,7 +87,7 @@ all_sources = \ $(diffpos_SOURCES) \ $(sorterr_SOURCES) \ $(extend_SOURCES) \ - $(cad3d_SOURCES) + $(survexport_SOURCES) ../lib/survex.pox: $(all_sources) ../lib/extract-msgs.pl cd $(srcdir)/../lib && ./extract-msgs.pl `echo $(all_sources)|perl -ne 'print "../src/$$_\n" for sort split'|uniq` > survex.pox diff --git a/src/cad3d.cc b/src/survexport.cc similarity index 98% rename from src/cad3d.cc rename to src/survexport.cc index 7d9369b9..33e04244 100644 --- a/src/cad3d.cc +++ b/src/survexport.cc @@ -1,6 +1,5 @@ -/* cad3d.cc - * Converts a .3d file to CAD-like formats (DXF, Skencil, SVG) and also Compass - * PLT. +/* survexport.cc + * Convert a processed survey data file to another format. */ /* Copyright (C) 1994-2004,2008,2010,2011,2013,2014,2018 Olly Betts diff --git a/tests/3dtopos.tst b/tests/3dtopos.tst index 4d89e602..ed586e2f 100755 --- a/tests/3dtopos.tst +++ b/tests/3dtopos.tst @@ -28,7 +28,7 @@ test -n "$*" && VERBOSE=1 test -x "$testdir"/../src/cavern || testdir=. : ${DIFFPOS="$testdir"/../src/diffpos} -: ${CAD3D="$testdir"/../src/cad3d} +: ${SURVEXPORT="$testdir"/../src/survexport} : ${TESTS=${*:-"pos.pos v0 v0b v1 v2 v3"}} @@ -36,7 +36,7 @@ vg_error=123 vg_log=vg.log if [ -n "$VALGRIND" ] ; then rm -f "$vg_log" - CAD3D="$VALGRIND --log-file=$vg_log --error-exitcode=$vg_error $CAD3D" + SURVEXPORT="$VALGRIND --log-file=$vg_log --error-exitcode=$vg_error $SURVEXPORT" DIFFPOS="$VALGRIND --log-file=$vg_log --error-exitcode=$vg_error $DIFFPOS" fi @@ -47,7 +47,7 @@ for file in $TESTS ; do *) input="$srcdir/$file.3d" ;; esac rm -f tmp.pos diffpos.tmp - $CAD3D "$input" tmp.pos + $SURVEXPORT "$input" tmp.pos exitcode=$? if [ -n "$VALGRIND" ] ; then if [ $exitcode = "$vg_error" ] ; then diff --git a/tests/cavern.tst b/tests/cavern.tst index b55112d0..b16fc07f 100755 --- a/tests/cavern.tst +++ b/tests/cavern.tst @@ -33,7 +33,7 @@ testdir=`(cd "$testdir" && pwd)` : ${CAVERN="$testdir"/../src/cavern} : ${DIFFPOS="$testdir"/../src/diffpos} -: ${CAD3D="$testdir"/../src/cad3d} +: ${SURVEXPORT="$testdir"/../src/survexport} : ${TESTS=${*:-"singlefix singlereffix oneleg midpoint noose cross firststn\ deltastar deltastar2 bug3 calibrate_tape nosurvey2 cartesian cartesian2\ @@ -85,7 +85,7 @@ if [ -n "$VALGRIND" ] ; then rm -f "$vg_log" CAVERN="$VALGRIND --log-file=$vg_log --error-exitcode=$vg_error $CAVERN" DIFFPOS="$VALGRIND --log-file=$vg_log --error-exitcode=$vg_error $DIFFPOS" - CAD3D="$VALGRIND --log-file=$vg_log --error-exitcode=$vg_error $CAD3D" + SURVEXPORT="$VALGRIND --log-file=$vg_log --error-exitcode=$vg_error $SURVEXPORT" fi for file in $TESTS ; do @@ -213,10 +213,10 @@ for file in $TESTS ; do ;; dxf) if test -n "$VERBOSE" ; then - $CAD3D tmp.3d tmp.dxf + $SURVEXPORT tmp.3d tmp.dxf exitcode=$? else - $CAD3D tmp.3d tmp.dxf > /dev/null + $SURVEXPORT tmp.3d tmp.dxf > /dev/null exitcode=$? fi if [ -n "$VALGRIND" ] ; then diff --git a/tests/smoke.tst b/tests/smoke.tst index e35f2b35..00bdfa74 100755 --- a/tests/smoke.tst +++ b/tests/smoke.tst @@ -25,7 +25,7 @@ test -x "$testdir"/../src/cavern || testdir=. DISPLAY= export DISPLAY -PROGS="cad3d cavern diffpos extend sorterr aven" +PROGS="cavern diffpos extend sorterr survexport aven" vgrun= vg_error=123 -- 2.11.4.GIT