finished command, basic command, byte array

DBO/ScBasicCommand.cpp

@@ -2,14 +2,30 @@
 // Created by robin on 6/27/15.
 //
 
+#include <string>
 #include "ScBasicCommand.h"
 
 ScBasicCommand::ScBasicCommand(const std::string &data)
 {
+    DWORD size = 0;
     for (auto c : data)
     {
-
+        if (isxdigit(c))
+            ++size;
+    }
+    auto d = new BYTE[size];
+    size = 0;
+    for (int i = 0; i < data.size(); ++i)
+    {
+        auto c = data[i];
+        if (isxdigit(c))
+            d[size++] = hexToDec(c);
     }
+    _data = ScByteArray(d, size);
+}
+
+ScBasicCommand::~ScBasicCommand()
+{
 }
 
 ScByteArray ScBasicCommand::getData() const

DBO/ScBasicCommand.h

@@ -6,7 +6,7 @@
 # define LIBPCSC_CPPTOOLS_SCBASICCOMMAND_H
 
 
-# include <bits/stringfwd.h>
+# include <string>
 # include "ScCommand.h"
 
 class ScBasicCommand : public ScCommand {
@@ -14,6 +14,8 @@ class ScBasicCommand : public ScCommand {
 public:
     ScBasicCommand(const std::string& data);
 
+    virtual ~ScBasicCommand();
+
     virtual ScByteArray getData() const override;
 
 private:

DBO/ScByteArray.h

@@ -16,6 +16,8 @@ public:
 
     inline ScByteArray(const ScByteArray& data);
 
+    inline ~ScByteArray();
+
     inline DWORD getSize() const;
 
     inline BYTE* getData() const;

DBO/ScByteArray.hxx

@@ -23,9 +23,9 @@ ScByteArray::ScByteArray(const ScByteArray &data)
     _data = (BYTE*)memcpy(malloc(_size), data._data, _size);
 }
 
-DWORD ScByteArray::getSize() const
+ScByteArray::~ScByteArray()
 {
-    return _size;
+    delete[] _data;
 }
 
 BYTE* ScByteArray::getData() const

DBO/ScCommand.cpp

@@ -3,3 +3,16 @@
 //
 
 #include "ScCommand.h"
+
+ScCommand::~ScCommand()
+{
+}
+
+int ScCommand::hexToDec(const char c)
+{
+    if (c >= 'a')
+        return 10 + (c - ('a' - 'A')) - 'A';
+    if (c >= 'A')
+        return 10 + c - 'A';
+    return c - '0';
+}

DBO/ScCommand.h

@@ -10,8 +10,12 @@
 class ScCommand {
 
 public:
+    virtual ~ScCommand();
+
     virtual ScByteArray getData() const = 0;
 
+    static int hexToDec(const char c);
+
 };
 
 # include "ScCommand.hxx"