Merge branch 'release/2.7.0'

fix wrongly shown signals and streams in table
update version numbers
2020-07-15 22:08:05 +02:00 · 2020-07-15 21:58:49 +02:00 · 2020-07-15 21:48:41 +02:00 · 2020-07-15 21:43:07 +02:00 · 2020-07-15 21:42:10 +02:00 · 2020-07-15 21:39:30 +02:00
56 changed files with 393 additions and 386 deletions
--- a/com.minres.scviewer.e4.product/pom.xml
+++ b/com.minres.scviewer.e4.product/pom.xml
@ -10,7 +10,7 @@
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product</artifactId>
-  	<version>2.6.1-SNAPSHOT</version>
+  	<version>2.7.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<groupId>com.minres.scviewer</groupId>
 	<build>
--- a/com.minres.scviewer.e4.product/scviewer.product
+++ b/com.minres.scviewer.e4.product/scviewer.product
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>

-<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.6.1.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.7.0.qualifier" useFeatures="true" includeLaunchers="true">

   <configIni use="default">
   </configIni>
@ -17,7 +17,6 @@

   <windowImages/>

-
   <launcher name="scviewer">
      <linux icon="icons/SCViewer_512x512.xpm"/>
      <macosx icon="icons/SCViewer.icns"/>
--- a/features/com.minres.scviewer.database.feature/feature.xml
+++ b/features/com.minres.scviewer.database.feature/feature.xml
@ -29,26 +29,12 @@ http://www.eclipse.org/legal/epl-v10.html
   </url>

   <requires>
+      <import plugin="org.codehaus.groovy" version="2.5.8" match="greaterOrEqual"/>
      <import plugin="org.eclipse.osgi.services" version="3.4.0" match="greaterOrEqual"/>
      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
      <import plugin="org.eclipse.osgi"/>
      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views.properties.tabbed"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.swt" version="3.103.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.registry"/>
-      <import plugin="org.codehaus.groovy" version="2.5.8" match="greaterOrEqual"/>
-      <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
   </requires>

   <plugin
--- a/features/com.minres.scviewer.e4.feature/feature.xml
+++ b/features/com.minres.scviewer.e4.feature/feature.xml
@ -41,7 +41,6 @@
      <import plugin="org.eclipse.e4.ui.di" version="1.1.0" match="greaterOrEqual"/>
      <import plugin="org.eclipse.e4.core.contexts" version="1.4.0" match="greaterOrEqual"/>
      <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui"/>
      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
      <import plugin="org.eclipse.osgi.services" version="3.5.0" match="greaterOrEqual"/>
      <import plugin="org.eclipse.e4.core.services" version="2.0.0" match="greaterOrEqual"/>
@ -51,17 +50,15 @@
      <import plugin="org.eclipse.equinox.preferences"/>
      <import plugin="org.eclipse.core.expressions"/>
      <import plugin="org.eclipse.e4.core.commands" version="0.11.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.workbench.addons.swt"/>
-      <import plugin="com.opcoach.e4.preferences"/>
      <import plugin="org.eclipse.e4.core.di.extensions"/>
      <import plugin="org.eclipse.e4.ui.css.swt.theme" version="0.10.0" match="greaterOrEqual"/>
      <import plugin="org.eclipse.core.resources" version="3.13.0" match="greaterOrEqual"/>
-      <import plugin="com.opcoach.e4.preferences.mainmenu" version="1.2.0" match="greaterOrEqual"/>
      <import feature="com.opcoach.e4.preferences.feature" version="1.3.0.202004072127"/>
      <import feature="org.eclipse.equinox.executable" version="3.8.700.v20200207-2156"/>
      <import feature="org.eclipse.equinox.sdk" version="3.20.100.v20200303-1901"/>
      <import feature="org.eclipse.sdk" version="4.15.0.v20200305-0155"/>
      <import feature="org.eclipse.rcptt.core" version="2.5.1.M3"/>
+      <import plugin="org.eclipse.core.commands"/>
   </requires>

   <plugin
--- a/features/com.minres.scviewer.feature/feature.xml
+++ b/features/com.minres.scviewer.feature/feature.xml
@ -37,8 +37,8 @@ http://www.eclipse.org/legal/epl-v10.html
         version="0.0.0"/>

   <requires>
+      <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui" version="1.0.0" match="greaterOrEqual"/>
      <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
      <import plugin="org.eclipse.core.runtime"/>
      <import plugin="org.eclipse.core.resources"/>
@ -52,7 +52,6 @@ http://www.eclipse.org/legal/epl-v10.html
      <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
      <import plugin="org.eclipse.jface"/>
      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
-      <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
   </requires>

   <plugin
--- a/features/com.minres.scviewer.ui.feature/feature.xml
+++ b/features/com.minres.scviewer.ui.feature/feature.xml
@ -17,12 +17,19 @@
      [Enter License Description here.]
   </license>

-   <plugin
-         id="com.minres.scviewer.database.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <includes
+         id="com.minres.scviewer.database.feature"
+         version="0.0.0"/>
+
+   <requires>
+      <import plugin="org.eclipse.swt" version="3.103.1" match="greaterOrEqual"/>
+      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.equinox.registry"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.osgi"/>
+   </requires>

   <plugin
         id="com.minres.scviewer.database.ui.swt"
--- a/plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF
@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT widget
 Bundle-SymbolicName: com.minres.scviewer.database.ui.swt
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.swt;bundle-version="3.103.1",
@ -10,11 +10,21 @@ Require-Bundle: org.eclipse.swt;bundle-version="3.103.1",
 com.google.guava;bundle-version="15.0.0",
 org.eclipse.jface,
 org.eclipse.equinox.registry,
- com.minres.scviewer.database.ui,
 org.eclipse.core.runtime,
 org.eclipse.osgi
-Export-Package: com.minres.scviewer.database.swt
+Export-Package: com.minres.scviewer.database.ui;
+  uses:="org.eclipse.swt.events,
+   org.eclipse.swt.graphics,
+   org.eclipse.swt.widgets,
+   com.minres.scviewer.database,
+   org.eclipse.jface.viewers",
+ com.minres.scviewer.database.ui.swt;
+  uses:="org.osgi.framework,
+   org.eclipse.core.runtime,
+   com.minres.scviewer.database.ui,
+   org.eclipse.swt.graphics,
+   org.eclipse.swt.widgets"
 Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
-Bundle-Activator: com.minres.scviewer.database.swt.DatabaseUiPlugin
+Bundle-Activator: com.minres.scviewer.database.ui.swt.DatabaseUiPlugin
 Automatic-Module-Name: com.minres.scviewer.database.ui.swt
--- a/plugins/com.minres.scviewer.database.ui.swt/pom.xml
+++ b/plugins/com.minres.scviewer.database.ui.swt/pom.xml
@ -8,5 +8,5 @@
  	<version>2.0.0-SNAPSHOT</version>
 	<relativePath>../..</relativePath>
  </parent>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>2.3.0-SNAPSHOT</version>
 </project>
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/GotoDirection.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/GotoDirection.java
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/ICursor.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/ICursor.java
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformView.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformView.java
@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Control;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.RelationType;

