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=eacde3aa7eda581375a39ea13281259f0abdf120;hp=2f9e23775adca005210ff23708dc892f52546cd8;hb=13931006f26ed2707664989b5adb5ed893054dc2;hpb=29aa2c239b63eed8908bf6ecda7889bafd61ca4c

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 2f9e237..eacde3a 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -101,10 +101,11 @@ proc nextarg {} {
     return $v
 }
 
-set notes_loc vessel-notes
+set notes_loc {}
 set scraper {./yppedia-ocean-scraper --chart}
 set info_cache _vessel-info-cache
 set info_source rsync.yarrg.chiark.net::yarrg/vessel-info
+set filter_lockown_separate 0
 
 proc parseargs {} {
     global ai argv
@@ -121,25 +122,49 @@ proc parseargs {} {
 	    --local-html-dir { lappend scraper --local-html-dir=[nextarg] }
 	    --notes { glset notes_loc [nextarg] }
 	    --vessel-info-source { glset info_source [nextarg] }
+	    --filter-separate-lock-owner { glset filter_lockown_separate 1 }
 	    --debug { incr debug }
-	    default { badusage "unknown option $arg" }
+	    default { badusage "bad option $arg; see README.where-vessels" }
 	}
     }
     set argv [lrange $argv $ai end]
     if {[llength $argv]} { badusage "non-option args not allowed" }
 }
 
