where-vessels: fix layout of filtering

[ypp-sc-tools.main.git] / yarrg / where-vessels

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index c382c6a4b92f913218c2e6c73e40401723a19feb..ae8fb5520325066b134011566c178f5ed7650264 100755 (executable)
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -200,7 +200,7 @@ proc display-note-infos {} {
     debug "display-note-infos $nmissing [array size notes]"
 
     if {[llength $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 {
     } elseif {$nmissing && [array size notes]} {
        set tiny "$nmissing missing"
     } else {


@@ -232,7 +232,7 @@ 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] warning(s);\
        white blue 0 \
        $tiny \
        "[llength $note_infos] warning(s);\


@@ -327,23 +327,14 @@ proc show-report-decode {code} {
 
 set filters {}
 
 
 set filters {}
 

-#proc make-size-filter {minmax minmaxdesc} {
-#    set n [llength $vc_codes]
-#    $w configure 
-
-#    make-filter size${minmax} "$minmaxdesc size" scale \
-#      [list \
-#           -tickinterval 0 \
-#           -variable filter_size{$minmax} \
-#           -from 0 -to [expr {$n-1}] \
-#           -resolution 1 \
-#           -length [expr {$n*5}] \
-#           ]
-
-

 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-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} {
 
 proc filter-values/lockown {} {
     foreach lv {0 1 2} {


@@ -357,6 +348,12 @@ proc filter-map/lockown {lockown} { return [code2abbrev-lock $lockown] }
 proc filter-default/lockown {lockown} {
     return [regexp {^[01]|^2[^1]} $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 {
 
 proc filter-validate/xabbre {re} {
     if {[catch {


@@ -368,6 +365,11 @@ proc filter-validate/xabbre {re} {
     }
     return {}
 }
     }
     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
 
 proc filter-tickbox-flip {fil} {
     upvar #0 filter_$fil vars


@@ -375,7 +377,7 @@ proc filter-tickbox-flip {fil} {
     foreach val $values {
        set vars($val) [expr {!$vars($val)}]
     }
     foreach val $values {
        set vars($val) [expr {!$vars($val)}]
     }

-    refilter-needed
+    redraw-needed

 }
 
 proc make-tickbox-filter {fil label rows inrow} {
 }
 
 proc make-tickbox-filter {fil label rows inrow} {


@@ -392,7 +394,7 @@ proc make-tickbox-filter {fil label rows inrow} {
        set vars($val) [filter-default/$fil $val]
        checkbutton $fw.$ix -variable filter_${fil}($val) \
            -text [filter-map/$fil $val] -font fixed \
        set vars($val) [filter-default/$fil $val]
        checkbutton $fw.$ix -variable filter_${fil}($val) \
            -text [filter-map/$fil $val] -font fixed \

-           -command refilter-needed
+           -command redraw-needed

        grid configure $fw.$ix -sticky sw \
            -row [expr {$ix / $inrow}] \
            -column [expr {$ix % $inrow}]
        grid configure $fw.$ix -sticky sw \
            -row [expr {$ix / $inrow}] \
            -column [expr {$ix % $inrow}]


@@ -417,7 +419,7 @@ proc entry-filter-changed {fw fil n1 n2 op} {
        } else {
            $fw.error configure -text { } -background $def_background
            set realvar $entryvar
        } else {
            $fw.error configure -text { } -background $def_background
            set realvar $entryvar

-           refilter-needed
+           redraw-needed

        }
     } emsg]} {
        puts stderr "FILTER CHECK ERROR $emsg $errorInfo"
        }
     } emsg]} {
        puts stderr "FILTER CHECK ERROR $emsg $errorInfo"


@@ -437,15 +439,11 @@ proc make-entry-filter {fil label def} {
     pack $fw.entry $fw.error -side top -anchor w
 }
 
     pack $fw.entry $fw.error -side top -anchor w
 }
 

-proc refilter-needed {} {
-    debug "REFILTER NEEDED"
-}
-

 proc make-filter {kind fil label ekind} {
     global filters
     label .filter.lab_$fil -text $label -justify left
     $ekind .filter.$fil
 proc make-filter {kind fil label ekind} {
     global filters
     label .filter.lab_$fil -text $label -justify left
     $ekind .filter.$fil

-    lappend filters [list $kind $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
     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


@@ -457,6 +455,15 @@ proc make-filters {} {
     make-tickbox-filter lockown "Lock/\nowner" 2 6
     make-entry-filter xabbre "Flags\n regexp" {}
 }
     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) ----------
 
     
 #---------- loading and parsing the clipboard (vessel locations) ----------
 


@@ -631,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 {} {
 proc draw {} {

-    global chart found isleloc canvas
+    global chart found isleloc canvas redraw_after
+
+    catch { after cancel $redraw_after }
+    catch { unset redraw_after }

     
     $canvas delete all
 
     
     $canvas delete all
 


@@ -648,6 +665,8 @@ proc draw {} {
 #      debug "SHOWING $key $c"
        regexp {^(.*) (\S+)$} $key dummy islandname code
 
 #      debug "SHOWING $key $c"
        regexp {^(.*) (\S+)$} $key dummy islandname code
 

+       if {![filters-say-yes $code]} continue
+

        set abbrev [code2abbrev $code]
        
        if {[string compare $lastislandname $islandname]} {
        set abbrev [code2abbrev $code]
        
        if {[string compare $lastislandname $islandname]} {


@@ -676,7 +695,7 @@ proc draw {} {
 #      debug "NEW Y $y"
     }
 
 #      debug "NEW Y $y"
     }
 

-    panner::updatecanvas-bbox .ctrl.pan
+    panner::updatecanvas-bbox .cp.ctrl.pan

 }
 
 
 }
 
 


@@ -804,13 +823,13 @@ proc reparse {base varname old fulldesc okshow noneshow parse ok} {
     manyset [errexpect-catch {
        uplevel 1 $parse
        if {[string length [string trim $var]]} {
     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 {
        } else {

-           parser-control-none .ctrl.$base $base $noneshow
+           parser-control-none .cp.ctrl.$base $base $noneshow

        }
     }] failed emsg lno ei
     if {$failed} {
        }
     }] 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
            $emsg $lno $ei $fulldesc $var
        set var $old
        uplevel 1 $parse


@@ -835,83 +854,85 @@ proc widgets-setup {} {
     pack $canvas -expand 1 -fill both
     pack .f -expand 1 -fill both -side left
 
     pack $canvas -expand 1 -fill both
     pack .f -expand 1 -fill both -side left
 

-    #----- filter -----
+    #----- control panels and filter -----

 
 

+    frame .cp

     frame .filter -relief groove -bd 2
     frame .filter -relief groove -bd 2

-    pack .filter -side bottom
+    pack .cp .filter -side top

 
     label .filter.title -text Filter
     grid configure .filter.title -row 0 -column 0 -columnspan 2
 
     #----- control panel -----
 
 
     label .filter.title -text Filter
     grid configure .filter.title -row 0 -column 0 -columnspan 2
 
     #----- control panel -----
 

-    frame .ctrl
-    pack .ctrl -side left -anchor n
+    frame .cp.ctrl
+    pack .cp.ctrl -side left -anchor n

 
     debug "BBOX [$canvas bbox all]"
 
     panner::canvas-scroll-bbox .f.c
 
     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" \
        
        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" \
        
        notes "Reload notes" \
        "Vessel notes loading report" \
        

-    pack .ctrl.notes -side top -pady 2
+    pack .cp.ctrl.notes -side top -pady 2

 
     #----- decoding etc. report -----
 
 
     #----- decoding etc. report -----
 

-    frame .report
-    pack .report -side left -anchor n
+    frame .cp.report
+    pack .cp.report -side left -anchor n

 
 

-    label .report.island -text { }
+    label .cp.report.island -text { }

 
 

-    frame .report.abbrev -background black
+    frame .cp.report.abbrev -background black

     glset report_abbrev {         }
     glset report_abbrev {         }

-    entry .report.abbrev.abbrev -state readonly \
+    entry .cp.report.abbrev.abbrev -state readonly \

        -textvariable report_abbrev \
        -borderwidth 0 -relief flat -width 0 \
        -highlightbackground white \
        -readonlybackground white -foreground black
        -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
+    pack .cp.report.abbrev.abbrev -side left -padx 1 -pady 1

 
 

-    frame .report.code
-    label .report.code.lab -text Code:
+    frame .cp.report.code
+    label .cp.report.code.lab -text Code:

     glset report_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
+    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 .report.list -height 5
+    listbox .cp.report.list -height 5

 
 

-    pack .report.island .report.abbrev .report.details \
-       .report.list .report.code -side top
-    pack configure .report.details -fill x
+    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} {
 
     foreach sw {inport class subclass lock own xabbrev} {

-       label .report.details.$sw -text { }
-       pack .report.details.$sw -side top -anchor w
+       label .cp.report.details.$sw -text { }
+       pack .cp.report.details.$sw -side top -anchor w

     }
 }
 
     }
 }
 

-proc report-set {sw val} { .report.details.$sw configure -text $val }
+proc report-set {sw val} { .cp.report.details.$sw configure -text $val }

 
 proc show-report {islandname code} {
 
 proc show-report {islandname code} {

-    .report.island configure -text $islandname
+    .cp.report.island configure -text $islandname

     glset report_code $code
     glset report_abbrev [code2abbrev $code]
 
     glset report_code $code
     glset report_abbrev [code2abbrev $code]
 


@@ -920,11 +941,11 @@ proc show-report {islandname code} {
     set kk "$islandname $code"
     upvar #0 found($kk) k
 
     set kk "$islandname $code"
     upvar #0 found($kk) k
 

-    .report.list delete 0 end
+    .cp.report.list delete 0 end

 
     foreach entry $k {
        manyset $entry vid name
 
     foreach entry $k {
        manyset $entry vid name

-       .report.list insert end $name
+       .cp.report.list insert end $name

     }
 }
 
     }
 }
 


@@ -944,7 +965,7 @@ proc invoke_acquire {} {
     if {[catch {
        set clipboard [clipboard get]
     } emsg]} {
     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
     }
            $emsg "fetching clipboard:\n\n$errorInfo"
        return
     }


@@ -965,7 +986,7 @@ proc invoke_notes {} {
     if {[catch {
        load-notes
     } emsg]} {
     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
     }
            $emsg "loading $notes_loc:\n\n$errorInfo"
        return
     }