Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr into treemodel

3 files changed, 6 insertions, 2 deletions

diff --git a/gui/basewindow.cc b/gui/basewindow.cc
index 6e997011..6d5e97f5 100644
--- a/gui/basewindow.cc
+++ b/gui/basewindow.cc
@@ -86,6 +86,7 @@ BaseMainWindow::BaseMainWindow(std::unique_ptr<Context> context, QWidget *parent
     connect(fpgaView, SIGNAL(clickedBel(BelId, bool)), designview, SLOT(onClickedBel(BelId, bool)));

     connect(fpgaView, SIGNAL(clickedWire(WireId, bool)), designview, SLOT(onClickedWire(WireId, bool)));

     connect(fpgaView, SIGNAL(clickedPip(PipId, bool)), designview, SLOT(onClickedPip(PipId, bool)));

+    connect(designview, SIGNAL(zoomSelected()), fpgaView, SLOT(zoomSelected()));

 

     connect(designview, SIGNAL(highlight(std::vector<DecalXY>, int)), fpgaView,

             SLOT(onHighlightGroupChanged(std::vector<DecalXY>, int)));

diff --git a/gui/designwidget.cc b/gui/designwidget.cc
index 0f01b3c5..5107fbee 100644
--- a/gui/designwidget.cc
+++ b/gui/designwidget.cc
@@ -158,8 +158,8 @@ DesignWidget::DesignWidget(QWidget *parent) : QWidget(parent), ctx(nullptr), sel
             &DesignWidget::prepareMenuProperty);

     connect(propertyEditor->treeWidget(), &QTreeWidget::itemDoubleClicked, this, &DesignWidget::onItemDoubleClicked);

 

-    connect(treeView, &QTreeWidget::customContextMenuRequested, this, &DesignWidget::prepareMenuTree);

-

+    connect(treeView, &QTreeView::customContextMenuRequested, this, &DesignWidget::prepareMenuTree);

+    connect(treeView, &QTreeView::doubleClicked, this, &DesignWidget::onDoubleClicked);

     selectionModel = treeView->selectionModel();

     connect(selectionModel, SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),

             SLOT(onSelectionChanged(const QItemSelection &, const QItemSelection &)));

@@ -713,4 +713,5 @@ void DesignWidget::onItemDoubleClicked(QTreeWidgetItem *item, int column)
         selectionModel->setCurrentIndex(treeModel->indexFromNode(it), QItemSelectionModel::ClearAndSelect);

 }

 

+void DesignWidget::onDoubleClicked(const QModelIndex &index) { Q_EMIT zoomSelected(); }

 NEXTPNR_NAMESPACE_END

diff --git a/gui/designwidget.h b/gui/designwidget.h
index bbd188cd..27ead589 100644
--- a/gui/designwidget.h
+++ b/gui/designwidget.h
@@ -56,12 +56,14 @@ class DesignWidget : public QWidget
     void info(std::string text);

     void selected(std::vector<DecalXY> decal, bool keep);

     void highlight(std::vector<DecalXY> decal, int group);

+    void zoomSelected();

 

   private Q_SLOTS:

     void prepareMenuProperty(const QPoint &pos);

     void prepareMenuTree(const QPoint &pos);

     void onSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);

     void onItemDoubleClicked(QTreeWidgetItem *item, int column);

+    void onDoubleClicked(const QModelIndex &index);

   public Q_SLOTS:

     void newContext(Context *ctx);

     void updateTree();