A somewhat working state, but still struggeling with pangocairo

.gitea/workflows/build.yaml

@@ -14,7 +14,7 @@ jobs:
       - name: install meson
         run: apt-get -yq install meson
       - name: Install build dependencies
-        run: apt-get -yq install libusb-1.0-0-dev libspdlog-dev libfmt-dev libpango1.0-dev libcairo2-dev gcovr
+        run: apt-get -yq install libusb-1.0-0-dev libspdlog-dev libpango1.0-dev libcairo2-dev gcovr
       - name: setup builddir
         run: meson setup builddir -Db_coverage=true
       - name: build all targets

.gitignore

@@ -6,7 +6,6 @@ subprojects/*
 coverageReport/
 
 # Files
-ptprnt.log
 !subprojects/*.wrap
 .vscode/*
 !.vscode/c_cpp_properties.json

.vscode/settings.json

@@ -85,6 +85,5 @@
   },
   "clang-tidy.buildPath": "builddir/",
   "clangd.onConfigChanged": "restart",
-  "C_Cpp.default.compileCommands": "builddir/compile_commands.json",
+  "C_Cpp.default.compileCommands": "builddir/compile_commands.json"
-  "mesonbuild.configureOnOpen": true
 }

README.md

@@ -19,7 +19,7 @@ pacman -S libusb spdlog pango cairo meson gcovr
 
 Install dependencies on Debian/Ubuntu
 ``` bash
-apt-get install libusb-1.0-0-dev libspdlog-dev libfmt-dev libpango1.0-dev libcairo2-dev meson gcovr
+apt-get install libusb-1.0-0-dev libspdlog-dev libpango1.0-dev libcairo2-dev meson gcovr
 ```
 
 ## Build

meson.build

@@ -6,7 +6,6 @@ project('ptprnt', 'cpp',
 
 usb_dep = dependency('libusb-1.0')
 log_dep = dependency('spdlog')
-fmt_dep = dependency('fmt')
 pangocairo_dep = dependency('pangocairo')
 
 # CLI11 
@@ -24,7 +23,7 @@ ptprnt_exe = executable(
     'ptprnt', 
     'src/main.cpp',
     install: true,
-    dependencies : [usb_dep, log_dep, fmt_dep, pangocairo_dep, cli11_dep],
+    dependencies : [usb_dep, log_dep, pangocairo_dep, cli11_dep],
     include_directories: incdir,
     sources: [ptprnt_srcs],
     cpp_args : ['-DPROJ_VERSION="'+meson.project_version()+'"'],

src/PtouchPrint.cpp

@@ -16,29 +16,19 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
  */
-#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>
-#include <spdlog/details/synchronous_factory.h>
-#include <spdlog/logger.h>
-#include <spdlog/sinks/base_sink.h>
-#include <spdlog/sinks/basic_file_sink.h>
-#include <spdlog/sinks/stdout_color_sinks.h>
 #include <spdlog/spdlog.h>
 
 #include <functional>
-#include <memory>
-#include <vector>
 
 #include "CLI/Option.hpp"
 #include "P700Printer.hpp"
 #include "graphics/Bitmap.hpp"
