Oddělení ELC1 generatoru a readeru

include/generator/licGenELC1.h

@@ -1,9 +1,38 @@
 #ifndef ELC1_GENERATOR__H
 #define ELC1_GENERATOR__H
 
+#include "utils.h"
+#include "licenceCommon.h"
+#include "licenceELC1.h"
+#include "SDCard.h"
+#include "pugixml.hpp"
+
 namespace Generator
 {
-  
+  class Licence1 : public LicenceELC1
+  {
+  public:
+    Licence1();
+    Licence1(string cid, string csd, string dataFileName);
+    ~Licence1();
+
+    pugi::xml_document *xmlDoc;
+    string projectDescription = "";
+    string stationName; // name of station
+    string distributor;
+    WORD licType = 2;                                                         // type of licence
+    BinaryGenerationType binaryGeneration = BinaryGenerationType::Base64Cout; // typ generování binárního souboru
+
+    string dataLicenceType = "";         // type of licence from xmlFile;
+    string dataLicenceVersion = "";      // version type of licence from xmlFile;
+    string dataCryptoVersion = "";       // version of crypting from xmlFile
+    string dataGenerationType = "";      // version of dataGeneration from xmlFile
+    string dataLicenceDataFileName = ""; // name of licence file to read
+
+    void processConfigFile(string &dataFileName); // process data from config file
+    bool createLicence(); // create licence for EOV_OSV
+    LicenceIdentification lIdentification;
+  };
 }
 
 #endif

include/generator/licGenELC2.h

@@ -1,9 +1,38 @@
-#ifndef ELC2_GENERATOR__H
-#define ELC2_GENERATOR__H
+#ifndef ELC2_GENERATOR_H
+#define ELC2_GENERATOR_H
+
+#include "utils.h"
+#include "licenceCommon.h"
+#include "licenceELC2.h"
+#include "SDCard.h"
+#include "pugixml.hpp"
+
+
+using namespace std;
 
 namespace Generator
 {
-  
+  class Licence2 : public LicenceELC2
+  {
+    
+  public:
+    Licence2();
+    Licence2(string cid, string csd, pugi::xml_document * xmlDoc);
+    ~Licence2();
+
+    string cid = "";
+    string csd = "";
+    pugi::xml_document *xmlDoc;
+    string projectDescription = "";
+
+
+    bool createLicence();
+    void getHeader();
+    string getVersion(int middleVersion);
+    bool processInputConfiguration();
+    void getLicenceItems();
+
+  };
 }
 
 #endif

include/generator/licenceGenerator.h

@@ -3,13 +3,7 @@
 
 #include <iostream>
 #include <sstream>
-#include <iomanip>
 #include <stdio.h>
-#include <stdlib.h>
-#include <vector>
-#include <wchar.h>
-#include <time.h>
-#include <map>
 #include <stdint.h>
 #include "pugixml.hpp"
 #include "licenceCommon.h"
@@ -47,6 +41,8 @@ public:
   LicenceELC11 *licence11;
   LicenceELC21 *licence21;
   LicenceELC31 *licence31;
+  Mapping mapping;
+
 
   LicenceGenerator();
   ~LicenceGenerator();
@@ -54,8 +50,6 @@ public:
     
   void createLicenceFile();
   
-  int getDataPointsCount(int protocolId);
-  
 
   LicenceInfoGeneral licenceInfo;