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=73f416a5beaa546c0fa6e0ed745289f2949d87ae;hp=ecf1e063156bbd3ddee66d3359da8a4ab5b6b1da;hb=48e77a76589d23fa8916e97d3abdd816fe05cf95;hpb=4f2334b5230b2ee0f3a1416bb7f4019d684fb520 diff --git a/yarrg/where-vessels b/yarrg/where-vessels index ecf1e06..73f416a 100755 --- a/yarrg/where-vessels +++ b/yarrg/where-vessels @@ -47,6 +47,48 @@ proc glset {n val} { set var $val } +#---------- expecting certain errors ---------- + +proc errexpect-setline {lno line} { + glset errexpect_lno $lno + glset errexpect_line $line +} + +proc errexpect-error {m} { + global errexpect_line errexpect_lno + error $m "$errexpect_line\n" [list YARRG-ERREXPECT $errexpect_lno] +} + +proc errexpect-arrayget {arrayvar key} { + upvar 1 $arrayvar av + upvar 1 ${arrayvar}($key) v + if {[info exists v]} { return $v } + 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 { + uplevel 1 $code + } rv] + debug "ERREXPECT CATCH |$rc|$rv|$errorCode|$errorInfo|" + if {$rc==1 && ![string compare YARRG-ERREXPECT [lindex $errorCode 0]]} { + return [list 1 $rv [lindex $errorCode 1] $errorInfo] + } elseif {$rc==0} { + return [list 0 $rv] + } else { + return -code $rc -errorinfo $errorInfo -errorcode $errorCode $rv + } +} + #---------- argument parsing ---------- proc nextarg {} { @@ -99,107 +141,434 @@ proc argdefaults {} { #---------- loading and parsing the vessel notes ---------- proc load-notes {} { - global notes_loc notes - catch { unset notes } + global notes_loc notes_data if {[regexp {^\w+\:} $notes_loc]} { - vwait idletasks - debug "FETCHING NOTES" - ::http::geturl $notes_loc - switch -glob [::http::status].[::http::ncode] { + update + debug "FETCHING NOTES $notes_loc" + set req [::http::geturl $notes_loc] + switch -glob [::http::status $req].[::http::ncode $req] { ok.200 { } - ok.* { error "retrieving vessel-notes $url: [::http::code]" } - * { error "retrieving vessel-notes $url: [::http::error]" } + ok.* { error "retrieving vessel-notes: [::http::code $req]" } + * { error "Retrieving vessel-notes: [::http::error $req]" } } - set notes_data [::http::data] - ::http::cleanup + set newdata [::http::data $req] + ::http::cleanup $req } else { + debug "READING NOTES $notes_loc" set vn [open $notes_loc] - set notes_data [read $vn] + set newdata [read $vn] close $vn } + set notes_data $newdata +} + +proc parse-notes {} { + global notes_data notes + catch { unset notes } + + set lno 0 foreach l [split $notes_data "\n"] { - regsub -all {\t+} $l "\t" l - manyset [split $l "\t"] vname vid owner note - set nk $vid.$vname - debug "SET NOTE $nk" - set notes($nk) [list $owner $note] + incr lno + errexpect-setline $lno $l + set l [string trim $l] + if {![string length $l]} continue + if {[regexp {^\#} $l]} continue + if {![regexp -expanded \ + {^ (\d+) (?: \s+([^=]*?) )? \s* = + (?: \s* (\S+) + (?: \s+ (\S+) )?)? $} \ + $l dummy vid vname owner note]} { + errexpect-error "badly formatted" + } + set vname [string trim $vname] + if {[info exists notes($vid)]} { + errexpect-error "duplicate vesselid $vid" + } + set notes($vid) [list $lno $vname $owner $note] } } +proc note-info {lno vid name island description} { + global note_infos + lappend note_infos [list $lno $vid $name $island $description] +} -#---------- loading and parsing the clipboard (vessel locations) ---------- +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 vessel {vin} { - global pirate notes_used - upvar 1 $vin vi - switch -exact $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 { error "$vi(vesselClass) ?" } +proc display-note-infos {} { + global note_infos note_missings notes + + set nmissing [llength $note_missings] + debug "display-note-infos $nmissing [array size notes]" + + if {[llength $note_infos]} { + set tiny "[llength $note_infos] warning(s)" + } elseif {$nmissing && [array size notes]} { + set tiny "$nmissing missing" + } else { + return + } + + set infodata {} + + foreach info $note_infos { + 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} { + 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 + if {[string compare $island $last_island]} { + append infodata "# $island:\n" + set last_island $island + } + append infodata [format "%-9d %-29s =\n" $vid $name] } - set abbrev $sz - switch -exact $vi(vesselSubclass) { - null { } - icy { append abbrev F } - default { error "$vi(vesselSubclass) ?" } + } + + parser-control-failed-core .cp.ctrl.notes notes \ + white blue 0 \ + $tiny \ + "[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 + warfrig im wf {War Frigate} + merchgal jm mg {Merchant Galleon} + 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 + image create bitmap ship-icon/$abbrev -file icondir/$abbrev.xbm + } +} + +proc code2abbrev-lock {lockown} { + manyset [split $lockown ""] lock notown + append abbrev [lindex {* + -} $lock] + append abbrev [lindex {= - ?} [regsub {\D} $notown 2]] +} + +proc code2abbrev {code} { + global vc_code2abbrev + + 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 + + debug "CODE2ABBREV $code $abbrev" + return $abbrev +} + +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} } + F { report-set subclass {"Frost 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" } + U { report-set own "Owner not known" } + M { report-set own "Missing from notes" } + 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-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} { + foreach ov {0 1 X} { + lappend vals "$lv$ov" } - switch -exact $vi(isLocked)/$vi(isBattleReady) { - true/false { append abbrev 2- } - false/false { append abbrev 1+ } - false/true { append abbrev 0* } - default { error "$vi(isLocked)/$vi(isBattleReady) ?" } + } + return $vals +} +proc filter-map/lockown {lockown} { return [code2abbrev-lock $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 +} + +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}] + } + + 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 + 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 } - switch -exact $vi(inPort) { - true { } - false { append abbrev ? } - default { error "$vi(inPort) ?" } + } 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 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 vessel {vin} { + global pirate notes_used note_missings newnotes + upvar 1 $vin vi + + 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 {} } + icy { lappend codel F } + default { lappend codel ($subclass) } + } + + switch -exact [errexpect-arrayget vi isLocked]/[ \ + errexpect-arrayget vi isBattleReady] { + 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] + set island [errexpect-arrayget vi islandName] + + set owner {} + set xabbrev {} + if {[info exists note]} { + manyset $note lno notename owner xabbrev + if {[string compare -nocase $realname $notename]} { + note-info $lno $vid $realname $island \ + "notes say name is $notename" } - set nk $vi(vesselId).$vi(vesselName) - upvar #0 notes($nk) note - if {[info exists note]} { - manyset $note owner xabbrev + if {[string length $owner]} { if {![string compare $owner $pirate]} { - append abbrev = + set notown 0 } else { - append abbrev - + set notown 1 } - append abbrev $xabbrev - set notes_used($nk) 1 } else { - debug "UNKNOWN $nk" + set notown U } - set kk "$vi(islandName) $abbrev" - upvar #0 count($kk) k - if {![info exists k]} { set k 0 } - incr k + append abbrev $xabbrev + set notes_used($vid) 1 + + } else { + set notown M + lappend note_missings [list $island $realname $vid] + } + + lappend codel "$lock$notown" $xabbrev + lappend newnotes [list $vid $realname $owner $xabbrev] + set kk "$island [join $codel _]" + upvar #0 found($kk) k + lappend k [list $vid $realname] + + debug "CODED $kk $vid $realname" } set clipboard {} proc parse-clipboard {} { - global clipboard count notes notes_used + global clipboard found notes notes_used newnotes - catch { unset count } + catch { unset found } catch { unset notes_used } + glset note_infos {} + glset note_missings {} + + set newnotes {} set itemre { (\w+) = ([^=]*) } set manyitemre "^\\\[ $itemre ( (?: ,\\ $itemre)* ) \\]\$" debug $manyitemre + set lno 0 foreach l [split $clipboard "\n"] { + incr lno + errexpect-setline $lno $l if {![string length $l]} continue catch { unset vi } while 1 { if {![regexp -expanded $manyitemre $l dummy \ - thiskey thisval rhs]} { error "$l ?" } + thiskey thisval rhs]} { + errexpect-error "badly formatted" + } set vi($thiskey) $thisval if {![string length $rhs]} break regsub {^, } $rhs {} rhs @@ -208,9 +577,13 @@ proc parse-clipboard {} { vessel vi } - foreach nk [lsort [array names notes]] { - if {![info exists notes_used($nk)]} { - debug "IGNORED NOTE $nk" + if {[llength $newnotes]} { + foreach vid [lsort [array names notes]] { + if {![info exists notes_used($vid)]} { + manyset $notes($vid) lno notename + note-info $lno $vid $notename {} \ + "vessel in notes no longer found" + } } } } @@ -275,8 +648,19 @@ 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 + global vc_code2abbrev + + catch { after cancel $redraw_after } + catch { unset redraw_after } $canvas delete all @@ -287,10 +671,15 @@ proc draw {} { } 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 + + set abbrev [code2abbrev $code] + if {[string compare $lastislandname $islandname]} { manyset $isleloc($islandname) x y set x [coord $x] @@ -301,28 +690,190 @@ proc draw {} { 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 + + 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 [list show-report $islandname $code] + $canvas bind $bid [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 +} + + +#---------- parser error reporting ---------- + +proc parser-control-create {w base invokebuttontext etl_title} { + frame $w + button $w.do -text $invokebuttontext -command invoke_$base + + frame $w.resframe -width 120 -height 32 + button $w.resframe.res -text {} -anchor nw \ + -padx 1 -pady 1 -borderwidth 0 -justify left + glset deffont_$base [$w.resframe.res cget -font] + place $w.resframe.res -relx 0.5 -y 0 -anchor n + + pack $w.do -side top + pack $w.resframe -side top -expand y -fill both + + set eb .err_$base + toplevel $eb + wm withdraw $eb + wm title $eb "where-vessels - $etl_title" + + label $eb.title -text $etl_title + pack $eb.title -side top + + button $eb.close -text Close -command [list wm withdraw $eb] + pack $eb.close -side bottom + + frame $eb.emsg -bd 2 -relief groove + label $eb.emsg.lab -text "Error:" + text $eb.emsg.text -height 1 + pack $eb.emsg.text -side bottom + pack $eb.emsg.lab -side left + + pack $eb.emsg -side top -pady 2 + + frame $eb.text -bd 2 -relief groove + pack $eb.text -side bottom -pady 2 + + label $eb.text.lab + + text $eb.text.text -width 85 \ + -xscrollcommand [list $eb.text.xscroll set] \ + -yscrollcommand [list $eb.text.yscroll set] + $eb.text.text tag configure error \ + -background red -foreground white + + scrollbar $eb.text.xscroll -orient horizontal \ + -command [list $eb.text.text xview] + 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.yscroll -sticky ns -row 1 -column 1 + grid configure $eb.text.xscroll -sticky ew -row 2 -column 0 +} + +proc parser-control-ok-core {w base background show} { + debug "parser-control-ok-core $w $base $background $show" + upvar #0 deffont_$base deffont + $w.resframe.res configure \ + -background $background -disabledforeground black -font $deffont \ + -state disabled -command {} \ + -text $show +} +proc parser-control-ok {w base show} { + parser-control-ok-core $w $base green $show +} +proc parser-control-none {w base show} { + parser-control-ok-core $w $base blue $show +} +proc parser-control-failed-core {w base foreground background smallfont + tiny summary fulldesc fulldata} { + debug "parser-control-failed-core $w $base $summary $fulldesc" + upvar #0 deffont_$base deffont + set eb .err_$base + + $eb.emsg.text delete 0.0 end + $eb.emsg.text insert end $summary + + $eb.text.lab configure -text $fulldesc + $eb.text.text delete 0.0 end + $eb.text.text insert end $fulldata + + regsub -all {.{18}} $tiny "&\n" ewrap + + if {$smallfont} { + set font fixed + } else { + set font $deffont + } + + $w.resframe.res configure \ + -background $background -foreground $foreground -font $font \ + -state normal -command [list wm deiconify $eb] \ + -text $ewrap } + +proc parser-control-failed-expected {w base emsg lno ei fulldesc newdata} { + set eb .err_$base + + set line [lindex [split $ei "\n"] 0] + debug "parser-control-failed-expected: $w $base: $lno: $emsg\n $line" + parser-control-failed-core $w $base \ + white red 1 \ + "err: [string trim $emsg]: \"$line\"" \ + "at line $lno: $emsg" \ + $fulldesc $newdata -#---------- user interface ---------- + $eb.text.text tag add error $lno.0 $lno.end + $eb.text.text see $lno.0 +} +proc parser-control-failed-unexpected {w base emsg ei} { + global errorInfo + parser-control-failed-core $w $base \ + black yellow 1 \ + $emsg $emsg "Details and stack trace:" $ei +} + +proc reparse {base varname old fulldesc okshow noneshow parse ok} { + upvar #0 $varname var + manyset [errexpect-catch { + uplevel 1 $parse + if {[string length [string trim $var]]} { + parser-control-ok .cp.ctrl.$base $base $okshow + } else { + parser-control-none .cp.ctrl.$base $base $noneshow + } + }] failed emsg lno ei + if {$failed} { + parser-control-failed-expected .cp.ctrl.$base $base \ + $emsg $lno $ei $fulldesc $var + set var $old + uplevel 1 $parse + } else { + uplevel 1 $ok + } +} + +#---------- main user interface ---------- proc widgets-setup {} { - global canvas debug acqdeffont + global canvas debug pirate ocean + + wm geometry . 1024x480 + wm title . "where-vessels - $pirate on the $ocean ocean" + + #----- map ----- frame .f -border 1 -relief groove set canvas .f.c @@ -330,37 +881,99 @@ 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 + pack .cp .filter -side top + + label .filter.title -text Filter + 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 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 - frame .ctrl.acquire - button .ctrl.acquire.do -text Acquire -command acquire + parser-control-create .cp.ctrl.acquire \ + acquire Acquire \ + "Clipboard parsing error" \ + + pack .cp.ctrl.acquire -side top -pady 2 - frame .ctrl.acquire.resframe -width 120 -height 32 - button .ctrl.acquire.resframe.res -text {} -anchor nw \ - -padx 1 -pady 1 -borderwidth 0 -justify left - glset acqdeffont [.ctrl.acquire.resframe.res cget -font] - place .ctrl.acquire.resframe.res -relx 0.5 -y 0 -anchor n - # -relheight 1.0 -relwidth 1.0 + parser-control-create .cp.ctrl.notes \ + notes "Reload notes" \ + "Vessel notes loading report" \ + + pack .cp.ctrl.notes -side top -pady 2 - pack .ctrl.acquire.do -side top - pack .ctrl.acquire.resframe -side top -expand y -fill both - pack .ctrl.acquire -side top + #----- decoding etc. report ----- - wm geometry . 1024x480 + frame .cp.report + pack .cp.report -side left -anchor n + + 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 + + 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 .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 + glset report_code $code + glset report_abbrev [code2abbrev $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 + .cp.report.list insert end $name + } } proc zoom {extail} { @@ -372,48 +985,65 @@ proc zoom {extail} { draw } -proc acquire_showerror {} { - global acqerr - tk_messageBox -type ok \ - -title "where-vessels: clipboard parsing error" \ - -message $acqerr -} - -proc acquire {} { - global clipboard acqdeffont acqerr errorInfo +proc invoke_acquire {} { + global clipboard errorInfo set old $clipboard + if {[catch { set clipboard [clipboard get] - parse-clipboard - .ctrl.acquire.resframe.res configure \ - -background blue -disabledforeground black -font $acqdeffont \ - -state disabled -command {} \ - -text " acquired ok " } emsg]} { - set acqerr "clipboard parsing failed: $emsg" - puts stderr $acqerr - append acqerr "\n$errorInfo" - regsub -all {.{18}} "error: [string trim $emsg]" "&\n" ewrap - .ctrl.acquire.resframe.res configure \ - -background red -foreground white -font fixed \ - -state normal -command acquire_showerror \ - -text $ewrap - set clipboard $old - parse-clipboard + parser-control-failed-unexpected .cp.ctrl.acquire acquire \ + $emsg "fetching clipboard:\n\n$errorInfo" + return } + + reparse acquire \ + clipboard $old "Clipboard contents:" { acquired ok } { no vessels } { + parse-clipboard + } { + display-note-infos + } draw } +proc invoke_notes {} { + global notes_data errorInfo notes_loc + set old $notes_data + + if {[catch { + load-notes + } emsg]} { + parser-control-failed-unexpected .cp.ctrl.notes notes \ + $emsg "loading $notes_loc:\n\n$errorInfo" + return + } + + reparse notes \ + notes_data $old "Vessel notes:" "loaded ok" { no notes } { + parse-notes + parse-clipboard + } { + display-note-infos + } + draw +} #---------- main program ---------- +vesselclasses-init + parseargs argdefaults httpclientsetup where-vessels load-chart widgets-setup +make-filters -load-notes -parse-clipboard +set notes_data {} +if {[catch { parse-clipboard } emsg]} { + puts stderr "$emsg\n$errorInfo" + exit 1 +} +after idle invoke_notes draw