X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Fwhere-vessels;h=c60137532af0b2dde6fb54ad10db10f4ecc67363;hp=1506f292ad13984327e95c1cd6f4561f4aca72e1;hb=25bfdb659114a00e7bea79c97d7372e97d99bbe5;hpb=17ca1c1dcb03cf14737c098c02731a09b75b08a7

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 1506f29..c601375 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -410,11 +410,18 @@ proc code2canvas {code canvas x yvar qty qtylen bind} {
 proc show-report-decode {code} {
     global vc_code2full
 
+    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 size $vc_code2full($sizecode)
+
+    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} {
@@ -442,10 +449,19 @@ proc show-report-decode {code} {
 	default { report-set own "?? $notown" }
     }
 
-    if {[string length $xabbrev]} {
-	report-set xabbrev "Notes flags: $xabbrev"
+    global smash_xabbrev_map
+    if {[llength $smash_xabbrev_map]} {
+	if {[string length $xabbrev]} {
+	    report-set xabbrev "(Flags: $xabbrev)"
+	} else {
+	    report-set xabbrev "(No flags)"
+	}
     } else {
-	report-set xabbrev "No flags in notes"
+	if {[string length $xabbrev]} {
+	    report-set xabbrev "Notes flags: $xabbrev"
+	} else {
+	    report-set xabbrev "No flags in notes"
+	}
     }
 }
 
@@ -469,13 +485,13 @@ proc begin-control-grid {cw count rows inrow} {
     return $cw
 }
 
-proc make-control-grid-entry {cw kind ix ekind args} {
+proc make-control-grid-elem {cw kind ix ekind args} {
     upvar #0 control_grid_properties($cw) props
     manyset $props rows inrow
 
     set ew $cw.$ix
 
-    debug "MAKE-CONTROL-GRID-ENTRY $cw $kind $ix $ekind $rows $inrow $ew"
+    debug "MAKE-CONTROL-GRID-ELEM $cw $kind $ix $ekind $rows $inrow $ew"
 
     eval [list $ekind $ew] $args
 
@@ -519,7 +535,7 @@ proc populate-control-grid-tickboxes {cw rows inrow varsvn values flipvalues
     for {set ix 0} {$ix < $count} {incr ix} {
 	set val [lindex $values $ix]
 	set vars($val) [uplevel 1 $default_get]
-	set ew [make-control-grid-entry $cw ix $ix checkbutton \
+	set ew [make-control-grid-elem $cw ix $ix checkbutton \
 		    -variable ${varsvn}($val) \
 		    -font fixed \
 		    -command [list redraw-needed c.-g.-tickbox $cw $val]]
@@ -528,7 +544,7 @@ proc populate-control-grid-tickboxes {cw rows inrow varsvn values flipvalues
 	    image { $ew configure -height 16 }
 	}
     }
-    [make-control-grid-entry $cw final invert button] \
+    [make-control-grid-elem $cw final invert button] \
 	configure \
 	-text flip -command [list control-tickbox-flip $varsvn $flipvalues] \
 	-padx 0 -pady 0
@@ -571,16 +587,32 @@ proc smash-code {code} {
 	4 { set lockown 33 }
     }
 
+    global smash_xabbrev_map
+    set xabbrev [string map $smash_xabbrev_map $xabbrev]
+
     return [join [list $inport $smsize $subclass $lockown $xabbrev] _]
 }
 
 proc smash-prepare {} {
-    global vc_codes smash_sizemap smash_size
+    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 }
+	if {!$smash_size($size)} {
+	    set mapto $size
+	} else {
+	    set smash_sizeinexact($mapto) 1
+	}
 	set smash_sizemap($size) $mapto
     }
+
+    global smash_xabbrev_a smash_xabbrev_b smash_xabbrev_map
+    set smash_xabbrev_map {}
+    foreach a [split $smash_xabbrev_a ""] b [split $smash_xabbrev_b ""] {
+	if {![string length $a]} continue
+	lappend smash_xabbrev_map $a $b
+    }
+    debug "SMASH-PREPAE xabbrev_map=[list $smash_xabbrev_map]"
 }
 
 proc make-smasher {sma label ekind} {
@@ -591,7 +623,7 @@ proc make-radio-smasher {sma label variable descs rows inrow} {
     set w [make-smasher $sma $label frame]
     begin-control-grid $w [llength $descs] $rows $inrow
     for {set i 0} {$i < [llength $descs]} {incr i} {
-	make-control-grid-entry $w ix $i \
+	make-control-grid-elem $w ix $i \
 	    radiobutton \
 	    -variable $variable -value $i -command redraw-needed \
 	    -text [lindex $descs $i]
@@ -611,6 +643,18 @@ proc make-smashers {} {
 
     make-radio-smasher owner Owner smash_owner \
 	{Show Yours? {For you} Lock Hide} 2 3
+
+    set cw [make-smasher xabbrev "Flags" frame]
+    foreach ix {1 3} ab {a b} {
+	set vn smash_xabbrev_$ab
+	global $vn
+	set $vn {}
+	entry $cw.$ix -textvariable $vn -width 14
+	trace add variable $vn write [list redraw-needed $vn]
+    }
+    set ix 0
+    foreach str {y/ / /d} { label $cw.$ix -text $str; incr ix 2 }
+    eval pack [lsort [winfo children $cw]] -side left
 }
 
 #---------- filtering ----------
@@ -1318,8 +1362,8 @@ proc show-report {islandname code} {
 
     .cp.report.list delete 0 end
 
-    foreach entry $k {
-	manyset $entry vid name owner
+    foreach elem $k {
+	manyset $elem vid name owner
 	lappend owned($owner) $name
     }