From 49124a8e9873d14fcaa7fa08f563d5484f50d20e Mon Sep 17 00:00:00 2001 From: konrad Date: Wed, 19 Mar 2008 18:16:45 +0000 Subject: [PATCH] fix ODT rendering, complete eventsummary git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@132 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33 --- examples/eventsummary.odtt | Bin 10814 -> 10799 bytes src/eventsummary.cpp | 23 +++++++++++++++++++++++ src/eventsummary.h | 2 ++ src/odtrender.cpp | 4 ++-- www/inc/classes/event.php | 4 ++-- 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/examples/eventsummary.odtt b/examples/eventsummary.odtt index 06925005666a76e6d63d2587c438bc080198a42b..85c37b025cf9819b470567a929bbf36d2fb57d91 100644 GIT binary patch delta 1760 zcmY+EX*kpi8^&kFkg>+pv8xUxTgJW}+0xj}m{AO-bSw?0kOqw)wKrn##V zVcy@f_cDLp^T-2Ma8;=6H%@~4@3IJKd0-l@{oUJy6mka}nigL+{>oO$ZH0qCJ~|+f z7-&C;6i$vjPma`%xfq7^LV%!axLJp94-VKE7-$)~41Mnd6bPfKi;1w349k+WWxVOg zfUB#e-eT%+m}J_@OHNfH#L+?lW44&g?}!Sx)*iQ+>v9Bjx5Xh~zQP)xBV@B}crWVl zl+UD|y4+uyGer#OjQSh72hJyD>+2^8@1xCcD$NF-61_FRB!niG+Pae}Z#BWQ`!3K5 zn%GLvjJy3#-a=?eTErHJY)$oW;VM?q()$j=+WYLg<;MaX3W?WGvN_>OFd|lyq8L>>2itsktU zHtn9<8a3G~Xn8IDIc=ghN$mH8@Ho4DD3avhtD$*f4ZldsY>}@RvgWM5gb()dlvVlt zuu0|@mBHZac%a0$_Uag8pnO4ij#3hF!dRgFY5dkdbQF`8{`{lP0p z?-!Zee)dR$2CR-fjlkeSq_?`saXu~LCl0udmX7;yFQ@S$e(kKigAV0hUc!#HcWnKo zqIOO~Uvp^gkI`rm^Z2B?aZZCoI^N{7WATlmN_-ZaEA&a+1;NW~qI?Cgq!?3x0v4yb zMdL>wB&@6Nw<*||PH&uPn48JZZk>wZN0O1a{x?(UeHoM;Qbe@F;y`-q$8uh1Xk98l z!Fl1Ag@|)l_Ig#2o7e$0oL~1=!_^mG7to_rxiLX^o9V;A$F!&w z=s$V3hY`mq7tdsoUTgn%`K<_iE0&{FBPDUQ=mt#d_(4Px^w5c5TI!*Rmw}4ZkE*Kr zPMD;MZc6_+C8}w&Tl)2o)$qsY$}$cGbO;Na$9Y?o=;PFAqu$Bly+ zJq7+JGku}j;J{3Eq7uAtD8GrTwH~0ljX@%}Ix3Z>CXdsKvzU_(8?d*bM_griiG`h= zg_+vyJmAgqEr)uzusomn#LM=4$$b$71CeXD#Okvd$+0zhT242bRY-02 z7Gf(_t~QxPIwU{0O1ID%c6XCA$;umCVJ1DZ>wA|Ej+Qr@j=f?W?OI$)2VqbUJ~sSL zt;WHQynCKOe@fVZ=y)YfE5WKS!zyye@_hQLltUQJytnUznehdiJZ6Pl9jhVUt-y5 zpMdHGu_`RGI~e3Ek@2x7G}fQol$nn;=x`eX!=0ku8S;a5YKXi-du0)W$}s+8LENJ% zI)gZ7Tu+pFBsfK_O53SE_F_ryq-vf@C+(^qg;?e8LJV>Ud9AmipG8iY@ST<(*%yD! z+~Whs3#<95j&osWKMQ|!6w@CDr31Pi=Ra8z5+zLmXxb8Q<6_=um_ zE%hAnY1m%VJMMxGXX#fBK delta 1775 zcmY+EdpOgJAICS_9G8i?C)&z&xwCRNmx_L8b32BNT-I_Yk#Zg4hfc0viA=}upfQ_V zqH>)m&Vv_)Sc|OncdA~mI=lOj8df#*Jb}!I}I5~5gjOM|R z`xzXdNk|pgfyx3dLNecVBt#ad5JK#0+`qU9m%&m1 z0gB$!X;9B^xA$*q?t2sfEbIs*>+3HhnExINkX8UVFuiZymIK1B;1e4q7ft7KGT;L+ z5XjyL1QG|yfk;u2vE;~Dy{i%71b0yo|Kelwxr-4-*Mlo0VDrSBA*fGfeTn#uqyBV~u*HTCK!Xk+8?< z7^!uNz4s5D%o-KrK-+Smym$+c^;`sa8gsIjO|SSpav)|Ip;uDf7|)=#$}gRfJ?_zN zMttv;wCH6P#y4!#3T4EST_`P!GTswgIWl2(vN2eOKjznlHE1_8O^-0#c zRK#D)cb>Bj`e(+ddW?)uf4Kg&o7=3VTCAu(FQ?oTDL(m=k6526zs8_BKDDU6fLU@V zpJ7#l$)v+S2WSyxxXZu{ZfS@y7i2M1XqLTWmTLL(VU~>7{qY9PsLFrID z=wwM2YW6>BnF$nRwUIqm+uGuSq`01Aeg*80`8+PmTd+sQQdfJu*FWXtGSnWx{qvjhPJF<{hi~t0L{*r zxAPBv!d*Xupe#<#9}_s4UvAFW3S&>)t&6q{&cv;tDMJRn{y}Np-1fd+1jQ($MtXbbP8{e2DW2OJsmu7hp<0~lyp6i``N?| zCuqB54u#_miUet=DZ8jJwtCqaABa^uOv=4!?{rT3Z>~d&Wkc^mWw@{%- zp9_~{*{_~7L_7S7rDgS$Zr&7|TP;*tE69p>WWD&c5M^p(1T1Dd7U6X#DTYYt zqgDNCrb>*UB&MfHB2uTf;&YQ_lxI7vH0RzIT{*-y&;>4v5(SRrOkZLHa@B?tuSJ(2GSA*2L@KrUYjuW(8?&0r9xe=esF>oAjzm)kAFr+PcHZ(< zitAR!9JytA)LJgT59#OBzGU^jY6dU)=Q#I_q;0H_8i#6*Pu?h@7E}e%XS$XpPgjj= z4AlrpkrZtb?!SrtILXgzh>8+czq55IJt_Z!!ZEW-o4P#C1uS2EV~G1=36gfVI0E_b z7r_)}b2CgSYa?v#0haO`W=#;QzWq8->!ft`l;P-)f*}lhdFY*Eu7!s0-7%&?M?LXz z+5blK9mLL6(2r%N5L7;F-FLM+Wp;?e<+gGHc1P1J^pfAYdk~IuH#uJ#v0LHr!>jf9 zUiwrtPhv4bcdoMP&wM_Oeaq$5r;p(mV`|za3&YWWm%6QLzN8l?L$x|4x5kP)qGw*aHGB ieXuuxM4tv*02k1w!0`YB?FN1W?4pkee^Lc~t$zT&<5dy> diff --git a/src/eventsummary.cpp b/src/eventsummary.cpp index e771b47..0a9acdb 100644 --- a/src/eventsummary.cpp +++ b/src/eventsummary.cpp @@ -22,6 +22,7 @@ #include #include #include +#include MEventSummary::MEventSummary(QWidget*par,MWebRequest*rq,int eid) :QDialog(par) @@ -84,6 +85,7 @@ MEventSummary::MEventSummary(QWidget*par,MWebRequest*rq,int eid) hl->addWidget(p=new QPushButton(tr("Print")),0); connect(p,SIGNAL(clicked()),this,SLOT(print())); hl->addWidget(p=new QPushButton(tr("Save as...")),0); + connect(p,SIGNAL(clicked()),this,SLOT(saveas())); hl->addSpacing(15); hl->addWidget(p=new QPushButton(tr("Close")),0); connect(p,SIGNAL(clicked()),this,SLOT(accept())); @@ -144,6 +146,27 @@ void MEventSummary::print() rend.renderToPrinter(); } +void MEventSummary::saveas() +{ + QFileDialog fd(this); + fd.setAcceptMode(QFileDialog::AcceptSave); + fd.setFileMode(QFileDialog::AnyFile); + fd.setConfirmOverwrite(true); + fd.setFilter("Open Document Text (*.odt)"); + fd.setDefaultSuffix("odt"); + QString fname; + if(fd.exec()){ + QStringList fn=fd.selectedFiles(); + if(fn.size()<1)return; + fname=fn[0]; + } + MOdtSignalRenderer rend("../examples/eventsummary.odtt"); + connect(&rend,SIGNAL(getVariable(QString,QString&)),this,SLOT(getVariable(QString,QString&))); + connect(&rend,SIGNAL(getLoopIterations(QString,int&)),this,SLOT(getLoopIterations(QString,int&))); + connect(&rend,SIGNAL(getLoopVariable(QString,int,QString,QString&)),this,SLOT(getLoopVariable(QString,int,QString,QString&))); + rend.renderToFile(fname); +} + void MEventSummary::getVariable(QString varname,QString&value) { if(varname=="TITLE") diff --git a/src/eventsummary.h b/src/eventsummary.h index 8ac219d..cc791dc 100644 --- a/src/eventsummary.h +++ b/src/eventsummary.h @@ -33,6 +33,8 @@ class MEventSummary:public QDialog private slots: /**internal: print summary*/ void print(); + /**internal: save summary to file*/ + void saveas(); //used for ODT rendering: void getVariable(QString varname,QString&value); diff --git a/src/odtrender.cpp b/src/odtrender.cpp index 50ee487..f832cb7 100644 --- a/src/odtrender.cpp +++ b/src/odtrender.cpp @@ -73,7 +73,7 @@ MOdtRendererPrivate::~MOdtRendererPrivate() void MOdtRenderer::renderToFile(QString file) { QFile f(file); - if(f.open(QIODevice::WriteOnly)){ + if(f.open(QIODevice::ReadWrite)){ renderToFile(f); f.close(); } @@ -83,7 +83,7 @@ void MOdtRenderer::renderToFile(QFile &file) { qDebug("File Name: %s",file.fileName().toAscii().data()); if(!file.isWritable()) - if(!file.open(QIODevice::WriteOnly))return; + if(!file.open(QIODevice::ReadWrite))return; file.seek(0); file.resize(0); d->render(&file); diff --git a/www/inc/classes/event.php b/www/inc/classes/event.php index 4d23089..ded9731 100644 --- a/www/inc/classes/event.php +++ b/www/inc/classes/event.php @@ -364,9 +364,9 @@ function getEventSummaryXml($evid) else $p->setAttribute("unused",0); if(isset($tcused[$price])) - $p->setAttribute("unused",$tcused[$price]); + $p->setAttribute("used",$tcused[$price]); else - $p->setAttribute("unused",0); + $p->setAttribute("used",0); $doc->appendChild($p); } $xml->appendChild($doc); -- 1.7.2.5