diff --git a/Makefile b/Makefile index 4d0d7a204..afd538bac 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,8 @@ cavern_flags = -qq -s -v7 tar_flags = -cz --exclude "*/CVS" --ignore-case -f svxtrace_cmd = ./svxtrace.py +# 3dtopos = ? + #things needed to run this stuff #python3 imaging library, freesans or arial truetype font, dump3d, cavestats #Debian packages: python3-imaging, ttf-freefont, perl, python3 @@ -60,6 +62,8 @@ folk/index.htm: folk/folk.csv scripts/make-folklist.py ########### #QM files are now outo built in troggle for all caves-1623/ + qmlists: 1623/204/atoz.html + # qmlists: 1623/204/qm.html 1623/204/atoz.html 1623/234/qm.html 1623/258/qm.html # 1623/204/qm.html: 1623/204/qm.csv 1623/204/tablize-qms.pl @@ -76,6 +80,7 @@ folk/index.htm: folk/folk.csv scripts/make-folklist.py ########### #3d files are now outo built in troggle for all caves-1623/ + 3dfiles: noinfo/1623-and-1626.3d noinfo/alltracks.3d # 3dfiles: noinfo/1623-and-1626.3d 1623/204/204.3d 1623/234/234.3d 1623/76/76.3d noinfo/alltracks.3d @@ -113,10 +118,12 @@ dump3d: noinfo/prospecting_guide_scripts/dump3d ########### # We don't do the tarfile thing anymore + tarfiles: noinfo/all.tgz + # tarfiles: noinfo/all.tgz 1623/204/surveydata.tgz 1623/234/surveydata.tgz 1623/76/surveydata.tgz -# noinfo/all.tgz: noinfo/1623-and-1626.3d - # tar $(tar_flags) noinfo/all.tgz -C $(dataset_path)/.. loser + noinfo/all.tgz: noinfo/1623-and-1626.3d + tar $(tar_flags) noinfo/all.tgz -C $(dataset_path)/.. loser # 1623/204/surveydata.tgz: 1623/204/204.3d # tar $(tar_flags) 1623/204/surveydata.tgz -C $(dataset_path)/caves-1623/ 204 diff --git a/handbook/computing/basiclaptop.html b/handbook/computing/basiclaptop.html index 24c4e56b1..96c455f7e 100644 --- a/handbook/computing/basiclaptop.html +++ b/handbook/computing/basiclaptop.html @@ -10,8 +10,30 @@

Setting up a minimal Expo laptop

-

Overview

-

If you are new to expo please use the expo laptop first. You don't need to use your own laptop - which takes most of a day to do it properly. +

What you can do from any laptop

+

There is a lot you can do without installing any software on your own machine. Using a browser, you can logon to the Expo online system ("the website", also known as "troggle") as user 'expo' at the Troggle User Login page. (Ask another expoer for the 'cavey:beery' password.) You can: +

+

And using email to send the results to an expo nerd, you can: +

+

and of course using your phone or laptop you can update entries on expo antics on public forums such as ukcaving. + +

We are actively working on increasing the number of expo activities that can be done with just a browser and no installed software. + +

Your own laptop

+

If you are new to expo please use the expo laptop first. You don't need to use your own laptop - which takes most of a day to setup completely.

