From ebaa7c5d0ddfb75fb535f8383acb37beafd91993 Mon Sep 17 00:00:00 2001
From: Pierre <ratinaud@univ-tlse2.fr>
Date: Sun, 7 Oct 2012 22:38:29 +0200
Subject: [PATCH] ...

---
 PrintRScript.py           |   3 ++-
 agw/__init__.pyc          | Bin 6112 -> 6119 bytes
 agw/aui/__init__.pyc      | Bin 15988 -> 15995 bytes
 agw/aui/aui_constants.pyc | Bin 127723 -> 127730 bytes
 agw/aui/aui_utilities.pyc | Bin 19623 -> 19812 bytes
 agw/aui/auibar.pyc        | Bin 114969 -> 116341 bytes
 agw/aui/auibook.pyc       | Bin 148514 -> 150033 bytes
 agw/aui/dockart.pyc       | Bin 34967 -> 35191 bytes
 agw/aui/framemanager.pyc  | Bin 277850 -> 280652 bytes
 agw/aui/tabart.pyc        | Bin 74265 -> 74790 bytes
 agw/aui/tabmdi.pyc        | Bin 18218 -> 18666 bytes
 dialog.py                 |  36 ++++++++++++++++++------------------
 layout.py                 |  38 +++++++++++++++++++++++---------------
 openanalyse.py            |   3 +++
 textwordcloud.py          |   2 --
 15 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/PrintRScript.py b/PrintRScript.py
