|
@@ -33,6 +33,7 @@ static QString FILTER_START = "filter-start";
|
|
static QString FILTER_NAME = "filter-name";
|
|
static QString FILTER_NAME = "filter-name";
|
|
static QString FILTER_COMMENT = "filter-comment";
|
|
static QString FILTER_COMMENT = "filter-comment";
|
|
static QString FILTER_PROGRESS = "filter-progress";
|
|
static QString FILTER_PROGRESS = "filter-progress";
|
|
|
|
+static QString FILTER_PROGRESS_TEXT = "filter-progress-text";
|
|
static QString FILTER_RESULT = "filter-result";
|
|
static QString FILTER_RESULT = "filter-result";
|
|
static QString FILTER_END = "filter-end";
|
|
static QString FILTER_END = "filter-end";
|
|
|
|
|
|
@@ -91,7 +92,7 @@ public:
|
|
}
|
|
}
|
|
|
|
|
|
if (stack.size() == 2 &&
|
|
if (stack.size() == 2 &&
|
|
- (stack.front() == FILTER_START || stack.front() == FILTER_END || stack.front() == FILTER_PROGRESS))
|
|
|
|
|
|
+ (stack.front() == FILTER_START || stack.front() == FILTER_END))
|
|
{
|
|
{
|
|
if (stack.back() == FILTER_NAME)
|
|
if (stack.back() == FILTER_NAME)
|
|
{
|
|
{
|
|
@@ -106,6 +107,10 @@ public:
|
|
{
|
|
{
|
|
currentProgress = reader.text().toString().toFloat();
|
|
currentProgress = reader.text().toString().toFloat();
|
|
}
|
|
}
|
|
|
|
+ else if (stack.size() == 1 && stack.back() == FILTER_PROGRESS_TEXT)
|
|
|
|
+ {
|
|
|
|
+ currentComment = reader.text().toString();
|
|
|
|
+ }
|
|
else if (stack.size() == 1 && stack.back() == FILTER_RESULT)
|
|
else if (stack.size() == 1 && stack.back() == FILTER_RESULT)
|
|
{
|
|
{
|
|
currentResultValue = reader.text().toString();
|
|
currentResultValue = reader.text().toString();
|
|
@@ -125,6 +130,7 @@ public:
|
|
|
|
|
|
if (name.compare(FILTER_START, Qt::CaseInsensitive) == 0 ||
|
|
if (name.compare(FILTER_START, Qt::CaseInsensitive) == 0 ||
|
|
name.compare(FILTER_PROGRESS, Qt::CaseInsensitive) == 0 ||
|
|
name.compare(FILTER_PROGRESS, Qt::CaseInsensitive) == 0 ||
|
|
|
|
+ name.compare(FILTER_PROGRESS_TEXT, Qt::CaseInsensitive) == 0 ||
|
|
name.compare(FILTER_RESULT, Qt::CaseInsensitive) == 0 ||
|
|
name.compare(FILTER_RESULT, Qt::CaseInsensitive) == 0 ||
|
|
name.compare(FILTER_END, Qt::CaseInsensitive) == 0)
|
|
name.compare(FILTER_END, Qt::CaseInsensitive) == 0)
|
|
{
|
|
{
|
|
@@ -140,6 +146,10 @@ public:
|
|
currentComment = QString();
|
|
currentComment = QString();
|
|
currentProgress = 0;
|
|
currentProgress = 0;
|
|
}
|
|
}
|
|
|
|
+ else if (name.compare(FILTER_PROGRESS_TEXT, Qt::CaseInsensitive) == 0)
|
|
|
|
+ {
|
|
|
|
+ currentProgress = reader.attributes().value("progress").toString().toFloat();
|
|
|
|
+ }
|
|
else if (name.compare(FILTER_RESULT, Qt::CaseInsensitive) == 0)
|
|
else if (name.compare(FILTER_RESULT, Qt::CaseInsensitive) == 0)
|
|
{
|
|
{
|
|
currentResultParameter = reader.attributes().value("name").toString();
|
|
currentResultParameter = reader.attributes().value("name").toString();
|
|
@@ -178,6 +188,11 @@ public:
|
|
emit q->filterProgress(currentProgress, currentComment);
|
|
emit q->filterProgress(currentProgress, currentComment);
|
|
currentComment = QString();
|
|
currentComment = QString();
|
|
}
|
|
}
|
|
|
|
+ else if (name.compare(FILTER_PROGRESS_TEXT, Qt::CaseInsensitive) == 0)
|
|
|
|
+ {
|
|
|
|
+ emit q->filterProgress(currentProgress, currentComment);
|
|
|
|
+ currentComment = QString();
|
|
|
|
+ }
|
|
else if (name.compare(FILTER_RESULT, Qt::CaseInsensitive) == 0)
|
|
else if (name.compare(FILTER_RESULT, Qt::CaseInsensitive) == 0)
|
|
{
|
|
{
|
|
emit q->filterResult(currentResultParameter, currentResultValue);
|
|
emit q->filterResult(currentResultParameter, currentResultValue);
|