From 71a4627029eb64be633217af5cd8a997d746a3e3 Mon Sep 17 00:00:00 2001
From: Romain DERRE <romain.derre@pc269-28.pedago.ensiie.fr>
Date: Wed, 20 Mar 2019 09:37:13 +0100
Subject: [PATCH] general status in text label
---
app/mainwindow.cpp | 6 +++---
app/mainwindow.ui | 3 ---
app/task.cpp | 8 ++++++--
app/task.h | 1 +
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index 8246b46..79351e3 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 87f93b0..347fa19 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 10fd194..8480da3 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 f349c67..250435c 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;
--
GitLab