Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fixed the FileLabel. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
e5a6541265f93325f08ed599a1083137 |
User & Date: | peter 2003-02-09 18:52:42.000 |
Context
2003-02-09
| ||
23:36 | Renamed resultfile to diffw.exe. check-in: 8ff014bc22 user: peter tags: trunk | |
18:52 | Fixed the FileLabel. check-in: e5a6541265 user: peter tags: trunk | |
2003-02-06
| ||
19:40 | Initial revision check-in: b37d5b1a52 user: peter tags: trunk | |
Changes
Changes to src/eskil.tcl.
︙ | ︙ | |||
52 53 54 55 56 57 58 | #----------------------------------------------- # the next line restarts using wish \ exec wish "$0" "$@" package require Tk set debug 1 | | | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | #----------------------------------------------- # the next line restarts using wish \ exec wish "$0" "$@" package require Tk set debug 1 set diffver "Version 1.9.6+ 2003-02-06" set tmpcnt 0 set tmpfiles {} set thisscript [file join [pwd] [info script]] set thisdir [file dirname $thisscript] set ::diff(cvsExists) [expr {![string equal [auto_execok cvs] ""]}] set ::diff(diffexe) diff set ::diff(thisexe) [list [info nameofexecutable] $thisscript] |
︙ | ︙ | |||
491 492 493 494 495 496 497 | incr bestsum $bestscore incr j } # puts "Bestsum: $bestsum" # origresult holds a mapping between blocks where each row # is paired with its best match. This may not be a possible | | | 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 | incr bestsum $bestscore incr j } # puts "Bestsum: $bestsum" # origresult holds a mapping between blocks where each row # is paired with its best match. This may not be a possible # result since it has to be in order. array set bestresult [array get origresult] set bestscoresum -100000 # If the size is 1, it is automatically in order so we # don't need further processing. if {$size1 > 1} { |
︙ | ︙ | |||
602 603 604 605 606 607 608 | array set bestresult [array get result] set bestscoresum $scoresum # If it is close enough to the theoretical max, take it if {$bestscoresum >= (3 * $bestsum / 4)} { break } | | | 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 | array set bestresult [array get result] set bestscoresum $scoresum # If it is close enough to the theoretical max, take it if {$bestscoresum >= (3 * $bestsum / 4)} { break } # We are redoing from start, but try to improve by # ignoring the most awkwardly placed line. set mostp -1 set mosti 0 for {set i 0} {$i < $size1} {incr i} { if {$mark($i) == 1} { if {abs($result($i) - $i) > $mostp} { |
︙ | ︙ | |||
2423 2424 2425 2426 2427 2428 2429 | tkwait window $top catch {grab release $top} focus $oldfocus } proc textSearch::DismissDialog {top result} { variable prompt | | | 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 | tkwait window $top catch {grab release $top} focus $oldfocus } proc textSearch::DismissDialog {top result} { variable prompt set prompt(ok) $result set prompt(geo) [wm geometry $top] destroy $top } # Ask for a search string proc textSearch::FindDialog {string} { |
︙ | ︙ | |||
2889 2890 2891 2892 2893 2894 2895 | if {![info exists ::diff(aligns)] || [llength $::diff(aligns)] == 0} { return } set pattern 0 foreach align $::diff(aligns) { foreach {lline rline level} $align break | | > > | 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 | if {![info exists ::diff(aligns)] || [llength $::diff(aligns)] == 0} { return } set pattern 0 foreach align $::diff(aligns) { foreach {lline rline level} $align break set pre {} set post {} for {set t 1} {$t <= $level} {incr t} { lappend pre [formatAlignPattern $pattern] incr pattern lappend post [formatAlignPattern $pattern] incr pattern } set fix1($lline) [list [join $pre \n] [join $post \n]] set fix2($rline) [list [join $pre \n] [join $post \n]] } prepareFiles foreach n {1 2} src {leftFile rightFile} { set tmp [tmpfile] set f$n $tmp set cho [open $tmp w] #puts $cho hej set chi [open $::diff($src) r] set lineNo 1 while {[gets $chi line] >= 0} { if {[info exists fix${n}($lineNo)]} { foreach {pre post} [set fix${n}($lineNo)] break puts $cho $pre puts $cho $line puts $cho $post } else { puts $cho $line } incr lineNo } close $cho close $chi } # FIXA : detta tar bort tmpfiles cleanupFiles catch {eval exec $::diff(thisexe) \$f1 \$f2 &} set ::diff(aligns) "" } |
︙ | ︙ | |||
3213 3214 3215 3216 3217 3218 3219 | proc fileLabel {w args} { eval label $w $args set fg [$w cget -foreground] set bg [$w cget -background] set font [$w cget -font] destroy $w | > | | | 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 | proc fileLabel {w args} { eval label $w $args set fg [$w cget -foreground] set bg [$w cget -background] set font [$w cget -font] destroy $w entry $w -relief flat -bd 0 -highlightthickness 0 \ -foreground $fg -background $bg -font $font eval $w configure $args $w configure -takefocus 0 -state disabled if {[info tclversion] >= 8.4} { $w configure -state readonly -readonlybackground $bg } set i [lsearch $args -textvariable] if {$i >= 0} { set var [lindex $args [expr {$i + 1}]] uplevel #0 "trace variable $var w \ {after idle {$w xview end} ;#}" |
︙ | ︙ |