SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@569 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2019-06-27 15:49:30 +00:00
parent 9fd50a8082
commit 5e2ca10e73
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kx_utils/kx_pult.cpp
View File

@@ -57,6 +57,7 @@ config(piqt(config_), QIODevice::ReadWrite), coeffs(config_, "k", true) {
ui->scrollArea->setAutoFillBackground(false); ui->scrollArea->setAutoFillBackground(false);
ui->scrollAreaWidgetContents->setAutoFillBackground(false); ui->scrollAreaWidgetContents->setAutoFillBackground(false);
ui->widget->setAutoFillBackground(false); ui->widget->setAutoFillBackground(false);
ui->label_17->setFixedSize(preferredIconSize(1.25, this));
log_menu.addAction(ui->actionClear); log_menu.addAction(ui->actionClear);
prot_x = 0; prot_x = 0;
prot_c = 0; prot_c = 0;

23
kx_utils/kx_pult.ui
View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1034</width> <width>1759</width>
<height>559</height> <height>852</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -18,7 +18,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
@@ -233,6 +233,9 @@
<property name="pixmap"> <property name="pixmap">
<pixmap resource="kx_pult.qrc">:/icons/edit-find.png</pixmap> <pixmap resource="kx_pult.qrc">:/icons/edit-find.png</pixmap>
</property> </property>
<property name="scaledContents">
<bool>true</bool>
</property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
@@ -457,8 +460,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>851</width> <width>1370</width>
<height>462</height> <height>655</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_7"> <layout class="QVBoxLayout" name="verticalLayout_7">
@@ -1273,16 +1276,16 @@
<extends>QFrame</extends> <extends>QFrame</extends>
<header>graphic.h</header> <header>graphic.h</header>
</customwidget> </customwidget>
<customwidget>
<class>QPIConfigWidget</class>
<extends>QTreeWidget</extends>
<header>qpiconfigwidget.h</header>
</customwidget>
<customwidget> <customwidget>
<class>CLineEdit</class> <class>CLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>clineedit.h</header> <header>clineedit.h</header>
</customwidget> </customwidget>
<customwidget>
<class>QPIConfigWidget</class>
<extends>QTreeWidget</extends>
<header>qpiconfigwidget.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="kx_pult.qrc"/> <include location="kx_pult.qrc"/>

4
piqt_utils/piintrospector/containers_view.cpp
View File

@@ -27,8 +27,10 @@ ContainersModel::ContainersModel() {
void ContainersModel::update(const PIVector<PIIntrospectionContainers::TypeInfo> & t) { void ContainersModel::update(const PIVector<PIIntrospectionContainers::TypeInfo> & t) {
prev_data.clear(); prev_data.clear();
all.fill(0U); all.fill(0U);
piForeachC (PIIntrospectionContainers::TypeInfo & i, t) { piForeachC (PIIntrospectionContainers::TypeInfo & i, cur_data) {
prev_data[i.id] = i; prev_data[i.id] = i;
}
piForeachC (PIIntrospectionContainers::TypeInfo & i, t) {
all[ccCount] += i.count; all[ccCount] += i.count;
all[ccBytesAllocated] += i.allocated * i.item_size; all[ccBytesAllocated] += i.allocated * i.item_size;
all[ccBytesUsed] += i.used * i.item_size; all[ccBytesUsed] += i.used * i.item_size;