set scraper {./yppedia-ocean-scraper --chart}
set info_cache _vessel-info-cache
set info_source rsync.yarrg.chiark.net::yarrg/vessel-info
-set no_owners 0
+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] ||
error "$ocean $pirate ?"
}
}
- if {![info exists pirate]} { set pirate {}; glset no_owners 1 }
- if {![string length $notes_loc]} { glset no_owners 1 }
+ 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
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
{(All lock states)} {(Not battle ready)}
} $lock]
- global no_owners notes_loc
- if {!$no_owners} {
+ if {[have-notes]} {
switch -exact $notown {
0 { report-set own "Yours" }
1 { report-set own "Other pirate's" }
}
global smash_xabbrev_map
- if {![string length $notes_loc]} {
+ if {![have-notes]} {
} elseif {[llength $smash_xabbrev_map]} {
if {[string length $xabbrev]} {
report-set xabbrev "(Flags: $xabbrev)"
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"
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-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 ----------
for {set i 0} {$i < [llength $descs]} {incr 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 {} {
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
- global no_owners
- glset smash_owner [expr {$no_owners ? 3 : 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-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} {
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} {
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} {
} 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 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 {}
#---------- main user interface ----------
proc widgets-setup {} {
- global canvas debug pirate ocean filterstyle notes_loc
+ global canvas debug pirate ocean filterstyle
wm geometry . 1200x800
if {[string length $pirate]} {
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
pack .cp.ctrl.notes -side top -pady 2
- if {![string length $notes_loc]} {
+ if {![have-notes]} {
.cp.ctrl.notes.do configure -state disabled
}
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
proc report-set {sw val} { .cp.report.details.$sw configure -text $val }
proc show-report {islandname code} {
- global no_owners
-
.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 elem $k {
+ foreach foundelem $vessels {
+ manyset $foundelem elem code
manyset $elem vid name owner
- lappend owned($owner) $name
+ lappend owned($owner) [list $name $code]
}
foreach owner [lsort [array names owned]] {
} else {
set owndesc "Owner unknown"
}
- if {!$no_owners} {
+ if {[have-notes]} {
.cp.report.list insert end "$owndesc:"
+ lappend report_list_codes {}
}
- foreach name $owned($owner) {
+ 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 {amt} {
puts stderr "$emsg\n$errorInfo"
exit 1
}
-if {[string length $notes_loc]} {
+if {[have-notes]} {
after idle invoke_notes
}
~yarrgweb / ypp-sc-tools.main.git / blobdiff