diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp index 8246b46aa1a6ead70eb5b9e2e4b88320bd89b747..79351e362fa514b15ad39fbfcaae6b176f271a3b 100644 --- a/app/mainwindow.cpp +++ b/app/mainwindow.cpp @@ -28,9 +28,9 @@ void MainWindow::update_status(GeneralStatus &genStatus) int m = time/60; int s = time - m*60; - ui->statusBar->clearMessage(); - QString message = "uptime: " + QString::number(j)+ ":" + QString::number(h)+ ":" + QString::number(m)+ ":" + QString::number(s) + " tasks running: " + QString::number(genStatus.getNbTask()) + " CPU: " + QString::number(genStatus.getCPU()) + "% memory: " + QString::number(genStatus.getMem()) + "%"; - ui->statusBar->showMessage(message); + //ui->statusBar->clearMessage(); + QString message = "uptime: " + QString::number(j)+ ":" + QString::number(h) + ":" + QString::number(m) + ":" + QString::number(s) + "\ntasks running: " + QString::number(genStatus.getNbTask()) + "\nCPU: " + QString::number(genStatus.getCPU()) + "%\nmemory: " + QString::number(genStatus.getMem()) + "%"; + ui->label_2->setText(message); } diff --git a/app/mainwindow.ui b/app/mainwindow.ui index 535560799703bce6ece502d4abb201e7944ec01c..0dbcf2da67395e27b4bf49013358bfeec433118c 100644 --- a/app/mainwindow.ui +++ b/app/mainwindow.ui @@ -61,9 +61,6 @@ <height>16777215</height> </size> </property> - <property name="text"> - <string>TextLabel</string> - </property> </widget> </item> </layout> diff --git a/app/task.cpp b/app/task.cpp index 10fd194d069b820651c23395fab0fd5b4f663b5b..8480da383722e8301645ce381d2d5ba933dac7ef 100644 --- a/app/task.cpp +++ b/app/task.cpp @@ -17,10 +17,10 @@ void Task::update() QStringList fields = line.split(" "); status = fields.at(2); - mem = fields.at(22).toInt()/8000000.0; + mem = fields.at(22).toDouble()/80000.0; int new_utime = fields.at(13).toInt(); - CPU = static_cast<double>(new_utime-utime)/100.0; + CPU = static_cast<double>(new_utime-utime); utime = new_utime; stat.close(); @@ -39,6 +39,10 @@ double Task::getCPU() { return CPU; } +int Task::getUtime() +{ + return utime; +} double Task::getMem() { return mem; diff --git a/app/task.h b/app/task.h index f349c6703a9645391d1187602eae25d393bba9c2..250435c1f4a9c305993bb594a84f823869e438b0 100644 --- a/app/task.h +++ b/app/task.h @@ -15,6 +15,7 @@ public: void sendSignal(int sig); int getPID(); double getCPU(); + int getUtime(); double getMem(); private: int PID;