Предварительно пофиксил замирание крутилки FIM

InstructorsAndTrainees/tasks/fimtaskswidget.h

@@ -5,6 +5,7 @@
 #include <QTreeWidget>
 #include "tasksAmmFim.h"
 #include "connectortoserver.h"
+#include "taskTreePreparation.h"
 
 namespace Ui {
 class FIMtasksWidget;
@@ -23,12 +24,7 @@ public:
     };
 
 private:
-    enum ColumnsTree{
-        clmn_Title = 0,
-        clmn_ID,
-        clmn_status,
-        clmn_count
-    };
+
 
 public:
     explicit FIMtasksWidget(ConnectorToServer* connectorToServer, TypeList type, QWidget *parent = nullptr);
@@ -36,8 +32,7 @@ public:
 
 public:
     void deactivate();
-
-    void setOneTaskFim(TaskAmmFim* task);
+    void setOneTaskFim(TaskAmmFim* task); //FIM
 
 public:
     void resizeEvent(QResizeEvent *event) override;
@@ -47,11 +42,8 @@ protected:
 private Q_SLOTS:
     void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
     void on_btnUpdateTasks_clicked();
-
     void on_btnDelete_clicked();
-
     void on_btnCheck_clicked();
-
     void on_btnAssignTask_clicked();
 
 public Q_SLOTS:
@@ -64,20 +56,26 @@ public Q_SLOTS:
 
 private:
     TaskAmmFim* getTaskByID(int id);
-    void loadFIMtasksFromXML(QByteArray array);
-    void fillTree();
-
-    void prepareListTasksForTrainee(QList<TaskAmmFim> listTask);
-
     void preparationTreeWidget();
     void reSetHeadTreeWidget();
     void loadTasksFIM();
+    void assignTaskFIMtoTrainee();
 
-    void deleteAllTaskAmmFim();
+
+    /*
+    void fillTree();
+    void prepareListTasksForTrainee(QList<TaskAmmFim> listTask);
+    */
 
     void updateTaskItem(QTreeWidgetItem *itemTask);
 
-    void assignTaskFIMtoTrainee();
+
+
+Q_SIGNALS:
+    void signal_prepareFIMListItems(QByteArray array, QList<TaskAmmFim*>* listTaskAmmFim);
+    void signal_prepareFIMListItemsForTrainee(QList<TaskAmmFim> listTask, QList<TaskAmmFim*>* listTaskAmmFim);
+public Q_SLOTS:
+    void slot_FIMlistItemsReady(QList<QTreeWidgetItem*> listItems);
 
 private:
     Ui::FIMtasksWidget *ui;
@@ -85,14 +83,16 @@ private:
     QTreeWidget* treeWidget;
     TypeList type;
 
-private:
-    QString userName;
+private:    
     QList<TaskAmmFim*> listTaskAmmFim;
     QString loginTraineeSelected;
     int idTraineeSelected;
 
-    QThread* threadAnimation;
+    QThread* threadPreparation;
+    TaskTreePreparation* taskTreePreparation;
     WaitAnimationWidget *waitAnimationWidget;
+
+    QString userName; //FIM
 };
 
 #endif // FIMTASKSWIDGET_H