Оптимизация docTasks 1

This commit is contained in:
krivoshein
2025-01-21 13:06:11 +03:00
parent adae8f43eb
commit 07c4335b25
5 changed files with 46 additions and 53 deletions

View File

@@ -13,16 +13,11 @@ DocTasksWidget::DocTasksWidget(ConnectorToServer* connectorToServer, QWidget *pa
ui->setupUi(this);
treeWidget = new QTreeWidget();
ui->horizontalLayout_1->addWidget(treeWidget);
connect(treeWidget, &QTreeWidget::currentItemChanged, this, &DocTasksWidget::on_treeWidget_currentItemChanged);
ui->horizontalLayout_2->addWidget(treeWidget);
preparationTreeWidget();
//loadDocTasksFromXML();
//updateTreeWidget();
}
DocTasksWidget::~DocTasksWidget()
@@ -192,8 +187,6 @@ void DocTasksWidget::loadDocTasksFromXML(QByteArray array)
if(manifestElement.isNull())
return;
//deleteAllModuls();
domElementParser(manifestElement, nullptr);
}

View File

@@ -29,10 +29,10 @@
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2"/>
<layout class="QHBoxLayout" name="horizontalLayout_1"/>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
@@ -50,7 +50,7 @@
</layout>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QToolButton" name="btnUpdateTasks">
<property name="text">

View File

@@ -13,11 +13,10 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, QWidget *pa
{
ui->setupUi(this);
//loadTasksAmmFimFromXML();
treeWidget = new QTreeWidget();
ui->horizontalLayout_1->addWidget(treeWidget);
preparationTreeWidget();
//fillTree();
}
FIMtasksWidget::~FIMtasksWidget()
@@ -118,7 +117,7 @@ void FIMtasksWidget::fillTree()
itemTask->setCheckState(0, Qt::Checked);
itemTask->setIcon(0, QIcon(":/resources/icons/procedure.png"));
ui->treeWidget->addTopLevelItem(itemTask);
treeWidget->addTopLevelItem(itemTask);
for (int j = 0; j < task.malfunctionList.count(); j++)
{/*Неисправности*/
@@ -152,20 +151,20 @@ void FIMtasksWidget::fillTree()
void FIMtasksWidget::preparationTreeWidget()
{
ui->treeWidget->setColumnCount(2);
treeWidget->setColumnCount(2);
reSetHeadTreeWidget();
ui->treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 20);
ui->treeWidget->setColumnWidth(ColumnsTree::clmn_Title, 500);
treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 20);
treeWidget->setColumnWidth(ColumnsTree::clmn_Title, 500);
//ui->treeWidget->setColumnHidden(ColumnsTree::clmn_ID, true);
//treeWidget->setColumnHidden(ColumnsTree::clmn_ID, true);
}
void FIMtasksWidget::reSetHeadTreeWidget()
{
QStringList listHeaders = {tr("Title"), tr("ID")};
ui->treeWidget->setHeaderLabels(listHeaders);
treeWidget->setHeaderLabels(listHeaders);
}
void FIMtasksWidget::slot_NeedUpdateUI()
@@ -176,7 +175,7 @@ void FIMtasksWidget::slot_NeedUpdateUI()
void FIMtasksWidget::loadTasksFIM()
{
//Обновление дерева
ui->treeWidget->clear();
treeWidget->clear();
QByteArray array = connectorToServer->getListTaskFimArray();
loadTasksAmmFimFromXML(array);

View File

@@ -2,6 +2,7 @@
#define FIMTASKSWIDGET_H
#include <QWidget>
#include <QTreeWidget>
#include "tasksAmmFim.h"
#include "connectortoserver.h"
@@ -23,31 +24,30 @@ public:
explicit FIMtasksWidget(ConnectorToServer* connectorToServer, QWidget *parent = nullptr);
~FIMtasksWidget();
public:
void loadTasksAmmFimFromXML(QByteArray array);
private:
void fillTree();
void preparationTreeWidget();
void reSetHeadTreeWidget();
private Q_SLOTS:
void on_btnUpdateTasks_clicked();
public Q_SLOTS:
//Слот обработки сигнала необходимости обновления интерфейса
void slot_NeedUpdateUI();
private:
void loadTasksAmmFimFromXML(QByteArray array);
void fillTree();
void preparationTreeWidget();
void reSetHeadTreeWidget();
void loadTasksFIM();
public:
QString userName;
QList<TaskAmmFim> listTaskAmmFim;
private slots:
void on_btnUpdateTasks_clicked();
private:
Ui::FIMtasksWidget *ui;
ConnectorToServer* connectorToServer;
QTreeWidget* treeWidget;
private:
QString userName;
QList<TaskAmmFim> listTaskAmmFim;
};
#endif // FIMTASKSWIDGET_H

View File

@@ -17,29 +17,13 @@
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox_2">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>FIM</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="3" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>List of tasks</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QTreeWidget" name="treeWidget">
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
</widget>
</item>
<item row="5" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QToolButton" name="btnUpdateTasks">
<property name="text">
@@ -49,6 +33,23 @@
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Code</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="editCode"/>
</item>
</layout>
</item>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_1"/>
</item>
</layout>
</widget>
</item>