X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fwhere-vessels;h=40a50e4106a058567d63ef7a2f8898c0cae8cd50;hb=cbf2f65bbd48ebcd9410e3cb09358e79b2b3e0f2;hp=14d2e0e2fce54153807a5774639c3ed4ba808a84;hpb=55e0e74412d88ce934886762801cab2ab830a1a8;p=ypp-sc-tools.db-test.git

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 14d2e0e..40a50e4 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -474,6 +474,9 @@ proc make-control-grid-entry {cw kind ix ekind args} {
     manyset $props rows inrow
 
     set ew $cw.$ix
+
+    debug "MAKE-CONTROL-GRID-ENTRY $cw $kind $ix $ekind $rows $inrow $ew"
+
     eval [list $ekind $ew] $args
 
     switch -exact $kind {
@@ -494,6 +497,43 @@ proc make-control-grid-entry {cw kind ix ekind args} {
     return $ew
 }
 
+proc control-tickbox-flip {varsvn values} {
+    upvar #0 $varsvn vars
+    foreach val $values {
+	set vars($val) [expr {!$vars($val)}]
+    }
+    redraw-needed c.-tickbox-flip $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"
+
+    upvar #0 $varsvn vars
+    upvar 1 $valvn val
+    set count [llength $values]
+
+    begin-control-grid $cw $count $rows $inrow
+
+    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 \
+		    -variable ${varsvn}($val) \
+		    -font fixed \
+		    -command [list redraw-needed c.-g.-tickbox $cw $val]]
+	$ew configure -$label_kind [uplevel 1 $label_get]
+	switch -exact $label_kind {
+	    image { $ew configure -height 16 }
+	}
+    }
+    [make-control-grid-entry $cw final invert button] \
+	configure \
+	-text flip -command [list control-tickbox-flip $varsvn $flipvalues] \
+	-padx 0 -pady 0
+}
+
 #---------- smashing ----------
 
 set smash_subclass 0
@@ -502,6 +542,8 @@ set smash_owner 0
 proc smash-code {code} {
     manyset [split $code _] inport class subclass lockown xabbrev
 
+    upvar #0 smash_sizemap($class) smclass
+
     global smash_subclass
     if {$smash_subclass > 1} {
 	set subclass {}
@@ -529,7 +571,16 @@ proc smash-code {code} {
 	4 { set lockown 33 }
     }
 
-    return [join [list $inport $class $subclass $lockown $xabbrev] _]
+    return [join [list $inport $smclass $subclass $lockown $xabbrev] _]
+}
+
+proc smash-prepare {} {
+    global vc_codes smash_sizemap smash_size
+    set mapto {}
+    foreach size $vc_codes {
+	if {!$smash_size($size)} { set mapto $size }
+	set smash_sizemap($size) $mapto
+    }
 }
 
 proc make-smasher {sma label ekind} {
@@ -547,6 +598,21 @@ proc make-radio-smasher {sma label variable descs rows inrow} {
     }
 }
 
+proc make-smashers {} {
+    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 Subclass smash_subclass \
+	{Show Normal/LE Hide} 1 0
+
+    make-radio-smasher owner Owner smash_owner \
+	{Show Yours? {For you} Lock Hide} 2 3
+}
+
 #---------- filtering ----------
 
 set filters {}
@@ -598,41 +664,22 @@ proc filter-says-yes/xabbre {codel} {
     return [regexp -- $filter_xabbre $xabbrev]
 }
 
-proc filter-tickbox-flip {fil} {
-    upvar #0 filter_$fil vars
-    set values [filter-values/$fil]
-    foreach val $values {
-	set vars($val) [expr {!$vars($val)}]
-    }
-    redraw-needed
-}
-
 proc make-tickbox-filter {fil label rows inrow} {
-    upvar #0 filter_$fil vars
     set values [filter-values/$fil]
-    set count [llength $values]
-    set noicons [catch { info args filter-icon/$fil }]
+
+    if {![catch { info args filter-icon/$fil }]} {
+	set label_get { filter-icon/$fil $val }
+	set label_kind image
+    } else {
+	set label_get { filter-map/$fil $val }
+	set label_kind text
+    }
 
     set fw [make-filter $fil $label frame]
-    begin-control-grid $fw $count $rows $inrow
 
-    for {set ix 0} {$ix < $count} {incr ix} {
-	set val [lindex $values $ix]
-	set vars($val) [filter-default/$fil $val]
-	set ew [make-control-grid-entry $fw ix $ix checkbutton \
-		    -variable filter_${fil}($val) \
-		    -font fixed \
-		    -command [list redraw-needed tickbox-filter $fil $val]]
-	if {!$noicons} {
-	    $fw.$ix configure -image [filter-icon/$fil $val] -height 16
-	} else {
-	    $fw.$ix configure -text [filter-map/$fil $val]
-	}
-    }
-    [make-control-grid-entry $fw final invert button] \
-	configure \
-	-text flip -command [list filter-tickbox-flip $fil] \
-	-padx 0 -pady 0
+    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} {
@@ -933,6 +980,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
@@ -1145,7 +1194,7 @@ proc islandnames-handler {offset maxchars} {
 proc widgets-setup {} {
     global canvas debug pirate ocean filterstyle
 
-    wm geometry . 1024x600
+    wm geometry . 1200x800
     wm title . "where-vessels - $pirate on the $ocean ocean"
 
     #----- map -----
@@ -1164,15 +1213,9 @@ proc widgets-setup {} {
     frame .islands -pady 2
     pack .cp .filter .islands .smash -side top
 
-    label .smash.title -text Smash
+    label .smash.title -text {Display/combine details}
     grid .smash.title -row 0 -column 0 -columnspan 2
 
-    make-radio-smasher subclass Subclass smash_subclass \
-	{Show Normal/LE Hide} 1 0
-
-    make-radio-smasher owner Owner smash_owner \
-	{Show Yours? {For you} Lock Hide} 2 3
-
     set filterstyle 1
     trace add variable filterstyle write filterstyle-changed
 
@@ -1355,6 +1398,7 @@ vesselclasses-init
 load-chart
 widgets-setup
 make-filters
+make-smashers
 
 set notes_data {}
 if {[catch { parse-clipboard } emsg]} {
@@ -1365,4 +1409,11 @@ after idle invoke_notes
 
 draw
 
+if {$debug} {
+    package require Tclx
+    commandloop -async \
+	-prompt1 { return "where-vessels% " } \
+	-prompt2 { return "> " }
+}
+
 # rsync -r --exclude=\*~ yarrg/icons/. ijackson@chiark.greenend.org.uk:/home/ftp/users/ijackson/yarrg/vessel-info/.