Исправил VersionSelectWidget

InstructorsAndTrainees/connectorToServer/connectortoserver.cpp

@@ -11,17 +11,13 @@ ConnectorToServer::ConnectorToServer(QWidget* parentWidget, QObject *parent) :
     recognizeSystem(nullptr),
     versionSelectWidget(nullptr),
     versionContainer(nullptr),
-    notifyController(nullptr),
-    waitAnimationWidget(nullptr)
+    notifyController(nullptr)
 {
     initialize();
 }
 
 ConnectorToServer::~ConnectorToServer()
 {
-    waitAnimationWidget->hideWithStop();
-
-    delete waitAnimationWidget;
     delete client;
     delete versionSelectWidget;
     delete notifyController;
@@ -399,18 +395,6 @@ void ConnectorToServer::initialize()
     SetConnectToServer();
 }
 
-void ConnectorToServer::activateLoadAnimation(bool flag)
-{
-    if (flag)
-    {
-        waitAnimationWidget->showWithPlay();
-    }
-    else
-    {
-        waitAnimationWidget->hideWithStop();
-    }
-}
-
 void ConnectorToServer::bindConnection()
 {
     connect(this,&ConnectorToServer::sigInitializeClient,client,&TCPClient::initialize,Qt::AutoConnection);
@@ -438,7 +422,6 @@ void ConnectorToServer::bindConnection()
 
     connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryTasksXML_FIM,this,&ConnectorToServer::slot_AnswerQueryTasksXML_FIM);
     connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryTasksXML_AMM,this,&ConnectorToServer::slot_AnswerQueryTasksXML_AMM);
-    connect(recognizeSystem,&RecognizeSystem::sigAnimationActivated,this,&ConnectorToServer::activateLoadAnimation,Qt::AutoConnection);
 
     connect(client,&TCPClient::signal_ConnectedToServer,this,&ConnectorToServer::signal_ConnectedToServer,Qt::AutoConnection);
 
@@ -452,9 +435,7 @@ void ConnectorToServer::createObjects()
     client = new TCPClient;
     client->moveToThread(connectionThread);
 
-    dataParser = new DataParser;
-
-    waitAnimationWidget = new WaitAnimationWidget;
+    dataParser = new DataParser;    
 
     sendSystem = new SendSystem;
     sendSystem->moveToThread(connectionThread);
@@ -465,13 +446,7 @@ void ConnectorToServer::createObjects()
     notifyController = new NotifyController;
     versionContainer = new VersionContainer;
     versionSelectWidget = new VersionSelectWidget(parentWidget);
-    versionSelectWidget->initialize(sendSystem,versionContainer,notifyController);
-
-    QMovie *movie = new QMovie(":/resources/icons/762.gif");
-
-    waitAnimationWidget->setParent(versionSelectWidget);
-    waitAnimationWidget->initialize(movie,versionSelectWidget);
-    waitAnimationWidget->moveToThread(connectionThread);
+    versionSelectWidget->initialize(sendSystem,versionContainer,notifyController, recognizeSystem);
 
     connectionThread->start();
     connectionThread->setPriority(QThread::HighestPriority);

InstructorsAndTrainees/connectorToServer/connectortoserver.h

@@ -4,7 +4,6 @@
 #include <QObject>
 #include <QMap>
 #include <widgets/versionselectwidget.h>
-#include <widgets/waitanimationwidget.h>
 #include "Core\tcpclient.h"
 #include "Core\dataparser.h"
 #include "Core\sendsystem.h"
@@ -63,7 +62,6 @@ public:
     int getIdTraineeByLogin(QString login);
     void showVersionSelect();
 
-    void activateLoadAnimation(bool flag);
     void setLoginName(QString name);
 
     ServerSettings getServerSettings();
@@ -129,7 +127,6 @@ private:
     VersionSelectWidget *versionSelectWidget;
     VersionContainer *versionContainer;
     NotifyController *notifyController;
-    WaitAnimationWidget *waitAnimationWidget;
 
     //Списочная модель БД СУО
     QList<Instructor> listInstructors;