fix first initialization

This commit is contained in:
arcan1s 2014-06-10 09:42:21 +04:00
parent f8a02a48ac
commit 178bbd0bc0
2 changed files with 10 additions and 55 deletions

View File

@ -44,7 +44,7 @@ ExtendedSysMon::ExtendedSysMon(QObject* parent, const QVariantList& args)
setMinimumPollingInterval(333); setMinimumPollingInterval(333);
readConfiguration(); readConfiguration();
setProcesses(); setProcesses();
setKeys(); initValues();
} }
@ -104,6 +104,14 @@ QStringList ExtendedSysMon::sources() const
} }
void ExtendedSysMon::initValues()
{
QStringList sourceList = sources();
for (int i=0; i<sourceList.count(); i++)
updateSourceEvent(sourceList[i]);
}
void ExtendedSysMon::readConfiguration() void ExtendedSysMon::readConfiguration()
{ {
if (debug) qDebug() << "[DE]" << "[readConfiguration]"; if (debug) qDebug() << "[DE]" << "[readConfiguration]";
@ -147,59 +155,6 @@ void ExtendedSysMon::readConfiguration()
} }
void ExtendedSysMon::setKeys()
{
if (debug) qDebug() << "[DE]" << "[setKeys]";
QString key, source;
// custom
source = QString("custom");
for (int i=0; i<configuration[QString("CUSTOM")].split(QString("@@"), QString::SkipEmptyParts).count(); i++) {
key = QString("custom") + QString::number(i);
setData(source, key, QString(""));
}
// gpu
source = QString("gpu");
key = QString("GPU");
setData(source, key, float(0.0));
// gputemp
source = QString("gputemp");
key = QString("GPUTemp");
setData(source, key, float(0.0));
// hddtemp
source = QString("hddtemp");
for (int i=0; i<configuration[QString("HDDDEV")].split(QChar(','), QString::SkipEmptyParts).count(); i++) {
key = configuration[QString("HDDDEV")].split(QChar(','), QString::SkipEmptyParts)[i];
setData(source, key, float(0.0));
}
// pkg
source = QString("pkg");
for (int i=0; i<configuration[QString("PKGCMD")].split(QString(","), QString::SkipEmptyParts).count(); i++) {
key = QString("pkgCount") + QString::number(i);
setData(source, key, 0);
}
// player
source = QString("player");
key = QString("album");
setData(source, key, QString("unknown"));
key = QString("artist");
setData(source, key, QString("unknown"));
key = QString("duration");
setData(source, key, QString("0"));
key = QString("progress");
setData(source, key, QString("0"));
key = QString("title");
setData(source, key, QString("unknown"));
// ps
source = QString("ps");
key = QString("psCount");
setData(source, key, QString("0"));
key = QString("ps");
setData(source, key, QString(""));
key = QString("psTotal");
setData(source, key, QString("0"));
}
void ExtendedSysMon::setProcesses() void ExtendedSysMon::setProcesses()
{ {
if (debug) qDebug() << "[DE]" << "[setProcesses]"; if (debug) qDebug() << "[DE]" << "[setProcesses]";

View File

@ -64,8 +64,8 @@ private:
// reread configuration // reread configuration
QString getAllHdd(); QString getAllHdd();
QString getAutoGpu(); QString getAutoGpu();
void initValues();
void readConfiguration(); void readConfiguration();
void setKeys();
void setProcesses(); void setProcesses();
QMap<QString, QString> updateConfiguration(const QMap<QString, QString> rawConfig); QMap<QString, QString> updateConfiguration(const QMap<QString, QString> rawConfig);
}; };