Generate labels with pangocairo (#8)
All checks were successful
Build ptprnt / build (push) Successful in 3m41s
All checks were successful
Build ptprnt / build (push) Successful in 3m41s
Goal of this PR is to have some basic labels generated with pangocairo - size of the canvas should be matching the input text and grow/shrink accordingly - basic formatting options like fontsize and align should be working Reviewed-on: moritz/ptouch-prnt#8
This commit was merged in pull request #8.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
ptrnt - print labels on linux
|
||||
Copyright (C) 2023 Moritz Martinius
|
||||
Copyright (C) 2023-2024 Moritz Martinius
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@@ -27,12 +27,12 @@
|
||||
#include "libusbwrap/interface/IUsbDevice.hpp"
|
||||
|
||||
namespace libusbwrap {
|
||||
UsbDevice::UsbDevice(libusb_context* ctx, libusb_device* dev) : mLibusbCtx(ctx), mLibusbDev(dev) {
|
||||
UsbDevice::UsbDevice(libusb_context* ctx, usbDevice_ptr dev) : mLibusbCtx(ctx), mLibusbDev(std::move(dev)) {
|
||||
if (mLibusbCtx == nullptr || mLibusbDev == nullptr) {
|
||||
throw std::invalid_argument("ctx or device are nullptr");
|
||||
}
|
||||
|
||||
libusb_get_device_descriptor(dev, &mLibusbDevDesc);
|
||||
libusb_get_device_descriptor(mLibusbDev.get(), &mLibusbDevDesc);
|
||||
}
|
||||
|
||||
UsbDevice::~UsbDevice() {
|
||||
@@ -44,7 +44,7 @@ UsbDevice::~UsbDevice() {
|
||||
}
|
||||
|
||||
bool UsbDevice::open() {
|
||||
int openStatus = libusb_open(mLibusbDev, &mLibusbDevHandle);
|
||||
int openStatus = libusb_open(mLibusbDev.get(), &mLibusbDevHandle);
|
||||
if (openStatus != 0) {
|
||||
mLastError = static_cast<Error>(openStatus);
|
||||
return false;
|
||||
@@ -90,13 +90,12 @@ bool UsbDevice::releaseInterface(int interfaceNo) {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UsbDevice::bulkTransfer(uint8_t endpoint, std::vector<uint8_t>& data, int* tx,
|
||||
unsigned int timeout) {
|
||||
bool UsbDevice::bulkTransfer(uint8_t endpoint, const std::vector<uint8_t>& data, int* tx, unsigned int timeout) {
|
||||
// TODO: implement error handling for incomplete transactions (tx length != data length)
|
||||
int bulkTransferStatus = 0;
|
||||
|
||||
bulkTransferStatus =
|
||||
libusb_bulk_transfer(mLibusbDevHandle, endpoint, data.data(), data.size(), tx, timeout);
|
||||
bulkTransferStatus = libusb_bulk_transfer(mLibusbDevHandle, endpoint, const_cast<unsigned char*>(data.data()),
|
||||
data.size(), tx, timeout);
|
||||
if (bulkTransferStatus != 0) {
|
||||
mLastError = static_cast<Error>(bulkTransferStatus);
|
||||
return false;
|
||||
@@ -109,15 +108,15 @@ const usbId UsbDevice::getUsbId() {
|
||||
}
|
||||
|
||||
const device::Speed UsbDevice::getSpeed() {
|
||||
return static_cast<device::Speed>(libusb_get_device_speed(mLibusbDev));
|
||||
return static_cast<device::Speed>(libusb_get_device_speed(mLibusbDev.get()));
|
||||
}
|
||||
|
||||
const uint8_t UsbDevice::getBusNumber() {
|
||||
return libusb_get_bus_number(mLibusbDev);
|
||||
return libusb_get_bus_number(mLibusbDev.get());
|
||||
}
|
||||
|
||||
const uint8_t UsbDevice::getPortNumber() {
|
||||
return libusb_get_port_number(mLibusbDev);
|
||||
return libusb_get_port_number(mLibusbDev.get());
|
||||
}
|
||||
|
||||
const Error UsbDevice::getLastError() {
|
||||
|
||||
Reference in New Issue
Block a user