index 1bb0af1..7a847a6 100644
--- a/PrintRScript.py
+++ b/PrintRScript.py
@@ -919,7 +919,8 @@ class WordCloudRScript(PrintRScript) :
         txt = """
         act <- read.csv2("%s", header = FALSE, row.names=1, sep='\t')
         selected.col <- read.table("%s")
-        toprint <- act[selected.col[,1] + 1,]
+        toprint <- as.matrix(act[selected.col[,1] + 1,])
+        rownames(toprint) <- rownames(act)[selected.col[,1] + 1]
         open_file_graph("%s", width = %i, height = %i)
         par(bg=rgb%s)
         wordcloud(row.names(toprint), toprint[,1], scale=c(%f,%f), random.order=FALSE, colors=rgb%s)
diff --git a/agw/__init__.pyc b/agw/__init__.pyc
index 6a5d9da69ec39f00565b74df61c08c3fae942c97..8d7fb7628ac007e307b0f9a576af97345c23b8e8 100644
GIT binary patch
delta 59
zcmaE$|6HGg`7<xq=g=$u8#yM3s~R#eFz9FG=ceixWTqAsrRtaG7iAY0BqpcoXBH*q
PmX@Rz`ngZuCawhlg%cH?

delta 52
zcmaE^|3IIE`7<xqkC}x58#yM3%V{w%Fz9FG=cei>SLT&uWG3oo7A5AEmZTQyrDv8*
I-Yc#J0Pju`#sB~S

diff --git a/agw/aui/__init__.pyc b/agw/aui/__init__.pyc
index 7cdf89c4137482d0e51cb80834120f985bde16b1..f0da19de5e68aac7f3150d4b32a66df15acde48a 100644
GIT binary patch
delta 59
zcmexT^Sg$F`7<xq=g=$u8#x5*R81Ke81yspb5r#TGE<9+QuWL8i?WLg5|dN)Gm8>)
POG{D<{oE&;+1UXApnw&|

delta 52
zcmexe^QDG^`7<xqkC}x58#x5*<n$OA81yspb5r$`EAvV+G86SPixP87OHvE<(lbjY
I+uGRy00++!?f?J)

diff --git a/agw/aui/aui_constants.pyc b/agw/aui/aui_constants.pyc
index e0b39708aba2376e9c382b7fddf5f60ddb6098f1..23a2fce6346a00ba9f819964633f7d46892f0bea 100644
GIT binary patch
delta 66
zcmaF;l>O6Fb`Ivxyj-6{ulP4|Y~^6w@Ltu5fq_9kBR@A)zaTTUs3=vxJijQrxF9h(
WRX?*RF}JiNwb0Lf`?dFsqRaqxdKt(7

delta 59
zcmezLl>PNnb`Ivxyj(wK76vqOY~^6w@LtZCfq_9kBR@A)Ke;lmBqK9XKeH$?x3na+
PP%k~RWc%IsjH1i{#ON0A

diff --git a/agw/aui/aui_utilities.pyc b/agw/aui/aui_utilities.pyc
index 668e991669b3fa86293c7ded52568b413f42c89e..d85802117391cb2b575512289faf3cd4f8dcf79d 100644
GIT binary patch
delta 1281
zcmZ2Jlkv$cMh@oByj-6{ulR4|;9^m=Vqjp<&&bbB)i20QEh<XYFV8Q^E-pw+PSwvW
zO3W=SNiFnqpB%^`wb_fskBJ237ub>+iBrBgkmDOECf9R6AYQrT=4pJj#5%-K-~#a`
zOKr9kwr3{Ji{Jp<AoiL_hk%q%zAO<<wBeGQQzbn}Fnse<DH)P{D*K2O(}U$LNJv?e
zH;A!pKCWC!ii1kjdPq@jq4|V(_seaL(EdTZa;eQ7x^={-1If*{hO%tL$L!>Z=2MAR
wy*bvRorIv@EMv<_N;t;acadVcyvuLm14e3dkVi8qj^XtdCLxw4NBH;y08QMp4gdfE

delta 1088
zcmaDdi*fl(Mh@oByj(wK76xqO;9`+8W?*2@&&bbB)laU>E6K=A)XywR%q=ZRE!0cT
zEScQMEwwq2#gB;?b@$kk840P|s4cg-h2sVx^ENkf|01LY=r+mCJNasfva?cP6A|V~
zZO#(5XC~waP?)?Bdri>ZMsB&uVv^y6jg#EGTGE3E<D@nlNy`xBjb7PDM47iv-h!wk
zpsG?yl)ZP=dWcfDLh}hB_if&&Ek=}CY<hJ>M49B~Lx!?!M8w5pS&OMeDBJwOqMfLq
r+h)s2lsEp_cM)aYahKmjcvosOqh~Ww_8#^YCKMIGoF+F}($^aRn%!=@

diff --git a/agw/aui/auibar.pyc b/agw/aui/auibar.pyc
index a1d1e83d5ec015676cfad0706f331d2378333fca..39cc8c31f955c1f98151966a0f7658ede58d000c 100644
GIT binary patch
delta 9349
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
bIFI^*8dPo|=q&9)dFg@pMq_+?p3?pUj3RkX

delta 7979
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
AfdBvi

diff --git a/agw/aui/auibook.pyc b/agw/aui/auibook.pyc
index 4ebed30da9658c85c422e2f11c2952cff3160ba2..bb381c88a7910fd73f42c22c12802c59393c0f58 100644
GIT binary patch
delta 10276
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
E2j{IM+yDRo

delta 8809
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

diff --git a/agw/aui/dockart.pyc b/agw/aui/dockart.pyc
index a37845f887fe33536c83c135f439d1c4dd800f98..46905c7d0323cf266639ecbcac2c5c491e925b79 100644
GIT binary patch
delta 1525
zcmbO}k?H#+CJyG$yj-6{ulR4|a8Xb-VPIg;&&bbB)i20QEh<XYFV8Q^E-pw+PSwvW
zO3W=SNiFnqpX_KNvAId%FbmPjg(n9Tvu>_dUB^VU7Lm=-8fl~`|E%?snP}4`HY@2f
zvJ$6!v!lsGM&gtLLq=pXi<t~5%7e^{iT9?&=HHe{#48us+;8)g_)rnqyv$(<3Cb7O
zxDc;eV)G{VPsAq~k;(d@9Gma?m=JG+$Yz&-og~<>SwHj!JMj@ax!;Ckvt#UO;vFQs
z**0+lDaz$iClIe(WbuOx;uD(iX2Gm=#48t>{4qO$=&%u<+?4Z#c-5Py=LQfTPr{oe
zir9&Fx$x$I;&-H&o?r2S_&^ulJfVh@6y>Mtt=WhVnaO5tD~MOUnZKQ%_<)g^9Ma(o
E0IM7h!vFvP

delta 1277
zcmex9iD~*oCJyG$yj(wK76xqOa8Z!cWnf^?&&bbB)laU>E6K=A)XywR%q=ZRE!0cT
zEZJPBaGQmo8r5S=1k_9}R1n!*ppiz5y2%9^ESrV3zcLdxQ)08LJ|inJ>Y7a|840M{
ztY~IHNX=wLGl|W8=J`bULt?X)RT3d}n-ALjB*LE}n?E}&Ax7Qe3ob+`li1Ab@rh8h
zf}(8l{7{a~4!$Ntm?^S(ZNN@q%-lRb^aeYDsF-}vMrQMl*wcjVRTbI1CviPd>XxMT
z6IQ1nvN$J`P%79wG3y{9HQ?au&PgET(?V5|$tt;ziBPuLA<v(100RT$L=hWd*QrWu
z<}P_jlzF<9?+FFmX2)6?LTV-hy}Ef?gB2SQex1zOzMKeUn_sr`5%#Kr#AK6BX8?pb
BvjhMD

diff --git a/agw/aui/framemanager.pyc b/agw/aui/framemanager.pyc
index 5e3b7ad6aebcb54629b35842fef35228b9b7aad8..8d18ab2a6e8caaff91246ae1d00cff758c0e9fae 100644
GIT binary patch
delta 19214
zcmb7LeSD5pA9v2VHuJKY*V)ZI+rma;mNA|ZN-ZxNTB5Qvvl+|7y{YsfJkrKw+4XQO
zJqV)^wOu$!_J-Dw*9dJiDLt4PK2MC#p7XozkN>~tk9|J(AK&x4zQ5P=JHK;w?ry;0
zk6ZbPoBqvjjy*N1$giSJ*8xqMG>J-|F+DYE=G4^8%+#p2W@Kh$%}h>7jhdR7JpGMX
zsh)&5vuJpbIof5IzHRS<E0RNl%-D8&Kr}nyHY3}g1koh>#wcI&iNML=3dP?(6ZjO@
zfRA<sF&u7w*6|vMCiWGbmTI7L+<72+?LxQteDGorO-$N!Mr9|5y3Oj&IPXw%bI2z!
zlWY)4p6ndfQp1x@;HGsss_}u>yKdC+J!M9Gc#Osec7^ZL)u5=yCGZ2})<ch81<@2T
ze?|TTqLu9YUbQ&b42r@dCdjObDgb2@?V{exK(s^KFy}=78(&~O{55N8k9zDkG!)40
zug5IGzmVU{u>17&*OC8Lzb#tw&7|1(zy*|90sV~@IGi%e9`*D;Pz5~0BJGny=NZ@+
zY|pSTRC3YqeV9;ZC)+q;HHfCTsWr^GBQ>p_8jl7V?R+r_n>G0KGR&Y+Yw!hXtF%CL
zS+?6O8@&-kQ@pPpqf-pz^WY|Fmn9mg?>!~%{IS1doGli>-DcQ}zhQ8bR2($!3XY~|
znKWKwfwG{lo&8c7s%=?fXLI2zH$g_!w|zCC3`8qSnp={NV`!`FTjn<9tH(gNWBKxl
zAlxK9kG@uc2`4|1<&PvwZ~;Yn$t0afUz*y~T%U3Tl<$~w@|Pf*!fa{kHVt%E8roVD
zlk_QI2zZ@3IekAy#ev%?Q?r|bcohU8W`qaz5*0^R<}OS)1%cfxs}Rj3)z8{jW~HKi
z82RXfw@%|+Xm?*eyE95>%srQV?d?t|oObI$@3sZuw&%S*Ak=DADqQx@bJl@)+EMKt
zbJy#@^X508aB^zdf^rnTc3~avA@kse)fn0?%RZ_TD97@A%)^V(t&ytq<=opC702GK
zKFZOf1MZJbdsO%F4Gk)7^Y5WlsOXMZu49$SEB>oNWuXN(4P}XLdw+o+8dg+@nyy?2
za#4EPzph-aVHSJ)sybg#I&rBkEC$gke^endt2W#R7pQ}k%|Bm`T88rThc7<Vfallx
z*dK51ps~Wfum$!MoeRUZ{sAgWMg6I5*KxF+_SF@XxpI`fs3;nQdt1}n#X3g;)$*LP
z%R%;3WlnAfTM}<0uxE!xCu^VG36Et|Q(}kgZUvgg+1b<g_-epu^WF4KJB=0g?Y#jS
zaMf<wgZH%oSJ<8sbpJIyCBgQ^(iWg($2MW*zkqN%bbk*J>TRlh?VJM-p)1I(#}7UX
z!mataJlO7335%y%ll*-*P(1NB_f?@gAEDK@ZU1rz<*&{tZu`+A8#VaYen;n_aN0#G
zj)j15o1KUQp-!c-7o6-4;++t?bgCx`rzjY48g2;5t6hJ34V6x9d+FJ|I6TO<&nKX8
zYG(Uar=f7-{$oux3Mc92#eOJUNiVM5se!hyUpj@tiOb)YVW$#&!tc+bJq^Ln{;>@t
zV|gCp!DhwPN{y|o{MzRj+WKogbD3+eZyGR6-F3}Ve@*B|6ZYT-fAGV2@Wb!Hj{x-}
zA!3c`iEU%AtIHAC7o8S8xqc$r(J5m&mlO?uYs{r+hwF5=IcQ<07$!A<$5(sIy(}MG
zS0ZmUGKSs_s>)`?2(}pff=UCWth^)GP*huGQ8~+pxxi7g8M;4MRyAV<Xm}HTbxU>w
zHImX;R<>p@qI{Ifa%><g0rj<_KM`&@Dv0$57f^)CeJ<t?D(q|-mam)TfIcJn2i$Cd
zW(vp!UD!O3lMD@KtwDX|m<aX}h;?k!t_K?r@*uob7|H&`O=BJE$v(v4GN%_y*I^&t
zn?0+6w+f@#Gz~h>JjNzzltL;GvbHai&9HA+%CT;FY7jf2p@Xa*!mes~Og0W>ff`E4
z_~+Oq9X?Zrv+s5IOo?YN=*X{6V2eTiPI<88^I9=CE0O)Ko4qSuW)o1IJ;U6xXA&EZ
z;?-$d7Egq$gOkNmCozpH#2{Io!qADTllA_oY$X=c4xO4*_Gohr{NS0aKj>n0YII9G
zi$#JtM*V<QcZ@Za?l}xSYtk+dBGcYyLv#YQW-hx8;-zZUrh!<;qWKHhmmr?z+HU#w
zLe>@CglP}^aS=;FBUDZB<;*2)JBlayujH{eK?NLz{g$!II`}Ro+oXdxmNWGDE2CGi
zIvv?B7O<gcIFoITf64};^1VHxHEb0F-}yMF0y%m$<0vKS`IfF_ji7s-37V`dWJ}O0
zN)<703u^;@fKpgZp=9+|rgNJj)w7mC;3vE~EGlM`&;@kME4%GrwcrAi%KFp0SSacR
z>Wn}AhWUZ=rMjiA1%pVIm9Q*OE*W2Dl(WG)_}cv}2joJtCAr}s>#k!LpDNZD<YTdy
zR5g6#FuSfpXw?tQ1%ALWklJ91LHXWLJAZ-&f(x7vbU%eRx)f=fe`HCZeD7xW%o&Cc
z>=NBO&$22|zQdoLXE${4;nl1W#Zw7Qy1+)F5k&ZlwX8lI?@*l1-oFL6K~CPNYiP;G
zgA1e@3}vENReLn1h(WTT6^Cz8m2s?bZ8`o{)+x=Q?Ku3tfXx4GAP-0Li|`#?{BzJc
z6mGOz-0#T0(0Jl!{T$B0J94K#`7?rV&<Hr|a3n{c)=@<)?#U;j2BMkE$lm-()Ifwk
z5Y5q>6gpJ7teQR?eL71abUlWj$J5Jd?8~>}aCxa8Z;x6>jnS=`0X$nneEk59-n}^U
zBANI&NB3!`8s-n=xuCbam1O)N9)~JS`Eq&)UxbeA2)`nZKaO^9g!fC}=RgIVYzZ38
zCxCeCc(CD;TgPzpK0wY-<QXV=RUFhaQ6CxcGOyG~Um5-?5705_KT|k7W2OCiNE$By
z4dfU!Af2Dpz*`~H_z8^+=$^s%q2h^t*mQmX#nS;kYzBW0#VeOtYiIHzkUsURi#$B4
zr3U`S9Nu1oj(lP+&p;2?WS-gue121mk5qTX{{vIqTYT)L{2eg-y$jNp^GGz7$(n~&
z@@42wO3qsPHTRdFZRF?})G3K-QE6+;L=Jvo1>dcqg!RVv{DOw~+$#PG8bMSL-Dh|U
zbRtFjZ^}j9O{e~pUg9Na#3>(81GMJ~p8{IQyU9$b<E1*B66<*)7^x4MvR`iTXjBcF
z62#x(@Hvd?%DM)A2Tf$cpT5s`qj*Y%gN@t-P2{vqa+wg5!Q^zpI<mRwfEtK$P2v4z
z&O@RS)WUoE%ncBcsOP8~t#2)Ep?D`7+KWIPd`1Tmt%0{rx`a-5dAXxNpLY>^!!7;>
z*?7$v8zQ=ZQQ>Uf`HzTmI{5YB0v<C_l<w^zcA~|I6y6jg9`OT<BjLqB@tux*7AOAH
z(Klj*K<`E!dtQha=s3v1j~Fddz{+S+vHoMM=ndwVgMVS1$OG|Gji>6sU~{;4n;_sD
zPbv`WlLY!8mRx)0Rq+wnsd!_5O_~^l`j%RuplRZL&^FF!@I;2VisDIuThm1wln>#b
z^oS(T{@#<x$t*DtT;Mn??oDx2M}hd+B34KKH}8mIbjKit3+IYfItIG-FR>n#PkTjG
zwz!Mp=_2Xg5-|?cS9<b9CW>YGA`wk;Dw?^LKxfucO+?^#<7D&uD@7E@+liT!Rbmnt
zGnTrXa_?LthUmzjy;kf;@noB<LeUbnCF#3!lL*m?G5@V%I;t=IH=f+FO>nfWB0_cB
z1$?_n_#7#;<{O{v7NMvD^h!_G?-5<W1x`dH>=h$*@W;OuVW5Ylx-XukBYSU|*r0<i
zs1U(;^tfbQr5KJ@5OUUxBLaSpPx#`a;*1Xe(&OS7il=P(?xbje>l-ASofVZj`uf#~
z4|MPqwc-}a-$|BV#cZAIU3Eny>*(9JPV_<N3B+g39kC1L?|IK9^BP146i@PN?uiI6
zSDaiN*eG<auB~il=uDrV;l>6XI-x$s3?1`-*W751h7Xyu*~3PAG#seobROFzwKfjv
z_+VmN13hy&H|hC-hEA8X!e#8$IN;oL8Sr~!>UsKiGTsGUCe?U*7>IQ`Y-?<&aR=m1
zTo#2H*{HiH`s2D8*FZjUOn2im9oZ2*4V}4xbIUrex6uoY9Hp;S8f~1y%;P<<9DU5N
uP#uy(J6QkeXLvCAG{CWj#v1cLxU#<05No`I!)0!N+_`jejeo-MXa5HWeRz2Q

delta 16511
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

diff --git a/agw/aui/tabart.pyc b/agw/aui/tabart.pyc
index 9d1d42ef82eca2a6f53d63cbd24a91e389db13d6..f5d15645b8a330293f7e3d75af5ab800f0df403f 100644
GIT binary patch
delta 3538
zcmb7`-%C?r9L9Iran04jS~0{xT|`91$<{@b#Xu@BnL$60Zq`~yCu7ZRjwos}gFz4>
zy~SGO#k?4~R<ym;3A&M$Q3RSGLPlu_QgjjFAVw29@A?Ox@BQa}c;4szKHqcFZ{+Md
z*=$^~T2{`?b{EXqy6sMb!Jzm<K~)*(S0fQsxg3fFq61!^s`N*^!PuZ0b{}U2zl|-_
z#X&mUY2&v|kLp2Oi1#(9IL%iZ<_Y55+%zPC>caZVtwU=FxW9P}Ro8FI54B!Eabaf4
z;arcKVf&PiIL)1V%SHm;vp-J3*B<EFgsJmz=K~o-nH~yj@6Lm?NWAgn4pdx>;>fbh
zW2dj7)ew*5I2T88VQ9wVq2%cGN$A7~|Lo!n9u9LomRVZ;Ksk}uPxKBGPIUF%0_n^X
zJG1(e7|jd*9yE3_H3u*K#e~JW<GrCKR9xW2!7bn;r4kz?JFmtX(O!#3JvKZ^@ZNso
z6gptS`$V!0U3da_-1My@n0ayc4#5n&az8;3-<8f$#6`C)qt6KIfd9<M6uc$-nUE#h
zJ^l^9EjyB<RePGC?aG6-tNjf8$>WtCg<aTr^yxGuzGz_z7Ps+8@hI5Q+8w|1ADH<6
zMw^}otQcS0FJq-P&<y|m`Y?#re0wHIzOTPsqC_q#bnktYu)KI_E@J|dNql(-l429N
zzjjc9DJ_tKSzJ6z31%WG^T1M>aD<O67bznXE$0ZUh`B3Q30YPupD5OitFH(np#7?s
zT!clfowrIx@M$&udm1EIXZk~F+cru&34X*+p_bSzr7d`(+KFaq4|oUB+thfAR0ZYr
L-<i~0tJLui*eU)K

delta 2973
zcma);-Ahw(7{_<?_>!ibnzqU<(Jq43oKb{y6_j2Wp`-A^8(U*;yEvM)CCV~-0h`c8
z`w`;^E$YHxt4Tf85xnps&B|(mH)<EMus7<ikkAozPJh7jz5noie&6r&a?aQ*S(}zi
z3x8IW{nq;0AD505?cQ&(Slq#0)$jHV^n`;UuRC<!t46~9zJ@?3EOG&>_*^u^U=%B!
z+{7@ZR8;W;813A;jL6Zxn#&TSM_GHkfMF8zd!!wdti8jD86N0D-C2&K_4=00Oi`gW
z+C<d-mcdAEERh*TWbM0%4)qr@9JMudZR41Q)={=zylsk+F_Vh5?`5To0aKDP{Wu-v
zhLLV|-r^XuZpWD}Hi~6m71u@KN!x_e{|>M!+}&9Y^FFePBY~?NmJ8hF5v!O8jsO@9
zhMKv^Xtk%3jlvjw=eZhA%Z&e0q#DwDbJ4*ri7_6v*Jco__Uos(t{cxwC{{_P^stM&
z3Z@rj#8-|KPv4Fs#YIHBg2*+DrVu$&l24Hhqx^jt;+h_OKw=RmQaR3sC%wucMswAN
zz~X4Ul1&`W+~6^*Sj#|*GcmpZCGq0Pd!Q=4re<U(M9Z^ph+N=#Zw10tP9H$ZQvZw-
z;l$EQ=y~h2U!d@e!|#~OBUgYti}#8F%fh)512Fo&atw0Zor4??f9ymY|35yCPrne@
z{4SpSnt?ifa4m&wxTxM3MB<s<SVEpii+?7O?&)*o(ox`|Rq4mKNCik^^dUupBG>=j
jdlyjJ{0-3uwo6(W5Rl$lC%KS!CdTWfJR@lQe|G!@mh30`

diff --git a/agw/aui/tabmdi.pyc b/agw/aui/tabmdi.pyc
index 5d416927be1ab71c4afcabf84fd8e7cf153ce4da..d16d22c36112ea71d9ba59c0c18d049f9e75462a 100644
GIT binary patch
delta 2985
zcmZ40$M|X@BM0+mUarrfSNu0}JYrEbW?*2@&&bbB)i20QEh<XYFV8Q^E-pw+PSwvW
zO3W=SNiFnqpUkKzJb8mW%Vc@hStRIq#o9!I>bY#8M5-<{6rQZi{*MIJvPSHaBRNt@
z(D9yQ8<DDkVYB%fCle!)%7KpG%*ma=M5J<1$j{=<CQ>yhWX$+VNl<-<FP;R|IsC+$
z4GI+@0Y2hGMSOCo;Cm9B^1*^<a-+}!B6Tn-icby`zDl%e;mt837Q{Lp<kzF3j-)6z
z7w;feIViz=kdP%-Imj_~QjV-7cy)ukF_ETkW>gF&Hsylc-Krc<q{-kSMpTv9EDG}F
zYE=hf4No)?pRAysPGp#XRPRxrL4xW|jd0>sZx+?eCf4CVe@@=0l}x1JpiptumLb+~
zkUyvCbP#X&WPjZN;#F_HpsPl#Q$YSy*RLer@W~hT14&RFY*0j`YETjS%^;R&)zw6+
z6rL<=L~IfSxniqPAqi%O8%L9%`mu2Wk*X6-QixOu4mpz;5>z*vl2YY!nnjXe_GGg(
z5>#uM6Yp;E$-B+NNHE*UqLu{JA1p{|G%dDVNxa#cYpn!G$dH@&S$|+A(sWS%1vL;K
z+cy%gWAjvpKoV+`$>Pq(h&OyPpGyx3s!zM@Bti97R}#v>$!2bIh%_5iBD1?I0|4IN
B`!@gp

delta 2560
zcmaDgk#SWYBM0+mUalWA3j;QCJYtd4VPIg;&&bbB)laU>E6K=A)XywR%q=ZRE!0cT
zESbDfRd})z>pWtV{a|e(M%gB|P(sQUx`<D9X8%P<S)qye<VubVVwA~pZX%>?qpJ91
zZmxfXlogr?Pd>oUve}h8hKZ0`P~hF<%_gJ_WMmCrDKW}4`QwREc7UItX+XDa&K2Ne
zB*wVSf}e>|c28&xA!VQtIV60O2xXfui&zkJ9LN*SVva<q+aumVP#rKPHrGhX5>yAW
z_o9>|D>44?QZOdUyse531QQg<eYz^~M3`4WjMEa;90(c(N}K_j?2{j;rw}p{qLgKF
zgT@TvltvS$jAiq4&1`}W1tqO6?PNkmf}&1UM~0wrFwfNLb`W9YWLv!eB9v`Ds;5TK
zW{^je4Jrv4chG=fgn&$nH7p`z63DB-B5g9aQ6w=+=NJ)H<T@A=j0>2>_l<K2TbxH&
ziST4`(*$Ca1!%HN-fZeij8Y4;7-E#2F(ay0i!~>x3=}BqEZHW1Fel0@9Tr5nPsTEe
z7;mhztR+U-Jt3aS`Br6wl!DTqto2Gl%78xJ{Lfl|n2fR6&GrK`A@e}i<~g<!p=`6Z
vQy{@YccBY0_0{A}u02H9IJwMiCo#&>-H9nrCck%|L&!8xdIF{Q;~vTYP<v>`

diff --git a/dialog.py b/dialog.py
index d85a241..79ad5f9 100755
--- a/dialog.py
+++ b/dialog.py
@@ -2494,18 +2494,18 @@ class PrefWordCloud ( wx.Dialog ):
         fgSizer1.SetFlexibleDirection( wx.BOTH )
         fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED )
         
-        self.m_staticText1 = wx.StaticText( self, wx.ID_ANY, u"Sélectionner les formes", wx.DefaultPosition, wx.DefaultSize, 0 )
-        self.m_staticText1.Wrap( -1 )
-        fgSizer1.Add( self.m_staticText1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 )
+        #self.m_staticText1 = wx.StaticText( self, wx.ID_ANY, u"Sélectionner les formes", wx.DefaultPosition, wx.DefaultSize, 0 )
+        #self.m_staticText1.Wrap( -1 )
+        #fgSizer1.Add( self.m_staticText1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 )
         
-        self.but_selectcol = wx.Button( self, wx.ID_ANY, u"Sélectionner", wx.DefaultPosition, wx.DefaultSize, 0 )
-        fgSizer1.Add( self.but_selectcol, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+        #self.but_selectcol = wx.Button( self, wx.ID_ANY, u"Sélectionner", wx.DefaultPosition, wx.DefaultSize, 0 )
+        #fgSizer1.Add( self.but_selectcol, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
         
-        self.m_staticline1 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
-        fgSizer1.Add( self.m_staticline1, 0, wx.EXPAND |wx.ALL, 5 )
+        #self.m_staticline1 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
+        #fgSizer1.Add( self.m_staticline1, 0, wx.EXPAND |wx.ALL, 5 )
         
-        self.m_staticline2 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
-        fgSizer1.Add( self.m_staticline2, 0, wx.EXPAND |wx.ALL, 5 )
+        #self.m_staticline2 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
+        #fgSizer1.Add( self.m_staticline2, 0, wx.EXPAND |wx.ALL, 5 )
         
         bSizer1 = wx.BoxSizer( wx.HORIZONTAL )
         
@@ -2535,18 +2535,18 @@ class PrefWordCloud ( wx.Dialog ):
         self.m_staticline4 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
         fgSizer1.Add( self.m_staticline4, 0, wx.EXPAND |wx.ALL, 5 )
         
-        self.m_staticText5 = wx.StaticText( self, wx.ID_ANY, u"Nombre maximum de formes", wx.DefaultPosition, wx.DefaultSize, 0 )
-        self.m_staticText5.Wrap( -1 )
-        fgSizer1.Add( self.m_staticText5, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 )
+        #self.m_staticText5 = wx.StaticText( self, wx.ID_ANY, u"Nombre maximum de formes", wx.DefaultPosition, wx.DefaultSize, 0 )
+        #self.m_staticText5.Wrap( -1 )
+        #fgSizer1.Add( self.m_staticText5, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 )
         
-        self.spin_maxword = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 10000, 600 )
-        fgSizer1.Add( self.spin_maxword, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+        #self.spin_maxword = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 10000, 600 )
+        #fgSizer1.Add( self.spin_maxword, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
         
-        self.m_staticline5 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
-        fgSizer1.Add( self.m_staticline5, 0, wx.EXPAND |wx.ALL, 5 )
+        #self.m_staticline5 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
+        #fgSizer1.Add( self.m_staticline5, 0, wx.EXPAND |wx.ALL, 5 )
         
-        self.m_staticline6 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
-        fgSizer1.Add( self.m_staticline6, 0, wx.EXPAND |wx.ALL, 5 )
+        #self.m_staticline6 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
+        #fgSizer1.Add( self.m_staticline6, 0, wx.EXPAND |wx.ALL, 5 )
         
         self.m_staticText6 = wx.StaticText( self, wx.ID_ANY, u"Taille du texte", wx.DefaultPosition, wx.DefaultSize, 0 )
         self.m_staticText6.Wrap( -1 )
diff --git a/layout.py b/layout.py
index 669b278..361c1b0 100644
--- a/layout.py
+++ b/layout.py
@@ -758,21 +758,7 @@ class GraphPanelDendro(wx.Panel):
             self.make_param(dial)
             self.make_dendro()
 
-class WordCloudLayout:
-    def __init__(self, ira, parent, filename):
-        self.dictpathout = parent.corpus.dictpathout
-        self.pathout = os.path.dirname(filename)
-        self.corpus = parent.corpus
-    #    self.read_result()
-        self.Tab = aui.AuiNotebook(ira.nb, -1, wx.DefaultPosition)
-        list_graph = [['nuage_1.png', 'Nuage']]
-        self.TabStatTot = GraphPanel(ira.nb, self.dictpathout, list_graph)
-        #self.TabStatTot.write(self.result['glob'])
-        self.Tab.AddPage(self.TabStatTot, 'Nuage')
-        self.Tab.corpus = parent.corpus
-        ira.nb.AddPage(self.Tab, 'WordCloud %s' % parent.conf.get('wordcloud','corpus_name'))
-        ira.nb.SetSelection(ira.nb.GetPageCount() - 1)
-        ira.ShowAPane("Tab_content")
+
 
 class OpenCorpus :
     def __init__(self, ira, parametres) :
@@ -911,6 +897,28 @@ class DefaultTextLayout :
     def dolayout(self) :
         log.info('no layout yet')
 
+class WordCloudLayout(DefaultTextLayout):
+    def dolayout(self):
+        #self.dictpathout = parent.corpus.dictpathout
+        #self.pathout = os.path.dirname(filename)
+        #self.corpus = parent.corpus
+    #    self.read_result()
+        self.pathout.basefiles(simipath)
+        self.Tab = aui.AuiNotebook(self.ira.nb, -1, wx.DefaultPosition)
+#        if os.path.exists(self.pathout['liste_graph']) :
+#            list_graph = read_list_file(self.pathout['liste_graph'])
+#        else : 
+#            list_graph = [['','']]
+        list_graph = [['nuage_1.png', 'Nuage']]
+        self.TabStatTot = GraphPanel(self.ira.nb, self.pathout, list_graph)
+        #self.TabStatTot.write(self.result['glob'])
+        self.Tab.AddPage(self.TabStatTot, 'Nuage')
+        self.Tab.corpus = self.corpus
+        self.Tab.parametres = self.parametres
+        self.ira.nb.AddPage(self.Tab, 'WordCloud %s' % self.parametres.get('corpus_name','corpus_name'))
+        self.ira.nb.SetSelection(self.ira.nb.GetPageCount() - 1)
+        self.ira.ShowAPane("Tab_content")
+
 class SimiLayout(DefaultTextLayout) :
     def dolayout(self) :
         self.pathout.basefiles(simipath)
diff --git a/openanalyse.py b/openanalyse.py
index 3290bc4..2678a3a 100644
--- a/openanalyse.py
+++ b/openanalyse.py
@@ -63,6 +63,9 @@ class OpenAnalyse():
         elif self.conf['type'] == 'simitxt' :
             self.parent.ShowMenu(_("Text analysis"))
             SimiLayout(self.parent, corpus, self.conf)
+        elif self.conf['type'] == 'wordcloud' :
+            self.parent.ShowMenu(_("Text analysis"))
+            WordCloudLayout(self.parent, corpus, self.conf)
             #self.tableau = Tableau(self.parent, self.conf['ira'])
             #self.DictPathOut=construct_simipath(self.conf['pathout'])
             #self.tableau.dictpathout = self.DictPathOut
diff --git a/textwordcloud.py b/textwordcloud.py
index b31e940..9e35872 100644
--- a/textwordcloud.py
+++ b/textwordcloud.py
@@ -4,8 +4,6 @@
 #Copyright (c) 2008-2009 Pierre Ratinaud
 #Lisense: GNU/GPL
 
-from chemins import ConstructPathOut, StatTxtPathOut, ffr, FFF
-#from corpus import Corpus
 from analysetxt import AnalyseText
 from guifunct import getPage, getCorpus, SelectColumn
 from ConfigParser import RawConfigParser
-- 
2.7.4