Add container for parsing TechTree.json file

Author: MahBoiDeveloper

src/FactionsManager.cpp

@@ -0,0 +1,31 @@
+#include <future>
+#include "Logger.hpp"
+#include "FactionsManager.hpp"
+
+FactionManager::FactionManager()
+{
+    vFactions.reserve(12);
+
+    for(const auto& elem : TECH_TREE_SOURCE.Query("$.TechTree").toArray())
+        vFactions.push_back(Faction{elem.toObject()});
+}
+
+int FactionManager::Count() { return vFactions.size(); }
+const Faction& FactionManager::FindByIndex(int position) { return vFactions.at(position); }
+const Faction& FactionManager::FindByShortName(const QString& name)
+{
+    int tmp = 0;
+
+    for(int i = 0; i < vFactions.count(); i++)
+    {
+        const Faction& elem = vFactions[i];
+        
+        if(elem.GetShortName() != name)
+            continue;
+
+        tmp = i;
+        break;
+    }
+    
+    return vFactions.at(tmp);
+}

src/FactionsManager.hpp

@@ -0,0 +1,28 @@
+#pragma once
+#include <memory>
+#include <QVector>
+#include "Parsers/JSONFile.hpp"
+#include "Faction.hpp"
+
+#define FACTIONS_MANAGER FactionManager::Instance
+
+class FactionManager final
+{
+private: // Data
+    JSONFile TECH_TREE_SOURCE{PROGRAM_CONSTANTS->TECH_TREE_FILE};
+    QVector<Faction> vFactions;
+public:
+    inline static std::unique_ptr<FactionManager> Instance = nullptr;
+
+private: // Methods
+    void Parse();
+public:
+    /// @brief Default constructor.
+    FactionManager();
+    /// @brief Return count of parsed factions.
+    int Count();
+    /// @brief Return faction by its index in container.
+    const Faction& FindByIndex(int position);
+    /// @brief Return faction reference.
+    const Faction& FindByShortName(const QString& name);
+};

src/GUI/EditorWindow.cpp

@@ -12,6 +12,7 @@
 #include "../Logger.hpp"
 #include "../Unsorted.hpp"
 #include "../Convert.hpp"
+#include "../FactionsManager.hpp"
 
 #include "ImageManager.hpp"
 #include "WindowManager.hpp"
