diff --git a/InstructorsAndTrainees/docTasks/doctaskswidget.cpp b/InstructorsAndTrainees/docTasks/doctaskswidget.cpp index 91a6bef..f597cf5 100644 --- a/InstructorsAndTrainees/docTasks/doctaskswidget.cpp +++ b/InstructorsAndTrainees/docTasks/doctaskswidget.cpp @@ -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); } diff --git a/InstructorsAndTrainees/docTasks/doctaskswidget.ui b/InstructorsAndTrainees/docTasks/doctaskswidget.ui index 1aa3eb6..9b62e02 100644 --- a/InstructorsAndTrainees/docTasks/doctaskswidget.ui +++ b/InstructorsAndTrainees/docTasks/doctaskswidget.ui @@ -29,10 +29,10 @@ - + - + @@ -50,7 +50,7 @@ - + diff --git a/InstructorsAndTrainees/docTasks/fimtaskswidget.cpp b/InstructorsAndTrainees/docTasks/fimtaskswidget.cpp index 8f46ced..ed07f28 100644 --- a/InstructorsAndTrainees/docTasks/fimtaskswidget.cpp +++ b/InstructorsAndTrainees/docTasks/fimtaskswidget.cpp @@ -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); diff --git a/InstructorsAndTrainees/docTasks/fimtaskswidget.h b/InstructorsAndTrainees/docTasks/fimtaskswidget.h index 28b5686..4b4ce0d 100644 --- a/InstructorsAndTrainees/docTasks/fimtaskswidget.h +++ b/InstructorsAndTrainees/docTasks/fimtaskswidget.h @@ -2,6 +2,7 @@ #define FIMTASKSWIDGET_H #include +#include #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 listTaskAmmFim; - -private slots: - void on_btnUpdateTasks_clicked(); - private: Ui::FIMtasksWidget *ui; ConnectorToServer* connectorToServer; + QTreeWidget* treeWidget; + +private: + QString userName; + QList listTaskAmmFim; }; #endif // FIMTASKSWIDGET_H diff --git a/InstructorsAndTrainees/docTasks/fimtaskswidget.ui b/InstructorsAndTrainees/docTasks/fimtaskswidget.ui index a2ee50d..2ceeabe 100644 --- a/InstructorsAndTrainees/docTasks/fimtaskswidget.ui +++ b/InstructorsAndTrainees/docTasks/fimtaskswidget.ui @@ -17,29 +17,13 @@ - + FIM - - - - List of tasks - - - - - - - 1 - - - - - - + @@ -49,6 +33,23 @@ + + + + + + Code + + + + + + + + + + +