From 5e2ca10e7357165af68444ecc78f5f605e949a3f 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, 27 Jun 2019 15:49:30 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@569 a8b55f48-bf90-11e4-a774-851b48703e85 --- kx_utils/kx_pult.cpp | 1 + kx_utils/kx_pult.ui | 23 +++++++++++-------- piqt_utils/piintrospector/containers_view.cpp | 4 +++- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/kx_utils/kx_pult.cpp b/kx_utils/kx_pult.cpp index 246b10e..2e5fab9 100644 --- a/kx_utils/kx_pult.cpp +++ b/kx_utils/kx_pult.cpp @@ -57,6 +57,7 @@ config(piqt(config_), QIODevice::ReadWrite), coeffs(config_, "k", true) { ui->scrollArea->setAutoFillBackground(false); ui->scrollAreaWidgetContents->setAutoFillBackground(false); ui->widget->setAutoFillBackground(false); + ui->label_17->setFixedSize(preferredIconSize(1.25, this)); log_menu.addAction(ui->actionClear); prot_x = 0; prot_c = 0; diff --git a/kx_utils/kx_pult.ui b/kx_utils/kx_pult.ui index b69c0da..ab30c52 100644 --- a/kx_utils/kx_pult.ui +++ b/kx_utils/kx_pult.ui @@ -6,8 +6,8 @@ 0 0 - 1034 - 559 + 1759 + 852 @@ -18,7 +18,7 @@ - 1 + 0 @@ -233,6 +233,9 @@ :/icons/edit-find.png + + true + Qt::AlignCenter @@ -457,8 +460,8 @@ 0 0 - 851 - 462 + 1370 + 655 @@ -1273,16 +1276,16 @@ QFrame
graphic.h
- - QPIConfigWidget - QTreeWidget -
qpiconfigwidget.h
-
CLineEdit QLineEdit
clineedit.h
+ + QPIConfigWidget + QTreeWidget +
qpiconfigwidget.h
+
diff --git a/piqt_utils/piintrospector/containers_view.cpp b/piqt_utils/piintrospector/containers_view.cpp index db84dde..1775690 100644 --- a/piqt_utils/piintrospector/containers_view.cpp +++ b/piqt_utils/piintrospector/containers_view.cpp @@ -27,8 +27,10 @@ ContainersModel::ContainersModel() { void ContainersModel::update(const PIVector & t) { prev_data.clear(); all.fill(0U); - piForeachC (PIIntrospectionContainers::TypeInfo & i, t) { + piForeachC (PIIntrospectionContainers::TypeInfo & i, cur_data) { prev_data[i.id] = i; + } + piForeachC (PIIntrospectionContainers::TypeInfo & i, t) { all[ccCount] += i.count; all[ccBytesAllocated] += i.allocated * i.item_size; all[ccBytesUsed] += i.used * i.item_size;