From 61c2102ab70119bad2ce76b47ac91ed69273eef2 Mon Sep 17 00:00:00 2001 From: eyck Date: Sun, 26 Jul 2020 15:07:23 +0200 Subject: [PATCH] fix ITx selection issue --- .../scviewer/database/ui/swt/internal/WaveformView.java | 8 ++++---- .../e4/application/provider/TxDbContentProvider.java | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java index 23273d2..68882c2 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java @@ -725,13 +725,13 @@ public class WaveformView implements IWaveformView { streams.add(trackEntry); } currentTxSelection = txSel; - if(trackEntry!=null) { - currentWaveformSelection.add((TrackEntry)sel); - } +// if(trackEntry!=null) { +// currentWaveformSelection.add((TrackEntry)sel); +// } selectionChanged = true; } else if (sel instanceof TrackEntry && !currentWaveformSelection.contains(sel)) { currentWaveformSelection.add((TrackEntry)sel); - if(currentTxSelection!=null) + if(currentTxSelection!=null && !selectionChanged) currentTxSelection=null; selectionChanged = true; } diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbContentProvider.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbContentProvider.java index f44493f..2a83ca2 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbContentProvider.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbContentProvider.java @@ -21,7 +21,6 @@ import com.google.common.collect.Collections2; import com.minres.scviewer.database.IHierNode; import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveformDb; -import com.minres.scviewer.e4.application.parts.LoadingWaveformDb; /** * The Class TxDbContentProvider providing the tree content of a database for the respective viewer.