To set up your own laptop you need to do this:

  1. Register an SSH key with an expo nerd i.e 'get a login'. (see "Key Configuration" below)
    2. @@ -27,7 +49,7 @@ And please write some documentation for the next person in your situation

    Cheat lists and quick reminders

    Software

    diff --git a/handbook/computing/yourlaptop.html b/handbook/computing/yourlaptop.html index e07470b00..7f09beb4c 100644 --- a/handbook/computing/yourlaptop.html +++ b/handbook/computing/yourlaptop.html @@ -75,11 +75,11 @@ but all the recommended software here is open source (and please don't install p
  2. inkscape-speleo - plugin to import/export survex, therion and pockettopo files to the drawing package inkscape.
  3. Imagemagick convert for re-scaling photographs and scanned images and converting from PDF to JPG. (NB you may need to fix this security issue) -

    Nearly all our Austrian surveys have beeen produced using Tunnel (or were hand-drawn) but many smaller caves and some areas of SMKsystem are done with Therion because Therion does elevations and Tunnel doesn't.

    +

    Nearly all our Austrian surveys have beeen produced using Tunnel (or were hand-drawn) but many smaller caves and some areas of SMKsystem are done with Therion because Therion does elevations and Tunnel doesn't. Expo has a policy decision on which to use: if it is an entirely new disconnected cave, then use Therion. If it is a passage in a cave where previously we used Tunnel, then use Tunnel. See also Comparison of Tunnel to Other Cave Software. -

    Note that on a Debian/Ubuntu machine you should normally install the versions that come with the distro, not be getting things from the above sites

    +

    Note that on a Debian/Ubuntu machine you should normally install the versions that come with the distro (i.e. install using 'apt install xxx', not be downloading things from the above sites

    For Linux users only:

    Once you have created the .svx file you will run survex to check that your format is correct without typos @@ -75,7 +86,7 @@ scan it again and then use that scanned image to digitise passage layout into tu

    [Nerds: survex cave data belongs in the repository :loser: so e.g. @@ -116,6 +127,7 @@ straighforward p10.

    Using the direct online system

    +

    This is where you type up the hand-scrawled notes directly into a a web browser, creating a new online survex file automatically in the right place on the online system.

    Having confirmed the right name to use for your cave, including whether it is in area 1623 or 1626, e.g. 

     caves-1623/2050-cucc-01/easybimble.svx
@@ -124,11 +136,12 @@ open a web browser on the equivalent page
 
     http://expo.suvex.com/survexfile/caves-{area}/{cave}/{surveytripid}.svx
 
    
-e.g.
+where {area} will be 1623 or 1626, and for a new discovery, {cave} will be something like 2050-BH-01  if it is the third cave disovered by 
+Dr. Bunsen Honeydew on the 2050 expo, e.g.
 
    -/survexfile/caves-1623/2050-CUCC-01/easybimble.svx
+/survexfile/caves-1623/2050-BH-03/easybimble.svx
 
    
-and a suvex-file editing page will open, pre-populated with an example template 
+and a survex-file editing page will open, pre-populated with an example template 
 for survex data, most of which you will delete and replace. Edit this template and type in your own data.
 
    You can save your work by pressing the "Save this edited svx file" button, but it
 will refuse to save until you have hand-edited out all the template material in [square brackets].
@@ -172,7 +185,7 @@ typing up your notes.
 
    If you have a complex cave like 204 or 161 with many separate exploration zones then you can put subfolder names in the
 URL bar e.g. 
 
    -survexfile/caves-1623/2050-CUCC-01/murderalley/killerclimb/easybimble.svx
+survexfile/caves-1623/2050-BH-03/murderalley/killerclimb/easybimble.svx
 
    
 and the intermediate directories will be created on the server if they don't already exist. This is in addition to 
 the directory name which is also the name of your new cave being created automatically.
diff --git a/handbook/survey/notex.jpg b/handbook/survey/notex.jpg
new file mode 100644
index 000000000..3d8a44214
Binary files /dev/null and b/handbook/survey/notex.jpg differ
diff --git a/handbook/survey/sketch6.gif b/handbook/survey/sketch6.gif
new file mode 100644
index 000000000..7ee320a64
Binary files /dev/null and b/handbook/survey/sketch6.gif differ
diff --git a/handbook/survey/usingsurvex.html b/handbook/survey/usingsurvex.html
deleted file mode 100644
index 0189b3aeb..000000000
--- a/handbook/survey/usingsurvex.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-Handbook placeholder page
-
-
-
-
    CUCC Expedition Handbook
    
-
-
    Placeholder
    
-
    This is not the page you were hoping for.
-
    This will be replaced with the information you want as soon as someone gets around to writing it. Why not find out how to do this yourself ?
-
-
    
-
-
-
-