From 03f92948d1504c32049da065c0e73e01f96d8033 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Thu, 26 Jul 2018 17:14:56 +0200 Subject: clangformat and GraphicElement::style comments Signed-off-by: Clifford Wolf --- gui/designwidget.cc | 14 ++++++-------- gui/designwidget.h | 2 +- gui/fpgaviewwidget.h | 1 + 3 files changed, 8 insertions(+), 9 deletions(-) (limited to 'gui') diff --git a/gui/designwidget.cc b/gui/designwidget.cc index 4086fd63..2bba8532 100644 --- a/gui/designwidget.cc +++ b/gui/designwidget.cc @@ -777,18 +777,16 @@ std::vector DesignWidget::getDecals(ElementType type, IdString value) return decals; } -void DesignWidget::updateHighlightGroup(QList items, int group) +void DesignWidget::updateHighlightGroup(QList items, int group) { const bool shouldClear = items.size() == 1; for (auto item : items) { if (highlightSelected.contains(item)) { if (shouldClear && highlightSelected[item] == group) { highlightSelected.remove(item); - } - else + } else highlightSelected[item] = group; - } - else + } else highlightSelected.insert(item, group); } std::vector decals[8]; @@ -799,14 +797,14 @@ void DesignWidget::updateHighlightGroup(QList items, int group std::vector d = getDecals(type, value); std::move(d.begin(), d.end(), std::back_inserter(decals[it.second])); } - for (int i=0;i<8;i++) + for (int i = 0; i < 8; i++) Q_EMIT highlight(decals[i], i); } void DesignWidget::prepareMenuProperty(const QPoint &pos) { QTreeWidget *tree = propertyEditor->treeWidget(); - QList items; + QList items; for (auto itemContextMenu : tree->selectedItems()) { QtBrowserItem *browserItem = propertyEditor->itemToBrowserItem(itemContextMenu); if (!browserItem) @@ -848,7 +846,7 @@ void DesignWidget::prepareMenuTree(const QPoint &pos) if (treeWidget->selectedItems().size() == 0) return; int selectedIndex = -1; - QList items = treeWidget->selectedItems(); + QList items = treeWidget->selectedItems(); if (treeWidget->selectedItems().size() == 1) { QTreeWidgetItem *item = treeWidget->selectedItems().at(0); if (highlightSelected.contains(item)) diff --git a/gui/designwidget.h b/gui/designwidget.h index fe340237..6d4b7fe1 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(QList item, int group); + void updateHighlightGroup(QList item, int group); Q_SIGNALS: void info(std::string text); void selected(std::vector decal); diff --git a/gui/fpgaviewwidget.h b/gui/fpgaviewwidget.h index 636d5672..36d4a3f2 100644 --- a/gui/fpgaviewwidget.h +++ b/gui/fpgaviewwidget.h @@ -296,6 +296,7 @@ class FPGAViewWidget : public QOpenGLWidget, protected QOpenGLFunctions void zoom_out(); void zoom_selected(); void zoom_outbound(); + private: void renderLines(void); void zoom(int level); -- cgit v1.2.3