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
--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" }
}
if {[llength $argv]} { badusage "non-option args not allowed" }
}
+proc have-notes {} {
+ global notes_loc
+ return [string length $notes_loc]
+}
+proc have-ownership {} {
+ 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 }
error "$ocean $pirate ?"
}
}
+ if {![info exists pirate]} {
+ set pirate {}
+ }
+ if {![have-notes]} {
+ glset filter_lockown_separate 1
+ }
+
lappend scraper $ocean
}
$infodata
}
-#---------- vessel properties ----------
+#---------- vessel info and icons ----------
proc info-cache-update {} {
global info_source info_cache
}
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
image create bitmap icon/[join $args +] -data [exec bash -c $cmd]
}
+#---------- vessel properties ----------
+
proc code-lockown2icon {lockown} {
manyset [split $lockown ""] lock notown
set l "
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
- manyset [split $code _] inport class subclass lockown xabbrev
+ manyset [split $code _] inport size subclass lockown xabbrev
set stackx $x
incr stackx 2
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
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 {
{(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 "(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"
+ }
}
}
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-ELEM $cw $kind $ix $ekind $rows $inrow $ew"
+
eval [list $ekind $ew] $args
switch -exact $kind {
return $ew
}
-#---------- smashing ----------
+proc control-tickbox-flip {varsvn values onflip} {
+ upvar #0 $varsvn vars
+ foreach val $values {
+ set vars($val) [expr {!$vars($val)}]
+ }
+ $onflip c.-tickbox-flip $varsvn $values
+}
-set smash_subclass 0
-set smash_owner 0
+proc populate-control-grid-tickboxes {cw rows inrow varsvn values flipvalues
+ label_kind valvn default_get label_get onflip} {
+ 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-elem $cw ix $ix checkbutton \
+ -variable ${varsvn}($val) \
+ -font fixed \
+ -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-elem $cw final invert button] \
+ configure \
+ -text flip -padx 0 -pady 0 \
+ -command [list control-tickbox-flip $varsvn $flipvalues $onflip]
+}
+
+#---------- smashing ----------
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} {
4 { set lockown 33 }
}
- return [join [list $inport $class $subclass $lockown $xabbrev] _]
+ 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 }
+ foreach size $vc_codes {
+ 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} {
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 {} {
+ 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)"} } \
+ redraw-needed
+ $cw.0 configure -state disabled
+
+ glset smash_subclass 0
+ make-radio-smasher subclass Class smash_subclass \
+ {Show Normal/LE Hide} 1 0
+
+ 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-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 ----------
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} {
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 \
+ specific-filter-adjusted
}
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"
}
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} {
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
}]]
}
-
-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
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
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 {}
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 -----
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
+ 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
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 \
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
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
+ .cp.report.list .cp.report.abbrev1 -side top
+ bind .cp.report.list <<ListboxSelect>> show-report-abbrev1
+
#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
}
.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]] {
} 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
}
#---------- main program ----------
+init-scales
parseargs
argdefaults
httpclientsetup where-vessels
info-cache-update
-vesselclasses-init
+vesselinfo-init
load-chart
widgets-setup
make-filters
+make-smashers
set notes_data {}
if {[catch { parse-clipboard } emsg]} {
puts stderr "$emsg\n$errorInfo"
exit 1
}
-after idle invoke_notes
+if {[have-notes]} {
+ after idle invoke_notes
+}
draw
-# rsync -r --exclude=\*~ yarrg/icons/. ijackson@chiark.greenend.org.uk:/home/ftp/users/ijackson/yarrg/vessel-info/.
+if {$debug} {
+ package require Tclx
+ commandloop -async \
+ -prompt1 { return "where-vessels% " } \
+ -prompt2 { return "> " }
+}
+
+# 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/.
~yarrgweb / ypp-sc-tools.db-test.git / blobdiff