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

empeche opengl pour mac

parent 4873623f
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -116,18 +116,20 @@ proc LoadTkAndPackages {} {
package require Tk $::tcl_patchLevel
#catch {console show}
Espionne "Tk : $::tk_patchLevel"
if {[catch {package require tcl3d} Msg]} {
if {[string first "instead" $Msg] > -1} {
set vertcl3d [lindex [split [string trim $Msg]] end-2]
if {[string range [::platform::generic] 0 5] eq "macosx"} {
if {[catch {package require tcl3d} Msg]} {
if {[string first "instead" $Msg] > -1} {
set vertcl3d [lindex [split [string trim $Msg]] end-2]
} else {
puts "Msg : $Msg"
set vertcl3d "None"
}
} else {
puts "Msg : $Msg"
set vertcl3d "None"
set vertcl3d $Msg
package require tcl3d
}
} else {
set vertcl3d $Msg
package require tcl3d
Espionne "tcl3d : $vertcl3d"
}
Espionne "tcl3d : $vertcl3d"
if {$Defauts(Devlpt)} {
Espionne "biotext-dev: [package require biotext-dev]"
} else {
......
......@@ -975,11 +975,11 @@ proc RunRPCA {Ld} {
set NbRow [llength $Ld]
Rpipe "rm(list = ls())"
Rpipe "set.seed($::Defauts(RSeed))"
Rpipe "data <- c([join [concat {*}$Ld] ,])"
Rpipe "data <- matrix(data,nrow=$NbRow,byrow=T)"
Rpipe "set.seed($::Defauts(RSeed))"
Rpipe "pca <- prcomp(data, scale=T)"
#Rpipe "pca <- prcomp(data)"
puts "\nR PCA scales :"
......@@ -1076,3 +1076,29 @@ proc RunTclPCA {Ldata} {
}
proc Cnp {n p} {
set sum 0
for {set i $n} {$i > ($n - $p)} {incr i -1} {
if {$i == $n} {
set sum $i
} else {
set sum [expr {$sum * $i}]
}
}
set sum [expr {$sum / [factorial1 $p]}]
return $sum
}
proc prmcnp {} {
set sum 0
for {set i 3} {$i < 32} {incr i} {
incr sum [Cnp 32 $i]
}
incr sum
return $sum
}
......@@ -1900,6 +1900,7 @@ proc eFetchREST {db Lid {what ""}} {
continue
}
set LidNow $Lid
switch $db {
"taxonomy" {
lappend Lres {*}[TaxonomyProcessXML $ddb $LidNow]
......@@ -2619,6 +2620,7 @@ proc teli {} {
proc ListOfEBIDatabases {} {
# databanses list :
# https://www.uniprot.org/help/api_idmapping
# http://www.ebi.ac.uk/Tools/services/rest/ncbiblast/parameterdetails/database
#
set url "http://www.ebi.ac.uk/Tools/services/rest/ncbiblast/parameterdetails/database"
......@@ -4117,6 +4119,7 @@ proc Mafft_AddSequences {fali fseqs} {
}
set url "http://ddbj.nig.ac.jp/wabi/mafft/"
package require http
set query [::http::formatQuery \
"format" "text" \
"querySequence" "$ali" \
......
......@@ -750,6 +750,7 @@ proc ValsDeCouleurs {} {
proc Luc_bgerror {err} {
global errorInfo
set old_errorInfo $errorInfo
#package require smtp
#package require mime
......@@ -782,8 +783,8 @@ proc ChangeTkOptions {} {
# change bgerror in order to send me a mesage
catch {bgerror}
rename ::bgerror ::Old_bgerror
rename ::Luc_bgerror ::bgerror
catch {rename ::bgerror ::Old_bgerror}
catch {rename ::Luc_bgerror ::bgerror}
if {1 && [info exists ::env(USER)] && $::env(USER) eq "moumou"} {
if {"SeqFont" in [font names]} {
......
......@@ -106,6 +106,13 @@ proc PrepareViewer {} {
proc VisualiseStructure {} {
global Defauts ListePDB StrucAVoir
#::profiler::reset
if {[string range [::platform::generic] 0 5] eq "macosx"} {
FaireLire "Apple does not support OpenGL anymore.\nThis option is not available on this platform"
return
}
if {[TypeAli] eq "pasdali"} {return}
if {[QuelMode] eq "seqlab"} {
FaireLire "Not available in Editor mode !"
......
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