aboutsummaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2018-07-26 17:14:56 +0200
committerClifford Wolf <clifford@clifford.at>2018-07-26 17:14:56 +0200
commit03f92948d1504c32049da065c0e73e01f96d8033 (patch)
treee519616846f5e8079ba8d75aeadc3f516817311b /gui
parentdb7edbf0b3bbbf96d46dc082d5c82dd5ebbf460f (diff)
downloadnextpnr-03f92948d1504c32049da065c0e73e01f96d8033.tar.gz
nextpnr-03f92948d1504c32049da065c0e73e01f96d8033.tar.bz2
nextpnr-03f92948d1504c32049da065c0e73e01f96d8033.zip
clangformat and GraphicElement::style comments
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Diffstat (limited to 'gui')
-rw-r--r--gui/designwidget.cc14
-rw-r--r--gui/designwidget.h2
-rw-r--r--gui/fpgaviewwidget.h1
3 files changed, 8 insertions, 9 deletions
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<DecalXY> DesignWidget::getDecals(ElementType type, IdString value)
return decals;
}
-void DesignWidget::updateHighlightGroup(QList<QTreeWidgetItem*> items, int group)
+void DesignWidget::updateHighlightGroup(QList<QTreeWidgetItem *> 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<DecalXY> decals[8];
@@ -799,14 +797,14 @@ void DesignWidget::updateHighlightGroup(QList<QTreeWidgetItem*> items, int group
std::vector<DecalXY> 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<QTreeWidgetItem*> items;
+ QList<QTreeWidgetItem *> 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<QTreeWidgetItem*> items = treeWidget->selectedItems();
+ QList<QTreeWidgetItem *> 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<DecalXY> getDecals(ElementType type, IdString value);
- void updateHighlightGroup(QList<QTreeWidgetItem*> item, int group);
+ void updateHighlightGroup(QList<QTreeWidgetItem *> item, int group);
Q_SIGNALS:
void info(std::string text);
void selected(std::vector<DecalXY> 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);