X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=yarrg%2Fwhere-vessels;h=d6ce007785919ea21f67911f8d1532ac9bcc018f;hp=2e625c1e12e12815ec9ad13a3acf9ec51e0fc4d4;hb=ea3cffe854b1c540bc68cd2218fdb2be732197fa;hpb=27d9c020c52e2ad3d6e8ae5c4b113f062ec01251

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 2e625c1..d6ce007 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -103,6 +103,8 @@ proc nextarg {} {
 
 set notes_loc vessel-notes
 set scraper {./yppedia-ocean-scraper --chart}
+set info_cache _vessel-info-cache
+set info_source rsync.yarrg.chiark.net::yarrg/vessel-info
 
 proc parseargs {} {
     global ai argv
@@ -118,6 +120,7 @@ proc parseargs {} {
 	    --clipboard-file { load-clipboard-file [nextarg] }
 	    --local-html-dir { lappend scraper --local-html-dir=[nextarg] }
 	    --notes { glset notes_loc [nextarg] }
+	    --vessel-info-source { glset info_source [nextarg] }
 	    --debug { incr debug }
 	    default { badusage "unknown option $arg" }
 	}
@@ -133,6 +136,9 @@ proc argdefaults {} {
 	if {[info exists ocean]} { lappend cmd --ocean $ocean }
 	if {[info exists pirate]} { lappend cmd --pirate $pirate }
 	manyset [split [eval exec $cmd] " "] ocean pirate
+	if {![llength $ocean] || ![llength $pirate]} {
+	    error "$ocean $pirate ?"
+	}
     }
     lappend scraper $ocean
 }
@@ -243,23 +249,35 @@ proc display-note-infos {} {
 
 #---------- vessel properties ----------
 
+proc info-cache-update {} {
+    global info_source info_cache
+    file mkdir $info_cache
+    exec sh -c "cp -u icons/* $info_cache/."
+
+    if {[string length $info_source]} {
+	set cmdl [list \
+		  rsync -udLKtOzm \
+		  --exclude=*~ --exclude=*.bak --exclude=.* --exclude=*.tmp \
+		  $info_source/ $info_cache 2>@ stderr]
+	debug "INFO-CACHE $cmdl"
+	eval exec $cmdl
+    }
+
+    set f [open $info_cache/vessel-info]
+    glset vessel_class_data [read $f]
+    close $f
+}
+
 proc vesselclasses-init {} {
     global vc_game2code vc_code2abbrev vc_code2full vc_codes
-    set vcl {
-	smsloop		am	sl	Sloop
-	lgsloop		bm	ct	Cutter
-	dhow		cm	dh	Dhow
-	longship	dm	ls	Longship
-	baghlah		em	bg	Baghlah
-	merchbrig	fm	mb	{Merchant Brig}
-	warbrig		gm	wb	{War Brig}
-	xebec		hm	xe	Xebec
-	warfrig		im	wf	{War Frigate}
-	merchgal	jm	mg	{Merchant Galleon}
-	grandfrig	km	gf	{Grand Frigate}
-    }
+
+    global vessel_class_data
+    manyset $vessel_class_data classinfos subclassinfos
+
     set vc_codes {}
-    foreach {game code abbrev full} $vcl {
+    foreach {game code abbrev full} $classinfos {
+	if {![regexp {^[a-z][a-z]$} $code code]} { error "bad code" }
+	if {![regexp {^[a-z][a-z]$} $abbrev abbrev]} { error "bad abbrev" }
 	lappend vc_codes $code
 	set vc_game2code($game) $code
 	set vc_code2abbrev($code) $abbrev
@@ -267,24 +285,51 @@ proc vesselclasses-init {} {
 	load-icon $abbrev
     }
 
-    load-icon unlocked
-    load-icon locked
-    load-icon battle
-    load-icon borrow
-    load-icon query
-    load-icon ours
-    load-icon dot
+    global vsc_code2report
+    global vsc_game2code
+    set vsc_game2code(null) {}
+    set vsc_code2report() Ordinary
+    set vsc_code2report(!) "Special/L.E."
+    foreach {game code full} $subclassinfos {
+	if {![regexp {^[A-Z]$} $code code]} { error "bad code" }
+	set vsc_game2code($game) $code
+	set vsc_code2report($code) $full
+    }
+
+    load-icon atsea
+    foreach a {battle borrow dot} {
+	foreach b {ours dot query} {
+	    load-icon-combine $a $b
+	}
+    }
 }
 
 proc load-icon {icon} {
-    image create bitmap icon/$icon -file icons/$icon.xbm
+    global info_cache
+    image create bitmap icon/$icon -file $info_cache/$icon.xbm
 }
 
-proc code2abbrev-lock {lockown} {
+proc load-icon-combine {args} {
+    global info_cache
+    set cmd {}
+    set delim "pnmcat -lr "
+    foreach icon $args {
+	append cmd $delim " <(xbmtopbm $info_cache/$icon.xbm)"
+	set delim " <(pbmmake -white 1 1)"
+    }
+    append cmd " | pbmtoxbm"
+    debug "load-icon-combine $cmd"
+    image create bitmap icon/[join $args +] -data [exec bash -c $cmd]
+}
+
+proc code-lockown2icon {lockown} {
     manyset [split $lockown ""] lock notown
-    append abbrev [lindex {* + -} $lock]
-    append abbrev [lindex {= - ?} [regsub {\D} $notown 2]]
-}    
+    return icon/[
+		 lindex {battle borrow dot} $lock
+		]+[
+		   lindex {ours dot query} $notown
+		  ]
+}
 
 proc canvas-horiz-stack {xvar xoff y bind type args} {
     upvar 1 $xvar x
@@ -306,14 +351,27 @@ proc code2canvas {code canvas x yvar qty qtylen bind} {
     incr stackx 2
     set imy [expr {$y+2}]
 
-    append qty [lindex {? {}} $inport]
+    if {!$inport} { incr qtylen -1 }
+    if {$qtylen<=0} { set qtylen {} }
     set qty [format "%${qtylen}s" $qty]
 
     set qtyid [canvas-horiz-stack stackx 0 $y $bind \
 		   text -anchor nw -font fixed -text $qty]
 
+    if {!$inport} {
+	canvas-horiz-stack stackx 0 $imy $bind \
+	    image -anchor nw -image icon/atsea
+	incr stackx
+    }
+    
+    upvar #0 vc_code2abbrev($class) vcabb
+    if {![info exists vcabb]} {
+	set vcabb vc-$class
+	image create bitmap icon/$vcabb -data \
+	    [exec pbmtext -builtin fixed $class | pnminvert | pnmcrop >t.pnm]
+    }
     canvas-horiz-stack stackx -1 $imy $bind \
-	    image -anchor nw -image icon/$vc_code2abbrev($class)
+	    image -anchor nw -image icon/$vcabb
 
     if {[string length $subclass]} {
 	canvas-horiz-stack stackx 0 $y $bind \
@@ -321,15 +379,9 @@ proc code2canvas {code canvas x yvar qty qtylen bind} {
 	    $subclass
     }
 
-    manyset [split $lockown ""] lock notown
-
     incr stackx
     canvas-horiz-stack stackx 0 $imy $bind \
-	image -anchor nw -image icon/[lindex {battle dot locked} $lock]
-    incr stackx
-    canvas-horiz-stack stackx 0 $imy $bind \
-	image -anchor nw -image icon/[lindex {ours dot query} \
-					  [regsub {\D} $notown 2]]
+	image -anchor nw -image [code-lockown2icon $lockown]
     incr stackx
     
     if {[string length $xabbrev]} {
@@ -359,10 +411,11 @@ proc show-report-decode {code} {
     report-set inport [lindex {{At Sea} {In port}} $inport]
     report-set class $vc_code2full($classcode)
 
-    switch -exact $subclass {
-	{} { report-set subclass {Ordinary} }
-	F { report-set subclass {"Frost class"} }
-	default { report-set subclass "Subclass \"$subclass\"" }
+    upvar #0 vsc_code2report($subclass) subclass_report
+    if {[info exists subclass_report]} {
+	report-set subclass $subclass_report
+    } else {
+	report-set subclass "Subclass \"$subclass\""
     }
 
     report-set lock [lindex {
@@ -372,8 +425,7 @@ proc show-report-decode {code} {
     switch -exact $notown {
 	0 { report-set own "Yours" }
 	1 { report-set own "Other pirate's" }
-	U { report-set own "Owner not known" }
-	M { report-set own "Missing from notes" }
+	2 { report-set own "Owner unknown" }
 	default { report-set own "?? $notown" }
     }
 
@@ -384,6 +436,35 @@ proc show-report-decode {code} {
     }
 }
 
+#---------- smashing ----------
+
+set smash_subclass 0
+
+proc smash-code {code} {
+    manyset [split $code _] inport class subclass lockown xabbrev
+
+    global smash_subclass
+    if {$smash_subclass > 1} {
+	set subclass {}
+    } elseif {$smash_subclass && [string length $subclass]} {
+	set subclass !
+    }
+
+    return [join [list $inport $class $subclass $lockown $xabbrev] _]
+}
+
+proc make-radio-smasher {w label variable descs} {
+    frame $w
+    label $w.label -text $label
+    pack $w.label -side left
+    for {set i 0} {$i < [llength $descs]} {incr i} {
+	radiobutton $w.v$i \
+	    -variable $variable -value $i -command redraw-needed \
+	    -text [lindex $descs $i]
+	pack $w.v$i -side left
+    }
+}
+
 #---------- filtering ----------
 
 set filters {}
@@ -402,19 +483,18 @@ proc filter-says-yes/size {codel} {
 
 proc filter-values/lockown {} {
     foreach lv {0 1 2} {
-	foreach ov {0 1 X} {
+	foreach ov {0 1 2} {
 	    lappend vals "$lv$ov"
 	}
     }
     return $vals
 }
-proc filter-map/lockown {lockown} { return [code2abbrev-lock $lockown] }
+proc filter-icon/lockown {lockown} { return [code-lockown2icon $lockown] }
 proc filter-default/lockown {lockown} {
     return [regexp {^[01]|^2[^1]} $lockown]
 }
 proc filter-says-yes/lockown {codel} {
     set lockown [lindex $codel 3]
-    regsub -all {\D} $lockown X lockown
     upvar #0 filter_lockown($lockown) yes
     return $yes
 }
@@ -524,11 +604,27 @@ proc make-filters {} {
     make-entry-filter xabbre "Flags\n regexp" {}
 }
 
+proc filterstyle-changed {n1 n2 op} {
+    global filterstyle
+    debug "filterstyle-changed $filterstyle"
+    redraw-needed
+}
+
 proc filters-say-yes {code} {
-    global filters
+    global filters filterstyle
     debug "filters-say-yes $code"
+    set codel [split $code _]
+    set lockown [lindex $codel 3]
+    switch -exact $filterstyle {
+	0 { return 1 }
+	1 { return [filter-default/lockown $lockown] }
+	2 { return [regexp {^.0} $lockown] }
+	3 { }
+	default { error $filterstyle }
+    }
+    
     foreach fil $filters {
-	if {![filter-says-yes/$fil [split $code _]]} { return 0 }
+	if {![filter-says-yes/$fil $codel]} { return 0 }
     }
     return 1
 }
@@ -544,14 +640,26 @@ proc vessel {vin} {
 
     set gameclass [errexpect-arrayget vi vesselClass]
     upvar #0 vc_game2code($gameclass) class
-    if {![info exists class]} { errexpect-error "unexpected vesselClass"}
+    if {![info exists class]} {
+	set class "($gameclass)"
+	upvar #0 vc_code2abbrev($class) vcabb
+	set vcabb vc-$class
+	set data [exec pbmtext -builtin fixed " $gameclass " \
+		 | pnminvert | pnmcrop | pbmtoxbm]
+	debug "INVENTED ICON $vcabb $data"
+	image create bitmap icon/$vcabb -data $data
+	    
+	global vc_code2full
+	set vc_code2full($class) "Type \"$gameclass\""
+    }
     lappend codel $class
 
-    set subclass [errexpect-arrayget vi vesselSubclass]
-    switch -exact $subclass {
-	null		{ lappend codel {} }
-	icy		{ lappend codel F }
-	default		{ lappend codel ($subclass) }
+    set gamesubclass [errexpect-arrayget vi vesselSubclass]
+    upvar #0 vsc_game2code($gamesubclass) subclass
+    if {[info exists subclass]} {
+	lappend codel $subclass
+    } else {
+	lappend codel ($gamesubclass)
     }
 
     switch -exact [errexpect-arrayget vi isLocked]/[ \
@@ -582,13 +690,13 @@ proc vessel {vin} {
 		set notown 1
 	    }
 	} else {
-	    set notown U
+	    set notown 2
 	}
 	append abbrev $xabbrev
 	set notes_used($vid) 1
 
     } else {
-	set notown M
+	set notown 2
 	lappend note_missings [list $island $realname $vid]
     }
 
@@ -596,7 +704,7 @@ proc vessel {vin} {
     lappend newnotes [list $vid $realname $owner $xabbrev]
     set kk "$island [join $codel _]"
     upvar #0 found($kk) k
-    lappend k [list $vid $realname]
+    lappend k [list $vid $realname $owner]
  
     debug "CODED $kk $vid $realname"
 }
@@ -666,7 +774,7 @@ proc load-chart {} {
 	yppedia_chart_parse(\*STDIN, (new IO::File ">/dev/null"),
 		sub { sprintf "%d %d", @_; },
 		sub { printf "archlabel %d %d %s\n", @_; },
-		sub { printf "island %s %s\n", @_; },
+		sub { printf "island %s {%s} %s\n", @_; },
 		sub { printf "league %s %s %s.\n", @_; },
 		sub { printf STDERR "warning: %s: incomprehensible: %s", @_; }
 			);
@@ -683,17 +791,19 @@ proc coord {c} {
 }
 
 proc chart-got/archlabel {args} { }
-proc chart-got/island {x y args} {
-#	debug "ISLE $x $y $args"
+proc chart-got/island {x y isle sizecol} {
+	debug "ISLE $x $y $isle $sizecol"
 	global canvas isleloc
-	set isleloc($args) [list $x $y]
+	set isleloc($isle) [list $x $y]
 	set sz 5
 #	$canvas create oval \
 #		[expr {[coord $x] - $sz}] [expr {[coord $y] - $sz}] \
 #		[expr {[coord $x] + $sz}] [expr {[coord $y] + $sz}] \
 #		-fill blue
+	set colour "#888"
+	if {[string match *_col $sizecol]} { set colour black }
 	$canvas create text [coord $x] [coord $y] \
-		-text $args -anchor s
+		-text $isle -anchor s -fill $colour
 }
 proc chart-got/league {x1 y1 x2 y2 kind} {
 #	debug "LEAGUE $x1 $y1 $x2 $y2 $kind"
@@ -714,7 +824,7 @@ proc redraw-needed {} {
 }
 
 proc draw {} {
-    global chart found isleloc canvas redraw_after
+    global chart found isleloc canvas redraw_after islandnames smfound
 
     catch { after cancel $redraw_after }
     catch { unset redraw_after }
@@ -727,11 +837,21 @@ proc draw {} {
 	eval chart-got/$proc [lrange $l 1 end]
     }
 
-    set lastislandname {}
+    catch { unset smfound }
     foreach key [lsort [array names found]] {
-	set c [llength $found($key)]
-#	debug "SHOWING $key $c"
 	regexp {^(.*) (\S+)$} $key dummy islandname code
+	set smcode [smash-code $code]
+	debug "smashed $code => $smcode"
+	set smkey "$islandname $smcode"
+	foreach vessel $found($key) { lappend smfound($smkey) $vessel }
+    }
+
+    set islandnames {}
+    set lastislandname {}
+    foreach smkey [lsort [array names smfound]] {
+	set c [llength $smfound($smkey)]
+#	debug "SHOWING $smkey $c"
+	regexp {^(.*) (\S+)$} $smkey dummy islandname code
 
 	if {![filters-say-yes $code]} continue
 
@@ -740,6 +860,7 @@ proc draw {} {
 		set x [coord $x]
 		set y [coord $y]
 		set lastislandname $islandname
+	        lappend islandnames $islandname
 #		debug "START Y $y"
 	}
 
@@ -750,6 +871,8 @@ proc draw {} {
     }
 
     panner::updatecanvas-bbox .cp.ctrl.pan
+
+    islandnames-update
 }
 
 
@@ -757,7 +880,7 @@ proc draw {} {
 
 proc parser-control-create {w base invokebuttontext etl_title} {
     frame $w
-    button $w.do -text $invokebuttontext -command invoke_$base
+    button $w.do -text $invokebuttontext -command invoke_$base -pady 3
 
     frame $w.resframe -width 120 -height 32
     button $w.resframe.res -text {} -anchor nw \
@@ -772,6 +895,7 @@ proc parser-control-create {w base invokebuttontext etl_title} {
     toplevel $eb
     wm withdraw $eb
     wm title $eb "where-vessels - $etl_title"
+    wm protocol $eb WM_DELETE_WINDOW [list wm withdraw $eb]
 
     label $eb.title -text $etl_title
     pack $eb.title -side top
@@ -780,17 +904,17 @@ proc parser-control-create {w base invokebuttontext etl_title} {
     pack $eb.close -side bottom
 
     frame $eb.emsg -bd 2 -relief groove
-    label $eb.emsg.lab -text "Error:"
+    label $eb.emsg.lab -anchor nw -text "Error:"
     text $eb.emsg.text -height 1
-    pack $eb.emsg.text -side bottom
+    pack $eb.emsg.text -side bottom -fill x
     pack $eb.emsg.lab -side left
 
-    pack $eb.emsg -side top -pady 2
+    pack $eb.emsg -side top -pady 2 -fill x
 
     frame $eb.text -bd 2 -relief groove
-    pack $eb.text -side bottom -pady 2
+    pack $eb.text -side bottom -pady 2 -fill both -expand y
     
-    label $eb.text.lab
+    label $eb.text.lab -anchor nw
 
     text $eb.text.text -width 85 \
 	-xscrollcommand [list $eb.text.xscroll set] \
@@ -803,10 +927,15 @@ proc parser-control-create {w base invokebuttontext etl_title} {
     scrollbar $eb.text.yscroll -orient vertical \
 	-command [list $eb.text.text yview]
 
-    grid configure $eb.text.lab -row 0 -column 0 -sticky w
-    grid configure $eb.text.text -row 1 -column 0
+    grid configure $eb.text.lab -row 0 -column 0 -sticky w -columnspan 2
+    grid configure $eb.text.text -row 1 -column 0 -sticky news
     grid configure $eb.text.yscroll -sticky ns -row 1 -column 1
     grid configure $eb.text.xscroll -sticky ew -row 2 -column 0
+    grid rowconfigure $eb.text 0 -weight 0
+    grid rowconfigure $eb.text 1 -weight 1
+    grid rowconfigure $eb.text 2 -weight 0
+    grid columnconfigure $eb.text 0 -weight 1
+    grid columnconfigure $eb.text 1 -weight 0
 }
 
 proc parser-control-ok-core {w base background show} {
@@ -892,12 +1021,34 @@ proc reparse {base varname old fulldesc okshow noneshow parse ok} {
     }
 }
 
+#---------- island names selection etc. ----------
+
+proc islandnames-update {} {
+    global islandnames
+    .islands.count configure -text [format "ships at %d island(s)" \
+					[llength $islandnames]]
+}
+
+proc islandnames-select {} {
+    .islands.clip configure -relief sunken -state disabled
+    selection own -command islandnames-deselect .islands.clip
+}
+proc islandnames-deselect {} {
+    .islands.clip configure -relief raised -state normal
+}
+
+proc islandnames-handler {offset maxchars} {
+    global islandnames
+    return [string range [join $islandnames ", "] \
+		$offset [expr {$offset+$maxchars-1}]]
+}
+
 #---------- main user interface ----------
 
 proc widgets-setup {} {
-    global canvas debug pirate ocean
+    global canvas debug pirate ocean filterstyle
 
-    wm geometry . 1024x480
+    wm geometry . 1024x600
     wm title . "where-vessels - $pirate on the $ocean ocean"
 
     #----- map -----
@@ -911,10 +1062,31 @@ proc widgets-setup {} {
     #----- control panels and filter -----
 
     frame .cp
-    frame .filter -relief groove -bd 2
-    pack .cp .filter -side top
+    frame .smash -relief groove -bd 2 -padx 1
+    frame .filter -relief groove -bd 2 -padx 1
+    frame .islands -pady 2
+    pack .cp .filter .islands .smash -side top
+
+    label .smash.title -text Smash
+    pack .smash.title -side top
+
+    make-radio-smasher .smash.subclass Subclass smash_subclass \
+	{Show Normal/LE Hide}
+    pack .smash.subclass -side top
+
+    set filterstyle 1
+    trace add variable filterstyle write filterstyle-changed
+
+    frame .filter.title
+    label .filter.title.title -text Show
+    pack .filter.title.title -side left
+    for {set fing 0} {$fing < 4} {incr fing} {
+	radiobutton .filter.title.f$fing \
+	    -variable filterstyle -value $fing \
+	    -text [lindex {All Useable Mine These:} $fing]
+	pack .filter.title.f$fing -side left
+    }
 
-    label .filter.title -text Filter
     grid configure .filter.title -row 0 -column 0 -columnspan 2
 
     #----- control panel -----
@@ -927,12 +1099,12 @@ proc widgets-setup {} {
     panner::canvas-scroll-bbox .f.c
     panner::create .cp.ctrl.pan .f.c 120 120 $debug
 
-    pack .cp.ctrl.pan -side top -pady 10 -padx 5
+    pack .cp.ctrl.pan -side top -pady 0 -padx 5
     frame .cp.ctrl.zoom
     pack .cp.ctrl.zoom -side top
 
-    button .cp.ctrl.zoom.out -text - -font {Courier 16} -command {zoom /2}
-    button .cp.ctrl.zoom.in  -text + -font {Courier 16} -command {zoom *2}
+    button .cp.ctrl.zoom.out -text - -font {Courier 16} -command {zoom /2} -pady 0
+    button .cp.ctrl.zoom.in  -text + -font {Courier 16} -command {zoom *2} -pady 0
     pack .cp.ctrl.zoom.out .cp.ctrl.zoom.in -side left
 
     parser-control-create .cp.ctrl.acquire \
@@ -947,6 +1119,14 @@ proc widgets-setup {} {
 	
     pack .cp.ctrl.notes -side top -pady 2
 
+    #----- island name count and copy -----
+
+    label .islands.count
+    button .islands.clip -text "copy island names" -pady 2 -padx 2 \
+	 -command islandnames-select
+    selection handle .islands.clip islandnames-handler
+    pack .islands.count .islands.clip -side left
+
     #----- decoding etc. report -----
 
     frame .cp.report
@@ -967,7 +1147,8 @@ proc widgets-setup {} {
     listbox .cp.report.list -height 5
 
     pack .cp.report.island .cp.report.abbrev .cp.report.details \
-	.cp.report.list .cp.report.code -side top
+	.cp.report.list -side top
+    #pack .cp.report.code -side top
     pack configure .cp.report.details -fill x
 
     foreach sw {inport class subclass lock own xabbrev} {
@@ -991,13 +1172,25 @@ proc show-report {islandname code} {
     show-report-decode $code
 
     set kk "$islandname $code"
-    upvar #0 found($kk) k
+    upvar #0 smfound($kk) k
 
     .cp.report.list delete 0 end
 
     foreach entry $k {
-	manyset $entry vid name
-	.cp.report.list insert end $name
+	manyset $entry vid name owner
+	lappend owned($owner) $name
+    }
+
+    foreach owner [lsort [array names owned]] {
+	if {[string length $owner]} {
+	    set owndesc "$owner's"
+	} else {
+	    set owndesc "Owner unknown"
+	}
+	.cp.report.list insert end "$owndesc:"
+	foreach name $owned($owner) {
+	    .cp.report.list insert end " $name"
+	}
     }
 }
 
@@ -1055,11 +1248,11 @@ proc invoke_notes {} {
 
 #---------- main program ----------
 
-vesselclasses-init
-
 parseargs
 argdefaults
 httpclientsetup where-vessels
+info-cache-update
+vesselclasses-init
 load-chart
 widgets-setup
 make-filters
@@ -1072,3 +1265,5 @@ if {[catch { parse-clipboard } emsg]} {
 after idle invoke_notes
 
 draw
+
+# rsync -r --exclude=\*~ yarrg/icons/. ijackson@chiark.greenend.org.uk:/home/ftp/users/ijackson/yarrg/vessel-info/.