diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index a9f2001..805108b 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -44,6 +44,7 @@ bool ConnectorToServer::getIsConnected() void ConnectorToServer::SetConnectToServer() { + qDebug() << "connectorToServer::SetConnectToServer() thread ID " << QThread::currentThreadId(); serverSettings = *dataParser->getServerSettings(); emit sigSetConnect(dataParser->getServerSettings(),connectionThread); } diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index 97d917c..5cc152a 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -1,5 +1,6 @@ #include #include +#include #include "instructorsandtraineeswidget.h" #include "ui_instructorsandtraineeswidget.h" #include "dialogauthorization.h" @@ -46,7 +47,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : setLanguageInterfase(); - connectorToServer = new ConnectorToServer(this); + connectorToServer = new ConnectorToServer(/*this*/nullptr); connect(connectorToServer, &ConnectorToServer::sigLoginResult, this, &InstructorsAndTraineesWidget::slot_checkLoginResult); connect(connectorToServer, &ConnectorToServer::sigDeLoginResult, this, &InstructorsAndTraineesWidget::slot_checkDeLoginResult); connect(connectorToServer,&ConnectorToServer::signal_AnswerDocsChanged,this, &InstructorsAndTraineesWidget::slot_AnswerDocsChanged); @@ -296,9 +297,8 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state) { if(cntTryConnectToServer < 10) { - QThread::sleep(1); cntTryConnectToServer++; - connectorToServer->SetConnectToServer(); + QTimer::singleShot(1000, this, SLOT(slot_ConnectToServer())); } else { @@ -366,6 +366,12 @@ void InstructorsAndTraineesWidget::slot_AnswerDocsChanged() viewerTrainees->getAmmTasksWidgetCommon()->setDocsActualed(false); } +void InstructorsAndTraineesWidget::slot_ConnectToServer() +{ + updateLabelServer(); + connectorToServer->SetConnectToServer(); +} + bool InstructorsAndTraineesWidget::authorizationInstructorDialog(QWidget* parent) { DialogAuthorization dlg(parent); @@ -429,7 +435,7 @@ void InstructorsAndTraineesWidget::on_btnConnectionToServer_clicked() updateLabelServer(); - connectorToServer->SetConnectToServer(); + QTimer::singleShot(1000, this, SLOT(slot_ConnectToServer())); } void InstructorsAndTraineesWidget::on_btnAuthorizationInstructor_clicked() diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.h b/InstructorsAndTrainees/instructorsandtraineeswidget.h index 6932e2c..4328ee4 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.h +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.h @@ -58,6 +58,8 @@ public Q_SLOTS: void slot_AnswerDocsChanged(); + void slot_ConnectToServer(); + Q_SIGNALS: //сигнал смены языка void signal_LanguageChanged(QString language);