Goal of this PR should be to integrate a working CLI parser so that commands can be sent to the Printer class to print text, such as ptprnt -t=FooBar also, standard flags for setting the output verbosity and help should be implemented Reviewed-on: #4
This commit is contained in:
@@ -19,30 +19,54 @@
|
||||
|
||||
#include "PtouchPrint.hpp"
|
||||
|
||||
#include <CLI/App.hpp>
|
||||
#include <spdlog/common.h>
|
||||
#include <spdlog/spdlog.h>
|
||||
|
||||
#include <functional>
|
||||
|
||||
#include "CLI/Option.hpp"
|
||||
#include "P700Printer.hpp"
|
||||
#include "graphics/Bitmap.hpp"
|
||||
#include "libusbwrap/UsbDeviceFactory.hpp"
|
||||
|
||||
PtouchPrint::PtouchPrint() {}
|
||||
namespace ptprnt {
|
||||
|
||||
PtouchPrint::~PtouchPrint() {}
|
||||
PtouchPrint::PtouchPrint(const char* versionString) : mVersionString{versionString} {}
|
||||
|
||||
void PtouchPrint::init() {
|
||||
mUsbDeviceFactory.init();
|
||||
int PtouchPrint::init(int argc, char** argv) {
|
||||
setupCliParser();
|
||||
|
||||
try {
|
||||
mApp.parse(argc, argv);
|
||||
} catch (const CLI::ParseError& e) {
|
||||
mApp.exit(e);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (mVerboseFlag) {
|
||||
setupLogger(spdlog::level::trace);
|
||||
} else {
|
||||
setupLogger(spdlog::level::critical);
|
||||
}
|
||||
|
||||
if (!mUsbDeviceFactory.init()) {
|
||||
spdlog::error("Could not initialize libusb");
|
||||
return -1;
|
||||
}
|
||||
mCompatiblePrinters = {std::make_shared<ptprnt::printer::P700Printer>()};
|
||||
return 0;
|
||||
}
|
||||
|
||||
void PtouchPrint::run() {
|
||||
int PtouchPrint::run() {
|
||||
auto numFoundPrinters = getCompatiblePrinters();
|
||||
if (numFoundPrinters == 0) {
|
||||
spdlog::error(
|
||||
"No compatible printers found, please make sure if they are turned on and connected");
|
||||
return;
|
||||
return -1;
|
||||
} else if (numFoundPrinters > 1) {
|
||||
spdlog::warn("Found more than one compatible printer. Currently not supported.");
|
||||
return;
|
||||
return -1;
|
||||
}
|
||||
|
||||
auto printer = mCompatiblePrinters[0];
|
||||
@@ -50,14 +74,20 @@ void PtouchPrint::run() {
|
||||
if (devices.size() != 1) {
|
||||
spdlog::warn(
|
||||
"Found more than one device of the same printer on bus. Currently not supported");
|
||||
return;
|
||||
return -1;
|
||||
}
|
||||
printer->attachUsbDevice(devices[0]);
|
||||
auto status = printer->getPrinterStatus();
|
||||
spdlog::info("Detected tape width is {}mm", status.tapeWidthMm);
|
||||
auto bm = ptprnt::graphics::Bitmap<ptprnt::graphics::ALPHA8>(512, 128);
|
||||
printer->printBitmap(bm);
|
||||
//printer->printBitmap(bm);
|
||||
//printer->printText("wurst", 1);
|
||||
|
||||
for (auto& cmd : mCommands) {
|
||||
std::cout << cmd.second << std::endl;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
unsigned int PtouchPrint::getCompatiblePrinters() {
|
||||
@@ -81,3 +111,52 @@ unsigned int PtouchPrint::getCompatiblePrinters() {
|
||||
mCompatiblePrinters.clear();
|
||||
return mDetectedPrinters.size();
|
||||
}
|
||||
|
||||
void PtouchPrint::setupLogger(spdlog::level::level_enum lvl) {
|
||||
spdlog::set_level(lvl);
|
||||
spdlog::debug("Starting ptprnt {}", mVersionString);
|
||||
}
|
||||
|
||||
void PtouchPrint::setupCliParser() {
|
||||
auto printVersion = [this](std::size_t) {
|
||||
std::cout << "ptprnt version: " << mVersionString << std::endl;
|
||||
};
|
||||
|
||||
// General options
|
||||
mApp.add_flag("-v,--verbose", mVerboseFlag, "Enable verbose output");
|
||||
mApp.add_flag("-V,--version", printVersion, "Prints the ptprnt's version");
|
||||
|
||||
// Text printing options
|
||||
mApp.add_option("-t,--text",
|
||||
"Text to print (can be used multple times, use formatting options before to "
|
||||
"influence text layout)")
|
||||
->group("Printing")
|
||||
->multi_option_policy(CLI::MultiOptionPolicy::TakeAll)
|
||||
->trigger_on_parse()
|
||||
->each([this](std::string text) { mCommands.emplace_back(CliCmdType::Text, text); });
|
||||
mApp.add_option("-f,--font", "Font used for the following text occurences")
|
||||
->group("Text printing ")
|
||||
->multi_option_policy(CLI::MultiOptionPolicy::TakeAll)
|
||||
->trigger_on_parse()
|
||||
->each([this](std::string font) { mCommands.emplace_back(CliCmdType::Font, font); });
|
||||
mApp.add_option("-s,--fontsize", "Font size of the following text occurences")
|
||||
->group("Text printing ")
|
||||
->multi_option_policy(CLI::MultiOptionPolicy::TakeAll)
|
||||
->trigger_on_parse()
|
||||
->each([this](std::string size) { mCommands.emplace_back(CliCmdType::FontSize, size); });
|
||||
mApp.add_option("--valign", "Vertical alignment of the following text occurences")
|
||||
->group("Text printing ")
|
||||
->multi_option_policy(CLI::MultiOptionPolicy::TakeAll)
|
||||
->trigger_on_parse()
|
||||
->each([this](std::string valign) { mCommands.emplace_back(CliCmdType::VAlign, valign); });
|
||||
mApp.add_option("--halign", "Vertical alignment of the following text occurences")
|
||||
->group("Text printing ")
|
||||
->multi_option_policy(CLI::MultiOptionPolicy::TakeAll)
|
||||
->trigger_on_parse()
|
||||
->each([this](std::string halign) { mCommands.emplace_back(CliCmdType::HAlign, halign); });
|
||||
|
||||
// Image options
|
||||
mApp.add_option("-i,--image", "Image to print. Excludes all text printing ")
|
||||
->group("Image printing");
|
||||
}
|
||||
} // namespace ptprnt
|
Reference in New Issue
Block a user