X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fwhere-vessels;h=af77cbab45221214c58b5d6296ec42c192bd82f0;hb=ffda086c04303e1ed0ec10538c69696878674510;hp=219126db0c4951127df67bf0210716130b332793;hpb=1cceda60563a883b6260cf6ac2279e031806f2de;p=ypp-sc-tools.main.git

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 219126d..af77cba 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -133,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
 }
@@ -251,6 +254,7 @@ proc vesselclasses-init {} {
 	dhow		cm	dh	Dhow
 	longship	dm	ls	Longship
 	baghlah		em	bg	Baghlah
+	junk		eo	jk	Junk
 	merchbrig	fm	mb	{Merchant Brig}
 	warbrig		gm	wb	{War Brig}
 	xebec		hm	xe	Xebec
@@ -376,7 +380,11 @@ proc show-report-decode {code} {
 
     switch -exact $subclass {
 	{} { report-set subclass {Ordinary} }
-	F { report-set subclass {"Frost class"} }
+	E { report-set subclass {Emerald class} }
+	F { report-set subclass {Frost class} }
+	R { report-set subclass {Rogue class} }
+	V { report-set subclass {Verdant class} }
+	I { report-set subclass {Inferno class} }
 	default { report-set subclass "Subclass \"$subclass\"" }
     }
 
@@ -387,7 +395,7 @@ proc show-report-decode {code} {
     switch -exact $notown {
 	0 { report-set own "Yours" }
 	1 { report-set own "Other pirate's" }
-	2 { report-set own "Owner not specified in notes" }
+	2 { report-set own "Owner unknown" }
 	default { report-set own "?? $notown" }
     }
 
@@ -537,11 +545,27 @@ proc make-filters {} {
     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
+    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 [split $code _]]} { return 0 }
+	if {![filter-says-yes/$fil $codel]} { return 0 }
     }
     return 1
 }
@@ -563,7 +587,11 @@ proc vessel {vin} {
     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 }
+	inferno         { lappend codel I }
 	default		{ lappend codel ($subclass) }
     }
 
@@ -609,7 +637,7 @@ proc vessel {vin} {
     lappend newnotes [list $vid $realname $owner $xabbrev]
     set kk "$island [join $codel _]"
     upvar #0 found($kk) k
-    lappend k [list $vid $realname]
+    lappend k [list $vid $realname $owner]
  
     debug "CODED $kk $vid $realname"
 }
@@ -727,7 +755,7 @@ proc redraw-needed {} {
 }
 
 proc draw {} {
-    global chart found isleloc canvas redraw_after
+    global chart found isleloc canvas redraw_after islandnames
 
     catch { after cancel $redraw_after }
     catch { unset redraw_after }
@@ -740,6 +768,7 @@ proc draw {} {
 	eval chart-got/$proc [lrange $l 1 end]
     }
 
+    set islandnames {}
     set lastislandname {}
     foreach key [lsort [array names found]] {
 	set c [llength $found($key)]
@@ -753,6 +782,7 @@ proc draw {} {
 		set x [coord $x]
 		set y [coord $y]
 		set lastislandname $islandname
+	        lappend islandnames $islandname
 #		debug "START Y $y"
 	}
 
@@ -763,6 +793,8 @@ proc draw {} {
     }
 
     panner::updatecanvas-bbox .cp.ctrl.pan
+
+    islandnames-update
 }
 
 
@@ -770,7 +802,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 \
@@ -785,6 +817,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
@@ -793,17 +826,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] \
@@ -816,10 +849,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} {
@@ -905,12 +943,34 @@ 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 . 1024x480
+    wm geometry . 1024x600
     wm title . "where-vessels - $pirate on the $ocean ocean"
 
     #----- map -----
@@ -924,10 +984,23 @@ proc widgets-setup {} {
     #----- control panels and filter -----
 
     frame .cp
-    frame .filter -relief groove -bd 2
-    pack .cp .filter -side top
+    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
+    }
 
-    label .filter.title -text Filter
     grid configure .filter.title -row 0 -column 0 -columnspan 2
 
     #----- control panel -----
@@ -940,12 +1013,12 @@ proc widgets-setup {} {
     panner::canvas-scroll-bbox .f.c
     panner::create .cp.ctrl.pan .f.c 120 120 $debug
 
-    pack .cp.ctrl.pan -side top -pady 10 -padx 5
+    pack .cp.ctrl.pan -side top -pady 0 -padx 5
     frame .cp.ctrl.zoom
     pack .cp.ctrl.zoom -side top
 
-    button .cp.ctrl.zoom.out -text - -font {Courier 16} -command {zoom /2}
-    button .cp.ctrl.zoom.in  -text + -font {Courier 16} -command {zoom *2}
+    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 .cp.ctrl.acquire \
@@ -960,6 +1033,14 @@ proc widgets-setup {} {
 	
     pack .cp.ctrl.notes -side top -pady 2
 
+    #----- 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
@@ -980,7 +1061,8 @@ proc widgets-setup {} {
     listbox .cp.report.list -height 5
 
     pack .cp.report.island .cp.report.abbrev .cp.report.details \
-	.cp.report.list .cp.report.code -side top
+	.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} {
@@ -1009,8 +1091,20 @@ proc show-report {islandname code} {
     .cp.report.list delete 0 end
 
     foreach entry $k {
-	manyset $entry vid name
-	.cp.report.list insert end $name
+	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"
+	}
     }
 }