From c9b9d9b22754778beaa1a922f0df3dac42dd8867 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 26 Jul 2018 11:42:05 +0200 Subject: [PATCH] highlight operation on multiple items --- gui/designwidget.cc | 104 ++++++++++++++++++++++---------------------- gui/designwidget.h | 3 +- 2 files changed, 52 insertions(+), 55 deletions(-) diff --git a/gui/designwidget.cc b/gui/designwidget.cc index c17990a5..f9d231c1 100644 --- a/gui/designwidget.cc +++ b/gui/designwidget.cc @@ -775,54 +775,55 @@ std::vector DesignWidget::getDecals(ElementType type, IdString value) return decals; } -void DesignWidget::updateHighlightGroup(QTreeWidgetItem *item, int group) +void DesignWidget::updateHighlightGroup(QList items, int group) { - if (highlightSelected.contains(item)) { - if (highlightSelected[item] == group) { - highlightSelected.remove(item); - } else - highlightSelected[item] = group; - } else - highlightSelected.insert(item, group); - - std::vector decals; + const bool shouldClear = items.size() == 1; + for (auto item : items) { + if (highlightSelected.contains(item)) { + if (shouldClear && highlightSelected[item] == group) { + highlightSelected.remove(item); + } + else + highlightSelected[item] = group; + } + else + highlightSelected.insert(item, group); + } + std::vector decals[8]; for (auto it : highlightSelected.toStdMap()) { - if (it.second == group) { - ElementType type = static_cast(it.first)->getType(); - IdString value = static_cast(it.first)->getData(); - std::vector d = getDecals(type, value); - std::move(d.begin(), d.end(), std::back_inserter(decals)); - } + ElementType type = static_cast(it.first)->getType(); + IdString value = static_cast(it.first)->getData(); + std::vector d = getDecals(type, value); + std::move(d.begin(), d.end(), std::back_inserter(decals[it.second])); } - - Q_EMIT highlight(decals, group); + for (int i=0;i<8;i++) + Q_EMIT highlight(decals[i], i); } void DesignWidget::prepareMenuProperty(const QPoint &pos) { QTreeWidget *tree = propertyEditor->treeWidget(); - - itemContextMenu = tree->itemAt(pos); - if (itemContextMenu->parent() == nullptr) - return; - - QtBrowserItem *browserItem = propertyEditor->itemToBrowserItem(itemContextMenu); - if (!browserItem) - return; - QtProperty *selectedProperty = browserItem->property(); - ElementType type = getElementTypeByName(selectedProperty->propertyId()); - if (type == ElementType::NONE) - return; - IdString value = ctx->id(selectedProperty->valueText().toStdString()); - - QTreeWidgetItem *item = nameToItem[getElementIndex(type)].value(value.c_str(ctx)); + QList items; + for (auto itemContextMenu : tree->selectedItems()) { + QtBrowserItem *browserItem = propertyEditor->itemToBrowserItem(itemContextMenu); + if (!browserItem) + continue; + QtProperty *selectedProperty = browserItem->property(); + ElementType type = getElementTypeByName(selectedProperty->propertyId()); + if (type == ElementType::NONE) + continue; + IdString value = ctx->id(selectedProperty->valueText().toStdString()); + items.append(nameToItem[getElementIndex(type)].value(value.c_str(ctx))); + } + int selectedIndex = -1; + if (items.size() == 1) { + QTreeWidgetItem *item = items.at(0); + if (highlightSelected.contains(item)) + selectedIndex = highlightSelected[item]; + } QMenu menu(this); - QAction *selectAction = new QAction("&Select", this); - connect(selectAction, &QAction::triggered, this, [this, type, value] { Q_EMIT selected(getDecals(type, value)); }); - menu.addAction(selectAction); - QMenu *subMenu = menu.addMenu("Highlight"); QActionGroup *group = new QActionGroup(this); group->setExclusive(true); @@ -833,27 +834,24 @@ void DesignWidget::prepareMenuProperty(const QPoint &pos) action->setCheckable(true); subMenu->addAction(action); group->addAction(action); - if (highlightSelected.contains(item) && highlightSelected[item] == i) + if (selectedIndex == i) action->setChecked(true); - connect(action, &QAction::triggered, this, [this, i, item] { updateHighlightGroup(item, i); }); + connect(action, &QAction::triggered, this, [this, i, items] { updateHighlightGroup(items, i); }); } menu.exec(tree->mapToGlobal(pos)); } void DesignWidget::prepareMenuTree(const QPoint &pos) { - QTreeWidget *tree = treeWidget; - - itemContextMenu = tree->itemAt(pos); - - ElementType type = static_cast(itemContextMenu)->getType(); - IdString value = static_cast(itemContextMenu)->getData(); - - if (type == ElementType::NONE) + if (treeWidget->selectedItems().size() == 0) return; - - QTreeWidgetItem *item = nameToItem[getElementIndex(type)].value(value.c_str(ctx)); - + int selectedIndex = -1; + QList items = treeWidget->selectedItems(); + if (treeWidget->selectedItems().size() == 1) { + QTreeWidgetItem *item = treeWidget->selectedItems().at(0); + if (highlightSelected.contains(item)) + selectedIndex = highlightSelected[item]; + } QMenu menu(this); QMenu *subMenu = menu.addMenu("Highlight"); QActionGroup *group = new QActionGroup(this); @@ -865,11 +863,11 @@ void DesignWidget::prepareMenuTree(const QPoint &pos) action->setCheckable(true); subMenu->addAction(action); group->addAction(action); - if (highlightSelected.contains(item) && highlightSelected[item] == i) + if (selectedIndex == i) action->setChecked(true); - connect(action, &QAction::triggered, this, [this, i, item] { updateHighlightGroup(item, i); }); + connect(action, &QAction::triggered, this, [this, i, items] { updateHighlightGroup(items, i); }); } - menu.exec(tree->mapToGlobal(pos)); + menu.exec(treeWidget->mapToGlobal(pos)); } void DesignWidget::onItemDoubleClicked(QTreeWidgetItem *item, int column) diff --git a/gui/designwidget.h b/gui/designwidget.h index b5877f60..fe340237 100644 --- a/gui/designwidget.h +++ b/gui/designwidget.h @@ -60,7 +60,7 @@ class DesignWidget : public QWidget void updateButtons(); void addToHistory(QTreeWidgetItem *item); std::vector getDecals(ElementType type, IdString value); - void updateHighlightGroup(QTreeWidgetItem *item, int group); + void updateHighlightGroup(QList item, int group); Q_SIGNALS: void info(std::string text); void selected(std::vector decal); @@ -85,7 +85,6 @@ class DesignWidget : public QWidget QtGroupPropertyManager *groupManager; QtVariantEditorFactory *variantFactory; QtTreePropertyBrowser *propertyEditor; - QTreeWidgetItem *itemContextMenu; QMap propertyToId; QMap idToProperty;