X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fwhere-vessels;h=2f9e23775adca005210ff23708dc892f52546cd8;hb=29aa2c239b63eed8908bf6ecda7889bafd61ca4c;hp=3c85552d963b9afdc7b6da37f2bc79c84dc2a18e;hpb=97393f2419dfc6ccad6f0300fd2c0e01eb552674;p=ypp-sc-tools.main.git

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 3c85552..2f9e237 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -264,18 +264,18 @@ proc info-cache-update {} {
     }
 
     set f [open $info_cache/vessel-info]
-    glset vessel_class_data [read $f]
+    glset vessel_size_data [read $f]
     close $f
 }
 
-proc vesselclasses-init {} {
+proc vesselinfo-init {} {
     global vc_game2code vc_code2abbrev vc_code2full vc_codes
 
-    global vessel_class_data
-    manyset $vessel_class_data classinfos subclassinfos
+    global vessel_size_data
+    manyset $vessel_size_data sizeinfos subclassinfos
 
     set vc_codes {}
-    foreach {game code abbrev full} $classinfos {
+    foreach {game code abbrev full} $sizeinfos {
 	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
@@ -347,7 +347,7 @@ proc code2canvas {code canvas x yvar qty qtylen bind} {
     global vc_code2abbrev
     upvar 1 $yvar y
 
-    manyset [split $code _] inport class subclass lockown xabbrev
+    manyset [split $code _] inport size subclass lockown xabbrev
 
     set stackx $x
     incr stackx 2
@@ -366,11 +366,11 @@ proc code2canvas {code canvas x yvar qty qtylen bind} {
 	incr stackx
     }
     
-    upvar #0 vc_code2abbrev($class) vcabb
+    upvar #0 vc_code2abbrev($size) vcabb
     if {![info exists vcabb]} {
-	set vcabb vc-$class
+	set vcabb vc-$size
 	image create bitmap icon/$vcabb -data \
-	    [exec pbmtext -builtin fixed $class | pnminvert | pnmcrop >t.pnm]
+	    [exec pbmtext -builtin fixed $size | pnminvert | pnmcrop >t.pnm]
     }
     canvas-horiz-stack stackx -1 $imy $bind \
 	    image -anchor nw -image icon/$vcabb
@@ -410,22 +410,29 @@ proc code2canvas {code canvas x yvar qty qtylen bind} {
 proc show-report-decode {code} {
     global vc_code2full
 
-    manyset [split $code _] inport classcode subclass lockown xabbrev
+    smash-prepare
+
+    manyset [split $code _] inport sizecode subclass lockown xabbrev
     manyset [split $lockown ""] lock notown
     
     report-set inport [lindex {{At Sea} {In port}} $inport]
-    report-set class $vc_code2full($classcode)
+
+    upvar #0 vc_code2full($sizecode) sizefull
+    upvar #0 smash_sizeinexact($sizecode) sizeinexact
+    set size_report $sizefull
+    if {[info exists sizeinexact]} { set size_report "($sizefull+)" }
+    report-set size $size_report
 
     global smash_subclass
     if {$smash_subclass >= 2} {
-	report-set subclass "(Any subclass)"
+	report-set subclass "(Any class)"
     } elseif {[
 	       upvar #0 vsc_code2report($subclass) subclass_report
 	       info exists subclass_report
 	      ]} {
 	report-set subclass $subclass_report
     } else {
-	report-set subclass "Subclass \"$subclass\""
+	report-set subclass "Class \"$subclass\""
     }
 
     report-set lock [lindex {
@@ -505,7 +512,7 @@ proc control-tickbox-flip {varsvn values} {
     redraw-needed c.-tickbox-flip $varsvn $values
 }
 
-proc populate-control-grid-tickboxes {cw rows inrow varsvn values
+proc populate-control-grid-tickboxes {cw rows inrow varsvn values flipvalues
 				    label_kind valvn default_get label_get} {
     debug "POPULATE-CONTROL-GRID-TICKBOXES $cw $rows $inrow $varsvn\
              [list $values] $label_kind $valvn"
@@ -530,7 +537,7 @@ proc populate-control-grid-tickboxes {cw rows inrow varsvn values
     }
     [make-control-grid-entry $cw final invert button] \
 	configure \
-	-text flip -command [list control-tickbox-flip $varsvn $values] \
+	-text flip -command [list control-tickbox-flip $varsvn $flipvalues] \
 	-padx 0 -pady 0
 }
 
@@ -540,7 +547,9 @@ set smash_subclass 0
 set smash_owner 0
 
 proc smash-code {code} {
-    manyset [split $code _] inport class subclass lockown xabbrev
+    manyset [split $code _] inport size subclass lockown xabbrev
+
+    upvar #0 smash_sizemap($size) smsize
 
     global smash_subclass
     if {$smash_subclass > 1} {
@@ -569,7 +578,21 @@ proc smash-code {code} {
 	4 { set lockown 33 }
     }
 
-    return [join [list $inport $class $subclass $lockown $xabbrev] _]
+    return [join [list $inport $smsize $subclass $lockown $xabbrev] _]
+}
+
+proc smash-prepare {} {
+    global vc_codes smash_sizemap smash_size smash_sizeinexact
+    set mapto {}
+    catch { unset smash_sizeplus }
+    foreach size $vc_codes {
+	if {!$smash_size($size)} {
+	    set mapto $size
+	} else {
+	    set smash_sizeinexact($mapto) 1
+	}
+	set smash_sizemap($size) $mapto
+    }
 }
 
 proc make-smasher {sma label ekind} {
@@ -588,17 +611,18 @@ proc make-radio-smasher {sma label variable descs rows inrow} {
 }
 
 proc make-smashers {} {
-    make-radio-smasher subclass Subclass smash_subclass \
+    global vc_codes vc_code2abbrev
+    set cw [make-smasher size "Size\n round\n down" frame]
+    populate-control-grid-tickboxes $cw 2 0 smash_size \
+	$vc_codes [lrange $vc_codes 1 end] \
+	image val { expr 0 } { expr {"icon/$vc_code2abbrev($val)"} }
+    $cw.0 configure -state disabled
+
+    make-radio-smasher subclass Class smash_subclass \
 	{Show Normal/LE Hide} 1 0
 
     make-radio-smasher owner Owner smash_owner \
 	{Show Yours? {For you} Lock Hide} 2 3
-
-    global vc_codes vc_code2abbrev
-
-    set cw [make-smasher size "Size\nround down" frame]
-    populate-control-grid-tickboxes $cw 2 0 smash_size $vc_codes \
-	image val { expr 0 } { expr {"icon/$vc_code2abbrev($val)"} }
 }
 
 #---------- filtering ----------
@@ -665,8 +689,9 @@ proc make-tickbox-filter {fil label rows inrow} {
 
     set fw [make-filter $fil $label frame]
 
-    populate-control-grid-tickboxes $fw $rows $inrow filter_$fil $values \
-	 $label_kind val { filter-default/$fil $val } $label_get
+    populate-control-grid-tickboxes $fw $rows $inrow filter_$fil \
+	$values $values \
+	$label_kind val { filter-default/$fil $val } $label_get
 }
 
 proc entry-filter-changed {fw fil n1 n2 op} {
@@ -751,21 +776,21 @@ proc vessel {vin} {
     set codel {}
     lappend codel [errexpect-arrayget-boolean vi inPort]
 
-    set gameclass [errexpect-arrayget vi vesselClass]
-    upvar #0 vc_game2code($gameclass) class
-    if {![info exists class]} {
-	set class "($gameclass)"
-	upvar #0 vc_code2abbrev($class) vcabb
-	set vcabb vc-$class
-	set data [exec pbmtext -builtin fixed " $gameclass " \
+    set gamesize [errexpect-arrayget vi vesselClass]
+    upvar #0 vc_game2code($gamesize) size
+    if {![info exists size]} {
+	set size "($gamesize)"
+	upvar #0 vc_code2abbrev($size) vcabb
+	set vcabb vc-$size
+	set data [exec pbmtext -builtin fixed " $gamesize " \
 		 | pnminvert | pnmcrop | pbmtoxbm]
 	debug "INVENTED ICON $vcabb $data"
 	image create bitmap icon/$vcabb -data $data
 	    
 	global vc_code2full
-	set vc_code2full($class) "Type \"$gameclass\""
+	set vc_code2full($size) "Type \"$gamesize\""
     }
-    lappend codel $class
+    lappend codel $size
 
     set gamesubclass [errexpect-arrayget vi vesselSubclass]
     upvar #0 vsc_game2code($gamesubclass) subclass
@@ -967,6 +992,8 @@ proc draw {} {
 	eval chart-got/$proc [lrange $l 1 end]
     }
 
+    smash-prepare
+
     catch { unset smfound }
     foreach key [lsort [array names found]] {
 	regexp {^(.*) (\S+)$} $key dummy islandname code
@@ -1278,7 +1305,7 @@ proc widgets-setup {} {
     #pack .cp.report.code -side top
     pack configure .cp.report.details -fill x
 
-    foreach sw {inport class subclass lock own xabbrev} {
+    foreach sw {inport size subclass lock own xabbrev} {
 	label .cp.report.details.$sw -text { }
 	pack .cp.report.details.$sw -side top -anchor w
     }
@@ -1379,7 +1406,7 @@ parseargs
 argdefaults
 httpclientsetup where-vessels
 info-cache-update
-vesselclasses-init
+vesselinfo-init
 load-chart
 widgets-setup
 make-filters