X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fwhere-vessels;h=b93db197922e0c74bdd314b946595321c6f03684;hp=66d8527a6a6d88784491efcb9d41487b599676c9;hb=ea09579bdbec295cfe7735a262e06055a1f69835;hpb=c221fee571a483c7ff5a51703a228c254cb050f3 diff --git a/yarrg/where-vessels b/yarrg/where-vessels index 66d8527..b93db19 100755 --- a/yarrg/where-vessels +++ b/yarrg/where-vessels @@ -66,6 +66,14 @@ proc errexpect-arrayget {arrayvar key} { errexpect-error "undefined $key" } +proc errexpect-arrayget-boolean {arrayvar key} { + switch -exact [uplevel 1 [list errexpect-arrayget $arrayvar $key]] { + true { return 1 } + false { return 0 } + default { errexpect-error "unexpected $key" } + } +} + proc errexpect-catch {code} { global errorInfo errorCode set rc [catch { @@ -125,6 +133,9 @@ proc argdefaults {} { 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 } @@ -180,9 +191,9 @@ proc parse-notes {} { } } -proc note-info {lno vid name description} { +proc note-info {lno vid name island description} { global note_infos - lappend note_infos [list $lno $vid $name $description] + lappend note_infos [list $lno $vid $name $island $description] } proc display-note-infos {} { @@ -192,7 +203,7 @@ proc display-note-infos {} { 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 { @@ -202,15 +213,17 @@ proc display-note-infos {} { set infodata {} foreach info $note_infos { - manyset $info lno vid name description + manyset $info lno vid name island description append infodata "vessel" append infodata " $vid" if {[string length $name]} { append infodata " $name" } + if {[string length $island]} { append infodata " ($island)" } append infodata ": " $description "\n" } if {$nmissing} { - append infodata "$nmissing vessels not mentioned in notes:\n" + if {[string length $infodata]} { append infodata "\n" } + append infodata "$nmissing vessel(s) not mentioned in notes:\n" set last_island {} foreach info [lsort $note_missings] { manyset $info island name vid @@ -222,53 +235,371 @@ proc display-note-infos {} { } } - parser-control-failed-core .ctrl.notes notes \ + parser-control-failed-core .cp.ctrl.notes notes \ white blue 0 \ $tiny \ - "[llength $note_infos] warnings;\ - $nmissing vessels missing" \ + "[llength $note_infos] warning(s);\ + $nmissing vessel(s) missing" \ "Full description of warnings and missing vessels:" \ $infodata } +#---------- vessel properties ---------- + +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 + merchgal jm mg {Merchant Galleon} + warfrig im wf {War Frigate} + grandfrig km gf {Grand Frigate} + } + set vc_codes {} + foreach {game code abbrev full} $vcl { + lappend vc_codes $code + set vc_game2code($game) $code + set vc_code2abbrev($code) $abbrev + set vc_code2full($code) $full + load-icon $abbrev + } + + 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 code-lockown2icon {lockown} { + manyset [split $lockown ""] lock notown + 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 $bind + return $id +} + +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 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 + + $canvas bind $bid $bind +} + +proc show-report-decode {code} { + global vc_code2full + + manyset [split $code _] inport classcode subclass lockown xabbrev + manyset [split $lockown ""] lock notown + + report-set inport [lindex {{At Sea} {In port}} $inport] + report-set class $vc_code2full($classcode) + + switch -exact $subclass { + {} { report-set subclass {Ordinary} } + E { report-set subclass {Emerald class} } + F { report-set subclass {Frost class} } + R { report-set subclass {Rogue class} } + V { report-set subclass {Verdant class} } + default { report-set subclass "Subclass \"$subclass\"" } + } + + report-set lock [lindex { + {Battle ready} {Unlocked} {Locked} + } $lock] + + switch -exact $notown { + 0 { report-set own "Yours" } + 1 { report-set own "Other pirate's" } + 2 { report-set own "Owner unknown" } + default { report-set own "?? $notown" } + } + + if {[string length $xabbrev]} { + report-set xabbrev "Notes flags: $xabbrev" + } else { + report-set xabbrev "No flags in notes" + } +} + +#---------- filtering ---------- + +set filters {} + +proc filter-values/size {} { global vc_codes; return $vc_codes } +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] + upvar #0 filter_size($sizecode) yes + return $yes +} + +proc filter-values/lockown {} { + foreach lv {0 1 2} { + foreach ov {0 1 2} { + lappend vals "$lv$ov" + } + } + return $vals +} +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] + upvar #0 filter_lockown($lockown) yes + return $yes +} + +proc filter-validate/xabbre {re} { + if {[catch { + regexp -- $re {} + } emsg]} { + regsub {^.*:\s*} $emsg {} emsg + regsub {^.*(.{30})$} $emsg {\1} emsg + return $emsg + } + 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 + 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 fw [make-filter tickbox $fil $label frame] + set values [filter-values/$fil] + set nvalues [llength $values] + 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) \ + -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}] + } + button $fw.invert -text flip -command [list filter-tickbox-flip $fil] \ + -padx 0 -pady 0 + grid configure $fw.invert -sticky se \ + -row [expr {$rows-1}] \ + -column [expr {$inrow-1}] +} + +proc entry-filter-changed {fw fil n1 n2 op} { + global errorInfo + upvar #0 filter_$fil realvar + upvar #0 filterentered_$fil entryvar + global def_background + debug "entry-filter-changed $fw $fil $entryvar" + if {[catch { + set error [filter-validate/$fil $entryvar] + if {[string length $error]} { + $fw.error configure -text $error -foreground white -background red + } else { + $fw.error configure -text { } -background $def_background + set realvar $entryvar + redraw-needed + } + } emsg]} { + puts stderr "FILTER CHECK ERROR $emsg $errorInfo" + } +} + +proc make-entry-filter {fil label def} { + global filterentered_$fil + upvar #0 filter_$fil realvar + set realvar $def + set fw [make-filter entry $fil $label frame] + entry $fw.entry -textvariable filterentered_$fil + label $fw.error + glset def_background [$fw.error cget -background] + trace add variable filterentered_$fil write \ + [list entry-filter-changed $fw $fil] + pack $fw.entry $fw.error -side top -anchor w +} + +proc make-filter {kind fil label ekind} { + global filters + label .filter.lab_$fil -text $label -justify left + $ekind .filter.$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 + return .filter.$fil +} + +proc make-filters {} { + make-tickbox-filter size Size 2 0 + make-tickbox-filter lockown "Lock/\nowner" 2 6 + 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 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 $codel]} { return 0 } + } + return 1 +} + #---------- loading and parsing the clipboard (vessel locations) ---------- proc vessel {vin} { global pirate notes_used note_missings newnotes upvar 1 $vin vi - set abbrev {} - switch -exact [errexpect-arrayget vi inPort] { - true { } - false { append abbrev ? } - default { errexpect-error "unexpected inPort" } - } - switch -exact [errexpect-arrayget vi vesselClass] { - smsloop { set sz 00sl } - lgsloop { set sz 01ct } - dhow { set sz 02dh } - longship { set sz 03ls } - baghlah { set sz 04bg } - merchbrig { set sz 05mb } - warbrig { set sz 06wb } - xebec { set sz 07xe } - warfrig { set sz 08wf } - merchgal { set sz 09mg } - grandfrig { set sz 10gf } - default { errexpect-error "unknown class" } - } - append abbrev $sz - switch -exact [errexpect-arrayget vi vesselSubclass] { - null { } - icy { append abbrev F } - default { errexpect-error "unknown subclass ?" } + + 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]} { errexpect-error "unexpected vesselClass"} + lappend codel $class + + set subclass [errexpect-arrayget vi vesselSubclass] + switch -exact $subclass { + null { lappend codel {} } + celtic { lappend codel E } + icy { lappend codel F } + rogue { lappend codel R } + verdant { lappend codel V } + default { lappend codel ($subclass) } } + switch -exact [errexpect-arrayget vi isLocked]/[ \ errexpect-arrayget vi isBattleReady] { - true/false { append abbrev 2- } - false/false { append abbrev 1+ } - false/true { append abbrev 0* } + true/false { set lock 2 } + false/false { set lock 1 } + false/true { set lock 0 } default { errexpect-error "unexpected isLocked/isBattleReady" } } + set vid [errexpect-arrayget vi vesselId] upvar #0 notes($vid) note set realname [errexpect-arrayget vi vesselName] @@ -279,35 +610,40 @@ proc vessel {vin} { if {[info exists note]} { manyset $note lno notename owner xabbrev if {[string compare -nocase $realname $notename]} { - note-info $lno $vid $realname \ - "notes say name is $notename - perhaps renamed" + note-info $lno $vid $realname $island \ + "notes say name is $notename" } if {[string length $owner]} { if {![string compare $owner $pirate]} { - append abbrev = + set notown 0 } else { - append abbrev - + set notown 1 } + } else { + set notown 2 } append abbrev $xabbrev set notes_used($vid) 1 } else { + set notown 2 lappend note_missings [list $island $realname $vid] } + + lappend codel "$lock$notown" $xabbrev lappend newnotes [list $vid $realname $owner $xabbrev] - - set kk "$island $abbrev" - upvar #0 count($kk) k - if {![info exists k]} { set k 0 } - incr k + set kk "$island [join $codel _]" + upvar #0 found($kk) k + lappend k [list $vid $realname $owner] + + debug "CODED $kk $vid $realname" } set clipboard {} proc parse-clipboard {} { - global clipboard count notes notes_used newnotes + global clipboard found notes notes_used newnotes - catch { unset count } + catch { unset found } catch { unset notes_used } glset note_infos {} glset note_missings {} @@ -341,7 +677,7 @@ proc parse-clipboard {} { foreach vid [lsort [array names notes]] { if {![info exists notes_used($vid)]} { manyset $notes($vid) lno notename - note-info $lno $vid $notename \ + note-info $lno $vid $notename {} \ "vessel in notes no longer found" } } @@ -408,8 +744,18 @@ proc chart-got/league {x1 y1 x2 y2 kind} { } } +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 count isleloc canvas + global chart found isleloc canvas redraw_after islandnames + + catch { after cancel $redraw_after } + catch { unset redraw_after } $canvas delete all @@ -419,36 +765,33 @@ proc draw {} { eval chart-got/$proc [lrange $l 1 end] } + set islandnames {} set lastislandname {} - foreach key [lsort [array names count]] { - set c $count($key) + foreach key [lsort [array names found]] { + set c [llength $found($key)] # debug "SHOWING $key $c" - regexp {^(.*) (\S+)$} $key dummy islandname abbrev + regexp {^(.*) (\S+)$} $key dummy islandname code + + if {![filters-say-yes $code]} continue + 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 - 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 .ctrl.pan + panner::updatecanvas-bbox .cp.ctrl.pan + + islandnames-update } @@ -456,7 +799,7 @@ proc draw {} { 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 \ @@ -471,6 +814,7 @@ proc parser-control-create {w base invokebuttontext etl_title} { 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 @@ -479,17 +823,17 @@ proc parser-control-create {w base invokebuttontext etl_title} { 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] \ @@ -502,10 +846,15 @@ proc parser-control-create {w base invokebuttontext etl_title} { 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} { @@ -576,13 +925,13 @@ proc reparse {base varname old fulldesc okshow noneshow parse ok} { 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 @@ -591,10 +940,37 @@ proc reparse {base varname old fulldesc okshow noneshow parse ok} { } } +#---------- 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 . 1024x600 + wm title . "where-vessels - $pirate on the $ocean ocean" + + #----- map ----- frame .f -border 1 -relief groove set canvas .f.c @@ -602,36 +978,131 @@ proc widgets-setup {} { pack $canvas -expand 1 -fill both pack .f -expand 1 -fill both -side left - frame .ctrl - pack .ctrl -side right + #----- control panels and filter ----- + + frame .cp + 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 + } + + grid configure .filter.title -row 0 -column 0 -columnspan 2 + + #----- control panel ----- + + 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 0 -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} -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 .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 - wm geometry . 1024x480 - wm title . "where-vessels - $pirate on the $ocean ocean" + #----- 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 + pack .cp.report -side left -anchor n + + label .cp.report.island -text { } + + canvas .cp.report.abbrev -width 1 -height 15 + + frame .cp.report.code + label .cp.report.code.lab -text Code: + glset report_code { } + 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 .cp.report.list -height 5 + + pack .cp.report.island .cp.report.abbrev .cp.report.details \ + .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} { + label .cp.report.details.$sw -text { } + pack .cp.report.details.$sw -side top -anchor w + } +} + +proc report-set {sw val} { .cp.report.details.$sw configure -text $val } + +proc show-report {islandname code} { + .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}] + + glset report_code $code + show-report-decode $code + + set kk "$islandname $code" + upvar #0 found($kk) k + + .cp.report.list delete 0 end + + foreach entry $k { + 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" + } + } } proc zoom {extail} { @@ -650,7 +1121,7 @@ proc invoke_acquire {} { 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 } @@ -671,7 +1142,7 @@ proc invoke_notes {} { 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 } @@ -689,12 +1160,18 @@ proc invoke_notes {} { #---------- main program ---------- parseargs +vesselclasses-init argdefaults httpclientsetup where-vessels load-chart widgets-setup +make-filters set notes_data {} +if {[catch { parse-clipboard } emsg]} { + puts stderr "$emsg\n$errorInfo" + exit 1 +} after idle invoke_notes draw