diff --git a/handbook/computing/CaveConverterWorkflow.png b/handbook/computing/CaveConverterWorkflow.png new file mode 100644 index 000000000..f4de353d1 Binary files /dev/null and b/handbook/computing/CaveConverterWorkflow.png differ diff --git a/handbook/computing/yourlaptop.html b/handbook/computing/yourlaptop.html index 1e55208fb..4877a2839 100644 --- a/handbook/computing/yourlaptop.html +++ b/handbook/computing/yourlaptop.html @@ -25,7 +25,11 @@ The expo laptop uses Debian<

Software

-

Long-standing Expo policy is to retain absolute control of all software and all data. So we use FOSS software and we store data in text files not in a database. You can use other software on your own machine if it is format-compatible and exports data in the formats we want, but all the recommended software here is open source and please don't install proprietary software on the 'expo laptop'.

+

Long-standing Expo policy is to retain absolute control of all software and all data. +So we use FOSS software. +You can use other software on your own machine if it is format-compatible and exports data in the formats we want, +but all the recommended software here is open source (and please don't install proprietary software on the 'expo laptop').

+

The list of software: @@ -35,11 +39,12 @@ The expo laptop uses Debian<

  • mercurial - distributed version control system (to be deprecated during 2020)
  • Filezilla - ftp GUI software with a configuration file to get to the expo server
  • Survex, including the Aven visualisation tool. -
  • Tunnel: a Java 2.5D cave drawing program surveys based on Survex-compatible data which can also read PocketTopo files. (Generally called 'tunnel' even though the project and executable is actually 'tunnelx'.) +
  • Tunnel: 2.5D cave drawing program based on Survex-compatible data which can also read PocketTopo files. (Generally called 'tunnel' even though the project and executable is actually 'tunnelx'.)
  • Therion - Therion processes survey data and generates maps or 3D models of caves.
  • TopParser - to convert PocketTopo .top files from a DistoX into Therion. +
  • Footleg Cave Converter - to convert PocketTopo .top files from a DistoX into survex (Java)
  • QGIS - A Free and Open Source Geographic Information System -
  • GPSprune - to edit GPS tracks in GPX files. Just download the .jar file. +
  • GPSprune - to edit GPS tracks in GPX files (Java).
  • Viking - an alternative to GPSprune. The code is on github.
  • python, if you are extending troggle or the scripts in expoweb/noinfo/ - already installed on Linux
  • python packages you will want to install: [not yet documented] @@ -61,7 +66,7 @@ The expo laptop uses Debian<
  • TortoiseGit - GUI interface to git
  • python for windows. We are using python 2.7 not 3.8.
  • WinScp can be used as an alternative to Filezilla if you like. -
  • java - needed for GPSprune. Has to be installed separately on a Windows machine. +
  • java - needed for GPSprune and CaveConverter. Has to be installed separately on a Windows machine.
  • Notepad++ or any other syntax-highlighting code editor for HTML and python such as Aptana Studio. Configuring these to syntax-highlight .svx files has yet to be done.
  • Cygwin rsync - not installed as standard on Windows so you need to get Cygwin or use WSL. But getting WSL to work with ssh keys has been tricky and pagent-managed ssh keys are apparently not visible to ssh and rsync in WSL. If you find a good solution for Windows please edit this documentation. @@ -71,6 +76,7 @@ The expo laptop uses Debian<
  • Termius - command line to create a key for your phone, to ssh (and mosh) login to the expo server. To get sftp you have to buy it.
  • OsmAnd - a GPS app. See also the expo GPS configuration pages
  • GPSessentials - another GPS app. +
  • Ape@Map - another GPS app, compatible with Kompass commerical map sand used by Austrian cavers
  • andftp FTP app - needs an ssh key installed on your phone
  • FTP using Cx_File_Explorer (this is probably out of date)
  • TopoDroid makes cave surveys with the DistoX. @@ -87,12 +93,16 @@ The expo laptop uses Debian<
  • Launchpad - create an account to help develop survex. -

    Bug lists and open issues are discussed on the github CaveSurveying/CUCCexposurveyissues/issues issue list so you will need to subscribe to the Cave Surveying Group on github to participate. - -

    github.com/CaveSurveying/CUCCexposurveyissues/wiki/Expo-tunnel-workflows is a wiki on github discussing workflows to generate centerlines, GEOTIFF and QGIS integration. - -

    launchpad.net/survex - the main Survex development system. +

    You should also have a look at, and keep up to date with: +

    Configuration

    @@ -139,6 +149,9 @@ to Xenu Link Sleuth - on Windows
  • Linkchecking with wget - command line methods on Linux + + +