diff --git a/include/BarcodeFactory.h b/include/BarcodeFactory.h index c680112..21d8c59 100644 --- a/include/BarcodeFactory.h +++ b/include/BarcodeFactory.h @@ -4,8 +4,6 @@ #include "Code128Generator.h" #include "Code39Generator.h" #include "Code93Generator.h" -#include "DataBarExpandedGenerator.h" -#include "DataBarGenerator.h" #include "DataMatrixGenerator.h" #include "IBarcodeGenerator.h" #include "ItfGenerator.h" @@ -14,6 +12,7 @@ #include "UpcEGenerator.h" #include #include + class BarcodeFactory { public: static std::unique_ptr create(const std::string type); diff --git a/include/DataBarExpandedGenerator.h b/include/DataBarExpandedGenerator.h deleted file mode 100644 index 7458761..0000000 --- a/include/DataBarExpandedGenerator.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once -#include "IBarcodeGenerator.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -class DataBarExpandedGenerator : public virtual IBarcodeGenerator { -private: - ZXing::MultiFormatWriter writer{ZXing::BarcodeFormat::DataBarExpanded}; - -public: - std::string generate(const std::string &text, int margin, int size); -}; \ No newline at end of file diff --git a/include/DataBarGenerator.h b/include/DataBarGenerator.h deleted file mode 100644 index 3d92229..0000000 --- a/include/DataBarGenerator.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once -#include "IBarcodeGenerator.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -class DataBarGenerator : public virtual IBarcodeGenerator { -private: - ZXing::MultiFormatWriter writer{ZXing::BarcodeFormat::DataBar}; - -public: - std::string generate(const std::string &text, int margin, int size); -}; \ No newline at end of file diff --git a/src/BarcodeFactory.cpp b/src/BarcodeFactory.cpp index b6b3320..5f3a41a 100644 --- a/src/BarcodeFactory.cpp +++ b/src/BarcodeFactory.cpp @@ -13,10 +13,6 @@ BarcodeFactory::create(const std::string type) { return std::make_unique(); } else if (type == "Itf") { return std::make_unique(); - } else if (type == "DataBar") { - return std::make_unique(); - } else if (type == "DataBarExpanded") { - return std::make_unique(); } else if (type == "Code39") { return std::make_unique(); } else if (type == "Code93") { diff --git a/src/DataBarExpandedGenerator.cpp b/src/DataBarExpandedGenerator.cpp deleted file mode 100644 index 7321be9..0000000 --- a/src/DataBarExpandedGenerator.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "../include/DataBarExpandedGenerator.h" - -std::string DataBarExpandedGenerator::generate(const std::string &text, - int margin, int size) { - writer.setMargin(margin); - writer.setEncoding(ZXing::CharacterSet::UTF8); - ZXing::BitMatrix matrix = writer.encode(text, size, size); - - return ZXing::ToSVG(matrix); -} \ No newline at end of file diff --git a/src/DataBarGenerator.cpp b/src/DataBarGenerator.cpp deleted file mode 100644 index 7634b4c..0000000 --- a/src/DataBarGenerator.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "../include/DataBarGenerator.h" - -std::string DataBarGenerator::generate(const std::string &text, int margin, - int size) { - writer.setMargin(margin); - writer.setEncoding(ZXing::CharacterSet::UTF8); - ZXing::BitMatrix matrix = writer.encode(text, size, size); - - return ZXing::ToSVG(matrix); -} \ No newline at end of file