From 65615e2bcfb2ec4ece009ed773966eb5046bba6b Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Wed, 3 May 2023 00:21:08 -0500 Subject: [PATCH] Use string get functions in the Qt UI --- qt/DeviceView.cpp | 22 +++++++++---------- .../OpenRGBDeviceInfoPage.cpp | 12 +++++----- qt/OpenRGBDevicePage/OpenRGBDevicePage.cpp | 6 ++--- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/qt/DeviceView.cpp b/qt/DeviceView.cpp index 7d4497f6..758bdf97 100644 --- a/qt/DeviceView.cpp +++ b/qt/DeviceView.cpp @@ -388,18 +388,18 @@ void DeviceView::InitDeviceView() \*-----------------------------------------------------*/ if(led_x < map->width - 1 && map->map[map_idx + 1] == 0xFFFFFFFF) { - if( ( controller->leds[color_idx].name == KEY_EN_TAB ) - || ( controller->leds[color_idx].name == KEY_EN_CAPS_LOCK ) - || ( controller->leds[color_idx].name == KEY_EN_LEFT_SHIFT ) - || ( controller->leds[color_idx].name == KEY_EN_RIGHT_SHIFT) - || ( controller->leds[color_idx].name == KEY_EN_BACKSPACE ) - || ( controller->leds[color_idx].name == KEY_EN_NUMPAD_0 ) ) + if( ( controller->GetLEDName(color_idx) == KEY_EN_TAB ) + || ( controller->GetLEDName(color_idx) == KEY_EN_CAPS_LOCK ) + || ( controller->GetLEDName(color_idx) == KEY_EN_LEFT_SHIFT ) + || ( controller->GetLEDName(color_idx) == KEY_EN_RIGHT_SHIFT) + || ( controller->GetLEDName(color_idx) == KEY_EN_BACKSPACE ) + || ( controller->GetLEDName(color_idx) == KEY_EN_NUMPAD_0 ) ) { led_pos[color_idx].matrix_w += 1.0f; } } - if( ( controller->leds[color_idx].name == KEY_EN_NUMPAD_ENTER ) - || ( controller->leds[color_idx].name == KEY_EN_NUMPAD_PLUS ) ) + if( ( controller->GetLEDName(color_idx) == KEY_EN_NUMPAD_ENTER ) + || ( controller->GetLEDName(color_idx) == KEY_EN_NUMPAD_PLUS ) ) { if(led_y < map->height - 1 && map->map[map_idx + map->width] == 0xFFFFFFFF) { @@ -412,7 +412,7 @@ void DeviceView::InitDeviceView() led_pos[color_idx].matrix_h += 1.0f; } } - else if(controller->leds[color_idx].name == KEY_EN_SPACE) + else if(controller->GetLEDName(color_idx) == KEY_EN_SPACE) { for(unsigned int map_idx2 = map_idx - 1; map_idx2 > led_y * map->width && map->map[map_idx2] == 0xFFFFFFFF; map_idx2--) { @@ -498,7 +498,7 @@ void DeviceView::InitDeviceView() \*-----------------------------------------------------*/ for(std::size_t led_idx = 0; led_idx < controller->leds.size(); led_idx++) { - std::map::const_iterator it = led_label_lookup.find(controller->leds[led_idx].name); + std::map::const_iterator it = led_label_lookup.find(controller->GetLEDName(led_idx)); if(it != led_label_lookup.end()) { @@ -824,7 +824,7 @@ void DeviceView::paintEvent(QPaintEvent* /* event */) { painter.setPen(palette().windowText().color()); } - painter.drawText(posx, posy + posh, QString(controller->zones[zone_idx].name.c_str())); + painter.drawText(posx, posy + posh, QString(controller->GetZoneName(zone_idx).c_str())); for(std::size_t segment_idx = 0; segment_idx < controller->zones[zone_idx].segments.size(); segment_idx++) { diff --git a/qt/OpenRGBDeviceInfoPage/OpenRGBDeviceInfoPage.cpp b/qt/OpenRGBDeviceInfoPage/OpenRGBDeviceInfoPage.cpp index 0d213b2b..2c73fd0d 100644 --- a/qt/OpenRGBDeviceInfoPage/OpenRGBDeviceInfoPage.cpp +++ b/qt/OpenRGBDeviceInfoPage/OpenRGBDeviceInfoPage.cpp @@ -21,12 +21,12 @@ OpenRGBDeviceInfoPage::OpenRGBDeviceInfoPage(RGBController *dev, QWidget *parent ui->TypeValue->setText(device_type_to_str(dev->type).c_str()); - ui->NameValue->setText(QString::fromStdString(dev->name)); - ui->VendorValue->setText(QString::fromStdString(dev->vendor)); - ui->DescriptionValue->setText(QString::fromStdString(dev->description)); - ui->VersionValue->setText(QString::fromStdString(dev->version)); - ui->LocationValue->setText(QString::fromStdString(dev->location)); - ui->SerialValue->setText(QString::fromStdString(dev->serial)); + ui->NameValue->setText(QString::fromStdString(dev->GetName())); + ui->VendorValue->setText(QString::fromStdString(dev->GetVendor())); + ui->DescriptionValue->setText(QString::fromStdString(dev->GetDescription())); + ui->VersionValue->setText(QString::fromStdString(dev->GetVersion())); + ui->LocationValue->setText(QString::fromStdString(dev->GetLocation())); + ui->SerialValue->setText(QString::fromStdString(dev->GetSerial())); } OpenRGBDeviceInfoPage::~OpenRGBDeviceInfoPage() diff --git a/qt/OpenRGBDevicePage/OpenRGBDevicePage.cpp b/qt/OpenRGBDevicePage/OpenRGBDevicePage.cpp index f932478b..f6f73933 100644 --- a/qt/OpenRGBDevicePage/OpenRGBDevicePage.cpp +++ b/qt/OpenRGBDevicePage/OpenRGBDevicePage.cpp @@ -116,7 +116,7 @@ OpenRGBDevicePage::OpenRGBDevicePage(RGBController *dev, QWidget *parent) : for(std::size_t i = 0; i < device->modes.size(); i++) { - ui->ModeBox->addItem(device->modes[i].name.c_str()); + ui->ModeBox->addItem(device->GetModeName(i).c_str()); ui->ModeBox->setItemData((int)i, ModeDescription(device->modes[i]), Qt::ToolTipRole); } @@ -285,7 +285,7 @@ void Ui::OpenRGBDevicePage::on_ZoneBox_currentIndexChanged(int index) \*-------------------------------------*/ for(std::size_t i = 0; i < device->leds.size(); i++) { - ui->LEDBox->addItem(device->leds[i].name.c_str()); + ui->LEDBox->addItem(device->GetLEDName(i).c_str()); } /*-------------------------------------*\ @@ -1062,7 +1062,7 @@ void Ui::OpenRGBDevicePage::UpdateModeUi() for(std::size_t zone_idx = 0; zone_idx < device->zones.size(); zone_idx++) { - ui->ZoneBox->addItem(device->zones[zone_idx].name.c_str()); + ui->ZoneBox->addItem(device->GetZoneName(zone_idx).c_str()); for(std::size_t segment_idx = 0; segment_idx < device->zones[zone_idx].segments.size(); segment_idx++) {