fix error in ps dataengine

This commit is contained in:
arcan1s 2014-06-10 09:27:26 +04:00
parent 6643852822
commit cf39fba9c2
3 changed files with 6 additions and 3 deletions

View File

@ -1,3 +1,6 @@
Ver.1.10.1:
- fix error with number formats in ps label
Ver.1.10.0: Ver.1.10.0:
+ added tags $hddtotmb, $hddtotgb + added tags $hddtotmb, $hddtotgb
+ added tags $memtotmb, $memtotgb, $swaptotmb, $swaptotgb + added tags $memtotmb, $memtotgb, $swaptotmb, $swaptotgb

View File

@ -8,7 +8,7 @@ cmake_policy (SET CMP0015 NEW)
project (pytextmonitor) project (pytextmonitor)
set (PROJECT_VERSION_MAJOR 1) set (PROJECT_VERSION_MAJOR 1)
set (PROJECT_VERSION_MINOR 10) set (PROJECT_VERSION_MINOR 10)
set (PROJECT_VERSION_PATCH 0) set (PROJECT_VERSION_PATCH 1)
set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
message (STATUS "Version: ${PROJECT_VERSION}") message (STATUS "Version: ${PROJECT_VERSION}")

View File

@ -662,7 +662,7 @@ void ExtendedSysMon::setPs(int exitCode, QProcess::ExitStatus exitStatus)
psList.append(qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i]); psList.append(qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i]);
QString source = QString("ps"); QString source = QString("ps");
QString key = QString("psCount"); QString key = QString("psCount");
setData(source, key, QString::number(psList.count())); setData(source, key, int(QString::number(psList.count())));
key = QString("ps"); key = QString("ps");
setData(source, key, psList.join(QString(","))); setData(source, key, psList.join(QString(",")));
} }
@ -670,7 +670,7 @@ void ExtendedSysMon::setPs(int exitCode, QProcess::ExitStatus exitStatus)
// pstotal // pstotal
QString source = QString("ps"); QString source = QString("ps");
QString key = QString("psTotal"); QString key = QString("psTotal");
setData(source, key, QString::number(qoutput.split(QChar('\n'), QString::SkipEmptyParts).count())); setData(source, key, int(QString::number(qoutput.split(QChar('\n'), QString::SkipEmptyParts).count())));
} }
} }
} }