Commit b7982dfd authored by luc.moulinier's avatar luc.moulinier

bug AfficheOverview

parent 942edaf0
......@@ -553,6 +553,7 @@ proc CompilePackages {{plat ""}} {
puts "installing in : $instdir"
# do Tk packages
set Lpkg [list tkhtml3.0 1 LRIPhoto1.0 1 biotext0.1 1 tclordalie0.1 0 tclcluspack0.1 0 tclfastme0.1 0 tsurf0.1 0]
set Lpkg [list tclordalie0.1 0 tclcluspack0.1 0 tclfastme0.1 0 tsurf0.1 0]
foreach {pkg avecTk} $Lpkg {
puts "package : $pkg\n"
cd $pkg
......@@ -574,9 +575,9 @@ proc CompilePackages {{plat ""}} {
"linux-x86" {
}
"win32-x86_64" {
set Cmd "sh.exe configure --enable-64bit --exec-prefix=$instdir --with-tcl=/c/TclTk8.6.7/lib"
set Cmd "sh configure --enable-threads --exec-prefix=$instdir --with-tcl=/c/TclTk64-8.6.7/lib"
if {$avecTk} {
append Cmd " --with-tk=/c/TclTk8.6.7/lib"
append Cmd " --with-tk=/c/TclTk64-8.6.7/lib"
}
}
}
......
......@@ -6112,26 +6112,32 @@ proc CalculeOverview {Id} {
set wc [set Ovw(O$Id,w)]
set Twdt [LongueurDeLAlignement]
#set Thgt [$NomTextSeq count -lines 0.0 end]
set Thgt [llength $LSOrdali]
set Thgt [$NomTextSeq count -lines 0.0 end]
#set Thgt [llength $LSOrdali]
set Ovw(O$Id,Width) $Twdt
set Ovw(O$Id,Height) $Thgt
set Ovw(WidthOri) 600.
set Ovw(HeightOri) 300.
set Ovw(O$Id,WidthOri) 600.
set Ovw(O$Id,HeightOri) 300.
set fx [expr {1.* $Ovw(WidthOri)/$Twdt}]
set fy [expr {1.* $Ovw(HeightOri)/$Thgt}]
if {$fx <= 1.} {set fx 1.0}
if {$fy <= 1.} {set fy 1.0}
set fx [expr {1.* $Ovw(O$Id,WidthOri)/$Twdt}]
set fy [expr {1.* $Ovw(O$Id,HeightOri)/$Thgt}]
if {$fx >= 1.} {
set Ovw(O$Id,WidthOri) $Twdt
set fx 1.0
}
if {$fy >= 1.} {
set Ovw(O$Id,HeightOri) $Thgt
set fy 1.0
}
set Ovw(O$Id,ScaOriX) [expr {int($fx * 100.)}]
set Ovw(O$Id,ScaOriY) [expr {int($fy * 100.)}]
$wc configure -height $Ovw(HeightOri) -width $Ovw(WidthOri)
$wc configure -height $Ovw(O$Id,HeightOri) -width $Ovw(O$Id,WidthOri)
# create original image
set f " #888888"
set b " #ffffff"
set f " #888"
set b " #fff"
# blank line
set linew [string trim [string repeat $b $Twdt]]
# get the whole alignment
......@@ -6147,7 +6153,7 @@ proc CalculeOverview {Id} {
lappend Data $l
}
}
set img [image create photo -height $Thgt -width $Twdt]
set img [image create photo]
$img put $Data
# subsample image if necessary
......@@ -6158,6 +6164,7 @@ proc CalculeOverview {Id} {
set St [expr int(100*[join [set Ovw(O$Id,ScaleTot)] *])]
LRI::imgtransform $img -scale $St
}
update
set TOri [$wc create image 0 0 \
-image $img \
......@@ -6516,7 +6523,7 @@ proc AfficheOverview {} {
FaireAttendre "Please wait ...\nDrawing alignment overview ..."
# configure features
if {! [info exists Ovw]} {
if {! [info exists Ovw(Liste)]} {
set Id 1
set Ovw(Groupes) $LNDG
set Ovw(Liste) [list $Id]
......@@ -7174,12 +7181,12 @@ proc ToggleAuLog {{Init ""}} {
if {$Init ne ""} {
set Toggle(AuLog) $Init
if {! $Init} {
if {[info commands AuLog] ne "" && [info commands AuLogText] ne ""} {
#rename AuLogText AuLog
if {[info commands AuLog] eq "" && [info commands AuLogText] ne ""} {
rename AuLogText AuLog
}
} else {
if {[info commands AuLog] ne "" && [info commands AuLogWindow] ne ""} {
#rename AuLogWindow AuLog
if {[info commands AuLog] eq "" && [info commands AuLogWindow] ne ""} {
rename AuLogWindow AuLog
}
}
......
......@@ -11815,3 +11815,33 @@ proc runtcl2 {} {
exit
}
proc lesc {} {
set Ll [LesLignesDuFichier lesc]
set o [open lesc w]
puts $o [join $Ll]
close $o
exit
}
proc lesh {} {
cd /home/moumou/tmp/tclcluspack0.1
cd include
set Lhi [glob *.h]
cd ../generic
set Lhg [glob *.h]
set Lh [land $Lhi $Lhg]
if {[llength $Lh] == 0} {
exit
}
puts [join $Lh \n]
file delete {*}$Lh
exit
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment