X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fwhere-vessels;h=50c38b3595e0f399ba4f8e61590bb06136bba099;hb=ca7f7a582f148a9e7d5e182451b59c4b2b151389;hp=0b32a48eaa2e6e1f70f0c87eff35cfd129570ef5;hpb=ff7c0cf15c9c9af7d5f14db5da480cc214cb06a6;p=ypp-sc-tools.web-live.git

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 0b32a48..50c38b3 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -1,19 +1,40 @@
 #!/usr/bin/wish
 
-pkg_mkIndex .
-set auto_path [concat . $auto_path]
+source yarrglib.tcl
+source panner.tcl
 
-package require panner
+set pirate { }
 
-set us Aristarchus
+proc badusage {m} {
+    puts stderr "where-vessels: bad usage: $m"
+    exit 1
+}
 
-proc manyset {list args} {
-    foreach val $list var $args {
-        upvar 1 $var my
-        set my $val
+set ai 0
+proc nextarg {} {
+    global ai argv
+    if {$ai >= [llength $argv]} {
+	badusage "option [lindex $argv [expr {$ai-1}]] needs a value"
     }
+    set v [lindex $argv $ai]
+    incr ai
+    return $v
 }
 
+while {[regexp {^\-} [set arg [lindex $argv $ai]]]} {
+    incr ai
+    switch -exact -- $arg {
+	-- { break }
+	--pirate { set pirate [string totitle [nextarg]] }
+	--ocean { set ocean [string totitle [nextarg]] }
+	--clipboard-file { set clipboard_file [nextarg] }
+	--notes { set notes_loc [nextarg] }
+	default { badusage "unknown option $arg" }
+    }
+}
+set argv [lrange $argv $ai end]
+if {[llength $argv]} { badusage "non-option args not allowed" }
+    
 set itemre { (\w+) = ([^=]*) }
 set manyitemre "^\\\[ $itemre ( (?: ,\\ $itemre)* ) \\]\$"
 puts $manyitemre
@@ -29,7 +50,7 @@ while {[gets $vn l] >= 0} {
 close $vn
 
 proc vessel {vin} {
-	global us
+	global pirate
 	upvar #0 $vin vi
 	switch -exact $vi(vesselClass) {
 		smsloop		{ set sz 00sl }
@@ -66,7 +87,7 @@ proc vessel {vin} {
 	upvar #0 notes($nk) note
 	if {[info exists note]} {
 		manyset $note owner xabbrev
-		if {![string compare $owner $us]} {
+		if {![string compare $owner $pirate]} {
 			append abbrev =
 		} else {
 			append abbrev -
@@ -99,7 +120,7 @@ while {[gets $cl l] >= 0} {
 }
 close $cl
 
-set chart [open |[list perl -we {
+set chart [exec perl -we {
 	use strict;
 	use CommodsScrape;
 	use IO::File;
@@ -112,7 +133,7 @@ set chart [open |[list perl -we {
 		sub { printf STDERR "warning: %s: incomprehensible: %s", @_; }
 			);
 	STDOUT->error and die $!;
-}] r]
+}]
 
 frame .f -border 1 -relief groove
 set canvas .f.c
@@ -152,16 +173,17 @@ proc chart-got/league {x1 y1 x2 y2 kind} {
 	}
 }
 
-while {[gets $chart l] >= 0} {
+proc draw {} {
+    global chart count isleloc canvas
+    
+    foreach l [split $chart "\n"] {
 #	puts "CHART-GOT $l"
 	set proc [lindex $l 0]
 	eval chart-got/$proc [lrange $l 1 end]
-}
-
-puts WILLSHOW
+    }
 
-set lastislandname {}
-foreach key [lsort [array names count]] {
+    set lastislandname {}
+    foreach key [lsort [array names count]] {
 	set c $count($key)
 #	puts "SHOWING $key $c"
 	regexp {^(.*) (\S+)$} $key dummy islandname abbrev
@@ -187,8 +209,11 @@ foreach key [lsort [array names count]] {
 	$canvas lower $bid $id
 	manyset $bbox dummy dummy dummy y
 #	puts "NEW Y $y"
+    }
 }
 
+draw
+
 foreach nk [lsort [array names $note]] {
 	puts "IGNORED NOTE $nk"
 }
@@ -203,8 +228,19 @@ pack .ctrl.pan -side top -pady 10 -padx 5
 frame .ctrl.zoom
 pack .ctrl.zoom -side top
 
-button .ctrl.zoom.out -text - -font {Courier 16}
-button .ctrl.zoom.in  -text + -font  {Courier 16}
+proc zoom {extail} {
+    global scale canvas
+    set nscale [expr "\$scale $extail"]
+    puts "ZOOM $scale $nscale"
+    if {$nscale < 1 || $nscale > 200} return
+    set scale $nscale
+    $canvas delete all
+    draw
+    panner::updatecanvas-bbox .ctrl.pan
+}
+
+button .ctrl.zoom.out -text - -font {Courier 16} -command {zoom /2}
+button .ctrl.zoom.in  -text + -font {Courier 16} -command {zoom *2}
 pack .ctrl.zoom.out .ctrl.zoom.in -side left
 
 #. configure -width 640 -height 480