From a611b7a996cc349e36b17d11df52943f0294a24f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 22 Jun 2017 21:18:19 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@523 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- utils/system_daemon/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/system_daemon/main.cpp b/utils/system_daemon/main.cpp index 290795c6..50c6e008 100755 --- a/utils/system_daemon/main.cpp +++ b/utils/system_daemon/main.cpp @@ -217,9 +217,9 @@ public: tile->content = local_info_base; int num = 0, maxlen = 0; PIString line = "Process load: k "; - PIString ns = PIString::fromNumber(sys_mon.statistic().cpu_load_system).replaceAll(",", "."); ns = ns.left(ns.find('.') + 2); + PIString ns = PIString::fromNumber(sys_mon.statistic().cpu_load_system, 'f', 2); line += ns.expandLeftTo(5, ' ') + " %, u "; - ns = PIString::fromNumber(sys_mon.statistic().cpu_load_user).replaceAll(",", "."); ns = ns.left(ns.find('.') + 2); + ns = PIString::fromNumber(sys_mon.statistic().cpu_load_user, 'f', 2); line += ns.expandLeftTo(5, ' ') + " %"; tile->content << TileList::Row("PID: " + PIString(sys_mon.statistic().ID), CellFormat()); tile->content << TileList::Row(line, CellFormat()); @@ -229,9 +229,9 @@ public: piForeachC (PISystemMonitor::ThreadStats & t, ts) { line = PIString(++num).expandLeftTo(2, ' ') + ": "; line += PIString(t.name).expandRightTo(maxlen, ' ') + ": k "; - PIString ns = PIString::fromNumber(t.cpu_load_kernel).replaceAll(",", "."); ns = ns.left(ns.find('.') + 2); + PIString ns = PIString::fromNumber(t.cpu_load_kernel, 'f', 2); line += ns.expandLeftTo(5, ' ') + " %, u "; - ns = PIString::fromNumber(t.cpu_load_user).replaceAll(",", "."); ns = ns.left(ns.find('.') + 2); + ns = PIString::fromNumber(t.cpu_load_user, 'f', 2); line += ns.expandLeftTo(5, ' ') + " %"; tile->content << TileList::Row(line, CellFormat()); }