Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-27 19:45:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

9
InstructorsAndTrainees/docTasks/doctaskswidget.cpp
View File

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

6
InstructorsAndTrainees/docTasks/doctaskswidget.ui
View File

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

19
InstructorsAndTrainees/docTasks/fimtaskswidget.cpp
View File

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

28
InstructorsAndTrainees/docTasks/fimtaskswidget.h
View File

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

37
InstructorsAndTrainees/docTasks/fimtaskswidget.ui
View File

@@ -17,29 +17,13 @@
<item row="0" column="0"> <item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>FIM</string> <string>FIM</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <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"> <item row="4" column="0">
<widget class="QTreeWidget" name="treeWidget"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
</widget>
</item>
<item row="5" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QToolButton" name="btnUpdateTasks"> <widget class="QToolButton" name="btnUpdateTasks">
<property name="text"> <property name="text">
@@ -49,6 +33,23 @@
</item> </item>
</layout> </layout>
</item> </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> </layout>
</widget> </widget>
</item> </item>