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

Доделал списки подпроцедур

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-11-22 23:40:24 +03:00
parent 394eee5a16
commit 72d107308c
5 changed files with 17 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
InstructorsAndTrainees/tasks/ammtaskswidget.cpp
View File

@@ -34,17 +34,20 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
treeWidget->setObjectName("treeWidget_AMMforTrainee");
ui->horizontalLayout_Tree->addWidget(treeWidget);
//connect(treeWidget, &QTreeWidget::currentItemChanged, this, &AMMtasksWidget::on_treeWidgetItemClicked);
connect(treeWidget, &QTreeWidget::itemClicked, this, &AMMtasksWidget::on_treeWidgetItemClicked);
connect(treeWidget, &QTreeWidget::itemDoubleClicked, this, &AMMtasksWidget::on_treeWidgetDoubleClicked);
preparationTreeWidget();
threadPreparation = new QThread();
taskTreePreparation = new TaskAMMFIMTreePreparation(type, treeWidget);
//taskTreePreparation->moveToThread(threadPreparation);
threadPreparation->start();
threadPreparation->setPriority(QThread::HighestPriority);
if(type == TypeListTreeAMMFIM::listCommon)
{
threadPreparation = new QThread();
taskTreePreparation->moveToThread(threadPreparation);
threadPreparation->start();
threadPreparation->setPriority(QThread::HighestPriority);
}
connect(this, &AMMtasksWidget::signal_prepareAMMListItems, taskTreePreparation, &TaskAMMFIMTreePreparation::slot_prepareAMMListItems);
connect(this, &AMMtasksWidget::signal_prepareAMMListItemsForTrainee, taskTreePreparation, &TaskAMMFIMTreePreparation::slot_prepareAMMListItemsForTrainee);
connect(taskTreePreparation, &TaskAMMFIMTreePreparation::signal_listAMMItemsReady, this, &AMMtasksWidget::slot_AMMlistItemsReady);
@@ -89,10 +92,14 @@ AMMtasksWidget::~AMMtasksWidget()
waitAnimationWidget->hideWithStop();
emit signal_stopParserPreparation();
threadPreparation->quit();
threadPreparation->wait();
delete threadPreparation;
if(type == TypeListTreeAMMFIM::listCommon)
{
threadPreparation->quit();
threadPreparation->wait();
delete threadPreparation;
}
delete taskTreePreparation;
delete waitAnimationWidget;
@@ -266,7 +273,6 @@ void AMMtasksWidget::loadTasksAMM(bool flRequestFirst)
QByteArray arrayAMM;
//if(flRequestFirst)
arrayAMM = connectorToServer->getListTaskAmmArray();
emit signal_prepareAMMListItems(arrayAMM, flOnlyActive, flRequestFirst);