Mercurial > clickerconvert
comparison src/converter.cpp @ 86:08cca723e37d
Move pre into html style to keep it out of xlsx
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Wed, 05 Oct 2016 14:59:20 +0200 |
parents | f505df84380d |
children | 80ff6591101a |
comparison
equal
deleted
inserted
replaced
85:12b160bc2c2e | 86:08cca723e37d |
---|---|
71 "%1</td></tr><tr/>"); | 71 "%1</td></tr><tr/>"); |
72 mQuestionStyle = QStringLiteral("<tr><td colspan='3' style='font-size: 11pt;font-weight: bold;'" | 72 mQuestionStyle = QStringLiteral("<tr><td colspan='3' style='font-size: 11pt;font-weight: bold;'" |
73 "><hr/>%1<hr/></td></tr>"); | 73 "><hr/>%1<hr/></td></tr>"); |
74 mAnswerChoiceStyle= QStringLiteral("<tr><td colspan='3' style='text-align: left; font-size: 11pt;'>Answer</td></tr>"); | 74 mAnswerChoiceStyle= QStringLiteral("<tr><td colspan='3' style='text-align: left; font-size: 11pt;'>Answer</td></tr>"); |
75 mChoiceTextStyle= QStringLiteral("<tr><td align='right' style='vertical-align: middle; font-size:11pt;'>%1</td>"); | 75 mChoiceTextStyle= QStringLiteral("<tr><td align='right' style='vertical-align: middle; font-size:11pt;'>%1</td>"); |
76 mChoiceVotesStyle = QStringLiteral("<td align='left' style='vertical-align: middle; font-size:10pt;'>%1</td></tr>"); | 76 mChoiceVotesStyle = QStringLiteral("<td align='left' style='vertical-align: middle; font-size:10pt;'><pre>%1</pre></td></tr>"); |
77 mAnswerTextStyle = QStringLiteral("<tr><td colspan='3' style='font-weight: bold;vertical-algin: middle;" | 77 mAnswerTextStyle = QStringLiteral("<tr><td colspan='3' style='font-weight: bold;vertical-algin: middle;" |
78 "font-size:11pt;'>Answer<hr/></td></tr>"); | 78 "font-size:11pt;'>Answer<hr/></td></tr>"); |
79 mFreeTextStyle = QStringLiteral("<tr><td colspan='3'; style='font-size:11pt;'>%1<hr/></td></tr>"); | 79 mFreeTextStyle = QStringLiteral("<tr><td colspan='3'; style='font-size:11pt;'>%1<hr/></td></tr>"); |
80 mEmptyRow = QStringLiteral("<tr style='height: %1px'/>").arg(CHOICE_ROW_HEIGHT); | 80 mEmptyRow = QStringLiteral("<tr style='height: %1px'/>").arg(CHOICE_ROW_HEIGHT); |
81 } | 81 } |
335 /* PercentStr was not a number. */ | 335 /* PercentStr was not a number. */ |
336 } | 336 } |
337 makeBar(html, percent, doc); | 337 makeBar(html, percent, doc); |
338 xlsx.write(row, 2, percent == 0 ? QVariant() : percent); | 338 xlsx.write(row, 2, percent == 0 ? QVariant() : percent); |
339 const QString numStr = choiceMatch.captured("num"); | 339 const QString numStr = choiceMatch.captured("num"); |
340 const QString numVotesString = QString("<pre>%1% | %2 Number of votes</pre> "). | 340 const QString numVotesString = QString("%1% | %2 Number of votes"). |
341 arg(percentStr.isEmpty() ? QStringLiteral("0") : percentStr, 8). | 341 arg(percentStr.isEmpty() ? QStringLiteral("0") : percentStr, 8). |
342 arg(numStr.isEmpty() ? QStringLiteral("0") : numStr, 3); | 342 arg(numStr.isEmpty() ? QStringLiteral("0") : numStr, 3); |
343 html << mChoiceVotesStyle.arg(numVotesString); | 343 html << mChoiceVotesStyle.arg(numVotesString); |
344 xlsx.write(row, 3, numVotesString, mChoiceVotesFmt); | 344 xlsx.write(row, 3, numVotesString, mChoiceVotesFmt); |
345 xlsx.setRowHeight(row, CHOICE_ROW_HEIGHT); | 345 xlsx.setRowHeight(row, CHOICE_ROW_HEIGHT); |