Commit 20cca06a authored by luc.moulinier's avatar luc.moulinier

enleve ulrich

parent d5c57ec1
This diff is collapsed.
......@@ -85,15 +85,15 @@ proc CreeOrdalieTclGlobal {} {
proc LoadTclPackages {} {
#package require tclcluspack
package require tclcluspack
package require tclordalie
package require tclfastme
package require http
package require sqlite3
#package require La
#catch { namespace import La::*}
#package require struct
#package require tdom
package require struct
package require tdom
return
}
......@@ -114,6 +114,7 @@ proc LoadTkAndPackages {} {
}
} else {
set vertcl3d $Msg
package require tcl3d
}
Espionne "tcl3d : $vertcl3d"
if {$Defauts(Devlpt)} {
......
......@@ -2080,7 +2080,7 @@ proc SwitchWindows {sens} {
}
proc TagsGenerauxFenetre {} {
proc OrdaliDefaultTags {} {
$::NomNomSeq tag configure InvNm -background black -foreground white
$::NomNomSeq tag configure NrmNm -background white -foreground black
......@@ -2254,7 +2254,7 @@ proc BindingsOrdali {} {
bind BTSel <Control-3> {DeselectLesColonnes %W @%x,%y}
bind BTSel <3> {SelectLesColonnes @%x,%y}
TagsGenerauxFenetre
OrdaliDefaultTags
# Status pos seq - gen
bind BTStatus <Any-Motion> [list AffichePosGenSeq %W @%x,%y]
......@@ -5360,24 +5360,16 @@ proc EffaceWNomsWSeqs {} {
global NomTextSeq NomNomSeq
$NomNomSeq configure -state normal
set Ltag [$NomNomSeq tag names]
if {$Ltag != {}} {
$NomNomSeq tag delete {*}$Ltag
}
$NomNomSeq delete 1.0 end
$NomNomSeq configure -state disabled
if {[QuelMode] ne "seqlab"} {
$NomTextSeq configure -state normal
set Ltag [$NomTextSeq tag names]
if {$Ltag != {}} {
$NomTextSeq tag delete {*}$Ltag
}
$NomTextSeq delete 1.0 end
$NomTextSeq configure -state disabled
}
TagsGenerauxFenetre
OrdaliDefaultTags
return
}
......@@ -6171,7 +6163,7 @@ proc CalculeOverview {Id} {
# subsample image if necessary
LRI::imgtransform $img -scalex [expr {int($fx * 100)}] -scaley [expr {int($fy * 100.)}]
if {! [info exists Ovw(O$Id,ScaleTot)]} {
if {! [info exists Ovw(O$Id,ScaleTot)] || $Ovw(O$Id,ScaleTot) eq ""} {
set Ovw(O$Id,ScaleTot) {}
} else {
set St [expr int(100*[join [set Ovw(O$Id,ScaleTot)] *])]
......@@ -7330,6 +7322,8 @@ proc ToggleToolbar {} {
grid forget $FrmToolBar
destroy $FrmToolBar
update idletasks
}
return
......@@ -7341,7 +7335,7 @@ proc AfficheBarreBoutons {} {
set FrmToolBar $NomFenetreOrdali.tbb
frame $FrmToolBar
grid $FrmToolBar -row 1 -column 0 -sticky ew -padx 5
grid $FrmToolBar -row 0 -column 0 -sticky ew -padx 5
set frm $FrmToolBar
......@@ -7640,19 +7634,23 @@ proc AfficheBarreMenus {} {
set bgm [set Defauts(BackAppli)]
set w $NomFenetreOrdali
set mb $w.menuBar
set w [winfo toplevel $NomFenetreOrdali]
if {$w eq "."} {
set mb ".menuBar"
} else {
set mb $w.menuBar
}
menu $mb -tearoff 0
set mfi $w.menuBar.file
set med $w.menuBar.edit
set mvw $w.menuBar.view
set mse $w.menuBar.sequence
set mal $w.menuBar.alignement
set mst $w.menuBar.structure
set mto $w.menuBar.tools
set min $w.menuBar.info
set mhe $w.menuBar.help
set mfi $mb.file
set med $mb.edit
set mvw $mb.view
set mse $mb.sequence
set mal $mb.alignement
set mst $mb.structure
set mto $mb.tools
set min $mb.info
set mhe $mb.help
set MenuFile $mfi
set MenuEdit $med
......@@ -7824,7 +7822,7 @@ proc AfficheBarreMenus {} {
$mhe add command -label "Ordalie PDF documentation" -command "LanceDoc"
[winfo toplevel $NomFenetreOrdali] configure -menu $mb
return
}
......@@ -8154,7 +8152,7 @@ proc AfficheBarreMac {} {
set wv $NomFenetreOrdali.fmac
set FrmVues $wv
frame $FrmVues
grid $FrmVues -row 2 -column 0 -sticky ew -padx 5 -pady {1 3}
grid $FrmVues -row 1 -column 0 -sticky ew -padx 5 -pady {1 3}
frame $wv.fcx
grid $wv.fcx -row 0 -column 0 -sticky w
......@@ -8258,7 +8256,7 @@ proc AfficheFrameSequences {} {
set w $NomFenetreOrdali
set FrmSequence "$w.lessequences"
frame $FrmSequence
grid $FrmSequence -row 3 -column 0 -padx 5 -sticky news
grid $FrmSequence -row 2 -column 0 -padx 5 -sticky news
#
# widgets to display names of sequences, and
......@@ -8287,7 +8285,7 @@ proc AfficheFrameSequences {} {
-bd 2 \
-font SeqFont \
-cursor left_ptr \
-yscrollcommand "$FrmSequence.scrolly set" \
-yscrollcommand [list .ordali.lessequences.scrolly set] \
-setgrid 1 \
-width $WdtNom \
-wrap none \
......@@ -8305,17 +8303,17 @@ proc AfficheFrameSequences {} {
# Sequences : biotext widget for seqlab ,
# text widget otherwise
biotext $FrmSequence.biotextsequence \
-yscrollcommand "FromScrollYBiotext2Names" \
-xscrollcommand "$TScrollX set" \
-yscrollcommand FromScrollYBiotext2Names \
-xscrollcommand [list .ordali.lessequences.scrollxseq set] \
-height 20 \
-width 60 \
-relief flat \
-relief sunken \
-class Biotext \
-bd 0
text $w.lessequences.textsequence \
-xscrollcommand "$FrmSequence.scrollxseq set" \
-yscrollcommand "$FrmSequence.scrolly set" \
-xscrollcommand [list .ordali.lessequences.scrollxseq set] \
-yscrollcommand [list .ordali.lessequences.scrolly set] \
-relief sunken \
-height 20 \
-width 60 \
......@@ -8341,7 +8339,7 @@ proc AfficheFrameSequences {} {
-cursor left_ptr \
-foreground black \
-background white \
-xscrollcommand "$w.lessequences.scrollxseq set" \
-xscrollcommand [list .ordali.lessequences.scrollxseq set] \
-setgrid 1 \
-wrap none \
-height 2
......@@ -8432,7 +8430,7 @@ proc AfficheFrameSequences {} {
$NomTextSeq tag configure TagZoneClus -background green1 -foreground red
#update idletasks
update idletasks
return
}
......@@ -8678,7 +8676,7 @@ proc AfficheFrameScores {} {
set w $NomFenetreOrdali
set FrmScores "$w.scores"
frame $FrmScores
grid $FrmScores -row 4 -column 0 -sticky ew
grid $FrmScores -row 3 -column 0 -sticky ew
return
}
......@@ -8814,7 +8812,7 @@ proc AfficheFrameFeatures {} {
set FrmBouton $NomFenetreOrdali.fbout
frame $FrmBouton
grid $FrmBouton -row 5 -column 0 -padx 10 -pady 10 -sticky news
grid $FrmBouton -row 4 -column 0 -padx 10 -pady 10 -sticky news
frame $FrmBouton.fimg
grid $FrmBouton.fimg -row 0 -column 0 -sticky ""
......@@ -8849,7 +8847,7 @@ proc AfficheFrameDebug {} {
set FrmDebug "$NomFenetreOrdali.fdev"
frame $FrmDebug
grid $FrmDebug -row 6 -column 0 -sticky ew -padx 10 -pady 1
grid $FrmDebug -row 5 -column 0 -sticky ew -padx 10 -pady 1
grid columnconfig $FrmDebug {0 2} -weight 0
grid columnconfig $FrmDebug 1 -weight 1
......@@ -8963,10 +8961,9 @@ proc AfficheFenetreOrdali {} {
global Defauts NomFenetreOrdali
set menustatus " "
set w $NomFenetreOrdali
set w [winfo toplevel $NomFenetreOrdali]
grid rowconfig $w {0 1 2 4 5 6} -weight 0
grid rowconfig $w 3 -weight 1
grid rowconfig $w 2 -weight 1
grid columnconfig $w 0 -weight 1
AfficheBarreMenus
......@@ -9025,11 +9022,9 @@ proc LanceOrdali {{behave slave} {aNomFenetreOrdali ""}} {
# Lancement fenetre principale
if {! [info exists NomFenetreOrdali] || $NomFenetreOrdali eq ""} {
set w ".ordali"
set NomFenetreOrdali $w
} else {
set w $NomFenetreOrdali
set NomFenetreOrdali ".ordali"
}
set w $NomFenetreOrdali
if {[ModeI]} {
ChangeTkOptions
......@@ -9131,6 +9126,7 @@ proc InitialiseFenetreOrdali {{behave slave} w} {
wm iconname $top "Ordalie"
wm maxsize $top [winfo screenwidth $top] [winfo screenheight $top]
wm protocol $top WM_DELETE_WINDOW AdieuOrdali
grid columnconfig $top 0 -weight 1
grid rowconfig $top 0 -weight 1
......
proc BarcodeAlignment {} {
global DS
......@@ -205,7 +208,7 @@ proc BarcodeTraceAliFig {} {
set DS(Dep) -1
set DS(Contig) 0
for {set i 0} {$i < $DS(AliLg)} {incr i} {
set p [string map [list "." ""] [lindex $ListeDesPiliersDuGroupe($n) $i]]]
set p [string map {"." ""} [lindex $ListeDesPiliersDuGroupe($n) $i]]]
set pl [string length $p]
if {100.*$pl/$plg >= 10 } {
BarcodeTracePilierFig [expr {$i+1}] $n
......@@ -225,7 +228,7 @@ proc BarcodeTracePilierFig {i n {fin 0}} {
if {! $DS(Contig)} {
set DS(Contig) 1
set DS(Dep) $i
} elseif {$DS(Dep)+$DS(Contig) == $i} {
} elseif {($DS(Dep)+$DS(Contig)) == $i} {
incr DS(Contig)
if {$fin} {
set fin 0
......@@ -236,6 +239,9 @@ proc BarcodeTracePilierFig {i n {fin 0}} {
set c $DS(Can)
set bb [$c bbox [$c find withtag R$n]]
if {$bb == {}} {
set bb {0 0 0 0}
}
lassign $bb x1 y1 x2 y2
set ic1 [expr {int(double($DS(LaneW))/$DS(AliLg)*$DS(Dep))}]
set xi1 [expr {$x1+$ic1}]
......
......@@ -1177,6 +1177,8 @@ proc DbFetchGET {db Lid {format ""} {style ""}} {
proc eFetchREST {db Lid {what ""}} {
package require http
package require tls
# part of eUtils service from NCBI.
#
# the type and format of returning data depends on
......
......@@ -773,7 +773,7 @@ $::errorInfo
proc ChangeTkOptions {} {
global Defauts
# change bgerror in order to send me a mesage
catch {bgerror}
rename ::bgerror ::Old_bgerror
......
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