From 15b15d03c5db7f47c052a8f14e7060e6b3681503 Mon Sep 17 00:00:00 2001 From: Levi Armstrong Date: Mon, 5 Aug 2024 10:32:48 -0500 Subject: [PATCH] Add long and unsigned long support --- .../common/models/standard_item_utils.h | 6 ++++-- common/src/models/standard_item_utils.cpp | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/common/include/tesseract_qt/common/models/standard_item_utils.h b/common/include/tesseract_qt/common/models/standard_item_utils.h index 26d5e56c..39bfd3db 100644 --- a/common/include/tesseract_qt/common/models/standard_item_utils.h +++ b/common/include/tesseract_qt/common/models/standard_item_utils.h @@ -37,8 +37,10 @@ class NamespaceStandardItem; QList createStandardItemFloat(const std::string& text, double data); QList createStandardItemFloat(const QIcon& icon, const std::string& text, double data); -QList createStandardItemInt(const std::string& text, int data); -QList createStandardItemInt(const QIcon& icon, const std::string& text, int data); +QList createStandardItemInt(const std::string& text, long data); +QList createStandardItemInt(const QIcon& icon, const std::string& text, long data); +QList createStandardItemUnsigned(const std::string& text, unsigned long data); +QList createStandardItemUnsigned(const QIcon& icon, const std::string& text, unsigned long data); QList createStandardItemString(const std::string& text, const std::string& data); QList createStandardItemString(const QIcon& icon, const std::string& text, const std::string& data); QList createStandardItemURL(const std::string& text, const std::string& data); diff --git a/common/src/models/standard_item_utils.cpp b/common/src/models/standard_item_utils.cpp index e1b28640..6f01b393 100644 --- a/common/src/models/standard_item_utils.cpp +++ b/common/src/models/standard_item_utils.cpp @@ -45,16 +45,29 @@ QList createStandardItemFloat(const QIcon& icon, const std::stri return { name, value }; } -QList createStandardItemInt(const std::string& text, int data) +QList createStandardItemInt(const std::string& text, long data) { return createStandardItemInt(icons::getNumericIcon(), text, data); } -QList createStandardItemInt(const QIcon& icon, const std::string& text, int data) +QList createStandardItemInt(const QIcon& icon, const std::string& text, long data) { auto* name = new QStandardItem(icon, QString::fromStdString(text)); auto* value = new QStandardItem(); // NOLINT - value->setData(data, Qt::DisplayRole); + value->setData(static_cast(data), Qt::DisplayRole); + return { name, value }; +} + +QList createStandardItemUnsigned(const std::string& text, unsigned long data) +{ + return createStandardItemUnsigned(icons::getNumericIcon(), text, data); +} + +QList createStandardItemUnsigned(const QIcon& icon, const std::string& text, unsigned long data) +{ + auto* name = new QStandardItem(icon, QString::fromStdString(text)); + auto* value = new QStandardItem(); // NOLINT + value->setData(static_cast(data), Qt::DisplayRole); return { name, value }; }