From 8f585b40a52fa197e81956f3bfb5898a7712b468 Mon Sep 17 00:00:00 2001 From: Michael Carpenter Date: Tue, 18 Jun 2013 11:34:48 -0400 Subject: [PATCH] Fix for category values not being updated in QuickView properly --- src/ui/uas/UASQuickViewItemSelect.cc | 11 +++++++++-- src/ui/uas/UASQuickViewItemSelect.h | 1 + src/ui/uas/UASQuickViewTextItem.cc | 9 ++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/ui/uas/UASQuickViewItemSelect.cc b/src/ui/uas/UASQuickViewItemSelect.cc index bf3832333..6536529ca 100644 --- a/src/ui/uas/UASQuickViewItemSelect.cc +++ b/src/ui/uas/UASQuickViewItemSelect.cc @@ -35,6 +35,7 @@ void UASQuickViewItemSelect::addItem(QString item,bool enabled) ui.gridLayout->addWidget(titlelabel,0,col); } QCheckBox *label = new QCheckBox(this); + m_checkboxToValueMap[label] = item; m_checkBoxList.append(label); if (enabled) { @@ -82,13 +83,19 @@ void UASQuickViewItemSelect::checkBoxClicked(bool checked) { return; } + QString checkval = check->text(); + if (m_checkboxToValueMap.contains(check)) + { + checkval = m_checkboxToValueMap[check]; + } if (checked) { - emit valueEnabled(check->text()); + + emit valueEnabled(checkval); } else { - emit valueDisabled(check->text()); + emit valueDisabled(checkval); } } diff --git a/src/ui/uas/UASQuickViewItemSelect.h b/src/ui/uas/UASQuickViewItemSelect.h index 04174b4b7..efd769cb3 100644 --- a/src/ui/uas/UASQuickViewItemSelect.h +++ b/src/ui/uas/UASQuickViewItemSelect.h @@ -19,6 +19,7 @@ protected: void resizeEvent(QResizeEvent *event); private: QMap m_categoryToIndexMap; + QMap m_checkboxToValueMap; QList m_checkBoxList; Ui::UASQuickViewItemSelect ui; private slots: diff --git a/src/ui/uas/UASQuickViewTextItem.cc b/src/ui/uas/UASQuickViewTextItem.cc index c8fb12e86..3fbdd932d 100644 --- a/src/ui/uas/UASQuickViewTextItem.cc +++ b/src/ui/uas/UASQuickViewTextItem.cc @@ -32,7 +32,14 @@ void UASQuickViewTextItem::setValue(double value) void UASQuickViewTextItem::setTitle(QString title) { - titleLabel->setText(title); + if (title.indexOf(".") != -1 && title.indexOf(":") != -1) + { + titleLabel->setText(title.mid(title.indexOf(".")+1)); + } + else + { + titleLabel->setText(title); + } } void UASQuickViewTextItem::resizeEvent(QResizeEvent *event) { -- 2.22.0