From ebaa7c5d0ddfb75fb535f8383acb37beafd91993 Mon Sep 17 00:00:00 2001 From: Pierre 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`7SLT&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) POG{D<{oE&;+1UXApnw&| delta 52 zcmexe^QDG^`7O6Fb`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+iBrBgkmDOECf9R6AYQrT=4pJj#5%-K-~#a` zOKr9kwr3{Ji{JpZ=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#EGTGE3EM49B~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 zcmb7}e^69a6vsWfxGae4xaiY|ikQDb6f{9C5JUqL5J99>Q9;|3Rsu0Z8682zM)JqV zEuW=CV>OyPDEeZq*!UxDa&j;+Wh#rzamrzsu^e^FNvwMxPJe&z|DSX2Ip>~V_r3SG z*dOh*2ljdp67*ofjm#5)yX>Q0=+UD`^s3?_PjpG4r?k`)U0z)3U0YJH!V_IsT2NH> zmS@e}R2C7XvCDRb(MHyA(#+bx-h}atoG!Ms%+6XJAAk}Cof@kTI)~8)Z6KZP3$Dg+ zcHgbBd3~-b&^aM*gEToc*01k%n0^l=Bcfd9C1*`f7}wbL{+m$RbqXbg89|}-=*3H` zZw~lK0cSofSHYG^gXZAMHFjcf1*n|-nwhWfc7V8Wl!cE>$7%E6$dzDmnh{YI_`SPW z%Y;8cJIJZChtVpj-57Hj*6m`xiIpHN6D4m_KO2b4hEf+-htsBaic>{-%wiim{?aA< z0461T@js#xevLIJRN-`OhK;SAeghQ{@sS2?Ooa3OnZ&px{DO5he#X17MH=(ZxQ5Zz zfMHLP_v5(ET4thMH^QZvH)f528;46{F)7PX<02u%l#{2-6N2ekx4C|il%^6 z-nhOTR4(t-z2PM4ryNF!n~s6FLH)(kYedyoATLTuGsCKr(Ik+O*R*cTXYkX3G9nP`y>zX$R9$T(n-Zr9K$NW#8!Y@dSk}()1p_j%pWcgSpO! zrh(WpG;`tcRQOs&TWb6K3~IYf_>0YdC?x!y)2lQX*UZZAyecctkhZTCGSV2ILv~Yd z*U>bSN$>e31hz;F$-}>*Ta|UOx7*O0D(KYBt#{9ZX=4_2hABKz&4!0@U{Fl*KScvV ze%+k%_zH}RaK}E01znUqM!sdt`hN*N!LRclh%#Z`sqs7;y#ex8A2a^xO)X%`3m1&P z?X(xi`RPE)0?m;T;_<3i@HDKLx|g%SEd>pr1l2n8#h5HpNI6a+M*G@QP~ za*qoaDnQ-O^2pA6ji59&85`gF95sP5){}~tjG|ef027nl=on3%n9tG=BVa5w;yC|( zER9C35!2L2h@?FV>boK-LPdRM6zxz@?-)-#Vf8M}NSZ)LK=oqW@!`>w0jsxmYa2fl zL&Lzj6hA9m{Qe{w3ZLQ9_{_=VMS1avGw#F^_=J~5tn;)($G7WKIbM=wZfLb`=n4S zZjWw=Jhkybv#ACZl15#Bg_2QT6hrqRS!oKBQ$%)8I=ze@B5%SmmjVTS$5;bhF76;NcQBo=UO=-I1jJOxr7pbc#D_u~4|7wM z${GCHLV`anh>Q}4*!hgbR0tkojjNyX$cOqNx|zr)JHN1m^3XHn%*tFwkI^%P8{t`Y zUYSpBw8CY_ajc+`s7Z1IUH%${D)5HSLmi+C|JQ2k>y#gi3JD(yN@+Q06BkK)5oE0? z*H%X36nJA|Iia8ANw!#{(%c<~PEs}LD} ztcKR0yzG!UJLv-YW|#J-)>1X9U-Dgy+Ex4wuA_k}_GBL-ze*);_>?xQ@XsHiiz@t3 zA7!ZU2O7ws@VSb&oxn$pjQ@6%zEQca$|gFb!q4Yafb!i#z-Dxuq9<56%I07UJWaph bIFI^*8dPo|=q&9)dFg@pMq_+?p3?pUj3RkX delta 7979 zcma)=X;77A6vsUZb6Et1t6sY0nxch@7af-*5Jh2BWD^xNRu{m~AQ}Y4HOADd4!+jw z7AZ5x;D`e6=;Ml(jZ>2(jWjtbqGL>@j@hKSG%e3TzyHto-~7*h&hx%c+_pU%Y+l{| z^z(VPry!xhYn!d#@Gf1tgyyWsUmTiUvb-oKH#0Q1Ff;$7qQwOxm*y530ZxbUgUvvg z%inJ8_wpeDXWa5Wh_H$jhjGT|JjR^HDc^F0MO8bD((YFzSh?ROgt`3hVZ>p~?Xd=7 z6lAyjdT!~8IIh9fz%qonVjPCs4s**^7x(%CmWsLXJ_iI`F7k|}s)D9NsQ_mMl1hwo zSht+py%AS2I2|GE)vzH;B_m*cH#{4bN$VL)LLVWsE`NuybJP}uMY--EL=T-YKWrVs zIL^S)Jv|WDDL3wO0cM4c?;(;)pJX%2!oLp)LI0w2#jQGfFNR7iy zp9F`LvEEVNV>O4-f3k@&r}1R6K+SIUA3!#vYxJjB(r#Rdz7DY%r}gX9!Egp$F}MTt zqVb8vi!#PxHOJnT%#GDCBL;ew7aE593VY zMk!jF^gx1ECLfnzTW7;vQIT>CDe=)=J?AmPcz+$4yB%Y8t8ktNEQKq^X&g^IgyeK7 zEOY))ET_GDv0xvP(xCh!uO8mjHX&I zD{ohWz_#5SwSYXVxw{`q@@SRqZGoaZO`9ucLQXF%E1=33aaL6IRLN__YO1}8v<&^o zwwmh%iP7iwTthT0N@84)6`{^T|F{Rk&i*dx!PIj(4#eq=VExm&Omv$M{B%juGgf8$ zK-dD@gHLb!LA!hvrrh0y!r*Gyf4&B@%$+jy-bGkl=7Jx3z^@A)^{l63VYs}=Tc7;` z!)5O2-z|{i(bO*utJ{Ar7>j1r`(4QsifZGk&V!O5s4u^oXrnv<_;M?lcf9E`tf9Z% z?C>G@<@YLf)#yuc5)X8uJXN?q)xs)qruz1zCgD-tG_aAYJWePA%T^a?jZp?Rr3c@fCTPz*!*%3ofdRe zr}F7HDMO-cR3_V0>JVXYH-qUERINyHs@7o?EdU+n?6>K@ASSaogz5#HN*_+a(6C-( z=D88H0|=^uku*jm))q>eftbN_99iOJ9vVe2ARFT}+g((RIfuFsMhOxpRqPlV1gAr% zMpccazEDwLD)sL;%7LJM`o)Z`oRTEU zYE1-9fgoq;c_i(FpblPLjiNIU2z6O-eKxSvZ=l^ zX$z)bo?~@4jv_D|^GbSAyx@ZHQLas(sZf?PJ0gh!A*kOrYE?2V7l2MREQMx4kV|lM z4t*>EjmmagO~E{pu$^BNsxDQyjP>`2Ojd7gUsbe_N~KQtDpwl0By{KbIG9ek2sZUD zb(qsKsRm6fcfea&l#LWsLpF6sQ0La=DR{n!7Qor!v34(|!BCYSL=SSPmjpD!^XNAe zw0_XPoWGo9l;MkL?dOSN%7WH;Q}S1;s$5A&AkEQlD5VeyXm+e3_=iJJp83aWszc%M zgQ2aAs^LoG)@WK!?GWTpek`X6@DCA#)3%epBxdE_K?M-xbu*!YzJlLoY*%5g99=K?lHsUNHj=mG4}p4qg4T)h*l?1* z6@iVXsY(R8&r&7?^&r*^X~NrD2W`H0o;uLPaB@m7P@O2<=@)4S1bI~iU!wT`0jqRj AfdBvi diff --git a/agw/aui/auibook.pyc b/agw/aui/auibook.pyc index 4ebed30da9658c85c422e2f11c2952cff3160ba2..bb381c88a7910fd73f42c22c12802c59393c0f58 100644 GIT binary patch delta 10276 zcmb7K`%_g_6m}humx4i{SMV`V;wzq!kF+tvBn8ClV{Eh}1X4s)#K$Cxkcu>Ea68&5 zl~G9(l`uHy9u0Bu6``efaz?{4>7n>2P0V*rXI=XPzV-WezWuFlt+n^s``(HYZ^wFX zFSmAIpZ3XTQ);~Wcj*(?p+kqLS@Uu-qvmI2E?AHmwPfCc?7aDD>6uYk3(|5HEzHav zm!P)>2Ab(z>IsCW1qAAL|JxYaObeKyfzZ~#3#bN`{8!gC0=T}@winaEe&{9L^FefI z@LCYbqJIhYcEjO%aIak`x|bbAS~4@AZZ}8ldP$v6d8r7LVxMl){RV9V(JZBP&=%A` zhSv_+DuC;&UY;P(;x(+zO8^fWwM3xBJo$RN1b!aASa%T46;MA>5~yyU{H}of>f~q-0X*@oHq;mUbaW50ddQ4TZS=)- znEp9kPz}5RO_+NVBX*r|dGl@v(2n`nF|^_At_7KUbJq!!n{)FHOW>)C#-RPfRoJrR zB+Ab1cHuoV^JZ)QBb1pF|A%(O+(pP`pVLUSfEeG zy6Ccc46ZxFL(D#ozUVM&MQU7HYE{7d>)rjpCDHHuKJ|k!Zj24w+r` zDhlUR{ag*RbM=m|nT@83*>BXkqi|*qt24YoXSfiqA8H2CmKOa=!*(3~w6z-#Pm#zU z+X#=m9PO?nWhgs)nSE?D3TO7;j^9HIncuJ?W+TfkH%PKt*!G=7%!=#J3fT2yH*SF~!qPAQxkXX~ z>UIHY443=Nhwx6rV%#3b3B+v3qT^tsmKJ55^Z5ephOajXo)U}zA385k)1wnD7GzZ& z>r8b5Z;UfvlDn$*r&>X!86O8y9vFj_E;TrarrL14aWsN9<8bAOq+-F1RgD=;GbNV( zI)pwI?5?V6I8_SnPpUYcx=Z+-qsc(C#Ra`_4B1gUr>kcYC87Q>|E6S;JV&UU6!HN1 z4aa!eDkz0?JBI#dp4_rx+nr&rfaL%9`@ z51KAsU_>GHlnDB$h~iOxD`4x!?5TWKQ7pO!e`DQ(jYX^J9+(H~%4F;)Ch&QKZ|264 zHRQn9mGvy2gl5=MqV9f3`@vwJX6%o3A`7(M1T*VbI-w~DJAa}`1{IsB) zI^9QC;(~g#f#5mYK0QSFeMTh$exqq4p%0jr9HU|rp}$C2H&?^CS=9d5%IPY&*{Q!P zCm^KN>Cb(rfE8@h*v3gj5us|bBNVlS<6 zvKUnJ{|2N=tH}fHd#?L$YG|q;y=r0|HKOB~rAdwcnw~-V8DDaUMhF~L4;n}p+%Hta z30f-QpWQ^J1fSAOg%UiSqB9b_+xL_x!55yUS@1aDD@cW$r~RG4n&bL$`F-=}2~eBwiLNc8*tOS>if z*PamkR}tRNt;5%I-xKYqBnR#88cA{--bss=#9ZR5q3=-2+O6Q9R=D0G1GIAjKaIhG z+FiW8jMN}a@UCPOb=59m?5>~7)cS5(Z_r8pK=O{TC0L6_jp2=-dT5&^MRU5h76(dK zptYhO0&n*Q!CRi#v3LHUPEW`XSdSir2RN E2j{IM+yDRo delta 8809 zcma)>dr(w$6vsV3S724drBxPIP#beY1$Kc@B6U#lJxWB`U`{G1Sb`!%$_k+wkT1k* zUNYa74>A$2@Ix&XG;B0q=@>SSS}Ewjs0}DSAUk)pzt8#qGvD+4{eI`%TfEM=z0l~< zvDvfpFpgx#tA)%!49bxHw@69bAsVqL zgI~WwV`jB`H!vvU1JAJ8xB)d3>j>(lygM+5#w?20pmrLor4fq~9$ZObc!XT>YPOI- zy6<1Y$|`#WLs)S->N(hk(4_>XMThNXw_yJWGR+vZk~`g9`8#4WVOhVnw8Mk9(78cw zZRA!Cr+ge0$1(dT>W&A4bKR=em<*0-?bPUI7S}vBm`*rezX=nPS$a<=Iyl^pq)8l1 z*)(}KnVJ7PdueR2frPPocjFUD+v)FRbENuBvAZ!iSLKSQ-6GBEr!-^}xGNPOt|4`? zD!J2t_9Qucj~AysBQZQG`{&&!F;uIY-^9V%(;FF>);D7{nHQ+AXib?%NKPLVZf1=m zJK9w3t0gb0W$Dd!Hqjim)ry=3l5+%El>?uhCeos9%kyDKS+s{sJV{PZNz~_KXbwX- zvW)RIU<3H)uO~uqO@U4MB^>Ohf~ORw*T1FkC>;a_+qk@fbq!oCno8-Z&;mV_wBiiP zzi69930QlK#;lsZVxuP_3?pZ~M>kr}tR4N<&7I~f8tjcGkA>bV&V8duPA^B>{-GqN zzo`qfkEk?js7Eob_c^XoHIlKuSU;5h$H~#jR9!`?VMas^*(fgW)}IJsMbUP04aI5Y zwFwlXn$Chn8~aN$-A-7B%wKuy)3b9qtkY9|=?_-zG&o}A>! zuFJrmGONEwa^@E>l2pVsN8T=gP*M@U|Elp{0y+Oj+pOy9U=%~qEO&kd9xTNM720S;EMl(>z?k09NBkC1 z#8FgRHv|2l1`lD~7I;F}#r4rnHEn}i6pIZcL$||i)>RR^3;gLsqL(}OKr3ZgA3&~@ z!d8;Qe3yL>y*O!@fh@@)i8-SvkWq{2BJ90kvmU-LQbW6)LCcf0aD`bc8X=z zbRP0p;OPr+fdyXr4JNR_DVHIIH4#3(2C@s)5c=bB=MFgO${@J05$G>qx?)okJRlna zzv9fJA7514(+Wi_|I(krTviTywm}jL)Y@S&3ru+q#Vj8~g(#&IB^bng3R3i|4wo`_ zX?GJRScx3eSpZcQ*Elh|yRfsOIqxl43%yM2AsXn2u-Kpbh~GJ&s`!dWjP6!z`~+uL zR~xP3CPPme{6!y5Zq#YLMIlEpppUTA5#zI8&{u3^)%kuI=V#Iy{%EA lg#)VnhKYJkbBr7=4%4xq<%kht0}C|9hykoz&K)Pd`w!2Kj&A?} 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_dUB^VU7Lm=-8fl~`|E%?snP}4`HY@2f zvJ$6!v!lsGM>LLq=pXiSwHj!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 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 delta 16511 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 m7Hy;eGJQ5~+S5o!IF&P(dm5t%I63_V>_GP<(!H zy~SGO#k?4~RcaZVtwU=FxW9P}Ro8FI54B!Eabaf4 z;arcKVf&PiIL)1V%SHm;vp-J3*B;>fbh zW2dj7)ew*5I2T88VQ9wVq2%cGN$A7~|Lo!n9u9LomRVZ;Ksk}uPxKBGPIUF%0_n^X zJG1(e7|jd*9yE3_H3u*K#e~JWWtCgaD!ibnzqU<(Jq43oKb{y6_j2Wp`-A^8(U*;yEvM)CCV~-0h`c8 z`w`;^E$YHxt4Tf85xnps&B|(mH)_*^u^U=%B! z+{7@ZR8;W;813A;jL6Zxn#&TSM_GHkfMF8zd!!wdti8jD86N0D-C2&K_4=00Oi`gW z+CM!+}&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=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)i20QEhbY#8M5-<{6rQZi{*MIJvPSHaBRNt@ z(D9yQ8yhWX$+VNl<-gF&Hsylc-KrcsZx+?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`?qpJ91 zZmxfXlogr?Pd>oUve}h8hKZ0`P~hF<%_gJ_WMmCrDKW}4`QwREc7UItX+XDa&K2Ne zB*wVSf}e>|c28&xA!VQtIV60O2xXfui&zkJ9LN*SVvayAW z_o9>|D>44?QZOdUyse531QQg2>_lx3=}BqEZHW1Fel0@9Tr5nPsTEe z7;mhztR+U-Jt3aS`Br6wl!DTqto2Gl%78xJ{Lfl|n2fR6&GrK`A@e}i<~g-H9nrCck%|L&!8xdIF{Q;~vTYP` 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