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=6f4433fa9e7efc7521820ad94f64d5507756c270;hp=712991098295b4b93e6a7f879f85d0c8dd2c28e9;hb=363f7060f6fd6ffceca3611b7283c695cc2731df;hpb=6f75e595f6c445fc84d9d5f10239b11cbfb2a0a2

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 7129910..6f4433f 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 {} {
@@ -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
@@ -233,8 +235,8 @@ 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
 }
@@ -242,7 +244,7 @@ proc display-note-infos {} {
 #---------- vessel properties ----------
 
 proc vesselclasses-init {} {
-    global vc_game2code vc_code2abbrev vc_abbrev2full
+    global vc_game2code vc_code2abbrev vc_code2full
     foreach {game code abbrev full} {
 	smsloop		am	sl	Sloop
 	lgsloop		bm	ct	Cutter
@@ -258,7 +260,7 @@ proc vesselclasses-init {} {
     } {
 	set vc_game2code($game) $code
 	set vc_code2abbrev($code) $abbrev
-	set vc_abbrev2full($abbrev) $full
+	set vc_code2full($code) $full
     }
 }
 
@@ -266,19 +268,53 @@ proc code2abbrev {code} {
     global vc_code2abbrev
 
     manyset [split $code _] inport class subclass lockown xabbrev
-    manyset [split $lockown ""] lock own
+    manyset [split $lockown ""] lock notown
 
     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 [lindex {= - ?} [regsub {\D} $notown 2]]
     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"
+    }
+}
     
 #---------- loading and parsing the clipboard (vessel locations) ----------
 
@@ -320,40 +356,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 {}
@@ -455,7 +490,7 @@ proc chart-got/league {x1 y1 x2 y2 kind} {
 }
 
 proc draw {} {
-    global chart count isleloc canvas
+    global chart found isleloc canvas
     
     $canvas delete all
 
@@ -466,8 +501,8 @@ 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
 
@@ -493,6 +528,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"
     }
@@ -645,14 +682,21 @@ 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
 
+    #----- control panel -----
+
     frame .ctrl
-    pack .ctrl -side right
+    pack .ctrl -side left -anchor n
 
     debug "BBOX [$canvas bbox all]"
 
@@ -679,8 +723,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} {