ref: add postprocess and dataparserOut

Core/dataparser.cpp

@@ -8,9 +8,9 @@ DataParser::DataParser(QObject *parent) :
     }
 }
 
-void DataParser::initialize()
+void DataParser::initialize(PostProcessorSystem *postProcessSystem)
 {
-
+    this->postProcessSystem = postProcessSystem;
 }
 
 
@@ -118,17 +118,17 @@ void DataParser::xmlParser(QByteArray array)
                 {
                     if (value == "END")
                     {
-                        postProcessorSystem->socketDisable();
+                        postProcessSystem->socketDisable();
                     }
 
                     if (value == "BLOCKED")
                     {
-                        postProcessorSystem->serverBlocked();
+                        postProcessSystem->serverBlocked();
                     }
 
                     if (value == "HASHSENDCOMPLETE")
                     {
-                        postProcessorSystem->startCompare();
+                        postProcessSystem->startCompare();
                     }
 
                     if (value == "BASEDELETETRY")
@@ -149,13 +149,13 @@ void DataParser::xmlParser(QByteArray array)
                     if (value == "UNCHANGEABLE")
                     {
                         emit sigNotify(tr("Нельзя выгружать в базовую версию"));
-                        postProcessorSystem->showUpdateList();
+                        postProcessSystem->showUpdateList();
                         //emit recognizeSystem->sigShowUpdateList();
                     }
 
                     if (value == "CHANGEABLE")
                     {
-                        postProcessorSystem->compareFiles();
+                        postProcessSystem->compareFiles();
                         //emit sigUpdateFilesOnServer(hashComparer->getFilesForUpdate());
                     }
                 }
@@ -185,12 +185,12 @@ void DataParser::xmlParser(QByteArray array)
 
                 if (name == "AccessType"){
                     serverAuth->AccessType = value;
-                    postProcessorSystem->checkAccessType(value);
+                    postProcessSystem->checkAccessType(value);
                     //recognizeSystem->checkAccessType(value);
                 }
             }
 
-            postProcessorSystem->saveLoginData(serverAuth);
+            postProcessSystem->saveLoginData(serverAuth);
             //emit recognizeSystem->sigSaveLoginData(serverAuth);
         }
 
@@ -218,7 +218,7 @@ void DataParser::xmlParser(QByteArray array)
                 }
 
             }
-            postProcessorSystem->setServerVersion(serverVersion);
+            postProcessSystem->setServerVersion(serverVersion);
             //recognizeSystem->setServerVersion(serverVersion);
         }
 
@@ -256,7 +256,7 @@ void DataParser::xmlParser(QByteArray array)
 
                 xmlReader.readNext();
             }
-            postProcessorSystem->showServerDataList(serverStreamingVersionDataList);
+            postProcessSystem->showServerDataList(serverStreamingVersionDataList);
         }
 
         xmlReader.readNext();

Core/dataparser.h

@@ -21,7 +21,7 @@ class DataParser : public QObject
 
 public:
     explicit DataParser(QObject *parent = 0);
-    void initialize();
+    void initialize(PostProcessorSystem *postProcessSystem);
 
     ~DataParser();
     ServerSettings* getClientSettings();
@@ -33,7 +33,7 @@ signals:
 
 private:
     ClientAutorization *authPassCache;
-    PostProcessorSystem *postProcessorSystem;
+    PostProcessorSystem *postProcessSystem;
 };
 
 #endif // DATAPARSER_H

Core/postprocessorsystem.cpp

@@ -1,6 +1,6 @@
 #include "postprocessorsystem.h"
 
-PostProcessorSystem::PostProcessorSystem() {}
+PostProcessorSystem::PostProcessorSystem(QObject *parent) : QObject(parent){}
 
 void PostProcessorSystem::initialize(DataParserOutput *dataParserOutput,
                                      HashComparer *hashComparer,

Core/postprocessorsystem.h

@@ -10,7 +10,7 @@ class PostProcessorSystem : public QObject
 {
     Q_OBJECT
 public:
-    PostProcessorSystem();
+    explicit PostProcessorSystem(QObject *parent = 0);
     void initialize(DataParserOutput *dataParserOutput,
                     HashComparer *hashComparer,
                     VersionContainer* versionContainer,

Core/recognizesystem.cpp

@@ -19,10 +19,11 @@ RecognizeSystem::~RecognizeSystem()
 
 }
 
-void RecognizeSystem::initialize(VersionContainer *versionContainer,PostProcessorSystem *postProcessorSystem)
+void RecognizeSystem::initialize(DataParser *dataParser, VersionContainer *versionContainer,PostProcessorSystem *postProcessorSystem)
 {
     this->versionContainer = versionContainer;
     this->postProcessorSystem = postProcessorSystem;
+    this->dataParser = dataParser;
 }
 
 void RecognizeSystem::recognize(QTcpSocket *socket)

Core/recognizesystem.h

@@ -23,7 +23,7 @@ class RecognizeSystem : public QObject
 public:
     explicit RecognizeSystem(QObject *parent = 0);
     ~RecognizeSystem();
-    void initialize(VersionContainer* versionContainer,PostProcessorSystem *postProcessorSystem);
+    void initialize(DataParser *dataParser, VersionContainer* versionContainer,PostProcessorSystem *postProcessorSystem);
 
     void recognize(QTcpSocket *socket);
     void showServerDataList(QList<StreamingVersionData*> *showServerDataList);

StaticData/settings.xml

@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ServerSettingsContainer>
-    <ServerSettings DestPortMath="18003" Port="6000" AutoStart="0" UseMathModel="1" Language="RUS" Address="192.168.100.83" LocalPortMath="18004"/>
+    <ServerSettings Address="192.168.100.83" Port="6000" Language="RUS" AutoStart="0" DestPortMath="18003" LocalPortMath="18004" UseMathModel="1"/>
-    <VersionData Version="base" isChangable="0" Created="Пт авг 1 10:37:32 2025"/>
+    <VersionData Version="" isChangable="13"/>
 </ServerSettingsContainer>

mainwindow.cpp

@@ -31,6 +31,8 @@ void MainWindow::createObjects()
 
     updateWidget->setParent(this);
     commonButtonGroupWidget = new CommonButtonGroupWidget;
+    instructorButtonGroup = new InstructorButtonGroupWidget;
+
     entryWidget = new EntryWidget;
     versionSelectWidget = new VersionSelectWidget;
     waitAnimationWidget = new WaitAnimationWidget;
@@ -108,8 +110,9 @@ void MainWindow::initialize()
     versionSelectWidget->initialize(sendSystem,versionContainer,notifyController);
     hashComparer->initialize(versionContainer);
     updateController->initialize(versionContainer);
-    dataParser->initialize();
+    postProcessorSystem->initialize(dataParserOutput,hashComparer,versionContainer,updateController);
-    recognizeSystem->initialize(versionContainer,postProcessorSystem);
+    dataParser->initialize(postProcessorSystem);
+    recognizeSystem->initialize(dataParser, versionContainer, postProcessorSystem);
     resourceManager->painting();
     commonButtonGroupWidget->initialize(externalExecuter,sendSystem,client);
     commonButtonGroupWidget->show();