+proc have-notes {} {
+    global notes_loc
+    return [string length $notes_loc]
+}
+proc have-ownership {} {
+    global pirate
+    return [expr {[have-notes] && [string length $pirate]}]
+}
+
 proc argdefaults {} {
     global ocean notes_loc pirate scraper
-    if {![info exists ocean] || ![info exists pirate]} {
+    if {![info exists ocean] ||
+        (![info exists pirate] && [string length $notes_loc])} {
 	set cmd {./yarrg --find-window-only --quiet}
 	if {[info exists ocean]} { lappend cmd --ocean $ocean }
 	if {[info exists pirate]} { lappend cmd --pirate $pirate }
-	manyset [split [eval exec $cmd] " "] ocean pirate
+	if {[catch {
+	    manyset [split [eval exec $cmd] " "] ocean pirate
+	} emsg]} {
+	    puts stderr "yarrg: [string trim $emsg]"
+	    puts stderr "Alternatively pass, --ocean and perhaps --pirate options to where-vessels"
+	    exit 1
+	}
 	if {![llength $ocean] || ![llength $pirate]} {
 	    error "$ocean $pirate ?"
 	}
     }
+    if {![info exists pirate]} {
+	set pirate {}
+    }
+    if {![have-notes]} {
+	glset filter_lockown_separate 1
+    }
+
     lappend scraper $ocean
 }
 
@@ -247,7 +272,7 @@ proc display-note-infos {} {
 	$infodata
 }
 
-#---------- vessel properties ----------
+#---------- vessel info and icons ----------
 
 proc info-cache-update {} {
     global info_source info_cache
@@ -323,6 +348,8 @@ proc load-icon-combine {args} {
     image create bitmap icon/[join $args +] -data [exec bash -c $cmd]
 }
 
+#---------- vessel properties ----------
+
 proc code-lockown2icon {lockown} {
     manyset [split $lockown ""] lock notown
     set l "
@@ -343,6 +370,13 @@ proc canvas-horiz-stack {xvar xoff y bind type args} {
     return $id
 }
 
+proc code2canvas1 {code canvas} {
+    set y 2
+    code2canvas $code $canvas 5 y {} 0 {}
+    manyset [$canvas bbox all] minx dummy maxx dummy
+    $canvas configure -width [expr {$maxx-$minx+4}]
+}
+
 proc code2canvas {code canvas x yvar qty qtylen bind} {
     global vc_code2abbrev
     upvar 1 $yvar y
@@ -440,19 +474,31 @@ proc show-report-decode {code} {
 	{(All lock states)} {(Not battle ready)}
     } $lock]
 
-    switch -exact $notown {
-	0 { report-set own "Yours" }
-	1 { report-set own "Other pirate's" }
-	2 { report-set own "Owner unknown" }
-	3 { report-set own "(All ownerships)" }
-	4 - 5 { report-set own "(Yours/unknown)" }
-	default { report-set own "?? $notown" }
+    if {[have-notes]} {
+	switch -exact $notown {
+	    0 { report-set own "Yours" }
+	    1 { report-set own "Other pirate's" }
+	    2 { report-set own "Owner unknown" }
+	    3 { report-set own "(All ownerships)" }
+	    4 - 5 { report-set own "(Not yours / unknown)" }
+	    default { report-set own "?? $notown" }
+	}
     }
 
-    if {[string length $xabbrev]} {
-	report-set xabbrev "Notes flags: $xabbrev"
+    global smash_xabbrev_map
+    if {![have-notes]} {
+    } elseif {[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"
+	}
     }
 }
 
@@ -476,13 +522,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
 
@@ -504,16 +550,16 @@ proc make-control-grid-entry {cw kind ix ekind args} {
     return $ew
 }
 
-proc control-tickbox-flip {varsvn values} {
+proc control-tickbox-flip {varsvn values onflip} {
     upvar #0 $varsvn vars
     foreach val $values {
 	set vars($val) [expr {!$vars($val)}]
     }
-    redraw-needed c.-tickbox-flip $varsvn $values
+    $onflip c.-tickbox-flip $varsvn $values
 }
 
 proc populate-control-grid-tickboxes {cw rows inrow varsvn values flipvalues
-				    label_kind valvn default_get label_get} {
+			    label_kind valvn default_get label_get onflip} {
     debug "POPULATE-CONTROL-GRID-TICKBOXES $cw $rows $inrow $varsvn\
              [list $values] $label_kind $valvn"
 
@@ -526,26 +572,23 @@ 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]]
+		    -command [list $onflip 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] \
+    [make-control-grid-elem $cw final invert button] \
 	configure \
-	-text flip -command [list control-tickbox-flip $varsvn $flipvalues] \
-	-padx 0 -pady 0
+	-text flip -padx 0 -pady 0 \
+	-command [list control-tickbox-flip $varsvn $flipvalues $onflip]
 }
 
 #---------- smashing ----------
 
-set smash_subclass 0
-set smash_owner 0
-
 proc smash-code {code} {
     manyset [split $code _] inport size subclass lockown xabbrev
 
@@ -578,13 +621,16 @@ 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 smash_sizeinexact
     set mapto {}
-    catch { unset smash_sizeplus }
+    catch { unset smash_sizeinexact }
     foreach size $vc_codes {
 	if {!$smash_size($size)} {
 	    set mapto $size
@@ -593,6 +639,14 @@ proc smash-prepare {} {
 	}
 	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} {
@@ -603,11 +657,13 @@ 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 \
+	    -variable $variable -value $i \
+	    -command [list redraw-needed radio-smasher $sma] \
 	    -text [lindex $descs $i]
     }
+    return $w
 }
 
 proc make-smashers {} {
@@ -615,14 +671,33 @@ proc make-smashers {} {
     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)"} }
+	image val { expr 0 } { expr {"icon/$vc_code2abbrev($val)"} } \
+	redraw-needed
     $cw.0 configure -state disabled
 
+    glset smash_subclass 0
     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
+    glset smash_owner [expr {[have-ownership] ? 0 : 3}]
+    set cw [make-radio-smasher owner "Lock/\nowner" smash_owner \
+		{Show Yours? {For you} Lock Hide} 2 3]
+    if {![have-notes]} { $cw.0 configure -state disabled }
+    if {![have-ownership]} {
+	foreach ix {1 2} { $cw.$ix configure -state disabled }
+    }
+
+    set cw [make-smasher xabbrev "Flags" frame]
+    foreach ix {1 3} ab {a b} width {14 12} {
+	set vn smash_xabbrev_$ab
+	global $vn
+	set $vn {}
+	entry $cw.$ix -textvariable $vn -width $width
+	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 ----------
@@ -641,6 +716,26 @@ proc filter-says-yes/size {codel} {
     return $yes
 }
 
+proc filter-values/lock {} { return {0 1 2} }
+proc filter-icon/lock {lock} { return [code-lockown2icon ${lock}3] }
+proc filter-default/lock {lock} { return 1 }
+proc filter-says-yes/lock {codel} {
+    regexp {^.} [lindex $codel 3] lock
+    upvar #0 filter_lock($lock) yes
+    debug "FILTER-SAYS-YES/LOCK $codel $lock $yes"
+    return $yes
+}
+
+proc filter-values/own {} { return {0 1 2} }
+proc filter-icon/own {own} { return [code-lockown2icon 3${own}] }
+proc filter-default/own {own} { return 1 }
+proc filter-says-yes/own {codel} {
+    regexp {.$} [lindex $codel 3] own
+    upvar #0 filter_own($own) yes
+    debug "FILTER-SAYS-YES/OWN $codel $own $yes"
+    return $yes
+}
+
 proc filter-values/lockown {} {
     foreach lv {0 1 2} {
 	foreach ov {0 1 2} {
@@ -691,7 +786,8 @@ proc make-tickbox-filter {fil label rows inrow} {
 
     populate-control-grid-tickboxes $fw $rows $inrow filter_$fil \
 	$values $values \
-	$label_kind val { filter-default/$fil $val } $label_get
+	$label_kind val { filter-default/$fil $val } $label_get \
+	specific-filter-adjusted
 }
 
 proc entry-filter-changed {fw fil n1 n2 op} {
@@ -707,7 +803,7 @@ proc entry-filter-changed {fw fil n1 n2 op} {
 	} else {
 	    $fw.error configure -text { } -background $def_background
 	    set realvar $entryvar
-	    redraw-needed
+	    specific-filter-adjusted entry-filter-changed $fw
 	}
     } emsg]} {
 	puts stderr "FILTER CHECK ERROR $emsg $errorInfo"
@@ -734,15 +830,28 @@ proc make-filter {fil label ekind} {
 }
 
 proc make-filters {} {
+    global filter_lockown_separate
     make-tickbox-filter size Size 2 0
-    make-tickbox-filter lockown "Lock/\nowner" 2 6
+    if {!$filter_lockown_separate} {
+	make-tickbox-filter lockown "Lock/\nowner" 2 6
+    } else {
+	make-tickbox-filter lock "Lock" 1 0
+	if {[have-notes]} {
+	    make-tickbox-filter own "Owner" 1 0
+	}
+    }
     make-entry-filter xabbre "Flags\n regexp" {}
 }
 
+proc specific-filter-adjusted {args} {
+    glset filterstyle 3
+    eval redraw-needed $args
+}
+
 proc filterstyle-changed {n1 n2 op} {
     global filterstyle
-    debug "filterstyle-changed $filterstyle"
-    redraw-needed
+    debug "FILTERSTYLE-CHANGED $filterstyle"
+    redraw-needed filterstyle-changed
 }
 
 proc filters-say-yes {code} {
@@ -920,8 +1029,18 @@ proc load-chart {} {
     }]]
 }
 
-
-set scale 16
+proc init-scales {} {
+    global scales scaleix scale
+    set defscale 16
+    set scales {1 2 3 4 5 6 8}
+    set e12 {10 12 15 18 22 27 33 39 47 56 68 82}
+    foreach t $e12 {
+	if {$t < $defscale} { set scaleix [llength $scales] }
+	lappend scales $t
+    }
+    foreach t [lrange $e12 0 6] { lappend scales [expr {$t * 10}] }
+    set scale [lindex $scales $scaleix]
+}
 
 proc coord {c} {
 	global scale
@@ -1003,7 +1122,9 @@ proc draw {} {
 	set smcode [smash-code $code]
 	debug "smashed $code => $smcode"
 	set smkey "$islandname $smcode"
-	foreach vessel $found($key) { lappend smfound($smkey) $vessel }
+	foreach vessel $found($key) {
+	    lappend smfound($smkey) [list $vessel $code]
+	}
     }
 
     set islandnames {}
@@ -1207,7 +1328,11 @@ proc widgets-setup {} {
     global canvas debug pirate ocean filterstyle
 
     wm geometry . 1200x800
-    wm title . "where-vessels - $pirate on the $ocean ocean"
+    if {[string length $pirate]} {
+	wm title . "where-vessels - $pirate on the $ocean ocean"
+    } else {
+	wm title . "where-vessels - $ocean ocean"
+    }
 
     #----- map -----
 
@@ -1223,23 +1348,26 @@ proc widgets-setup {} {
     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
+    pack .cp .filter .islands .smash -side top -fill x
 
     label .smash.title -text {Display/combine details}
     grid .smash.title -row 0 -column 0 -columnspan 2
 
-    set filterstyle 1
+    set filterstyle [expr {[have-ownership] ? 1 : 3}]
     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} {
+    foreach fing {0 1 2 3} {
 	radiobutton .filter.title.f$fing \
 	    -variable filterstyle -value $fing \
 	    -text [lindex {All Useable Mine These:} $fing]
 	pack .filter.title.f$fing -side left
     }
+    if {![have-ownership]} {
+	foreach fing {1 2} { .filter.title.f$fing configure -state disabled }
+    }
 
     grid configure .filter.title -row 0 -column 0 -columnspan 2
 
@@ -1257,9 +1385,11 @@ proc widgets-setup {} {
     frame .cp.ctrl.zoom
     pack .cp.ctrl.zoom -side top
 
-    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
+    foreach inout {out in} minplus {- +} {
+	button .cp.ctrl.zoom.$inout -text $minplus -font {Courier 16} \
+	    -command "zoom ${minplus}1" -pady 0
+	pack .cp.ctrl.zoom.$inout -side left
+    }
 
     parser-control-create .cp.ctrl.acquire \
 	acquire Acquire \
@@ -1270,9 +1400,13 @@ proc widgets-setup {} {
     parser-control-create .cp.ctrl.notes \
 	notes "Reload notes" \
 	"Vessel notes loading report" \
-	
+
     pack .cp.ctrl.notes -side top -pady 2
 
+    if {![have-notes]} {
+	.cp.ctrl.notes.do configure -state disabled
+    }	
+	
     #----- island name count and copy -----
 
     label .islands.count
@@ -1284,7 +1418,7 @@ proc widgets-setup {} {
     #----- decoding etc. report -----
 
     frame .cp.report
-    pack .cp.report -side left -anchor n
+    pack .cp.report -side left -anchor n -fill both -expand y
 
     label .cp.report.island -text { }
 
@@ -1300,10 +1434,14 @@ proc widgets-setup {} {
 
     listbox .cp.report.list -height 5
 
+    canvas .cp.report.abbrev1 -width 1 -height 15
+
     pack .cp.report.island .cp.report.abbrev .cp.report.details \
-	.cp.report.list -side top
-    #pack .cp.report.code -side top
+	.cp.report.list .cp.report.abbrev1 -side top
+    bind .cp.report.list <<ListboxSelect>> show-report-abbrev1
+
     pack configure .cp.report.details -fill x
+    pack configure .cp.report.list -fill x
 
     foreach sw {inport size subclass lock own xabbrev} {
 	label .cp.report.details.$sw -text { }
@@ -1317,22 +1455,22 @@ proc show-report {islandname code} {
     .cp.report.island configure -text $islandname
 
     .cp.report.abbrev delete all
-    set y 2
-    code2canvas $code .cp.report.abbrev 5 y {} 0 {}
-    manyset [.cp.report.abbrev bbox all] minx dummy maxx dummy
-    .cp.report.abbrev configure -width [expr {$maxx-$minx+4}]
+    code2canvas1 $code .cp.report.abbrev
 
     glset report_code $code
     show-report-decode $code
 
     set kk "$islandname $code"
-    upvar #0 smfound($kk) k
+    upvar #0 smfound($kk) vessels
 
+    global report_list_codes
+    set report_list_codes {}
     .cp.report.list delete 0 end
 
-    foreach entry $k {
-	manyset $entry vid name owner
-	lappend owned($owner) $name
+    foreach foundelem $vessels {
+	manyset $foundelem elem code
+	manyset $elem vid name owner
+	lappend owned($owner) [list $name $code]
     }
 
     foreach owner [lsort [array names owned]] {
@@ -1341,19 +1479,43 @@ proc show-report {islandname code} {
 	} else {
 	    set owndesc "Owner unknown"
 	}
-	.cp.report.list insert end "$owndesc:"
-	foreach name $owned($owner) {
+	if {[have-notes]} {
+	    .cp.report.list insert end "$owndesc:"
+	    lappend report_list_codes {}
+	}
+	foreach ownelem $owned($owner) {
+	    manyset $ownelem name code
 	    .cp.report.list insert end " $name"
+	    lappend report_list_codes $code
 	}
     }
+    show-report-abbrev1
+}
+
+proc show-report-abbrev1 {} {
+    global report_list_codes
+    .cp.report.abbrev1 delete all
+    set ix [.cp.report.list curselection]
+    debug "SHOW-REPORT-ABBREV1 $ix $report_list_codes"
+    if {[llength $ix] != 1} return
+    set code [lindex $report_list_codes $ix]
+    if {![string length $code]} return
+    if {![have-notes]} {
+	manyset [split $code _] inport size subclass lockown xabbrev
+	regsub {.$} $lockown 3 lockown
+	set code [join [list $inport $size $subclass $lockown $xabbrev] _]
+    }
+    code2canvas1 $code .cp.report.abbrev1
 }
 
-proc zoom {extail} {
-    global scale canvas
-    set nscale [expr "\$scale $extail"]
-    debug "ZOOM $scale $nscale"
-    if {$nscale < 1 || $nscale > 200} return
-    set scale $nscale
+proc zoom {amt} {
+    global scaleix scales scale canvas
+    incr scaleix $amt
+    if {$scaleix < 0} { set scaleix 0 }
+    set nscales [llength $scales]
+    if {$scaleix >= $nscales} { set scaleix [expr {$nscales-1}] }
+    set scale [lindex $scales $scaleix]
+    debug "ZOOM $amt $scaleix $scale"
     draw
 }
 
@@ -1402,6 +1564,7 @@ proc invoke_notes {} {
 
 #---------- main program ----------
 
+init-scales
 parseargs
 argdefaults
 httpclientsetup where-vessels
@@ -1417,7 +1580,9 @@ if {[catch { parse-clipboard } emsg]} {
     puts stderr "$emsg\n$errorInfo"
     exit 1
 }
-after idle invoke_notes
+if {[have-notes]} {
+    after idle invoke_notes
+}
 
 draw
 
@@ -1428,4 +1593,10 @@ if {$debug} {
 	-prompt2 { return "> " }
 }
 
-# rsync -r --exclude=\*~ yarrg/icons/. ijackson@chiark.greenend.org.uk:/home/ftp/users/ijackson/yarrg/vessel-info/.
+# some runes I use:
+#
+# offline development
+#   ./where-vessels --notes ~/vessel-notes --vessel-info-source '' --pirate Aristarchus --ocean Midnight --debug --local-html-dir . --clipboard-file ~/clipboard-aristarchus
+#
+# updating published vessel info
+#   rsync -r --exclude=\*~ yarrg/icons/. ijackson@chiark.greenend.org.uk:/home/ftp/users/ijackson/yarrg/vessel-info/.