diff --git a/handbook/prospecting_guide.html b/handbook/prospecting_guide.html index 409c40eae..4fb7b2b1d 100644 --- a/handbook/prospecting_guide.html +++ b/handbook/prospecting_guide.html @@ -13,28 +13,28 @@ bgtc = false; .bad { background-color: #ff9955; text-align: center } .good { background-color: #99ff99; text-align: center } .awful { background-color: #ff5555; text-align: center } -

Prospecting Guide

Generated 06/22/06 17:16:48 by make-prospectingguide-new.py

+

Prospecting Guide

Generated 06/22/06 18:33:52 by make-prospectingguide-new.py

Notes:

- + Note: this requires a login to work! -

+

Eishöhle area detail

- + Note: this requires a login to work! -

+

Eislufthöhle area detail

- + Note: this requires a login to work! -

+

Steinbrückenhöhle area detail

- + Note: this requires a login to work! -

+

Near Top Camp area detail

- + Note: this requires a login to work! -

+

Location unclear

diff --git a/handbook/prospecting_guide.jpg b/handbook/prospecting_guide.jpg deleted file mode 100644 index 9bf7b32d4..000000000 Binary files a/handbook/prospecting_guide.jpg and /dev/null differ diff --git a/handbook/prospecting_guide.png b/handbook/prospecting_guide.png new file mode 100644 index 000000000..1d7f07f06 Binary files /dev/null and b/handbook/prospecting_guide.png differ diff --git a/handbook/prospecting_guide_204area.jpg b/handbook/prospecting_guide_204area.jpg deleted file mode 100644 index 0fb3c1894..000000000 Binary files a/handbook/prospecting_guide_204area.jpg and /dev/null differ diff --git a/handbook/prospecting_guide_204area.png b/handbook/prospecting_guide_204area.png new file mode 100644 index 000000000..d4501a85e Binary files /dev/null and b/handbook/prospecting_guide_204area.png differ diff --git a/handbook/prospecting_guide_40area.jpg b/handbook/prospecting_guide_40area.jpg deleted file mode 100644 index fa634bade..000000000 Binary files a/handbook/prospecting_guide_40area.jpg and /dev/null differ diff --git a/handbook/prospecting_guide_40area.png b/handbook/prospecting_guide_40area.png new file mode 100644 index 000000000..57805c20b Binary files /dev/null and b/handbook/prospecting_guide_40area.png differ diff --git a/handbook/prospecting_guide_76area.jpg b/handbook/prospecting_guide_76area.jpg deleted file mode 100644 index 0cfb91cc7..000000000 Binary files a/handbook/prospecting_guide_76area.jpg and /dev/null differ diff --git a/handbook/prospecting_guide_76area.png b/handbook/prospecting_guide_76area.png new file mode 100644 index 000000000..5e68dbba4 Binary files /dev/null and b/handbook/prospecting_guide_76area.png differ diff --git a/handbook/prospecting_guide_tcarea.jpg b/handbook/prospecting_guide_tcarea.jpg deleted file mode 100644 index e1df60a79..000000000 Binary files a/handbook/prospecting_guide_tcarea.jpg and /dev/null differ diff --git a/handbook/prospecting_guide_tcarea.png b/handbook/prospecting_guide_tcarea.png new file mode 100644 index 000000000..cb2c802a7 Binary files /dev/null and b/handbook/prospecting_guide_tcarea.png differ diff --git a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py index 11be105f6..7fb6d6d82 100644 --- a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py +++ b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py @@ -160,7 +160,10 @@ def get_img_name(maparea): filename = "prospecting_guide" if maparea != "all": filename += "_" + maparea + "area" - filename += ".jpg" + if showbg: + filename += ".jpg" + else: + filename += ".png" return filename # Parameters for big map and zoomed subarea maps: @@ -190,8 +193,6 @@ B = 3 ZOOM = 4 DESC = 5 -allwhite = False - import Image, ImageDraw, ImageFont, string, os, sys for FONT in [ "/usr/share/fonts/truetype/freefont/FreeSans.ttf", @@ -202,8 +203,9 @@ for FONT in [ SIZE = 8 myFont = ImageFont.truetype(FONT, SIZE) +showbg = not(len(sys.argv) > 1 and sys.argv[1] == '--white') mainImage = Image.open("pguidemap.jpg") -if len(sys.argv) > 1 and sys.argv[1] == '--white': +if not showbg: mainImage = Image.new("RGB", mainImage.size, '#ffffff') imgs = {} @@ -399,7 +401,8 @@ for maparea in mapcodes: filename = get_img_name(maparea) if maparea != "all": htmlfile.write("

%s area detail

\n" % (maparea, maps[maparea][DESC])) - htmlfile.write("\n" % (maparea, maparea, filename, maparea, filename, maparea, maparea)) + basename = filename[0:-3] + htmlfile.write("\n" % (maparea, maparea, basename, maparea, basename, maparea, maparea)) htmlfile.write("Note: this requires a login to work!\n") htmlfile.write("

\n" % imgs[maparea].size) @@ -508,6 +511,6 @@ htmlfile.close() for maparea in imgs.keys(): del draws[maparea] filename = get_img_name(maparea) - imgs[maparea].save("../" + filename, "JPEG") + imgs[maparea].save("../" + filename) # vim:syntax=python:set ts=4: diff --git a/noinfo/prospecting_guide_scripts/pguidemap_204area.jpg b/noinfo/prospecting_guide_scripts/pguidemap_204area.jpg deleted file mode 100644 index 9d7b324d0..000000000 Binary files a/noinfo/prospecting_guide_scripts/pguidemap_204area.jpg and /dev/null differ diff --git a/noinfo/prospecting_guide_scripts/pguidemap_40area.jpg b/noinfo/prospecting_guide_scripts/pguidemap_40area.jpg deleted file mode 100644 index cac65bdc0..000000000 Binary files a/noinfo/prospecting_guide_scripts/pguidemap_40area.jpg and /dev/null differ
Cave NumberNameFinishedSurvey
Data		Survey
Drawn		MarkedPhotoENAltLocation
221?NoneNoneNone?
232GrießkogelschachtxNoneNoneNone?