X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fwhere-vessels;h=8d6de95900fcd15d64f480cac5d05238b78f2945;hp=712991098295b4b93e6a7f879f85d0c8dd2c28e9;hb=15a33b9bcca5a2932534c7ab5952961bf278faf8;hpb=6f75e595f6c445fc84d9d5f10239b11cbfb2a0a2

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 7129910..8d6de95 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -188,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 {} {
@@ -200,7 +200,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 {
@@ -210,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
@@ -230,11 +232,11 @@ 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
 }
@@ -242,8 +244,8 @@ proc display-note-infos {} {
 #---------- vessel properties ----------
 
 proc vesselclasses-init {} {
-    global vc_game2code vc_code2abbrev vc_abbrev2full
-    foreach {game code abbrev full} {
+    global vc_game2code vc_code2abbrev vc_code2full vc_codes
+    set vcl {
 	smsloop		am	sl	Sloop
 	lgsloop		bm	ct	Cutter
 	dhow		cm	dh	Dhow
@@ -252,32 +254,291 @@ proc vesselclasses-init {} {
 	merchbrig	fm	mb	{Merchant Brig}
 	warbrig		gm	wb	{War Brig}
 	xebec		hm	xe	Xebec
-	warfrig		im	wf	{War Frigate}
 	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_abbrev2full($abbrev) $full
+	set vc_code2full($code) $full
+	load-icon $abbrev
     }
+
+    load-icon unlocked
+    load-icon locked
+    load-icon battle
+    load-icon atsea
+    load-icon borrow
+    load-icon query
+    load-icon ours
+    load-icon dot
 }
 
-proc code2abbrev {code} {
+proc load-icon {icon} {
+    image create bitmap icon/$icon -file icons/$icon.xbm
+}
+
+proc code2abbrev-lock {lockown} {
+    manyset [split $lockown ""] lock notown
+    append abbrev [lindex {x u .} $lock]
+    append abbrev [lindex {m . ?} [regsub {\D} $notown 2]]
+}    
+
+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 <ButtonPress> $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
-    manyset [split $lockown ""] lock own
 
-    set abbrev {}
-    append abbrev [lindex {? {}} $inport]
-    append abbrev $vc_code2abbrev($class)
-    append abbrev $subclass
-    append abbrev [lindex {* + -} $lock]
-    append abbrev [lindex {- = ?} [regsub {\D} $own 2]]
-    append abbrev $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)
 
-    debug "CODE2ABBREV $code $abbrev"
-    return $abbrev
+    if {[string length $subclass]} {
+	canvas-horiz-stack stackx 0 $y $bind \
+	    text -anchor nw -font fixed -text \
+	    $subclass
+    }
+
+    manyset [split $lockown ""] lock notown
+
+    incr stackx
+    canvas-horiz-stack stackx 0 $imy $bind \
+	image -anchor nw -image icon/[lindex {battle borrow dot} $lock]
+    incr stackx
+    canvas-horiz-stack stackx 0 $imy $bind \
+	image -anchor nw -image icon/[lindex {ours dot query} \
+					  [regsub {\D} $notown 2]]
+    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 <ButtonPress> $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} }
+	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-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 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}]
+    }
+    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 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) ----------
@@ -320,40 +581,39 @@ proc vessel {vin} {
 	manyset $note lno notename owner xabbrev
 	if {[string compare -nocase $realname $notename]} {
 	    note-info $lno $vid $realname $island \
-		"notes say name is $notename - perhaps renamed"
+		"notes say name is $notename"
 	}
 	if {[string length $owner]} {
 	    if {![string compare $owner $pirate]} {
-		set own 1
+		set notown 0
 	    } else {
-		set own 0
+		set notown 1
 	    }
 	} else {
-	    set own U
+	    set notown U
 	}
 	append abbrev $xabbrev
 	set notes_used($vid) 1
 
     } else {
-	set own M
+	set notown M
 	lappend note_missings [list $island $realname $vid]
     }
 
-    lappend codel "$lock$own" $xabbrev
+    lappend codel "$lock$notown" $xabbrev
     lappend newnotes [list $vid $realname $owner $xabbrev]
     set kk "$island [join $codel _]"
-    upvar #0 count($kk) k
-    if {![info exists k]} { set k 0 }
-    incr k
-
+    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 {}
@@ -454,8 +714,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
 
@@ -466,13 +736,13 @@ 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 code
 
-	set abbrev [code2abbrev $code]
-	
+	if {![filters-say-yes $code]} continue
+
 	if {[string compare $lastislandname $islandname]} {
 		manyset $isleloc($islandname) x y
 		set x [coord $x]
@@ -480,24 +750,14 @@ proc draw {} {
 		set lastislandname $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
 }
 
 
@@ -625,13 +885,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
@@ -645,42 +905,108 @@ 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
 
-    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
 
-    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"
+    #----- 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 .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
+	.cp.report.list insert end $name
+    }
 }
 
 proc zoom {extail} {
@@ -699,7 +1025,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
     }
@@ -720,7 +1046,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
     }
@@ -744,6 +1070,7 @@ argdefaults
 httpclientsetup where-vessels
 load-chart
 widgets-setup
+make-filters
 
 set notes_data {}
 if {[catch { parse-clipboard } emsg]} {