+#include "graphics/Image.hpp"
 #include "libusbwrap/UsbDeviceFactory.hpp"
 
 namespace ptprnt {
@@ -56,9 +46,9 @@ int PtouchPrint::init(int argc, char** argv) {
     }
 
     if (mVerboseFlag) {
-        setupLogger(spdlog::level::debug);
+        setupLogger(spdlog::level::trace);
     } else {
-        setupLogger(spdlog::level::err);
+        setupLogger(spdlog::level::critical);
     }
 
     if (!mUsbDeviceFactory.init()) {
@@ -70,12 +60,10 @@ int PtouchPrint::init(int argc, char** argv) {
 }
 
 int PtouchPrint::run() {
-    spdlog::debug("ptprnt version {}", mVersionString);
-    SPDLOG_TRACE("testing trace");
     auto numFoundPrinters = getCompatiblePrinters();
     if (numFoundPrinters == 0) {
         spdlog::error(
-            "No compatible printers found, please make sure that they are turned on and connected");
+            "No compatible printers found, please make sure if they are turned on and connected");
         return -1;
     } else if (numFoundPrinters > 1) {
         spdlog::warn("Found more than one compatible printer. Currently not supported.");
@@ -97,7 +85,10 @@ int PtouchPrint::run() {
     //printer->printText("wurst", 1);
 
     for (auto& cmd : mCommands) {
-        spdlog::debug("Command: {}", cmd.second);
+        if (cmd.first == CliCmdType::Text) {
+            auto label{graphics::Image()};
+            label.createLabel(cmd.second);
+        }
     }
 
     return 0;
@@ -126,22 +117,13 @@ unsigned int PtouchPrint::getCompatiblePrinters() {
 }
 
 void PtouchPrint::setupLogger(spdlog::level::level_enum lvl) {
-    auto consoleSink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
+    spdlog::set_level(lvl);
-    consoleSink->set_level(lvl);
+    spdlog::debug("Starting ptprnt {}", mVersionString);
-    consoleSink->set_pattern("%^%L:%$ %v");
-
-    auto fileSink = std::make_shared<spdlog::sinks::basic_file_sink_mt>("ptprnt.log", true);
-    fileSink->set_level(spdlog::level::trace);
-    fileSink->set_pattern("%Y-%m-%d %H:%m:%S:%e [pid:%P tid:%t] [%^%l%$] %v (%@)");
-    std::vector<spdlog::sink_ptr> sinks{consoleSink, fileSink};
-    auto logger = std::make_shared<spdlog::logger>("default_logger", sinks.begin(), sinks.end());
-    logger->set_level(spdlog::level::trace);
-    spdlog::set_default_logger(logger);
 }
 
 void PtouchPrint::setupCliParser() {
     auto printVersion = [this](std::size_t) {
-        fmt::print("ptprnt version: {}\n", mVersionString);
+        std::cout << "ptprnt version: " << mVersionString << std::endl;
     };
 
     // General options

src/graphics/Image.cpp

@@ -19,13 +19,23 @@
 
 #include "Image.hpp"
 
+#include <algorithm>
+#include <spdlog/spdlog.h>
+
+#include <cstddef>
+#include <iostream>  // remove me
 #include <string>
 
+#include "cairo.h"
+#include "pango/pango-context.h"
 #include "pango/pango-font.h"
+#include "pango/pango-layout.h"
+#include "pango/pango-types.h"
+#include "pango/pangocairo.h"
 
 namespace ptprnt::graphics {
 Image::Image() {
-    mSurface         = cairo_image_surface_create(CAIRO_FORMAT_A8, 512, 128);
+    /*mSurface         = cairo_image_surface_create(CAIRO_FORMAT_A8, 512, 128);
     cairo_t* cr      = cairo_create(mSurface);
     mFontDescription = pango_font_description_new();
     pango_font_description_set_family(mFontDescription, "sans");
@@ -42,7 +52,7 @@ Image::Image() {
     cairo_move_to(cr, 0.0, 94.0);
     pango_cairo_show_layout_line(cr, pango_layout_get_line(mLayout, 0));
 
-    cairo_surface_write_to_png(mSurface, "hello.png");
+    cairo_surface_write_to_png(mSurface, "hello.png");*/
 }
 
 uint8_t* Image::getRaw() {
@@ -50,8 +60,46 @@ uint8_t* Image::getRaw() {
     return cairo_image_surface_get_data(mSurface);
 }
 
+uint8_t Image::getNumLines(std::string_view strv) {
+    return std::count(strv.begin(), strv.end(), '\n');
+}
+
+void Image::createLabel(const std::string& str) {
+    // create Pango layout first, to get the render dimensions
+    mSurface    = cairo_image_surface_create(CAIRO_FORMAT_A8, 512, 128);
+    cairo_t* cr = cairo_create(mSurface);
+    //auto pangoCtx{pango_context_new()};
+    auto pangoLyt{pango_cairo_create_layout(cr)};
+    auto pangoFontDesc{pango_font_description_from_string("FreeSans 32")};
+
+    pango_layout_set_single_paragraph_mode(pangoLyt, true);
+    pango_layout_set_height(pangoLyt, getNumLines(str) * -1);
+    pango_layout_set_alignment(pangoLyt, PANGO_ALIGN_CENTER);
+    pango_layout_set_font_description(pangoLyt, pangoFontDesc);
+    pango_layout_set_text(pangoLyt, str.c_str(), static_cast<int>(str.length()));
+
+    // Debug only
+    GError* gerr{nullptr};
+    pango_layout_write_to_file(pangoLyt, PANGO_LAYOUT_SERIALIZE_DEFAULT, "hello.txt", &gerr);
+
+    // create Cairo surface from p ango layout
+    int* width{};
+    int* height{};  // TODO: change me, fixed for current printer (128px)
+    PangoRectangle* rect{};
+
+    pango_cairo_show_layout(cr, pangoLyt);
+    pango_layout_get_extents(pangoLyt, rect, rect);
+    std::cerr << "Width is: " << rect->width << " height is:" << rect->height << std::endl;
+
+    //auto cairoSfc{cairo_image_surface_create(CAIRO_FORMAT_A8, *width, *height)};
+
+    cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
+
+    // Debug only
+    cairo_surface_write_to_png(mSurface, "hellow.png");
+}
+
 Image::~Image() {
-    g_object_unref(mLayout);
+    spdlog::info("Image dtor...");
-    pango_font_description_free(mFontDescription);
 }
 }  // namespace ptprnt::graphics

src/graphics/Image.hpp

@@ -22,15 +22,30 @@
 #include <pango/pangocairo.h>
 
 #include <cstdint>
+#include <string>
 
 namespace ptprnt::graphics {
+
+constexpr const char* DEFAULT_FONT_FAMILY = "sans";
+constexpr const uint8_t DEFAULT_FONT_SIZE = 32;
+
 class Image {
    public:
     Image();
     ~Image();
+
+    Image(const Image&)            = delete;
+    Image& operator=(const Image&) = delete;
+    Image(Image&&)                 = delete;
+    Image& operator=(Image&&)      = delete;
+
     uint8_t* getRaw();
+    void createLabel(const std::string& labelText);
 
    private:
+    // methods
+    uint8_t getNumLines(std::string_view str);
+    // members
     PangoLayout* mLayout;
     PangoFontDescription* mFontDescription;
     cairo_surface_t* mSurface;

src/interface/IPrinterDriver.hpp

@@ -30,7 +30,6 @@ namespace ptprnt {
 
 class IPrinterDriver {
    public:
-    virtual ~IPrinterDriver()                                                     = default;
     virtual const std::string_view getDriverName()                                = 0;
     virtual const std::string_view getName()                                      = 0;
     virtual const std::string_view getVersion()                                   = 0;

src/libusbwrap/UsbDevice.hpp

@@ -29,8 +29,8 @@
 namespace libusbwrap {
 class UsbDevice : public IUsbDevice {
    public:
-    explicit UsbDevice(libusb_context* ctx, libusb_device* dev);
+    UsbDevice(libusb_context* ctx, libusb_device* dev);
-    ~UsbDevice() override;
+    ~UsbDevice();
 
     // delete copy ctor and assignment
     UsbDevice(const UsbDevice&)      = delete;

src/libusbwrap/interface/IUsbDevice.hpp

@@ -24,9 +24,8 @@ enum class Speed {
 
 class IUsbDevice {
    public:
-    virtual ~IUsbDevice() = default;
+    virtual bool open()  = 0;
-    virtual bool open()   = 0;
+    virtual void close() = 0;
-    virtual void close()  = 0;
 
     // libusb wrappers
     virtual bool detachKernelDriver(int interfaceNo) = 0;

src/libusbwrap/interface/IUsbDeviceFactory.hpp

@@ -9,8 +9,7 @@
 namespace libusbwrap {
 class IUsbDeviceFactory {
    public:
-    virtual ~IUsbDeviceFactory()                                      = default;
+    virtual std::vector<std::shared_ptr<IUsbDevice>> findAllDevices()                        = 0;
-    virtual std::vector<std::shared_ptr<IUsbDevice>> findAllDevices() = 0;
     virtual std::vector<std::shared_ptr<IUsbDevice>> findDevices(uint16_t vid, uint16_t pid) = 0;
 };
 }  // namespace libusbwrap