-public interface IWaveformViewer extends PropertyChangeListener, ISelectionProvider{
+public interface IWaveformView extends PropertyChangeListener, ISelectionProvider{

 	String CURSOR_PROPERTY = "cursor_time";
 	
@ -51,7 +51,9 @@ public interface IWaveformViewer extends PropertyChangeListener, ISelectionProvi

 	public void setSelection(ISelection selection);

-	public void setSelection(ISelection selection, boolean addIfNeeded);
+	public void setSelection(ISelection selection, boolean showIfNeeded);
+
+	public void addToSelection(ISelection selection, boolean showIfNeeded);

 	public void moveSelection(GotoDirection direction);

@ -110,4 +112,6 @@ public interface IWaveformViewer extends PropertyChangeListener, ISelectionProvi
 	public void scrollHorizontal(int percent);
 	
 	public void addDisposeListener( DisposeListener listener );
+
+	public void deleteSelectedTracks();
 }
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformViewFactory.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformViewFactory.java
@ -12,6 +12,6 @@ package com.minres.scviewer.database.ui;

 import org.eclipse.swt.widgets.Composite;

-public interface IWaveformViewerFactory {
-	public IWaveformViewer createPanel(Composite parent);
+public interface IWaveformViewFactory {
+	public IWaveformView createPanel(Composite parent);
 }
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/TrackEntry.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/TrackEntry.java
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/WaveformColors.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/WaveformColors.java
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/Constants.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/Constants.java
@ -1,4 +1,4 @@
-package com.minres.scviewer.database.swt;
+package com.minres.scviewer.database.ui.swt;

 public class Constants {

--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/DatabaseUiPlugin.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/DatabaseUiPlugin.java
@ -8,7 +8,7 @@
 * Contributors:
 *     MINRES Technologies GmbH - initial API and implementation
 *******************************************************************************/
-package com.minres.scviewer.database.swt;
+package com.minres.scviewer.database.ui.swt;

 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Plugin;
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/ToolTipContentProvider.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/ToolTipContentProvider.java
@ -1,4 +1,4 @@
-package com.minres.scviewer.database.swt;
+package com.minres.scviewer.database.ui.swt;

 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/ToolTipHelpTextProvider.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/ToolTipHelpTextProvider.java
@ -1,4 +1,4 @@
-package com.minres.scviewer.database.swt;
+package com.minres.scviewer.database.ui.swt;

 import org.eclipse.swt.widgets.Widget;

--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/WaveformViewFactory.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/WaveformViewFactory.java
@ -8,19 +8,19 @@
 * Contributors:
 *     MINRES Technologies GmbH - initial API and implementation
 *******************************************************************************/
-package com.minres.scviewer.database.swt;
+package com.minres.scviewer.database.ui.swt;

 import org.eclipse.swt.widgets.Composite;

-import com.minres.scviewer.database.swt.internal.WaveformViewer;
-import com.minres.scviewer.database.ui.IWaveformViewer;
-import com.minres.scviewer.database.ui.IWaveformViewerFactory;
+import com.minres.scviewer.database.ui.IWaveformView;
+import com.minres.scviewer.database.ui.IWaveformViewFactory;
+import com.minres.scviewer.database.ui.swt.internal.WaveformView;

-public class WaveformViewerFactory implements IWaveformViewerFactory {
+public class WaveformViewFactory implements IWaveformViewFactory {

 	@Override
-	public IWaveformViewer createPanel(Composite parent) {
-		return new WaveformViewer(parent);
+	public IWaveformView createPanel(Composite parent) {
+		return new WaveformView(parent);
 	}

 }
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java
@ -8,7 +8,7 @@
 * Contributors:
 *     MINRES Technologies GmbH - initial API and implementation
 *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;

 import java.util.Collection;
 import java.util.LinkedList;
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/CursorPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/CursorPainter.java
@ -8,7 +8,7 @@
 * Contributors:
 *     MINRES Technologies GmbH - initial API and implementation
 *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;

 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Rectangle;
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/IPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/IPainter.java
@ -8,7 +8,7 @@
 * Contributors:
 *     MINRES Technologies GmbH - initial API and implementation
 *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;

 import org.eclipse.swt.graphics.Rectangle;

--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/IWaveformPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/IWaveformPainter.java
@ -8,7 +8,7 @@
 * Contributors:
 *     MINRES Technologies GmbH - initial API and implementation
 *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;

 import com.minres.scviewer.database.ui.TrackEntry;

--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ObservableList.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ObservableList.java
@ -8,7 +8,7 @@
 * Contributors:
 *     MINRES Technologies GmbH - initial API and implementation
 *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;

 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/Projection.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/Projection.java
@ -1,4 +1,4 @@
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;

 import java.util.Arrays;

--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/RelSelectionDialog.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/RelSelectionDialog.java
@ -1,4 +1,4 @@
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;

 import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter;

--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/RulerPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/RulerPainter.java
@ -8,7 +8,7 @@
 * Contributors:
 *     MINRES Technologies GmbH - initial API and implementation
 *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;

 import java.text.DecimalFormat;

--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/SignalPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/SignalPainter.java
@ -8,7 +8,7 @@
 * Contributors:
 *     MINRES Technologies GmbH - initial API and implementation
 *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;

 import java.util.Collection;
 import java.util.Map.Entry;
@ -249,7 +249,7 @@ public class SignalPainter extends TrackPainter {
 		final boolean continous;
 		private long minVal;
 		private long range;
-
+		double yRange = (yOffsetB-yOffsetT);
 		public MultiBitStencilAnalog(NavigableMap<Long, ?> entries, Object left, boolean continous, boolean signed) {
 			this.continous=continous;
 			Collection<?> values = ((NavigableMap<Long, ?>) entries).values();
@ -276,8 +276,8 @@ public class SignalPainter extends TrackPainter {
 			long leftVal = ((BitVector) left).toUnsignedValue();
 			long rightVal= ((BitVector) right).toUnsignedValue();
 			proj.setForeground(waveCanvas.colors[WaveformColors.SIGNAL_REAL.ordinal()]);
-			int yOffsetLeft = (int) ((leftVal-minVal) / range * (yOffsetB-yOffsetT));
-			int yOffsetRight = (int) ((rightVal-minVal) / range * (yOffsetB-yOffsetT));
+			int yOffsetLeft = (int) ((leftVal-minVal) * yRange / range);
+			int yOffsetRight = (int) ((rightVal-minVal) * yRange / range);
 			if(continous) {
 				if (xEnd > maxPosX) {
 					proj.drawLine(xBegin, yOffsetB-yOffsetLeft, maxPosX, yOffsetB-yOffsetRight);
@ -401,8 +401,8 @@ public class SignalPainter extends TrackPainter {
 				}
 			} else {				
 				proj.setForeground(waveCanvas.colors[WaveformColors.SIGNAL_REAL.ordinal()]);
-				int yOffsetLeft = (int) ((leftVal-minVal) / range * (yOffsetB-yOffsetT));
-				int yOffsetRight = Double.isNaN(rightVal)?yOffsetLeft:(int) ((rightVal-minVal) / range * (yOffsetB-yOffsetT));
+				int yOffsetLeft = (int) ((leftVal-minVal) * (yOffsetB-yOffsetT) / range);
+				int yOffsetRight = Double.isNaN(rightVal)?yOffsetLeft:(int) ((rightVal-minVal) * (yOffsetB-yOffsetT) / range);
 				if(continous) {
 					if (xEnd > maxPosX) {
 						proj.drawLine(xBegin, yOffsetB-yOffsetLeft, maxPosX, yOffsetB-yOffsetRight);
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java
@ -8,7 +8,7 @@
 * Contributors:
 *     MINRES Technologies GmbH - initial API and implementation
 *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;

 import java.util.Collection;
 import java.util.List;
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ToolTipHandler.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ToolTipHandler.java
@ -1,4 +1,4 @@
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;

 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
@ -13,9 +13,9 @@ import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Widget;

-import com.minres.scviewer.database.swt.Constants;
-import com.minres.scviewer.database.swt.ToolTipContentProvider;
-import com.minres.scviewer.database.swt.ToolTipHelpTextProvider;
+import com.minres.scviewer.database.ui.swt.Constants;
+import com.minres.scviewer.database.ui.swt.ToolTipContentProvider;
+import com.minres.scviewer.database.ui.swt.ToolTipHelpTextProvider;

 class ToolTipHandler {

--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/TrackAreaPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/TrackAreaPainter.java
@ -8,7 +8,7 @@
 * Contributors:
 *     MINRES Technologies GmbH - initial API and implementation
 *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;

 import java.util.Map.Entry;
 import java.util.TreeMap;
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/TrackPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/TrackPainter.java
@ -8,7 +8,7 @@
 * Contributors:
 *     MINRES Technologies GmbH - initial API and implementation
 *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;

 import com.minres.scviewer.database.ui.TrackEntry;

--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java
@ -8,7 +8,7 @@
 * Contributors:
 *     MINRES Technologies GmbH - initial API and implementation
 *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;

 import java.util.ArrayList;
 import java.util.HashMap;
@ -25,6 +25,7 @@ import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.Rectangle;
@ -39,15 +40,17 @@ import com.google.common.collect.Lists;
 import com.minres.scviewer.database.ITx;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.RelationType;
-import com.minres.scviewer.database.swt.Constants;
-import com.minres.scviewer.database.ui.IWaveformViewer;
+import com.minres.scviewer.database.ui.IWaveformView;
 import com.minres.scviewer.database.ui.TrackEntry;
 import com.minres.scviewer.database.ui.WaveformColors;
+import com.minres.scviewer.database.ui.swt.Constants;

 public class WaveformCanvas extends Canvas {
 	
    Color[] colors = new Color[WaveformColors.values().length];

+    private boolean doubleBuffering = true;
+    	
    private int trackHeight = 50;
    
    private long scaleFactor = 1000000L; // 1ns
@ -110,7 +113,7 @@ public class WaveformCanvas extends Canvas {
        painterList.add(trackAreaPainter);
        rulerPainter=new RulerPainter(this);
        painterList.add(rulerPainter);
-        arrowPainter=new ArrowPainter(this, IWaveformViewer.NEXT_PREV_IN_STREAM);
+        arrowPainter=new ArrowPainter(this, IWaveformView.NEXT_PREV_IN_STREAM);
        painterList.add(arrowPainter);
 		CursorPainter cp = new CursorPainter(this, scaleFactor * 10, cursorPainters.size()-1);
 		painterList.add(cp);
@ -398,7 +401,18 @@ public class WaveformCanvas extends Canvas {
    /* Paint function */
    private void paint(GC gc) {
        Rectangle clientRect = getClientArea(); /* Canvas' painting area */
-        Projection p = new Projection(gc);
+        GC thisGc = gc;
+        Image d_backingImg = null;
+        if(doubleBuffering) {
+            Point p = getSize();
+            d_backingImg = new Image(getDisplay(), p.x, p.y);
+            thisGc = new GC(d_backingImg);
+            thisGc.setBackground(gc.getBackground());
+            thisGc.setForeground(gc.getForeground());
+            thisGc.setFont(gc.getFont());
+            
+        }
+        Projection p = new Projection(thisGc);
        p.setTranslation(origin);
        if (painterList.size() > 0 ) {
            for (IPainter painter : painterList)
@ -407,6 +421,11 @@ public class WaveformCanvas extends Canvas {
            gc.fillRectangle(clientRect);
            initScrollBars();
        }
+        if(doubleBuffering) {
+            gc.drawImage(d_backingImg, 0, 0);
+            d_backingImg.dispose();
+            thisGc.dispose();
+        }
    }

    public List<Object> getElementsAt(Point point) {
--- 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
@ -8,7 +8,7 @@
 * Contributors:
 *     MINRES Technologies GmbH - initial API and implementation
 *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;

 import java.awt.Color;
 import java.beans.PropertyChangeEvent;
@ -86,14 +86,14 @@ import com.minres.scviewer.database.ITxRelation;
 import com.minres.scviewer.database.ITxStream;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.RelationType;
-import com.minres.scviewer.database.swt.Constants;
 import com.minres.scviewer.database.ui.GotoDirection;
 import com.minres.scviewer.database.ui.ICursor;
-import com.minres.scviewer.database.ui.IWaveformViewer;
+import com.minres.scviewer.database.ui.IWaveformView;
 import com.minres.scviewer.database.ui.TrackEntry;
 import com.minres.scviewer.database.ui.WaveformColors;
+import com.minres.scviewer.database.ui.swt.Constants;

-public class WaveformViewer implements IWaveformViewer  {
+public class WaveformView implements IWaveformView  {

 	private ListenerList<ISelectionChangedListener> selectionChangedListeners = new ListenerList<ISelectionChangedListener>();

@ -103,7 +103,7 @@ public class WaveformViewer implements IWaveformViewer  {

 	private ITx currentTxSelection;

-	private TrackEntry currentWaveformSelection;
+	private ArrayList<TrackEntry> currentWaveformSelection = new ArrayList<>();

 	private ScrolledComposite nameListScrolled;

@ -133,18 +133,41 @@ public class WaveformViewer implements IWaveformViewer  {

 	private Font nameFont, nameFontB;

+	protected TrackEntry lastClickedEntry;
+
 	protected MouseListener nameValueMouseListener = new MouseAdapter() {
+		
 		@Override
 		public void mouseDown(MouseEvent e) {
 			if (e.button == 1) {
 				Entry<Integer, TrackEntry> entry = trackVerticalOffset.floorEntry(e.y);
-				if (entry != null)
-					setSelection(new StructuredSelection(entry.getValue()));
+				entry.getValue().selected=true;
 			} else if (e.button == 3) {
 				Menu topMenu= top.getMenu();
 				if(topMenu!=null) topMenu.setVisible(true);
 			}
 		}
+		
+		@Override
+		public void mouseUp(MouseEvent e) {
+			if (e.button == 1) {
+				Entry<Integer, TrackEntry> entry = trackVerticalOffset.floorEntry(e.y);
+				if (entry != null) {
+					if((e.stateMask & SWT.SHIFT) != 0) {
+						if(lastClickedEntry.selected) {
+							int firstIdx=streams.indexOf(lastClickedEntry);
+							int lastIdx = streams.indexOf(entry.getValue());
+							List<TrackEntry> res = firstIdx>lastIdx?streams.subList(lastIdx, firstIdx+1):streams.subList(firstIdx, lastIdx+1);
+							setSelection(new StructuredSelection(res), (e.stateMask & SWT.CTRL) !=0 , false);
+						} else
+							setSelection(new StructuredSelection(entry.getValue()), (e.stateMask & SWT.CTRL) !=0 , false);
+					} else {
+						setSelection(new StructuredSelection(entry.getValue()), (e.stateMask & SWT.CTRL) !=0 , false);
+					}
+				}
+				lastClickedEntry = entry.getValue();
+			}
+		}
 	};
 	
 	class WaveformMouseListener implements MouseMoveListener, MouseListener, PaintListener {
@ -185,8 +208,7 @@ public class WaveformViewer implements IWaveformViewer  {
 	            gc.setAlpha(128);
 	            int minX = Math.min(start.x, end.x);
 	            int width = Math.max(start.x, end.x) - minX;
-	            Point origin = waveformCanvas.getOrigin();
-	            int y_top = waveformCanvas.getRulerHeight()- origin.y;
+	            int y_top = waveformCanvas.getRulerHeight();
 	            int y_bottom = waveformCanvas.getSize().y;
 	            gc.fillRectangle(minX, y_top, width,y_bottom);
 			}
@ -288,7 +310,7 @@ public class WaveformViewer implements IWaveformViewer  {
 	};
 	protected WaveformMouseListener waveformMouseListener = new WaveformMouseListener();

-	public WaveformViewer(Composite parent) {
+	public WaveformView(Composite parent) {
 		pcs=new PropertyChangeSupport(this);

 		trackVerticalOffset = new TreeMap<Integer, TrackEntry>();
@ -458,7 +480,7 @@ public class WaveformViewer implements IWaveformViewer  {
 					@Override
 					public void run() {
 						update();
-						waveformCanvas.reveal(currentWaveformSelection.waveform);
+						currentWaveformSelection.stream().forEach(e -> waveformCanvas.reveal(e.waveform));
 						valueList.redraw();
 						nameList.redraw();
 					}
@ -481,13 +503,11 @@ public class WaveformViewer implements IWaveformViewer  {
 		trackVerticalOffset.clear();
 		waveformCanvas.clearAllWaveformPainter(false);
 		boolean even = true;
-		boolean clearSelection = true;
 		TextLayout tl = new TextLayout(waveformCanvas.getDisplay());
 		tl.setFont(nameFontB);
 		for (TrackEntry streamEntry : streams) {
 			streamEntry.height = waveformCanvas.getTrackHeight();
 			streamEntry.vOffset=trackVerticalHeight;
-			clearSelection &= currentWaveformSelection!=null && (streamEntry.waveform != currentWaveformSelection.waveform);
 			if (streamEntry.isStream()) {
 				streamEntry.currentValue="";
 				streamEntry.height *= streamEntry.getStream().getMaxConcurrency();
@ -513,7 +533,6 @@ public class WaveformViewer implements IWaveformViewer  {
 		if (trackVerticalOffset.isEmpty()){
 			waveformCanvas.setOrigin(0, 0);
 		}
-		if(clearSelection) setSelection(new StructuredSelection());
 	}

 	private int calculateValueWidth() {
@ -652,11 +671,12 @@ public class WaveformViewer implements IWaveformViewer  {
 	@Override
 	public ISelection getSelection() {
 		if (currentTxSelection != null) {
-			Object[] elem = {currentTxSelection, currentWaveformSelection};
-			return new StructuredSelection(elem);
-		} else if (currentWaveformSelection != null) {
-			Object[] elem = {currentWaveformSelection.waveform, currentWaveformSelection};
-			return new StructuredSelection(elem);
+			ArrayList<Object> sel = new ArrayList<>();
+			sel.add(currentTxSelection);
+			sel.addAll(currentWaveformSelection.stream().map(e -> e.waveform).collect(Collectors.toList()));
+			return new StructuredSelection(sel.toArray());
+		} else if (currentWaveformSelection.size()>0) {
+			return new StructuredSelection(currentWaveformSelection.toArray());
 		} else
 			return new StructuredSelection();
 	}
@ -666,22 +686,33 @@ public class WaveformViewer implements IWaveformViewer  {
 	 */
 	@Override
 	public void setSelection(ISelection selection) {
-		setSelection(selection, false);
+		setSelection(selection, false, false);
 	}
-
 	/* (non-Javadoc)
 	 * @see com.minres.scviewer.database.swt.IWaveformPanel#setSelection(org.eclipse.jface.viewers.ISelection, boolean)
 	 */
 	@Override
-	public void setSelection(ISelection selection, boolean addIfNeeded) {
+	public void setSelection(ISelection selection, boolean showIfNeeded) {
+		setSelection(selection, false, showIfNeeded);
+	}
+	/* (non-Javadoc)
+	 * @see com.minres.scviewer.database.swt.IWaveformPanel#addToSelection(org.eclipse.jface.viewers.ISelection, boolean)
+	 */
+	@Override
+	public void addToSelection(ISelection selection, boolean showIfNeeded) {
+		setSelection(selection, true, showIfNeeded);		
+	}
+	
+	public void setSelection(ISelection selection, boolean add, boolean addIfNeeded) {
 		boolean selectionChanged = false;
-		if(currentWaveformSelection!=null) currentWaveformSelection.selected=false;
+		currentWaveformSelection.forEach(e->e.selected=false);
 		if (selection instanceof IStructuredSelection) {
 			if(((IStructuredSelection) selection).size()==0){
 				selectionChanged = currentTxSelection!=null||currentWaveformSelection!=null;  
 				currentTxSelection = null;
-				currentWaveformSelection = null;
+				currentWaveformSelection .clear();
 			} else {
+				if(!add) currentWaveformSelection.clear();
 				for(Object sel:((IStructuredSelection) selection).toArray()){
 					if (sel instanceof ITx && currentTxSelection != sel){
 						ITx txSel = (ITx) sel;
@ -694,26 +725,27 @@ public class WaveformViewer implements IWaveformViewer  {
 							streams.add(trackEntry);
 						}
 						currentTxSelection = txSel;
-						if(trackEntry!=null) currentWaveformSelection = trackEntry;
+						if(trackEntry!=null) {
+							currentWaveformSelection.add((TrackEntry)sel);
+						}
 						selectionChanged = true;
-					} else if (sel instanceof TrackEntry && currentWaveformSelection != sel) {
-						currentWaveformSelection = (TrackEntry) sel;
-						if(currentTxSelection!=null && currentTxSelection.getStream()!=currentWaveformSelection)
-							currentTxSelection=null;
-						
+					} else if (sel instanceof TrackEntry && !currentWaveformSelection.contains(sel)) {
+						currentWaveformSelection.add((TrackEntry)sel);
+						if(currentTxSelection!=null)
+							currentTxSelection=null;						
 						selectionChanged = true;
 					}            		
 				}
 			}
 		} else {
-			if (currentTxSelection != null || currentWaveformSelection != null)
+			if (currentTxSelection != null || currentWaveformSelection.size() > 0)
 				selectionChanged = true;
 			currentTxSelection = null;
-			currentWaveformSelection = null;
+			currentWaveformSelection.clear();
 		}
-		if(currentWaveformSelection!=null) currentWaveformSelection.selected=true;
+		currentWaveformSelection.forEach(e -> e.selected = true);
 		if (selectionChanged) {
-			if(currentWaveformSelection!=null) waveformCanvas.reveal(currentWaveformSelection.waveform);
+			currentWaveformSelection.forEach(e -> waveformCanvas.reveal(e.waveform));
 			waveformCanvas.setSelected(currentTxSelection);
 			valueList.redraw();
 			nameList.redraw();
@ -723,13 +755,11 @@ public class WaveformViewer implements IWaveformViewer  {

 	protected void fireSelectionChanged() {
 		if(currentWaveformSelection==null) return;
-		IStructuredSelection selection=currentTxSelection!=null?
-				new StructuredSelection(new Object[]{currentTxSelection, currentWaveformSelection.waveform}):
-					new StructuredSelection(currentWaveformSelection.waveform);
-				Object[] list = selectionChangedListeners.getListeners();
-				for (int i = 0; i < list.length; i++) {
-					((ISelectionChangedListener) list[i]).selectionChanged(new SelectionChangedEvent(this, selection));
-				}
+		ISelection selection=getSelection();
+		Object[] list = selectionChangedListeners.getListeners();
+		for (int i = 0; i < list.length; i++) {
+			((ISelectionChangedListener) list[i]).selectionChanged(new SelectionChangedEvent(this, selection));
+		}
 	}

 	/* (non-Javadoc)
@ -740,12 +770,14 @@ public class WaveformViewer implements IWaveformViewer  {
 		if(direction==GotoDirection.NEXT || direction==GotoDirection.PREV)
 			moveSelection(direction, NEXT_PREV_IN_STREAM) ;
 		else {
-			int idx = streams.indexOf(currentWaveformSelection);
+			if(currentWaveformSelection.size()==1) {
+			int idx = streams.indexOf(currentWaveformSelection.get(0));
 			if(direction==GotoDirection.UP && idx>0) {
 				setSelection(new StructuredSelection(streams.get(idx-1)));
 			} else if(direction==GotoDirection.DOWN && idx<(streams.size()-1)) {
 				setSelection(new StructuredSelection(streams.get(idx+1)));
 			}
+			}
 		}
 	}

@ -754,9 +786,15 @@ public class WaveformViewer implements IWaveformViewer  {
 	 */
 	@Override
 	public void moveSelection(GotoDirection direction, RelationType relationType) {
-		if (currentWaveformSelection!=null && currentWaveformSelection.isStream() && currentTxSelection!=null) {
-			if(relationType.equals(IWaveformViewer.NEXT_PREV_IN_STREAM)){
-				ITxStream<? extends ITxEvent> stream = currentWaveformSelection.getStream();
+		TrackEntry selectedWaveform=null;
+		if(currentTxSelection!=null)
+			selectedWaveform = getEntryForStream(currentTxSelection.getStream());
+		else if(currentWaveformSelection.size()!=1) return;
+		if(selectedWaveform==null)
+			selectedWaveform = currentWaveformSelection.get(1);
+		if (selectedWaveform!=null && selectedWaveform.isStream() && currentTxSelection!=null) {
+			if(relationType.equals(IWaveformView.NEXT_PREV_IN_STREAM)){
+				ITxStream<? extends ITxEvent> stream = selectedWaveform.getStream();
 				ITx transaction = null;
 				if (direction == GotoDirection.NEXT) {
 					List<ITxEvent> thisEntryList = stream.getEvents().get(currentTxSelection.getBeginTime());
@ -856,14 +894,14 @@ public class WaveformViewer implements IWaveformViewer  {
 	 */
 	@Override
 	public void moveCursor(GotoDirection direction) {
+		if(currentWaveformSelection.size()!=1) return;
+		TrackEntry sel = currentWaveformSelection.get(1);
 		long time = getCursorTime();
 		NavigableMap<Long, ?> map=null;
-		if(currentWaveformSelection!=null) {
-			if(currentWaveformSelection.isStream()){
-				map=currentWaveformSelection.getStream().getEvents();
-			} else if(currentWaveformSelection.isSignal()){
-				map=currentWaveformSelection.getSignal().getEvents();
-			}
+		if(sel.isStream()){
+			map=sel.getStream().getEvents();
+		} else if(sel.isSignal()){
+			map=sel.getSignal().getEvents();
 		}
 		if(map!=null){
 			Entry<Long, ?> entry=direction==GotoDirection.PREV?map.lowerEntry(time):map.higherEntry(time);
@ -885,29 +923,37 @@ public class WaveformViewer implements IWaveformViewer  {
 	public List<TrackEntry> getStreamList() {
 		return streams;
 	}
-
+	/* (non-Javadoc)
+	 * @see com.minres.scviewer.database.swt.IWaveformPanel#deleteSelectedTracks()
+	 */
+	@Override
+	public void deleteSelectedTracks() {
+		List<TrackEntry> streams = getStreamList();
+		for (Object o : (IStructuredSelection)getSelection()) {
+			if(o instanceof TrackEntry) {
+				TrackEntry e = (TrackEntry) o;
+				e.selected=false;
+				streams.remove(e);				
+			}
+		}
+		setSelection(new StructuredSelection());
+		update();
+	}
 	/* (non-Javadoc)
 	 * @see com.minres.scviewer.database.swt.IWaveformPanel#moveSelected(int)
 	 */
 	@Override
 	public void moveSelectedTrack(int i) {
-		if(currentWaveformSelection!=null){
-			int idx = streams.indexOf(currentWaveformSelection);
-			int newIdx=idx+i;
-			if(newIdx>=0 && newIdx<streams.size()){
-				Collections.swap(streams,idx,newIdx);
-				revealSelected=true;
-//				update();
-//				ITx selectedTx=currentTxSelection;
-//				if(selectedTx!=null){
-//					setSelection(new StructuredSelection(new Object[]{selectedTx, currentWaveformSelection.waveform}));
-//				} else {
-//					setSelection(new StructuredSelection(currentWaveformSelection.waveform));
-//				}
-//				waveformCanvas.reveal(currentWaveformSelection.waveform);
-//				valueList.redraw();
-//				nameList.redraw();
-			}
+		if(currentWaveformSelection.size()>0){
+			int idx = streams.indexOf(currentWaveformSelection.get(0));
+			for(Object o: currentWaveformSelection)
+				streams.remove(o);
+			int tgtIdx=idx+i;
+			if(tgtIdx<0) tgtIdx=0;
+			if(tgtIdx>=streams.size())
+				streams.addAll(currentWaveformSelection);
+			else
+				streams.addAll(tgtIdx, currentWaveformSelection);
 		}	
 	}

@ -1109,38 +1155,30 @@ public class WaveformViewer implements IWaveformViewer  {
 		dropTarget.setTransfer(types);

 		dropTarget.addDropListener(new DropTargetAdapter() {
+			@SuppressWarnings("unchecked")
 			public void drop(DropTargetEvent event) {
 				if (LocalSelectionTransfer.getTransfer().isSupportedType(event.currentDataType)){
-					ISelection sel = LocalSelectionTransfer.getTransfer().getSelection();
-					if(sel!=null && sel instanceof IStructuredSelection){
-						Object source = ((IStructuredSelection)sel).getFirstElement();
+					ISelection s = LocalSelectionTransfer.getTransfer().getSelection();
+					if(s!=null && s instanceof IStructuredSelection){
+						IStructuredSelection sel = (IStructuredSelection) s;
+						for(Object o: sel.toList())
+							streams.remove(o);
 						DropTarget tgt = (DropTarget) event.widget;
 						Point dropPoint = ((Canvas) tgt.getControl()).toControl(event.x, event.y);
-						Object target = trackVerticalOffset.floorEntry(dropPoint.y).getValue();
-						if(source instanceof TrackEntry && target instanceof TrackEntry){
-							TrackEntry srcWave=(TrackEntry) source;
-							int srcIdx=streams.indexOf(srcWave);
-							streams.remove(srcWave);
+						// extract all elements being selected
+						if( dropPoint.y > trackVerticalOffset.lastKey()) {
+							streams.addAll(sel.toList());
+						} else {
+							TrackEntry target = trackVerticalOffset.floorEntry(dropPoint.y).getValue();
 							int tgtIdx=streams.indexOf(target);
-							if(srcIdx<=tgtIdx) tgtIdx++;
-							if(tgtIdx>=streams.size())
-								streams.add(srcWave);
-							else
-								streams.add(tgtIdx, srcWave);
-							currentWaveformSelection=srcWave;
-							update();
-						} else if(source instanceof CursorPainter){
-							((CursorPainter)source).setTime(0);
-							updateValueList();
-						}
+							streams.addAll(tgtIdx, sel.toList());
+						}	
 					}
 				}
 			}

-
 			public void dropAccept(DropTargetEvent event) {
-				Point offset = canvas.toControl(event.x, event.y); 
-				if (event.detail != DND.DROP_MOVE || offset.y > trackVerticalOffset.lastKey() + waveformCanvas.getTrackHeight()) {
+				if (event.detail != DND.DROP_MOVE) {
 					event.detail = DND.DROP_NONE;
 				}
 			}
@ -1351,4 +1389,5 @@ public class WaveformViewer implements IWaveformViewer  {
 	public void addDisposeListener( DisposeListener listener ) {
 		waveformCanvas.addDisposeListener(listener);
 	}
+
 }
--- a/plugins/com.minres.scviewer.database.ui/.classpath
+++ b/plugins/com.minres.scviewer.database.ui/.classpath
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
--- a/plugins/com.minres.scviewer.database.ui/.gitignore
+++ b/plugins/com.minres.scviewer.database.ui/.gitignore
@ -1,2 +0,0 @@
-/bin/
-/target/
--- a/plugins/com.minres.scviewer.database.ui/.project
+++ b/plugins/com.minres.scviewer.database.ui/.project
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.minres.scviewer.database.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
--- a/plugins/com.minres.scviewer.database.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/com.minres.scviewer.database.ui/.settings/org.eclipse.jdt.core.prefs
@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
--- a/plugins/com.minres.scviewer.database.ui/.settings/org.eclipse.pde.core.prefs
+++ b/plugins/com.minres.scviewer.database.ui/.settings/org.eclipse.pde.core.prefs
@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
--- a/plugins/com.minres.scviewer.database.ui/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.database.ui/META-INF/MANIFEST.MF
@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Database UI
-Bundle-SymbolicName: com.minres.scviewer.database.ui
-Bundle-Version: 2.0.0.qualifier
-Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: com.minres.scviewer.database.ui
-Require-Bundle: com.minres.scviewer.database,
- org.eclipse.jface,
- org.eclipse.swt
-Automatic-Module-Name: com.minres.scviewer.database.ui
--- a/plugins/com.minres.scviewer.database.ui/build.properties
+++ b/plugins/com.minres.scviewer.database.ui/build.properties
@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
--- a/plugins/com.minres.scviewer.database.ui/pom.xml
+++ b/plugins/com.minres.scviewer.database.ui/pom.xml
@ -1,12 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>com.minres.scviewer.database.ui</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-  <parent>
-  	<groupId>com.minres.scviewer</groupId>
-  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.0.0-SNAPSHOT</version>
-	<relativePath>../..</relativePath>
-  </parent>
-  </project>
--- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.minres.scviewer.e4.application;singleton:=true
-Bundle-Version: 2.6.1.qualifier
+Bundle-Version: 2.7.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: javax.inject;bundle-version="1.0.0",
 org.eclipse.core.runtime;bundle-version="3.11.1",
@ -15,7 +15,6 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
 org.eclipse.e4.ui.di;bundle-version="1.1.0",
 org.eclipse.e4.core.contexts;bundle-version="1.4.0",
 com.minres.scviewer.database.ui.swt;bundle-version="1.0.0",
- com.minres.scviewer.database.ui,
 com.minres.scviewer.database;bundle-version="1.0.0",
 org.eclipse.osgi.services;bundle-version="3.5.0",
 org.eclipse.e4.core.services;bundle-version="2.0.0",
--- a/plugins/com.minres.scviewer.e4.application/pom.xml
+++ b/plugins/com.minres.scviewer.e4.application/pom.xml
@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <artifactId>com.minres.scviewer.e4.application</artifactId>
-  <version>2.6.1-SNAPSHOT</version>
+  <version>2.7.0-SNAPSHOT</version>
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/Messages.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/Messages.java
@ -41,6 +41,7 @@ public class Messages extends NLS {
 	public static String TransactionDetails_21;
 	public static String TransactionDetails_3;
 	public static String TransactionDetails_4;
+	public static String WaveformPreferencesPage_description;
 	public static String WaveformPreferencesPage_1;
 	public static String WaveformViewer_13;
 	public static String WaveformViewer_14;
@ -61,6 +62,30 @@ public class Messages extends NLS {
 	public static String WaveStatusBarControl_6;
 	public static String WaveStatusBarControl_7;
 	public static String WaveStatusBarControl_8;
+	public static String line;
+	public static String line_highlite;
+	public static String track_bg_even;
+	public static String track_bg_odd;
+	public static String track_bg_highlite;
+	public static String tx_bg;
+	public static String tx_bg_highlite;
+	public static String tx_border;
+	public static String signal0;
+	public static String signal1;
+	public static String signalz;
+	public static String signalx;
+	public static String signalu;
+	public static String signal_text;
+	public static String signal_real;
+	public static String signal_nan;
+	public static String cursor;
+	public static String cursor_drag;
+	public static String cursor_text;
+	public static String marker;
+	public static String marker_text;
+	public static String rel_arrow;
+	public static String rel_arrow_highlite;
+
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/WaveformPopupMenuContribution.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/WaveformPopupMenuContribution.java
@ -1,7 +1,6 @@
 
 package com.minres.scviewer.e4.application.elements;

-import java.util.Iterator;
 import java.util.List;

 import javax.inject.Inject;
@ -34,22 +33,46 @@ public class WaveformPopupMenuContribution {
 		
 	final TrackEntry nullEntry = new TrackEntry(null);
 	
+	private boolean selHasBitVector(ISelection sel, boolean checkForDouble) {
+		if(!sel.isEmpty() && sel instanceof IStructuredSelection) {
+			for(Object elem:(IStructuredSelection)sel) {
+				if(elem instanceof TrackEntry) {
+					TrackEntry e = (TrackEntry) elem;
+					if(e.waveform instanceof ISignal<?>) {
+						Object o = ((ISignal<?>) e.waveform).getEvents().firstEntry().getValue();
+						if(checkForDouble && o instanceof Double) 
+							return true;
+						else if(o instanceof BitVector && ((BitVector)o).getWidth()>1)
+							return true;
+						else
+							return false;
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	private TrackEntry getSingleTrackEntry(ISelection sel) {
+		TrackEntry entry=null;
+		if(!sel.isEmpty() && sel instanceof IStructuredSelection) {
+			for(Object elem:(IStructuredSelection)sel) {
+				if(elem instanceof TrackEntry) {
+					if(entry != null)
+						return null;
+					entry = (TrackEntry) elem;
+				}
+			}
+		}
+		return entry;
+	}
+	
 	@Evaluate
 	public boolean evaluate() {
 		Object obj = activePart.getObject();
 		if(obj instanceof WaveformViewer){
 			WaveformViewer wfv = (WaveformViewer)obj;
-			ISelection sel = wfv.getSelection();
-			if(!sel.isEmpty() && sel instanceof IStructuredSelection) {
-				Object selected = ((IStructuredSelection)sel).getFirstElement();
-				if(selected instanceof ISignal<?>) {
-					Object x = ((ISignal<?>) selected).getEvents().firstEntry().getValue();
-					if((x instanceof BitVector) && ((BitVector)x).getWidth()==1) {
-						return false;
-					} else
-						return true;
-				}
-			}
+			return selHasBitVector(wfv.getSelection(), true);
 		}
 		return false;
 	}
@ -60,39 +83,24 @@ public class WaveformPopupMenuContribution {
 		if(obj instanceof WaveformViewer){
 			WaveformViewer wfv = (WaveformViewer)obj;
 			ISelection sel = wfv.getSelection();
-			if(!sel.isEmpty() && sel instanceof IStructuredSelection) {
-				Iterator<?> it = ((IStructuredSelection)sel).iterator();
-				Object first = it.next();
-				Object second=null;
-				if(it.hasNext()) second=it.next();
-				if(first instanceof ISignal<?>) {
-					Object o = ((ISignal<?>) first).getEvents().firstEntry().getValue();
-					//com.minres.scviewer.e4.application.menu.mulitvaluesettings
-					if((o instanceof Double) || (o instanceof BitVector)) {
-						TrackEntry entry=nullEntry;
-						if(second instanceof TrackEntry)
-							entry=(TrackEntry)second;
-						if(o instanceof BitVector) {
-						    addValueMenuItem(items, application, modelService, "hex", TrackEntry.ValueDisplay.DEFAULT, entry.valueDisplay);
-						    addValueMenuItem(items, application, modelService, "unsigned", TrackEntry.ValueDisplay.UNSIGNED, entry.valueDisplay);
-						    addValueMenuItem(items, application, modelService, "signed", TrackEntry.ValueDisplay.SIGNED, entry.valueDisplay);
-							items.add(MMenuFactory.INSTANCE.createMenuSeparator());
-							addWaveMenuItem(items, application, modelService, "bit vector", TrackEntry.WaveDisplay.DEFAULT, entry.waveDisplay);
-						}						
-						addWaveMenuItem(items, application, modelService, "analog step-wise", TrackEntry.WaveDisplay.STEP_WISE, entry.waveDisplay);
-						addWaveMenuItem(items, application, modelService, "analog continous", TrackEntry.WaveDisplay.CONTINOUS, entry.waveDisplay);
-					}
-				}
-			}
+			TrackEntry elem = getSingleTrackEntry(sel);
+			if(selHasBitVector(sel, false)) {
+				addValueMenuItem(items, application, modelService, "hex", TrackEntry.ValueDisplay.DEFAULT, elem);
+				addValueMenuItem(items, application, modelService, "unsigned", TrackEntry.ValueDisplay.UNSIGNED, elem);
+				addValueMenuItem(items, application, modelService, "signed", TrackEntry.ValueDisplay.SIGNED, elem);
+				items.add(MMenuFactory.INSTANCE.createMenuSeparator());
+				addWaveMenuItem(items, application, modelService, "bit vector", TrackEntry.WaveDisplay.DEFAULT, elem);
+			}						
+			addWaveMenuItem(items, application, modelService, "analog step-wise", TrackEntry.WaveDisplay.STEP_WISE, elem);
+			addWaveMenuItem(items, application, modelService, "analog continous", TrackEntry.WaveDisplay.CONTINOUS, elem);
 		}
-
 	}

 	private void addValueMenuItem(List<MMenuElement> items, MApplication application, EModelService modelService,
-			String label, TrackEntry.ValueDisplay value, TrackEntry.ValueDisplay actual) {
+			String label, TrackEntry.ValueDisplay value, TrackEntry elem) {
 		MHandledMenuItem item = MMenuFactory.INSTANCE.createHandledMenuItem();
 		item.setType(ItemType.RADIO);
-		item.setSelected(value==actual);
+		item.setSelected(elem != null && elem.valueDisplay == value);
 		item.setLabel("Show as "+label);
 		item.setContributorURI("platform:/plugin/com.minres.scviewer.e4.application");
 		List<MCommand> cmds = modelService.findElements(application, "com.minres.scviewer.e4.application.command.changevaluedisplay", MCommand.class, null);
@ -106,10 +114,10 @@ public class WaveformPopupMenuContribution {
 	}
 	
 	private void addWaveMenuItem(List<MMenuElement> items, MApplication application, EModelService modelService,
-			String label, TrackEntry.WaveDisplay value, TrackEntry.WaveDisplay actual) {
+			String label, TrackEntry.WaveDisplay value, TrackEntry elem) {
 		MHandledMenuItem item = MMenuFactory.INSTANCE.createHandledMenuItem();
 		item.setType(ItemType.RADIO);
-		item.setSelected(value==actual);
+		item.setSelected(elem != null && elem.waveDisplay==value);
 		item.setLabel("Render "+label);
 		item.setContributorURI("platform:/plugin/com.minres.scviewer.e4.application");
 		List<MCommand> cmds = modelService.findElements(application, "com.minres.scviewer.e4.application.command.changewavedisplay", MCommand.class, null);
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ChangeValueDisplay.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ChangeValueDisplay.java
@ -1,8 +1,6 @@
 
 package com.minres.scviewer.e4.application.handlers;

-import java.util.Iterator;
-
 import javax.inject.Named;

 import org.eclipse.e4.core.di.annotations.CanExecute;
@ -34,18 +32,14 @@ public class ChangeValueDisplay {
 			WaveformViewer wfv = (WaveformViewer)obj;
 			ISelection sel = wfv.getSelection();
 			if(!sel.isEmpty() && sel instanceof IStructuredSelection) {
-				Iterator<?> it = ((IStructuredSelection)sel).iterator();
-				it.next();
-				if(it.hasNext()) {
-						Object second = it.next();
-						if(second instanceof TrackEntry) {
-							TrackEntry.ValueDisplay val = TrackEntry.ValueDisplay.valueOf(param);
-							((TrackEntry)second).valueDisplay=val;
-							wfv.update();
-						}
+				for(Object elem:(IStructuredSelection)sel) {
+					if(elem instanceof TrackEntry) {
+						TrackEntry.ValueDisplay val= TrackEntry.ValueDisplay.valueOf(param);
+						((TrackEntry)elem).valueDisplay=val;
+					}
 				}
+				wfv.update();
 			}
 		}
 	}
-		
 }
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ChangeWaveformDisplay.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ChangeWaveformDisplay.java
@ -1,8 +1,6 @@
 
 package com.minres.scviewer.e4.application.handlers;

-import java.util.Iterator;
-
 import javax.inject.Named;

 import org.eclipse.e4.core.di.annotations.CanExecute;
@ -34,16 +32,13 @@ public class ChangeWaveformDisplay {
 			WaveformViewer wfv = (WaveformViewer)obj;
 			ISelection sel = wfv.getSelection();
 			if(!sel.isEmpty() && sel instanceof IStructuredSelection) {
-				Iterator<?> it = ((IStructuredSelection)sel).iterator();
-				it.next();
-				if(it.hasNext()) {
-						Object second = it.next();
-						if(second instanceof TrackEntry) {
-							TrackEntry.WaveDisplay val= TrackEntry.WaveDisplay.valueOf(param);
-							((TrackEntry)second).waveDisplay=val;
-							wfv.update();
-						}
+				for(Object elem:(IStructuredSelection)sel) {
+					if(elem instanceof TrackEntry) {
+						TrackEntry.WaveDisplay val= TrackEntry.WaveDisplay.valueOf(param);
+						((TrackEntry)elem).waveDisplay=val;
+					}
 				}
+				wfv.update();
 			}
 		}
 	}
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/DeleteWaveformHandler.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/DeleteWaveformHandler.java
@ -17,23 +17,30 @@ import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
 import org.eclipse.jface.viewers.IStructuredSelection;

-import com.minres.scviewer.database.IWaveform;
+import com.minres.scviewer.database.ui.TrackEntry;
 import com.minres.scviewer.e4.application.parts.WaveformViewer;

 public class DeleteWaveformHandler {
 	
+	@SuppressWarnings("unchecked")
 	@CanExecute
 	public Boolean canExecute(ESelectionService selectionService){
 		Object o = selectionService.getSelection();
-		return o instanceof IStructuredSelection && ((IStructuredSelection)o).getFirstElement() instanceof IWaveform;
+		if(o instanceof IStructuredSelection) {
+			IStructuredSelection sel = (IStructuredSelection) o;
+			if(sel.size()>0)
+				return sel.toList().stream().allMatch(e-> e instanceof TrackEntry);
+			else
+				return false;
+		} else
+			return false;
 	}
 	
 	@Execute
 	public void execute(ESelectionService selectionService, MPart activePart) {
 		Object o = activePart.getObject();
-		Object sel = selectionService.getSelection();
-		if(o instanceof WaveformViewer && ((IStructuredSelection)sel).getFirstElement() instanceof IWaveform){
-			((WaveformViewer)o).removeStreamFromList((IWaveform) ((IStructuredSelection)sel).getFirstElement());
+		if(o instanceof WaveformViewer){
+			((WaveformViewer)o).removeSelectedStreamsFromList();
 		}	
 	}	
 }
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties
@ -35,6 +35,7 @@ TransactionDetails_20=Time
 TransactionDetails_21=End time
 TransactionDetails_3=Value
 TransactionDetails_4=Relation
+WaveformPreferencesPage_description=Default Waveform Window Settings
 WaveformPreferencesPage_1=Color for 
 WaveformViewer_13=Database Load Status
 WaveformViewer_14=Database Load Cancelled
@ -55,3 +56,27 @@ WaveStatusBarControl_5=C:
 WaveStatusBarControl_6=M:
 WaveStatusBarControl_7=C-M:
 WaveStatusBarControl_8=Z:
+line=Track line
+line_highlite=higlighted Track line 
+track_bg_even=even Track Background
+track_bg_odd=odd Track Background
+track_bg_highlite=highlighted Track Background
+tx_bg=Transaction Background
+tx_bg_highlite=highlighted Transaction Background
+tx_border=Transaction Border
+signal0=Signal Value '0'
+signal1=Signal Value '1'
+signalz=Signal Value 'Z'
+signalx=Signal Value 'X'
+signalu=Signal Value 'U'
+signal_text=Signal text
+signal_real=Signal real Value
+signal_nan=Signal NaN Value
+cursor=Cursor
+cursor_drag=dragged Cursor
+cursor_text=Cursor Text
+marker=Marker
+marker_text=Marker TExt
+rel_arrow=Relation arrow
+rel_arrow_highlite=highlighted Relation arrorw
+
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
@ -90,16 +90,16 @@ import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.IWaveformDb;
 import com.minres.scviewer.database.IWaveformDbFactory;
 import com.minres.scviewer.database.RelationType;
-import com.minres.scviewer.database.swt.Constants;
-import com.minres.scviewer.database.swt.ToolTipContentProvider;
-import com.minres.scviewer.database.swt.ToolTipHelpTextProvider;
-import com.minres.scviewer.database.swt.WaveformViewerFactory;
 import com.minres.scviewer.database.ui.GotoDirection;
 import com.minres.scviewer.database.ui.ICursor;
-import com.minres.scviewer.database.ui.IWaveformViewer;
+import com.minres.scviewer.database.ui.IWaveformView;
 import com.minres.scviewer.database.ui.TrackEntry;
 import com.minres.scviewer.database.ui.TrackEntry.ValueDisplay;
 import com.minres.scviewer.database.ui.TrackEntry.WaveDisplay;
+import com.minres.scviewer.database.ui.swt.Constants;
+import com.minres.scviewer.database.ui.swt.ToolTipContentProvider;
+import com.minres.scviewer.database.ui.swt.ToolTipHelpTextProvider;
+import com.minres.scviewer.database.ui.swt.WaveformViewFactory;
 import com.minres.scviewer.database.ui.WaveformColors;
 import com.minres.scviewer.e4.application.Messages;
 import com.minres.scviewer.e4.application.internal.status.WaveStatusBarControl;
@ -164,10 +164,10 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	private static int disposeListenerNumber = 0;
 	
 	/** The factory. */
-	WaveformViewerFactory factory = new WaveformViewerFactory();
+	WaveformViewFactory factory = new WaveformViewFactory();

 	/** The waveform pane. */
-	private IWaveformViewer waveformPane;
+	private IWaveformView waveformPane;

 	/** get UISynchronize injected as field */
 	@Inject UISynchronize sync;
@ -217,7 +217,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	private Object detailsSettings;

 	/** The navigation relation type. */
-	private RelationType navigationRelationType=IWaveformViewer.NEXT_PREV_IN_STREAM ;
+	private RelationType navigationRelationType=IWaveformView.NEXT_PREV_IN_STREAM ;

 	/** The file monitor. */
 	FileMonitor fileMonitor = new FileMonitor();
@ -262,7 +262,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 		//set selection to empty selection when opening a new waveformPane
 		selectionService.setSelection(new StructuredSelection());
 		
-		waveformPane.addPropertyChangeListener(IWaveformViewer.CURSOR_PROPERTY, new PropertyChangeListener() {
+		waveformPane.addPropertyChangeListener(IWaveformView.CURSOR_PROPERTY, new PropertyChangeListener() {
 			@Override
 			public void propertyChange(PropertyChangeEvent evt) {
 				Long time = (Long) evt.getNewValue();
@ -272,7 +272,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis

 			}
 		});
-		waveformPane.addPropertyChangeListener(IWaveformViewer.MARKER_PROPERTY, new PropertyChangeListener() {
+		waveformPane.addPropertyChangeListener(IWaveformView.MARKER_PROPERTY, new PropertyChangeListener() {
 			@Override
 			public void propertyChange(PropertyChangeEvent evt) {
 				Long time = (Long) evt.getNewValue();
@ -478,13 +478,13 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	
 	@Inject
 	@Optional
-	public void reactOnShowHoverChange(@Preference(value = PreferenceConstants.SHOW_HOVER) Boolean hover) {
+	public void reactOnShowHoverChange(@Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE, value = PreferenceConstants.SHOW_HOVER) Boolean hover) {
 		showHover=hover;
 	}
 	
 	@Inject
 	@Optional
-	public void reactOnReloadDatabaseChange(@Preference(value = PreferenceConstants.DATABASE_RELOAD) Boolean checkForUpdates) {
+	public void reactOnReloadDatabaseChange(@Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE, value = PreferenceConstants.DATABASE_RELOAD) Boolean checkForUpdates) {
 		if (checkForUpdates) {
 			fileChecker = fileMonitor.addFileChangeListener(WaveformViewer.this, filesToLoad, FILE_CHECK_INTERVAL);
 		} else { 
@ -1005,55 +1005,13 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 		setFocus();
 	}

-	/**
-	 * Removes the stream from list.
-	 *
-	 * @param stream the stream
-	 */
-	public void removeStreamFromList(IWaveform stream) {
-		TrackEntry trackEntry = waveformPane.getEntryForStream(stream);
-		List<TrackEntry> streams = waveformPane.getStreamList();
-		ISelection sel = waveformPane.getSelection();
-		TrackEntry newSelection=null;
-		
-		if(sel instanceof IStructuredSelection && ((IStructuredSelection) sel).size()==2) {
-				Iterator<?> it = ((IStructuredSelection)sel).iterator();
-				it.next();
-				int idx = streams.indexOf(it.next());
-				
-				if(idx==streams.size()-1) {
-					//last stream gets deleted, no more selection
-					if(idx==0) {
-						newSelection=null;
-					}
-					//more than 1 stream left, last gets deleted, selection jumps to new last stream
-					else {
-						newSelection=streams.get(idx-1);
-					}
-				}
-				//more than 1 stream left, any stream but the last gets deleted, selection jumps to the next stream
-				else {
-					newSelection=streams.get(idx+1);
-				}
-		}
-		waveformPane.setSelection(new StructuredSelection());
-		streams.remove(trackEntry);
-		if(newSelection!=null) {
-			Object[] o = {newSelection};
-			waveformPane.setSelection(new StructuredSelection(o));
-		}
+	public void removeSelectedStreamsFromList() {
+		waveformPane.deleteSelectedTracks();
 	}

-	/**
-	 * Removes the streams from list.
-	 *
-	 * @param iWaveforms the i waveforms
-	 */
-	public void removeStreamsFromList(IWaveform[] iWaveforms) {
-		for (IWaveform stream : iWaveforms)
-			removeStreamFromList(stream);
+	public void removeStreamFromList(ISelection sel) {
+		waveformPane.deleteSelectedTracks();
 	}
-
 	/**
 	 * Move selected.
 	 *
@ -1215,7 +1173,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	 */
 	public List<RelationType> getAllRelationTypes() {
 		List<RelationType> res =new ArrayList<>();
-		res.add(IWaveformViewer.NEXT_PREV_IN_STREAM);
+		res.add(IWaveformView.NEXT_PREV_IN_STREAM);
 		res.addAll(database.getAllRelationTypes());
 		return res;
 	}
@ -1227,7 +1185,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	 */
 	public List<RelationType> getSelectionRelationTypes() {
 		List<RelationType> res =new ArrayList<>();
-		res.add(IWaveformViewer.NEXT_PREV_IN_STREAM);
+		res.add(IWaveformView.NEXT_PREV_IN_STREAM);
 		ISelection selection = waveformPane.getSelection();
 		if(selection instanceof IStructuredSelection && !selection.isEmpty()){
 			IStructuredSelection sel=(IStructuredSelection) selection;
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/WaveformPreferencesPage.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/WaveformPreferencesPage.java
@ -10,6 +10,9 @@
 *******************************************************************************/
 package com.minres.scviewer.e4.application.preferences;

+import java.lang.reflect.Field;
+import java.util.HashMap;
+
 import org.eclipse.jface.preference.ColorFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;

@ -26,6 +29,7 @@ public class WaveformPreferencesPage extends FieldEditorPreferencePage {
 	 */
 	public WaveformPreferencesPage() {
 		super(GRID);
+		setDescription(Messages.WaveformPreferencesPage_description);
 	}

 	/* (non-Javadoc)
@ -33,9 +37,18 @@ public class WaveformPreferencesPage extends FieldEditorPreferencePage {
 	 */
 	@Override
 	protected void createFieldEditors() {
-
+		Field[] declaredFields = Messages.class.getDeclaredFields();
+		HashMap<String, String> staticFields = new HashMap<String, String>();
+		for (Field field : declaredFields) {
+		    if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {
+		        try {
+					staticFields.put(field.getName(), (String)field.get(null));
+				} catch (IllegalArgumentException | IllegalAccessException e) {}
+		    }
+		}
 		for (WaveformColors c : WaveformColors.values()) {
-			addField(new ColorFieldEditor(c.name() + "_COLOR", Messages.WaveformPreferencesPage_1 + c.name().toLowerCase(), //$NON-NLS-1$
+			addField(new ColorFieldEditor(c.name() + "_COLOR", 
+					Messages.WaveformPreferencesPage_1 + staticFields.get(c.name().toLowerCase()), //$NON-NLS-1$
 					getFieldEditorParent()));
 		}
 	}
--- 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
@ -68,7 +68,9 @@ public class TxDbContentProvider implements ITreeContentProvider {
 	 */
 	@Override
 	public Object[] getElements(Object inputElement) {
-		if(inputElement instanceof IHierNode){
+		if(inputElement instanceof IWaveformDb){
+			return new Object[]{};
+		}else if(inputElement instanceof IHierNode){
 			Collection<IHierNode> res = Collections2.filter(((IHierNode)inputElement).getChildNodes(), new Predicate<IHierNode>(){
 				@Override
 				public boolean apply(IHierNode arg0) {
@ -82,8 +84,6 @@ public class TxDbContentProvider implements ITreeContentProvider {
 			return res.toArray();
 		}else if(inputElement instanceof List<?>){
 			return ((List<?>)inputElement).toArray();
-		}else if(inputElement instanceof IWaveformDb){
-			return new Object[]{};
 		} else
 			return null;
 	}
--- a/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF
@ -6,7 +6,6 @@ Bundle-Version: 1.0.1.qualifier
 Bundle-Activator: com.minres.scviewer.ui.TxEditorPlugin
 Bundle-Vendor: MINRES Technologies GmbH
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
- com.minres.scviewer.database.ui;bundle-version="1.0.0",
 com.minres.scviewer.database.ui.swt;bundle-version="1.0.0",
 org.eclipse.core.runtime,
 org.eclipse.core.resources,
--- a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java
+++ b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java
@ -48,10 +48,10 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.IWaveformDb;
 import com.minres.scviewer.database.IWaveformDbFactory;
-import com.minres.scviewer.database.swt.WaveformViewerFactory;
 import com.minres.scviewer.database.ui.GotoDirection;
-import com.minres.scviewer.database.ui.IWaveformViewer;
+import com.minres.scviewer.database.ui.IWaveformView;
 import com.minres.scviewer.database.ui.TrackEntry;
+import com.minres.scviewer.database.ui.swt.WaveformViewFactory;
 import com.minres.scviewer.ui.views.TxOutlinePage;

 public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPageContributor {
@ -78,7 +78,7 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage

 	public static final String WAVE_ACTION_ID = "com.minres.scviewer.ui.action.AddToWave";

-	private IWaveformViewer txDisplay;
+	private IWaveformView txDisplay;

 	/** This is the root of the editor's model. */
 	private IWaveformDb database;
@ -112,10 +112,10 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage
 				}		
 			}
 		});
-		WaveformViewerFactory factory = new WaveformViewerFactory();
+		WaveformViewFactory factory = new WaveformViewFactory();
 		txDisplay = factory.createPanel(parent);
 		txDisplay.setMaxTime(0);
-		txDisplay.addPropertyChangeListener(IWaveformViewer.CURSOR_PROPERTY, new PropertyChangeListener() {
+		txDisplay.addPropertyChangeListener(IWaveformView.CURSOR_PROPERTY, new PropertyChangeListener() {
            @Override
            public void propertyChange(PropertyChangeEvent evt) {
                Long time = (Long) evt.getNewValue();
--- a/pom.xml
+++ b/pom.xml
@ -13,7 +13,6 @@
 		<module>plugins/com.minres.scviewer.database.text</module>
 		<module>plugins/com.minres.scviewer.database.vcd</module>
 		<module>tests/com.minres.scviewer.database.test</module>
-		<module>plugins/com.minres.scviewer.database.ui</module>
 		<module>plugins/com.minres.scviewer.database.ui.swt</module>
 		<module>plugins/com.minres.scviewer.e4.application</module>
 		<module>plugins/com.minres.scviewer.ui</module>
Author	SHA1	Message	Date
eyck	3de6c9900c	Merge branch 'release/2.7.0'	2020-07-15 22:08:05 +02:00
eyck	ef1f2a758a	fix wrongly shown signals and streams in table	2020-07-15 21:58:49 +02:00
eyck	3e6d5bd33e	update version numbers	2020-07-15 21:48:41 +02:00
eyck	26968b8521	add multi-selection in waveform viewer	2020-07-15 21:43:07 +02:00
eyck	611cfc7b46	change package structure	2020-07-15 21:42:10 +02:00
eyck	8cb77a555b	refactor plugin structures	2020-07-15 21:39:30 +02:00
eyck	b4a7f032f5	update versions	2020-07-11 21:05:04 +02:00
eyck	62e0ec2008	Merge branch 'release/v2.6.2'	2020-07-11 19:57:17 +02:00
eyck	f6cc12e8c3	fix analog painting calculation issue	2020-07-11 19:36:45 +02:00
eyck	b38b268fcb	refactor class names	2020-07-11 19:36:28 +02:00
eyck	55a14edc9d	improve preferences handling and textual representation	2020-06-21 17:06:18 +02:00
eyck	b170fb3c2a	Merge branch 'release/2.6.1' into develop	2020-06-21 16:04:29 +02:00