expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-12-08 14:54:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[svn r7417] Make the non-map versions PNGs since they're smaller that way and we lose the

Browse Source 
JPEG artifacts.
This commit is contained in:
olly
2006-06-22 19:38:02 +02:00
parent eb0545f2ab
commit f12e29ce67
14 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
handbook/prospecting_guide.html
View File

@@ -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 }
</style></head><body><h1>Prospecting Guide</h1><p><small>Generated 06/22/06 17:16:48 by make-prospectingguide-new.py</small></p>
</style></head><body><h1>Prospecting Guide</h1><p><small>Generated 06/22/06 18:33:52 by make-prospectingguide-new.py</small></p>
<p><b>Notes:</b></p><ul><li>A marking status of "Retag" means a tag is in place but it carries a provisional number, or in some cases an incorrect number, and needs replacing with a new tag.</li>
<li>Kataster status codes indicate the size of a cave, its character and its exploration status, as described <a href="../katast.htm">here</a>.</li><li>For more info on each cave, see the links to detailed description pages.</li></ul>
<button onclick="if (bgall) imgall.src = 'prospecting_guide.jpg'; else imgall.src = '../noinfo/prospecting_guide.jpg'; bgall = !bgall;">Toggle Background</button>
<button onclick="if (bgall) imgall.src = 'prospecting_guide.png'; else imgall.src = '../noinfo/prospecting_guide.jpg'; bgall = !bgall;">Toggle Background</button>
<small>Note: this requires a login to work!</small>
<p><img src="prospecting_guide.jpg" usemap="#mapall" ismap="ismap" name="imgall" width="1417" height="1704" /></p>
<p><img src="prospecting_guide.png" usemap="#mapall" ismap="ismap" name="imgall" width="1417" height="1704" /></p>
<h3 id="idsubmap40">Eish&ouml;hle area detail</h3>
<button onclick="if (bg40) img40.src = 'prospecting_guide_40area.jpg'; else img40.src = '../noinfo/prospecting_guide_40area.jpg'; bg40 = !bg40;">Toggle Background</button>
<button onclick="if (bg40) img40.src = 'prospecting_guide_40area.png'; else img40.src = '../noinfo/prospecting_guide_40area.jpg'; bg40 = !bg40;">Toggle Background</button>
<small>Note: this requires a login to work!</small>
<p><img src="prospecting_guide_40area.jpg" usemap="#map40" ismap="ismap" name="img40" width="714" height="838" /></p>
<p><img src="prospecting_guide_40area.png" usemap="#map40" ismap="ismap" name="img40" width="714" height="838" /></p>
<h3 id="idsubmap76">Eislufth&ouml;hle area detail</h3>
<button onclick="if (bg76) img76.src = 'prospecting_guide_76area.jpg'; else img76.src = '../noinfo/prospecting_guide_76area.jpg'; bg76 = !bg76;">Toggle Background</button>
<button onclick="if (bg76) img76.src = 'prospecting_guide_76area.png'; else img76.src = '../noinfo/prospecting_guide_76area.jpg'; bg76 = !bg76;">Toggle Background</button>
<small>Note: this requires a login to work!</small>
<p><img src="prospecting_guide_76area.jpg" usemap="#map76" ismap="ismap" name="img76" width="920" height="778" /></p>
<p><img src="prospecting_guide_76area.png" usemap="#map76" ismap="ismap" name="img76" width="920" height="778" /></p>
<h3 id="idsubmap204">Steinbr&uuml;ckenh&ouml;hle area detail</h3>
<button onclick="if (bg204) img204.src = 'prospecting_guide_204area.jpg'; else img204.src = '../noinfo/prospecting_guide_204area.jpg'; bg204 = !bg204;">Toggle Background</button>
<button onclick="if (bg204) img204.src = 'prospecting_guide_204area.png'; else img204.src = '../noinfo/prospecting_guide_204area.jpg'; bg204 = !bg204;">Toggle Background</button>
<small>Note: this requires a login to work!</small>
<p><img src="prospecting_guide_204area.jpg" usemap="#map204" ismap="ismap" name="img204" width="981" height="1068" /></p>
<p><img src="prospecting_guide_204area.png" usemap="#map204" ismap="ismap" name="img204" width="981" height="1068" /></p>
<h3 id="idsubmaptc">Near Top Camp area detail</h3>
<button onclick="if (bgtc) imgtc.src = 'prospecting_guide_tcarea.jpg'; else imgtc.src = '../noinfo/prospecting_guide_tcarea.jpg'; bgtc = !bgtc;">Toggle Background</button>
<button onclick="if (bgtc) imgtc.src = 'prospecting_guide_tcarea.png'; else imgtc.src = '../noinfo/prospecting_guide_tcarea.jpg'; bgtc = !bgtc;">Toggle Background</button>
<small>Note: this requires a login to work!</small>
<p><img src="prospecting_guide_tcarea.jpg" usemap="#maptc" ismap="ismap" name="imgtc" width="1245" height="835" /></p>
<p><img src="prospecting_guide_tcarea.png" usemap="#maptc" ismap="ismap" name="imgtc" width="1245" height="835" /></p>
<h3>Location unclear</h3><table border="1">
<tr><th>Cave Number</th><th>Name</th><th>Finished</th><th>Survey<br>Data</th><th>Survey<br>Drawn</th><th>Marked</th><th>Photo</th><th>E</th><th>N</th><th>Alt</th><th>Location</th><tr><td>221</td><td><a id="id221">?</a></td><td></td><td class="awful">None</td><td class="awful">None</td><td class="awful"></td><td class="awful">None</td><td colspan="3" class=>?</td><td class="locn"> </td></tr>
<tr><td>232</td><td><a id="id232">Grie&szlig;kogelschacht</a></td><td class="bad">x</td><td class="awful">None</td><td class="awful">None</td><td class="awful"></td><td class="awful">None</td><td colspan="3" class=>?</td><td class="locn"> </td></tr>

