X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fwhere-vessels;h=39d83064fecf99d7c58700adc6d4810a43e7b7fb;hb=4e736b5638f21d0726da0c8776e26dae396e1e23;hp=29c3ab720c6c5650c326637df8fa078ad3141d97;hpb=d10f467c0e4205c612d0e71e787f8c6bf40ccadb;p=ypp-sc-tools.web-test.git

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 29c3ab7..39d8306 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 {
@@ -180,9 +188,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 {} {
@@ -202,15 +210,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
@@ -225,49 +235,265 @@ proc display-note-infos {} {
     parser-control-failed-core .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
+	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
+    }
+}
+
+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"
+	}
+    }
+    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
+	}
+    } 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
-    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" }
-    }
-    set 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 {} }
+	icy		{ lappend codel F }
+	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" }
     }
-    switch -exact [errexpect-arrayget vi inPort] {
-	true		{ }
-	false		{ append abbrev ? }
-	default		{ errexpect-error "unexpected inPort" }
-    }
+
     set vid [errexpect-arrayget vi vesselId]
     upvar #0 notes($vid) note
     set realname [errexpect-arrayget vi vesselName]
@@ -278,35 +504,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 U
 	}
 	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 $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]
+ 
+    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 {}
@@ -340,7 +571,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"
 	    }
 	}
@@ -407,8 +638,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
+
+    catch { after cancel $redraw_after }
+    catch { unset redraw_after }
     
     $canvas delete all
 
@@ -419,10 +660,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]
@@ -443,6 +689,8 @@ proc draw {} {
 	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]
+	$canvas bind $bid <ButtonPress> [list show-report $islandname $code]
 	manyset $bbox dummy dummy dummy y
 #	debug "NEW Y $y"
     }
@@ -595,14 +843,29 @@ proc reparse {base varname old fulldesc okshow noneshow parse ok} {
 proc widgets-setup {} {
     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
     canvas $canvas
     pack $canvas -expand 1 -fill both
     pack .f -expand 1 -fill both -side left
 
+    #----- filter -----
+
+    frame .filter -relief groove -bd 2
+    pack .filter -side bottom
+
+    label .filter.title -text Filter
+    grid configure .filter.title -row 0 -column 0 -columnspan 2
+
+    #----- control panel -----
+
     frame .ctrl
-    pack .ctrl -side right
+    pack .ctrl -side left -anchor n
 
     debug "BBOX [$canvas bbox all]"
 
@@ -629,8 +892,59 @@ proc widgets-setup {} {
 	
     pack .ctrl.notes -side top -pady 2
 
-    wm geometry . 1024x480
-    wm title . "where-vessels - $pirate on the $ocean ocean"
+    #----- decoding etc. report -----
+
+    frame .report
+    pack .report -side left -anchor n
+
+    label .report.island -text { }
+
+    frame .report.abbrev -background black
+    glset report_abbrev {         }
+    entry .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
+
+    frame .report.code
+    label .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
+
+    listbox .report.list -height 5
+
+    pack .report.island .report.abbrev .report.details \
+	.report.list .report.code -side top
+    pack configure .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
+    }
+}
+
+proc report-set {sw val} { .report.details.$sw configure -text $val }
+
+proc show-report {islandname code} {
+    .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
+
+    .report.list delete 0 end
+
+    foreach entry $k {
+	manyset $entry vid name
+	.report.list insert end $name
+    }
 }
 
 proc zoom {extail} {
@@ -687,13 +1001,20 @@ proc invoke_notes {} {
 
 #---------- main program ----------
 
+vesselclasses-init
+
 parseargs
 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