Extend printer interface to represent actually functionality better

.vscode/settings.json

@@ -85,5 +85,6 @@
   },
   "clang-tidy.buildPath": "builddir/",
   "clangd.onConfigChanged": "restart",
-  "C_Cpp.default.compileCommands": "builddir/compile_commands.json"
+  "C_Cpp.default.compileCommands": "/home/moritz/src/ptouch-prnt/builddir/compile_commands.json",
+  "C_Cpp.default.configurationProvider": "mesonbuild.mesonbuild"
 }

src/P700Printer.cpp

@@ -160,7 +160,27 @@ bool P700Printer::printBitmap(const graphics::Bitmap<graphics::ALPHA8>& bitmap)
     return true;
 }
 
-bool P700Printer::printText(const std::string& text, uint16_t fontSize) {
+bool P700Printer::setText(const std::string& text) {
+    return true;
+};
+
+bool P700Printer::setFont(const std::string& text) {
+    return true;
+};
+
+bool P700Printer::setFontSize(uint8_t fontSize) {
+    return true;
+};
+
+bool P700Printer::setHAlign(HAlignPosition hpos) {
+    return true;
+};
+
+bool P700Printer::setVAlign(VAlignPosition vpos) {
+    return true;
+}
+
+bool P700Printer::print() {
     send(commands["lf"]);
     send(commands["ff"]);
     send(commands["eject"]);

src/P700Printer.hpp

@@ -49,16 +49,21 @@ class P700Printer : public ::ptprnt::IPrinterDriver {
     static const PrinterInfo mInfo;
 
     // IPrinterDriver
-    const std::string_view getDriverName() override;
+    [[nodiscard]] const std::string_view getDriverName() override;
-    const std::string_view getName() override;
+    [[nodiscard]] const std::string_view getName() override;
-    const libusbwrap::usbId getUsbId() override;
+    [[nodiscard]] const libusbwrap::usbId getUsbId() override;
-    const std::string_view getVersion() override;
+    [[nodiscard]] const std::string_view getVersion() override;
-    const PrinterInfo getPrinterInfo() override;
+    [[nodiscard]] const PrinterInfo getPrinterInfo() override;
-    const PrinterStatus getPrinterStatus() override;
+    [[nodiscard]] const PrinterStatus getPrinterStatus() override;
     bool attachUsbDevice(std::shared_ptr<libusbwrap::IUsbDevice> usbHndl) override;
     bool detachUsbDevice() override;
+    bool setText(const std::string& text) override;
+    bool setFont(const std::string& text) override;
+    bool setFontSize(uint8_t fontSize) override;
+    bool setHAlign(HAlignPosition hpos) override;
+    bool setVAlign(VAlignPosition vpos) override;
     bool printBitmap(const graphics::Bitmap<graphics::ALPHA8>& bitmap) override;
-    bool printText(const std::string& text, uint16_t fontSize) override;
+    bool print() override;
 
    private:
     bool send(std::vector<uint8_t>& data);

src/PrinterDriverFactory.cpp

@@ -1,22 +1,23 @@
 #include "PrinterDriverFactory.hpp"
-#include <memory>
+
-#include "libusbwrap/LibUsbTypes.hpp"
-#include "P700Printer.hpp"
 #include <spdlog/spdlog.h>
 
+#include <memory>
+
+#include "P700Printer.hpp"
+#include "libusbwrap/LibUsbTypes.hpp"
+
 namespace ptprnt {
 
 std::shared_ptr<IPrinterDriver> PrinterDriverFactory::create(libusbwrap::usbId id) {
 
-   if(printer::P700Printer::mInfo.usbId == id) {
+    if (printer::P700Printer::mInfo.usbId == id) {
-      spdlog::debug("Printer is P700!");
+        spdlog::info("Found printer P700!");
-      return std::make_shared<printer::P700Printer>();
+        return std::make_shared<printer::P700Printer>();
-   }
+    } else {
-   else  {
+        spdlog::trace("{:04x}:{:04x} is not a compatible printer", id.first, id.second);
-      spdlog::debug("{:04x}:{:04x} is not a compatible printer", id.first, id.second);
+    }
-   }
+    return nullptr;
-   return nullptr;
 }
 
-
+}  // namespace ptprnt
-}

src/PtouchPrint.cpp

@@ -16,12 +16,11 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
  */
+#include <cstdint>
 #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_TRACE
 #define SPDLOG_DEBUG_ON
 #define SPDLOG_TRACE_ON
 
-#include "PtouchPrint.hpp"
-
 #include <CLI/App.hpp>
 #include <fmt/core.h>
 #include <spdlog/common.h>
@@ -38,6 +37,7 @@
 
 #include "CLI/Option.hpp"
 #include "PrinterDriverFactory.hpp"
+#include "PtouchPrint.hpp"
 #include "graphics/Bitmap.hpp"
 #include "libusbwrap/UsbDeviceFactory.hpp"
 
@@ -69,9 +69,9 @@ int PtouchPrint::init(int argc, char** argv) {
 }
 
 int PtouchPrint::run() {
-    spdlog::debug("ptprnt version {}", mVersionString);
+    spdlog::info("ptprnt version {}", mVersionString);
     SPDLOG_TRACE("testing trace");
-    mDetectedPrinters = getCompatiblePrinters();
+    mDetectedPrinters     = getCompatiblePrinters();
     auto numFoundPrinters = mDetectedPrinters.size();
     if (numFoundPrinters == 0) {
         spdlog::error(
@@ -82,7 +82,7 @@ int PtouchPrint::run() {
         return -1;
     }
 
-    auto printer = mDetectedPrinters[0];
+    auto printer            = mDetectedPrinters[0];
     const auto printerUsbId = printer->getUsbId();
     auto devices = mUsbDeviceFactory.findDevices(printerUsbId.first, printerUsbId.second);
     if (devices.size() != 1) {
@@ -98,21 +98,50 @@ int PtouchPrint::run() {
     //printer->printText("wurst", 1);
 
     for (auto& cmd : mCommands) {
-        spdlog::debug("Command: {}", cmd.second);
+        switch (cmd.first) {
+            case CliCmdType::Text:
+                spdlog::debug("Setting text to {}", cmd.second);
+                printer->setText(cmd.second);
+                break;
+            case CliCmdType::Font:;
+                spdlog::debug("Setting font to {}", cmd.second);
+                printer->setFont(cmd.second);
+                break;
+            case CliCmdType::FontSize:;
+                spdlog::debug("Setting font size to {}", cmd.second);
+                printer->setFontSize(static_cast<uint8_t>(std::atoi(cmd.second.c_str())));
+                break;
+            case CliCmdType::HAlign:;
+                spdlog::debug("[Not implemented] Setting text horizontal alignment to {}",
+                              cmd.second);
+                break;
+            case CliCmdType::VAlign:;
+                spdlog::debug("[Not implemented] Setting text vertical alignment to {}",
+                              cmd.second);
+                break;
+            case CliCmdType::None:;
+                [[fallthrough]];
+            default:
+                spdlog::warn("This command is currently not supported.");
+                break;
+        }
+    }
+    if (!printer->print()) {
+        spdlog::error("An error occured while printing");
+        return -1;
     }
-
     return 0;
 }
 
 std::vector<std::shared_ptr<IPrinterDriver>> PtouchPrint::getCompatiblePrinters() {
 
-    auto usbDevs = mUsbDeviceFactory.findAllDevices();
+    auto usbDevs       = mUsbDeviceFactory.findAllDevices();
     auto driverFactory = std::make_unique<PrinterDriverFactory>();
-    std::vector<std::shared_ptr<IPrinterDriver>> foundPrinterDrivers {};
+    std::vector<std::shared_ptr<IPrinterDriver>> foundPrinterDrivers{};
 
     for (auto usbDev : usbDevs) {
         auto driver = driverFactory->create(usbDev->getUsbId());
-        if(driver != nullptr) {
+        if (driver != nullptr) {
             foundPrinterDrivers.push_back(driver);
         }
     }

src/interface/IPrinterDriver.hpp

@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <memory>
 #include <string_view>
 
@@ -31,16 +32,21 @@ namespace ptprnt {
 class IPrinterDriver {
    public:
     virtual ~IPrinterDriver()                                                     = default;
-    virtual const std::string_view getDriverName()                                = 0;
+    [[nodiscard]] virtual const std::string_view getDriverName()                  = 0;
-    virtual const std::string_view getName()                                      = 0;
+    [[nodiscard]] virtual const std::string_view getName()                        = 0;
-    virtual const std::string_view getVersion()                                   = 0;
+    [[nodiscard]] virtual const std::string_view getVersion()                     = 0;
-    virtual const libusbwrap::usbId getUsbId()                                    = 0;
+    [[nodiscard]] virtual const libusbwrap::usbId getUsbId()                      = 0;
-    virtual const PrinterInfo getPrinterInfo()                                    = 0;
+    [[nodiscard]] virtual const PrinterInfo getPrinterInfo()                      = 0;
-    virtual const PrinterStatus getPrinterStatus()                                = 0;
+    [[nodiscard]] virtual const PrinterStatus getPrinterStatus()                  = 0;
     virtual bool attachUsbDevice(std::shared_ptr<libusbwrap::IUsbDevice> usbHndl) = 0;
     virtual bool detachUsbDevice()                                                = 0;
+    virtual bool setText(const std::string& text)                                 = 0;
+    virtual bool setFont(const std::string& text)                                 = 0;
+    virtual bool setFontSize(uint8_t fontSize)                                    = 0;
+    virtual bool setHAlign(HAlignPosition hpos)                                   = 0;
+    virtual bool setVAlign(VAlignPosition vpos)                                   = 0;
     virtual bool printBitmap(const graphics::Bitmap<graphics::ALPHA8>& bitmap)    = 0;
-    virtual bool printText(const std::string& text, uint16_t fontSize)            = 0;
+    virtual bool print()                                                          = 0;
 };
 
 }  // namespace ptprnt

src/interface/IPrinterTypes.hpp

@@ -20,7 +20,9 @@
 #pragma once
 
 #include <cstdint>
+#include <string>
 #include <string_view>
+
 #include "libusbwrap/LibUsbTypes.hpp"
 
 namespace ptprnt {
@@ -29,7 +31,7 @@ struct PrinterInfo {
     std::string_view driverName = "";
     std::string_view name       = "";
     std::string_view version    = "";
-    libusbwrap::usbId usbId {0x00, 0x00};
+    libusbwrap::usbId usbId{0x00, 0x00};
 };
 
 struct PrinterStatus {
@@ -37,4 +39,27 @@ struct PrinterStatus {
     unsigned int tapeWidthMm    = 0.0;
 };
 
+enum class HAlignPosition {
+    UNKNOWN = 0,
+    LEFT    = 1,
+    CENTER  = 2,
+    RIGHT   = 3,
+    JUSTIFY = 4,
+};
+
+enum class VAlignPosition {
+    UNKNOWN = 0,
+    TOP     = 1,
+    MIDDLE  = 2,
+    BOTTOM  = 3,
+};
+
+struct PrintableText {
+    std::string text{""};
+    std::string font{"Noto"};
+    uint8_t fontSize{0};
+    HAlignPosition hAlign{HAlignPosition::LEFT};
+    VAlignPosition vAlign{VAlignPosition::MIDDLE};
+};
+
 }  // namespace ptprnt

tests/image_test/image_test.cpp

@@ -21,8 +21,6 @@
 
 #include <gtest/gtest.h>
 
-#include <optional>
-
 TEST(basic_test, Image_smokeTest_succeeds) {
     auto im = ptprnt::graphics::Image();
 }

tests/meson.build

@@ -1,14 +1,38 @@
-tests = [['bitmap_test', 'bitmap_test_exe', ptprnt_srcs + ['bitmap_test/bitmap_test.cpp']],
+tests = [
-         ['image_test', 'image_test_exe', ptprnt_srcs +['image_test/image_test.cpp']],
+    [
-         ['monochrome_test', 'monochrome_test_exe', ptprnt_srcs +['monochrome_test/monochrome_test.cpp']]
+        'bitmap_test',
-        ]
+        'bitmap_test_exe',
+        ['../src/graphics/Bitmap.cpp', 'bitmap_test/bitmap_test.cpp'],
+    ],
+    [
+        'image_test',
+        'image_test_exe',
+        ['../src/graphics/Image.cpp', 'image_test/image_test.cpp'],
+    ],
+    [
+        'monochrome_test',
+        'monochrome_test_exe',
+        [
+            '../src/graphics/Monochrome.cpp',
+            'monochrome_test/monochrome_test.cpp',
+        ],
+    ],
+]
 
 foreach test : tests
-    test(test.get(0),
+    test(
-         executable(test.get(1),
+        test.get(0),
-                    sources: test.get(2),
+        executable(
-                    include_directories: incdir,
+            test.get(1),
-                    dependencies: [gtest_dep, usb_dep, log_dep, pangocairo_dep, cli11_dep]
+            sources: test.get(2),
-         )
+            include_directories: incdir,
+            dependencies: [
+                gtest_dep,
+                usb_dep,
+                log_dep,
+                pangocairo_dep,
+                cli11_dep,
+            ],
+        ),
     )
-endforeach
+endforeach

tests/monochrome_test/monochrome_test.cpp

@@ -57,6 +57,9 @@ TEST(basic_test, Monochrome_convertWithCustomThreshhold_yieldsMonochromeRespecti
 }
 
 TEST(basic_test, Monochrome_convertNonAlignedPixels_spillsOverIntoNewByte) {
+    // TODO: We need to find to access the vector without the possiblity of out-of-bounds access
+    // Ideas: constexpr? compile time check?
+    GTEST_SKIP() << "Skipping this test, as ASAN will halt as this is an out-of-bounds access";
     const std::vector<uint8_t> pixels({0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00,
                                        0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF});