lappend note_infos [list $lno $vid $name $island $description]
}
+proc canvas-horiz-stack {xvar y type args} {
+ upvar 1 $xvar x
+ global canvas
+ set id [eval $canvas create $type $x $y $args]
+ set bbox [$canvas bbox $id]
+ set x [lindex $bbox 2]
+ return $id
+}
+
proc display-note-infos {} {
global note_infos note_missings notes
debug "display-note-infos $nmissing [array size notes]"
if {[llength $note_infos]} {
- set tiny "[llength $note_infos] warnings"
+ set tiny "[llength $note_infos] warning(s)"
} elseif {$nmissing && [array size notes]} {
set tiny "$nmissing missing"
} else {
}
}
- parser-control-failed-core .ctrl.notes notes \
+ parser-control-failed-core .cp.ctrl.notes notes \
white blue 0 \
$tiny \
"[llength $note_infos] warning(s);\
set vc_game2code($game) $code
set vc_code2abbrev($code) $abbrev
set vc_code2full($code) $full
+ image create bitmap ship-icon/$abbrev -file icondir/$abbrev.xbm
}
}
set filters {}
-#proc make-size-filter {minmax minmaxdesc} {
-# set n [llength $vc_codes]
-# $w configure
-
-# make-filter size${minmax} "$minmaxdesc size" scale \
-# [list \
-# -tickinterval 0 \
-# -variable filter_size{$minmax} \
-# -from 0 -to [expr {$n-1}] \
-# -resolution 1 \
-# -length [expr {$n*5}] \
-# ]
-
-
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-default/size {code} { return 1 }
+proc filter-says-yes/size {codel} {
+ set sizecode [lindex $codel 1]
+ upvar #0 filter_size($sizecode) yes
+ return $yes
+}
proc filter-values/lockown {} {
foreach lv {0 1 2} {
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
+}
proc filter-validate/xabbre {re} {
if {[catch {
}
return {}
}
+proc filter-says-yes/xabbre {codel} {
+ global filter_xabbre
+ set xabbrev [lindex $codel 4]
+ return [regexp -- $filter_xabbre $xabbrev]
+}
proc filter-tickbox-flip {fil} {
upvar #0 filter_$fil vars
foreach val $values {
set vars($val) [expr {!$vars($val)}]
}
- refilter-needed
+ redraw-needed
}
proc make-tickbox-filter {fil label rows inrow} {
set vars($val) [filter-default/$fil $val]
checkbutton $fw.$ix -variable filter_${fil}($val) \
-text [filter-map/$fil $val] -font fixed \
- -command refilter-needed
+ -command redraw-needed
grid configure $fw.$ix -sticky sw \
-row [expr {$ix / $inrow}] \
-column [expr {$ix % $inrow}]
} else {
$fw.error configure -text { } -background $def_background
set realvar $entryvar
- refilter-needed
+ redraw-needed
}
} emsg]} {
puts stderr "FILTER CHECK ERROR $emsg $errorInfo"
pack $fw.entry $fw.error -side top -anchor w
}
-proc refilter-needed {} {
- debug "REFILTER NEEDED"
-}
-
proc make-filter {kind fil label ekind} {
global filters
label .filter.lab_$fil -text $label -justify left
$ekind .filter.$fil
- lappend filters [list $kind $fil]
+ lappend filters $fil
set nfilters [llength $filters]
grid configure .filter.lab_$fil -row $nfilters -column 0 -sticky nw -pady 4
grid configure .filter.$fil -row $nfilters -column 1 -sticky w -pady 3
make-tickbox-filter lockown "Lock/\nowner" 2 6
make-entry-filter xabbre "Flags\n regexp" {}
}
+
+proc filters-say-yes {code} {
+ global filters
+ debug "filters-say-yes $code"
+ foreach fil $filters {
+ if {![filter-says-yes/$fil [split $code _]]} { return 0 }
+ }
+ return 1
+}
#---------- loading and parsing the clipboard (vessel locations) ----------
}
}
+proc redraw-needed {} {
+ global redraw_after
+ debug "REDRAW NEEDED"
+ if {[info exists redraw_after]} return
+ set redraw_after [after 250 draw]
+}
+
proc draw {} {
- global chart found isleloc canvas
+ global chart found isleloc canvas redraw_after
+ global vc_code2abbrev
+
+ catch { after cancel $redraw_after }
+ catch { unset redraw_after }
$canvas delete all
# debug "SHOWING $key $c"
regexp {^(.*) (\S+)$} $key dummy islandname code
+ if {![filters-say-yes $code]} continue
+
set abbrev [code2abbrev $code]
if {[string compare $lastislandname $islandname]} {
set text $abbrev
regsub -all {[0-9]} $text {} text
if {$c > 1} {
- set text [format "%2d%s" $c $text]
+ set qty [format "%2d" $c]
} else {
- set text [format " %s" $text]
+ set qty [format "99" $c]
}
- 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]
+
+ set stackx $x
+ incr stackx 2
+ set tid [canvas-horiz-stack stackx $y \
+ text -anchor nw -font fixed -text $qty]
+ incr stackx -1
+ canvas-horiz-stack stackx [expr {$y+1}] \
+ image -anchor nw -image ship-icon/$vc_code2abbrev([lindex [split $code _] 1])
+ incr stackx
+ canvas-horiz-stack stackx $y \
+ text -anchor nw -font fixed -text $text
+
+ set bbox [$canvas bbox $tid]
+ set ny [lindex $bbox 3]
+ puts "$tid $bbox"
+ set bid [$canvas create rectangle \
+ $x $y $stackx $ny \
+ -fill white]
+
+ set y $ny
+ $canvas lower $bid $tid
+
+ $canvas bind $tid <ButtonPress> [list show-report $islandname $code]
$canvas bind $bid <ButtonPress> [list show-report $islandname $code]
manyset $bbox dummy dummy dummy y
# debug "NEW Y $y"
}
- panner::updatecanvas-bbox .ctrl.pan
+ panner::updatecanvas-bbox .cp.ctrl.pan
}
manyset [errexpect-catch {
uplevel 1 $parse
if {[string length [string trim $var]]} {
- parser-control-ok .ctrl.$base $base $okshow
+ parser-control-ok .cp.ctrl.$base $base $okshow
} else {
- parser-control-none .ctrl.$base $base $noneshow
+ parser-control-none .cp.ctrl.$base $base $noneshow
}
}] failed emsg lno ei
if {$failed} {
- parser-control-failed-expected .ctrl.$base $base \
+ parser-control-failed-expected .cp.ctrl.$base $base \
$emsg $lno $ei $fulldesc $var
set var $old
uplevel 1 $parse
pack $canvas -expand 1 -fill both
pack .f -expand 1 -fill both -side left
- #----- filter -----
+ #----- control panels and filter -----
+ frame .cp
frame .filter -relief groove -bd 2
- pack .filter -side bottom
+ pack .cp .filter -side top
label .filter.title -text Filter
grid configure .filter.title -row 0 -column 0 -columnspan 2
#----- control panel -----
- frame .ctrl
- pack .ctrl -side left -anchor n
+ frame .cp.ctrl
+ pack .cp.ctrl -side left -anchor n
debug "BBOX [$canvas bbox all]"
panner::canvas-scroll-bbox .f.c
- panner::create .ctrl.pan .f.c 120 120 $debug
+ panner::create .cp.ctrl.pan .f.c 120 120 $debug
- pack .ctrl.pan -side top -pady 10 -padx 5
- frame .ctrl.zoom
- pack .ctrl.zoom -side top
+ pack .cp.ctrl.pan -side top -pady 10 -padx 5
+ frame .cp.ctrl.zoom
+ pack .cp.ctrl.zoom -side top
- button .ctrl.zoom.out -text - -font {Courier 16} -command {zoom /2}
- button .ctrl.zoom.in -text + -font {Courier 16} -command {zoom *2}
- pack .ctrl.zoom.out .ctrl.zoom.in -side left
+ button .cp.ctrl.zoom.out -text - -font {Courier 16} -command {zoom /2}
+ button .cp.ctrl.zoom.in -text + -font {Courier 16} -command {zoom *2}
+ pack .cp.ctrl.zoom.out .cp.ctrl.zoom.in -side left
- parser-control-create .ctrl.acquire \
+ parser-control-create .cp.ctrl.acquire \
acquire Acquire \
"Clipboard parsing error" \
- pack .ctrl.acquire -side top -pady 2
+ pack .cp.ctrl.acquire -side top -pady 2
- parser-control-create .ctrl.notes \
+ parser-control-create .cp.ctrl.notes \
notes "Reload notes" \
"Vessel notes loading report" \
- pack .ctrl.notes -side top -pady 2
+ pack .cp.ctrl.notes -side top -pady 2
#----- decoding etc. report -----
- frame .report
- pack .report -side left -anchor n
+ frame .cp.report
+ pack .cp.report -side left -anchor n
- label .report.island -text { }
+ label .cp.report.island -text { }
- frame .report.abbrev -background black
+ frame .cp.report.abbrev -background black
glset report_abbrev { }
- entry .report.abbrev.abbrev -state readonly \
+ entry .cp.report.abbrev.abbrev -state readonly \
-textvariable report_abbrev \
-borderwidth 0 -relief flat -width 0 \
-highlightbackground white \
-readonlybackground white -foreground black
- pack .report.abbrev.abbrev -side left -padx 1 -pady 1
+ pack .cp.report.abbrev.abbrev -side left -padx 1 -pady 1
- frame .report.code
- label .report.code.lab -text Code:
+ frame .cp.report.code
+ label .cp.report.code.lab -text Code:
glset report_code { }
- entry .report.code.code -state readonly -textvariable report_code -width 15
- pack .report.code.lab .report.code.code -side left
- frame .report.details -bd 2 -relief groove -padx 2 -pady 2
+ entry .cp.report.code.code -state readonly \
+ -textvariable report_code -width 15
+ pack .cp.report.code.lab .cp.report.code.code -side left
+ frame .cp.report.details -bd 2 -relief groove -padx 2 -pady 2
- listbox .report.list -height 5
+ listbox .cp.report.list -height 5
- pack .report.island .report.abbrev .report.details \
- .report.list .report.code -side top
- pack configure .report.details -fill x
+ pack .cp.report.island .cp.report.abbrev .cp.report.details \
+ .cp.report.list .cp.report.code -side top
+ pack configure .cp.report.details -fill x
foreach sw {inport class subclass lock own xabbrev} {
- label .report.details.$sw -text { }
- pack .report.details.$sw -side top -anchor w
+ label .cp.report.details.$sw -text { }
+ pack .cp.report.details.$sw -side top -anchor w
}
}
-proc report-set {sw val} { .report.details.$sw configure -text $val }
+proc report-set {sw val} { .cp.report.details.$sw configure -text $val }
proc show-report {islandname code} {
- .report.island configure -text $islandname
+ .cp.report.island configure -text $islandname
glset report_code $code
glset report_abbrev [code2abbrev $code]
set kk "$islandname $code"
upvar #0 found($kk) k
- .report.list delete 0 end
+ .cp.report.list delete 0 end
foreach entry $k {
manyset $entry vid name
- .report.list insert end $name
+ .cp.report.list insert end $name
}
}
if {[catch {
set clipboard [clipboard get]
} emsg]} {
- parser-control-failed-unexpected .ctrl.acquire acquire \
+ parser-control-failed-unexpected .cp.ctrl.acquire acquire \
$emsg "fetching clipboard:\n\n$errorInfo"
return
}
if {[catch {
load-notes
} emsg]} {
- parser-control-failed-unexpected .ctrl.notes notes \
+ parser-control-failed-unexpected .cp.ctrl.notes notes \
$emsg "loading $notes_loc:\n\n$errorInfo"
return
}