feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Limit result output by default

Browse Source 
For huge amount of output the processing takes much too long
and blocks QC. So, limiting it to a reasonable value seems
appropriate. Additionally provide a setting to be still able
to get the full output if you need to.

Change-Id: I811d69be33c77830049f64fcf291681f05011966
Reviewed-by: Riitta-Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Christian Stenger
2015-04-09 15:51:42 +02:00
parent 178318d077
commit 475c6cea1e
5 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/autotest/testresultdelegate.cpp
View File

@@ -17,8 +17,10 @@
**
****************************************************************************/
#include "autotestplugin.h"
#include "testresultdelegate.h"
#include "testresultmodel.h"
#include "testsettings.h"
#include <QAbstractItemView>
#include <QDebug>
@@ -28,6 +30,8 @@
namespace Autotest {
namespace Internal {
const static int outputLimit = 100000;
TestResultDelegate::TestResultDelegate(QObject *parent)
: QStyledItemDelegate(parent)
{
@@ -124,6 +128,11 @@ void TestResultDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
int leading = fm.leading();
int fontHeight = fm.height();
output.replace(QLatin1Char('\n'), QChar::LineSeparator);
if (AutotestPlugin::instance()->settings()->limitResultOutput
&& output.length() > outputLimit)
output = output.left(outputLimit).append(QLatin1String("..."));
QTextLayout tl(output);
tl.setFont(painter->font());
QTextOption txtOption;
@@ -143,8 +152,9 @@ void TestResultDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
tl.draw(painter, QPoint(positions.textAreaLeft(), positions.top()));
} else {
painter->setClipRect(positions.textArea());
// cut output before generating elided text as this takes quite long for exhaustive output
painter->drawText(positions.textAreaLeft(), positions.top() + fm.ascent(),
fm.elidedText(output, Qt::ElideRight, positions.textAreaWidth()));
fm.elidedText(output.left(2000), Qt::ElideRight, positions.textAreaWidth()));
}
QString file = testResult.fileName();
@@ -222,6 +232,11 @@ QSize TestResultDelegate::sizeHint(const QStyleOptionViewItem &option, const QMo
int height = 0;
int leading = fm.leading();
if (AutotestPlugin::instance()->settings()->limitResultOutput
&& output.length() > outputLimit)
output = output.left(outputLimit).append(QLatin1String("..."));
QTextLayout tl(output);
tl.setFont(opt.font);
QTextOption txtOption;