set notes_loc vessel-notes
set scraper {./yppedia-ocean-scraper --chart}
+set info_cache _vessel-info-cache
+set info_source rsync.yarrg.chiark.net::yarrg/vessel-info
proc parseargs {} {
global ai argv
--clipboard-file { load-clipboard-file [nextarg] }
--local-html-dir { lappend scraper --local-html-dir=[nextarg] }
--notes { glset notes_loc [nextarg] }
+ --vessel-info-source { glset info_source [nextarg] }
--debug { incr debug }
default { badusage "unknown option $arg" }
}
if {[info exists ocean]} { lappend cmd --ocean $ocean }
if {[info exists pirate]} { lappend cmd --pirate $pirate }
manyset [split [eval exec $cmd] " "] ocean pirate
+ if {![llength $ocean] || ![llength $pirate]} {
+ error "$ocean $pirate ?"
+ }
}
lappend scraper $ocean
}
#---------- vessel properties ----------
+proc info-cache-update {} {
+ global info_source info_cache
+ file mkdir $info_cache
+ exec sh -c "cp -u icons/* $info_cache/."
+
+ if {[string length $info_source]} {
+ set cmdl [list \
+ rsync -udLKtOzm \
+ --exclude=*~ --exclude=*.bak --exclude=.* --exclude=*.tmp \
+ $info_source/ $info_cache 2>@ stderr]
+ debug "INFO-CACHE $cmdl"
+ eval exec $cmdl
+ }
+
+ set f [open $info_cache/vessel-info]
+ glset vessel_class_data [read $f]
+ close $f
+}
+
proc vesselclasses-init {} {
global vc_game2code vc_code2abbrev vc_code2full vc_codes
- set vcl {
- smsloop am sl Sloop
- lgsloop bm ct Cutter
- dhow cm dh Dhow
- longship dm ls Longship
- baghlah em bg Baghlah
- merchbrig fm mb {Merchant Brig}
- warbrig gm wb {War Brig}
- xebec hm xe Xebec
- warfrig im wf {War Frigate}
- merchgal jm mg {Merchant Galleon}
- grandfrig km gf {Grand Frigate}
- }
+
+ global vessel_class_data
+ manyset $vessel_class_data classinfos subclassinfos
+
set vc_codes {}
- foreach {game code abbrev full} $vcl {
+ set vc_code2abbrev(zz) vcunk
+ load-icon vcunk
+ foreach {game code abbrev full} $classinfos {
+ 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
set vc_game2code($game) $code
set vc_code2abbrev($code) $abbrev
set vc_code2full($code) $full
+ load-icon $abbrev
+ }
+
+ global vsc_code2report
+ global vsc_game2code
+ set vsc_game2code(null) {}
+ set vsc_code2report() Ordinary
+ foreach {game code full} $subclassinfos {
+ if {![regexp {^[A-Z]$} $code code]} { error "bad code" }
+ set vsc_game2code($game) $code
+ set vsc_code2report($code) $full
+ }
+
+ load-icon atsea
+ foreach a {battle borrow dot} {
+ foreach b {ours dot query} {
+ load-icon-combine $a $b
+ }
+ }
+}
+
+proc load-icon {icon} {
+ image create bitmap icon/$icon -file icons/$icon.xbm
+}
+
+proc load-icon-combine {args} {
+ set cmd {}
+ set delim "pnmcat -lr "
+ foreach icon $args {
+ append cmd $delim " <(xbmtopbm icons/$icon.xbm)"
+ set delim " <(pbmmake -white 1 1)"
}
+ append cmd " | pbmtoxbm"
+ debug "load-icon-combine $cmd"
+ image create bitmap icon/[join $args +] -data [exec bash -c $cmd]
}
-proc code2abbrev-lock {lockown} {
+proc code-lockown2icon {lockown} {
manyset [split $lockown ""] lock notown
- append abbrev [lindex {* + -} $lock]
- append abbrev [lindex {= - ?} [regsub {\D} $notown 2]]
-}
+ return icon/[
+ lindex {battle borrow dot} $lock
+ ]+[
+ lindex {ours dot query} $notown
+ ]
+}
+
+proc canvas-horiz-stack {xvar xoff y bind type args} {
+ upvar 1 $xvar x
+ upvar 1 canvas canvas
+ set id [eval $canvas create $type [expr {$x+$xoff}] $y $args]
+ set bbox [$canvas bbox $id]
+ set x [lindex $bbox 2]
+ $canvas bind $id <ButtonPress> $bind
+ return $id
+}
-proc code2abbrev {code} {
+proc code2canvas {code canvas x yvar qty qtylen bind} {
global vc_code2abbrev
+ upvar 1 $yvar y
manyset [split $code _] inport class subclass lockown xabbrev
- set abbrev {}
- append abbrev [lindex {? {}} $inport]
- append abbrev $vc_code2abbrev($class)
- append abbrev $subclass
- append abbrev [code2abbrev-lock $lockown]
- append abbrev $xabbrev
+ set stackx $x
+ incr stackx 2
+ set imy [expr {$y+2}]
+
+ if {!$inport} { incr qtylen -1 }
+ if {$qtylen<=0} { set qtylen {} }
+ set qty [format "%${qtylen}s" $qty]
+
+ set qtyid [canvas-horiz-stack stackx 0 $y $bind \
+ text -anchor nw -font fixed -text $qty]
+
+ if {!$inport} {
+ canvas-horiz-stack stackx 0 $imy $bind \
+ image -anchor nw -image icon/atsea
+ incr stackx
+ }
+
+ canvas-horiz-stack stackx -1 $imy $bind \
+ image -anchor nw -image icon/$vc_code2abbrev($class)
+
+ if {[string length $subclass]} {
+ canvas-horiz-stack stackx 0 $y $bind \
+ text -anchor nw -font fixed -text \
+ $subclass
+ }
+
+ incr stackx
+ canvas-horiz-stack stackx 0 $imy $bind \
+ image -anchor nw -image [code-lockown2icon $lockown]
+ incr stackx
+
+ if {[string length $xabbrev]} {
+ canvas-horiz-stack stackx 0 $y $bind \
+ text -anchor nw -font fixed -text \
+ $xabbrev
+ }
+
+ set bbox [$canvas bbox $qtyid]
+ set ny [lindex $bbox 3]
+ set bid [$canvas create rectangle \
+ $x $y $stackx $ny \
+ -fill white]
+
+ set y $ny
+ $canvas lower $bid $qtyid
- debug "CODE2ABBREV $code $abbrev"
- return $abbrev
+ $canvas bind $bid <ButtonPress> $bind
}
proc show-report-decode {code} {
report-set inport [lindex {{At Sea} {In port}} $inport]
report-set class $vc_code2full($classcode)
- switch -exact $subclass {
- {} { report-set subclass {Ordinary} }
- F { report-set subclass {"Frost class"} }
- default { report-set subclass "Subclass \"$subclass\"" }
+ upvar #0 vsc_code2report($subclass) subclass_report
+ if {[info exists subclass_report]} {
+ report-set subclass $subclass_report
+ } else {
+ report-set subclass "Subclass \"$subclass\""
}
report-set lock [lindex {
switch -exact $notown {
0 { report-set own "Yours" }
1 { report-set own "Other pirate's" }
- U { report-set own "Owner not known" }
- M { report-set own "Missing from notes" }
+ 2 { report-set own "Owner unknown" }
default { report-set own "?? $notown" }
}
set filters {}
proc filter-values/size {} { global vc_codes; return $vc_codes }
-proc filter-map/size {code} { upvar #0 vc_code2abbrev($code) abb; return $abb }
+proc filter-icon/size {code} {
+ upvar #0 vc_code2abbrev($code) abb
+ return icon/$abb
+}
proc filter-default/size {code} { return 1 }
proc filter-says-yes/size {codel} {
set sizecode [lindex $codel 1]
proc filter-values/lockown {} {
foreach lv {0 1 2} {
- foreach ov {0 1 X} {
+ foreach ov {0 1 2} {
lappend vals "$lv$ov"
}
}
return $vals
}
-proc filter-map/lockown {lockown} { return [code2abbrev-lock $lockown] }
+proc filter-icon/lockown {lockown} { return [code-lockown2icon $lockown] }
proc filter-default/lockown {lockown} {
return [regexp {^[01]|^2[^1]} $lockown]
}
proc filter-says-yes/lockown {codel} {
set lockown [lindex $codel 3]
- regsub -all {\D} $lockown X lockown
upvar #0 filter_lockown($lockown) yes
return $yes
}
if {!$inrow} {
set inrow [expr {($nvalues + $rows) / $rows}]
}
-
+ set noicons [catch { info args filter-icon/$fil }]
for {set ix 0} {$ix < $nvalues} {incr ix} {
set val [lindex $values $ix]
set vars($val) [filter-default/$fil $val]
checkbutton $fw.$ix -variable filter_${fil}($val) \
- -text [filter-map/$fil $val] -font fixed \
- -command redraw-needed
+ -font fixed -command redraw-needed
+ if {!$noicons} {
+ $fw.$ix configure -image [filter-icon/$fil $val] -height 16
+ } else {
+ $fw.$ix configure -text [filter-map/$fil $val]
+ }
grid configure $fw.$ix -sticky sw \
-row [expr {$ix / $inrow}] \
-column [expr {$ix % $inrow}]
make-entry-filter xabbre "Flags\n regexp" {}
}
+proc filterstyle-changed {n1 n2 op} {
+ global filterstyle
+ debug "filterstyle-changed $filterstyle"
+ redraw-needed
+}
+
proc filters-say-yes {code} {
- global filters
+ global filters filterstyle
debug "filters-say-yes $code"
+ set codel [split $code _]
+ set lockown [lindex $codel 3]
+ switch -exact $filterstyle {
+ 0 { return 1 }
+ 1 { return [filter-default/lockown $lockown] }
+ 2 { return [regexp {^.0} $lockown] }
+ 3 { }
+ default { error $filterstyle }
+ }
+
foreach fil $filters {
- if {![filter-says-yes/$fil [split $code _]]} { return 0 }
+ if {![filter-says-yes/$fil $codel]} { return 0 }
}
return 1
}
set gameclass [errexpect-arrayget vi vesselClass]
upvar #0 vc_game2code($gameclass) class
- if {![info exists class]} { errexpect-error "unexpected vesselClass"}
- lappend codel $class
+ if {[info exists class]} {
+ lappend codel $class
+ } else {
+ lappend codel zz
+ }
- set subclass [errexpect-arrayget vi vesselSubclass]
- switch -exact $subclass {
- null { lappend codel {} }
- icy { lappend codel F }
- default { lappend codel ($subclass) }
+ set gamesubclass [errexpect-arrayget vi vesselSubclass]
+ upvar #0 vsc_game2code($gamesubclass) subclass
+ if {[info exists subclass]} {
+ lappend codel $subclass
+ } else {
+ lappend codel ($gamesubclass)
}
switch -exact [errexpect-arrayget vi isLocked]/[ \
set notown 1
}
} else {
- set notown U
+ set notown 2
}
append abbrev $xabbrev
set notes_used($vid) 1
} else {
- set notown M
+ set notown 2
lappend note_missings [list $island $realname $vid]
}
lappend newnotes [list $vid $realname $owner $xabbrev]
set kk "$island [join $codel _]"
upvar #0 found($kk) k
- lappend k [list $vid $realname]
+ lappend k [list $vid $realname $owner]
debug "CODED $kk $vid $realname"
}
}
proc draw {} {
- global chart found isleloc canvas redraw_after
+ global chart found isleloc canvas redraw_after islandnames
catch { after cancel $redraw_after }
catch { unset redraw_after }
eval chart-got/$proc [lrange $l 1 end]
}
+ set islandnames {}
set lastislandname {}
foreach key [lsort [array names found]] {
set c [llength $found($key)]
if {![filters-say-yes $code]} continue
- set abbrev [code2abbrev $code]
-
if {[string compare $lastislandname $islandname]} {
manyset $isleloc($islandname) x y
set x [coord $x]
set y [coord $y]
set lastislandname $islandname
+ lappend islandnames $islandname
# debug "START Y $y"
}
- set text $abbrev
- regsub -all {[0-9]} $text {} text
- if {$c > 1} {
- set text [format "%2d%s" $c $text]
- } else {
- set text [format " %s" $text]
- }
- set id [$canvas create text $x $y \
- -anchor nw -font fixed \
- -text $text]
- set bbox [$canvas bbox $id]
- set bid [eval $canvas create rectangle $bbox -fill white]
- $canvas lower $bid $id
- $canvas bind $id <ButtonPress> [list show-report $islandname $code]
- $canvas bind $bid <ButtonPress> [list show-report $islandname $code]
- manyset $bbox dummy dummy dummy y
+
+ if {$c > 1} { set qty [format %d $c] } else { set qty {} }
+ code2canvas $code $canvas $x y $qty 2 \
+ [list show-report $islandname $code]
# debug "NEW Y $y"
}
panner::updatecanvas-bbox .cp.ctrl.pan
+
+ islandnames-update
}
proc parser-control-create {w base invokebuttontext etl_title} {
frame $w
- button $w.do -text $invokebuttontext -command invoke_$base
+ button $w.do -text $invokebuttontext -command invoke_$base -pady 3
frame $w.resframe -width 120 -height 32
button $w.resframe.res -text {} -anchor nw \
toplevel $eb
wm withdraw $eb
wm title $eb "where-vessels - $etl_title"
+ wm protocol $eb WM_DELETE_WINDOW [list wm withdraw $eb]
label $eb.title -text $etl_title
pack $eb.title -side top
pack $eb.close -side bottom
frame $eb.emsg -bd 2 -relief groove
- label $eb.emsg.lab -text "Error:"
+ label $eb.emsg.lab -anchor nw -text "Error:"
text $eb.emsg.text -height 1
- pack $eb.emsg.text -side bottom
+ pack $eb.emsg.text -side bottom -fill x
pack $eb.emsg.lab -side left
- pack $eb.emsg -side top -pady 2
+ pack $eb.emsg -side top -pady 2 -fill x
frame $eb.text -bd 2 -relief groove
- pack $eb.text -side bottom -pady 2
+ pack $eb.text -side bottom -pady 2 -fill both -expand y
- label $eb.text.lab
+ label $eb.text.lab -anchor nw
text $eb.text.text -width 85 \
-xscrollcommand [list $eb.text.xscroll set] \
scrollbar $eb.text.yscroll -orient vertical \
-command [list $eb.text.text yview]
- grid configure $eb.text.lab -row 0 -column 0 -sticky w
- grid configure $eb.text.text -row 1 -column 0
+ grid configure $eb.text.lab -row 0 -column 0 -sticky w -columnspan 2
+ grid configure $eb.text.text -row 1 -column 0 -sticky news
grid configure $eb.text.yscroll -sticky ns -row 1 -column 1
grid configure $eb.text.xscroll -sticky ew -row 2 -column 0
+ grid rowconfigure $eb.text 0 -weight 0
+ grid rowconfigure $eb.text 1 -weight 1
+ grid rowconfigure $eb.text 2 -weight 0
+ grid columnconfigure $eb.text 0 -weight 1
+ grid columnconfigure $eb.text 1 -weight 0
}
proc parser-control-ok-core {w base background show} {
}
}
+#---------- island names selection etc. ----------
+
+proc islandnames-update {} {
+ global islandnames
+ .islands.count configure -text [format "ships at %d island(s)" \
+ [llength $islandnames]]
+}
+
+proc islandnames-select {} {
+ .islands.clip configure -relief sunken -state disabled
+ selection own -command islandnames-deselect .islands.clip
+}
+proc islandnames-deselect {} {
+ .islands.clip configure -relief raised -state normal
+}
+
+proc islandnames-handler {offset maxchars} {
+ global islandnames
+ return [string range [join $islandnames ", "] \
+ $offset [expr {$offset+$maxchars-1}]]
+}
+
#---------- main user interface ----------
proc widgets-setup {} {
- global canvas debug pirate ocean
+ global canvas debug pirate ocean filterstyle
- wm geometry . 1024x480
+ wm geometry . 1024x600
wm title . "where-vessels - $pirate on the $ocean ocean"
#----- map -----
#----- control panels and filter -----
frame .cp
- frame .filter -relief groove -bd 2
- pack .cp .filter -side top
+ frame .filter -relief groove -bd 2 -padx 1
+ frame .islands -pady 2
+ pack .cp .filter .islands -side top
+
+ set filterstyle 1
+ 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} {
+ radiobutton .filter.title.f$fing \
+ -variable filterstyle -value $fing \
+ -text [lindex {All Useable Mine These:} $fing]
+ pack .filter.title.f$fing -side left
+ }
- label .filter.title -text Filter
grid configure .filter.title -row 0 -column 0 -columnspan 2
#----- control panel -----
panner::canvas-scroll-bbox .f.c
panner::create .cp.ctrl.pan .f.c 120 120 $debug
- pack .cp.ctrl.pan -side top -pady 10 -padx 5
+ pack .cp.ctrl.pan -side top -pady 0 -padx 5
frame .cp.ctrl.zoom
pack .cp.ctrl.zoom -side top
- button .cp.ctrl.zoom.out -text - -font {Courier 16} -command {zoom /2}
- button .cp.ctrl.zoom.in -text + -font {Courier 16} -command {zoom *2}
+ 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
parser-control-create .cp.ctrl.acquire \
pack .cp.ctrl.notes -side top -pady 2
+ #----- island name count and copy -----
+
+ label .islands.count
+ button .islands.clip -text "copy island names" -pady 2 -padx 2 \
+ -command islandnames-select
+ selection handle .islands.clip islandnames-handler
+ pack .islands.count .islands.clip -side left
+
#----- decoding etc. report -----
frame .cp.report
label .cp.report.island -text { }
- frame .cp.report.abbrev -background black
- glset report_abbrev { }
- entry .cp.report.abbrev.abbrev -state readonly \
- -textvariable report_abbrev \
- -borderwidth 0 -relief flat -width 0 \
- -highlightbackground white \
- -readonlybackground white -foreground black
- pack .cp.report.abbrev.abbrev -side left -padx 1 -pady 1
+ canvas .cp.report.abbrev -width 1 -height 15
frame .cp.report.code
label .cp.report.code.lab -text Code:
listbox .cp.report.list -height 5
pack .cp.report.island .cp.report.abbrev .cp.report.details \
- .cp.report.list .cp.report.code -side top
+ .cp.report.list -side top
+ #pack .cp.report.code -side top
pack configure .cp.report.details -fill x
foreach sw {inport class subclass lock own xabbrev} {
proc show-report {islandname code} {
.cp.report.island configure -text $islandname
- glset report_code $code
- glset report_abbrev [code2abbrev $code]
+ .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}]
+
+ glset report_code $code
show-report-decode $code
set kk "$islandname $code"
.cp.report.list delete 0 end
foreach entry $k {
- manyset $entry vid name
- .cp.report.list insert end $name
+ manyset $entry vid name owner
+ lappend owned($owner) $name
+ }
+
+ foreach owner [lsort [array names owned]] {
+ if {[string length $owner]} {
+ set owndesc "$owner's"
+ } else {
+ set owndesc "Owner unknown"
+ }
+ .cp.report.list insert end "$owndesc:"
+ foreach name $owned($owner) {
+ .cp.report.list insert end " $name"
+ }
}
}
#---------- main program ----------
-vesselclasses-init
-
parseargs
argdefaults
httpclientsetup where-vessels
+info-cache-update
+vesselclasses-init
load-chart
widgets-setup
make-filters
~yarrgweb / ypp-sc-tools.main.git / blobdiff