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

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 2e625c1..47cd6ed 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -254,8 +254,8 @@ proc vesselclasses-init {} {
 	merchbrig	fm	mb	{Merchant Brig}
 	warbrig		gm	wb	{War Brig}
 	xebec		hm	xe	Xebec
-	warfrig		im	wf	{War Frigate}
 	merchgal	jm	mg	{Merchant Galleon}
+	warfrig		im	wf	{War Frigate}
 	grandfrig	km	gf	{Grand Frigate}
     }
     set vc_codes {}
@@ -267,24 +267,38 @@ 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
+    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
 }
 
-proc code2abbrev-lock {lockown} {
+proc load-icon-combine {args} {
+    set cmd {}
+    set delim "pnmcat -lr "
+    foreach icon $args {
+	append cmd $delim " <(xbmtopbm icons/$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,12 +320,19 @@ 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
+    }
+    
     canvas-horiz-stack stackx -1 $imy $bind \
 	    image -anchor nw -image icon/$vc_code2abbrev($class)
 
@@ -321,15 +342,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]} {
@@ -372,8 +387,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" }
     }
 
@@ -402,19 +416,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
 }
@@ -582,13 +595,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]
     }
 
@@ -714,7 +727,7 @@ proc redraw-needed {} {
 }
 
 proc draw {} {
-    global chart found isleloc canvas redraw_after
+    global chart found isleloc canvas redraw_after islandnames
 
     catch { after cancel $redraw_after }
     catch { unset redraw_after }
@@ -727,6 +740,7 @@ proc draw {} {
 	eval chart-got/$proc [lrange $l 1 end]
     }
 
+    set islandnames {}
     set lastislandname {}
     foreach key [lsort [array names found]] {
 	set c [llength $found($key)]
@@ -740,6 +754,7 @@ proc draw {} {
 		set x [coord $x]
 		set y [coord $y]
 		set lastislandname $islandname
+	        lappend islandnames $islandname
 #		debug "START Y $y"
 	}
 
@@ -750,6 +765,8 @@ proc draw {} {
     }
 
     panner::updatecanvas-bbox .cp.ctrl.pan
+
+    islandnames-update
 }
 
 
@@ -757,7 +774,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 \
@@ -892,6 +909,28 @@ 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 {} {
@@ -911,8 +950,9 @@ proc widgets-setup {} {
     #----- control panels and filter -----
 
     frame .cp
-    frame .filter -relief groove -bd 2
-    pack .cp .filter -side top
+    frame .filter -relief groove -bd 2 -padx 1
+    frame .islands -pady 2
+    pack .cp .filter .islands -side top
 
     label .filter.title -text Filter
     grid configure .filter.title -row 0 -column 0 -columnspan 2
@@ -927,12 +967,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 +987,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 +1015,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} {
@@ -1055,9 +1104,8 @@ proc invoke_notes {} {
 
 #---------- main program ----------
 
-vesselclasses-init
-
 parseargs
+vesselclasses-init
 argdefaults
 httpclientsetup where-vessels
 load-chart