BIN
handbook/prospecting_guide.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 210 KiB

BIN
handbook/prospecting_guide.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 181 KiB

BIN
handbook/prospecting_guide_204area.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 96 KiB

BIN
handbook/prospecting_guide_204area.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 72 KiB

BIN
handbook/prospecting_guide_40area.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 62 KiB

BIN
handbook/prospecting_guide_40area.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB

BIN
handbook/prospecting_guide_76area.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

BIN
handbook/prospecting_guide_76area.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

BIN
handbook/prospecting_guide_tcarea.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 68 KiB

BIN
handbook/prospecting_guide_tcarea.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 55 KiB

15
noinfo/prospecting_guide_scripts/make-prospectingguide-new.py
View File

@@ -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("<h3 id=\"idsubmap%s\">%s area detail</h3>\n" % (maparea, maps[maparea][DESC]))
htmlfile.write("<button onclick=\"if (bg%s) img%s.src = '%s'; else img%s.src = '../noinfo/%s'; bg%s = !bg%s;\">Toggle Background</button>\n" % (maparea, maparea, filename, maparea, filename, maparea, maparea))
basename = filename[0:-3]
htmlfile.write("<button onclick=\"if (bg%s) img%s.src = '%spng'; else img%s.src = '../noinfo/%sjpg'; bg%s = !bg%s;\">Toggle Background</button>\n" % (maparea, maparea, basename, maparea, basename, maparea, maparea))
htmlfile.write("<small>Note: this requires a login to work!</small>\n")
htmlfile.write("<p><img src=\"%s\" usemap=\"#map%s\" ismap=\"ismap\" name=\"img%s\"" % (filename, maparea, maparea))
htmlfile.write(" width=\"%d\" height=\"%d\" /></p>\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:

BIN
noinfo/prospecting_guide_scripts/pguidemap_204area.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 170 KiB

BIN
noinfo/prospecting_guide_scripts/pguidemap_40area.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 131 KiB