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
}
load-icon $abbrev
}
- load-icon unlocked
- load-icon locked
- load-icon battle
load-icon atsea
- load-icon borrow
- load-icon query
- load-icon ours
- load-icon dot
+ 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 code2abbrev-lock {lockown} {
+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 code-lockown2icon {lockown} {
manyset [split $lockown ""] lock notown
- append abbrev [lindex {x u .} $lock]
- append abbrev [lindex {m . ?} [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
$subclass
}
- manyset [split $lockown ""] lock notown
-
incr stackx
canvas-horiz-stack stackx 0 $imy $bind \
- image -anchor nw -image icon/[lindex {battle borrow dot} $lock]
- incr stackx
- canvas-horiz-stack stackx 0 $imy $bind \
- image -anchor nw -image icon/[lindex {ours dot query} \
- [regsub {\D} $notown 2]]
+ image -anchor nw -image [code-lockown2icon $lockown]
incr stackx
if {[string length $xabbrev]} {
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" }
}
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
}
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 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)]
set x [coord $x]
set y [coord $y]
set lastislandname $islandname
+ lappend islandnames $islandname
# debug "START 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
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} {
.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
+vesselclasses-init
argdefaults
httpclientsetup where-vessels
load-chart
~yarrgweb / ypp-sc-tools.db-live.git / blobdiff