@@ -27,8 +28,7 @@ EditorWindow::EditorWindow(QWidget* parent)
     , pHotkeysPanelsWidget{nullptr}
     , pAboutDialog{nullptr}
 {
-    SetFactions();
-    LOGMSG("Total faction count that has been read from json file: " + factionVector.size());
+    LOGMSG("Total faction count that has been read from json file: " + FACTIONS_MANAGER->Count());
 
     resize(PROGRAM_CONSTANTS->EDITOR_WINDOW_SIZE);
     ConfigureMenu();
@@ -42,7 +42,7 @@ EditorWindow::EditorWindow(QWidget* parent)
     connect(pEntitiesTreeWidget, &QTreeWidget::itemSelectionChanged, this, &EditorWindow::SetHotkeysPanels);
 
     QBoxLayout* ltFactions = nullptr;
-    int factonsCount = factionVector.size();
+    int factonsCount = FACTIONS_MANAGER->Count();
 
     if (factonsCount == Faction::BASIC_FACTION_COUNT)
     {
@@ -59,7 +59,7 @@ EditorWindow::EditorWindow(QWidget* parent)
 
             for (int i = 0; i < 4; ++i)
             {
-                const Faction currFaction = factionVector.at(sectionIndex + i);
+                const Faction currFaction = FACTIONS_MANAGER->FindByIndex(sectionIndex + i);
 
                 QPushButton* factionButton = new QPushButton{currFaction.GetDisplayName()};
 
@@ -199,7 +199,7 @@ void EditorWindow::SetGameObjectList(const QString& factionShortName)
 {
     pEntitiesTreeWidget->clear();
 
-    QMap<Faction::GameObject, GameObjectTypes> goMap = GetFactionRef(factionShortName).GetTechTree();
+    QMap<Faction::GameObject, GameObjectTypes> goMap = FACTIONS_MANAGER->FindByShortName(factionShortName).GetTechTree();
 
     // Skip if there are no entities of that type
     if(goMap.isEmpty()) return;
@@ -265,7 +265,7 @@ void EditorWindow::SetHotkeysPanels()
     const QString& factionShortName = specialItemInfo.first;
     const QString& gameObjectName   = specialItemInfo.second;
 
-    const auto gameObjectKeyboardLayouts = GetFactionRef(factionShortName).GetKeyboardLayoutsByObjectName(gameObjectName);
+    const auto gameObjectKeyboardLayouts = FACTIONS_MANAGER->FindByShortName(factionShortName).GetKeyboardLayoutsByObjectName(gameObjectName);
 
     // Recreate panels widget
     if (pHotkeysPanelsWidget != nullptr) pHotkeysPanelsWidget->deleteLater();
@@ -418,40 +418,10 @@ void EditorWindow::KeyboardWindow_Update(int id)
     }
 }
 
-void EditorWindow::SetFactions()
-{
-    for(const auto& elem : TECH_TREE_SOURCE.Query("$.TechTree").toArray())
-        factionVector.push_back(Faction{elem.toObject()});
-}
-
-const Faction& EditorWindow::GetFactionRef(const QString& name)
-{
-    int tmp = 0;
-
-    for(int i = 0; i < factionVector.count(); i++)
-    {
-        const Faction& elem = factionVector[i];
-        
-        if(elem.GetShortName() == name)
-        {
-            tmp = i;
-            break;
-        }
-    }
-    
-    return factionVector.at(tmp);
-}
-
 void EditorWindow::SetActionHotkey(const QString& fctShortName, const QString& goName, const QString& actName, const QString& hk)
 {
-    for(Faction& fct : factionVector)
-    {
-        if(fct.GetShortName() == fctShortName)
-        {
-            fct.SetHotkey(goName, actName, hk);
-            break;
-        }
-    }
+    Faction& fct = const_cast<Faction&>(FACTIONS_MANAGER->FindByShortName(fctShortName));
+    fct.SetHotkey(goName, actName, hk);
 }
 
 void EditorWindow::ActAbout_Triggered()

src/GUI/EditorWindow.hpp

@@ -6,18 +6,13 @@
 #include <QHBoxLayout>
 
 #include "../Parsers/JSONFile.hpp"
-#include "../Faction.hpp"
 #include "ActionHotkeyWidget.hpp"
 
 class EditorWindow final : public QMainWindow
 {
     Q_OBJECT
 
 private: // Data
-    JSONFile TECH_TREE_SOURCE{PROGRAM_CONSTANTS->TECH_TREE_FILE};
-
-    QVector<Faction> factionVector;
-
     // Qt object in a single copy
     QButtonGroup* pFactionsButtonsGroup = nullptr;
 
@@ -37,10 +32,6 @@ class EditorWindow final : public QMainWindow
     EditorWindow(QWidget* parent = nullptr);
 
 private:
-    /// @brief Read data from TechTree.json and parse it to game objects.
-    void SetFactions();
-    /// @brief Return faction from EditorWindow::factionVector vector.
-    const Faction& GetFactionRef(const QString& name);
     /// @brief Set context menu bar functions and logics.
     void ConfigureMenu();
     /// @brief Set game object and their actions for window by short faction name.

src/GUI/Translations/ru.ts

@@ -84,13 +84,13 @@
     </message>
     <message>
         <location filename="../EditorWindow.cpp" line="189"/>
-        <location filename="../EditorWindow.cpp" line="526"/>
+        <location filename="../EditorWindow.cpp" line="496"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
         <location filename="../EditorWindow.cpp" line="193"/>
-        <location filename="../EditorWindow.cpp" line="491"/>
+        <location filename="../EditorWindow.cpp" line="461"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
@@ -100,27 +100,27 @@
         <translation>Раскладка %1</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="471"/>
+        <location filename="../EditorWindow.cpp" line="441"/>
         <source>Authors: </source>
         <translation>Авторы: </translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="472"/>
+        <location filename="../EditorWindow.cpp" line="442"/>
         <source>Version: </source>
         <translation>Версия: </translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="473"/>
+        <location filename="../EditorWindow.cpp" line="443"/>
         <source>Program licensed with </source>
         <translation>Программа лицензирована под </translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="474"/>
+        <location filename="../EditorWindow.cpp" line="444"/>
         <source>GitHub repository:</source>
         <translation>Репозиторий на GitHub:</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="476"/>
+        <location filename="../EditorWindow.cpp" line="446"/>
         <source>Support development:</source>
         <translation>Поддержать разработку:</translation>
     </message>

src/Main.cpp

@@ -10,8 +10,8 @@
 #include <QDebug>
 
 // Project headers
-// #include "Parsers/CSFParser.hpp"
 #include "GUI/WindowManager.hpp"
+#include "FactionsManager.hpp"
 #include "ProgramConstants.hpp"
 #include "Logger.hpp"
 
@@ -67,10 +67,13 @@ int main(int argc, const char** argv)
 
     PROGRAM_CONSTANTS->InitializeFileSettings();
 
-    // Show console, that by default is hiding by Logger class.
+    // Show console, that by default is hiding by Logger class
     if (PROGRAM_CONSTANTS->pSettingsFile->IsConsoleEnabled()) 
         ShowWindow(GetConsoleWindow(), SW_SHOW);
 
+    // Initialize TechTree.json parsing
+    FACTIONS_MANAGER = make_unique<FactionManager>();
+
     // Define logger as the singleton class, that could be used anywhere in the project
     WINDOW_MANAGER = make_unique<WindowManager>();