Olena-patches February 2011

olena-patches@lrde.epita.fr

2 participants
48 discussions

last-svn-commit-758-gbc82f16 Improve about dialog in scribo viewer.

by Guillaume Lazzara

* demo/shared/icons/olena_smaller.jpg: New. * demo/shared/shared.qrc: Add new image in resources. * demo/viewer/Makefile.am: Build qrc file. * demo/viewer/help_dialog.cc, * demo/viewer/help_dialog.hh: Make use of the new dialog. * demo/viewer/help_dialog.ui: New. * demo/viewer/viewer.qrc: New. --- scribo/ChangeLog | 17 ++++ scribo/demo/shared/icons/olena_smaller.jpg | Bin 0 -> 8028 bytes scribo/demo/shared/shared.qrc | 3 +- scribo/demo/viewer/Makefile.am | 6 +- scribo/demo/viewer/help_dialog.cc | 43 +-------- scribo/demo/viewer/help_dialog.hh | 11 +-- scribo/demo/viewer/help_dialog.ui | 138 ++++++++++++++++++++++++++++ scribo/demo/viewer/viewer.qrc | 5 + 8 files changed, 173 insertions(+), 50 deletions(-) create mode 100644 scribo/demo/shared/icons/olena_smaller.jpg create mode 100644 scribo/demo/viewer/help_dialog.ui create mode 100644 scribo/demo/viewer/viewer.qrc diff --git a/scribo/ChangeLog b/scribo/ChangeLog index be2e395..620dcfb 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,22 @@ 2011-02-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve about dialog in scribo viewer. + + * demo/shared/icons/olena_smaller.jpg: New. + + * demo/shared/shared.qrc: Add new image in resources. + + * demo/viewer/Makefile.am: Build qrc file. + + * demo/viewer/help_dialog.cc, + * demo/viewer/help_dialog.hh: Make use of the new dialog. + + * demo/viewer/help_dialog.ui: New. + + * demo/viewer/viewer.qrc: New. + +2011-02-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/viewer/runner.cc: Clear arguments on new process. 2011-01-28 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/demo/shared/icons/olena_smaller.jpg b/scribo/demo/shared/icons/olena_smaller.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c6b9110b047424a3ff83f2dcfce93ae2d2a172d9 GIT binary patch literal 8028 zcmbW41y~hZ*MR3V-QC?G2uP=tfTVOE4&B`#A}B2)5()?i(gM;*NQZzl5>g6CNK5k{ z?){#7@Ap5?pX;32^Um69ty#17p4ivZ*NXtbJtb8o0E8AE5Dx%cF9C6i{tmVPprHY9 z0RVsjz(7O*1Wh3H4**dCus;|8?t!TPVjU32zihw&5bXd!|7By0-rpcP@*m!R?jbp# zza!>=|FTxgf&9%ke%H%5hN=n*7Fs%*N~-FL=rjQUM@8Mi)eTGl04}cHo;u3%42DL= z42U5B3}6CqKmY)&kY4T@x=MOC5mXfw7`)I%H~cR_$2gw6$p!$%cvZ9*82+XI-|h&J z?w;Q0%h5tR+_ph^A<-O(W@kTd_Z$5#nn|pkZWw%12NF+of@r3=VY@&1rVb?5f3oZi z+qk&eplxn)cDHe{x#3PUKk@ZJp&6o%<|tnWlpmVM(ahrP<Klqk6Eu^!psc(A0E%;? z_eLS@(R>TdIG%bs3TT!@4<e4;KiK*o?2YnA=LrA`Ztek|4tDn53>-*K1_3cKQ3e&1 zpEJtan^(&U>15?;!=T{i;%?;{004hp^NklkbW>Xfbdf~_#6(1R1^LkB|4aVc&cCew zd$<|fKP?Wl{}?k6+2G&0zkUDKx#a?Y=n=X$Nq_6C(*dCFF#u3}{aeS90|5Au08l&p zkLw}3nJ@O<-tOZ3{C<9Zd=4li-%UaPlK;`*FU$WL{&7COoAdouJBGU`TPq)DZ-$$q zBHf(bd^{Pv+^vu(2HyWXiT~e@|48c}dGP3<Y*C&lSM;g$(X-6K)eb$}t~L(d4sNat z4zB;z2>(Cb{*l8C{yDGFK%9RCkXY~m1j8f%WP1>R5@Q1p(=2ok=&x~8$J7UI?mPqf zwLj-Qn$i7#wExzC6VZoYF9$n@8?}Ot9s|<H)Axqa_ry&D1F!&mfCQif=m2Jb1K<S& zfjfW%APXo0_W(^m4=@7E0VH4#xB#Aj9}o;Y1fqagAPIN@WB}PfK2QXd164pB&<wN# z-M|1a0!#q2z#{M+*aUWgW8fV9R7HSrLBt?R5Iu+$#0?SziGrj-iXe564#)^(39<vZ zf_y;1phuusP%<b3^afM}ssuHF+ChDwFQ6IF5@-Xo4>|)wz&KzMFfEu3%nud?%YoIv zdSElK9oPdL2#y3NfYZRa;8JicxE(wIo&Ya`H^D~`0D=u6gD^sPA)*ikh$h4sVhizv zghFB<sgPVqIiwNN0~v!XLbf2MP&kwr$^hksN<dYh51>e>2Q(BK2hD)KgVsVjp<~b` z=q~gMh6|&Cal^!6sxU*C9n23F1xtk$z-nM!unE|A*fAUqCxf%Y@4!{yMsP=X5Ihe4 z8eRc!gMWdqz>g3J1SNtSA%)OHSRuR-QHXRzDWVlIiujH=!NA6##}LF&!Z5~g#fZR2 z#VE#T!5GC@!#Kwzz+}Y~$JE5M!3@Am#LUNR#2m)_j(Ltnh{cX2g{6n(i1iRF4XYfh z3u_MR02>>d30n+X8`}Xp96JsBJ$5hl680$$5e^rQ0*)z;4^9G3Ax<0449)>AE-o9c zEUq!GH*NxM5pD<W0`3VOF&-bDDxM8q7+xk`E#4^J4n8J6E501QIes91Dt<NoF#Z++ zCIK6P0)Z7lC_yGc1Hlx*5g{?50HG$K3t=2#F<~F!IuU}1jYyHmhA5IKkEnxag&0E2 zOsqhRBz{DkPuxZPodiz8PNGWUND@m@MlwXQOG-p4M5<5fPnt>kk#vy^LdHg>O6E+K zNLEEQNp?m~OD;!_B7aI=PCiQhn}V7`mI6f)Ls3C7L2*XOK&eRSMEQ)ej&hy~O2tK` zP31?GMb$;MMNL92L5-x2p{}C-N&}|hqS2uVqRFEfq&cFcqgAGLr%k8rpxvS)qm!j` zq)VY|q1&J*rkAF7piiN1rT@u5${@$!%#g;=$*{{v!>GdO!}x}Ai1D0>o#_En1XBgm zJTn%vD6=hd3iBuCT^4#44VGY*5|*#5n5?3#_N*^idsu(7v9lSlMYGkht+P|GtFi~O zm$1)q;Bv@tcyQ!$jB~;{MLC@~UvrLdfw_da?71?zhPlDqBHRw#uerbQz<9)XTzPVN zrg(99<#>I0OL&*~$oSOxBKYd~cKBKNjrpJP_wZlc629epEC1H40Fl5wfe3*{fqg+P zL8M@&;P`Fa+e){?Zr9)56XF&^31taQ3lj@#2uBNl6226<BjPDiF0yfl<&Nc@S9hjF zNkp|o<3xMKU}ExOVPef<r{W^w-r`l_za)4ioFs}R)+N~`QIh$RD^g5SR#I=I7Nr@a zEv0j$7iAb_tYmU!mSve`ZDb2%*W@_m9OX*ocI0o#d&<|y|5gxJ2vKOe3%RR&H|Fk; zB9Y<)#SFy-B_<_1r4prGWntwY<u(<VikiwZl_^zPRitW>>h8Te_d@P<s^O^Vs%5Ax zt8=M)syAwYHSTFV*O<G{df)YaohG2Es`*@VUW;AJL#s&}uC1k=sr^GoKqpwIN0(UF zLbq7=SWjLrQE&DE#{-`SpY-wdP4$cPe;eF2NH$nB<Tng495A9XaxkhlMi}cG7Z@Lz zD4M)5`EDv~8f7|Z#%|_s)@M#-?ri?i0^h>QqS_K>X<%7wd10k#m1}imt!n+sdKamH ze2Lt&k+n&&*+5C5l2L26Qntyq>vmFh&+RtsW$aV!w;U84G930CRUES&e>-V96*^rz z8#q_EV7OSiG`JGEI=Obb(Yg7%eR1b@k8)r15chcDvFoYkS>OfoGV`kUCP9Bp4f=5S zJoZ`gmG;f_J@M1`tM(`Kcl93(;0kyeuokEk_%;X{gbex=%ozMIcqv3K<V`3j)H?K2 z7;{);*!OVd@OKZf9y&ez9C0fmIpXk<!K21V+Q{(8mB-4DOQP_iJfo(fC8D#RK%Y1~ z8G3sAY5LQv7@L^>*jurwu@`a3xc+#7__X-z1lxq6M3Ka-BzTf*(&RIlXYY~;lLM1i zo@+d>O<_ohNjZFB@uDwPC^h>f)=Qt4i)rd<_313>N$D3E_8AkI@|hK{XkI;i_4~EW z>(MOPtnzHy?AYwH9EY6gH_C5nbJ=oJ^Wb^Dc|Y>?^LyTkzAY-CDu^w(EOaege5doS zv*=DyQ87(%VhOm!r(~nlv~;BGZdrXfZ~2=FvWnREz<ZzfKPxROC#%$|K2?iWmw#aW z@T!KmCZ-lt8&JDjXJ5BiZ&d%K;a<b1Mv2CnCcdV^X2#~skE9<HTd-OpTdrFJTaVh@ z+qT;6+E+eVe46br>=^IV?i}h;>+0=R>h9=~>uK$k>TT{5?`!B6?XMdU8K@l;9<2E+ z{JCaGWT<xd&T##R*hu3S$uBLVGNbKdcgMQNRmTS=?oWJ~d@wmZWjeJuZ8N<-<2<wX z)%WZ9Z1@~(E@qx!K6Qa+A@>{Sw~9rP#g9vOmj;)0muFXyE1Rocs~6uRf8hQ|U87$s zS{Gbz-cZ^Y`Dya=`=<Nm`Bv06;r6Q?j-3y`WPc6r8t#7I^W3}Mk2|0|C_EH8{B)#s zv~cWleEvJ;g!1Iwspx6XnZeoGx!(oiBJGm%vhhmoYVO+Q`uchnPyoO;%O2283%(I3 z<fer|p%5q>hJKmdYzRyY^oD@L(XS{>tQ$cS4mK9f&B0BOKV88v2n2?OfFu4e`9C$+ zZ2%z#pa!TxKuiFb5CkCvU3UUh=x-Ou&2r~2fn&fBm=GwsPl5mdgFz4o7@a8`_Q!Gz z41vPn2to`ZMt~TTNkEQ-RND$m@F5xVZI6g&EUXIcyX2I5Zz|Ew)aao99vKdS0Z;@8 zjP4X51VCUY4E=}RtoYCZ0;88?gp4o&Ic+PVXK;^)Z-|*H+jmJ=1m$(UEM0#Ea3JV- zgb+eN2AJ7w;4y#R`DyHhQ|k0vE*B1iN`42|3B=(8p3iGFdRdYIYK>KcKa>q9s5}j& zk6v>cO;>Wg{xSaoq|E+saaX!6WSC`OBjn56_Uh&oVfhh|5%s!f(KE&Sipb)OV_C$( zB9U(M+_LWZBF7oNIo~^1>)g%TG^cNWw8+RIx0{H2+%7_XNnQhaBa~BLgeJ5tUx2Ow zWW{1K-cnkcLY+>gwor@Z?C8t2Q9fQ=UkCgCDzYC4z17PT#Y0V4eX61@<k@fSpLd-1 z#GR;h_X1nV*eZP@`}C)9lE8?8={aymmMTM*Di97JYL-W+-ee-;+jRXGX>0ch$K%P! zRufSac<NdB9`wC3@&=g>mZmCi2yC4QoLl6zR2G<14c)pcyW11pHV-d9D)z)j(>7&z zzT-Y<k{LK$tJT!itfAx(^euOglIO(hx{&5O|M+BeCClvf(`3N~V6p0*)_kcd-6Paz z!>(VcueyF>JPxYa3DVS@!`q6a|3!e$_lhnk{47M4;i1GE705eB>B>0XLh&=wOO2X= z0}kQ2&wCP(*s%t+j6k)M-~yv{(=rtgULiyE2>X}oZBT};m81Y246ZBQky)vjpKHnn z<NmKw%uiRXefXr58*pNWy#<RFBg*=l1%dv#2-4<6x~+8$RI7LxEONF?vYJ=Dv(|z& z%^)I|@!|5$O2VnA?aF&l?>;_Fwycz$+T#;@Z{>=>);mLP23Ahm$(A;bDf{<byJ#Mm zW6Vay@eEV={dz{4{-UY*Y!5ROrC6R&uztJ$!&oS1>R$2eXjOY5g^_yC18H*&m~UN( z()%aD8i6UZGSSN|5pz;f7Fs*J#hZNixJvD$1?BStv>W;RBVBWGEnlvV(g+atf;a<x zM{ZMmt-Tth9IlgrDR=VuNhQg|DT?J0{bZ~Hl~|%@sVtYOEYE+=t-IyUFP+r6)xO)r zFZyg^&C8I!bE*4M8QYH6y}O)af`&8><FfpCrIurcl)M*WCggkD$#+v-=L>a6o#-ob zYHIxI#5cNh51C|D&m&Y>k`0pw(XHwc=Y8ym-~=HW_cdbz(faeScb-qT<WZFmh&7%9 zzT)i#qYjPwzhenssDWOyHv!m(2Oyc_L((ZeT;g|;?>Mv0jj8ha8Guwd+chlBjXs&3 z5Te7%m%#<g`X;)*A1G(0PtJ-;ZmnFN91WD5`Rs=nuPn3IYrHAy{<r|X2D(jmn18P% zDy610u&7KZY!Kb5saz&_VIH5|5Q}u*t#s{97^9k1G`12k!TZhs!6wlvm!p<sZ<Rh! zQF9!@BlB{c*X;Kf2~A-aVm5QO1a58pWJAke_YTBP_2o-uu`3V0`b!7n7Z!gL`xvnB z(mB)LKcL67+q5z{y{M+90xI1{l+Sec*Xy^WV;}tOJ0I5*f=Os2#!b5Rgns%|*Eg7# zCyWWBdaUvq_@xq=tNH>}a<QqW-R%s|&ka7VJ_~ExKFl@O=It%^X_FHHY~R`d2X`d! zp!j;}4r6>7B>Fk88}_GKD)ZCk=X+ff;K3z7MZJfzi74Po6MMwdw4IV!%Yq~{zK=PX zj^Bq70r_WqK6az`XN&_qev*IgqbeRcF}*u;o0GoZT%1729<gAnz4Egyknt;BZ0(qw z^{q*-J%wi<;|kvE_1ZL<8%BeIkSrhqNzf<IFr=r1n7LZqYDGUUyoj1%DWtl`@ARrA z&)PV+mSl<6cypGK6rURt@36>`IR-R0`7tNRr7`_&)5+M&5r6%P*r!JMeJECyL`Ndp zPUH*2Ht6qafBFaKf!%J2h|bs29Mtn~u1KUHwnGIy8YR{)x<vw2sc%zSUawc?Rh*=h za3%+^tyMNjOucv_K_5nZUoEf^wQ&tl*JTi!tO<xKxF6(xm<|rg7d96lsWyvHj#s!B zXC40JyJz0Fq~eQKUbzbaDJ<j4gvpSwO;d(cn*i_b$AbG^G?78a<MeN^tjkL!FD743 zL>8sFYHLb|+GJpB5eY-wf|LeCgFiHOcG%`z19Xz7D~wd25A!ni(%B;Hu+h}6#VwP! z1p>4=71je1M8;0F^xqW&-tw(xP4IN-0pN$!{=7>?sLcX$!msgd*TCzFhiCN9H?M)L zklQDvti1fyzE#Nv&&qA9L?-<neE)uHCb>$Ee(w2J1c-ewnZC6c??=>}ga~e$%gP2% zxM-2%tLLit40MzJKd=U+FIzyn*dBef;+-8supb(qe-BLZvs7Z{>PK;o;@Q~x42gML zWHkACx*FFIFmYEU<%C=oA+Ex*bB78%rVg6+9`&!}$52D=om>5g?0wd{%(`tW+ixVt zo<u<;y)r_soNn)ao_!iJv}?Y)u==<)EoSsoW*mQWeX7J|XlzzN-fZHtuE>w8VMR^c zxcK_iqYc)Vvk&nR5j}m@qKf)nOPXayK99J>6O;;?<xMr@;sWmL%#-YJV&B*K@zc#W ze=5*IK@Cs;*pK#<E>p!x<v_HWrJAQwRa|LPPm%N~gdnLn_><~`M`fA2&u7beHaaM? zW?i<wgeBQIqQXcc@~FFRiRLE=#YrYr=VZ=15lK3?pQdL=P-H8ZvAda<ZOp3wIGb3& z0S#yrRTz%--A}2+EFHfK)L2NpW3D!tiDCNIM~x4ya5InG&G7T#bCfRQL|p@d<BiXC z%r2s-)8C^SB1l&qn0qMGK@}`VtFLYJen?NnCM@T_G<>ufc>lrVNGK%`|B$mLV8rvj zyQek}uPdva1mvg!{HVn@c51nGv`#-H%=>_B!8`LKm4t>_Lqg5dabe+Z5ff6DLhE}w z$Cd*55!4<r--#5cN!5rV1uF5dy@xxl0rw-3(ZloFhO4p~TD5a_16;VDfHFPx^!T=7 zQU8SoC%^7|az^)##LVVrA&udBlkrfCqIudXaoekwNvd>vOGhNC3CVm%>U{@Qs^=nD zPOB7aZw`YwAq2|_@BLZhz~Rp2{cV?c*8KM!q*ChwjhXbUP1itF;_ycS)w>=N{Fgw* zw93xQ=U*jLgFmLGw-4H3-KX}+@Cl<m_b9~=BXJ#Z<Xt)m+6ZP#Y{yA3=Ux7!9A7y9 z)iz^LzbHTWvMK+4jOMT5*@?2z*1Ju1qvRTaw+mfJk&HNvUYI15JgG9=*2JL)UaTeR zF_+DK68#q*Z99NJWK{D@MR#&Vx1H&RYm)Hs(=ufP`}u*cpCtjNdWs&WlD>ixe#Q^t zvy>i>P6T=oF0@|*1f|VDn}hm{{pSt4N{$Dz=E}B9+Oqqqm#y2I>~mQ1CR()~bTlh{ zFYf7-U}btW>x;YTj?MBYnU|LhnGJR%PSkmP6_L<AK$*L_&X?;!jV!)pC>qclcUqgT zUY({p&0T6Y?K{oAdcRg!oG6MaPWF8wrxgTjpWzp>_pKy@Rs&mLTk+eyeKxm7Uk;!~ z1KxkIGor&`lYGoJ&}}5ID)7TsOPTIxp+Fzc{Df;s*M^C4)I_XjO@mo`^5=4B@*PO3 z>j-cajz2rHr6MI7o=T=g<SjNE)^GB~FZ%u3+AAZuoMDq>--~j0#F%+;D(`&Ms~HmS z8tc$+(m{{?Xu>Lw0^L%F*|kK2ZC}0An(UeGkaxLzyr<#pN5}=os_K^87UXAaN$5zF zPPv~bNR0C1<D{~zFz)PTN36GF9PWoo&jsd@r}fB}?j!Tmv>z>91xRP_gy^d<;?)<J zk>1Y>{FF#o`$C<y(@{F9_;r~mZB$cU4W0#en952GmcFz8``j0$pK1wNgPt%09hh}o zf;|k@gt50TR`b_7YP&6PbA&~(eu%$T&6y$_Sx`0EquW2%ksVc1;NI(T^Yi<>jVFh@ z_{irLnK0SujxVwCN?u?(ZsUco1SQSBkSY$ok!_8@?whyTM1X{PSa@3S0DFMCxc$$9 z;rsKl!|#m~IUU@^s}8&0#>Iz^BDZtl(eu8n>1iC%_1Wo9_UGWP)q)ej5~ICUI>`tC z{{v=HZb3hpgYHo@_Oig3MpkK{!DI$f)oJ>0<nv1MU@dRN#HLZ1Ej5b_y&!*s$yd+j zgdVT2Yah<k8nI8}ci{c&w7u)UmOsMpM=dzU3)m)PO-=`jc<MQ&Co3AR+UqFA8>Qi~ z0@+x7?UGH?muB!|7p3o8wXZ(Y4|+Cob#2{cNOdr?78oMFXpe3?Pj!<HL24SG=bq9Q z7R8lWHXGr@G{>1_dkV$(u3V}Yo&|D74T%@dD#((Qev98AH{8MG6rb85(OIzsluxE( z9=+~seI@kmlg60SgKxa6Kk<TW4ZW|@Djt`Xf#RC$oIgZpMJDIJr9{x1(|Gl;1WuQE zNz2Kwy+wjNhp5@J?R|L0SN!~ol<!SsjaEi<v1K)rrh)oQSnx2Rw%>M}H_TK`^0qtX zJ~EdTudEF^br$;KB+wWqgmvgXod_^uP9i01xN?<gmX>meYizYx5y+Y^yB*z1k7zNb zRAux!fATi2;!yBxzH|JcP=3Zp;JQdNiK{kme(e{M0dacq46MoHn8Lyk^7`qkT+g8B zCZiMR*Kf2*J^G*IA3s*rtaB9{-G@l9I-Gt-xN+qTOHCv!FYXC$I>*YPK0Q5Il7l4W z&|meGWL^UXdnaZnr3Fpwq*7$>R8nb8NLx%*5po{Wy_LhNk0IcoZEc+FXbYQf(=Md> z`_F#2N<%9jtekLVnxeDI(AF?L4isEVWd2Og$@EvyX+}pYZp*FHt_#f+PNq!5Z#8$B zrI^@6(7=7JcA=Bnm?hbD<#1HZ?D{QLycLbPL(Cl$V4121#?2HeGd(+`(cY=r69 z+5d{CbhKGj65;ifqrdPya&o&`cUl+D=)o&^{lI&;F$cE0$-Eny-EbK4K{8HHXog(F zt<$7vCZINyyKRI@OZULgL4@6JEZ`2a)Qbu6uT_0T9}2AZ$D&vSxYS5Ika>1jmP`+~ znU(x;g<!qV{h5IvN<p7{xA#kvKj-uLvcbI;T+WwPR5A>hL|2u(w|-0L>ww`n7lGB{ zG!w>A3r8E2rKq=VgPwPYwt~ZxOF}JGIHb*`kv))}*#yM9d5`$~*|m3sIk=|@OsfWJ zMC!#hH2a!a0g94|k_iE;*=8j~vPgtCPK2^cNGlZF@f9mewcLi@<k>Hc%e%t#__PX{ zB@@S#TuWP;q*yw!+8vbG=9K*t7KP!^=baLv&7QJLs+hm`5Z<S8)0f?2(YC&|QPg+C zY!?#->rap|0!gVs0=X&Xm`Ua0wstE&b`I7iUj$Rwk5wxe*=^}7H?iqcWDQjCXmdwt z4{wd4$HU-l&`H$pbpIuV!?q%+_Q~vdMPN<C0Fg};Hf7;cQTA}s(xG6FEA}jZ8q7B1 zbrZ>CD>&PF+AAM1-TWYqgz?``HN#zV=Ra1Rgf63cw#{XjqsB8bIbT!=2e($coOl-x z?ltZmmC7!jYDq~}`^e=9Oz1?FkIe+DKbB12NKXm9{Nm?-*-Q5#J0dsnvg&vue6iHX zGCxH2Vqxvum|XpI9O|<Ok5PWYCV78n03D)uOKv7{qWMF~IW^&Mn12PT;SNz`ecTcB zk%h-LjrWk6lV7v|Pb0aPhe&T+m!!M75gi=0wx;+!8cV^WN2(=6S4u5d*NdcX^8wPE zj~&;IT$7*G@tCiNtB*1E$=rz~=`a0ltEHD85-ZB3#O*%{6pE)zo=xG#7<ziG$2{Ch zr#ulH+U@Nxy_fevtNZadeA`@XF-u3oMPE!<INC2MYr04JAS6%w>`ZwnfYV_lcl}+C bgz4Fa|5>K}fG8QRgI>%Sw?|pt^~`?&8`a%< literal 0 HcmV?d00001 diff --git a/scribo/demo/shared/shared.qrc b/scribo/demo/shared/shared.qrc index 051c986..3e1fd85 100644 --- a/scribo/demo/shared/shared.qrc +++ b/scribo/demo/shared/shared.qrc @@ -1,5 +1,6 @@ <RCC> - <qresource prefix="icons" > + <qresource prefix="icons"> + <file>icons/olena_smaller.jpg</file> <file>icons/close.gif</file> <file>icons/image-next-icon.png</file> <file>icons/page-down-icon.png</file> diff --git a/scribo/demo/viewer/Makefile.am b/scribo/demo/viewer/Makefile.am index fa143c9..2c5e4cf 100644 --- a/scribo/demo/viewer/Makefile.am +++ b/scribo/demo/viewer/Makefile.am @@ -63,7 +63,7 @@ BUILT_SOURCES = viewer.moc.cc \ image_scene.moc.cc \ image_view.moc.cc \ image_region.moc.cc \ - help_dialog.moc.cc \ + help_dialog.ui.h \ step_widget.moc.cc \ toolchain_options.moc.cc \ toolchain_options.ui.h \ @@ -74,7 +74,8 @@ BUILT_SOURCES = viewer.moc.cc \ preferences_dialog.ui.h \ general_options.moc.cc \ general_options.ui.h \ - demodir.hh + demodir.hh \ + viewer.qrc.cc noinst_HEADERS = viewer.hh \ @@ -121,5 +122,6 @@ EXTRA_DIST = \ preferences_dialog.ui \ README \ toolchain_options.ui \ + help_dialog.ui \ demodir.hh.in diff --git a/scribo/demo/viewer/help_dialog.cc b/scribo/demo/viewer/help_dialog.cc index 1f4a775..2d5ce6c 100644 --- a/scribo/demo/viewer/help_dialog.cc +++ b/scribo/demo/viewer/help_dialog.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -18,43 +19,5 @@ HelpDialog::HelpDialog() { - QPushButton *closeButton = new QPushButton(tr("Close")); - connect(closeButton, SIGNAL(clicked()), this, SLOT(close())); - - QHBoxLayout *buttonsLayout = new QHBoxLayout; - buttonsLayout->addStretch(1); - buttonsLayout->addWidget(closeButton); - - QVBoxLayout *mainLayout = new QVBoxLayout; - - QString help = tr( - "Document layout viewer:\n" - "\n" - "Usage:\n" - " - Choose an image file in the file browser,\n" - "if XML file(s) whose prefix name is the same as\n" - "the image name (i.e.image _name(_ .*)?.xml) is present\n" - "then you can choose the one you want in the step\n" - "chooser to display it on the scene.\n" - "- To load a base 64 encoded XML file,\n" - "its extension has to be .xmlc otherwise \n" - "the program won't recognize it !\n" - " - Select regions to display their properties.\n" - " - Use the mouse or keyboard to move and zoom\n" - " (Arrows, PageUp, PageDown, Home, End).\n" - "\n"); - - - QLabel* label = new QLabel(help); - - mainLayout->addWidget(label); - mainLayout->addLayout(buttonsLayout); - - setLayout(mainLayout); - setWindowTitle(tr("About")); -} - -void HelpDialog::done() -{ - emit close(); + setupUi(this); } diff --git a/scribo/demo/viewer/help_dialog.hh b/scribo/demo/viewer/help_dialog.hh index 41be95d..9f179c6 100644 --- a/scribo/demo/viewer/help_dialog.hh +++ b/scribo/demo/viewer/help_dialog.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -18,17 +19,13 @@ # define SCRIBO_DEMO_VIEWER_HELP_DIALOG_HH # include <QtGui> +# include <help_dialog.ui.h> -class HelpDialog - : public QDialog +class HelpDialog : public QDialog, private Ui::HelpDialog { - Q_OBJECT - public: HelpDialog(); -public slots: - void done(); }; #endif // ! SCRIBO_DEMO_VIEWER_HELP_DIALOG_HH diff --git a/scribo/demo/viewer/help_dialog.ui b/scribo/demo/viewer/help_dialog.ui new file mode 100644 index 0000000..9ab7e58 --- /dev/null +++ b/scribo/demo/viewer/help_dialog.ui @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HelpDialog</class> + <widget class="QDialog" name="HelpDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>557</width> + <height>390</height> + </rect> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>557</width> + <height>390</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>557</width> + <height>390</height> + </size> + </property> + <property name="windowTitle"> + <string>About</string> + </property> + <property name="windowIcon"> + <iconset resource="viewer.qrc"> + <normaloff>:/icons/shared/icons/olena_smaller.jpg</normaloff>:/icons/shared/icons/olena_smaller.jpg</iconset> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="viewer.qrc">:/icons/shared/icons/olena_smaller.jpg</pixmap> + </property> + <property name="scaledContents"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="label_2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +Document Image Analysis Tool + + +This project is powered by Milena, a generic image processing library. + +It is part of Olena, an Image Processing Platform and its module Scribo, a set of tools for Document Image Analysis. + + +<a href="http://olena.lrde.epita.fr">http://olena.lrde.epita.fr</a> + + +Thanks to Arthur Crépin-Leblond, Samuel Da Mota, Loic Denuziere, Jérôme Galtier, Florent d'Halluin, Alex Hamelin, Damien Lefortier, Vincent Ordy, Guillaume Sadegh and Warren Seine for their contribution. + + +This application has been developed in the context of the SCRIBO project of the Free Software Thematic Group, part of the &quot;System@tic Paris-Région&quot; Cluster (France). This project is partially funded by the French Government, its economic development agencies, and by the Paris-Région institutions. + +Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE)</body></html></string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="standardButtons"> + <set>QDialogButtonBox::Ok</set> + </property> + <property name="centerButtons"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + <resources> + <include location="viewer.qrc"/> + </resources> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HelpDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>281</x> + <y>391</y> + </hint> + <hint type="destinationlabel"> + <x>240</x> + <y>203</y> + </hint> + </hints> + </connection> + </connections> +</ui> diff --git a/scribo/demo/viewer/viewer.qrc b/scribo/demo/viewer/viewer.qrc new file mode 100644 index 0000000..361b332 --- /dev/null +++ b/scribo/demo/viewer/viewer.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="icons"> + <file>../shared/icons/olena_smaller.jpg</file> + </qresource> +</RCC> -- 1.5.6.5

13 years, 2 months

branch scribo-demo created: last-svn-commit-757-g9e5a4bf

by lazzara＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch scribo-demo has been created at 9e5a4bf678f40e84f65f2fd2c2383b5b8869ae5b (commit) - Log ----------------------------------------------------------------- 9e5a4bf demo/viewer/runner.cc: Clear arguments on new process. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 2 months

last-svn-commit-757-g9e5a4bf demo/viewer/runner.cc: Clear arguments on new process.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/demo/viewer/runner.cc | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b19115d..be2e395 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2011-02-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/viewer/runner.cc: Clear arguments on new process. + 2011-01-28 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/unit_test/unit-tests.mk: Regen. diff --git a/scribo/demo/viewer/runner.cc b/scribo/demo/viewer/runner.cc index 085ef39..86ff5dc 100644 --- a/scribo/demo/viewer/runner.cc +++ b/scribo/demo/viewer/runner.cc @@ -94,6 +94,7 @@ void runner::stop() void runner::start_demat(const QString& filename) { + args_.clear(); args_ << filename; mode_ = Demat; @@ -191,6 +192,7 @@ void runner::process(const image2d<value::rgb8>& original_ima, void runner::start_export(const QString& imgfile, const QString& xmlfile, const QString& outfile) { + args_.clear(); args_ << imgfile << xmlfile << outfile; mode_ = Export; -- 1.5.6.5

13 years, 2 months

last-svn-commit-539-g742ddd1 configure.ac: Make Boost dependency optional.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ configure.ac | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b63a9a3..2c3ec15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-01-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Make Boost dependency optional. + 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> Honor `--without-qt' in configure. diff --git a/configure.ac b/configure.ac index 1febf2c..1146d9b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 EPITA Research and # Development Laboratory (LRDE). # # This file is part of Olena. @@ -194,6 +194,9 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) # Boost. # # ------- # +# Check if Boost is available, if not just print a warning, otherwise +# look for boost:tuple. +BOOST_REQUIRE(1.3, [AC_DEFINE([HAVE_BOOST], [0])]) BOOST_TUPLE AM_CONDITIONAL([HAVE_BOOST_TUPLE], [test "x$ac_cv_header_boost_tuple_tuple_hpp" = xyes]) -- 1.5.6.5

13 years, 2 months

branch next updated: last-svn-commit-539-g742ddd1

by lazzara＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 742ddd1264342667c087c0d6cb17e7bd0203dc95 (commit) from 2f44565f67f0ef414e59ad84967397cce6167bfd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 742ddd1 configure.ac: Make Boost dependency optional. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ configure.ac | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 2 months

last-svn-commit-761-gf54c0a6 demo/viewer/xml_widget.cc: Fix data tracking of selected objects.

by Guillaume Lazzara

--- scribo/ChangeLog | 5 ++ scribo/demo/viewer/xml_widget.cc | 117 ++++++++++++++++++-------------------- 2 files changed, 60 insertions(+), 62 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 03705c9..4c39daf 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2011-02-05 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/viewer/xml_widget.cc: Fix data tracking of selected + objects. + +2011-02-05 Guillaume Lazzara <z(a)lrde.epita.fr> + Display baseline and meanline in Scribo viewer. * demo/viewer/common.hh: Add new enums. diff --git a/scribo/demo/viewer/xml_widget.cc b/scribo/demo/viewer/xml_widget.cc index c45177b..1f2bc83 100644 --- a/scribo/demo/viewer/xml_widget.cc +++ b/scribo/demo/viewer/xml_widget.cc @@ -50,21 +50,14 @@ XmlWidget::select(QString id, QString name) { QDomNode n = node_map_[item_map_[id]]; - if (name.contains("Text line")) - { - n = n.firstChild(); - while (!n.isNull() && !n.toElement().tagName().contains("line")) - n = n.nextSibling(); - } - if (!n.isNull()) - { - QTreeWidgetItem* item = node_map_.key(n); + { + QTreeWidgetItem* item = node_map_.key(n); - tree_->setCurrentItem(item, 0); - item->setExpanded(true); - check_item(item); - } + tree_->setCurrentItem(item, 0); + item->setExpanded(true); + check_item(item); + } } void @@ -73,17 +66,17 @@ XmlWidget::check_item (QTreeWidgetItem* item) QDomNode node = node_map_[item]; if (node.hasAttributes()) + { + property_->clear(); + QDomNamedNodeMap attributes = node.toElement().attributes(); + + for (int i = 0; i < attributes.count(); ++i) { - property_->clear(); - QDomNamedNodeMap attributes = node.toElement().attributes(); - - for (int i = 0; i < attributes.count(); ++i) - { - QStringList values; - values << attributes.item(i).toAttr().name() << attributes.item(i).toAttr().value(); - property_->addTopLevelItem(new QTreeWidgetItem(values)); - } + QStringList values; + values << attributes.item(i).toAttr().name() << attributes.item(i).toAttr().value(); + property_->addTopLevelItem(new QTreeWidgetItem(values)); } + } property_->resizeColumnToContents(0); } @@ -91,42 +84,42 @@ XmlWidget::check_item (QTreeWidgetItem* item) void XmlWidget::NFS(QDomNode node, QTreeWidgetItem* item) { if (!node.isNull()) + { + QString append; + if (node.toElement().tagName().contains("point")) + { + QString x = node.toElement().attribute("x", "0"); + QString y = node.toElement().attribute("y", "0"); + append.append(" = (" + x + ", " + y + ")"); + } + + QTreeWidgetItem* child = + new QTreeWidgetItem(QStringList(node.toElement().tagName() + node.nodeValue() + append)); + + if (node.hasAttributes()) + { + QString id = node.toElement().attribute("id", "none"); + item_map_[id] = child; + } + + node_map_[child] = node; + item->addChild(child); + + QDomNode sibling = node.firstChild(); + while (!sibling.isNull()) { - QString append; - if (node.toElement().tagName().contains("point")) - { - QString x = node.toElement().attribute("x", "0"); - QString y = node.toElement().attribute("y", "0"); - append.append(" = (" + x + ", " + y + ")"); - } - - QTreeWidgetItem* child = - new QTreeWidgetItem(QStringList(node.toElement().tagName() + node.nodeValue() + append)); - - if (node.hasAttributes()) - { - QString id = node.toElement().attribute("id", "none"); - item_map_[id] = child; - } - - node_map_[child] = node; - item->addChild(child); - - QDomNode sibling = node.firstChild(); - while (!sibling.isNull()) - { - if (!sibling.toElement().tagName().contains("data")) - NFS(sibling, child); - else - { - QTreeWidgetItem* child_son = - new QTreeWidgetItem(QStringList("data = base64-encoded")); - - child->addChild(child_son); - } - sibling = sibling.nextSibling(); - } + if (!sibling.toElement().tagName().contains("data")) + NFS(sibling, child); + else + { + QTreeWidgetItem* child_son = + new QTreeWidgetItem(QStringList("data = base64-encoded")); + + child->addChild(child_son); + } + sibling = sibling.nextSibling(); } + } } void XmlWidget::fill_widget(QString xml) @@ -147,17 +140,17 @@ void XmlWidget::fill_widget(QString xml) QDomElement root = doc.documentElement(); QTreeWidgetItem* root_item= - new QTreeWidgetItem(QStringList(root.tagName())); + new QTreeWidgetItem(QStringList(root.tagName())); tree_->addTopLevelItem(root_item); root = root.firstChild().toElement(); while (!root.isNull()) - { - ++i; - NFS(root, root_item); - root = root.nextSibling().toElement(); - } + { + ++i; + NFS(root, root_item); + root = root.nextSibling().toElement(); + } } void -- 1.5.6.5

13 years, 2 months

last-svn-commit-760-ge01df8b Display baseline and meanline in Scribo viewer.

by Guillaume Lazzara

* demo/viewer/common.hh: Add new enums. * demo/viewer/key_widget.cc, * demo/viewer/key_widget.hh: Revamp code and add support for more region types. * demo/viewer/viewer.cc, * demo/viewer/viewer.hh: Insert line blocks. --- scribo/ChangeLog | 13 ++++ scribo/demo/viewer/common.hh | 11 ++++ scribo/demo/viewer/key_widget.cc | 123 ++++++++++++++++++------------------- scribo/demo/viewer/key_widget.hh | 4 +- scribo/demo/viewer/viewer.cc | 106 +++++++++++++++++++++++++++++++- scribo/demo/viewer/viewer.hh | 1 + 6 files changed, 190 insertions(+), 68 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 52006a7..03705c9 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,16 @@ +2011-02-05 Guillaume Lazzara <z(a)lrde.epita.fr> + + Display baseline and meanline in Scribo viewer. + + * demo/viewer/common.hh: Add new enums. + + * demo/viewer/key_widget.cc, + * demo/viewer/key_widget.hh: Revamp code and add support for more + region types. + + * demo/viewer/viewer.cc, + * demo/viewer/viewer.hh: Insert line blocks. + 2011-02-04 Guillaume Lazzara <z(a)lrde.epita.fr> Add printing support in Scribo viewer. diff --git a/scribo/demo/viewer/common.hh b/scribo/demo/viewer/common.hh index b2d8f7e..46f20c1 100644 --- a/scribo/demo/viewer/common.hh +++ b/scribo/demo/viewer/common.hh @@ -26,6 +26,9 @@ namespace region { Text = 0, Line, + + EndOfTextRegion, + Image, Noise, Separator, @@ -34,6 +37,14 @@ namespace region Graphic, Chart, Maths, + + EndOfMiscRegion, + + Baseline, + Meanline, + + EndOfTypoRegion, + RegionIdCount }; } diff --git a/scribo/demo/viewer/key_widget.cc b/scribo/demo/viewer/key_widget.cc index 3a4b47b..cc10308 100644 --- a/scribo/demo/viewer/key_widget.cc +++ b/scribo/demo/viewer/key_widget.cc @@ -19,29 +19,31 @@ #include "common.hh" KeyWidget::KeyWidget(const region::KeyMap& key_map) - : items_(new QTreeWidget()), - text_(new QTreeWidgetItem(QStringList("Text"))), - regions_(new QTreeWidgetItem(QStringList("Regions"))) + : items_(new QTreeWidget()) { + item_list_.append(new QTreeWidgetItem(QStringList("Text"))); + item_list_.append(new QTreeWidgetItem(QStringList("Regions"))); + item_list_.append(new QTreeWidgetItem(QStringList("Typographical Lines"))); + QLabel* title = new QLabel(tr("Key")); title->setAlignment(Qt::AlignHCenter); - items_->addTopLevelItem(text_); - items_->addTopLevelItem(regions_); + foreach(QTreeWidgetItem* item, item_list_) + { + items_->addTopLevelItem(item); + item->setCheckState(0, Qt::Checked); + item->setExpanded(true); + } items_->setHeaderHidden(true); - text_->setCheckState(0, Qt::Checked); - text_->setExpanded(true); - - regions_->setCheckState(0, Qt::Checked); - regions_->setExpanded(true); + base_id_.append(0); + base_id_.append(region::EndOfTextRegion + 1); + base_id_.append(region::EndOfMiscRegion + 1); + base_id_.append(region::EndOfTypoRegion + 1); - for (int i = 0; i < 2; ++i) - add_item_(key_map.at(i).first, key_map.at(i).second, - i == region::Line, text_); - - for (int i = 2; i < key_map.size(); ++i) - add_item_(key_map.at(i).first, key_map.at(i).second, false, regions_); + for (int j = 0; j < base_id_.size() - 1; ++j) + for (int i = base_id_.at(j); i < base_id_.at(j + 1) - 1; ++i) + add_item_(key_map.at(i).first, key_map.at(i).second, false, item_list_.at(j)); QVBoxLayout* layout = new QVBoxLayout; layout->addWidget(title); @@ -55,11 +57,9 @@ KeyWidget::KeyWidget(const region::KeyMap& key_map) void KeyWidget::update_all() { - for (int i = 0; i < text_->childCount(); ++i) - update(text_->child(i)); - - for (int i = 0; i < regions_->childCount(); ++i) - update(regions_->child(i)); + foreach(QTreeWidgetItem* item, item_list_) + for (int i = 0; i < item->childCount(); ++i) + update(item->child(i)); } void KeyWidget::setAll(bool b) @@ -70,8 +70,8 @@ void KeyWidget::setAll(bool b) else state = Qt::Unchecked; - text_->setCheckState(0, state); - regions_->setCheckState(0, state); + foreach(QTreeWidgetItem* item, item_list_) + item->setCheckState(0, state); } void KeyWidget::setAllCheck(QTreeWidgetItem* parent) @@ -89,20 +89,8 @@ void KeyWidget::setAllCheck(QTreeWidgetItem* parent) void KeyWidget::change_mode(bool b) { - int id_line = region::Line; - - if (b) - { - //text_->child(id_region)->setCheckState(0, Qt::Checked); - // text_->child(id_line)->setCheckState(0, Qt::Checked); - text_->child(id_line)->setHidden(false); - } - else - { - //text_->child(id_region)->setCheckState(0, Qt::Unchecked); - // text_->child(id_line)->setCheckState(0, Qt::Unchecked); - text_->child(id_line)->setHidden(true); - } + item_list_.at(0)->child(region::Line)->setHidden(!b); + // FIXME: we may like to hide also typographical objects. } void @@ -118,43 +106,52 @@ KeyWidget::add_item_(QString text, QColor color, bool b, QTreeWidgetItem* parent item->setHidden(b); } - bool +bool KeyWidget::isChecked(region::RegionId id) { - QTreeWidgetItem* item = text_->child(id); - if (item) - return item->checkState(0) == Qt::Checked; - else - { - item = regions_->child(id); - if(item) - return item->checkState(0) == Qt::Checked; - else - return false; - } + QTreeWidgetItem* current_item = 0; + + foreach(QTreeWidgetItem* item, item_list_) + { + current_item = item->child(id); + if (item) + break; + else + current_item = 0; + } + + if (!current_item) + return false; + + return current_item->checkState(0) == Qt::Checked; } void -KeyWidget::update(QTreeWidgetItem* item) +KeyWidget::update(QTreeWidgetItem* item_up) { int id = -1; - if (item == text_ || item == regions_) - { - setAllCheck(item); - } - else + + foreach(QTreeWidgetItem* item, item_list_) + if (item_up == item) + { + setAllCheck(item); + return; + } + + + int i = 0; + foreach(QTreeWidgetItem* item, item_list_) { - id = text_->indexOfChild(item); - if (id == -1) + id = item->indexOfChild(item_up); + if (id != -1) { - // +2 since image region id starts from 0 to the number of - // region type without considering categories. There are 2 - // elements in text category and the rest is in the region's - // one. - id = regions_->indexOfChild(item) + 2; + id += base_id_.at(i); + break; } - emit updated(id, item->checkState(0) == Qt::Checked); + ++i; } + + emit updated(id, item_up->checkState(0) == Qt::Checked); } KeyWidget::~KeyWidget() diff --git a/scribo/demo/viewer/key_widget.hh b/scribo/demo/viewer/key_widget.hh index fd0b514..1a3518e 100644 --- a/scribo/demo/viewer/key_widget.hh +++ b/scribo/demo/viewer/key_widget.hh @@ -48,8 +48,8 @@ private: void add_item_(QString text, QColor color, bool b, QTreeWidgetItem* parent); QTreeWidget* items_; - QTreeWidgetItem* text_; - QTreeWidgetItem* regions_; + QVector<QTreeWidgetItem*> item_list_; + QVector<int> base_id_; }; #endif // ! SCRIBO_DEMO_VIEWER_KEY_WIDGET_HH diff --git a/scribo/demo/viewer/viewer.cc b/scribo/demo/viewer/viewer.cc index 57a67c2..1d48b1a 100644 --- a/scribo/demo/viewer/viewer.cc +++ b/scribo/demo/viewer/viewer.cc @@ -65,6 +65,9 @@ Viewer::Viewer(int &argc, char** argv) key_map_[region::Chart] = qMakePair(tr("Chart"), QColor(0, 204, 255)); key_map_[region::Maths] = qMakePair(tr("Maths"), QColor(170, 0, 255)); + key_map_[region::Baseline] = qMakePair(tr("Baseline"), QColor(128, 0, 255)); + key_map_[region::Meanline] = qMakePair(tr("Meanline"), QColor(128, 0, 255)); + // Region ids region_ids_["text_region"] = region::Text; @@ -78,7 +81,6 @@ Viewer::Viewer(int &argc, char** argv) region_ids_["chart_region"] = region::Chart; region_ids_["maths_region"] = region::Maths; - win_->resize(1152, 864); win_->statusBar(); @@ -154,7 +156,7 @@ Viewer::Viewer(int &argc, char** argv) precise_action_ = create_action("Precise outline", view_menu, "1px outline relative to the image " "(1px relative to the view if off).", - "Ctrl+p"); + "Shift+Ctrl+p"); precise_action_->setCheckable(true); precise_action_->setChecked(false); connect(precise_action_, SIGNAL(toggled(bool)), @@ -432,6 +434,100 @@ Viewer::add_region(QDomNode father, QString attr_id) scene_->addItem(r); } + +void +Viewer::add_typo_lines(QDomNode father, QString attr_id) +{ + // Retrieve typographical information + int baseline = father.toElement().attribute("baseline").toInt(); + int meanline = father.toElement().attribute("meanline").toInt(); + + QRect bbox; + + // Looking for bbox coordinates. + { + QDomNode coords = father.firstChild(); + while (!coords.isNull() && !coords.toElement().tagName().contains("coords")) + coords = coords.nextSibling(); + + if (coords.isNull()) + return; + + + QDomNode point = coords.firstChild(); + QVector<QPoint> points; + + while (!point.isNull()) + { + int x = point.toElement().attribute("x", "0").toInt(); + int y = point.toElement().attribute("y", "0").toInt(); + + points << QPoint(x, y); + point = point.nextSibling(); + } + + QPolygon polygon(points); + bbox = polygon.boundingRect(); + } + + // Creating blocks + + // Baseline + { + QVector<QPoint> points; + points.append(QPoint(bbox.topLeft().x(), baseline)); + points.append(QPoint(bbox.topRight().x(), baseline)); + + ImageRegion* r = new ImageRegion(region::Baseline, + key_map_[region::Baseline].first, + key_map_[region::Baseline].second, + attr_id, points, + outline_action_->isChecked(), + fill_action_->isChecked(), + precise_action_->isChecked(), + key_wgt_->isChecked(region::Baseline)); + + connect(this, SIGNAL(key_updated(int, bool)), + r, SLOT(setDrawIfSameId(int, bool))); + connect(this, SIGNAL(setOutline(bool)), + r, SLOT(setOutline(bool))); + connect(this, SIGNAL(setPrecise(bool)), + r, SLOT(setPrecise(bool))); + connect(this, SIGNAL(setFill(bool)), + r, SLOT(setFill(bool))); + + scene_->addItem(r); + } + + // Meanline + { + QVector<QPoint> points; + points.append(QPoint(bbox.topLeft().x(), meanline)); + points.append(QPoint(bbox.topRight().x(), meanline)); + + ImageRegion* r = new ImageRegion(region::Meanline, + key_map_[region::Meanline].first, + key_map_[region::Meanline].second, + attr_id, points, + outline_action_->isChecked(), + fill_action_->isChecked(), + precise_action_->isChecked(), + key_wgt_->isChecked(region::Meanline)); + + connect(this, SIGNAL(key_updated(int, bool)), + r, SLOT(setDrawIfSameId(int, bool))); + connect(this, SIGNAL(setOutline(bool)), + r, SLOT(setOutline(bool))); + connect(this, SIGNAL(setPrecise(bool)), + r, SLOT(setPrecise(bool))); + connect(this, SIGNAL(setFill(bool)), + r, SLOT(setFill(bool))); + + scene_->addItem(r); + } +} + + void Viewer::load_xml(QString filename) { @@ -557,7 +653,11 @@ Viewer::load_xml(QString filename) if (!line.isNull()) { if (extended_mode_) - add_region(line, attr_id); + { + QString line_id = line.toElement().attribute("id", "none"); + add_region(line, line_id); + add_typo_lines(line, line_id); + } add_text(line); } } diff --git a/scribo/demo/viewer/viewer.hh b/scribo/demo/viewer/viewer.hh index c4b99e8..c68dd02 100644 --- a/scribo/demo/viewer/viewer.hh +++ b/scribo/demo/viewer/viewer.hh @@ -84,6 +84,7 @@ private: QPixmap load_base64(QString xml); void add_region(QDomNode father, QString attr_id); void add_text(QDomNode line); + void add_typo_lines(QDomNode father, QString attr_id); QAction *create_action(QString name, QMenu* menu, QString status, QString shortcut); void reset_progress_dialog(); void configure_printer(QPrinter& printer); -- 1.5.6.5

13 years, 2 months

last-svn-commit-759-ge026707 Add printing support in Scribo viewer.

by Guillaume Lazzara

* demo/viewer/image_scene.cc, * demo/viewer/image_scene.hh: Accept a parent widget. * demo/viewer/image_widget.cc, * demo/viewer/image_widget.hh: Add an accessor to the underlying view. * demo/viewer/viewer.cc, * demo/viewer/viewer.hh: Add print and print preview menu entries --- scribo/ChangeLog | 14 +++++ scribo/demo/viewer/image_scene.cc | 7 ++- scribo/demo/viewer/image_scene.hh | 2 +- scribo/demo/viewer/image_widget.cc | 15 +++++- scribo/demo/viewer/image_widget.hh | 6 ++- scribo/demo/viewer/viewer.cc | 95 ++++++++++++++++++++++++++++++++++-- scribo/demo/viewer/viewer.hh | 9 +++- 7 files changed, 135 insertions(+), 13 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 620dcfb..52006a7 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,17 @@ +2011-02-04 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add printing support in Scribo viewer. + + * demo/viewer/image_scene.cc, + * demo/viewer/image_scene.hh: Accept a parent widget. + + * demo/viewer/image_widget.cc, + * demo/viewer/image_widget.hh: Add an accessor to the underlying + view. + + * demo/viewer/viewer.cc, + * demo/viewer/viewer.hh: Add print and print preview menu entries. + 2011-02-18 Guillaume Lazzara <z(a)lrde.epita.fr> Improve about dialog in scribo viewer. diff --git a/scribo/demo/viewer/image_scene.cc b/scribo/demo/viewer/image_scene.cc index 2c56113..a800896 100644 --- a/scribo/demo/viewer/image_scene.cc +++ b/scribo/demo/viewer/image_scene.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -18,8 +19,8 @@ #include "image_scene.hh" #include "image_region.hh" -ImageScene::ImageScene() - : selected_(0) +ImageScene::ImageScene(QObject *parent) + : QGraphicsScene(parent), selected_(0) { } diff --git a/scribo/demo/viewer/image_scene.hh b/scribo/demo/viewer/image_scene.hh index 136f1a2..b141478 100644 --- a/scribo/demo/viewer/image_scene.hh +++ b/scribo/demo/viewer/image_scene.hh @@ -27,7 +27,7 @@ class ImageScene Q_OBJECT public: - ImageScene(); + ImageScene(QObject *parent = 0); ~ImageScene(); void mousePressEvent(QGraphicsSceneMouseEvent* event); diff --git a/scribo/demo/viewer/image_widget.cc b/scribo/demo/viewer/image_widget.cc index e9e5e79..f86ff1d 100644 --- a/scribo/demo/viewer/image_widget.cc +++ b/scribo/demo/viewer/image_widget.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -20,6 +21,8 @@ ImageWidget::ImageWidget(QGraphicsScene* scene) : view_ (new ImageView(scene)) { + scene->setParent(view_); + QLabel* title = new QLabel(tr("Layout")); title->setAlignment(Qt::AlignHCenter); @@ -38,6 +41,12 @@ ImageWidget::ImageWidget(QGraphicsScene* scene) setLayout(layout); } + +ImageWidget::~ImageWidget() +{ +} + + void ImageWidget::update() { @@ -45,6 +54,8 @@ ImageWidget::update() view_->scaleUpdate(); } -ImageWidget::~ImageWidget() +ImageView * +ImageWidget::view() const { + return view_; } diff --git a/scribo/demo/viewer/image_widget.hh b/scribo/demo/viewer/image_widget.hh index 826b873..79dd672 100644 --- a/scribo/demo/viewer/image_widget.hh +++ b/scribo/demo/viewer/image_widget.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -18,6 +19,7 @@ # define SCRIBO_DEMO_VIEWER_IMAGE_WIDGET_HH # include <QtGui> +# include "image_view.hh" class ImageView; @@ -30,6 +32,8 @@ public: ImageWidget(QGraphicsScene* scene); ~ImageWidget(); + ImageView * view() const; + public slots: void update(); diff --git a/scribo/demo/viewer/viewer.cc b/scribo/demo/viewer/viewer.cc index 46172ce..57a67c2 100644 --- a/scribo/demo/viewer/viewer.cc +++ b/scribo/demo/viewer/viewer.cc @@ -22,10 +22,10 @@ #include "viewer.hh" #include "key_widget.hh" #include "browser_widget.hh" -#include "image_widget.hh" #include "xml_widget.hh" #include "step_widget.hh" #include "image_scene.hh" +#include "image_view.hh" #include "image_region.hh" #include "help_dialog.hh" #include "preferences_dialog.hh" @@ -107,6 +107,23 @@ Viewer::Viewer(int &argc, char** argv) file_menu->addSeparator(); + QAction *preview_print_action = create_action("Printing preview", file_menu, + "Printint preview", "Ctrl+P"); + connect(preview_print_action, SIGNAL(triggered()), + this, SLOT(preview_print())); + file_menu->addAction(preview_print_action); + preview_print_action->setEnabled(false); + + + QAction *print_action = create_action("Print", file_menu, + "Print", "Ctrl+P"); + connect(print_action, SIGNAL(triggered()), + this, SLOT(print())); + file_menu->addAction(print_action); + print_action->setEnabled(false); + + file_menu->addSeparator(); + QAction* quit_action = create_action("Quit", file_menu, "Exit the program.", "Ctrl+q"); @@ -220,10 +237,14 @@ Viewer::Viewer(int &argc, char** argv) step_widget_ = new StepWidget(); XmlWidget* xml_wgt = new XmlWidget(); browser_wgt_ = new BrowserWidget(files_, argc != 2 ? QString() : argv[1]); - ImageWidget* image_wgt = new ImageWidget(scene_); + image_wgt_ = new ImageWidget(scene_); connect(step_widget_, SIGNAL(step_selected(bool)), export_action_, SLOT(setEnabled(bool))); + connect(step_widget_, SIGNAL(step_selected(bool)), + print_action, SLOT(setEnabled(bool))); + connect(step_widget_, SIGNAL(step_selected(bool)), + preview_print_action, SLOT(setEnabled(bool))); scene_->setBackgroundBrush(scene_->palette().window()); @@ -231,7 +252,7 @@ Viewer::Viewer(int &argc, char** argv) v_splitter->addWidget(key_wgt_); v_splitter->addWidget(browser_wgt_); - v_splitter2->addWidget(image_wgt); + v_splitter2->addWidget(image_wgt_); v_splitter2->addWidget(xml_wgt); h_splitter->addWidget(v_splitter); @@ -264,7 +285,7 @@ Viewer::Viewer(int &argc, char** argv) connect(this, SIGNAL(mode_changed(bool)), key_wgt_, SLOT(change_mode(bool))); connect(this, SIGNAL(updated()), - image_wgt, SLOT(update())); + image_wgt_, SLOT(update())); connect(this, SIGNAL(fill_xml(QString)), xml_wgt, SLOT(fill_widget(QString))); @@ -276,7 +297,7 @@ Viewer::Viewer(int &argc, char** argv) connect(scene_, SIGNAL(deselected()), xml_wgt, SLOT(deselect())); - connect(image_wgt, SIGNAL(scaleUpdated(qreal)), + connect(image_wgt_, SIGNAL(scaleUpdated(qreal)), this, SLOT(maybeChangeCacheMode(qreal))); @@ -808,3 +829,67 @@ Viewer::reset_progress_dialog() pdialog_.setLabelText(""); pdialog_.show(); } + + +void +Viewer::print() +{ + QPrinter printer(QPrinter::HighResolution); + configure_printer(printer); + + QPrintDialog dialog(&printer); + dialog.setWindowTitle(tr("Print Document")); + if (dialog.exec() != QDialog::Accepted) + return; + + do_print(&printer); +} + +void +Viewer::preview_print() +{ + QPrinter printer(QPrinter::HighResolution); + configure_printer(printer); + + QPrintPreviewDialog preview(&printer); + connect(&preview, SIGNAL(paintRequested(QPrinter *)), + this, SLOT(do_print(QPrinter *))); + + preview.exec(); +} + +void Viewer::do_print(QPrinter * printer) +{ + QList<QGraphicsItem *> items = image_wgt_->view()->items(); + + QPainter painter(printer); + + QGraphicsItem *item; + QStyleOptionGraphicsItem options; + + // Painting backward objects first. + for (int i = items.size() - 1; i >= 0; --i) + { + item = items.at(i); + + if (item != image_) + { + QRect vport = image_->mapRectFromItem(item, + item->boundingRect()).toRect(); + + painter.translate(std::abs(item->boundingRect().x() - vport.x()), + std::abs(item->boundingRect().y() - vport.y())); + } + + + item->paint(&painter, &options); + painter.resetTransform(); + } +} + +void +Viewer::configure_printer(QPrinter& printer) +{ + printer.setPageSize(QPrinter::A4); + printer.setResolution(300); +} diff --git a/scribo/demo/viewer/viewer.hh b/scribo/demo/viewer/viewer.hh index 3aefaf6..c4b99e8 100644 --- a/scribo/demo/viewer/viewer.hh +++ b/scribo/demo/viewer/viewer.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -21,6 +22,7 @@ # include <QDomNode> # include "common.hh" # include "runner.hh" +# include "image_widget.hh" class ImageScene; class DomModel; @@ -61,6 +63,9 @@ private slots: void run_progress(); void on_xml_saved(const QString& filename); void export_as(); + void print(); + void preview_print(); + void do_print(QPrinter * printer); signals: void updated(); @@ -81,6 +86,7 @@ private: void add_text(QDomNode line); QAction *create_action(QString name, QMenu* menu, QString status, QString shortcut); void reset_progress_dialog(); + void configure_printer(QPrinter& printer); QApplication* app_; QMainWindow* win_; @@ -90,6 +96,7 @@ private: QGraphicsPixmapItem* image_; ImageScene* scene_; + ImageWidget* image_wgt_; QDirModel* files_; DomModel* doc_layout_; -- 1.5.6.5

13 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches February 2011