From 9954df8a08d0ca82599539a386469dd660c4323c Mon Sep 17 00:00:00 2001 From: Akashdeep Dhar Date: Jan 09 2022 07:34:33 +0000 Subject: Merge branch 'conv-sostwind' into 'main' Add value conversion for the storage statistics Closes #53 See merge request t0xic0der/obserware!69 --- diff --git a/obserware/sources/screens/sostwind/operations.py b/obserware/sources/screens/sostwind/operations.py index ce9eba6..41e1916 100644 --- a/obserware/sources/screens/sostwind/operations.py +++ b/obserware/sources/screens/sostwind/operations.py @@ -22,9 +22,13 @@ from PyQt5.QtCore import QThread from PyQt5.QtWidgets import * from obserware import __version__ +from obserware.sources.readers import memory, time from obserware.sources.screens.sostwind.interface import Ui_sostwind from obserware.sources.screens.sostwind.worker import Worker +mmrysize = memory() +timevalu = time() + class SoStWind(QDialog, Ui_sostwind): def __init__(self, parent=None): @@ -53,10 +57,20 @@ class SoStWind(QDialog, Ui_sostwind): self.sostqant.setText("%d unit(s)" % statdict["provider"]["unitqant"]) self.soctrdnm.setText(str(statdict["provider"]["diskioqt"].read_count)) self.soctwtnm.setText(str(statdict["provider"]["diskioqt"].write_count)) - self.sobsrdnm.setText(str(statdict["provider"]["diskioqt"].read_bytes)) - self.sobswtnm.setText(str(statdict["provider"]["diskioqt"].write_bytes)) - self.sotmrdnm.setText(str(statdict["provider"]["diskioqt"].read_time)) - self.sotmwtnm.setText(str(statdict["provider"]["diskioqt"].write_time)) + self.sobsrdnm.setText( + mmrysize.format(statdict["provider"]["diskioqt"].read_bytes) + ) + self.sobswtnm.setText( + mmrysize.format(statdict["provider"]["diskioqt"].write_bytes) + ) + self.sotmrdnm.setText( + timevalu.format(statdict["provider"]["diskioqt"].read_time) + ) + self.sotmwtnm.setText( + timevalu.format(statdict["provider"]["diskioqt"].write_time) + ) self.somcrdnm.setText(str(statdict["provider"]["diskioqt"].read_merged_count)) self.somcwtnm.setText(str(statdict["provider"]["diskioqt"].write_merged_count)) - self.sostbtnm.setText(str(statdict["provider"]["diskioqt"].busy_time)) + self.sostbtnm.setText( + timevalu.format(statdict["provider"]["diskioqt"].busy_time) + )