Browse Source

Fix for category values not being updated in QuickView properly

QGC4.4
Michael Carpenter 12 years ago
parent
commit
8f585b40a5
  1. 11
      src/ui/uas/UASQuickViewItemSelect.cc
  2. 1
      src/ui/uas/UASQuickViewItemSelect.h
  3. 7
      src/ui/uas/UASQuickViewTextItem.cc

11
src/ui/uas/UASQuickViewItemSelect.cc

@ -35,6 +35,7 @@ void UASQuickViewItemSelect::addItem(QString item,bool enabled)
ui.gridLayout->addWidget(titlelabel,0,col); ui.gridLayout->addWidget(titlelabel,0,col);
} }
QCheckBox *label = new QCheckBox(this); QCheckBox *label = new QCheckBox(this);
m_checkboxToValueMap[label] = item;
m_checkBoxList.append(label); m_checkBoxList.append(label);
if (enabled) if (enabled)
{ {
@ -82,13 +83,19 @@ void UASQuickViewItemSelect::checkBoxClicked(bool checked)
{ {
return; return;
} }
QString checkval = check->text();
if (m_checkboxToValueMap.contains(check))
{
checkval = m_checkboxToValueMap[check];
}
if (checked) if (checked)
{ {
emit valueEnabled(check->text());
emit valueEnabled(checkval);
} }
else else
{ {
emit valueDisabled(check->text()); emit valueDisabled(checkval);
} }
} }

1
src/ui/uas/UASQuickViewItemSelect.h

@ -19,6 +19,7 @@ protected:
void resizeEvent(QResizeEvent *event); void resizeEvent(QResizeEvent *event);
private: private:
QMap<QString,int> m_categoryToIndexMap; QMap<QString,int> m_categoryToIndexMap;
QMap<QCheckBox*,QString> m_checkboxToValueMap;
QList<QCheckBox*> m_checkBoxList; QList<QCheckBox*> m_checkBoxList;
Ui::UASQuickViewItemSelect ui; Ui::UASQuickViewItemSelect ui;
private slots: private slots:

7
src/ui/uas/UASQuickViewTextItem.cc

@ -32,7 +32,14 @@ void UASQuickViewTextItem::setValue(double value)
void UASQuickViewTextItem::setTitle(QString title) void UASQuickViewTextItem::setTitle(QString title)
{ {
if (title.indexOf(".") != -1 && title.indexOf(":") != -1)
{
titleLabel->setText(title.mid(title.indexOf(".")+1));
}
else
{
titleLabel->setText(title); titleLabel->setText(title);
}
} }
void UASQuickViewTextItem::resizeEvent(QResizeEvent *event) void UASQuickViewTextItem::resizeEvent(QResizeEvent *event)
{ {

Loading…
Cancel
Save