Commit 0ba9eee0 authored by luc.moulinier's avatar luc.moulinier

CompilePackages for windows

parent 22910050
......@@ -551,9 +551,22 @@ proc CompilePackages {{plat ""}} {
set platlong [::platform::generic]
set instdir [file join $pkgconf $platlong]
puts "installing in : $instdir"
# do Tk packages
if {0} {
# First create Rmath library
cd Rmath-master
exec make clean
exec make
set libRmath [glob [file join src *Rmath-*]]
file copy -force {*}$libRmath ../tclcluspack0.1/lib/.
puts "Copy $libRmath to tclcluspack ..."
cd ..
}
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]
# tests
set Lpkg [list tkhtml3.0 1]
#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
......@@ -575,24 +588,34 @@ proc CompilePackages {{plat ""}} {
"linux-x86" {
}
"win32-x86_64" {
set Cmd "sh configure --enable-threads --exec-prefix=$instdir --with-tcl=/c/TclTk64-8.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/TclTk64-8.6.7/lib"
}
}
}
eval exec $Cmd
catch {exec make}
puts "Command : $Cmd"
eval exec $Cmd >& log
catch {exec make >& log}
exec make install
cd ..
}
exit
return
}
proc rmath {} {
cd pkgconf/Rmath-master
puts "cleaning"
set clean [exec make clean]
puts $clean
puts "ze make :"
set zemake [exec make]
puts $zemake
exit
}
......@@ -124,7 +124,7 @@ proc LoadingAlignement {} {
if {! [InitSequences]} {
return 0
}
InitPremierGroupe
if {[TypeAli] eq "XML"} {
DonneTabFeature TabSF
......@@ -134,10 +134,8 @@ proc LoadingAlignement {} {
}
AssignSeqToGroup
InitInfoSeqs
InitConsensus
if {[TypeAli] ne "ORD"} {
RemplitOrdaliDB
}
......@@ -6511,6 +6509,9 @@ proc AfficheFenetreOverview {Id} {
-text "Print" \
-background yellow \
-command "PrintOverview $wc png"
button $w.btn.btclose \
-text "Close" \
-background green1 \
......
......@@ -114,16 +114,17 @@ proc RemplitOrdaliDB {} {
incr i
}
$db eval {commit}
# Met A Jour table des features
# on a TabSF, copie conforme des features
# du XML. On copie tel quel dans seqfeat
puts "tab feat"
if {[info exists TabSF]} {
MetAJourTableFeatures
} else {
set TabSF [list]
}
puts "done"
# Met A Jour table mac.
##########a###########
#
......@@ -1773,9 +1774,14 @@ proc CopyFeaturesToDB {} {
proc MetAJourTableFeatures {} {
global TabSF LNOrdali db ListePDB
set i 1
$db eval "PRAGMA cache_size = 100000"
#$db eval "PRAGMA journal_mode = MEMORY"
$db eval "PRAGMA journal_mode = OFF"
$db eval {begin transaction}
set pk_seqfeat 0 ; set pk_featali 0
set Lfeatvues [list]
puts "nb seq [llength $LNOrdali]"
foreach n $LNOrdali {
if {$n eq ""} {continue}
......@@ -1791,17 +1797,14 @@ proc MetAJourTableFeatures {} {
foreach f [set TabSF($a)] {
set note ""
DecortiqueUneFeature $f dg fg color score note csys
if {$note eq ""} {set note "NULL"}
set pk [list]
#set pk [$db eval {select pk_seqfeat from seqfeat where fstart=$dg and fstop=$fg and fcolor=$color and fscore=$score and fnote=$note and fcsys=$csys}]
# already seen
if {! [string is integer -strict $pk]} {
# dans seqfeat, met feature orig.
$db eval {insert into seqfeat values(NULL,$inom, $feat, $dg, $fg, $color, $score, $note, $csys)}
set pk [$db last_insert_rowid]
if {$note eq ""} {
set note "NULL"
}
# dans seqfeat, met feature orig.
incr pk_seqfeat
$db eval {insert into seqfeat values($pk_seqfeat,$inom, $feat, $dg, $fg, $color, $score, $note, $csys)}
# Features sont exprimees en
# coords. de la seq ou global
# selon fcsys et commencant a 1.
......@@ -1835,9 +1838,11 @@ proc MetAJourTableFeatures {} {
set pk [$db eval {select pk_featali from featali where fstart=$dg and fstop=$fg and fcolor=$color and fscore=$score and fnote=$note and fcsys=$csys}]
# not seen yet, record:
if {! [string is integer -strict $pk]} {
$db eval {insert into featali values(NULL, $feat, $dg, $fg, $color, $score, $note, $csys)}
set pk [$db last_insert_rowid]
incr pk_featali
$db eval {insert into featali values($pk_featali, $feat, $dg, $fg, $color, $score, $note, $csys)}
set pk $pk_featali
}
$db eval {insert into ln_seqali_featali values($inom,$pk)}
}
incr i
......
......@@ -1318,9 +1318,15 @@ proc DonnePosSG {n x} {
set x [lsearch [$mol _resnumber -chain $chn -polymer] $x]
}
return [lindex [lindex [regexp -all -inline -indices {[A-Z]} $::Sequences($n)] $x] 0]
#return [lindex [lindex [regexp -all -inline -indices {[A-Z]} $::Sequences($n)] $x] 0]
return [Ccode_DonnePosSG $::Sequences($n) $x]
#puts "out3 [time {set out3 [TclPosSeq2Gen $::Sequences($n) $x]}]"
puts "$x | $out1 $out2 $out3\n"
return $out1
if {[set v [$::db eval {select gen from corrseqgen where nom=$n and seq=$x}]] ne ""} {
return $v
......@@ -1330,6 +1336,19 @@ proc DonnePosSG {n x} {
}
}
proc TclPosSeq2Gen {s x} {
set pos 0 ; set gen 0
while {$pos < $x} {
if {[string index $s $gen] ne "."} {
incr pos
}
incr gen
}
return $gen
}
proc InitPosSeqGenGenSeq_OLD {} {
global Sequences TPosGS TPosSG ListePDB
......
proc CreeLeMacsim {{out "dehors"} {LNoms ""} {LSeqs ""}} {
global LNOrdali LSOrdali TabSF TpI TMolW
global GroupeDeLaSequence
......@@ -188,6 +191,9 @@ proc CreeLeMacsim {{out "dehors"} {LNoms ""} {LSeqs ""}} {
set ft [$si lastChild]
foreach nf [lsort [array names TabSF "$n,*"]] {
lassign [split $nf ,] tmp type
if {[string first "Cons-" $type] > -1} {
continue
}
foreach f [set TabSF($nf)] {
DecortiqueUneFeature $f iStart iStop color score note csys target
......
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