Skip to content

Commit f4f03cd

Browse files
committed
Selecting a waveform in viewer selects net in graph view as well
1 parent 2201adf commit f4f03cd

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ All notable changes to this project will be documented in this file.
55
* added information to GUI setting file so that widgets position and size from previous session gets restored
66
* added option to focus on pin in pin context menu
77
* plugins
8-
* fixed bug in waveform viewer, make sure that deleting a controller causes closing the tab
8+
* simulation
9+
* added feature, selecting a waveform in viewer selects net in graph view as well
10+
* fixed bug in waveform viewer, make sure that deleting a controller causes closing the tab
911
* fixed broken initialization of DANA plugin when starting via CLI
1012
* changed behavior of GUI plugin manager to keep only those plugins loaded which are requested by user
1113
* fixed bug in the bitorder propagation algorithm that would assign a wrong propagation order if pingroups with direction none were given as parameters

plugins/simulator/netlist_simulator_controller/src/netlist_simulator_controller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ namespace hal
823823
{
824824
for (const SaleaeDirectoryComposedEntry& sdce : sd.get_composed_list())
825825
{
826-
sdce.dump();
826+
// sdce.dump();
827827
QVector<WaveData*> wds;
828828
for (int childKey : sdce.get_children())
829829
{

plugins/simulator/waveform_viewer/src/wave_tree_view.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <QInputDialog>
1515
#include <QMimeData>
1616
#include <QPainter>
17+
#include "gui/gui_globals.h"
1718

1819
namespace hal {
1920
WaveTreeView::WaveTreeView(WaveDataList* wdList, WaveItemHash *wHash, QWidget* parent)
@@ -517,6 +518,8 @@ namespace hal {
517518
mWaveItemHash->setSelected();
518519
for (WaveItem* wi : mWaveItemHash->values())
519520
wi->setWaveSelected(false);
521+
522+
std::vector<u32> netIds;
520523
for (const QModelIndex& inx : sortedSelection())
521524
{
522525
WaveItemIndex wii = wtm->hashIndex(inx);
@@ -527,7 +530,13 @@ namespace hal {
527530
if (!mWaveItemHash->firstSelected())
528531
mWaveItemHash->setSelected(wi);
529532
}
533+
const WaveData* wd = wi->wavedata();
534+
if (wd)
535+
{
536+
netIds.push_back(wd->id());
537+
}
530538
}
539+
if (!netIds.empty()) gGuiApi->selectNet(netIds,true,false);
531540
}
532541

533542
void WaveTreeView::orderRecursion(const QModelIndex &parent)

0 commit comments

Comments
 (0)