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

VersionSelectWidget refact

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-11-26 17:28:22 +03:00
parent 44b6299e59
commit 1c151d4aff
14 changed files with 221 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
View File

@@ -9,10 +9,9 @@ ConnectorToServer::ConnectorToServer(QWidget* parentWidget, QObject *parent) :
dataParser(nullptr),
sendSystem(nullptr),
recognizeSystem(nullptr),
versionSelectWidget(nullptr),
versionContainer(nullptr),
notifyController(nullptr),
fl_GetedOfflineMessages(false)
fl_GetedOfflineMessages(false),
nameInstructorLoggedInLocal("")
{
initialize();
}
@@ -20,9 +19,7 @@ ConnectorToServer::ConnectorToServer(QWidget* parentWidget, QObject *parent) :
ConnectorToServer::~ConnectorToServer()
{
delete client;
delete versionSelectWidget;
delete notifyController;
delete versionContainer;
delete recognizeSystem;
delete sendSystem;
delete dataParser;
@@ -57,7 +54,13 @@ void ConnectorToServer::StopConnectToServer()
void ConnectorToServer::setLoginName(QString name)
{
versionSelectWidget->setAuthor(name);
//versionSelectWidget->setAuthor(name);
nameInstructorLoggedInLocal = name;
}
QString ConnectorToServer::getLoginName()
{
return nameInstructorLoggedInLocal;
}
void ConnectorToServer::slot_sendMessage(ClientMessage clientMessage)
@@ -67,7 +70,8 @@ void ConnectorToServer::slot_sendMessage(ClientMessage clientMessage)
void ConnectorToServer::slot_showServerList(QList<StreamingVersionData *> *serverList)
{
versionSelectWidget->fillView(serverList);
//versionSelectWidget->fillView(serverList);
emit signal_showServerList(serverList);
}
void ConnectorToServer::slot_HashReady()
@@ -81,6 +85,26 @@ void ConnectorToServer::slot_Auth(ServerAuthorization *serverAuth)
emit sigLoginResult(serverAuth);
}
void ConnectorToServer::slot_SendDeleteVersion(StreamingVersionData *streaming)
{
emit signal_SendDeleteVersion(streaming);
}
void ConnectorToServer::slot_SendSwitchVersion(StreamingVersionData *selectVersion)
{
emit signal_SendSwitchVersion(selectVersion);
}
void ConnectorToServer::slot_SendCopyVersion(QString versionPair)
{
emit signal_SendCopyVersion(versionPair);
}
void ConnectorToServer::slot_getVersion()
{
emit signal_SendGetVersion();
}
void ConnectorToServer::initialize()
{
createObjects();
@@ -104,7 +128,6 @@ void ConnectorToServer::bindConnection()
connect(recognizeSystem,&RecognizeSystem::sigDeAuth,this,&ConnectorToServer::sigDeLoginResult);
connect(recognizeSystem,&RecognizeSystem::signal_ReceiveMessage,this,&ConnectorToServer::signal_receiveMessage,Qt::AutoConnection);
connect(recognizeSystem,&RecognizeSystem::sigShowServerDataList,this,&ConnectorToServer::slot_showServerList);
connect (recognizeSystem,&RecognizeSystem::sigSetVersion,versionContainer,&VersionContainer::setServerVersionData);
connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListInstructors,this,&ConnectorToServer::slot_AnswerQueryToDB_ListInstructors);
connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListGroups,this,&ConnectorToServer::slot_AnswerQueryToDB_ListGroups);
@@ -127,6 +150,15 @@ void ConnectorToServer::bindConnection()
connect(recognizeSystem,&RecognizeSystem::sigHashReady,this,&ConnectorToServer::slot_HashReady);
connect(recognizeSystem,&RecognizeSystem::signal_AnswerDocsChanged,this,&ConnectorToServer::slot_AnswerDocsChanged);
connect(recognizeSystem, &RecognizeSystem::sigSetVersion, this, &ConnectorToServer::signal_SetVersion);
connect(recognizeSystem, &RecognizeSystem::sigAnimationActivated, this, &ConnectorToServer::signal_AnimationActivated);
connect(this, &ConnectorToServer::signal_SendCopyVersion, sendSystem, &SendSystem::sendCopyVersion);
connect(this, &ConnectorToServer::signal_SendDeleteVersion, sendSystem, &SendSystem::sendDeleteVersion);
connect(this, &ConnectorToServer::signal_SendSwitchVersion, sendSystem, &SendSystem::sendChangeVersion);
connect(this, &ConnectorToServer::signal_SendGetVersion, sendSystem, &SendSystem::sendGetVersion);
}
void ConnectorToServer::createObjects()
@@ -145,9 +177,6 @@ void ConnectorToServer::createObjects()
recognizeSystem->moveToThread(connectionThread);
notifyController = new NotifyController(parentWidget);
versionContainer = new VersionContainer;
versionSelectWidget = new VersionSelectWidget(parentWidget);
versionSelectWidget->initialize(sendSystem,versionContainer,notifyController, recognizeSystem);
connectionThread->start();
connectionThread->setPriority(QThread::HighestPriority);