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

Авто подключение работает

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-11-24 18:19:28 +03:00
parent 4bdfb8163a
commit f2d7557f19
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
View File

@@ -44,6 +44,7 @@ bool ConnectorToServer::getIsConnected()
void ConnectorToServer::SetConnectToServer() void ConnectorToServer::SetConnectToServer()
{ {
qDebug() << "connectorToServer::SetConnectToServer() thread ID " << QThread::currentThreadId();
serverSettings = *dataParser->getServerSettings(); serverSettings = *dataParser->getServerSettings();
emit sigSetConnect(dataParser->getServerSettings(),connectionThread); emit sigSetConnect(dataParser->getServerSettings(),connectionThread);
} }

14
InstructorsAndTrainees/instructorsandtraineeswidget.cpp
View File

@@ -1,5 +1,6 @@
#include <QMessageBox> #include <QMessageBox>
#include <QThread> #include <QThread>
#include <QTimer>
#include "instructorsandtraineeswidget.h" #include "instructorsandtraineeswidget.h"
#include "ui_instructorsandtraineeswidget.h" #include "ui_instructorsandtraineeswidget.h"
#include "dialogauthorization.h" #include "dialogauthorization.h"
@@ -46,7 +47,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
setLanguageInterfase(); setLanguageInterfase();
connectorToServer = new ConnectorToServer(this); connectorToServer = new ConnectorToServer(/*this*/nullptr);
connect(connectorToServer, &ConnectorToServer::sigLoginResult, this, &InstructorsAndTraineesWidget::slot_checkLoginResult); connect(connectorToServer, &ConnectorToServer::sigLoginResult, this, &InstructorsAndTraineesWidget::slot_checkLoginResult);
connect(connectorToServer, &ConnectorToServer::sigDeLoginResult, this, &InstructorsAndTraineesWidget::slot_checkDeLoginResult); connect(connectorToServer, &ConnectorToServer::sigDeLoginResult, this, &InstructorsAndTraineesWidget::slot_checkDeLoginResult);
connect(connectorToServer,&ConnectorToServer::signal_AnswerDocsChanged,this, &InstructorsAndTraineesWidget::slot_AnswerDocsChanged); connect(connectorToServer,&ConnectorToServer::signal_AnswerDocsChanged,this, &InstructorsAndTraineesWidget::slot_AnswerDocsChanged);
@@ -296,9 +297,8 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state)
{ {
if(cntTryConnectToServer < 10) if(cntTryConnectToServer < 10)
{ {
QThread::sleep(1);
cntTryConnectToServer++; cntTryConnectToServer++;
connectorToServer->SetConnectToServer(); QTimer::singleShot(1000, this, SLOT(slot_ConnectToServer()));
} }
else else
{ {
@@ -366,6 +366,12 @@ void InstructorsAndTraineesWidget::slot_AnswerDocsChanged()
viewerTrainees->getAmmTasksWidgetCommon()->setDocsActualed(false); viewerTrainees->getAmmTasksWidgetCommon()->setDocsActualed(false);
} }
void InstructorsAndTraineesWidget::slot_ConnectToServer()
{
updateLabelServer();
connectorToServer->SetConnectToServer();
}
bool InstructorsAndTraineesWidget::authorizationInstructorDialog(QWidget* parent) bool InstructorsAndTraineesWidget::authorizationInstructorDialog(QWidget* parent)
{ {
DialogAuthorization dlg(parent); DialogAuthorization dlg(parent);
@@ -429,7 +435,7 @@ void InstructorsAndTraineesWidget::on_btnConnectionToServer_clicked()
updateLabelServer(); updateLabelServer();
connectorToServer->SetConnectToServer(); QTimer::singleShot(1000, this, SLOT(slot_ConnectToServer()));
} }
void InstructorsAndTraineesWidget::on_btnAuthorizationInstructor_clicked() void InstructorsAndTraineesWidget::on_btnAuthorizationInstructor_clicked()

2
InstructorsAndTrainees/instructorsandtraineeswidget.h
View File

@@ -58,6 +58,8 @@ public Q_SLOTS:
void slot_AnswerDocsChanged(); void slot_AnswerDocsChanged();
void slot_ConnectToServer();
Q_SIGNALS: Q_SIGNALS:
//сигнал смены языка //сигнал смены языка
void signal_LanguageChanged(QString language); void signal_LanguageChanged(QString language);