Merge branch 'release/2.15.1'

This release fixes the following tickets:
* #62: Instead of or in addition to the Restore Default Zoom button, add
Full Zoom Out button.
* #64: Load multiple trace files and enable the possibility to view
signals from different files in a single window.
* partial #66: key shortcuts for actions like zoom in/out, go to
next/prev event etc
* #70: add full zoom and zoom between markers (once we had markers)
* #75: marker is often hiding events underneath for highlighting and
getting transaction details
* #82: Implement help for keyboard shortcuts

.launch/Build and deploy SCViewer.launch

@@ -12,7 +12,8 @@
     <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
     <stringAttribute key="M2_USER_SETTINGS" value=""/>
     <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/AdoptOpenJDK 8 [1.8.0_232]"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:com.minres.scviewer.parent}"/>
 </launchConfiguration>

README.md

@@ -18,14 +18,37 @@ The viewer has the following features
  - sqlite based 
  - visualization of transaction relations
 
-To build the plugins the Eclipse SDK or PDE can be used. In both cases the Groovy
+To build the plugins the Eclipse SDK or PDE can be used.
-eclipse plugin (http://groovy.codehaus.org/Eclipse+Plugin or Market) has to be
-installed.
 
-TODO
+Key Shortcuts
-====
+=============
-- add more tests
+
-- move to feature based product to allow automatic updates
+Legend:
-- improve graphics
+
-- catch-up e3 plugin to functionality of e4 product
+* Left Mouse Button: LMB
-- add calculated traces
+* Middle Mouse Button: MMB
+* Mouse Scroll wheel: MScrl
+* Context any means Name List, Value List or Waveform
+
+| Input     | Modifier | Context  | Action                            |
+|-----------|----------|----------|-----------------------------------|
+| LMB klick |          | any      | select                            |
+| LMB klick | Shift    | Waveform | move selected marker to position  |
+| LMB klick | Control  | Waveform | move cursor to position           |
+| LMB drag  |          | Waveform | zoom to range                     |
+| MMB klick |          | Waveform | move selected marker to position  |
+| MScrl     |          | any      | scroll window up/down             |
+| MScrl     | Shift    | any      | scroll window left/right          |
+| Key left  |          | Waveform | scroll window to the left (slow)  |
+| Key right |          | Waveform | scroll window to the right (slow) |
+| Key left  | Shift    | Waveform | scroll window to the left (fast)  |
+| Key right | Shift    | Waveform | scroll window to the right (fast) |
+| Key up    |          | Waveform | move selection up                 |
+| Key down  |          | Waveform | move selection down               |
+| Key up    | Control  | Waveform | move selected track up            |
+| Key down  | Control  | Waveform | move selected track down          |
+| Key +     | Control  | Waveform | zoom in                           |
+| Key -     | Control  | Waveform | zoom out                          |
+| Key Pos1  |          | Waveform | jump to selected marker           |
+| Key End   |          | Waveform | jump to cursor                    |
+| Key Del   |          | any      | delete selected entries           |

features/com.minres.scviewer.database.feature/feature.xml

@@ -27,12 +27,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="org.eclipse.core.runtime"/>
+      <import feature="org.eclipse.collections.feature" version="10.4.0.v20200820-2049"/>
    </requires>
 
    <plugin

features/com.minres.scviewer.database.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.2</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>3.0.0-SNAPSHOT</version>

features/com.minres.scviewer.e4.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.2</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.1.0-SNAPSHOT</version>

features/com.minres.scviewer.e4.platform.feature/feature.xml

@@ -29,6 +29,10 @@
          id="org.eclipse.emf.common"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.collections.feature"
+         version="0.0.0"/>
+
    <requires>
       <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.core.filesystem" version="1.3.0" match="compatible"/>

features/com.minres.scviewer.e4.platform.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.2</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.0.0-SNAPSHOT</version>

features/com.minres.scviewer.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.2</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.1.0-SNAPSHOT</version>

features/com.minres.scviewer.ui.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.2</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.1.0-SNAPSHOT</version>

plugins/com.minres.scviewer.database.sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.2</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java

@@ -14,12 +14,13 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.NavigableMap;
-import java.util.TreeMap;
 
+import com.minres.scviewer.database.EventEntry;
 import com.minres.scviewer.database.EventKind;
 import com.minres.scviewer.database.HierNode;
 import com.minres.scviewer.database.IEvent;
+import com.minres.scviewer.database.IEventList;
+import com.minres.scviewer.database.EventList;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.RelationType;
 import com.minres.scviewer.database.RelationTypeFactory;
@@ -35,7 +36,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	
 	private Integer maxConcurrency;
 
-	private TreeMap<Long, IEvent[]> events;
+	private IEventList events;
 
 	private List<RelationType> usedRelationsList;
 
@@ -71,9 +72,9 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	}
 
 	@Override
-	public  NavigableMap<Long, IEvent[]> getEvents(){
+	public  IEventList getEvents(){
 		if(events==null){
-			events=new TreeMap<>();
+			events=new EventList();
 			for(Entry<Integer, ITx> entry:getTransactions().entrySet()){
 				putEvent(new TxEvent(EventKind.BEGIN, entry.getValue()));
 				putEvent(new TxEvent(EventKind.END, entry.getValue()));
@@ -83,22 +84,13 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	}
 
 	private void putEvent(TxEvent ev){
-		Long time = ev.getTime();
+		events.put(ev.getTime(), ev);
-		if(events.containsKey(time)) {
-			IEvent[] oldV = events.get(time);
-			IEvent[] newV = new IEvent[oldV.length+1];
-			System.arraycopy(oldV, 0, newV, 0, oldV.length);
-			newV[oldV.length]=ev;
-			events.put(time, newV);
-		} else {
-			events.put(time, new IEvent[] {ev});
-		}
 	}
 
 	protected abstract Map<Integer, ITx> getTransactions();
 
 	@Override
-	public IEvent[] getEventsAtTime(Long time) {
+	public IEvent[] getEventsAtTime(long time) {
 		return getEvents().get(time);
 	}
 
@@ -113,12 +105,12 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	}
 
 	@Override
-	public IEvent[] getEventsBeforeTime(Long time) {
+	public IEvent[] getEventsBeforeTime(long time) {
-		Entry<Long, IEvent[]> e = events.floorEntry(time);
+		EventEntry e = events.floorEntry(time);
 		if(e==null)
 			return new IEvent[]{};
 		else
-			return  events.floorEntry(time).getValue();
+			return  events.floorEntry(time).events;
 	}
 
 	@Override

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java

@@ -48,7 +48,7 @@ public class SQLiteDbLoader implements IWaveformDbLoader {
 	protected PropertyChangeSupport pcs = new PropertyChangeSupport(this);
 
 	@Override
-	public Long getMaxTime() {
+	public long getMaxTime() {
 		SQLiteDatabaseSelectHandler<ScvTxEvent> handler = new SQLiteDatabaseSelectHandler<>(ScvTxEvent.class,
 				database, "time = (SELECT MAX(time) FROM ScvTxEvent)");
 		try {

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java

@@ -37,8 +37,8 @@ public class Tx implements ITx {
 	private TxGenerator trGenerator;
 	private ScvTx scvTx;
 	private List<ITxAttribute> attributes;
-	private Long begin;
+	private long begin=-1;
-	private Long end;
+	private long end=-1;
 	private List<ITxRelation> incoming;
 	private List<ITxRelation> outgoing;
 	
@@ -50,7 +50,7 @@ public class Tx implements ITx {
 	}
 
 	@Override
-	public Long getId() {
+	public long getId() {
 		return (long) scvTx.getId();
 	}
 
@@ -69,8 +69,8 @@ public class Tx implements ITx {
 	}
 
 	@Override
-	public Long getBeginTime() {
+	public long getBeginTime() {
-		if(begin==null){
+		if(begin<0){
 		SQLiteDatabaseSelectHandler<ScvTxEvent> handler = new SQLiteDatabaseSelectHandler<>(ScvTxEvent.class,
 				database, "tx="+scvTx.getId()+" AND type="+ AssociationType.BEGIN.ordinal());
 		try {
@@ -85,8 +85,8 @@ public class Tx implements ITx {
 	}
 
 	@Override
-	public Long getEndTime() {
+	public long getEndTime() {
-		if(end==null){
+		if(end<0){
 		SQLiteDatabaseSelectHandler<ScvTxEvent> handler = new SQLiteDatabaseSelectHandler<>(ScvTxEvent.class,
 				database, "tx="+scvTx.getId()+" AND type="+ AssociationType.END.ordinal());
 		try {
@@ -178,11 +178,11 @@ public class Tx implements ITx {
 
 	@Override
 	public int compareTo(ITx o) {
-		int res = this.getBeginTime().compareTo(o.getBeginTime());
+		int res = Long.compare(this.getBeginTime(), o.getBeginTime());
 		if(res!=0)	
 			return res;
 		else
-			return this.getId().compareTo(o.getId());
+			return Long.compare(this.getId(), o.getId());
 	}
 
 	@Override

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxEvent.java

@@ -28,7 +28,7 @@ public class TxEvent implements ITxEvent {
 	}
 
 	@Override
-	public Long getTime() {
+	public long getTime() {
 		return type==EventKind.BEGIN?tx.getBeginTime():tx.getEndTime();
 	}
 

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java

@@ -39,7 +39,7 @@ public class TxGenerator extends AbstractTxStream {
 	}
 
 	@Override
-	public Long getId() {
+	public long getId() {
 		return (long) scvGenerator.getId();
 	}
 
@@ -50,7 +50,7 @@ public class TxGenerator extends AbstractTxStream {
 
 	@Override
 	public boolean isSame(IWaveform other) {
-		return(other instanceof TxGenerator && this.getId().equals(other.getId()));
+		return(other instanceof TxGenerator && this.getId() == other.getId());
 	}
 
 	@Override

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java

@@ -49,7 +49,7 @@ public class TxStream extends AbstractTxStream {
 	}
 
 	@Override
-	public Long getId() {
+	public long getId() {
 		return (long) scvStream.getId();
 	}
 
@@ -89,13 +89,13 @@ public class TxStream extends AbstractTxStream {
 	}
 
 	@Override
-	public IEvent[] getEventsAtTime(Long time) {
+	public IEvent[] getEventsAtTime(long time) {
 		return getEvents().get(time);
 	}
 
 	@Override
 	public boolean isSame(IWaveform other) {
-		return(other instanceof TxStream && this.getId().equals(other.getId()));
+		return(other instanceof TxStream && this.getId() == other.getId());
 	}
 
 	@Override

plugins/com.minres.scviewer.database.text/.classpath

@@ -2,12 +2,12 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/mapdb-3.0.7.jar" sourcepath="lib/mapdb-3.0.7-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="jar:platform:/resource/com.minres.scviewer.database.text/lib/mapdb-3.0.7-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="lib/kotlin-stdlib-1.2.42.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/lz4-1.3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/elsa-3.0.0-M5.jar"/>

plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Textual transaction database
 Bundle-SymbolicName: com.minres.scviewer.database.text
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.1.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.osgi.framework;version="1.3.0"

plugins/com.minres.scviewer.database.text/OSGI-INF/component.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="TextDbLoader">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="TextDbLoaderFactory">
-   <implementation class="com.minres.scviewer.database.text.TextDbLoader"/>
+   <implementation class="com.minres.scviewer.database.text.TextDbLoaderFactory"/>
    <service>
-      <provide interface="com.minres.scviewer.database.IWaveformDbLoader"/>
+      <provide interface="com.minres.scviewer.database.IWaveformDbLoaderFactory"/>
    </service>
 </scr:component>

plugins/com.minres.scviewer.database.text/pom.xml

@@ -2,11 +2,11 @@
 	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.text</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>4.0.1-SNAPSHOT</version>
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.12.2</version>
+		<version>2.15.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/AbstractTxStream.java

@@ -12,14 +12,13 @@
 package com.minres.scviewer.database.text;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Map.Entry;
-import java.util.NavigableMap;
-import java.util.TreeMap;
 
+import com.minres.scviewer.database.EventEntry;
+import com.minres.scviewer.database.EventList;
 import com.minres.scviewer.database.HierNode;
 import com.minres.scviewer.database.IEvent;
+import com.minres.scviewer.database.IEventList;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.WaveformType;
 import com.minres.scviewer.database.tx.ITx;
@@ -39,7 +38,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	protected TextDbLoader loader;
 
 	/** The events. */
-	TreeMap<Long, IEvent[]> events = new TreeMap<>();
+	IEventList events = new EventList();
 
 	/** The max concurrency. */
 	private int rowCount = -1;
@@ -73,14 +72,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	 * @param evt the evt
 	 */
 	public void addEvent(ITxEvent evt) {
-		if (!events.containsKey(evt.getTime()))
+		events.put(evt.getTime(), evt);
-			events.put(evt.getTime(), new IEvent[] { evt });
-		else {
-			IEvent[] evts = events.get(evt.getTime());
-			IEvent[] newEvts = Arrays.copyOf(evts, evts.length + 1);
-			newEvts[evts.length] = evt;
-			events.put(evt.getTime(), newEvts);
-		}
 	}
 
 	/**
@@ -89,7 +81,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	 * @return the events
 	 */
 	@Override
-	public NavigableMap<Long, IEvent[]> getEvents() {
+	public IEventList getEvents() {
 		return events;
 	}
 
@@ -100,7 +92,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	 * @return the events at time
 	 */
 	@Override
-	public IEvent[] getEventsAtTime(Long time) {
+	public IEvent[] getEventsAtTime(long time) {
 		return events.get(time);
 	}
 
@@ -111,12 +103,12 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	 * @return the events before time
 	 */
 	@Override
-	public IEvent[] getEventsBeforeTime(Long time) {
+	public IEvent[] getEventsBeforeTime(long time) {
-		Entry<Long, IEvent[]> e = events.floorEntry(time);
+		EventEntry e = events.floorEntry(time);
 		if (e == null)
 			return new IEvent[] {};
 		else
-			return events.floorEntry(time).getValue();
+			return events.floorEntry(time).events;
 	}
 
 	/**
@@ -135,7 +127,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	 * @return the id
 	 */
 	@Override
-	public Long getId() {
+	public long getId() {
 		return id;
 	}
 
@@ -159,8 +151,8 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 			return;
 		ArrayList<Long> rowEndTime = new ArrayList<>();
 		HashMap<Long, Integer> rowByTxId = new HashMap<>();
-		for(Entry<Long, IEvent[]> entry: events.entrySet()) {
+		for(EventEntry entry: events) {
-			for(IEvent evt:entry.getValue()) {
+			for(IEvent evt:entry.events) {
 				TxEvent txEvt = (TxEvent) evt;
 				ITx tx = txEvt.getTransaction();
 				int rowIdx = 0;

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java

@@ -131,7 +131,7 @@ public class TextDbLoader implements IWaveformDbLoader {
 	 * @return the max time
 	 */
 	@Override
-	public Long getMaxTime() {
+	public long getMaxTime() {
 		return maxTime;
 	}
 
@@ -167,7 +167,9 @@ public class TextDbLoader implements IWaveformDbLoader {
 	 */
 	@Override
 	public Collection<IWaveform> getAllWaves() {
-		return new ArrayList<>(txStreams.values());
+		ArrayList<IWaveform> ret =  new ArrayList<>(txStreams.values());
+		ret.addAll(txGenerators.values());
+		return ret;
 	}
 
 	/**
@@ -343,10 +345,10 @@ public class TextDbLoader implements IWaveformDbLoader {
 			String curLine = reader.readLine();
 			String nextLine = null;
 			while ((nextLine = reader.readLine()) != null && curLine != null) {
-				curLine = parseLine(curLine, nextLine);
+				curLine = parseLine(curLine, nextLine, false);
 			}
 			if (curLine != null)
-				parseLine(curLine, nextLine);
+				parseLine(curLine, nextLine, true);
 			for(Entry<Long, ScvTx> e: transactionById.entrySet()) {
 				ScvTx scvTx = e.getValue();
 				scvTx.endTime=loader.maxTime;
@@ -383,16 +385,16 @@ public class TextDbLoader implements IWaveformDbLoader {
 		 * @throws IOException Signals that an I/O exception has occurred.
 		 * @throws InputFormatException Signals that the input format is wrong
 		 */
-		private String parseLine(String curLine, String nextLine) throws IOException, InputFormatException {
+		private String parseLine(String curLine, String nextLine, boolean last) throws IOException, InputFormatException {
 			String[] tokens = curLine.split("\\s+");
-			if ("tx_record_attribute".equals(tokens[0])) {
+			if ("tx_record_attribute".equals(tokens[0]) && tokens.length>4) {
 				Long id = Long.parseLong(tokens[1]);
 				String name = tokens[2].substring(1, tokens[2].length()-1);
 				DataType type = DataType.valueOf(tokens[3]);
 				String remaining = tokens.length > 5 ? String.join(" ", Arrays.copyOfRange(tokens, 5, tokens.length)) : "";
 				TxAttributeType attrType = getAttrType(name, type, AssociationType.RECORD);
 				transactionById.get(id).attributes.add(new TxAttribute(attrType, getAttrString(attrType, remaining)));
-			} else if ("tx_begin".equals(tokens[0])) {
+			} else if ("tx_begin".equals(tokens[0]) && tokens.length>4) {
 				Long id = Long.parseLong(tokens[1]);
 				Long genId = Long.parseLong(tokens[2]);
 				TxGenerator gen = loader.txGenerators.get(genId);
@@ -411,7 +413,7 @@ public class TextDbLoader implements IWaveformDbLoader {
 					}
 				}
 				transactionById.put(id, scvTx);
-			} else if ("tx_end".equals(tokens[0])) {
+			} else if ("tx_end".equals(tokens[0]) && tokens.length>4) {
 				Long id = Long.parseLong(tokens[1]);
 				ScvTx scvTx = transactionById.get(id);
 				assert Long.parseLong(tokens[2]) == scvTx.generatorId;
@@ -441,7 +443,7 @@ public class TextDbLoader implements IWaveformDbLoader {
 				}
 				txSink.put(scvTx.getId(), scvTx);
 				transactionById.remove(id);
-			} else if ("tx_relation".equals(tokens[0])) {
+			} else if ("tx_relation".equals(tokens[0]) && tokens.length>3) {
 				Long tr2 = Long.parseLong(tokens[2]);
 				Long tr1 = Long.parseLong(tokens[3]);
 				String relType = tokens[1].substring(1, tokens[1].length() - 1);
@@ -481,7 +483,7 @@ public class TextDbLoader implements IWaveformDbLoader {
 				}
 			} else if (")".equals(tokens[0])) {
 				generator = null;
-			} else
+			} else if(!last)			
 				throw new InputFormatException("Don't know what to do with: '" + curLine + "'");
 			return nextLine;
 		}

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoaderFactory.java

@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2012 IT Just working.
+ * Copyright (c) 2020 MINRES Technologies GmbH
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IT Just working - initial API and implementation
+ *******************************************************************************/
+package com.minres.scviewer.database.text;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.GZIPInputStream;
+
+import com.minres.scviewer.database.IWaveformDbLoader;
+import com.minres.scviewer.database.IWaveformDbLoaderFactory;
+
+/**
+ * The Class TextDbLoader.
+ */
+public class TextDbLoaderFactory implements IWaveformDbLoaderFactory {
+
+	/** The Constant x. */
+	static final byte[] x = "scv_tr_stream".getBytes();
+
+	/**
+	 * Checks if f is gzipped.
+	 *
+	 * @param f the f
+	 * @return true, if is gzipped
+	 */
+	private static boolean isGzipped(File f) {
+		try (InputStream is = new FileInputStream(f)) {
+			byte[] signature = new byte[2];
+			int nread = is.read(signature); // read the gzip signature
+			return nread == 2 && signature[0] == (byte) 0x1f && signature[1] == (byte) 0x8b;
+		} catch (IOException e) {
+			return false;
+		}
+	}
+
+	/**
+	 * Can load.
+	 *
+	 * @param inputFile the input file
+	 * @return true, if successful
+	 */
+	@Override
+	public boolean canLoad(File inputFile) {
+		if (!inputFile.isDirectory() && inputFile.exists()) {
+			boolean gzipped = isGzipped(inputFile);
+			try(InputStream stream = gzipped ? new GZIPInputStream(new FileInputStream(inputFile)) : new FileInputStream(inputFile)){
+				byte[] buffer = new byte[x.length];
+				int readCnt = stream.read(buffer, 0, x.length);
+				if (readCnt == x.length) {
+					for (int i = 0; i < x.length; i++)
+						if (buffer[i] != x[i])
+							return false;
+				}
+				return true;
+			} catch (Exception e) {
+				return false;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public IWaveformDbLoader getLoader() {
+		return new TextDbLoader();
+	}
+}

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/Tx.java

@@ -102,11 +102,11 @@ class Tx implements ITx {
 	 */
 	@Override
 	public int compareTo(ITx o) {
-		int res = getBeginTime().compareTo(o.getBeginTime());
+		int res = Long.compare(getBeginTime(), o.getBeginTime());
 		if (res != 0)
 			return res;
 		else
-			return getId().compareTo(o.getId());
+			return Long.compare(getId(), o.getId());
 	}
 
 	/**
@@ -150,7 +150,7 @@ class Tx implements ITx {
 	 * @return the id
 	 */
 	@Override
-	public Long getId() {
+	public long getId() {
 		return getScvTx().id;
 	}
 
@@ -180,7 +180,7 @@ class Tx implements ITx {
 	 * @return the begin time
 	 */
 	@Override
-	public Long getBeginTime() {
+	public long getBeginTime() {
 		if (beginTime < 0) {
 			ScvTx tx = scvTx==null?loader.getScvTx(id):getScvTx();
 			beginTime = tx.beginTime;
@@ -195,7 +195,7 @@ class Tx implements ITx {
 	 * @return the end time
 	 */
 	@Override
-	public Long getEndTime() {
+	public long getEndTime() {
 		if (endTime < 0) {
 			ScvTx tx = scvTx==null?loader.getScvTx(id):getScvTx();
 			beginTime = tx.beginTime;

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.java

@@ -95,7 +95,7 @@ class TxEvent implements ITxEvent {
 	 * @return the time
 	 */
 	@Override
-	public Long getTime() {
+	public long getTime() {
 		return time;
 	}
 

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.java

@@ -52,7 +52,7 @@ class TxGenerator extends AbstractTxStream {
 	 */
 	@Override
 	public boolean isSame(IWaveform other) {
-		return (other instanceof TxGenerator && this.getId().equals(other.getId()));
+		return (other instanceof TxGenerator && this.getId()==other.getId());
 	}
 
 	/**
@@ -82,5 +82,15 @@ class TxGenerator extends AbstractTxStream {
 	public String getKind() {
 		return stream.getKind();
 	}
+	
+	/**
+	 * Gets the full hierarchical name.
+	 *
+	 * @return the full name
+	 */
+	@Override
+	public String getFullName() {
+		return  ((AbstractTxStream)parent).getFullName()+"."+name;
+	}
 
 }

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.java

@@ -42,7 +42,7 @@ class TxStream extends AbstractTxStream {
 	 */
 	@Override
 	public boolean isSame(IWaveform other) {
-		return (other instanceof TxStream && this.getId().equals(other.getId()));
+		return (other instanceof TxStream && this.getId() == other.getId());
 	}
 
 	/**

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 database widget
 Bundle-SymbolicName: com.minres.scviewer.database.ui.swt
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.swt;bundle-version="3.103.1",

plugins/com.minres.scviewer.database.ui.swt/pom.xml

@@ -5,8 +5,8 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.2</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
   </parent>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
 </project>

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformView.java

@@ -27,10 +27,14 @@ import com.minres.scviewer.database.tx.ITx;
 
 public interface IWaveformView extends PropertyChangeListener, ISelectionProvider{
 
-	String CURSOR_PROPERTY = "cursor_time";
+	static final String CURSOR_PROPERTY = "cursor_time";
 	
-	String MARKER_PROPERTY = "marker_time";
+	static final String MARKER_PROPERTY = "marker_time";
 	
+	static final int CURSOR_POS = 0;
+	
+	static final int MARKER_POS = 1;
+
 	public static final RelationType NEXT_PREV_IN_STREAM = RelationTypeFactory.create("Prev/Next in stream"); 
 
 	public void addSelectionChangedListener(ISelectionChangedListener listener);
@@ -75,23 +79,17 @@ public interface IWaveformView extends PropertyChangeListener, ISelectionProvide
 	
     public void setHighliteRelation(RelationType relationType);
 
-	public long getMaxTime();
-
 	public void setMaxTime(long maxTime);
 
-	public void setZoomLevel(int scale);
-
-	public int getZoomLevel();
-
 	public void setCursorTime(long time);
 
-	public void setMarkerTime(long time, int index);
+	public void setMarkerTime(int marker, long time);
 
 	public long getCursorTime();
 
-	public int getSelectedMarkerId();
+	public int getSelectedMarker();
 
-	public long getMarkerTime(int index);
+	public long getMarkerTime(int marker);
 
 	public void addPropertyChangeListener(PropertyChangeListener listener);
 
@@ -101,21 +99,18 @@ public interface IWaveformView extends PropertyChangeListener, ISelectionProvide
 
 	public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener);
 
-	public String getScaledTime(long time);
-
-	public String[] getZoomLevels();
-
 	public List<ICursor> getCursorList();
 
-	public long getBaselineTime();
-
-	public void setBaselineTime(Long scale);
-	
 	public void scrollHorizontal(int percent);
 	
+	public void scrollTo(int pos);
+	
 	public void addDisposeListener( DisposeListener listener );
 
 	public void deleteSelectedTracks();
 
 	public TrackEntry addWaveform(IWaveform waveform, int pos);
+
+	public IWaveformZoom getWaveformZoom();
+	
 }

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformZoom.java

@@ -0,0 +1,24 @@
+package com.minres.scviewer.database.ui;
+
+public interface IWaveformZoom {
+	
+	long getMaxVisibleTime();
+
+	long getMinVisibleTime();
+
+	void setMinVisibleTime(long scale);
+
+	long getMaxTime();
+
+	long getScale();
+
+	void setScale(long factor);
+
+	void setVisibleRange(long startTime, long endTime);
+	
+	void centerAt(long time);
+	
+	void zoom(ZoomKind kind);
+
+	String timeToString(long time);
+}

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/ZoomKind.java

@@ -0,0 +1,3 @@
+package com.minres.scviewer.database.ui;
+
+public enum ZoomKind {IN, OUT, FIT, FULL}

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/Constants.java

@@ -1,14 +1,49 @@
 package com.minres.scviewer.database.ui.swt;
 
+import java.text.DecimalFormat;
+
 public class Constants {
 
-	public static final String[] UNIT_STRING={"fs", "ps", "ns", "us", "ms"};//, "s"};
+	public static final String[] UNIT_STRING={"fs", "ps", "ns", "us", "ms", "s"};
-    
+	public static final long[]   UNIT_MULTIPLIER={1l, 1000l, 1000l*1000, 1000l*1000*1000, 1000l*1000*1000*1000, 1000l*1000*1000*1000*1000 };
-    public static final int[] UNIT_MULTIPLIER={1, 3, 10, 30, 100, 300};
+
+    //public static final int[] UNIT_MULTIPLIER={1, 3, 10, 30, 100, 300};
+    public static final long[] SCALE_MULTIPLIER={1, 2, 5, 10, 20, 50, 100, 200, 500};
 
 	public static final String CONTENT_PROVIDER_TAG = "TOOLTIP_CONTENT_PROVIDER";
 	public static final String HELP_PROVIDER_TAG = "TOOLTIP_HELP_PROVIDER";
 	
+	public static final DecimalFormat TIME_FORMAT_FS  = new DecimalFormat("#"); 
+	public static final DecimalFormat TIME_FORMAT_PS  = new DecimalFormat("#"); 
+	public static final DecimalFormat TIME_FORMAT_NS  = new DecimalFormat("#.0##"); 
+	public static final DecimalFormat TIME_FORMAT_UMS = new DecimalFormat("#.0#####"); 
+	public static final long[] POWERS_OF_TEN = {
+			1L,
+			10L,
+			100L,
+			1_000L,
+			10_000L,
+			100_000L,
+			1_000_000L,
+			10_000_000L,
+			100_000_000L,
+			1_000_000_000L,
+			10_000_000_000L,
+			100_000_000_000L,
+			1_000_000_000_000L,
+			10_000_000_000_000L,
+			100_000_000_000_000L,
+			1_000_000_000_000_000L};
+
+	public static  DecimalFormat getTimeFormatForLevel(int idx) {
+		switch(idx) {
+		case 0:	return TIME_FORMAT_FS;
+		case 1:	return TIME_FORMAT_PS;
+		case 2:	return TIME_FORMAT_NS;
+		default:
+			return TIME_FORMAT_UMS;
+		}
+	}
 	private Constants() {}
 
 }

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java

@@ -24,7 +24,6 @@ import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Display;
 
 import com.minres.scviewer.database.IEvent;
-import com.minres.scviewer.database.IHierNode;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.RelationType;
 import com.minres.scviewer.database.tx.ITx;
@@ -76,14 +75,14 @@ public class ArrowPainter implements IPainter {
 		this.tx = newTx;
 		iRect = new LinkedList<>();
 		oRect = new LinkedList<>();
-		scaleFactor = waveCanvas.getScaleFactor();
+		scaleFactor = waveCanvas.getScale();
 		if (tx != null) {
 			calculateGeometries();
 		}
 	}
 
 	private int getConcurrencyIndex(ITx tx) {
-		IEvent[] eventList = tx.getStream().getEvents().floorEntry(tx.getBeginTime()).getValue();
+		IEvent[] eventList = tx.getStream().getEventsBeforeTime(tx.getBeginTime());
 		Optional<Integer> res = Arrays.stream(eventList).map(e -> ((ITxEvent)e).getRowIndex()).findFirst();
 		return res.isPresent()? res.get():0;
 	}
@@ -110,48 +109,23 @@ public class ArrowPainter implements IPainter {
 	protected void deriveGeom(Collection<ITxRelation> relations, List<LinkEntry> res, boolean useTarget) {
 		for (ITxRelation iTxRelation : relations) {
 			ITx otherTx = useTarget ? iTxRelation.getTarget() : iTxRelation.getSource();
-			Rectangle bb = createLinkEntry(otherTx, otherTx.getStream());
+			for(IWaveform iWaveform: new IWaveform[]{otherTx.getStream(), otherTx.getGenerator()}) {
-			if(bb!=null){
+				if (waveCanvas.wave2painterMap.containsKey(iWaveform)) {
-				res.add(new LinkEntry(bb, iTxRelation.getRelationType()));
+					IWaveformPainter painter = waveCanvas.wave2painterMap.get(iWaveform);
-				return;
+					if(painter!=null) {
-			} else {
+						int height = waveCanvas.styleProvider.getTrackHeight();
-				for(IHierNode gen:otherTx.getStream().getChildNodes()) {
+						Rectangle bb = new Rectangle(
-					if(gen instanceof IWaveform) {
+								(int) (otherTx.getBeginTime() / scaleFactor),
-						bb = createLinkEntry(otherTx, (IWaveform) gen);
+								waveCanvas.rulerHeight + painter.getVerticalOffset() + height * getConcurrencyIndex(otherTx),
-						if(bb!=null){
+								(int) ((otherTx.getEndTime() - otherTx.getBeginTime()) / scaleFactor),
-							res.add(new LinkEntry(bb, iTxRelation.getRelationType()));
+								height);
-							return;
+						res.add(new LinkEntry(bb, iTxRelation.getRelationType()));				
-						}
 					}
 				}
 			}
 		}
 	}
 
-	private Rectangle createLinkEntry(ITx otherTx, IWaveform iWaveform) {
-		if (waveCanvas.wave2painterMap.containsKey(iWaveform)) {
-			IWaveformPainter painter = waveCanvas.wave2painterMap.get(otherTx.getStream());
-			if(painter==null) {
-				for(IHierNode gen:otherTx.getStream().getChildNodes()) {
-					if(gen instanceof IWaveform) {
-						 painter = waveCanvas.wave2painterMap.get(gen);
-						 if(painter!=null)
-							 break;
-					}
-				}
-			}
-			if(painter!=null) {
-				int height = waveCanvas.styleProvider.getTrackHeight();
-				return new Rectangle(
-						(int) (otherTx.getBeginTime() / scaleFactor),
-						waveCanvas.rulerHeight + painter.getVerticalOffset() + height * getConcurrencyIndex(otherTx),
-						(int) ((otherTx.getEndTime() - otherTx.getBeginTime()) / scaleFactor),
-						height);
-			}
-		}
-		return null;
-	}
-
 	@Override
 	public void paintArea(Projection proj, Rectangle clientRect) {
 		yCtrlOffset = waveCanvas.styleProvider.getTrackHeight()/2;
@@ -159,7 +133,7 @@ public class ArrowPainter implements IPainter {
 		Color highliteColor = waveCanvas.styleProvider.getColor(WaveformColors.REL_ARROW_HIGHLITE);
 
 		if(tx==null) return;
-		scaleFactor = waveCanvas.getScaleFactor();
+		scaleFactor = waveCanvas.getScale();
 		if(calculateGeometries())
 			return;
 		int correctionValue = (int)(selectionOffset);

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/CursorPainter.java

@@ -65,7 +65,7 @@ public class CursorPainter implements IPainter, ICursor {
 		Rectangle area = proj.unProject(clientRect);
 		if(!waveCanvas.painterList.isEmpty()){
 			
-			long scaleFactor=waveCanvas.getScaleFactor();
+			long scaleFactor=waveCanvas.getScale();
 			long beginPos = area.x;
 			
 			maxPosX = area.x + area.width;
@@ -83,8 +83,7 @@ public class CursorPainter implements IPainter, ICursor {
 				proj.drawLine(x, top, x, area.y+area.height);
 				proj.setBackground(drawColor);
 				proj.setForeground(textColor);
-				double dTime=time;
+				proj.drawText(waveCanvas.timeToString(time), x+1, top);
-				proj.drawText((dTime/waveCanvas.getScaleFactorPow10())+waveCanvas.getUnitStr(), x+1, top);
 			}
 		}
 	}	

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/RulerPainter.java

@@ -10,22 +10,21 @@
  *******************************************************************************/
 package com.minres.scviewer.database.ui.swt.internal;
 
-import java.text.DecimalFormat;
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.wb.swt.SWTResourceManager;
 
+import com.minres.scviewer.database.ui.swt.Constants;
+
 public class RulerPainter implements IPainter {
     protected final WaveformCanvas waveCanvas;
     
     static final int RULER_TICK_MINOR = 10;
     static final int RULER_TICK_MAJOR = 100;
        
-	static final DecimalFormat df = new DecimalFormat("#.00####"); 
-
     public RulerPainter(WaveformCanvas waveCanvas) {
         this.waveCanvas=waveCanvas;
     }
@@ -39,26 +38,26 @@ public class RulerPainter implements IPainter {
     	Color headerBgColor = waveCanvas.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
     	if(headerBgColor.isDisposed())
     		headerBgColor=SWTResourceManager.getColor(255,255,255);
-        String unit=waveCanvas.getUnitStr();
+    	
-        int unitMultiplier=waveCanvas.getUnitMultiplier();
+        long scaleFactor=waveCanvas.getScale();
-        long scaleFactor=waveCanvas.getScaleFactor();
+        long startTime=waveCanvas.getMinVisibleTime(); 
-
+        long endTime=waveCanvas.getMaxVisibleTime();
-        long startPos=area.x*scaleFactor; 
-        long startVal=startPos - proj.getTranslation().x*scaleFactor;
-        long endPos=startPos+area.width*scaleFactor;
-
-        long rulerTickMinor = RULER_TICK_MINOR*scaleFactor;
-        long rulerTickMajor = RULER_TICK_MAJOR*scaleFactor;
 
+        long multiplier = Constants.POWERS_OF_TEN[waveCanvas.getScaleMagnitude()];
+        long rulerTickMinor = RULER_TICK_MINOR*multiplier;
+        long rulerTickMajor = RULER_TICK_MAJOR*multiplier;
+        if((endTime-startTime)/rulerTickMinor>area.width/5) {
+        	rulerTickMinor*=10;
+        	rulerTickMajor*=10;
+        }
         int minorTickY = waveCanvas.rulerHeight-5;
         int majorTickY = waveCanvas.rulerHeight-15;
-        int textY=waveCanvas.rulerHeight-20;
+        int textY=waveCanvas.rulerHeight-30;
         int baselineY=waveCanvas.rulerHeight - 1;
         int bottom=waveCanvas.rulerHeight - 2;
 
-        long modulo = startVal % rulerTickMinor;
+        long startTickTime = startTime+rulerTickMinor-(startTime % rulerTickMinor);
-        long startMinorIncrPos = startPos+rulerTickMinor-modulo;
+        long majorTickDist = rulerTickMajor/scaleFactor;
-        long startMinorIncrVal = startVal+rulerTickMinor-modulo;
         
         gc.setBackground(waveCanvas.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
         gc.fillRectangle(new Rectangle(area.x, area.y, area.width, waveCanvas.rulerHeight));
@@ -66,13 +65,22 @@ public class RulerPainter implements IPainter {
         gc.fillRectangle(new Rectangle(area.x, area.y, area.width, baselineY));
         gc.setForeground(headerFgColor);
         gc.drawLine(area.x, area.y+bottom, area.x+area.width, area.y+bottom);
-        
+        int maxTextLength=0;
-        for (long pos = startMinorIncrPos, tick = startMinorIncrVal; pos < endPos; pos+= rulerTickMinor, tick += rulerTickMinor) {
+        for (long tickTime = startTickTime; tickTime < endTime; tickTime+= rulerTickMinor) {
-            int x0Pos = (int) (pos/scaleFactor);
+            if ((tickTime % rulerTickMajor) == 0) {
-            long x0Val = tick/scaleFactor;
+            	Point textSize = gc.textExtent(waveCanvas.timeToString(tickTime));
-            if ((tick % rulerTickMajor) == 0) {
+            	maxTextLength=textSize.x>maxTextLength?textSize.x:maxTextLength;
-                gc.drawText(df.format(x0Val*unitMultiplier)+unit, x0Pos, area.y+textY);
+            }
+        }
+        boolean drawEvery = majorTickDist>maxTextLength;
+        boolean drawText=true;
+        for (long tickTime = startTickTime; tickTime < endTime; tickTime+= rulerTickMinor) {
+            int x0Pos = (int) (tickTime/scaleFactor) + proj.getTranslation().x;
+            if ((tickTime % rulerTickMajor) == 0) {
+            	if(drawEvery ||  drawText)
+            		gc.drawText(waveCanvas.timeToString(tickTime), x0Pos, area.y+textY);
                 gc.drawLine(x0Pos, area.y+majorTickY, x0Pos,area.y+ bottom);
+                drawText=!drawText;
             } else {
                 gc.drawLine(x0Pos, area.y+minorTickY, x0Pos, area.y+bottom);
             }

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/SignalPainter.java

@@ -12,8 +12,6 @@ package com.minres.scviewer.database.ui.swt.internal;
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Map.Entry;
-import java.util.NavigableMap;
 
 import javax.swing.JPanel;
 
@@ -26,7 +24,9 @@ import org.eclipse.swt.graphics.Rectangle;
 
 import com.minres.scviewer.database.BitVector;
 import com.minres.scviewer.database.DoubleVal;
+import com.minres.scviewer.database.EventEntry;
 import com.minres.scviewer.database.IEvent;
+import com.minres.scviewer.database.IEventList;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.ui.TrackEntry;
 import com.minres.scviewer.database.ui.WaveformColors;
@@ -37,16 +37,16 @@ public class SignalPainter extends TrackPainter {
 		IEvent value;
 		boolean fromMap;
 
-		public SignalChange(Entry<Long, IEvent[]> entry) {
+		public SignalChange(EventEntry entry) {
-			time = entry.getKey();
+			time = entry.timestamp;
-			value = entry.getValue()[0];
+			value = entry.events[0];
 			fromMap = true;
 		}
 
-		public void set(Entry<Long, IEvent[]> entry, Long actTime) {
+		public void set(EventEntry entry, Long actTime) {
 			if (entry != null) {
-				time = entry.getKey();
+				time = entry.timestamp;
-				value = entry.getValue()[0];
+				value = entry.events[0];
 				fromMap = true;
 			} else {
 				time = actTime;
@@ -82,7 +82,7 @@ public class SignalPainter extends TrackPainter {
 	}
 
 	private int getXPosEnd(long time) {
-		long ltmp = time / this.waveCanvas.getScaleFactor();
+		long ltmp = time / this.waveCanvas.getScale();
 		return ltmp > maxPosX ? maxPosX : (int) ltmp;
 	}
 	
@@ -95,31 +95,26 @@ public class SignalPainter extends TrackPainter {
 		proj.setFillRule(SWT.FILL_EVEN_ODD);
 		proj.fillRectangle(area);
 
-		long scaleFactor = this.waveCanvas.getScaleFactor();
+		long scaleFactor = this.waveCanvas.getScale();
 		long beginPos = area.x;
 		long beginTime = beginPos*scaleFactor;
         long endTime = beginTime + area.width*scaleFactor;
 		
-		Entry<Long, IEvent[]> first = signal.getEvents().floorEntry(beginTime);
+		EventEntry first = signal.getEvents().floorEntry(beginTime);
-		Entry<Long, IEvent[]> last = signal.getEvents().floorEntry(endTime);
+		if (first == null)
-		if (first == null) {
-			if (last == null)
-				return;
 			first = signal.getEvents().firstEntry();
-		} else if (last == null) {
+		beginTime = first.timestamp;
-			last = signal.getEvents().lastEntry();
-		}
 		proj.setForeground(this.waveCanvas.styleProvider.getColor(WaveformColors.LINE));
 		proj.setLineStyle(SWT.LINE_SOLID);
 		proj.setLineWidth(1);
-		NavigableMap<Long, IEvent[]> entries = signal.getEvents().subMap(first.getKey(), false, last.getKey(), true);
+		IEventList entries = signal.getEvents().subMap(beginTime, true, endTime);
-		SignalChange left = new SignalChange(first);
+		SignalChange left = new SignalChange(entries.firstEntry());
-		SignalChange right = new SignalChange(entries.size() > 0 ? entries.firstEntry() : first);
+		SignalChange right = new SignalChange(entries.size() > 1 ? entries.higherEntry(left.time) : entries.firstEntry());
 		maxPosX = area.x + area.width;
 		yOffsetT = this.waveCanvas.styleProvider.getTrackHeight() / 5 + area.y;
 		yOffsetM = this.waveCanvas.styleProvider.getTrackHeight() / 2 + area.y;
 		yOffsetB = 4 * this.waveCanvas.styleProvider.getTrackHeight() / 5 + area.y;
-		int xSigChangeBeginVal = Math.max(area.x, (int) (left.time / this.waveCanvas.getScaleFactor()));
+		int xSigChangeBeginVal = Math.max(area.x, (int) (left.time / this.waveCanvas.getScale()));
 		int xSigChangeBeginPos = area.x;
 		int xSigChangeEndPos = Math.max(area.x, getXPosEnd(right.time));
 		
@@ -132,7 +127,7 @@ public class SignalPainter extends TrackPainter {
 				right.time = endTime;
 			} else {
 				multiple = true;
-				long eTime = (xSigChangeBeginVal + 1) * this.waveCanvas.getScaleFactor();
+				long eTime = (xSigChangeBeginVal + 1) * this.waveCanvas.getScale();
 				right.set(entries.floorEntry(eTime), endTime);
 				right.time = eTime;
 			}
@@ -152,16 +147,16 @@ public class SignalPainter extends TrackPainter {
 			multiple = false;
 			if (xSigChangeEndPos == xSigChangeBeginPos) {
 				multiple = true;
-				long eTime = (xSigChangeBeginPos + 1) * this.waveCanvas.getScaleFactor();
+				long eTime = (xSigChangeBeginPos + 1) * this.waveCanvas.getScale();
-				Entry<Long, IEvent[]> entry = entries.floorEntry(eTime);
+				EventEntry entry = entries.floorEntry(eTime);
-				if(entry!=null && entry.getKey()> right.time)
+				if(entry!=null && entry.timestamp> right.time)
 					right.set(entry, endTime);
 				xSigChangeEndPos = getXPosEnd(eTime);
 			}
 		} while (left.time < endTime);
 	}
 
-	private SignalStencil getStencil(GC gc, SignalChange left, NavigableMap<Long, IEvent[]> entries) {
+	private SignalStencil getStencil(GC gc, SignalChange left, IEventList entries) {
 		IEvent val = left.value;
 		if(val instanceof BitVector) {
 			BitVector bv = (BitVector) val;
@@ -253,15 +248,15 @@ public class SignalPainter extends TrackPainter {
 		private long maxVal;
 		private long minVal;
 		double yRange = (yOffsetB-yOffsetT);
-		public MultiBitStencilAnalog(NavigableMap<Long, IEvent[]> entries, Object left, boolean continous, boolean signed) {
+		public MultiBitStencilAnalog(IEventList entries, Object left, boolean continous, boolean signed) {
 			this.continous=continous;
 			this.signed=signed;
-			Collection<IEvent[]> values = entries.values();
+			Collection<EventEntry> ievents = entries.entrySet();
 			minVal=signed?((BitVector)left).toSignedValue():((BitVector)left).toUnsignedValue();
-			if(!values.isEmpty()) {
+			if(!ievents.isEmpty()) {
 				maxVal=minVal;
-				for (IEvent[] tp : entries.values())
+				for (EventEntry tp : ievents)
-					for(IEvent e: tp) {
+					for(IEvent e: tp.events) {
 						long v = signed?((BitVector)e).toSignedValue():((BitVector)e).toUnsignedValue();
 						maxVal=Math.max(maxVal, v);
 						minVal=Math.min(minVal, v);
@@ -358,15 +353,15 @@ public class SignalPainter extends TrackPainter {
 		
 		boolean continous=true;
 		
-		public RealStencil(NavigableMap<Long, IEvent[]> entries, Object left, boolean continous) {
+		public RealStencil(IEventList entries, Object left, boolean continous) {
 			this.continous=continous;
-			Collection<IEvent[]> values = entries.values();
+			Collection<EventEntry> values = entries.entrySet();
 			minVal=(Double) left;
 			range=2.0;
 			if(!values.isEmpty()) {
 				double maxVal=minVal;
-				for (IEvent[] val : entries.values())
+				for (EventEntry val : values)
-					for(IEvent e:val) {
+					for(IEvent e:val.events) {
 						double v = ((DoubleVal)e).value;
 						if(Double.isNaN(maxVal))
 							maxVal=v;

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java

@@ -10,8 +10,6 @@
  *******************************************************************************/
 package com.minres.scviewer.database.ui.swt.internal;
 
-import java.util.Map.Entry;
-import java.util.NavigableMap;
 import java.util.TreeMap;
 
 import org.eclipse.swt.SWT;
@@ -19,8 +17,10 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 
+import com.minres.scviewer.database.EventEntry;
 import com.minres.scviewer.database.EventKind;
 import com.minres.scviewer.database.IEvent;
+import com.minres.scviewer.database.IEventList;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.tx.ITx;
 import com.minres.scviewer.database.tx.ITxEvent;
@@ -36,6 +36,7 @@ public class StreamPainter extends TrackPainter{
 	private IWaveform stream;
 	private int txBase;
 	private int txHeight;
+	// TODO: remove TreeMap usage
 	private TreeMap<ITx, ITxEvent> seenTx;
 
 	public StreamPainter(WaveformCanvas waveCanvas, boolean even, TrackEntry trackEntry) {
@@ -66,15 +67,16 @@ public class StreamPainter extends TrackPainter{
 		proj.setFillRule(SWT.FILL_EVEN_ODD);
 		proj.fillRectangle(area);
 
-		long scaleFactor = this.waveCanvas.getScaleFactor();
+		long scaleFactor = this.waveCanvas.getScale();
 		long beginPos = area.x;
 		long beginTime = beginPos*scaleFactor;
 		long endTime = beginTime + area.width*scaleFactor;
 
-		Entry<Long,  IEvent[]> firstTx=stream.getEvents().floorEntry(beginTime);
+		IEventList events = stream.getEvents();
-		Entry<Long,  IEvent[]> lastTx=stream.getEvents().ceilingEntry(endTime);
+		EventEntry firstTx = events.floorEntry(beginTime);
-		if(firstTx==null) firstTx = stream.getEvents().firstEntry();
+		EventEntry lastTx = events.ceilingEntry(endTime);
-		if(lastTx==null) lastTx=stream.getEvents().lastEntry();
+		if(firstTx==null) firstTx = events.firstEntry();
+		if(lastTx==null) lastTx = events.lastEntry();
 		proj.setFillRule(SWT.FILL_EVEN_ODD);
 		proj.setLineStyle(SWT.LINE_SOLID);
 		proj.setLineWidth(1);
@@ -83,16 +85,15 @@ public class StreamPainter extends TrackPainter{
 		for( int y1=area.y+trackHeight/2; y1<area.y+trackEntry.height; y1+=trackHeight)
 			proj.drawLine(area.x, y1, area.x+area.width, y1);
 		if(firstTx==lastTx) {
-			for(IEvent txEvent: firstTx.getValue())
+			for(IEvent txEvent: firstTx.events)
 				drawTx(proj, area, ((ITxEvent)txEvent).getTransaction(), ((ITxEvent)txEvent).getRowIndex(), false);
 		}else{
 			seenTx.clear();
-			NavigableMap<Long, IEvent[]> entries = stream.getEvents().subMap(firstTx.getKey(), true, lastTx.getKey(), true);
 			ITxEvent highlighed=null;
 			proj.setForeground(this.waveCanvas.styleProvider.getColor(WaveformColors.LINE));
 			long selectedId=waveCanvas.currentSelection!=null? waveCanvas.currentSelection.getId():-1;
-			for(Entry<Long, IEvent[]> entry: entries.entrySet())
+			for(EventEntry entry: events.subMap(firstTx.timestamp, true, lastTx.timestamp))
-				for(IEvent e:entry.getValue()){
+				for(IEvent e:entry.events){
 					ITxEvent evt = (ITxEvent) e;
 					ITx tx = evt.getTransaction();
 					if(selectedId==tx.getId())
@@ -129,8 +130,8 @@ public class StreamPainter extends TrackPainter{
 
 		int offset = concurrencyIndex*this.waveCanvas.styleProvider.getTrackHeight();
 		Rectangle bb = new Rectangle(
-				(int)(tx.getBeginTime()/this.waveCanvas.getScaleFactor()), area.y+offset+txBase,
+				(int)(tx.getBeginTime()/this.waveCanvas.getScale()), area.y+offset+txBase,
-				(int)((tx.getEndTime()-tx.getBeginTime())/this.waveCanvas.getScaleFactor()), txHeight);
+				(int)((tx.getEndTime()-tx.getBeginTime())/this.waveCanvas.getScale()), txHeight);
 
 		if(bb.x+bb.width<area.x || bb.x>area.x+area.width) return;
 		if(bb.width==0){
@@ -154,12 +155,12 @@ public class StreamPainter extends TrackPainter{
 
 	public ITx getClicked(Point point) {
 		int lane=point.y/waveCanvas.styleProvider.getTrackHeight();
-		Entry<Long, IEvent[]> firstTx=stream.getEvents().floorEntry(point.x*waveCanvas.getScaleFactor());
+		EventEntry firstTx=stream.getEvents().floorEntry(point.x*waveCanvas.getScale());
 		if(firstTx!=null){
 			do {
-				ITx tx = getTxFromEntry(lane, point.x, firstTx);
+				ITx tx = getTxFromEntry(lane, point.x, firstTx.events);
 				if(tx!=null) return tx;
-				firstTx=stream.getEvents().lowerEntry(firstTx.getKey());
+				firstTx=stream.getEvents().lowerEntry(firstTx.timestamp);
 			}while(firstTx!=null);
 		}
 		return null;
@@ -173,11 +174,11 @@ public class StreamPainter extends TrackPainter{
 		this.stream = stream;
 	}
 
-	protected ITx getTxFromEntry(int lane, int offset, Entry<Long, IEvent[]> firstTx) {
+	protected ITx getTxFromEntry(int lane, int offset, IEvent[] firstTx) {
-		long timePoint=offset*waveCanvas.getScaleFactor();
+		long timePoint=offset*waveCanvas.getScale();
-		long timePointLow=(offset-5)*waveCanvas.getScaleFactor();
+		long timePointLow=(offset-5)*waveCanvas.getScale();
-		long timePointHigh=(offset+5)*waveCanvas.getScaleFactor();
+		long timePointHigh=(offset+5)*waveCanvas.getScale();
-		for(IEvent e:firstTx.getValue()){
+		for(IEvent e:firstTx){
 			if(e instanceof ITxEvent) {
 				ITxEvent evt = (ITxEvent) e;
 				ITx tx=evt.getTransaction();

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java

@@ -34,6 +34,7 @@ import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.ScrollBar;
 
 import com.google.common.collect.Lists;
+import com.minres.scviewer.database.EventEntry;
 import com.minres.scviewer.database.IEvent;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.RelationType;
@@ -41,32 +42,36 @@ import com.minres.scviewer.database.tx.ITx;
 import com.minres.scviewer.database.tx.ITxEvent;
 import com.minres.scviewer.database.ui.IWaveformStyleProvider;
 import com.minres.scviewer.database.ui.IWaveformView;
+import com.minres.scviewer.database.ui.IWaveformZoom;
 import com.minres.scviewer.database.ui.TrackEntry;
+import com.minres.scviewer.database.ui.ZoomKind;
 import com.minres.scviewer.database.ui.swt.Constants;
 
-public class WaveformCanvas extends Canvas {
+public class WaveformCanvas extends Canvas implements IWaveformZoom{
+
+	public static final long ZOOM_FIT = -2;
+
+	public static final long ZOOM_FULL = -1;
 	
-    private boolean doubleBuffering = true;
+	private boolean doubleBuffering = true;
-    	
+
-    IWaveformStyleProvider styleProvider;
+	IWaveformStyleProvider styleProvider;
-        
+
-    private long scaleFactor = 1000000L; // 1ns
+	private int scaleMagnitude = 6;
-    
+	
-    String unit="ns";
+	private long scaleFactor = Constants.POWERS_OF_TEN[scaleMagnitude];
-    
+	
-    private int level = 12;
+	private long maxTime;
-        
+
-    private long maxTime;
+	protected Point origin; /* original size */
-    
+
-    protected Point origin; /* original size */
+	protected int rulerHeight=40;
-        
+
-    protected int rulerHeight=40;
+	protected List<IPainter> painterList;
-    
+
-    protected List<IPainter> painterList;
+	ITx currentSelection;
-    
+
-    ITx currentSelection;
+	private List<SelectionAdapter> selectionListeners;
-    
-    private List<SelectionAdapter> selectionListeners;
 
 	private RulerPainter rulerPainter;
 
@@ -77,38 +82,38 @@ public class WaveformCanvas extends Canvas {
 	private List<CursorPainter> cursorPainters;
 
 	HashMap<IWaveform, IWaveformPainter> wave2painterMap;
-    /**
+	/**
-     * Constructor for ScrollableCanvas.
+	 * Constructor for ScrollableCanvas.
-     * 
+	 * 
-     * @param parent
+	 * @param parent
-     *            the parent of this control.super(parent, style | SWT.DOUBLE_BUFFERED | SWT.NO_BACKGROUND | SWT.NO_REDRAW_RESIZE | SWT.V_SCROLL | SWT.H_SCROLL);
+	 *            the parent of this control.super(parent, style | SWT.DOUBLE_BUFFERED | SWT.NO_BACKGROUND | SWT.NO_REDRAW_RESIZE | SWT.V_SCROLL | SWT.H_SCROLL);
-     * @param style
+	 * @param style
-     *            the style of this control.
+	 *            the style of this control.
-     */
+	 */
-    public WaveformCanvas(final Composite parent, int style, IWaveformStyleProvider styleProvider) {
+	public WaveformCanvas(final Composite parent, int style, IWaveformStyleProvider styleProvider) {
-        super(parent, style | SWT.DOUBLE_BUFFERED | SWT.NO_BACKGROUND | SWT.V_SCROLL | SWT.H_SCROLL);
+		super(parent, style | SWT.DOUBLE_BUFFERED | SWT.NO_BACKGROUND | SWT.V_SCROLL | SWT.H_SCROLL);
-        this.styleProvider=styleProvider;
+		this.styleProvider=styleProvider;
-    	addControlListener(new ControlAdapter() { /* resize listener. */
+		addControlListener(new ControlAdapter() { /* resize listener. */
 			@Override
 			public void controlResized(ControlEvent event) {
-                syncScrollBars();
+				syncScrollBars();
-            }
+			}
-        });
+		});
-        addPaintListener((final PaintEvent event) -> paint(event.gc));
+		addPaintListener((final PaintEvent event) -> paint(event.gc));
-        painterList = new LinkedList<>();
+		painterList = new LinkedList<>();
-        origin = new Point(0, 0);
+		origin = new Point(0, 0);
-        selectionListeners = new LinkedList<>();
+		selectionListeners = new LinkedList<>();
-        cursorPainters= new ArrayList<>();
+		cursorPainters= new ArrayList<>();
-        wave2painterMap=new HashMap<>();
+		wave2painterMap=new HashMap<>();
-        
+
-        initScrollBars();
+		initScrollBars();
 		// order is important: it is bottom to top
-        trackAreaPainter=new TrackAreaPainter(this);
+		trackAreaPainter=new TrackAreaPainter(this);
-        painterList.add(trackAreaPainter);
+		painterList.add(trackAreaPainter);
-        arrowPainter=new ArrowPainter(this, IWaveformView.NEXT_PREV_IN_STREAM);
+		arrowPainter=new ArrowPainter(this, IWaveformView.NEXT_PREV_IN_STREAM);
-        painterList.add(arrowPainter);
+		painterList.add(arrowPainter);
-        rulerPainter=new RulerPainter(this);
+		rulerPainter=new RulerPainter(this);
-        painterList.add(rulerPainter);
+		painterList.add(rulerPainter);
 		CursorPainter cp = new CursorPainter(this, scaleFactor * 10, cursorPainters.size()-1);
 		painterList.add(cp);
 		cursorPainters.add(cp);
@@ -116,83 +121,109 @@ public class WaveformCanvas extends Canvas {
 		painterList.add(marker);
 		cursorPainters.add(marker);
 		wave2painterMap=new HashMap<>();
-    }
+	}
-    
+
 	public void addCursoPainter(CursorPainter cursorPainter){
 		painterList.add(cursorPainter);
 		cursorPainters.add(cursorPainter);
 	}
+
+	public void setHighliteRelation(RelationType relationType){
+		if(arrowPainter!=null){
+			boolean redraw = arrowPainter.getHighlightType()!=relationType; 
+			arrowPainter.setHighlightType(relationType);
+			if(redraw) redraw();
+		}
+	}
+
+	public Point getOrigin() {
+		return origin;
+	}
+
+	public int getWidth() {
+		return getClientArea().width; 
+	}
+	public void setOrigin(Point origin) {
+		setOrigin(origin.x, origin.y);
+	}
+
+	public void setOrigin(int x, int y) {
+		checkWidget();
+		ScrollBar hBar = getHorizontalBar();
+		if(x<=0) hBar.setSelection(-x);
+		x = -hBar.getSelection();
+		ScrollBar vBar = getVerticalBar();
+		if(y<=0) vBar.setSelection(-y);
+		y = -vBar.getSelection();
+		origin.x = x;
+		origin.y = y;
+		syncScrollBars();
+	}
+
+	@Override
+	public long getMaxTime() {
+		return maxTime;
+	}
+
+	public void setMaxTime(long maxTime) {
+		this.maxTime = maxTime;
+		syncScrollBars();
+	}
+
+	@Override
+	public long getScale() {
+		return scaleFactor;
+	}
 	
-    public void setHighliteRelation(RelationType relationType){
+	@Override
-    	if(arrowPainter!=null){
+	public void setScale(long factor) {
-    		boolean redraw = arrowPainter.getHighlightType()!=relationType; 
+		setScalingFactor(factor, (getMaxVisibleTime()+getMinVisibleTime())/2);
-    		arrowPainter.setHighlightType(relationType);
+	}
-    		if(redraw) redraw();
-    	}
-    }
-    
-    public Point getOrigin() {
-        return origin;
-    }
 
-    public int getWidth() {
+	@Override
-    	return getClientArea().width; 
+	public void setVisibleRange(long startTime, long endTime) {
-    }
+		assert(startTime<endTime);
-    public void setOrigin(Point origin) {
+		long time_diff = endTime-startTime;
-        setOrigin(origin.x, origin.y);
+		long factor = (time_diff*11/10)/getClientArea().width;
-    }
+		setScalingFactor(factor, startTime+time_diff/2);
+	}
 
-    public void setOrigin(int x, int y) {
+	//@Override
-        checkWidget();
+	public void setScalingFactor(long factor, long centerTime) {
-        ScrollBar hBar = getHorizontalBar();
+		Rectangle clientArea = getClientArea();
-        hBar.setSelection(-x);
+		long clientAreaWidth = clientArea.width;
-        x = -hBar.getSelection();
+		long maxFactor=maxTime/clientAreaWidth;
-        ScrollBar vBar = getVerticalBar();
+		if(factor<0) {
-        vBar.setSelection(-y);
+			if(factor== ZOOM_FIT) {
-        y = -vBar.getSelection();
+				long cTime = getCursorPainters().get(0).getTime();
-        origin.x = x;
+				long time_diff = centerTime>cTime?centerTime-cTime:cTime-centerTime;
-        origin.y = y;
+				centerTime = (centerTime>cTime?cTime:centerTime)+time_diff/2;
-        syncScrollBars();
+				factor = (time_diff*11/10)/clientAreaWidth;
-    }
+			} else if(factor== ZOOM_FULL)
-
+				factor = maxFactor;
-    public long getMaxTime() {
+		} 
-        return maxTime;
+		if(factor==0)
-    }
+			factor=1;
-
+		else if(factor>maxFactor)
-    public void setMaxTime(long maxTime) {
+			factor=maxFactor;
-        this.maxTime = maxTime;
+		if(factor!=scaleFactor || (getMaxVisibleTime()+getMinVisibleTime()/2) != centerTime) {
-        syncScrollBars();
+			scaleFactor = factor;
-    }
+			scaleMagnitude = 0;
-
+			for(int i=Constants.POWERS_OF_TEN.length-1; i>0; i--) {
-    public int getZoomLevel() {
+				if(scaleFactor>=Constants.POWERS_OF_TEN[i]) {
-        return level;
+					scaleMagnitude = i;
-    }
+					break;
-    
+				}
-    public int getMaxZoomLevel(){
+			}
-    	return Constants.UNIT_MULTIPLIER.length*Constants.UNIT_STRING.length-1;
+			ITx tx = arrowPainter.getTx();
-    }
+			arrowPainter.setTx(null);
-
+			/*
-    public void setZoomLevel(int level) {
+			 * xc = tc/oldScaleFactor
-		long tc=cursorPainters.get(0).getTime(); // cursor time
+			 * xoffs = xc+origin.x
-		setZoomLevel(level, tc);
+			 * xcn = tc/newScaleFactor
-    }
+			 * t0n = (xcn-xoffs)*scaleFactor
-
+			 */
-    public void setZoomLevel(int level, long centerTime) {
+			long xoffs = clientAreaWidth/2;
-    	//FIXME: keep center if zoom-out and cursor is not in view
-    	if(level<0) level = 0;
-		long xc=centerTime/this.scaleFactor; // cursor total x-offset
-    	if(level<Constants.UNIT_MULTIPLIER.length*Constants.UNIT_STRING.length){
-    		this.scaleFactor = (long) Math.pow(10, level>>1);
-    		if(level%2==1) this.scaleFactor*=3;
-    		ITx tx = arrowPainter.getTx();
-    		arrowPainter.setTx(null);
-    		/*
-    		 * xc = tc/oldScaleFactor
-    		 * xoffs = xc+origin.x
-    		 * xcn = tc/newScaleFactor
-    		 * t0n = (xcn-xoffs)*scaleFactor
-    		 */
-			long xoffs=xc+origin.x; // cursor offset relative to left border
 			long xcn=centerTime/scaleFactor; // new total x-offset
 			long originX=xcn-xoffs;
 			if(originX>0) {
@@ -200,322 +231,356 @@ public class WaveformCanvas extends Canvas {
 			}else {
 				origin.x=0;
 			}
-    		syncScrollBars();
+			syncScrollBars();
-    		arrowPainter.setTx(tx);    		
+			arrowPainter.setTx(tx);    		
-    		redraw();
+			redraw();
-    		this.level = level;
+		}
-    	}
+	}
-    }
 
-    public long getScaleFactor() {
+	@Override
-        return scaleFactor;
+	public String timeToString(long time) {
-    }
+		int idx = scaleMagnitude/3;
+		double fTime = (double)time/Constants.UNIT_MULTIPLIER[idx];
+		return Constants.getTimeFormatForLevel(idx).format(fTime)+Constants.UNIT_STRING[idx];
+	}
 
-    public long getScaleFactorPow10() {
+	public long getTimeForOffset(int xOffset){
-    	int scale = level/Constants.UNIT_MULTIPLIER.length;
+		return (xOffset-origin.x) * scaleFactor;
-    	double res = Math.pow(1000, scale);
+	}
-    	return (long) res;
-    }
 
-    public String getUnitStr(){
+	public void addPainter(IPainter painter) {
-        return Constants.UNIT_STRING[level/Constants.UNIT_MULTIPLIER.length];
+		painterList.add(painter);
-    }
+		redraw();
-     
+	}
-    public int getUnitMultiplier(){
-        return Constants.UNIT_MULTIPLIER[level%Constants.UNIT_MULTIPLIER.length];
-    }
-    
-    public long getTimeForOffset(int xOffset){
-        return (xOffset-origin.x) * scaleFactor;
-    }
-    
-    public void addPainter(IPainter painter) {
-        painterList.add(painter);
-        redraw();
-    }
 
-    public void removePainter(IPainter painter) {
+	public void removePainter(IPainter painter) {
-        painterList.remove(painter);
+		painterList.remove(painter);
-        redraw();
+		redraw();
-    }
+	}
 
-    public void clearAllWaveformPainter() {
+	public void clearAllWaveformPainter() {
-    	clearAllWaveformPainter(true);
+		clearAllWaveformPainter(true);
-    }
+	}
-    
-    void clearAllWaveformPainter(boolean update) {
-        trackAreaPainter.trackVerticalOffset.clear();
-        wave2painterMap.clear();
-        if(update) syncScrollBars();
-    }
 
-    public void addWaveformPainter(IWaveformPainter painter) {
+	void clearAllWaveformPainter(boolean update) {
-    	addWaveformPainter(painter, true);
+		trackAreaPainter.trackVerticalOffset.clear();
-    }
+		wave2painterMap.clear();
-    
+		if(update) syncScrollBars();
-    void addWaveformPainter(IWaveformPainter painter, boolean update) {
+	}
-        trackAreaPainter.addTrackPainter(painter);
-        wave2painterMap.put(painter.getTrackEntry().waveform, painter);
-        if(update) syncScrollBars();
-    }
 
-    public List<CursorPainter> getCursorPainters() {
+	public void addWaveformPainter(IWaveformPainter painter) {
+		addWaveformPainter(painter, true);
+	}
+
+	void addWaveformPainter(IWaveformPainter painter, boolean update) {
+		trackAreaPainter.addTrackPainter(painter);
+		wave2painterMap.put(painter.getTrackEntry().waveform, painter);
+		if(update) syncScrollBars();
+	}
+
+	public List<CursorPainter> getCursorPainters() {
 		return cursorPainters;
 	}
 
-    /* Initialize the scrollbar and register listeners. */
+	/* Initialize the scrollbar and register listeners. */
-    private void initScrollBars() {
+	private void initScrollBars() {
-        ScrollBar horizontal = getHorizontalBar();
+		ScrollBar horizontal = getHorizontalBar();
-        horizontal.setEnabled(false);
+		horizontal.setEnabled(false);
-        horizontal.setVisible(true);
+		horizontal.setVisible(true);
-        horizontal.addSelectionListener(new SelectionAdapter() {
+		horizontal.addSelectionListener(new SelectionAdapter() {
 			@Override
-            public void widgetSelected(SelectionEvent event) {
+			public void widgetSelected(SelectionEvent event) {
-                if (painterList.isEmpty())
+				if (painterList.isEmpty())
-                    return;
+					return;
-                setOrigin(-((ScrollBar) event.widget).getSelection(), origin.y);
+				setOrigin(-((ScrollBar) event.widget).getSelection(), origin.y);
-            }
+			}
-        });
+		});
-        ScrollBar vertical = getVerticalBar();
+		ScrollBar vertical = getVerticalBar();
-        vertical.setEnabled(false);
+		vertical.setEnabled(false);
-        vertical.setVisible(true);
+		vertical.setVisible(true);
-        vertical.addSelectionListener(new SelectionAdapter() {
+		vertical.addSelectionListener(new SelectionAdapter() {
 			@Override
-            public void widgetSelected(SelectionEvent event) {
+			public void widgetSelected(SelectionEvent event) {
-                if (painterList.isEmpty())
+				if (painterList.isEmpty())
-                    return;
+					return;
-                setOrigin(origin.x, -((ScrollBar) event.widget).getSelection());
+				setOrigin(origin.x, -((ScrollBar) event.widget).getSelection());
-            }
+			}
-        });
+		});
-    }
-
-    /**
-     * Synchronize the scrollbar with the image. If the transform is out of
-     * range, it will correct it. This function considers only following factors
-     * :<b> transform, image size, client area</b>.
-     */
-    public void syncScrollBars() {
-        if (painterList.isEmpty()) {
-            redraw();
-            return;
-        }
-        int height = trackAreaPainter.getHeight(); // incl. Ruler
-        long width = maxTime / scaleFactor;
-        Rectangle clientArea=getClientArea();
-        ScrollBar horizontal = getHorizontalBar();
-        horizontal.setIncrement(getClientArea().width / 100);
-        horizontal.setPageIncrement(getClientArea().width);
-        int clientWidthw = clientArea.width;
-        if (width > clientWidthw) { /* image is wider than client area */
-        	horizontal.setMinimum(0);
-            horizontal.setMaximum((int)width);
-            horizontal.setEnabled(true);
-            if (-origin.x > horizontal.getMaximum() - clientWidthw) {
-                origin.x = -horizontal.getMaximum() + clientWidthw;
-            }
-        } else { /* image is narrower than client area */
-            horizontal.setEnabled(false);
-        }
-        horizontal.setThumb(clientWidthw);
-        horizontal.setSelection(-origin.x);
-
-        ScrollBar vertical = getVerticalBar();
-        vertical.setIncrement(getClientArea().height / 100);
-        vertical.setPageIncrement(getClientArea().height);
-        int clientHeighth = clientArea.height;
-        if (height > clientHeighth) { /* image is higher than client area */
-            vertical.setMinimum(0);
-            vertical.setMaximum(height);
-            vertical.setEnabled(true);
-            if ( -origin.y > vertical.getMaximum() - clientHeighth) {
-                origin.y = -vertical.getMaximum() + clientHeighth;
-            }
-        } else { /* image is less higher than client area */
-            vertical.setMaximum(clientHeighth);
-            vertical.setEnabled(false);
-        }
-        vertical.setThumb(clientHeighth);
-        vertical.setSelection(-origin.y);
-        redraw();
-        fireSelectionEvent();
-    }
-
-    /* Paint function */
-    private void paint(GC gc) {
-        Point pt = getSize();
-        if(pt.x==0  || pt.y==0) return;
-        Rectangle clientRect = getClientArea(); /* Canvas' painting area */
-        GC thisGc = gc;
-        Image dBackingImg = null;
-        if(doubleBuffering) {
-        	dBackingImg = new Image(getDisplay(), pt.x, pt.y);
-            thisGc = new GC(dBackingImg);
-            thisGc.setBackground(gc.getBackground());
-            thisGc.setForeground(gc.getForeground());
-            thisGc.setFont(gc.getFont());
-            
-        }
-        Projection p = new Projection(thisGc);
-        p.setTranslation(origin);
-        if (!painterList.isEmpty() ) {
-            for (IPainter painter : painterList)
-                painter.paintArea(p, clientRect);
-        } else {
-            gc.fillRectangle(clientRect);
-            initScrollBars();
-        }
-        if(doubleBuffering) {
-            gc.drawImage(dBackingImg, 0, 0);
-            if(dBackingImg!=null) dBackingImg.dispose();
-            thisGc.dispose();
-        }
-    }
-
-    public List<Object> getElementsAt(Point point) {
-    	LinkedList<Object> result=new LinkedList<>();
-        for (IPainter p : Lists.reverse(painterList)) {
-            if (p instanceof TrackAreaPainter) {
-                int y = point.y - origin.y;
-                int x = point.x - origin.x;
-                Entry<Integer, IWaveformPainter> entry = trackAreaPainter.trackVerticalOffset.floorEntry(y);
-                if (entry != null) {
-                    if (entry.getValue() instanceof StreamPainter) {
-                    	ITx tx = ((StreamPainter) entry.getValue()).getClicked(new Point(x, y - entry.getKey()));
-                    	if(tx!=null)
-                    		result.add(tx);
-                    } 
-                    result.add(entry.getValue().getTrackEntry());
-                }
-            } else if (p instanceof CursorPainter) {
-                if (Math.abs(point.x - origin.x - ((CursorPainter) p).getTime()/scaleFactor) < 2) {
-                	result.add(p);
-                }
-            }
-        }
-        return result;
-    }
-
-    public List<Object> getEntriesAtPosition(IWaveform iWaveform, int i) {
-    	LinkedList<Object> result=new LinkedList<>();
-        int x = i - origin.x;
-        for(IWaveformPainter p: wave2painterMap.values()){
-        	if (p instanceof StreamPainter && ((StreamPainter)p).getStream()==iWaveform) {
-        		result.add(((StreamPainter) p).getClicked(new Point(x, styleProvider.getTrackHeight()/2)));
-        	}
-        }
-        return result;
-    }
-
-    public void setSelected(ITx currentSelection) {
-        this.currentSelection = currentSelection;
-        if (currentSelection != null)
-            reveal(currentSelection);
-        arrowPainter.setTx(currentSelection);
-        redraw();
-    }
-
-    public void reveal(ITx tx) {
-        int lower = (int) (tx.getBeginTime() / scaleFactor);
-        int higher = (int) (tx.getEndTime() / scaleFactor);
-        Point size = getSize();
-        size.x -= getVerticalBar().getSize().x + 2;
-        size.y -= getHorizontalBar().getSize().y;
-        if (lower < -origin.x) {
-            setOrigin(-lower, origin.y);
-        } else if (higher > (size.x - origin.x)) {
-            setOrigin(size.x - higher, origin.y);
-        }
-        for (IWaveformPainter painter : wave2painterMap.values()) {
-            if (painter instanceof StreamPainter && ((StreamPainter) painter).getStream() == tx.getStream()) {
-            	Entry<Long, IEvent[]> entry = tx.getStream().getEvents().floorEntry(tx.getBeginTime());
-            	Optional<IEvent> res = Arrays.stream(entry.getValue()).filter(e -> ((ITxEvent)e).getTransaction().equals(tx)).findFirst();
-            	if(res.isPresent()) {
-                    int top = painter.getVerticalOffset() + styleProvider.getTrackHeight() * ((ITxEvent)res.get()).getRowIndex();
-                    int bottom = top + styleProvider.getTrackHeight();
-                    if (top < -origin.y) {
-                        setOrigin(origin.x, -(top-styleProvider.getTrackHeight()));
-                    } else if (bottom > (size.y - origin.y)) {
-                        setOrigin(origin.x, size.y - bottom);
-                    }
-            	}
-            }
-        }
-    }
-    
-	public void reveal(IWaveform waveform) {
-        for (IWaveformPainter painter : wave2painterMap.values()) {
-        	TrackEntry te = painter.getTrackEntry();
-        	if(te.waveform == waveform) {
-                Point size = getSize();
-                size.y -=+rulerHeight;
-                ScrollBar sb = getHorizontalBar();
-                if((sb.getStyle()&SWT.SCROLLBAR_OVERLAY)!=0 && sb.isVisible())
-                	size.y-=  getHorizontalBar().getSize().y;
-                int top = te.vOffset;
-                int bottom = top + styleProvider.getTrackHeight();
-                if (top < -origin.y) {
-                    setOrigin(origin.x, -(top-styleProvider.getTrackHeight()));
-                } else if (bottom > (size.y - origin.y)) {
-                    setOrigin(origin.x, size.y - bottom);
-                }
-            }
-        }
 	}
 
-    public void reveal(long time) {
+	/**
-        int scaledTime = (int) (time / scaleFactor);
+	 * Synchronize the scrollbar with the image. If the transform is out of
-        Point size = getSize();
+	 * range, it will correct it. This function considers only following factors
-        size.x -= getVerticalBar().getSize().x + 2;
+	 * :<b> transform, image size, client area</b>.
-        size.y -= getHorizontalBar().getSize().y;
+	 */
-        if (scaledTime < -origin.x) {
+	public void syncScrollBars() {
-            setOrigin(-scaledTime+10, origin.y);
+		if (painterList.isEmpty()) {
-        } else if (scaledTime > (size.x - origin.x)) {
+			redraw();
-            setOrigin(size.x - scaledTime-30, origin.y);
+			return;
-        }
+		}
-    }
+		int height = trackAreaPainter.getHeight(); // incl. Ruler
+		long width = maxTime / scaleFactor;
+		Rectangle clientArea=getClientArea();
+		ScrollBar horizontal = getHorizontalBar();
+		horizontal.setIncrement(getClientArea().width / 100);
+		horizontal.setPageIncrement(getClientArea().width);
+		int clientWidthw = clientArea.width;
+		if (width > clientWidthw) { /* image is wider than client area */
+			horizontal.setMinimum(0);
+			horizontal.setMaximum((int)width);
+			horizontal.setEnabled(true);
+			if (-origin.x > horizontal.getMaximum() - clientWidthw) {
+				origin.x = -horizontal.getMaximum() + clientWidthw;
+			}
+		} else { /* image is narrower than client area */
+			horizontal.setEnabled(false);
+		}
+		horizontal.setThumb(clientWidthw);
+		horizontal.setSelection(-origin.x);
 
-    public int getRulerHeight() {
+		ScrollBar vertical = getVerticalBar();
-        return rulerHeight;
+		vertical.setIncrement(getClientArea().height / 100);
-    }
+		vertical.setPageIncrement(getClientArea().height);
+		int clientHeighth = clientArea.height;
+		if (height > clientHeighth) { /* image is higher than client area */
+			vertical.setMinimum(0);
+			vertical.setMaximum(height);
+			vertical.setEnabled(true);
+			if ( -origin.y > vertical.getMaximum() - clientHeighth) {
+				origin.y = -vertical.getMaximum() + clientHeighth;
+			}
+		} else { /* image is less higher than client area */
+			vertical.setMaximum(clientHeighth);
+			vertical.setEnabled(false);
+		}
+		vertical.setThumb(clientHeighth);
+		vertical.setSelection(-origin.y);
+		redraw();
+		fireSelectionEvent();
+	}
 
-    public void setRulerHeight(int rulerHeight) {
+	/* Paint function */
-        this.rulerHeight = rulerHeight;
+	private void paint(GC gc) {
-    }
+		Point pt = getSize();
+		if(pt.x==0  || pt.y==0) return;
+		Rectangle clientRect = getClientArea(); /* Canvas' painting area */
+		GC thisGc = gc;
+		Image dBackingImg = null;
+		if(doubleBuffering) {
+			dBackingImg = new Image(getDisplay(), pt.x, pt.y);
+			thisGc = new GC(dBackingImg);
+			thisGc.setBackground(gc.getBackground());
+			thisGc.setForeground(gc.getForeground());
+			thisGc.setFont(gc.getFont());
 
-    public void addSelectionListener(SelectionAdapter selectionAdapter) {
+		}
-        selectionListeners.add(selectionAdapter);
+		Projection p = new Projection(thisGc);
-    }
+		p.setTranslation(origin);
+		if (!painterList.isEmpty() ) {
+			for (IPainter painter : painterList)
+				painter.paintArea(p, clientRect);
+		} else {
+			gc.fillRectangle(clientRect);
+			initScrollBars();
+		}
+		if(doubleBuffering) {
+			gc.drawImage(dBackingImg, 0, 0);
+			if(dBackingImg!=null) dBackingImg.dispose();
+			thisGc.dispose();
+		}
+	}
 
-    public void removeSelectionListener(SelectionAdapter selectionAdapter) {
+	public List<Object> getElementsAt(Point point) {
-        selectionListeners.remove(selectionAdapter);
+		LinkedList<Object> result=new LinkedList<>();
-    }
+		for (IPainter p : Lists.reverse(painterList)) {
+			if (p instanceof TrackAreaPainter) {
+				int y = point.y - origin.y;
+				int x = point.x - origin.x;
+				Entry<Integer, IWaveformPainter> entry = trackAreaPainter.trackVerticalOffset.floorEntry(y);
+				if (entry != null) {
+					if (entry.getValue() instanceof StreamPainter) {
+						ITx tx = ((StreamPainter) entry.getValue()).getClicked(new Point(x, y - entry.getKey()));
+						if(tx!=null)
+							result.add(tx);
+					} 
+					result.add(entry.getValue().getTrackEntry());
+				}
+			} else if (p instanceof CursorPainter) {
+				if (Math.abs(point.x - origin.x - ((CursorPainter) p).getTime()/scaleFactor) < 2) {
+					result.add(p);
+				}
+			}
+		}
+		return result;
+	}
 
-    /**
+	public List<Object> getEntriesAtPosition(IWaveform iWaveform, int i) {
-     * 
+		LinkedList<Object> result=new LinkedList<>();
-     */
+		int x = i - origin.x;
-    protected void fireSelectionEvent() {
+		for(IWaveformPainter p: wave2painterMap.values()){
-        Event e = new Event();
+			if (p instanceof StreamPainter && ((StreamPainter)p).getStream()==iWaveform) {
-        e.widget = this;
+				result.add(((StreamPainter) p).getClicked(new Point(x, styleProvider.getTrackHeight()/2)));
-        e.detail=SWT.SELECTED;
+			}
-        e.type=SWT.Selection;
+		}
-        SelectionEvent ev = new SelectionEvent(e);
+		return result;
-        ev.x = origin.x;
+	}
-        ev.y = origin.y;
-        for (SelectionAdapter a : selectionListeners) {
-            a.widgetSelected(ev);
-        }
-    }
 
-    long getMaxVisibleTime() {
+	public void setSelected(ITx currentSelection) {
-    	return (getClientArea().width+origin.x)*scaleFactor;
+		this.currentSelection = currentSelection;
-    }
+		if (currentSelection != null)
+			reveal(currentSelection);
+		arrowPainter.setTx(currentSelection);
+		redraw();
+	}
 
-    long getMinVisibleTime() {
+	public void reveal(ITx tx) {
-    	return origin.x * scaleFactor;
+		int lower = (int) (tx.getBeginTime() / scaleFactor);
-    }
+		int higher = (int) (tx.getEndTime() / scaleFactor);
+		Point size = getSize();
+		size.x -= getVerticalBar().getSize().x + 2;
+		size.y -= getHorizontalBar().getSize().y;
+		if (lower < -origin.x) {
+			setOrigin(-lower, origin.y);
+		} else if (higher > (size.x - origin.x)) {
+			setOrigin(size.x - higher, origin.y);
+		}
+		for (IWaveformPainter painter : wave2painterMap.values()) {
+			if (painter instanceof StreamPainter && ((StreamPainter) painter).getStream() == tx.getStream()) {
+				EventEntry entry = tx.getStream().getEvents().floorEntry(tx.getBeginTime());
+				Optional<IEvent> res = Arrays.stream(entry.events).filter(e -> ((ITxEvent)e).getTransaction().equals(tx)).findFirst();
+				if(res.isPresent()) {
+					int top = painter.getVerticalOffset() + styleProvider.getTrackHeight() * ((ITxEvent)res.get()).getRowIndex();
+					int bottom = top + styleProvider.getTrackHeight();
+					if (top < -origin.y) {
+						setOrigin(origin.x, -(top-styleProvider.getTrackHeight()));
+					} else if (bottom > (size.y - origin.y)) {
+						setOrigin(origin.x, size.y - bottom);
+					}
+				}
+			}
+		}
+	}
+
+	public void reveal(IWaveform waveform) {
+		for (IWaveformPainter painter : wave2painterMap.values()) {
+			TrackEntry te = painter.getTrackEntry();
+			if(te.waveform == waveform) {
+				Point size = getSize();
+				size.y -=+rulerHeight;
+				ScrollBar sb = getHorizontalBar();
+				if((sb.getStyle()&SWT.SCROLLBAR_OVERLAY)!=0 && sb.isVisible())
+					size.y-=  getHorizontalBar().getSize().y;
+				int top = te.vOffset;
+				int bottom = top + styleProvider.getTrackHeight();
+				if (top < -origin.y) {
+					setOrigin(origin.x, -(top-styleProvider.getTrackHeight()));
+				} else if (bottom > (size.y - origin.y)) {
+					setOrigin(origin.x, size.y - bottom);
+				}
+			}
+		}
+	}
+
+	public void reveal(long time) {
+		int scaledTime = (int) (time / scaleFactor);
+		Point size = getSize();
+		size.x -= getVerticalBar().getSize().x + 2;
+		size.y -= getHorizontalBar().getSize().y;
+		if (scaledTime < -origin.x) {
+			setOrigin(-scaledTime+10, origin.y);
+		} else if (scaledTime > (size.x - origin.x)) {
+			setOrigin(size.x - scaledTime-30, origin.y);
+		}
+	}
+
+	@Override
+	public void centerAt(long time) {
+		int scaledTime = (int) (time / scaleFactor);
+		int newX = -scaledTime+getWidth()/2;
+		setOrigin(newX>0?0:newX, origin.y);
+	}
+
+	public int getRulerHeight() {
+		return rulerHeight;
+	}
+
+	public void setRulerHeight(int rulerHeight) {
+		this.rulerHeight = rulerHeight;
+	}
+
+	public void addSelectionListener(SelectionAdapter selectionAdapter) {
+		selectionListeners.add(selectionAdapter);
+	}
+
+	public void removeSelectionListener(SelectionAdapter selectionAdapter) {
+		selectionListeners.remove(selectionAdapter);
+	}
+
+	/**
+	 * 
+	 */
+	protected void fireSelectionEvent() {
+		Event e = new Event();
+		e.widget = this;
+		e.detail=SWT.SELECTED;
+		e.type=SWT.Selection;
+		SelectionEvent ev = new SelectionEvent(e);
+		ev.x = origin.x;
+		ev.y = origin.y;
+		for (SelectionAdapter a : selectionListeners) {
+			a.widgetSelected(ev);
+		}
+	}
+
+	
+	@Override
+	public long getMaxVisibleTime() {
+		return (getClientArea().width-origin.x)*scaleFactor;
+	}
+
+	@Override
+	public long getMinVisibleTime() {
+		return -origin.x * scaleFactor;
+	}
+
+	@Override
+	public void setMinVisibleTime(long time) {
+		long duration = getMaxVisibleTime()-getMinVisibleTime();
+		if(time>0) {
+			if((time+duration)<getMaxTime()) {
+				int scaledTime = (int) (time / scaleFactor);
+				setOrigin(-scaledTime, origin.y);
+			}
+		} else {
+			setOrigin(0, origin.y);
+		}
+	}
+
+	@Override
+	public void zoom(ZoomKind kind) {
+		switch(kind) {
+		case IN:
+			setScale(getScale()/2);
+			break;
+		case OUT:
+			setScale(getScale()*2);			
+			break;
+		case FIT:
+			setScalingFactor(WaveformCanvas.ZOOM_FIT, cursorPainters.get(1).getTime());
+			break;
+		case FULL:
+			setScale(WaveformCanvas.ZOOM_FULL);
+			break;
+		}
+	}
 
 	public void setStyleProvider(IWaveformStyleProvider styleProvider) {
 		this.styleProvider=styleProvider;
 		redraw();
 	}
+
+	public int getScaleMagnitude() {
+		return scaleMagnitude;
+	}
+
 }

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java

@@ -13,7 +13,6 @@ package com.minres.scviewer.database.ui.swt.internal;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -21,7 +20,6 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.NavigableMap;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.TreeMap;
@@ -77,8 +75,10 @@ import org.eclipse.wb.swt.SWTResourceManager;
 import com.google.common.collect.Lists;
 import com.minres.scviewer.database.BitVector;
 import com.minres.scviewer.database.DoubleVal;
+import com.minres.scviewer.database.EventEntry;
 import com.minres.scviewer.database.EventKind;
 import com.minres.scviewer.database.IEvent;
+import com.minres.scviewer.database.IEventList;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.RelationType;
 import com.minres.scviewer.database.WaveformType;
@@ -89,8 +89,8 @@ import com.minres.scviewer.database.ui.GotoDirection;
 import com.minres.scviewer.database.ui.ICursor;
 import com.minres.scviewer.database.ui.IWaveformStyleProvider;
 import com.minres.scviewer.database.ui.IWaveformView;
+import com.minres.scviewer.database.ui.IWaveformZoom;
 import com.minres.scviewer.database.ui.TrackEntry;
-import com.minres.scviewer.database.ui.swt.Constants;
 
 public class WaveformView implements IWaveformView {
 
@@ -98,8 +98,6 @@ public class WaveformView implements IWaveformView {
 
 	private PropertyChangeSupport pcs;
 
-	static final DecimalFormat df = new DecimalFormat("#0.00####");
-
 	private ITx currentTxSelection;
 
 	private ArrayList<TrackEntry> currentWaveformSelection = new ArrayList<>();
@@ -162,8 +160,7 @@ public class WaveformView implements IWaveformView {
 									: 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,
+							setSelection(new StructuredSelection(entry.getValue()), (e.stateMask & SWT.CTRL) != 0, false);
-									false);
 					} else {
 						setSelection(new StructuredSelection(entry.getValue()), (e.stateMask & SWT.CTRL) != 0, false);
 					}
@@ -196,88 +193,69 @@ public class WaveformView implements IWaveformView {
 			down = false;
 			if (start == null)
 				return;
-			if ((e.stateMask & SWT.MODIFIER_MASK & ~SWT.SHIFT) != 0)
+			if ((e.stateMask & SWT.MODIFIER_MASK & ~(SWT.SHIFT | SWT.CTRL)) != 0)
-				return; // don't react on modifier except shift
+				return; // don't react on modifier except shift and control
-			if (e.button == 1 && Math.abs(e.x - start.x) > 3) {
+			boolean isCtrl = (e.stateMask & SWT.CTRL)!=0;
-				asyncUpdate(e.widget);
+			boolean isShift = (e.stateMask & SWT.SHIFT)!=0;
-				long startTime = waveformCanvas.getTimeForOffset(start.x);
+			if (e.button == 1) {
-				long endTime = waveformCanvas.getTimeForOffset(end.x);
+				if (Math.abs(e.x - start.x) > 3) { // was drag event
-				long targetTimeRange = endTime - startTime;
-				long currentTimeRange = waveformCanvas.getMaxVisibleTime() - waveformCanvas.getMinVisibleTime();
-				if (targetTimeRange == 0)
-					return;
-				long relation = currentTimeRange / targetTimeRange;
-				long i = 1;
-				int level = 0;
-				do {
-					if (relation < 0) {
-						if (-relation < i) {
-							break;
-						}
-						level--;
-						if (-relation < i * 3) {
-							break;
-						}
-						level--;
-					} else {
-						if (relation < i) {
-							break;
-						}
-						level++;
-						if (relation < i * 3) {
-							break;
-						}
-						level++;
-					}
-					i = i * 10;
-				} while (i < 10000);
-				if (i < 10000) {
-					int curLevel = waveformCanvas.getZoomLevel();
-					waveformCanvas.setZoomLevel(curLevel - level, (startTime + endTime) / 2);
-				}
-			} else if (e.button == 1 && ((e.stateMask & SWT.SHIFT) == 0)) {
-				// set cursor (button 1 and no shift)
-				if (Math.abs(e.x - start.x) < 3 && Math.abs(e.y - start.y) < 3) {
-					// first set cursor time
-					setCursorTime(snapOffsetToEvent(start));
-					// then set selection and reveal
-					setSelection(new StructuredSelection(initialSelected));
 					asyncUpdate(e.widget);
+					long startTime = waveformCanvas.getTimeForOffset(start.x);
+					long endTime = waveformCanvas.getTimeForOffset(end.x);
+					if(startTime<endTime) {
+						waveformCanvas.setVisibleRange(startTime, endTime);
+					} else {
+						long targetTimeRange = startTime-endTime;
+						long currentTimeRange = waveformCanvas.getMaxVisibleTime() - waveformCanvas.getMinVisibleTime();
+						long factor = currentTimeRange/targetTimeRange *waveformCanvas.getScale();
+						waveformCanvas.setScalingFactor(factor, (startTime+endTime)/2);
+												
+					}
+				} else if( isShift) { // set marker (button 1 and shift)
+					setMarkerTime(selectedMarker, snapOffsetToEvent(start));
+				} else if(isCtrl) {	// set cursor (button 1 and ctrl)
+					setCursorTime(snapOffsetToEvent(start));
+				} else { // set cursor (button 1 only)
+					if (Math.abs(e.y - start.y) < 3) {
+						// first set cursor time
+						setCursorTime(snapOffsetToEvent(start));
+						// then set selection and reveal
+						setSelection(new StructuredSelection(initialSelected));
+					}
 				}
-			} else if (e.button == 2 || (e.button == 1 && (e.stateMask & SWT.SHIFT) != 0)) {
+			} else if (e.button == 2) { // set marker (button 2)
-				// set marker (button 1 and shift)
+				setMarkerTime(selectedMarker, snapOffsetToEvent(start));
-				setMarkerTime(snapOffsetToEvent(start), selectedMarker);
-				asyncUpdate(e.widget);
 			}
+			asyncUpdate(e.widget);
 		}
 
 		protected long snapOffsetToEvent(Point p) {
 			long time = waveformCanvas.getTimeForOffset(p.x);
-			long scaling = 5 * waveformCanvas.getScaleFactor();
+			long scaling = 5 * waveformCanvas.getScale();
 			for (Object o : waveformCanvas.getElementsAt(p)) {
-				Entry<Long, IEvent[]> floorEntry = null;
+				EventEntry floorEntry = null;
-				Entry<Long, IEvent[]> ceilEntry = null;
+				EventEntry ceilEntry = null;
 				if (o instanceof TrackEntry) {
 					TrackEntry entry = (TrackEntry) o;
-					NavigableMap<Long, IEvent[]> map = entry.waveform.getEvents();
+					IEventList map = entry.waveform.getEvents();
 					floorEntry = map.floorEntry(time);
 					ceilEntry = map.ceilingEntry(time);
 				} else if (o instanceof ITx) {
-					NavigableMap<Long, IEvent[]> map = ((ITx) o).getStream().getEvents();
+					IEventList map = ((ITx) o).getStream().getEvents();
 					floorEntry = map.floorEntry(time);
 					ceilEntry = map.ceilingEntry(time);
 				}
-				if (floorEntry != null && time - floorEntry.getKey() > scaling)
+				if (floorEntry != null && time - floorEntry.timestamp > scaling)
 					floorEntry = null;
-				if (ceilEntry != null && ceilEntry.getKey() - time > scaling)
+				if (ceilEntry != null && ceilEntry.timestamp - time > scaling)
 					ceilEntry = null;
 				if (ceilEntry == null && floorEntry != null) {
-					time = floorEntry.getKey();
+					time = floorEntry.timestamp;
 				} else if (ceilEntry != null && floorEntry == null) {
-					time = ceilEntry.getKey();
+					time = ceilEntry.timestamp;
 				} else if (ceilEntry != null && floorEntry != null) {
-					time = time - floorEntry.getKey() < ceilEntry.getKey() - time ? floorEntry.getKey()
+					time = time - floorEntry.timestamp < ceilEntry.timestamp - time ? floorEntry.timestamp
-							: ceilEntry.getKey();
+							: ceilEntry.timestamp;
 				}
 			}
 			return time;
@@ -287,6 +265,12 @@ public class WaveformView implements IWaveformView {
 		public void handleEvent(Event e) {
 			switch (e.type) {
 			case SWT.MouseWheel:
+				if((e.stateMask & SWT.CTRL) != 0) {
+					if(e.count<0)
+						waveformCanvas.setScale(waveformCanvas.getScale()*11/10);
+					else
+						waveformCanvas.setScale(waveformCanvas.getScale()*10/11);
+				} 
 				break;
 			case SWT.MouseDown:
 				start = new Point(e.x, e.y);
@@ -460,6 +444,17 @@ public class WaveformView implements IWaveformView {
 
 		toolTipHandler = new ToolTipHandler(parent.getShell());
 		toolTipHandler.activateHoverHelp(waveformCanvas);
+	    // This is the filter that prevents the default handling of mouse wheel in waveformCanvas
+	    getControl().getDisplay().addFilter(SWT.MouseWheel, new Listener() {
+	        @Override
+	        public void handleEvent(Event e) {
+	            // Check if it's the correct widget
+	            if(e.widget.equals(waveformCanvas) && (e.stateMask & SWT.CTRL) != 0) {
+	            	waveformMouseListener.handleEvent(e);
+	                e.doit = false;
+	            }
+	        }
+	    });
 	}
 
 	private void createTextPane(Composite namePane, String text) {
@@ -580,10 +575,10 @@ public class WaveformView implements IWaveformView {
 				}
 			} else if (entry.waveform.getType() == WaveformType.TRANSACTION) {
 				ITx[] resultsList = new ITx[entry.waveform.getRowCount()];
-				Entry<Long, IEvent[]> firstTx = entry.waveform.getEvents().floorEntry(time);
+				EventEntry firstTx = entry.waveform.getEvents().floorEntry(time);
 				if (firstTx != null) {
 					do {
-						for (IEvent e : firstTx.getValue()) {
+						for (IEvent e : firstTx.events) {
 							if (e instanceof ITxEvent) {
 								ITxEvent evt = ((ITxEvent) e);
 								ITx tx = evt.getTransaction();
@@ -593,7 +588,7 @@ public class WaveformView implements IWaveformView {
 									resultsList[evt.getRowIndex()] = evt.getTransaction();
 							}
 						}
-						firstTx = entry.waveform.getEvents().lowerEntry(firstTx.getKey());
+						firstTx = entry.waveform.getEvents().lowerEntry(firstTx.timestamp);
 					} while (firstTx != null && !isArrayFull(resultsList));
 					boolean separator = false;
 					StringBuilder sb = new StringBuilder();
@@ -751,27 +746,30 @@ public class WaveformView implements IWaveformView {
 				if (!add)
 					currentWaveformSelection.clear();
 				List<?> selList = sel.toList();
-				if (selList.get(0) instanceof ITx) {
+				for(Object o: selList) {
-					ITx txSel = (ITx) selList.get(0);
+					if (o instanceof ITx) {
-					TrackEntry trackEntry = selList.size() == 2 && selList.get(1) instanceof TrackEntry
+						ITx txSel = (ITx) o;
-							? (TrackEntry) selList.get(1)
+						TrackEntry trackEntry = selList.size() == 2 && selList.get(1) instanceof TrackEntry
-							: null;
+								? (TrackEntry) selList.get(1)
-					if (trackEntry == null) {
+										: null;
-						trackEntry = getEntryFor(txSel);
+						if (trackEntry == null) {
-						if (trackEntry == null && addIfNeeded) {
+							trackEntry = getEntryFor(txSel);
-							trackEntry = new TrackEntry(txSel.getStream(), styleProvider);
+							if (trackEntry == null && addIfNeeded) {
-							streams.add(trackEntry);
+								trackEntry = new TrackEntry(txSel.getStream(), styleProvider);
+								streams.add(trackEntry);
+							}
 						}
+						currentTxSelection = txSel;
+						currentWaveformSelection.clear();
+						currentWaveformSelection.add(trackEntry);
+						selectionChanged = true;
+					} else if (o instanceof TrackEntry) {
+						TrackEntry e = (TrackEntry)o;
+						if(!currentWaveformSelection.contains(e))
+							currentWaveformSelection.add(e);
+						selectionChanged = true;
 					}
-					currentTxSelection = txSel;
+					
-					currentWaveformSelection.clear();
-					currentWaveformSelection.add(trackEntry);
-					selectionChanged = true;
-				} else if (selList.size() == 1 && selList.get(0) instanceof TrackEntry) {
-					currentWaveformSelection.add((TrackEntry) selList.get(0));
-					if (currentTxSelection != null)
-						currentTxSelection = null;
-					selectionChanged = true;
 				}
 			}
 		} else {
@@ -854,11 +852,11 @@ public class WaveformView implements IWaveformView {
 						}
 					}
 					if (transaction == null) {
-						Entry<Long, IEvent[]> entry = selectedWaveform.waveform.getEvents()
+						EventEntry entry = selectedWaveform.waveform.getEvents()
 								.higherEntry(currentTxSelection.getBeginTime());
 						if (entry != null)
 							do {
-								for (IEvent evt : entry.getValue()) {
+								for (IEvent evt : entry.events) {
 									if (evt instanceof ITxEvent && (evt.getKind() == EventKind.BEGIN
 											|| evt.getKind() == EventKind.SINGLE)) {
 										transaction = ((ITxEvent) evt).getTransaction();
@@ -866,7 +864,7 @@ public class WaveformView implements IWaveformView {
 									}
 								}
 								if (transaction == null)
-									entry = selectedWaveform.waveform.getEvents().higherEntry(entry.getKey());
+									entry = selectedWaveform.waveform.getEvents().higherEntry(entry.timestamp);
 							} while (entry != null && transaction == null);
 					}
 				} else if (direction == GotoDirection.PREV) {
@@ -883,11 +881,11 @@ public class WaveformView implements IWaveformView {
 						}
 					}
 					if (transaction == null) {
-						Entry<Long, IEvent[]> entry = selectedWaveform.waveform.getEvents()
+						EventEntry entry = selectedWaveform.waveform.getEvents()
 								.lowerEntry(currentTxSelection.getBeginTime());
 						if (entry != null)
 							do {
-								for (IEvent evt : Lists.reverse(Arrays.asList(entry.getValue()))) {
+								for (IEvent evt : Lists.reverse(Arrays.asList(entry.events))) {
 									if (evt instanceof ITxEvent && (evt.getKind() == EventKind.BEGIN
 											|| evt.getKind() == EventKind.SINGLE)) {
 										transaction = ((ITxEvent) evt).getTransaction();
@@ -895,7 +893,7 @@ public class WaveformView implements IWaveformView {
 									}
 								}
 								if (transaction == null)
-									entry = selectedWaveform.waveform.getEvents().lowerEntry(entry.getKey());
+									entry = selectedWaveform.waveform.getEvents().lowerEntry(entry.timestamp);
 							} while (entry != null && transaction == null);
 					}
 				}
@@ -929,7 +927,7 @@ public class WaveformView implements IWaveformView {
 			return candidates.get(0);
 		default:
 			ArrayList<ITxRelation> visibleCandidates = candidates.stream().filter(this::streamsVisible)
-					.collect(Collectors.toCollection(ArrayList::new));
+			.collect(Collectors.toCollection(ArrayList::new));
 			if (visibleCandidates.isEmpty()) {
 				return new RelSelectionDialog(waveformCanvas.getShell(), candidates, target).open();
 			} else if (visibleCandidates.size() == 1) {
@@ -958,14 +956,14 @@ public class WaveformView implements IWaveformView {
 			return;
 		TrackEntry sel = currentWaveformSelection.get(0);
 		long time = getCursorTime();
-		NavigableMap<Long, ?> map = null;
+		IEventList map = null;
 		if (sel.waveform.getType() == WaveformType.TRANSACTION || sel.waveform.getType() == WaveformType.SIGNAL) {
 			map = sel.waveform.getEvents();
 		}
 		if (map != null) {
-			Entry<Long, ?> entry = direction == GotoDirection.PREV ? map.lowerEntry(time) : map.higherEntry(time);
+			EventEntry entry = direction == GotoDirection.PREV ? map.lowerEntry(time) : map.higherEntry(time);
 			if (entry != null) {
-				time = entry.getKey();
+				time = entry.timestamp;
 				setCursorTime(time);
 				waveformCanvas.reveal(time);
 				waveformCanvas.redraw();
@@ -1114,16 +1112,6 @@ public class WaveformView implements IWaveformView {
 		this.waveformCanvas.setHighliteRelation(relationType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.minres.scviewer.database.swt.IWaveformPanel#getMaxTime()
-	 */
-	@Override
-	public long getMaxTime() {
-		return waveformCanvas.getMaxTime();
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -1134,27 +1122,6 @@ public class WaveformView implements IWaveformView {
 		this.waveformCanvas.setMaxTime(maxTime);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.minres.scviewer.database.swt.IWaveformPanel#setZoomLevel(int)
-	 */
-	@Override
-	public void setZoomLevel(int scale) {
-		waveformCanvas.setZoomLevel(scale);
-		waveformCanvas.reveal(getCursorTime());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.minres.scviewer.database.swt.IWaveformPanel#getZoomLevel()
-	 */
-	@Override
-	public int getZoomLevel() {
-		return waveformCanvas.getZoomLevel();
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -1173,10 +1140,10 @@ public class WaveformView implements IWaveformView {
 	 * @see com.minres.scviewer.database.swt.IWaveformPanel#setMarkerTime(long, int)
 	 */
 	@Override
-	public void setMarkerTime(long time, int index) {
+	public void setMarkerTime(int marker, long time) {
-		if (waveformCanvas.getCursorPainters().size() > index + 1) {
+		if (waveformCanvas.getCursorPainters().size() > marker + 1) {
-			final Long oldVal = waveformCanvas.getCursorPainters().get(1 + index).getTime();
+			final Long oldVal = waveformCanvas.getCursorPainters().get(1 + marker).getTime();
-			waveformCanvas.getCursorPainters().get(1 + index).setTime(time);
+			waveformCanvas.getCursorPainters().get(1 + marker).setTime(time);
 			pcs.firePropertyChange(MARKER_PROPERTY, oldVal, time);
 		}
 	}
@@ -1197,7 +1164,7 @@ public class WaveformView implements IWaveformView {
 	 * @see com.minres.scviewer.database.swt.IWaveformPanel#getActMarkerTime()
 	 */
 	@Override
-	public int getSelectedMarkerId() {
+	public int getSelectedMarker() {
 		return selectedMarker;
 	}
 
@@ -1229,7 +1196,7 @@ public class WaveformView implements IWaveformView {
 				if (event.y < tracksVerticalHeight) {
 					event.doit = true;
 					LocalSelectionTransfer.getTransfer()
-							.setSelection(new StructuredSelection(currentWaveformSelection));
+					.setSelection(new StructuredSelection(currentWaveformSelection));
 				}
 			}
 
@@ -1449,58 +1416,32 @@ public class WaveformView implements IWaveformView {
 		return this.pcs.hasListeners(propertyName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.minres.scviewer.database.swt.IWaveformPanel#getScaledTime(long)
-	 */
-	@Override
-	public String getScaledTime(long time) {
-		StringBuilder sb = new StringBuilder();
-		double dTime = time;
-		double scaledTime = dTime / waveformCanvas.getScaleFactorPow10();
-		return sb.append(df.format(scaledTime)).append(waveformCanvas.getUnitStr()).toString();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.minres.scviewer.database.swt.IWaveformPanel#getZoomLevels()
-	 */
-	@Override
-	public String[] getZoomLevels() {
-		String[] res = new String[Constants.UNIT_MULTIPLIER.length * Constants.UNIT_STRING.length];
-		int index = 0;
-		for (String unit : Constants.UNIT_STRING) {
-			for (int factor : Constants.UNIT_MULTIPLIER) {
-				res[index++] = Integer.toString(factor) + unit;
-			}
-		}
-		return res;
-	}
-
-	@Override
-	public long getBaselineTime() {
-		return -waveformCanvas.getScaleFactorPow10() * waveformCanvas.getOrigin().x;
-	}
-
-	@Override
-	public void setBaselineTime(Long time) {
-		Point origin = waveformCanvas.getOrigin();
-		origin.x = (int) (-time / waveformCanvas.getScaleFactorPow10());
-		waveformCanvas.setOrigin(origin);
-	}
-
 	@Override
 	public void scrollHorizontal(int percent) {
 		if (percent < -100)
 			percent = -100;
 		if (percent > 100)
 			percent = 100;
-		int diff = (waveformCanvas.getWidth() * percent) / 100;
+		long minTime = waveformCanvas.getMinVisibleTime();
-		Point o = waveformCanvas.getOrigin();
+		long duration = waveformCanvas.getMaxVisibleTime()-minTime;
-		waveformCanvas.setOrigin(o.x - diff, o.y);
+		long diff = (duration * percent) / 100;
-		waveformCanvas.redraw();
+		waveformCanvas.setMinVisibleTime(minTime+diff);
+	}
+
+	@Override
+	public void scrollTo(int pos) {
+		long time = 0;
+		switch(pos) {
+		case IWaveformView.CURSOR_POS:
+			time = getCursorTime();
+			break;
+		case IWaveformView.MARKER_POS:
+			time = getMarkerTime(selectedMarker);
+			break;
+		default:
+			break;
+		}
+		waveformCanvas.centerAt(time);
 	}
 
 	public void asyncUpdate(Widget widget) {
@@ -1532,5 +1473,13 @@ public class WaveformView implements IWaveformView {
 			getStreamList().add(idx, e);
 		return e;
 	}
+	
+	public boolean waveformsContainsTx() {
+		return  streams.stream().filter(e -> e.waveform.getType() == WaveformType.TRANSACTION).findFirst().isPresent();
+	}
 
+	@Override
+	public IWaveformZoom getWaveformZoom() {
+		return waveformCanvas;
+	}
 }

plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VCD signal database
 Bundle-SymbolicName: com.minres.scviewer.database.vcd
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",

plugins/com.minres.scviewer.database.vcd/OSGI-INF/component.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="VCDDbLoader">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="VCDDbLoaderFactory">
-   <implementation class="com.minres.scviewer.database.vcd.VCDDbLoader"/>
+   <implementation class="com.minres.scviewer.database.vcd.VCDDbLoaderFactory"/>
    <service>
-      <provide interface="com.minres.scviewer.database.IWaveformDbLoader"/>
+      <provide interface="com.minres.scviewer.database.IWaveformDbLoaderFactory"/>
    </service>
 </scr:component>

plugins/com.minres.scviewer.database.vcd/pom.xml

@@ -1,11 +1,11 @@
 <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.vcd</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.2</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java

@@ -20,15 +20,13 @@ import java.util.ArrayDeque;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.NavigableMap;
-import java.util.TreeMap;
 import java.util.Vector;
 import java.util.zip.GZIPInputStream;
 
 import com.google.common.collect.Iterables;
 import com.minres.scviewer.database.BitVector;
 import com.minres.scviewer.database.DoubleVal;
-import com.minres.scviewer.database.IEvent;
+import com.minres.scviewer.database.IEventList;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.IWaveformDb;
 import com.minres.scviewer.database.IWaveformDbLoader;
@@ -115,19 +113,20 @@ public class VCDDbLoader implements IWaveformDbLoader, IVCDDatabaseBuilder {
 			moduleStack=null;
 			throw new InputFormatException(e.toString());
 		}
-		if(!res) throw new InputFormatException("Could not parse VCD file");
+		if(!res) 
+			throw new InputFormatException("Could not parse VCD file");
 		// calculate max time of this database
 		for(IWaveform waveform:signals) {
-			NavigableMap<Long, IEvent[]> events =waveform.getEvents();
+			IEventList events =waveform.getEvents();
 			if(!events.isEmpty())
 				maxTime= Math.max(maxTime, events.lastKey());
 		}
 		// extend signals to have a last value set at max time
 		for(IWaveform s:signals){
 			if(s instanceof VCDSignal<?>) {
-				TreeMap<Long,?> events = (TreeMap<Long, ?>) ((VCDSignal<?>)s).getEvents();
+				IEventList events = ((VCDSignal<?>)s).getEvents();
 				if(events.size()>0 && events.lastKey()<maxTime){
-					Object val = events.lastEntry().getValue();
+					Object val = events.lastEntry().events[0];
 					if(val instanceof BitVector) {
 						((VCDSignal<BitVector>)s).addSignalChange(maxTime, (BitVector) val);
 					} else if(val instanceof DoubleVal)
@@ -147,7 +146,7 @@ public class VCDDbLoader implements IWaveformDbLoader, IVCDDatabaseBuilder {
 	 * @see com.minres.scviewer.database.ITrDb#getMaxTime()
 	 */
 	@Override
-	public Long getMaxTime() {
+	public long getMaxTime() {
 		return maxTime;
 	}
 
@@ -165,7 +164,8 @@ public class VCDDbLoader implements IWaveformDbLoader, IVCDDatabaseBuilder {
 	@Override
 	public void enterModule(String tokenString) {
 		if(moduleStack.isEmpty()) {
-			if("SystemC".compareTo(tokenString)!=0) moduleStack.push(tokenString);
+			if("SystemC".compareTo(tokenString)!=0)
+				moduleStack.push(tokenString);
 		} else
 			moduleStack.push(moduleStack.peek()+"."+tokenString);
 

plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoaderFactory.java

@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     MINRES Technologies GmbH - initial API and implementation
+ *******************************************************************************/
+package com.minres.scviewer.database.vcd;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.GZIPInputStream;
+
+import com.minres.scviewer.database.IWaveformDbLoader;
+import com.minres.scviewer.database.IWaveformDbLoaderFactory;
+
+/**
+ * The Class VCDDb.
+ */
+public class VCDDbLoaderFactory implements IWaveformDbLoaderFactory {
+	/**
+	 * Checks if is gzipped.
+	 *
+	 * @param f the f
+	 * @return true, if is gzipped
+	 */
+	private static boolean isGzipped(File f) {
+		try (InputStream is = new FileInputStream(f)) {
+			byte [] signature = new byte[2];
+			int nread = is.read( signature ); //read the gzip signature
+			return nread == 2 && signature[ 0 ] == (byte) 0x1f && signature[ 1 ] == (byte) 0x8b;
+		}
+		catch (IOException e) {
+			return false;
+		}
+	}
+
+
+	/**
+	 * Can load.
+	 *
+	 * @param inputFile the input file
+	 * @return true, if successful
+	 */
+	@Override
+	public boolean canLoad(File inputFile) {
+		if(!inputFile.isDirectory() || inputFile.exists()) {
+			String name = inputFile.getName();
+			if(!(name.endsWith(".vcd") ||
+					name.endsWith(".vcdz") ||
+					name.endsWith(".vcdgz")  ||
+					name.endsWith(".vcd.gz")) )
+				return false;
+			boolean gzipped = isGzipped(inputFile);
+			try(InputStream stream = gzipped ? new GZIPInputStream(new FileInputStream(inputFile)) : new FileInputStream(inputFile)){
+				byte[] buffer = new byte[8];
+				if (stream.read(buffer, 0, buffer.length) == buffer.length) {
+					return buffer[0]=='$';
+				}
+			} catch (Exception e) {
+				return false;
+			}
+		}
+		return false;
+	}
+
+
+	@Override
+	public IWaveformDbLoader getLoader() {
+		return new VCDDbLoader();
+	}
+}

plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDSignal.java

@@ -10,12 +10,11 @@
  *******************************************************************************/
 package com.minres.scviewer.database.vcd;
 
-import java.util.Map.Entry;
+import com.minres.scviewer.database.EventEntry;
-import java.util.NavigableMap;
+import com.minres.scviewer.database.EventList;
-import java.util.TreeMap;
-
 import com.minres.scviewer.database.HierNode;
 import com.minres.scviewer.database.IEvent;
+import com.minres.scviewer.database.IEventList;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.WaveformType;
 
@@ -27,7 +26,7 @@ public class VCDSignal<T extends IEvent> extends HierNode implements IWaveform {
 
 	private final int width;
 
-	private NavigableMap<Long, IEvent[]> values;
+	private IEventList values;
 	
 	public VCDSignal(String name) {
 		this(0, name, 1);
@@ -42,7 +41,7 @@ public class VCDSignal<T extends IEvent> extends HierNode implements IWaveform {
 		fullName=name;
 		this.id=id;
 		this.width=width;
-		this.values=new TreeMap<>();
+		this.values=new EventList();
 	}
 
 	public VCDSignal(VCDSignal<T> o, int id, String name) {
@@ -63,44 +62,36 @@ public class VCDSignal<T extends IEvent> extends HierNode implements IWaveform {
 	}
 
 	@Override
-	public Long getId() {
+	public long getId() {
 		return id;
 	}
 
 	public void addSignalChange(Long time, T value){
-		if(values.containsKey(time)) {
+		values.put(time, value);
-			IEvent[] oldV = values.get(time);
-			IEvent[] newV = new IEvent[oldV.length+1];
-			System.arraycopy(oldV, 0, newV, 0, oldV.length);
-			newV[oldV.length]=value;
-			values.put(time, newV);
-		} else {
-			values.put(time, new IEvent[] {value});
-		}
 	}
 	
 	@Override
-	public NavigableMap<Long, IEvent[]> getEvents() {
+	public IEventList getEvents() {
 		return values;
 	}
 
 	@Override
-	public IEvent[] getEventsAtTime(Long time) {
+	public IEvent[] getEventsAtTime(long time) {
 		return values.get(time);
 	}
 
     @Override
-    public IEvent[] getEventsBeforeTime(Long time) {
+    public IEvent[] getEventsBeforeTime(long time) {
-    	Entry<Long, IEvent[]> e = values.floorEntry(time);
+    	EventEntry e = values.floorEntry(time);
     	if(e==null)
     		return new IEvent[] {};
     	else
-    		return values.floorEntry(time).getValue();
+    		return values.floorEntry(time).events;
     }
 
 	@Override
 	public boolean isSame(IWaveform other) {
-		return( other instanceof VCDSignal<?> && this.getId().equals(other.getId()));
+		return( other instanceof VCDSignal<?> && this.getId() == other.getId());
 	}
 
 	@Override

plugins/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs

@@ -12,5 +12,5 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=11

plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Waveform database
 Bundle-SymbolicName: com.minres.scviewer.database
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: com.minres.scviewer.database,

plugins/com.minres.scviewer.database/OSGI-INF/component.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="com.minres.scviewer.database.loader">
    <implementation class="com.minres.scviewer.database.internal.WaveformDb"/>
-   <reference bind="bind" cardinality="1..n" interface="com.minres.scviewer.database.IWaveformDbLoader" name="IWaveformDbLoader" policy="dynamic" unbind="unbind"/>
+   <reference bind="bind" cardinality="1..n" interface="com.minres.scviewer.database.IWaveformDbLoaderFactory" name="IWaveformDbLoaderFactory" policy="dynamic" unbind="unbind"/>
 </scr:component>

plugins/com.minres.scviewer.database/pom.xml

@@ -4,9 +4,9 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.2</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
 </project>

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/EventEntry.java

@@ -0,0 +1,41 @@
+package com.minres.scviewer.database;
+
+import java.util.Arrays;
+
+public class EventEntry implements Comparable<EventEntry>{
+	public long timestamp; // unsigned
+	public IEvent[] events = null;
+	
+	
+	public EventEntry(long timestamp) {
+		this.timestamp = timestamp;
+	}
+
+
+	public EventEntry(long timestamp, IEvent[] events) {
+		this.timestamp = timestamp;
+		this.events = events;
+	}
+
+
+	@Override
+	public int compareTo(EventEntry o) {
+		return Long.compareUnsigned(timestamp, o.timestamp);
+	}
+	
+	@Override
+	public String toString() {
+		return String.format("e.%d@%d", events.length,timestamp);
+	}
+
+
+	public void append(IEvent value) {
+		if(events.length==0)
+			events = new IEvent[] {value};
+		else {
+			int idx = events.length;
+			events = Arrays.copyOf(events, idx+1);
+			events[idx]=value;
+		}
+	}
+}

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/EventList.java

@@ -0,0 +1,195 @@
+package com.minres.scviewer.database;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
+public class EventList  implements IEventList {
+
+	ArrayList<EventEntry> store = new ArrayList<>();
+	int start = 0;
+	int end = store.size();
+	boolean unmodifiable = false;
+			
+	public class Iterator implements java.util.Iterator<EventEntry> {
+		
+		EventList list;
+		
+		private int pos;
+		
+		public Iterator(EventList list) {
+			this.list=list;
+			this.pos=-1;
+		}
+
+		@Override
+		public boolean hasNext() {
+			return pos<(list.end-1);
+		}
+
+		@Override
+		public EventEntry next() {
+			if(hasNext()) {
+				pos++;
+				return list.store.get(pos);
+			} else
+				return null;
+		}
+
+		@Override
+		public void remove() {
+			list.store.remove(pos);
+		}
+		
+	}
+	
+	public EventList() {
+	}
+
+	private EventList(ArrayList<EventEntry> store , int start, int end) {
+		this.store=store;
+		this.start=start;
+		this.end=end;
+		this.unmodifiable=true;
+	}
+
+	@Override
+	public IEventList subMap(long from, boolean includeFrom, long to) {
+		//the index of the first element greater than the key, or list.size()
+		int beginIndex = Collections.binarySearch(store, new EventEntry(from));
+		int startIndex = beginIndex < 0? -(beginIndex + 1): beginIndex;
+		int endIndex = Collections.binarySearch(store, new EventEntry(to));
+		endIndex = endIndex < 0? -(endIndex + 1): endIndex+1;
+		if(beginIndex>0 && !includeFrom)
+			return new EventList(store, startIndex+1, endIndex);
+		else
+			return new EventList(store, startIndex, endIndex);
+	}
+	
+	@Override
+	public int size() {
+		return end-start;
+	}
+
+	@Override
+	public boolean containsKey(long key) {
+		int index = Collections.binarySearch(store, new EventEntry(key));
+		return index>=0 && index>=start && index<end;
+	}
+
+	@Override
+	public IEvent[] get(long key) {
+		int index = Collections.binarySearch(store, new EventEntry(key));
+		if(index<0) return null;
+		return index>=start && index<end? store.get(index).events: null;
+	}
+
+	@Override
+	public void put(long key, IEvent value) {
+		if(unmodifiable) throw new UnsupportedOperationException();
+		if(store.size()==0 || store.get(store.size()-1).timestamp < key) {
+			store.add(new EventEntry(key, new IEvent[] {value}));
+		} else {
+			int index = Collections.binarySearch(store, new EventEntry(key));
+	        // < 0 if element is not in the list, see Collections.binarySearch
+	        if (index < 0) {
+	    		EventEntry e = new EventEntry(key, new IEvent[] {value});
+	        	index = -(index + 1);
+		        store.add(index, e);
+	        } else { 
+	            // Insertion index is index of existing element, to add new element behind it increase index
+	        	store.get(index).append(value);
+	        }
+		}
+		end=store.size();
+	}
+
+	@Override
+	public Collection<EventEntry> entrySet() {
+		if(start != 0 || end != store.size())
+			return Collections.unmodifiableList(store.subList(start, end));
+		else
+			return Collections.unmodifiableList(store);
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return start==end || store.isEmpty();
+	}
+
+	@Override
+	public long firstKey() {
+		return store.get(start).timestamp;
+	}
+
+	@Override
+	public long lastKey() {
+		return store.get(end-1).timestamp;
+	}
+
+	// Navigable map functions
+	@Override
+	public EventEntry firstEntry() {
+		return  store.get(start);
+	}
+
+	@Override
+	public EventEntry lastEntry() {
+		return store.get(end-1);
+	}
+
+	@Override
+	public EventEntry floorEntry(long key) {
+		int index = Collections.binarySearch(store, new EventEntry(key));
+    	if(index==-1) return null;
+        // < 0 if element is not in the list, see Collections.binarySearch
+        if (index < 0) {
+        	index = -(index + 2);
+        }
+        if(index>=end)
+        	return store.get(end-1);
+		return index<start? null: store.get(index);
+	}
+
+	@Override
+	public EventEntry ceilingEntry(long key) {
+		int index = Collections.binarySearch(store, new EventEntry(key));
+        // < 0 if element is not in the list, see Collections.binarySearch
+        if (index < 0) 
+        	index = -(index + 1);
+        if(index<start)
+        	return store.get(start);
+		return index>=end? null: store.get(index);
+	}
+
+	@Override
+	public EventEntry lowerEntry(long key) {
+		int index = Collections.binarySearch(store, new EventEntry(key));
+        // < 0 if element is not in the list, see Collections.binarySearch
+        if (index < 0) 
+        	index = -(index + 1);
+    	index--;
+        if(index>=end)
+        	return store.get(end-1);
+		return index>=end || index<start ?null:store.get(index);
+	}
+
+	@Override
+	public EventEntry higherEntry(long key) {
+		int index = Collections.binarySearch(store, new EventEntry(key));
+        // < 0 if element is not in the list, see Collections.binarySearch
+        if (index < 0) 
+        	index = -(index + 1);
+        else
+        	index++;
+        if(index<start)
+        	return store.get(start);
+		return index>=end || index<start ?null:store.get(index);
+	}
+
+	@Override
+	public java.util.Iterator<EventEntry> iterator() {
+		return new Iterator(this);
+	}
+
+}

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IEventList.java

@@ -0,0 +1,84 @@
+package com.minres.scviewer.database;
+
+import java.util.Collection;
+
+public interface IEventList extends Iterable<EventEntry> {
+
+	int size();
+
+	Collection<EventEntry> entrySet();
+
+	boolean containsKey(long key);
+
+	IEvent[] get(long key);
+
+	void put(long key, IEvent value);
+
+	long firstKey();
+
+	long lastKey();
+
+	boolean isEmpty();
+	/**
+	 * Returns a key-value mapping associated with the greatest key less 
+	 * than or equal to the given key, or null if there is no such key.
+	 * 
+	 * @param key
+	 * @return
+	 */
+	EventEntry floorEntry(long key);
+	/**
+	 * Returns a key-value mapping associated with the least key greater 
+	 * than or equal to the given key, or null if there is no such key.
+	 * 
+	 * @param key
+	 * @return
+	 */
+	EventEntry ceilingEntry(long key);
+	/**
+	 * Returns a key-value mapping associated with the least key in this map,
+	 * or null if the map is empty.
+	 * 
+	 * @return
+	 */
+	EventEntry firstEntry();
+	/**
+	 * Returns a key-value mapping associated with the least key in this map,
+	 * or null if the map is empty.
+	 * 
+	 * @return
+	 */
+	EventEntry lastEntry();
+	/**
+	 * Returns a key-value mapping associated with the least key strictly greater
+	 * than the given key, or null if there is no such key.
+	 * 
+	 * @param key
+	 * @return
+	 */
+	EventEntry higherEntry(long key);
+	/**
+	 * Returns a key-value mapping associated with the greatest key strictly less 
+	 * than the given key, or null if there is no such key.
+	 * 
+	 * @param key
+	 * @return
+	 */
+	EventEntry lowerEntry(long key);
+    /**
+     * Returns a view of the portion of this map whose keys range from
+     * {@code fromKey} to {@code toKey}.  If {@code fromKey} and
+     * {@code toKey} are equal, the returned map is empty unless
+     * {@code fromInclusive} is true.  The
+     * returned map is backed by this map, so changes in the returned map are
+     * reflected in this map, and vice-versa.  The returned map supports all
+     * optional map operations that this map supports.
+     *
+     * @param fromKey low endpoint of the keys in the returned map
+     * @param fromInclusive {@code true} if the low endpoint
+     *        is to be included in the returned view
+     * @param toKey high endpoint of the keys in the returned map (inclusive)
+     */
+	IEventList subMap(long key, boolean b, long key2);
+	
+}

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveform.java

@@ -10,7 +10,6 @@
  *******************************************************************************/
 package com.minres.scviewer.database;
 
-import java.util.NavigableMap;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -25,7 +24,7 @@ public interface IWaveform extends IHierNode {
 	 *
 	 * @return the id
 	 */
-	public Long getId();
+	public long getId();
 
 	/**
 	 * Checks if is same.
@@ -40,7 +39,7 @@ public interface IWaveform extends IHierNode {
 	 *
 	 * @return the events
 	 */
-	public NavigableMap<Long, IEvent[]> getEvents();
+	public IEventList getEvents();
 
 	/**
 	 * Gets the events at time.
@@ -48,7 +47,7 @@ public interface IWaveform extends IHierNode {
 	 * @param time the time
 	 * @return the events at time
 	 */
-	public IEvent[] getEventsAtTime(Long time);
+	public IEvent[] getEventsAtTime(long time);
 
 	/**
 	 * Gets the events before time.
@@ -56,7 +55,7 @@ public interface IWaveform extends IHierNode {
 	 * @param time the time
 	 * @return the events before time
 	 */
-	public IEvent[] getEventsBeforeTime(Long time);
+	public IEvent[] getEventsBeforeTime(long time);
 
 	/**
 	 * Gets the type.

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDb.java

@@ -23,7 +23,7 @@ public interface IWaveformDb extends IHierNode {
 	 *
 	 * @return the max time
 	 */
-	public Long getMaxTime();
+	public long getMaxTime();
 
 	/**
 	 * Gets the stream by name.
@@ -62,9 +62,4 @@ public interface IWaveformDb extends IHierNode {
 	 */
 	public boolean isLoaded();
 
-	/**
-	 * Clear.
-	 */
-	public void clear();
-
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbLoader.java

@@ -69,7 +69,7 @@ public interface IWaveformDbLoader {
 	 *
 	 * @return the max time
 	 */
-	public Long getMaxTime();
+	public long getMaxTime();
 
 	/**
 	 * Gets the all waves.

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbLoaderFactory.java

@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     MINRES Technologies GmbH - initial API and implementation
+ *******************************************************************************/
+package com.minres.scviewer.database;
+
+import java.io.File;
+
+/**
+ * A factory for creating IWaveformDb objects.
+ */
+public interface IWaveformDbLoaderFactory {
+
+	/**
+	 * Check if the loader produced by this factory can load the given file.
+	 *
+	 * @param inputFile the input file
+	 * @return true, if successful
+	 */
+	public boolean canLoad(File inputFile);
+	/**
+	 * Gets the database.
+	 *
+	 * @return the database
+	 */
+	IWaveformDbLoader getLoader();
+}

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java

@@ -15,16 +15,17 @@ import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import com.minres.scviewer.database.HierNode;
 import com.minres.scviewer.database.IHierNode;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.IWaveformDb;
 import com.minres.scviewer.database.IWaveformDbLoader;
+import com.minres.scviewer.database.IWaveformDbLoaderFactory;
 import com.minres.scviewer.database.RelationType;
 
 /**
@@ -33,7 +34,7 @@ import com.minres.scviewer.database.RelationType;
 public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeListener {
 
 	/** The loaders. */
-	private static List<IWaveformDbLoader> loaders = new LinkedList<>();
+	private static List<IWaveformDbLoaderFactory> loaderFactories = new LinkedList<>();
 
 	/** The loaded. */
 	private boolean loaded;
@@ -45,15 +46,15 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 	private Map<String, IWaveform> waveforms;
 
 	/** The max time. */
-	private Long maxTime;
+	private long maxTime = -1;
 
 	/**
 	 * Bind.
 	 *
 	 * @param loader the loader
 	 */
-	public synchronized void bind(IWaveformDbLoader loader) {
+	public synchronized void bind(IWaveformDbLoaderFactory loader) {
-		loaders.add(loader);
+		loaderFactories.add(loader);
 	}
 
 	/**
@@ -61,8 +62,8 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 	 *
 	 * @param loader the loader
 	 */
-	public synchronized void unbind(IWaveformDbLoader loader) {
+	public synchronized void unbind(IWaveformDbLoaderFactory loader) {
-		loaders.remove(loader);
+		loaderFactories.remove(loader);
 	}
 
 	/**
@@ -70,8 +71,8 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 	 *
 	 * @return the loaders
 	 */
-	public static List<IWaveformDbLoader> getLoaders() {
+	public static List<IWaveformDbLoaderFactory> getLoaders() {
-		return Collections.unmodifiableList(loaders);
+		return Collections.unmodifiableList(loaderFactories);
 	}
 
 	/**
@@ -79,7 +80,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 	 */
 	public WaveformDb() {
 		super();
-		waveforms = new HashMap<>();
+		waveforms = new ConcurrentHashMap<>();
 		relationTypes = new ArrayList<>();
 		maxTime = 0L;
 	}
@@ -90,7 +91,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 	 * @return the max time
 	 */
 	@Override
-	public Long getMaxTime() {
+	public long getMaxTime() {
 		return maxTime;
 	}
 
@@ -124,8 +125,9 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 	@Override
 	public boolean load(File inp) {
 		boolean retval = true;
-		for (IWaveformDbLoader loader : loaders) {
+		for (IWaveformDbLoaderFactory loaderFactory : loaderFactories) {
-			if (loader.canLoad(inp)) {
+			if (loaderFactory.canLoad(inp)) {
+				IWaveformDbLoader loader = loaderFactory.getLoader();
 				loader.addPropertyChangeListener(this);
 				try {
 					loader.load(this, inp);
@@ -165,16 +167,6 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 		return ext;
 	}
 
-	/**
-	 * Clear.
-	 */
-	@Override
-	public void clear() {
-		waveforms.clear();
-		childNodes.clear();
-		loaded = false;
-	}
-
 	/**
 	 * Checks if is loaded.
 	 *
@@ -189,6 +181,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 		if (IWaveformDbLoader.SIGNAL_ADDED.equals(evt.getPropertyName())
 				|| IWaveformDbLoader.STREAM_ADDED.equals(evt.getPropertyName())) {
 			IWaveform waveform = (IWaveform) evt.getNewValue();
+			waveforms.put(waveform.getFullName(), waveform);
 			putInHierarchy(waveform);
 			pcs.firePropertyChange(IHierNode.WAVEFORMS, null, waveforms);
 			pcs.firePropertyChange(IHierNode.CHILDS, null, childNodes);
@@ -200,7 +193,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 	/**
 	 * Builds the hierarchy nodes.
 	 */
-	private void buildHierarchyNodes() {
+	private synchronized void buildHierarchyNodes() {
 		boolean needsSorting = false;
 		for (IWaveform stream : getAllWaves()) {
 			if (stream.getParent() == null) {

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITx.java

@@ -25,7 +25,7 @@ public interface ITx extends Comparable<ITx> {
 	 *
 	 * @return the id
 	 */
-	public Long getId();
+	public long getId();
 
 	/**
 	 * Gets the stream.
@@ -46,14 +46,14 @@ public interface ITx extends Comparable<ITx> {
 	 *
 	 * @return the begin time
 	 */
-	public Long getBeginTime();
+	public long getBeginTime();
 
 	/**
 	 * Gets the end time.
 	 *
 	 * @return the end time
 	 */
-	public Long getEndTime();
+	public long getEndTime();
 
 	/**
 	 * Gets the attributes.

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxEvent.java

@@ -22,7 +22,7 @@ public interface ITxEvent extends IEvent {
 	 *
 	 * @return the time
 	 */
-	public Long getTime();
+	public long getTime();
 
 	/**
 	 * Gets the transaction.

plugins/com.minres.scviewer.e4.application/Application.e4xmi

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:advanced="http://www.eclipse.org/ui/2010/UIModel/application/ui/advanced" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmlns:ui="http://www.eclipse.org/ui/2010/UIModel/application/ui" xmi:id="_95PfsHNmEeWBq8z1Dv39LA" elementId="org.eclipse.e4.ide.application" bindingContexts="_95PfuXNmEeWBq8z1Dv39LA">
-  <children xsi:type="basic:TrimmedWindow" xmi:id="_95PfsXNmEeWBq8z1Dv39LA" label="SC Viewer" bindingContexts="_95PfunNmEeWBq8z1Dv39LA" width="1280" height="700">
+  <children xsi:type="basic:TrimmedWindow" xmi:id="_95PfsXNmEeWBq8z1Dv39LA" elementId="com.minres.scviewer.e4.application.trimmedwindow.main" label="SC Viewer" bindingContexts="_95PfunNmEeWBq8z1Dv39LA" width="1280" height="700">
     <children xsi:type="advanced:PerspectiveStack" xmi:id="_95QGxnNmEeWBq8z1Dv39LA">
       <children xsi:type="advanced:Perspective" xmi:id="_95QGx3NmEeWBq8z1Dv39LA">
         <children xsi:type="basic:PartStack" xmi:id="_95QGyXNmEeWBq8z1Dv39LA" elementId="org.eclipse.editorss" containerData="7500">
@@ -9,20 +9,22 @@
       </children>
     </children>
     <children xsi:type="basic:Part" xmi:id="__VNlAIytEeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.dialog.aboutscviewer" toBeRendered="false" visible="false" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.parts.AboutDialog" label="About SCViewer" bindingContexts="_95Pfu3NmEeWBq8z1Dv39LA"/>
+    <children xsi:type="basic:Part" xmi:id="_hXh-kEYFEeyPM8G0E2EYww" elementId="com.minres.scviewer.e4.application.dialog.onlinehelp" toBeRendered="false" visible="false" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.parts.HelpDialog" label="SCViewer Online Help" bindingContexts="_95Pfu3NmEeWBq8z1Dv39LA" closeable="true"/>
     <mainMenu xmi:id="_95PfyXNmEeWBq8z1Dv39LA" elementId="menu:org.eclipse.ui.main.menu">
       <children xsi:type="menu:Menu" xmi:id="_95QGwHNmEeWBq8z1Dv39LA" elementId="com.minres.scviewer.e4.application.menu.file" label="File">
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_igsK0BkREeudD5MqrWoETQ" elementId="" label="Open Database" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/folder_database.png" mnemonics="M1+O" command="_95PfwHNmEeWBq8z1Dv39LA"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_igsK0BkREeudD5MqrWoETQ" elementId="" label="Open Database" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/folder_database.png" mnemonics="" command="_95PfwHNmEeWBq8z1Dv39LA"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_VJG3YHgvEeWwZ-9vrAR2UQ" elementId="" label="Re-load Database" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/database_refresh.png" mnemonics="M1+R" command="_srACsBkREeudD5MqrWoETQ"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_VJG3YHgvEeWwZ-9vrAR2UQ" elementId="" label="Re-load Database" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/database_refresh.png" mnemonics="" command="_srACsBkREeudD5MqrWoETQ"/>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_e7MOYJedEeW09eyIbHsdvg" elementId="" label="Load active tab settings" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/folder_page.png" command="_7-AIMJebEeW09eyIbHsdvg">
           <parameters xmi:id="_4vtYgJehEeW09eyIbHsdvg" elementId="com.minres.scviewer.e4.application.parameter.30" name="com.minres.scviewer.e4.application.commandparameter.loadStore" value="load"/>
         </children>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_95QGwnNmEeWBq8z1Dv39LA" label="Save active tab settings" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/script_save.png" command="_7-AIMJebEeW09eyIbHsdvg">
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_95QGwnNmEeWBq8z1Dv39LA" label="Save active tab settings" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/script_save.png" mnemonics="" command="_7-AIMJebEeW09eyIbHsdvg">
           <parameters xmi:id="_61QIsJehEeW09eyIbHsdvg" elementId="com.minres.scviewer.e4.application.parameter.31" name="com.minres.scviewer.e4.application.commandparameter.loadStore" value="store"/>
         </children>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_95QGw3NmEeWBq8z1Dv39LA" label="Quit" command="_95PfvHNmEeWBq8z1Dv39LA"/>
       </children>
       <children xsi:type="menu:Menu" xmi:id="_ZyHC0HgvEeWwZ-9vrAR2UQ" elementId="" label="Edit">
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_cPlx4HgvEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledmenuitem.delete" label="Delete" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/cross.png" command="_WUZ2wHXHEeWwZ-9vrAR2UQ"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_FiwZcEhdEeyp3vLifEzGbQ" elementId="com.minres.scviewer.e4.application.handledmenuitem.delete" label="Delete" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/cross.png" command="_WUZ2wHXHEeWwZ-9vrAR2UQ"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_cPlx4HgvEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledmenuitem.delete" label="Select All" iconURI="" command="_bV-TMHXHEeWwZ-9vrAR2UQ"/>
       </children>
       <children xsi:type="menu:Menu" xmi:id="_XmZY4HchEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.menu.navigate" label="Navigate">
         <children xsi:type="menu:Menu" xmi:id="_VCn_cHgwEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.menu.waveform" label="Waveform ...">
@@ -55,7 +57,8 @@
       </children>
       <children xsi:type="menu:Menu" xmi:id="_95QGxHNmEeWBq8z1Dv39LA" elementId="com.minres.scviewer.e4.application.menu.help" label="Help">
         <children xsi:type="menu:HandledMenuItem" xmi:id="_UQRi0B07EeuiP60JNw0iiA" elementId="com.minres.scviewer.e4.application.handledmenuitem.checkforupdate" visible="false" label="Check for Update" enabled="false" command="_-9ED4B06EeuiP60JNw0iiA"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_95QGxXNmEeWBq8z1Dv39LA" label="About" command="_95PfxnNmEeWBq8z1Dv39LA"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_95QGxXNmEeWBq8z1Dv39LA" label="Online Help" command="_lqjIYEYEEeyPM8G0E2EYww"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_4xtmgEYEEeyPM8G0E2EYww" label="About" command="_95PfxnNmEeWBq8z1Dv39LA"/>
       </children>
     </mainMenu>
     <trimBars xmi:id="_95QGy3NmEeWBq8z1Dv39LA" elementId="org.eclipse.ui.main.toolbar">
@@ -78,41 +81,12 @@
         <children xsi:type="menu:HandledToolItem" xmi:id="_FrGmEHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledtoolitem.movestreamdown" label="Move Stream down" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/down_blue.png" tooltip="Move stream/waveform in list down" command="_N_sOkHXHEeWwZ-9vrAR2UQ">
           <parameters xmi:id="_VA_yAHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.parameter.9" name="com.minres.scviewer.e4.application.command.movewaveformupCommand.parameter.dir" value="down"/>
         </children>
-        <children xsi:type="menu:ToolBarSeparator" xmi:id="_srcD0HgwEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.toolbarseparator.3"/>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_GKi7IHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledtoolitem.previousevent" label="Previous Event" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/reverse_blue.png" tooltip="Navigate to previous event in stream/waveform" command="_79rx4HabEeWwZ-9vrAR2UQ">
-          <parameters xmi:id="_XS7YYHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.parameter.10" name="com.minres.scviewer.e4.application.command.navigateEventCommand.parameter.dir" value="prev"/>
-        </children>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_GjlGMHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledtoolitem.nextevent" label="Next Event" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/play_blue.png" tooltip="Navigate to next event in stream/waveform" command="_79rx4HabEeWwZ-9vrAR2UQ">
-          <parameters xmi:id="_ZzTqcHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.parameter.11" name="com.minres.scviewer.e4.application.command.navigateEventCommand.parameter.dir" value="next"/>
-        </children>
-        <children xsi:type="menu:ToolBarSeparator" xmi:id="_tcxaIHgwEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.toolbarseparator.4"/>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_HdKZkHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledtoolitem.previoustransaction" label="Previous Transaction" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/reverse_green.png" tooltip="Navigate to previous transaction" command="_Gn3lEHXKEeWwZ-9vrAR2UQ">
-          <parameters xmi:id="_cuGAkHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.parameter.12" name="com.minres.scviewer.e4.application.command.navigateTransCommand.parameter.dir" value="prev"/>
-        </children>
-        <children xsi:type="menu:ToolControl" xmi:id="_LtQhcIuKEeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.toolcontrol.0" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.elements.RelationTypeToolControl"/>
-        <children xsi:type="menu:DirectToolItem" xmi:id="_Z7ZQkIuJEeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.directtoolitem.nextprevinstream" toBeRendered="false" visible="false" label="Next/Prev in stream">
-          <menu xmi:id="_aPyMMIuJEeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.menu.2">
-            <children xsi:type="menu:DynamicMenuContribution" xmi:id="_cnNWkIuJEeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.dynamicmenucontribution.2" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.parts.NavigateContribution"/>
-          </menu>
-        </children>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_H7bp8HcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledtoolitem.nexttransaction" label="Next Transaction" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/play_green.png" tooltip="Navigate to next transaction" command="_Gn3lEHXKEeWwZ-9vrAR2UQ">
-          <parameters xmi:id="_fiO8IHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.parameter.13" name="com.minres.scviewer.e4.application.command.navigateTransCommand.parameter.dir" value="next"/>
-        </children>
-      </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_oQdMUHcqEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.toolbar.1">
-        <children xsi:type="menu:HandledToolItem" xmi:id="_5DrGQHf4EeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledtoolitem.zoomfit" label="Zoom out" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/magnifier.png" tooltip="Restore default zoom level" command="_693GoHcqEeWwZ-9vrAR2UQ">
-          <parameters xmi:id="_5DrGQXf4EeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.parameter.14" name="com.minres.scviewer.e4.application.command.zoomcommand.parameter.level" value="fit"/>
-        </children>
-        <children xsi:type="menu:ToolBarSeparator" xmi:id="_p1AvUHcqEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.toolbarseparator.1"/>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_XMQPAHcrEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledtoolitem.zoomin" label="Zoom in" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/magnifier_zoom_in.png" tooltip="Zoom in by a factor of 3" command="_693GoHcqEeWwZ-9vrAR2UQ">
-          <parameters xmi:id="_fi5w4HcrEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.parameter.15" name="com.minres.scviewer.e4.application.command.zoomcommand.parameter.level" value="in"/>
-        </children>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_XqTc8HcrEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledtoolitem.zoomout" label="Zoom out" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/magifier_zoom_out.png" tooltip="Zoom out by a factor of 3" command="_693GoHcqEeWwZ-9vrAR2UQ">
-          <parameters xmi:id="_d7OBYHcrEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.parameter.14" name="com.minres.scviewer.e4.application.command.zoomcommand.parameter.level" value="out"/>
-        </children>
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_fwn8wGtTEeqmlpoaaMHoiw" elementId="com.minres.scviewer.e4.application.toolbar.2">
-        <children xsi:type="menu:HandledToolItem" xmi:id="_j-XIgGtTEeqmlpoaaMHoiw" elementId="com.minres.scviewer.e4.application.handledtoolitem.hover" label="Hover" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/lightbulb.png" tooltip="Enable hover window in waveform" selected="true" type="Check" command="_uyeyYGtTEeqmlpoaaMHoiw">
+        <children xsi:type="menu:HandledToolItem" xmi:id="_j-XIgGtTEeqmlpoaaMHoiw" elementId="com.minres.scviewer.e4.application.handledtoolitem.txdetails" label="TX Details" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/application_side_expand.png" tooltip="Show tx details parts" selected="true" type="Check" command="_Fj1gQEYoEeyKK_icsY7Xjg">
+          <tags>EnableTxDetails</tags>
+        </children>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_33tugEYnEeyKK_icsY7Xjg" elementId="com.minres.scviewer.e4.application.handledtoolitem.hover" label="Hover" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/lightbulb.png" tooltip="Enable hover window in waveform" selected="true" type="Check" command="_uyeyYGtTEeqmlpoaaMHoiw">
           <tags>EnableHover</tags>
         </children>
       </children>
@@ -135,24 +109,17 @@
   <handlers xmi:id="_UUnX8IoNEeWxJ_wPkM6yGQ" elementId="com.minres.scviewer.e4.application.handler.set_them" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.ThemeSetHandler" command="_KlGlsIoNEeWxJ_wPkM6yGQ"/>
   <handlers xmi:id="_V4EscIuGEeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.handler.setreleationtype" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.SetRelationTypeHandler" command="_E9lUgIt2EeWid7xO48ZBXw"/>
   <handlers xmi:id="__99WoJebEeW09eyIbHsdvg" elementId="com.minres.scviewer.e4.application.handler.loadStoreSettings" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.LoadStoreSettingsHandler" command="_7-AIMJebEeW09eyIbHsdvg"/>
-  <handlers xmi:id="_x4pSEGtTEeqmlpoaaMHoiw" elementId="com.minres.scviewer.e4.application.handler.0" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.EnableHover" command="_uyeyYGtTEeqmlpoaaMHoiw"/>
+  <handlers xmi:id="_x4pSEGtTEeqmlpoaaMHoiw" elementId="com.minres.scviewer.e4.application.handler.enablehover" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.EnableHover" command="_uyeyYGtTEeqmlpoaaMHoiw"/>
   <handlers xmi:id="_h3jU8BkWEeudD5MqrWoETQ" elementId="com.minres.scviewer.e4.application.handler.reloadCommand" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.ReloadHandler" command="_srACsBkREeudD5MqrWoETQ"/>
   <handlers xmi:id="_gn_boBlEEeuiP60JNw0iiA" elementId="com.minres.scviewer.e4.application.handler.txSearch" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.SearchHandler" command="_XDxTYBlEEeuiP60JNw0iiA"/>
   <handlers xmi:id="_CCEtAB07EeuiP60JNw0iiA" elementId="com.minres.scviewer.e4.application.handler.update" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.UpdateHandler" command="_-9ED4B06EeuiP60JNw0iiA"/>
+  <handlers xmi:id="_ru2NIEYEEeyPM8G0E2EYww" elementId="com.minres.scviewer.e4.application.handler.helpCommand" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.HelpHandler" command="_lqjIYEYEEeyPM8G0E2EYww"/>
+  <handlers xmi:id="_TwU0IEYoEeyKK_icsY7Xjg" elementId="com.minres.scviewer.e4.application.handler.enabletxdetails" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.EnableTxDetails" command="_Fj1gQEYoEeyKK_icsY7Xjg"/>
   <bindingTables xmi:id="_95PfvnNmEeWBq8z1Dv39LA" bindingContext="_95PfuXNmEeWBq8z1Dv39LA">
     <bindings xmi:id="_95Pfv3NmEeWBq8z1Dv39LA" elementId="com.minres.scviewer.e4.application.keybinding.quit" keySequence="M1+Q" command="_95PfvHNmEeWBq8z1Dv39LA">
       <tags>type:user</tags>
     </bindings>
-  </bindingTables>
+    <bindings xmi:id="_2-008EhnEeyp3vLifEzGbQ" elementId="com.minres.scviewer.e4.application.keybinding.help" keySequence="F1" command="_lqjIYEYEEeyPM8G0E2EYww"/>
-  <bindingTables xmi:id="_zZFy0GVNEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.bindingtable.waveform" bindingContext="_q4VSsGVNEeqSQM-A6dw9ig">
-    <bindings xmi:id="_1o3dEGVNEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.keybinding.zoom_in" keySequence="M1++" command="_693GoHcqEeWwZ-9vrAR2UQ">
-      <tags>type:user</tags>
-      <parameters xmi:id="_53UagGVNEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.parameter.33" name="com.minres.scviewer.e4.application.command.zoomcommand.parameter.level" value="in"/>
-    </bindings>
-    <bindings xmi:id="_8i3awGVNEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.keybinding.zoom_out" keySequence="M1+-" command="_693GoHcqEeWwZ-9vrAR2UQ">
-      <tags>type:user</tags>
-      <parameters xmi:id="__UCh4GVNEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.parameter.34" name="com.minres.scviewer.e4.application.command.zoomcommand.parameter.level" value="out"/>
-    </bindings>
   </bindingTables>
   <bindingTables xmi:id="_XullMGVOEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.bindingtable.window" bindingContext="_95PfunNmEeWBq8z1Dv39LA">
     <bindings xmi:id="_95PfwnNmEeWBq8z1Dv39LA" elementId="com.minres.scviewer.e4.application.keybinding.load" keySequence="M1+L" command="_7-AIMJebEeW09eyIbHsdvg">
@@ -169,20 +136,22 @@
     <bindings xmi:id="_3PRIQGVPEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.keybinding.open" keySequence="M1+O" command="_95PfwHNmEeWBq8z1Dv39LA">
       <tags>type:user</tags>
     </bindings>
-  </bindingTables>
+    <bindings xmi:id="_QcOn8EheEeyp3vLifEzGbQ" elementId="com.minres.scviewer.e4.application.keybinding.1" keySequence="M1+A" command="_bV-TMHXHEeWwZ-9vrAR2UQ"/>
-  <bindingTables xmi:id="_mnMrUGVmEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.bindingtable.0" bindingContext="_iQ3kQGVmEeqSQM-A6dw9ig">
+    <bindings xmi:id="_1o3dEGVNEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.keybinding.zoom_in" keySequence="M1++" command="_693GoHcqEeWwZ-9vrAR2UQ">
-    <bindings xmi:id="_n9yDwGVmEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.keybinding.0" keySequence="M1+A" command="_bV-TMHXHEeWwZ-9vrAR2UQ">
       <tags>type:user</tags>
+      <parameters xmi:id="_53UagGVNEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.parameter.33" name="com.minres.scviewer.e4.application.command.zoomcommand.parameter.level" value="in"/>
     </bindings>
+    <bindings xmi:id="_8i3awGVNEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.keybinding.zoom_out" keySequence="M1+-" command="_693GoHcqEeWwZ-9vrAR2UQ">
+      <tags>type:user</tags>
+      <parameters xmi:id="__UCh4GVNEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.parameter.34" name="com.minres.scviewer.e4.application.command.zoomcommand.parameter.level" value="out"/>
+    </bindings>
+    <bindings xmi:id="_KjmnsEheEeyp3vLifEzGbQ" elementId="com.minres.scviewer.e4.application.keybinding.0" keySequence="M1+R" command="_srACsBkREeudD5MqrWoETQ"/>
   </bindingTables>
   <rootContext xmi:id="_95PfuXNmEeWBq8z1Dv39LA" elementId="org.eclipse.ui.contexts.dialogAndWindow" name="In Dialog and Windows">
-    <children xmi:id="_95PfunNmEeWBq8z1Dv39LA" elementId="org.eclipse.ui.contexts.window" name="In Windows">
+    <children xmi:id="_95PfunNmEeWBq8z1Dv39LA" elementId="org.eclipse.ui.contexts.window" name="In Windows"/>
-      <children xmi:id="_q4VSsGVNEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.bindingcontext.waveform" name="In Waveform Part"/>
-      <children xmi:id="_iQ3kQGVmEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.bindingcontext.indesignbrowser" name="In DesignBrowser"/>
-    </children>
     <children xmi:id="_95Pfu3NmEeWBq8z1Dv39LA" elementId="org.eclipse.ui.contexts.dialog" name="In Dialogs"/>
   </rootContext>
-  <descriptors xmi:id="_KicY0HRMEeWBq8z1Dv39LA" elementId="com.minres.scviewer.e4.application.partdescriptor.waveformviewer" label="SCViewer" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/scviewer.png" bindingContexts="_q4VSsGVNEeqSQM-A6dw9ig" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.parts.WaveformViewer">
+  <descriptors xmi:id="_KicY0HRMEeWBq8z1Dv39LA" elementId="com.minres.scviewer.e4.application.partdescriptor.waveformviewer" label="SCViewer" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/scviewer.png" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.parts.WaveformViewer">
     <tags>categoryTag:General</tags>
     <handlers xmi:id="_BSIuEHacEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handler.navigateEventCommand" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.NavigateEvent" command="_79rx4HabEeWwZ-9vrAR2UQ"/>
     <handlers xmi:id="_JpdGwHXKEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handler.navigateTransCommand" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.NavigateTrans" command="_Gn3lEHXKEeWwZ-9vrAR2UQ"/>
@@ -191,6 +160,7 @@
     <handlers xmi:id="_Du1NAHcrEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handler.zoomCommand" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.ZoomHandler" command="_693GoHcqEeWwZ-9vrAR2UQ"/>
     <handlers xmi:id="_bxt4QM3rEei6rfTGo88R-w" elementId="com.minres.scviewer.e4.application.handler.changeWaveDisplay" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.ChangeWaveformDisplay" command="_FZunYM2PEei6rfTGo88R-w"/>
     <handlers xmi:id="_bxw7kM3rEei6rfTGo88R-w" elementId="com.minres.scviewer.e4.application.handler.changeValueDisplay" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.ChangeValueDisplay" command="_4C_asM3ZEei6rfTGo88R-w"/>
+    <handlers xmi:id="_ZVHbYE-JEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.handler.panCommand" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.PanHandler" command="_y2BUsE-HEeyuGJbYVZjX8w"/>
     <menus xsi:type="menu:PopupMenu" xmi:id="_TwzrsHWSEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.popupmenu.namecontext" label="Name Menu">
       <children xsi:type="menu:HandledMenuItem" xmi:id="_Vco7YHWSEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledmenuitem.moveup" label="Move up" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/up_blue.png" tooltip="Move stream/waveform in list up" command="_N_sOkHXHEeWwZ-9vrAR2UQ">
         <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_elFdcHr_EeWVM_sKoXvptg" coreExpressionId="com.minres.scviewer.e4.application.oneWaveSeleted"/>
@@ -237,7 +207,50 @@
         <visibleWhen xsi:type="ui:ImperativeExpression" xmi:id="_Se1voBlEEeuiP60JNw0iiA" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.SearchHandler"/>
       </children>
     </menus>
+    <toolbar xmi:id="_ReeeAE-DEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.toolbar.3">
+      <children xsi:type="menu:HandledToolItem" xmi:id="_GKi7IHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledtoolitem.previousevent" label="Previous Event" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/previous-green.png" tooltip="Navigate to previous event in stream/waveform" command="_79rx4HabEeWwZ-9vrAR2UQ">
+        <parameters xmi:id="_XS7YYHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.parameter.10" name="com.minres.scviewer.e4.application.command.navigateEventCommand.parameter.dir" value="prev"/>
+      </children>
+      <children xsi:type="menu:HandledToolItem" xmi:id="_GjlGMHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledtoolitem.nextevent" label="Next Event" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/next-green.png" tooltip="Navigate to next event in stream/waveform" command="_79rx4HabEeWwZ-9vrAR2UQ">
+        <parameters xmi:id="_ZzTqcHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.parameter.11" name="com.minres.scviewer.e4.application.command.navigateEventCommand.parameter.dir" value="next"/>
+      </children>
+      <children xsi:type="menu:ToolBarSeparator" xmi:id="_tcxaIHgwEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.toolbarseparator.4"/>
+      <children xsi:type="menu:HandledToolItem" xmi:id="_HdKZkHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledtoolitem.previoustransaction" label="Previous Transaction" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/reverse_green.png" tooltip="Navigate to previous transaction" command="_Gn3lEHXKEeWwZ-9vrAR2UQ">
+        <parameters xmi:id="_cuGAkHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.parameter.12" name="com.minres.scviewer.e4.application.command.navigateTransCommand.parameter.dir" value="prev"/>
+      </children>
+      <children xsi:type="menu:ToolControl" xmi:id="_LtQhcIuKEeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.toolcontrol.0" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.elements.RelationTypeToolControl"/>
+      <children xsi:type="menu:HandledToolItem" xmi:id="_H7bp8HcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledtoolitem.nexttransaction" label="Next Transaction" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/play_green.png" tooltip="Navigate to next transaction" command="_Gn3lEHXKEeWwZ-9vrAR2UQ">
+        <parameters xmi:id="_fiO8IHcjEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.parameter.13" name="com.minres.scviewer.e4.application.command.navigateTransCommand.parameter.dir" value="next"/>
+      </children>
+      <children xsi:type="menu:ToolBarSeparator" xmi:id="_dOLmYE-DEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.toolbarseparator.0"/>
+      <children xsi:type="menu:HandledToolItem" xmi:id="_dPFBcE-HEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.handledtoolitem.panleft" label="Pan left" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/reverse_blue.png" tooltip="Pan left" command="_y2BUsE-HEeyuGJbYVZjX8w">
+        <parameters xmi:id="_jkVBYE-JEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.parameter.14" name="com.minres.scviewer.e4.application.command.pancommand.parameter.direction" value="left"/>
+      </children>
+      <children xsi:type="menu:HandledToolItem" xmi:id="_Z-blgE-GEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.handledtoolitem.pancursor" label="Pan to cursor" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/center_blue.png" tooltip="Center on cursor" command="_y2BUsE-HEeyuGJbYVZjX8w">
+        <parameters xmi:id="_Z-blgU-GEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.parameter.out" name="com.minres.scviewer.e4.application.command.pancommand.parameter.direction" value="cursor"/>
+      </children>
+      <children xsi:type="menu:HandledToolItem" xmi:id="_ejt5IE-HEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.handledtoolitem.panright" label="Pan right" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/play_blue.png" tooltip="Pan right" command="_y2BUsE-HEeyuGJbYVZjX8w">
+        <parameters xmi:id="_f4awUE-JEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.parameter.out" name="com.minres.scviewer.e4.application.command.pancommand.parameter.direction" value="right"/>
+      </children>
+      <children xsi:type="menu:ToolBarSeparator" xmi:id="_b7RFoE-GEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.toolbarseparator.1"/>
+      <children xsi:type="menu:HandledToolItem" xmi:id="_qA5D4E-DEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.handledtoolitem.zoomfull" label="Zoom full" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/zoom_full.png" tooltip="Zoom full range" command="_693GoHcqEeWwZ-9vrAR2UQ">
+        <parameters xmi:id="_qA5D4U-DEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.parameter.full" name="com.minres.scviewer.e4.application.command.zoomcommand.parameter.level" value="full"/>
+      </children>
+      <children xsi:type="menu:HandledToolItem" xmi:id="_qA65EE-DEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.handledtoolitem.zoomfit" label="Zoom fit" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/zoom_fit.png" tooltip="Zoom between cursor and marker" command="_693GoHcqEeWwZ-9vrAR2UQ">
+        <parameters xmi:id="_qA65EU-DEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.parameter.fit" name="com.minres.scviewer.e4.application.command.zoomcommand.parameter.level" value="fit"/>
+      </children>
+      <children xsi:type="menu:ToolBarSeparator" xmi:id="_qA8HME-DEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.toolbarseparator.1"/>
+      <children xsi:type="menu:HandledToolItem" xmi:id="_qA8uQE-DEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.handledtoolitem.zoomin" label="Zoom in" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/magnifier_zoom_in.png" tooltip="Zoom in" command="_693GoHcqEeWwZ-9vrAR2UQ">
+        <parameters xmi:id="_qA8uQU-DEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.parameter.in" name="com.minres.scviewer.e4.application.command.zoomcommand.parameter.level" value="in"/>
+      </children>
+      <children xsi:type="menu:HandledToolItem" xmi:id="_qA98YE-DEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.handledtoolitem.zoomout" label="Zoom out" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/magifier_zoom_out.png" tooltip="Zoom out" command="_693GoHcqEeWwZ-9vrAR2UQ">
+        <parameters xmi:id="_qA98YU-DEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.parameter.out" name="com.minres.scviewer.e4.application.command.zoomcommand.parameter.level" value="out"/>
+      </children>
+    </toolbar>
   </descriptors>
+  <snippets xsi:type="basic:Window" xmi:id="_R8mJUEhwEeyp3vLifEzGbQ" elementId="com.minres.scviewer.e4.application.window.help" selectedElement="_R8mJUUhwEeyp3vLifEzGbQ" label="SC Viewer Help" width="800" height="600">
+    <children xsi:type="basic:Part" xmi:id="_R8mJUUhwEeyp3vLifEzGbQ" elementId="com.minres.scviewer.e4.application.part.container" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.parts.help.HelpBrowser"/>
+  </snippets>
   <commands xmi:id="_95PfvHNmEeWBq8z1Dv39LA" elementId="org.eclipse.ui.file.exit" commandName="Quit Command"/>
   <commands xmi:id="_95PfwHNmEeWBq8z1Dv39LA" elementId="com.minres.scviewer.e4.application.open" commandName="Open Command"/>
   <commands xmi:id="_95Pfw3NmEeWBq8z1Dv39LA" elementId="org.eclipse.ui.file.save" commandName="Save Command"/>
@@ -280,6 +293,11 @@
   <commands xmi:id="_srACsBkREeudD5MqrWoETQ" elementId="com.minres.scviewer.e4.application.reload" commandName="Reload Command"/>
   <commands xmi:id="_XDxTYBlEEeuiP60JNw0iiA" elementId="com.minres.scviewer.e4.application.txSearch" commandName="Search Command"/>
   <commands xmi:id="_-9ED4B06EeuiP60JNw0iiA" elementId="com.minres.scviewer.e4.application.command.update" commandName="Update"/>
+  <commands xmi:id="_lqjIYEYEEeyPM8G0E2EYww" elementId="org.eclipse.ui.help.helpAction" commandName="Help Command"/>
+  <commands xmi:id="_Fj1gQEYoEeyKK_icsY7Xjg" elementId="com.minres.scviewer.e4.application.command.enabletxdetails" commandName="Enable Tx Details" description="Show tx details parts"/>
+  <commands xmi:id="_y2BUsE-HEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.command.pancommand" commandName="Pan Command">
+    <parameters xmi:id="_y2BUsU-HEeyuGJbYVZjX8w" elementId="com.minres.scviewer.e4.application.command.pancommand.parameter.direction" name="direction" optional="false"/>
+  </commands>
   <addons xmi:id="_95PfsnNmEeWBq8z1Dv39LA" elementId="org.eclipse.e4.core.commands.service" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
   <addons xmi:id="_95Pfs3NmEeWBq8z1Dv39LA" elementId="org.eclipse.e4.ui.contexts.service" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
   <addons xmi:id="_95PftHNmEeWBq8z1Dv39LA" elementId="org.eclipse.e4.ui.bindings.service" contributionURI="bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"/>

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.12.2
+Bundle-Version: 2.15.1
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.11.1",
@@ -38,5 +38,6 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.equinox.p2.metadata.repository;bundle-version="1.3.400"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: com.minres.scviewer.database,
+ javax.annotation;version="1.0.0";resolution:=optional,
  javax.inject;version="1.0.0"
 Automatic-Module-Name: com.minres.scviewer.e4.application

plugins/com.minres.scviewer.e4.application/pom.xml

@@ -6,8 +6,8 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.12.2</version>
+		<version>2.15.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>
-</project>
+</project>

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java

@@ -61,6 +61,8 @@ public class E4LifeCycle {
 		final Options opt = new Options(args, 0, Integer.MAX_VALUE);
 		opt.getSet()
 		.addOption("clearPersistedState", Multiplicity.ZERO_OR_ONE)
+		.addOption("launcher.defaultAction", Separator.BLANK, Multiplicity.ZERO_OR_ONE)
+		.addOption("launcher.openFile", Multiplicity.ZERO_OR_ONE)
 		.addOption("c", Separator.BLANK, Multiplicity.ZERO_OR_ONE);
 		if (!opt.check(Options.DEFAULT_SET, true, false)) {
 			logger.error(opt.getCheckErrors());

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/Messages.java

@@ -24,6 +24,7 @@ public class Messages extends NLS {
 	public static String SCViewerPreferencesPage_0;
 	public static String SCViewerPreferencesPage_1;
 	public static String SCViewerPreferencesPage_2;
+	public static String SCViewerPreferencesPage_3;
 	public static String StatusBarControl_1;
 	public static String StatusBarControl_2;
 	public static String StatusBarControl_3;
@@ -82,6 +83,16 @@ public class Messages extends NLS {
 	public static String cursor;
 	public static String cursor_drag;
 	public static String cursor_text;
+	public static String HelpBrowser_7;
+	public static String HelpBrowser_8;
+	public static String HelpDialog_0;
+	public static String HelpDialog_1;
+	public static String HelpDialog_2;
+	public static String HelpDialog_3;
+	public static String HelpDialog_4;
+	public static String HelpDialog_5;
+	public static String HelpDialog_6;
+	public static String HelpDialog_7;
 	public static String marker;
 	public static String marker_text;
 	public static String rel_arrow;

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/WaveformPopupMenuContribution.java

@@ -40,7 +40,7 @@ public class WaveformPopupMenuContribution {
 				if(elem instanceof TrackEntry) {
 					TrackEntry e = (TrackEntry) elem;
 					if(e.waveform.getType() == WaveformType.SIGNAL) {
-						Object o = e.waveform.getEvents().firstEntry().getValue()[0];
+						Object o = e.waveform.getEvents().firstEntry().events[0];
 						if(checkForDouble && o instanceof DoubleVal) 
 							return true;
 						else if(o instanceof BitVector && ((BitVector)o).getWidth()>1)

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/EnableTxDetails.java

@@ -0,0 +1,57 @@
+
+package com.minres.scviewer.e4.application.handlers;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.di.extensions.Preference;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import org.osgi.service.prefs.BackingStoreException;
+
+import com.minres.scviewer.e4.application.preferences.PreferenceConstants;
+
+@SuppressWarnings("restriction")
+public class EnableTxDetails {
+	static final String TAG_NAME = "EnableTxDetails"; //$NON-NLS-1$
+
+	static final String ICON_DISABLED = "platform:/plugin/com.minres.scviewer.e4.application/icons/application_side_expand.png"; //$NON-NLS-1$
+	static final String ICON_ENABLED = "platform:/plugin/com.minres.scviewer.e4.application/icons/application_side_contract.png"; //$NON-NLS-1$
+	static final String TOOLTIP_DISABLED = "Show tx details parts";
+	static final String TOOLTIP_ENABLED = "Hide tx details parts";
+	
+	@Inject
+	MApplication application;
+
+	@Inject
+	EPartService partService;
+
+	@Inject
+	@Optional
+	public void reactOnShowHoverChange(EModelService modelService, @Preference(value = PreferenceConstants.SHOW_TX_DETAILS) Boolean show) {
+		List<String> tags = new LinkedList<>();
+		tags.add(TAG_NAME);
+		List<MHandledItem> elements = modelService.findElements(application, null, MHandledItem.class, tags );
+		for( MHandledItem hi : elements ){
+			hi.setSelected(show);
+			hi.setIconURI(show?ICON_ENABLED:ICON_DISABLED);
+			hi.setTooltip(show?TOOLTIP_ENABLED:TOOLTIP_DISABLED);
+		}
+	}
+
+	@Execute
+	public void execute(MHandledItem handledItem, @Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE) IEclipsePreferences prefs ) {
+		try {
+			prefs.putBoolean(PreferenceConstants.SHOW_TX_DETAILS, handledItem.isSelected());
+			prefs.flush();
+		} catch (BackingStoreException e) {}
+	}
+
+}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java

@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     MINRES Technologies GmbH - initial API and implementation
+ *******************************************************************************/
+package com.minres.scviewer.e4.application.handlers;
+
+import org.eclipse.e4.core.di.annotations.CanExecute;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+
+public class HelpHandler {
+
+	static final String WINDOW_ID="com.minres.scviewer.e4.application.window.help"; //$NON-NLS-1$
+	@CanExecute
+	public boolean canExecute(MApplication app) {
+		return !app.getChildren().stream().filter(e -> e.getElementId().equals(WINDOW_ID)).findFirst().isPresent();
+	}
+	
+	@Execute
+	public void execute(MApplication app, MWindow window, EModelService modelService /*@Named("mdialog01.dialog.0") MDialog dialog*/) {
+		MWindow newWin = (MWindow)modelService.cloneSnippet(app, WINDOW_ID, null);
+		app.getChildren().add(newWin);
+	}
+
+}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateEvent.java

@@ -17,7 +17,6 @@ import org.eclipse.e4.core.di.annotations.CanExecute;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
-import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
 import com.minres.scviewer.database.IWaveform;
@@ -29,21 +28,25 @@ import com.minres.scviewer.e4.application.parts.WaveformViewer;
 public class NavigateEvent {
 
 	final static String PARAMTER_ID="com.minres.scviewer.e4.application.command.navigateEventCommand.parameter.dir"; //$NON-NLS-1$
-	
+
 	@CanExecute
-	public Boolean canExecute(ESelectionService selectionService){
+	public Boolean canExecute(EPartService partService){
-		Object sel = selectionService.getSelection();
+		MPart part = partService.getActivePart();
-		if( sel instanceof IStructuredSelection) {
+		if(part.getObject() instanceof WaveformViewer){
-			Object o= ((IStructuredSelection)sel).getFirstElement();
+			Object sel = ((WaveformViewer)part.getObject()).getSelection();
-			return o instanceof IWaveform || o instanceof ITx || o instanceof TrackEntry;
+			if( sel instanceof IStructuredSelection) {
+				if(((IStructuredSelection)sel).isEmpty()) return false;
+				Object o= ((IStructuredSelection)sel).getFirstElement();
+				return o instanceof IWaveform || o instanceof ITx || o instanceof TrackEntry;
+			}
 		}
 		return false;
 	}
-	
+
 	@Execute
 	public void execute(@Named(PARAMTER_ID) String param, EPartService partService) {
-//	public void execute(EPartService partService) {
+		//	public void execute(EPartService partService) {
-//		String param="next";
+		//		String param="next";
 		MPart part = partService.getActivePart();
 		Object obj = part.getObject();
 		if(obj instanceof WaveformViewer){

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/PanHandler.java

@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     MINRES Technologies GmbH - initial API and implementation
+ *******************************************************************************/
+ 
+package com.minres.scviewer.e4.application.handlers;
+
+import javax.inject.Named;
+
+import org.eclipse.e4.core.di.annotations.CanExecute;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+
+import com.minres.scviewer.e4.application.parts.WaveformViewer;
+
+public class PanHandler {
+
+	final static String PARAMTER_ID="com.minres.scviewer.e4.application.command.pancommand.parameter.direction"; //$NON-NLS-1$
+
+	@CanExecute
+	public boolean canExecute(EPartService partService) {
+		return true;
+	}
+		
+	@Execute
+	public void execute(@Named(PARAMTER_ID) String level, EPartService partService) {
+		MPart part = partService.getActivePart();
+		Object obj = part.getObject();
+		if(obj instanceof WaveformViewer){
+			WaveformViewer waveformViewerPart = (WaveformViewer) obj;
+			if("left".equalsIgnoreCase(level)) //$NON-NLS-1$
+				waveformViewerPart.pan(-1);
+			else if("right".equalsIgnoreCase(level)) //$NON-NLS-1$
+				waveformViewerPart.pan(+1);
+			else if("cursor".equalsIgnoreCase(level)) //$NON-NLS-1$
+				waveformViewerPart.pan(0);
+		}
+
+	}
+	
+	
+}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SelectAllHandler.java

@@ -11,33 +11,26 @@
  
 package com.minres.scviewer.e4.application.handlers;
 
-import javax.inject.Inject;
+import org.eclipse.e4.core.di.annotations.CanExecute;
-
 import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 
-import com.minres.scviewer.e4.application.parts.DesignBrowser;
+import com.minres.scviewer.e4.application.parts.WaveformViewer;
 
 public class SelectAllHandler {
 
-	@Inject @Optional DesignBrowser designBrowser;
+    @CanExecute
+    public boolean canExecute(EPartService partService) {
+    	MPart part = partService.getActivePart();
+    	return part.getObject() instanceof WaveformViewer;
+    }
 
 	@Execute
 	public void execute(EPartService partService) {
-		if(designBrowser==null) designBrowser = getListPart(partService);
+		MPart part = partService.getActivePart();
-		if(designBrowser!=null){
+		if(part.getObject() instanceof WaveformViewer)
-			designBrowser.selectAllWaveforms();
+			((WaveformViewer) part.getObject()).selectAll();
-		}
 	}
 
-	protected DesignBrowser getListPart(EPartService partService){
-		MPart part = partService.getActivePart();
-		if(part.getObject() instanceof DesignBrowser)
-			return (DesignBrowser) part.getObject();
-		else
-			return null;
-	}	
-
 }

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ZoomHandler.java

@@ -18,6 +18,7 @@ import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 
+import com.minres.scviewer.database.ui.ZoomKind;
 import com.minres.scviewer.e4.application.parts.WaveformViewer;
 
 public class ZoomHandler {
@@ -35,13 +36,14 @@ public class ZoomHandler {
 		Object obj = part.getObject();
 		if(obj instanceof WaveformViewer){
 			WaveformViewer waveformViewerPart = (WaveformViewer) obj;
-			int zoomLevel = waveformViewerPart.getZoomLevel();
 			if("in".equalsIgnoreCase(level)) //$NON-NLS-1$
-				waveformViewerPart.setZoomLevel(zoomLevel-1);
+				waveformViewerPart.zoom(ZoomKind.IN);
 			else if("out".equalsIgnoreCase(level)) //$NON-NLS-1$
-				waveformViewerPart.setZoomLevel(zoomLevel+1);
+				waveformViewerPart.zoom(ZoomKind.OUT);
 			else if("fit".equalsIgnoreCase(level)) //$NON-NLS-1$
-				waveformViewerPart.setZoomFit();
+				waveformViewerPart.zoom(ZoomKind.FIT);
+			else if("full".equalsIgnoreCase(level)) //$NON-NLS-1$
+				waveformViewerPart.zoom(ZoomKind.FULL);
 		}
 
 	}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/WaveStatusBarControl.java

@@ -27,9 +27,6 @@ import com.minres.scviewer.e4.application.Messages;
  */
 public class WaveStatusBarControl extends StatusBarControl {
 
-	/** The Constant ZOOM_LEVEL. */
-	public static final String ZOOM_LEVEL="ZoomLevelUpdate"; //$NON-NLS-1$
-	
 	/** The Constant CURSOR_TIME. */
 	public static final String CURSOR_TIME="CursorPosUpdate"; //$NON-NLS-1$
 	
@@ -45,7 +42,7 @@ public class WaveStatusBarControl extends StatusBarControl {
 
 
 	/** The zoom contribution. */
-	StatusLineContributionItem cursorContribution, markerContribution, markerDiffContribution, zoomContribution;
+	StatusLineContributionItem cursorContribution, markerContribution, markerDiffContribution;
 
 	/**
 	 * Instantiates a new wave status bar control.
@@ -59,11 +56,9 @@ public class WaveStatusBarControl extends StatusBarControl {
 		cursorContribution = new StatusLineContributionItem(Messages.WaveStatusBarControl_5, true, 20);
 		markerContribution = new StatusLineContributionItem(Messages.WaveStatusBarControl_6, true, 20);
 		markerDiffContribution = new StatusLineContributionItem(Messages.WaveStatusBarControl_7, true, 20);
-		zoomContribution = new StatusLineContributionItem(Messages.WaveStatusBarControl_8, true, 8);
 		manager.appendToGroup(StatusLineManager.BEGIN_GROUP,cursorContribution);
 		manager.appendToGroup(StatusLineManager.BEGIN_GROUP,markerContribution);
 		manager.appendToGroup(StatusLineManager.BEGIN_GROUP,markerDiffContribution);
-		manager.appendToGroup(StatusLineManager.BEGIN_GROUP, zoomContribution);
 	}
 
 	/**
@@ -88,17 +83,6 @@ public class WaveStatusBarControl extends StatusBarControl {
 		}
 	}
 
-	/**
-	 * Gets the zoom event.
-	 *
-	 * @param text the text
-	 * @return the zoom event
-	 */
-	@Inject @Optional
-	public void  getZoomEvent(@UIEventTopic(ZOOM_LEVEL) String text) {
-		zoomContribution.setText(text);
-	} 
-
 	/**
 	 * Gets the cursor event.
 	 *

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties

@@ -9,7 +9,7 @@ DesignBrowser_8=Insert before
 LoadingWaveformDb_0=Database loading...
 LoadStoreSettingsHandler_2=*.scview
 LoadStoreSettingsHandler_3=SCViewer.scview
-OpenHandler_0=*.vcd;*.txdb;*.txlog;*.fbrdb
+OpenHandler_0=*.vcd;*.vcd.gz;*.txlog;*.txlog.gz;*.txdb;*.fbrdb
 QuitHandler_0=Confirmation
 QuitHandler_1=Do you want to exit?
 RelationTypeToolControl_0=------------
@@ -18,6 +18,7 @@ ResourceManager_0=Wrong decorate corner
 SCViewerPreferencesPage_0=Check for changed database
 SCViewerPreferencesPage_1=Show hover window in waveform
 SCViewerPreferencesPage_2=Waveform track height
+SCViewerPreferencesPage_3=Show tx details in waveform
 StatusBarControl_1=Currently running: 
 StatusBarControl_2=\nLast task: 
 StatusBarControl_3=Currently running: 
@@ -76,6 +77,16 @@ signal_nan=Signal NaN Value
 cursor=Cursor
 cursor_drag=dragged Cursor
 cursor_text=Cursor Text
+HelpBrowser_7=Error initializing help browser
+HelpBrowser_8=An error occurred while initializing the help browser: 
+HelpDialog_0=Back
+HelpDialog_1=Forward
+HelpDialog_2=Stop
+HelpDialog_3=Refresh
+HelpDialog_4=Go
+HelpDialog_5=Address
+HelpDialog_6=https://minres.github.io/SCViewer/#key-shortcuts
+HelpDialog_7=Could not instantiate Browser: 
 marker=Marker
 marker_text=Marker TExt
 rel_arrow=Relation arrow

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/AboutDialog.java

@@ -131,7 +131,9 @@ public class AboutDialog extends Dialog {
 				if (style != null && style.underline && style.underlineStyle == SWT.UNDERLINE_LINK) {
 					Desktop.getDesktop().browse(new java.net.URI(style.data.toString()));
 				}
-			} catch (IOException | URISyntaxException | IllegalArgumentException e) {}
+			} catch (IOException | URISyntaxException | IllegalArgumentException e) {
+			} catch (UnsupportedOperationException e) {
+			}
 		});
 		
 		styleRange.start = 0;

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java

@@ -133,10 +133,11 @@ public class DesignBrowser {
 				treeViewer.refresh();
 			});
 		} else if(IHierNode.LOADING_FINISHED.equals(evt.getPropertyName())) {
-			treeViewer.getTree().getDisplay().asyncExec(() -> {
+			if(!treeViewer.getControl().isDisposed())
-				treeViewer.update(waveformViewerPart.getDatabase(), null);
+				treeViewer.getTree().getDisplay().asyncExec(() -> {
-				DesignBrowser.this.updateButtons();
+					treeViewer.update(waveformViewerPart.getDatabase(), null);
-			});
+					DesignBrowser.this.updateButtons();
+				});
 		}
 	};
 
@@ -225,6 +226,10 @@ public class DesignBrowser {
 			}
 		});
 	}
+	
+	public Control getControl() {
+		return top;
+	}
 
 	/**
 	 * Creates the table composite.
@@ -596,6 +601,7 @@ public class DesignBrowser {
 		 * Apply.
 		 */
 		public void apply() {
+			if(treeViewer.getControl().isDisposed()) return;
 			treeViewer.setExpandedElements(expandedElements);
 			treeViewer.setSelection(treeSelection, true);
 			txTableViewer.setSelection(tableSelection, true);

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/FileBrowserDialog.java

@@ -3,6 +3,7 @@ package com.minres.scviewer.e4.application.parts;
 import java.io.File;
 import java.nio.file.FileSystems;
 import java.nio.file.PathMatcher;
+import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -229,6 +230,14 @@ public class FileBrowserDialog extends TrayDialog {
 		colSize.getColumn().setText("Size");
 		colSize.getColumn().addSelectionListener(getSelectionAdapter(colSize.getColumn(), 1));
         
+		TableViewerColumn colDate = new TableViewerColumn(tableViewer, SWT.RIGHT);
+		colDate.setLabelProvider(new FileTableLabelProvider() {
+			@Override public String getText(Object element) { return DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.MEDIUM).format(((File) element).lastModified()); }
+		});
+		colDate.getColumn().setWidth(200);
+		colDate.getColumn().setText("Modification Date");
+		colDate.getColumn().addSelectionListener(getSelectionAdapter(colDate.getColumn(), 2));
+        
 		TableViewerColumn colEmpty = new TableViewerColumn(tableViewer, SWT.CENTER);
 		colEmpty.setLabelProvider(new FileTableLabelProvider() {
 			@Override public String getText(Object element) {	return ""; }
@@ -264,7 +273,7 @@ public class FileBrowserDialog extends TrayDialog {
 				tableViewer.setInput(selectedDir.listFiles());
 			}
 		});
-		sashForm.setWeights(new int[]{3, 3});
+		sashForm.setWeights(new int[]{2, 3});
 		return area;
 	}
 
@@ -445,6 +454,9 @@ public class FileBrowserDialog extends TrayDialog {
 	        case 1:
 	            rc = Long.valueOf(p1.length()).compareTo(p2.length());
 	            break;
+	        case 2:
+	            rc = Long.valueOf(p1.lastModified()).compareTo(p2.lastModified());
+	            break;
 	        default:
 	            rc = 0;
 	        }

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/HelpDialog.java

@@ -0,0 +1,177 @@
+package com.minres.scviewer.e4.application.parts;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTError;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.LocationListener;
+import org.eclipse.swt.browser.ProgressEvent;
+import org.eclipse.swt.browser.ProgressListener;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.ProgressBar;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+
+import com.minres.scviewer.e4.application.Messages;
+
+public class HelpDialog extends Dialog {
+	/**
+	 * Create the dialog.
+	 *
+	 * @param parentShell the parent shell
+	 */
+	@Inject
+	public HelpDialog(Shell parentShell) {
+		super(parentShell);
+		setShellStyle(getShellStyle() | SWT.MODELESS | SWT.MAX | SWT.BORDER | SWT.TITLE);
+		setBlockOnOpen(false);
+	}
+
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
+	@Override
+	protected Point getInitialSize() {
+		return new Point(800, 600);
+	}
+
+	/**
+	 * Create contents of the dialog.
+	 *
+	 * @param parent the parent
+	 * @return the control
+	 */
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite container = (Composite) super.createDialogArea(parent);
+		GridLayout gridLayout = new GridLayout();
+		gridLayout.numColumns = 3;
+		container.setLayout(gridLayout);
+		ToolBar toolbar = new ToolBar(container, SWT.NONE);
+		ToolItem itemBack = new ToolItem(toolbar, SWT.PUSH);
+		itemBack.setText(Messages.HelpDialog_0);
+		ToolItem itemForward = new ToolItem(toolbar, SWT.PUSH);
+		itemForward.setText(Messages.HelpDialog_1);
+		ToolItem itemStop = new ToolItem(toolbar, SWT.PUSH);
+		itemStop.setText(Messages.HelpDialog_2);
+		ToolItem itemRefresh = new ToolItem(toolbar, SWT.PUSH);
+		itemRefresh.setText(Messages.HelpDialog_3);
+		ToolItem itemGo = new ToolItem(toolbar, SWT.PUSH);
+		itemGo.setText(Messages.HelpDialog_4);
+
+		GridData data = new GridData();
+		data.horizontalSpan = 3;
+		toolbar.setLayoutData(data);
+
+		Label labelAddress = new Label(container, SWT.NONE);
+		labelAddress.setText(Messages.HelpDialog_5);
+
+		final Text location = new Text(container, SWT.BORDER);
+		data = new GridData();
+		data.horizontalAlignment = GridData.FILL;
+		data.horizontalSpan = 2;
+		data.grabExcessHorizontalSpace = true;
+		location.setLayoutData(data);
+
+		final Browser browser;
+		try {
+			browser = new Browser(container, SWT.NONE);
+			data = new GridData();
+			//			data.widthHint = 800;
+			//			data.heightHint =600;
+			data.horizontalAlignment = GridData.FILL;
+			data.verticalAlignment = GridData.FILL;
+			data.horizontalSpan = 3;
+			data.grabExcessHorizontalSpace = true;
+			data.grabExcessVerticalSpace = true;
+			browser.setLayoutData(data);
+
+			final Label status = new Label(container, SWT.NONE);
+			data = new GridData(GridData.FILL_HORIZONTAL);
+			data.horizontalSpan = 2;
+			status.setLayoutData(data);
+
+			final ProgressBar progressBar = new ProgressBar(container, SWT.NONE);
+			data = new GridData();
+			data.horizontalAlignment = GridData.END;
+			progressBar.setLayoutData(data);
+
+			/* event handling */
+			Listener listener = event -> {
+				ToolItem item = (ToolItem) event.widget;
+				String string = item.getText();
+				if (string.equals(Messages.HelpDialog_0))
+					browser.back();
+				else if (string.equals(Messages.HelpDialog_1))
+					browser.forward();
+				else if (string.equals(Messages.HelpDialog_2))
+					browser.stop();
+				else if (string.equals(Messages.HelpDialog_3))
+					browser.refresh();
+				else if (string.equals(Messages.HelpDialog_4))
+					browser.setUrl(location.getText());
+			};
+			browser.addProgressListener(new ProgressListener() {
+				@Override
+				public void changed(ProgressEvent event) {
+					if (event.total == 0) return;
+					int ratio = event.current * 100 / event.total;
+					progressBar.setSelection(ratio);
+				}
+				@Override
+				public void completed(ProgressEvent event) {
+					progressBar.setSelection(0);
+				}
+			});
+			browser.addStatusTextListener(event -> status.setText(event.text));
+			browser.addLocationListener(LocationListener.changedAdapter(event -> {
+				if (event.top) location.setText(event.location);
+			}
+					));
+			itemBack.addListener(SWT.Selection, listener);
+			itemForward.addListener(SWT.Selection, listener);
+			itemStop.addListener(SWT.Selection, listener);
+			itemRefresh.addListener(SWT.Selection, listener);
+			itemGo.addListener(SWT.Selection, listener);
+			location.addListener(SWT.DefaultSelection, e -> browser.setUrl(location.getText()));
+
+			browser.setUrl(Messages.HelpDialog_6);
+		} catch (SWTError e) {
+			System.out.println(Messages.HelpDialog_7 + e.getMessage());
+		}
+		return container;
+	}
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	protected void createButtonsForButtonBar(Composite parent) {
+		// create OK button
+		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.CLOSE_LABEL,	true);
+	}
+
+	/**
+	 * Open the dialog.
+	 * @return the result
+	 */
+	@PostConstruct
+	@Override
+	public int open() {
+		return super.open();
+	}
+
+}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionList.java

@@ -32,8 +32,8 @@ import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.Text;
 
 import com.minres.scviewer.database.DataType;
+import com.minres.scviewer.database.EventEntry;
 import com.minres.scviewer.database.EventKind;
-import com.minres.scviewer.database.IEvent;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.WaveformType;
 import com.minres.scviewer.database.tx.ITx;
@@ -249,8 +249,10 @@ public class TransactionList extends Composite {
 			}catch(SecurityException e){}
 			updateThread = new Thread(()-> {
 				final ConcurrentHashMap<String, DataType> propNames=new ConcurrentHashMap<>();
-				Collection<IEvent[]> values = stream.getEvents().values();
+				Collection<EventEntry> values = stream.getEvents().entrySet();
-				final List<ITx> txList = values.parallelStream().map(Arrays::asList)
+				final List<ITx> txList = values.parallelStream()
+						.map(e->e.events)
+						.map(Arrays::asList)
 						.flatMap(List::stream)
 						.filter(evt -> evt.getKind()==EventKind.BEGIN || evt.getKind()==EventKind.SINGLE)
 						.map(evt-> {
@@ -258,7 +260,7 @@ public class TransactionList extends Composite {
 							tx.getAttributes().forEach(attr -> propNames.put(attr.getName(), attr.getDataType()));
 							return tx;
 						})
-						.sorted((t1, t2)-> t1.getBeginTime().compareTo(t2.getBeginTime()))
+						.sorted((t1, t2)-> Long.compare(t1.getBeginTime(),t2.getBeginTime()))
 						.collect(Collectors.toList());
 				final List<AttributeNameBean> newAttrNames=propNames.entrySet().stream()
 						.sorted((e1,e2)->e1.getKey().compareTo(e2.getKey()))

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java

@@ -74,6 +74,7 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Widget;
+import org.osgi.service.prefs.BackingStoreException;
 
 import com.minres.scviewer.database.DataType;
 import com.minres.scviewer.database.IHierNode;
@@ -82,6 +83,7 @@ import com.minres.scviewer.database.IWaveformDb;
 import com.minres.scviewer.database.IWaveformDbFactory;
 import com.minres.scviewer.database.RelationType;
 import com.minres.scviewer.database.RelationTypeFactory;
+import com.minres.scviewer.database.WaveformType;
 import com.minres.scviewer.database.tx.ITx;
 import com.minres.scviewer.database.tx.ITxAttribute;
 import com.minres.scviewer.database.tx.ITxEvent;
@@ -92,6 +94,7 @@ 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.ZoomKind;
 import com.minres.scviewer.database.ui.swt.Constants;
 import com.minres.scviewer.database.ui.swt.IToolTipContentProvider;
 import com.minres.scviewer.database.ui.swt.IToolTipHelpTextProvider;
@@ -117,37 +120,37 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 
 	/** The Constant DATABASE_FILE. */
 	protected static final String DATABASE_FILE = "DATABASE_FILE"; //$NON-NLS-1$
-	
+
 	/** The Constant SHOWN_WAVEFORM. */
 	protected static final String SHOWN_WAVEFORM = "SHOWN_WAVEFORM"; //$NON-NLS-1$
-	
+
 	protected static final String VALUE_DISPLAY = ".VALUE_DISPLAY"; //$NON-NLS-1$
-	
+
 	protected static final String WAVE_DISPLAY = ".WAVE_DISPLAY"; //$NON-NLS-1$
-	
+
 	/** The Constant SHOWN_CURSOR. */
 	protected static final String SHOWN_CURSOR = "SHOWN_CURSOR"; //$NON-NLS-1$
-	
+
 	/** The Constant ZOOM_LEVEL. */
-	protected static final String ZOOM_LEVEL = "ZOOM_LEVEL"; //$NON-NLS-1$
+	protected static final String SCALING_FACTOR = "SCALING_FACTOR"; //$NON-NLS-1$
 
 	/** The Constant BASE_LINE_TIME. */
 	protected static final String BASE_LINE_TIME = "BASE_LINE_TIME"; //$NON-NLS-1$
-	
+
 	/** The Constant SELECTED_TX_ID. */
 	protected static final String SELECTED_TX_ID = "SELECTED_TX_ID"; //$NON-NLS-1$
 
 	/** The Constant SELECTED_TRACKENTRY_NAME. */
 	protected static final String SELECTED_TRACKENTRY_NAME = "SELECTED_TRACKENTRY_NAME"; //$NON-NLS-1$
-	
+
 	/** The Constant WAVEFORM_SELECTED. */
 	protected static final String WAVEFORM_SELECTED = ".WAVEFORM_SELECTED"; //$NON-NLS-1$
-	
+
 	/** The Constant FILE_CHECK_INTERVAL. */
 	protected static final long FILE_CHECK_INTERVAL = 60000;
-	
+
-	/** The zoom level. */
+	/** The Constant TX_DETAILS_SHOWN. */
-	private String[] zoomLevel;
+	protected static final String TX_DETAILS_SHOWN = "TX_DETAILS_SHOWN"; //$NON-NLS-1$
 
 	/** The Constant ID. */
 	public static final String ID = "com.minres.scviewer.ui.TxEditorPart"; //$NON-NLS-1$
@@ -156,19 +159,19 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	public static final String WAVE_ACTION_ID = "com.minres.scviewer.ui.action.AddToWave"; //$NON-NLS-1$
 
 	private static final String MENU_CONTEXT = "com.minres.scviewer.e4.application.popupmenu.wavecontext"; //$NON-NLS-1$
-	
+
 	/** The number of active DisposeListeners */
 	private int disposeListenerNumber = 0;
-	
+
 	/** The factory. */
 	WaveformViewFactory factory = new WaveformViewFactory();
 
 	DesignBrowser browser = null;
-	
+
 	TransactionDetails detailsView = null;
-	
+
 	TransactionListView transactionList = null;
-	
+
 	/** The waveform pane. */
 	private IWaveformView waveformPane;
 
@@ -211,7 +214,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	ArrayList<File> filesToLoad = new ArrayList<>();
 
 	String partConfig = "";
-	
+
 	/** The persisted state. */
 	Map<String, String> persistedState;
 
@@ -231,10 +234,14 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	IModificationChecker fileChecker;
 
 	@Inject IWaveformDbFactory dbFactory;
-	
+
 	@Inject Composite parent;
-	
+
 	private boolean showHover;
+	
+	private SashForm topSash = null;
+
+	private SashForm middleSash = null;
 
 	/**
 	 * Creates the composite.
@@ -246,7 +253,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	@PostConstruct
 	public void createComposite(MPart part, EMenuService menuService, @Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE) IEclipsePreferences prefs, @Preference(value = PreferenceConstants.SHOW_HOVER) Boolean hover) {
 		disposeListenerNumber += 1;
-		
+
 		myPart = part;
 		myParent = parent;
 		store=prefs;
@@ -258,14 +265,14 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 			}
 		});
 		parent.setLayout(new FillLayout(SWT.HORIZONTAL));
-		
+
 		IEclipseContext ctx = myPart.getContext();
 		ctx.set(WaveformViewer.class, this);
 		ctx.set(IWaveformDb.class, database);
 
-		SashForm topSash = new SashForm(parent, SWT.BORDER | SWT.SMOOTH | SWT.HORIZONTAL);
+		topSash = new SashForm(parent, SWT.BORDER | SWT.SMOOTH | SWT.HORIZONTAL);
 		Composite left = new Composite(topSash, SWT.NONE);
-		SashForm middleSash = new SashForm(topSash, SWT.BORDER | SWT.SMOOTH | SWT.VERTICAL);
+		middleSash = new SashForm(topSash, SWT.BORDER | SWT.SMOOTH | SWT.VERTICAL);
 		Composite right = new Composite(topSash, SWT.NONE);
 		topSash.setWeights(new int[] {20, 60, 20});
 
@@ -275,98 +282,100 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 
 		ctx.set(Composite.class, left);
 		browser = ContextInjectionFactory.make(DesignBrowser.class, ctx);
-		
+
 		ctx.set(Composite.class, right);
 		detailsView = ContextInjectionFactory.make(TransactionDetails.class, ctx);
 
 		waveformPane = factory.createPanel(middleTop);
-		
+
 		ctx.set(Composite.class, middleBottom);
 		transactionList = ContextInjectionFactory.make(TransactionListView.class, ctx);
-		
+
 		waveformPane.setMaxTime(0);
 		//set selection to empty selection when opening a new waveformPane
 		selectionService.setSelection(new StructuredSelection());
-		
+
 		waveformPane.addPropertyChangeListener(IWaveformView.CURSOR_PROPERTY, evt -> {
-				Long time = (Long) evt.getNewValue();
+			Long time = (Long) evt.getNewValue();
-				eventBroker.post(WaveStatusBarControl.CURSOR_TIME, waveformPane.getScaledTime(time));
+			eventBroker.post(WaveStatusBarControl.CURSOR_TIME, waveformPane.getWaveformZoom().timeToString(time));
-				long marker = waveformPane.getMarkerTime(waveformPane.getSelectedMarkerId());
+			long marker = waveformPane.getMarkerTime(waveformPane.getSelectedMarker());
-				eventBroker.post(WaveStatusBarControl.MARKER_DIFF, waveformPane.getScaledTime(time - marker));
+			eventBroker.post(WaveStatusBarControl.MARKER_DIFF, waveformPane.getWaveformZoom().timeToString(time - marker));
 		});
 		waveformPane.addPropertyChangeListener(IWaveformView.MARKER_PROPERTY, evt -> {
-				Long time = (Long) evt.getNewValue();
+			Long time = (Long) evt.getNewValue();
-				eventBroker.post(WaveStatusBarControl.MARKER_TIME, waveformPane.getScaledTime(time));
+			eventBroker.post(WaveStatusBarControl.MARKER_TIME, waveformPane.getWaveformZoom().timeToString(time));
-				long cursor = waveformPane.getCursorTime();
+			long cursor = waveformPane.getCursorTime();
-				eventBroker.post(WaveStatusBarControl.MARKER_DIFF, waveformPane.getScaledTime(cursor - time));
+			eventBroker.post(WaveStatusBarControl.MARKER_DIFF, waveformPane.getWaveformZoom().timeToString(cursor - time));
 		});
-		
+
 		waveformPane.addSelectionChangedListener(event -> {
-				if (event.getSelection() instanceof IStructuredSelection) {
+			if (event.getSelection() instanceof IStructuredSelection) {
-					selectionService.setSelection(event.getSelection());
+				selectionService.setSelection(event.getSelection());
-				}
+			}
 		});
 
 		waveformPane.getWaveformControl().addListener(SWT.KeyDown, e -> {
-				if((e.stateMask&SWT.MOD3)!=0) { // Alt key
+			if((e.stateMask&SWT.MOD3)!=0) { // Alt key
-				} else if((e.stateMask&SWT.MOD1)!=0) { //Ctrl/Cmd
+			} else if((e.stateMask&SWT.MOD1)!=0) { //Ctrl/Cmd
-					int zoomlevel = waveformPane.getZoomLevel();
+				switch(e.keyCode) {
-					switch(e.keyCode) {
+				case '+':
-					case '+':
+				case SWT.KEYPAD_ADD:
-					case SWT.KEYPAD_ADD:
+					waveformPane.getWaveformZoom().zoom(ZoomKind.IN);
-						if(zoomlevel>0)
+					return;
-							waveformPane.setZoomLevel(zoomlevel-1);
+				case '-':
-						return;
+				case SWT.KEYPAD_SUBTRACT:
-					case '-':
+					waveformPane.getWaveformZoom().zoom(ZoomKind.OUT);
-					case SWT.KEYPAD_SUBTRACT:
+					return;
-						if(zoomlevel<waveformPane.getZoomLevels().length-1)
+				case SWT.ARROW_UP:
-							waveformPane.setZoomLevel(zoomlevel+1);
+					waveformPane.moveSelectedTrack(-1);
-						return;
+					return;
-					case SWT.ARROW_UP:
+				case SWT.ARROW_DOWN:
-						waveformPane.moveSelectedTrack(-1);
+					waveformPane.moveSelectedTrack(1);
-						return;
+					return;
-					case SWT.ARROW_DOWN:
+				case 'a':
-						waveformPane.moveSelectedTrack(1);
+					selectAll();
-						return;
+				default:
-					default:
+					break;
-						break;
-					}
-				} else if((e.stateMask&SWT.MOD2)!=0) { //Shift
-					switch(e.keyCode) {
-					case SWT.ARROW_LEFT:
-						waveformPane.scrollHorizontal(-100);
-						return;
-					case SWT.ARROW_RIGHT:
-						waveformPane.scrollHorizontal(100);
-						return;
-					default:
-						break;
-					}
-				} else {
-					switch(e.keyCode) {
-					case SWT.ARROW_LEFT:
-						waveformPane.scrollHorizontal(-10);
-						return;
-					case SWT.ARROW_RIGHT:
-						waveformPane.scrollHorizontal(10);
-						return;
-					case SWT.ARROW_UP:
-						waveformPane.moveSelection(GotoDirection.UP);
-						return;
-					case SWT.ARROW_DOWN:
-						waveformPane.moveSelection(GotoDirection.DOWN);
-						return;
-					case SWT.HOME:
-						return;
-					case SWT.END:
-						return;
-					default:
-						break;
-					}
 				}
+			} else if((e.stateMask&SWT.MOD2)!=0) { //Shift
+				switch(e.keyCode) {
+				case SWT.ARROW_LEFT:
+					waveformPane.scrollHorizontal(-100);
+					return;
+				case SWT.ARROW_RIGHT:
+					waveformPane.scrollHorizontal(100);
+					return;
+				default:
+					break;
+				}
+			} else {
+				switch(e.keyCode) {
+				case SWT.ARROW_LEFT:
+					waveformPane.scrollHorizontal(-10);
+					return;
+				case SWT.ARROW_RIGHT:
+					waveformPane.scrollHorizontal(10);
+					return;
+				case SWT.ARROW_UP:
+					waveformPane.moveSelection(GotoDirection.UP);
+					return;
+				case SWT.ARROW_DOWN:
+					waveformPane.moveSelection(GotoDirection.DOWN);
+					return;
+				case SWT.HOME:
+					waveformPane.scrollTo(IWaveformView.MARKER_POS);
+					return;
+				case SWT.END:
+					waveformPane.scrollTo(IWaveformView.CURSOR_POS);
+					return;
+				case SWT.DEL:
+					waveformPane.deleteSelectedTracks();
+				default:
+					break;
+				}
+			}
 		});
-		
+
-		zoomLevel = waveformPane.getZoomLevels();
 		checkForUpdates = store.getBoolean(PreferenceConstants.DATABASE_RELOAD, true);
 		filesToLoad = new ArrayList<>();
 		persistedState = part.getPersistedState();
@@ -377,7 +386,6 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 		}
 		if (!filesToLoad.isEmpty())
 			loadDatabase(persistedState);
-		eventBroker.post(WaveStatusBarControl.ZOOM_LEVEL, zoomLevel[waveformPane.getZoomLevel()]);
 		menuService.registerContextMenu(waveformPane.getNameControl(), MENU_CONTEXT);
 		menuService.registerContextMenu(waveformPane.getValueControl(),	MENU_CONTEXT);
 		menuService.registerContextMenu(waveformPane.getWaveformControl(), MENU_CONTEXT);
@@ -457,8 +465,8 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 						valueCol.pack();
 						table.setSize(table.computeSize(SWT.DEFAULT, SWT.DEFAULT));
 						parent.addPaintListener( e -> {
-								Rectangle area = parent.getClientArea();
+							Rectangle area = parent.getClientArea();
-								valueCol.setWidth(area.width - nameCol.getWidth());
+							valueCol.setWidth(area.width - nameCol.getWidth());
 						});
 						parent.addFocusListener(FocusListener.focusGainedAdapter(e -> table.setFocus()));
 						return true;
@@ -480,21 +488,28 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 			}
 		});
 		waveformPane.setStyleProvider(new WaveformStyleProvider(store));
+		showTxDetails(false);
 	}
 
 	@Inject
 	@Optional
 	public void reactOnPrefsChange(@Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE) IEclipsePreferences prefs) {
 		prefs.addPreferenceChangeListener(this);
-		
+
 	}
-	
+
 	@Inject
 	@Optional
 	public void reactOnShowHoverChange(@Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE, value = PreferenceConstants.SHOW_HOVER) Boolean hover) {
 		showHover=hover;
 	}
-	
+
+	@Inject
+	@Optional
+	public void reactOnShowTxDetailsChange(@Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE, value = PreferenceConstants.SHOW_TX_DETAILS) Boolean show) {
+		showTxDetails(show);
+	}
+
 	@Inject
 	@Optional
 	public void reactOnReloadDatabaseChange(@Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE, value = PreferenceConstants.DATABASE_RELOAD) Boolean checkForUpdates) {
@@ -564,12 +579,13 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 				if (monitor.isCanceled())
 					throw new OperationCanceledException(Messages.WaveformViewer_14);
 
-				
+
 				IStatus result = jobGroup.getResult();
 				if( (!result.isMultiStatus() && result.getCode() != Status.OK_STATUS.getCode() ) ||
 						(result.isMultiStatus() && result.getChildren().length > 0 && result.getChildren()[0].getCode() != Status.OK_STATUS.getCode() ) ){
 					// kill editor and pop up warning for user
 					sync.asyncExec(() -> {
+						if(myParent.isDisposed()) return;
 						final Display display = myParent.getDisplay();
 						MessageDialog.openWarning(display.getActiveShell(), "Error loading database", "Database cannot be loaded. Aborting...");
 						ePartService.hidePart(myPart, true);
@@ -577,7 +593,9 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 				} else
 					sync.asyncExec(()->{
 						waveformPane.setMaxTime(database.getMaxTime());
-						if (state != null)
+						if(partConfig!=null && !partConfig.isEmpty())
+							loadState(partConfig);
+						if (state != null && !state.isEmpty())
 							restoreWaveformViewerState(state);
 						fileChecker = null;
 						if (checkForUpdates)
@@ -598,10 +616,10 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	public void fileChanged(List<File> file) {
 		final Display display = myParent.getDisplay();
 		display.asyncExec(() -> {
-				if (MessageDialog.openQuestion(display.getActiveShell(), Messages.WaveformViewer_17,
+			if (MessageDialog.openQuestion(display.getActiveShell(), Messages.WaveformViewer_17,
-						Messages.WaveformViewer_18)) {
+					Messages.WaveformViewer_18)) {
-					reloadDatabase();
+				reloadDatabase();
-				}
+			}
 		});
 		fileMonitor.removeFileChangeListener(this);
 	}
@@ -610,7 +628,12 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 		Map<String, String> state = new HashMap<>();
 		saveWaveformViewerState(state);
 		waveformPane.getStreamList().clear();
-		database.clear();
+		database =  dbFactory.getDatabase();
+		database.addPropertyChangeListener(evt -> {
+			if (IHierNode.WAVEFORMS.equals(evt.getPropertyName())) { //$NON-NLS-1$
+				myParent.getDisplay().syncExec(() -> waveformPane.setMaxTime(database.getMaxTime()));
+			}
+		});
 		if (!filesToLoad.isEmpty())
 			loadDatabase(state, 0L);
 	}
@@ -630,13 +653,9 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 			if (file.exists()) 
 				filesToLoad.add(file);
 		}
-		if(partConfig!=null) {
+		this.partConfig=partConfig;
-			this.partConfig=partConfig;
-		}
 		if (!filesToLoad.isEmpty())
 			loadDatabase(persistedState);
-		if(partConfig!=null && !partConfig.isEmpty())
-			loadState(partConfig);
 	}
 
 	/**
@@ -676,14 +695,14 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 		saveWaveformViewerState(persistingState);
 		Properties props = new Properties();
 		props.putAll(persistingState);
-		
+
 		try (FileOutputStream out = new FileOutputStream(fileName)) {
 			props.store(out, "Written by SCViewer"); //$NON-NLS-1$
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
 	}
-	
+
 	public void loadState(String fileName){
 		//clear old streams before loading tab settings
 		if(!waveformPane.getStreamList().isEmpty()) {
@@ -701,7 +720,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 			e.printStackTrace();
 		}
 	}
-	
+
 	/**
 	 * Save waveform viewer state.
 	 *
@@ -724,9 +743,9 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 			persistingState.put(SHOWN_CURSOR + index, Long.toString(cursor.getTime()));
 			index++;
 		}
-		persistingState.put(ZOOM_LEVEL, Integer.toString(waveformPane.getZoomLevel()));
+		persistingState.put(SCALING_FACTOR, Long.toString(waveformPane.getWaveformZoom().getScale()));
-		persistingState.put(BASE_LINE_TIME, Long.toString(waveformPane.getBaselineTime()));
+		persistingState.put(BASE_LINE_TIME, Long.toString(waveformPane.getWaveformZoom().getMinVisibleTime()));
-		
+
 		// get selected transaction	of a stream	
 		ISelection selection = waveformPane.getSelection();
 		if (!selection.isEmpty()) {
@@ -741,24 +760,25 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 				persistingState.put(SELECTED_TRACKENTRY_NAME, name);
 			}
 		}
+		persistingState.put(TX_DETAILS_SHOWN, Boolean.toString(store.getBoolean(PreferenceConstants.SHOW_TX_DETAILS, false)));
 	}
 
 	protected List<Object> getISelection(ISelection selection){
-	    List<Object> result = new LinkedList<> ();
+		List<Object> result = new LinkedList<> ();
 
-	    if ( selection instanceof IStructuredSelection ) {
+		if ( selection instanceof IStructuredSelection ) {
-	        Iterator<?> i = ((IStructuredSelection)selection).iterator();
+			Iterator<?> i = ((IStructuredSelection)selection).iterator();
-	        while (i.hasNext()){
+			while (i.hasNext()){
-	            Object o = i.next ();
+				Object o = i.next ();
-	            if (o == null) {
+				if (o == null) {
-	                continue;
+					continue;
-	            }
+				}
-	            result.add(o);
+				result.add(o);
-	        }
+			}
-	    }
+		}
-	    return result;
+		return result;
 	}	
-	
+
 	/**
 	 * Restore waveform viewer state.
 	 *
@@ -795,17 +815,17 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 				cursors.get(i).setTime(time);
 			}
 		}
-		if (state.containsKey(ZOOM_LEVEL)) {
+		if (state.containsKey(SCALING_FACTOR)) {
 			try {
-				Integer scale = Integer.parseInt(state.get(ZOOM_LEVEL));
+				long scale = Long.parseLong(state.get(SCALING_FACTOR));
-				waveformPane.setZoomLevel(scale);
+				waveformPane.getWaveformZoom().setScale(scale);
 			} catch (NumberFormatException e) {
 			}
 		}
 		if (state.containsKey(BASE_LINE_TIME)) {
 			try {
 				Long scale = Long.parseLong(state.get(BASE_LINE_TIME));
-				waveformPane.setBaselineTime(scale);
+				waveformPane.getWaveformZoom().setMinVisibleTime(scale);
 			} catch (NumberFormatException e) {
 			}
 		}
@@ -815,9 +835,24 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 				String trackentryName = state.get(SELECTED_TRACKENTRY_NAME);
 				//get TrackEntry Object based on name and TX Object by id and put into selectionList
 				trackEntries.stream().filter(e->trackentryName.equals(e.waveform.getFullName())).forEach(trackEntry ->
-				trackEntry.waveform.getEvents().values().stream().filter(Objects::nonNull).forEach(entries-> 
+				trackEntry.waveform.getEvents().entrySet().stream()
-				Arrays.stream(entries).filter(e->e instanceof ITxEvent && txId.equals(((ITxEvent)e).getTransaction().getId())).forEach(event ->
+				.map(e->e.events)
-				waveformPane.setSelection(new StructuredSelection(new Object[] {((ITxEvent)event).getTransaction(), trackEntry})))));
+				.filter(Objects::nonNull)
+				.forEach(entries-> 
+				Arrays.stream(entries)
+				.filter(e->e instanceof ITxEvent && txId.equals(((ITxEvent)e).getTransaction().getId()))
+				.forEach(event ->
+				waveformPane.setSelection(new StructuredSelection(
+						new Object[] {((ITxEvent)event).getTransaction(), trackEntry}))
+						)
+						)
+						);
+			} catch (NumberFormatException e) {
+			}
+		}
+		if (state.containsKey(TX_DETAILS_SHOWN)) {
+			try {
+				showTxDetails(Boolean.parseBoolean(state.get(TX_DETAILS_SHOWN)));
 			} catch (NumberFormatException e) {
 			}
 		}
@@ -829,12 +864,11 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	 */
 	private void updateAll() {
 		eventBroker.post(ACTIVE_WAVEFORMVIEW, this);
-		eventBroker.post(WaveStatusBarControl.ZOOM_LEVEL, zoomLevel[waveformPane.getZoomLevel()]);
 		long cursor = waveformPane.getCursorTime();
-		long marker = waveformPane.getMarkerTime(waveformPane.getSelectedMarkerId());
+		long marker = waveformPane.getMarkerTime(waveformPane.getSelectedMarker());
-		eventBroker.post(WaveStatusBarControl.CURSOR_TIME, waveformPane.getScaledTime(cursor));
+		eventBroker.post(WaveStatusBarControl.CURSOR_TIME, waveformPane.getWaveformZoom().timeToString(cursor));
-		eventBroker.post(WaveStatusBarControl.MARKER_TIME, waveformPane.getScaledTime(marker));
+		eventBroker.post(WaveStatusBarControl.MARKER_TIME, waveformPane.getWaveformZoom().timeToString(marker));
-		eventBroker.post(WaveStatusBarControl.MARKER_DIFF, waveformPane.getScaledTime(cursor - marker));
+		eventBroker.post(WaveStatusBarControl.MARKER_DIFF, waveformPane.getWaveformZoom().timeToString(cursor - marker));
 	}
 
 	/**
@@ -953,15 +987,18 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 			}
 
 		}
+		showTxDetails(waveformPane.getStreamList().stream().filter(t -> t.waveform.getType() == WaveformType.TRANSACTION).findFirst().isPresent());		
 		setFocus();
 	}
 
 	public void removeSelectedStreamsFromList() {
 		waveformPane.deleteSelectedTracks();
+		showTxDetails(waveformPane.getStreamList().stream().filter(t -> t.waveform.getType() == WaveformType.TRANSACTION).findFirst().isPresent());		
 	}
 
 	public void removeSelectedStreamFromList() {
 		waveformPane.deleteSelectedTracks();
+		showTxDetails(waveformPane.getStreamList().stream().filter(t -> t.waveform.getType() == WaveformType.TRANSACTION).findFirst().isPresent());		
 	}
 	/**
 	 * Move selected.
@@ -972,7 +1009,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 		waveformPane.moveSelectedTrack(i);
 	}
 
-	
+
 	/**
 	 * Move selection.
 	 *
@@ -1002,56 +1039,35 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	}
 
 	/**
-	 * Sets the zoom level.
+	 * Execute the zoom according to kind.
-	 *
+	 * 
-	 * @param level the new zoom level
+	 * @param kind the type of zoom to execute
 	 */
-	public void setZoomLevel(Integer level) {
+	public void zoom(ZoomKind kind) {
-		if (level < 0)
+		waveformPane.getWaveformZoom().zoom(kind);
-			level = 0;
-		if (level > zoomLevel.length - 1)
-			level = zoomLevel.length - 1;
-		waveformPane.setZoomLevel(level);
 		updateAll();
 	}
 
 	/**
-	 * Sets the zoom fit.
+	 * Execute the zoom kind.
+	 * 
+	 * @param direction the direction of the pan (-1, 0, 1)
 	 */
-	public void setZoomFit() {
+	public void pan(int direction) {
-		//actual max time of signal
+		switch(direction) {
-		long maxTime = waveformPane.getMaxTime();
+		case -1: 
-		
+			waveformPane.scrollHorizontal(-10);
-		//get area actually capable of displaying data, i.e. area of the receiver which is capable of displaying data
+			return;
-		Rectangle clientArea = myParent.getClientArea();
+		case 1:
-		long clientAreaWidth = clientArea.width;
+			waveformPane.scrollHorizontal(10);
-				
+			return;
-    	boolean foundZoom=false;
+		case 0:
-		//try to find existing zoomlevel where scaleFactor*clientAreaWidth >= maxTime, if one is found set it as new zoomlevel
+			waveformPane.scrollTo(IWaveformView.CURSOR_POS);
-		for (int level=0; level<Constants.UNIT_MULTIPLIER.length*Constants.UNIT_STRING.length; level++){
+			return;
-			long scaleFactor = (long) Math.pow(10, level/2d);
-		    if(level%2==1) scaleFactor*=3;
-		    if(scaleFactor*clientAreaWidth >= maxTime) {
-		    	setZoomLevel(level);
-		    	foundZoom=true;
-		    	break;
-		    }
 		}
-		//if no zoom level is found, set biggest one available
-		if(!foundZoom) setZoomLevel(Constants.UNIT_MULTIPLIER.length*Constants.UNIT_STRING.length-1);
-				
 		updateAll();
 	}
 
-	/**
-	 * Gets the zoom level.
-	 *
-	 * @return the zoom level
-	 */
-	public int getZoomLevel() {
-		return waveformPane.getZoomLevel();
-	}
-
 	/**
 	 * Gets the selection.
 	 *
@@ -1080,7 +1096,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	 * @return the scaled time
 	 */
 	public String getScaledTime(Long time) {
-		return waveformPane.getScaledTime(time);
+		return waveformPane.getWaveformZoom().timeToString(time);
 	}
 
 	/**
@@ -1184,7 +1200,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 		if(navigationRelationType!=relationType) waveformPane.setHighliteRelation(relationType);
 		navigationRelationType=relationType;
 	}
-	
+
 	public void update() {
 		waveformPane.update();
 	}
@@ -1203,17 +1219,45 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	 * 
 	 * @param e
 	 */
-    public void widgetDisposed(DisposeEvent e) {
+	public void widgetDisposed(DisposeEvent e) {
-    	disposeListenerNumber -= 1;
+		disposeListenerNumber -= 1;
-    	if( disposeListenerNumber == 0) {  //if the last tab is closed, reset statusbar
+		if( disposeListenerNumber == 0) {  //if the last tab is closed, reset statusbar
-			eventBroker.post(WaveStatusBarControl.ZOOM_LEVEL, null);
 			eventBroker.post(WaveStatusBarControl.CURSOR_TIME, null);
 			eventBroker.post(WaveStatusBarControl.MARKER_TIME, null);
 			eventBroker.post(WaveStatusBarControl.MARKER_DIFF, null);
-    	}
+		}
-    }
+	}
-    
+
 	public void search(String propName, DataType type, String propValue) {
 		transactionList.getControl().setSearchProps(propName, type, propValue);
 	}
+
+	public void showTxDetails(boolean show) {
+		if(middleSash==null || topSash==null || middleSash.isDisposed() || topSash.isDisposed())
+			return;
+		if(show) {
+			middleSash.setWeights(new int[] {75, 25});
+			topSash.setWeights(new int[] {20, 60, 20});
+		} else {
+			middleSash.setWeights(new int[] {100, 0});
+			topSash.setWeights(new int[] {20, 80, 0});
+
+		}
+		detailsView.getControl().setVisible(show);
+		transactionList.getControl().setVisible(show);
+		parent.requestLayout();
+		if(store.getBoolean(PreferenceConstants.SHOW_TX_DETAILS, false) != show) {
+			store.putBoolean(PreferenceConstants.SHOW_TX_DETAILS, show);
+			try {
+				store.flush();
+			} catch (BackingStoreException e) {}
+		}
+	}
+
+	public void selectAll() {
+		List<TrackEntry> entries = waveformPane.getStreamList();
+		ISelection sel = new StructuredSelection(entries);
+		waveformPane.setSelection(sel);
+		designBrowser.selectAllWaveforms();
+	}
 }

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/help/HelpBrowser.java

@@ -0,0 +1,153 @@
+package com.minres.scviewer.e4.application.parts.help;
+
+import java.io.File;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceLocator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTError;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.LocationListener;
+import org.eclipse.swt.browser.ProgressEvent;
+import org.eclipse.swt.browser.ProgressListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.ProgressBar;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+
+import com.minres.scviewer.e4.application.Messages;
+
+public class HelpBrowser {
+
+	@Inject IEclipseContext ctx;
+	
+	@Inject MUIElement element;
+	
+	private static void decorateItem(ToolItem item, String label, String imageName) {
+		String fullpath = File.separator+"icons"+File.separator+imageName; //$NON-NLS-1$
+		ImageDescriptor descr =  ResourceLocator.imageDescriptorFromBundle("com.minres.scviewer.e4.application", fullpath).orElse(null); //$NON-NLS-1$
+		if(descr == null) {
+			item.setText(label);
+		} else {
+			item.setImage(descr.createImage());
+			item.setToolTipText(label);
+		}
+		item.setData(label);
+	}
+
+	@PostConstruct
+	protected Control createComposite(Composite container) {
+//		container.getShell().addListener(SWT.Close, e -> {
+//			e.doit= false;
+//			element.setVisible(false);
+//		});
+		GridLayout gridLayout = new GridLayout();
+		gridLayout.numColumns = 3;
+		container.setLayout(gridLayout);
+		ToolBar toolbar = new ToolBar(container, SWT.NONE);
+		ToolItem itemBack = new ToolItem(toolbar, SWT.PUSH);
+		decorateItem(itemBack, Messages.HelpDialog_0, "arrow_undo.png"); //$NON-NLS-1$
+		ToolItem itemForward = new ToolItem(toolbar, SWT.PUSH);
+		decorateItem(itemForward, Messages.HelpDialog_1, "arrow_redo.png"); //$NON-NLS-1$
+		ToolItem itemStop = new ToolItem(toolbar, SWT.PUSH);
+		decorateItem(itemStop, Messages.HelpDialog_2, "cross.png"); //$NON-NLS-1$
+		ToolItem itemRefresh = new ToolItem(toolbar, SWT.PUSH);
+		decorateItem(itemRefresh, Messages.HelpDialog_3, "arrow_refresh.png"); //$NON-NLS-1$
+		ToolItem itemGo = new ToolItem(toolbar, SWT.PUSH);
+		decorateItem(itemGo, Messages.HelpDialog_4, "accept.png"); //$NON-NLS-1$
+
+		GridData data = new GridData();
+		data.horizontalSpan = 3;
+		toolbar.setLayoutData(data);
+
+		Label labelAddress = new Label(container, SWT.NONE);
+		labelAddress.setText(Messages.HelpDialog_5);
+
+		final Text location = new Text(container, SWT.BORDER);
+		data = new GridData();
+		data.horizontalAlignment = GridData.FILL;
+		data.horizontalSpan = 2;
+		data.grabExcessHorizontalSpace = true;
+		location.setLayoutData(data);
+
+		final Browser browser;
+		try {
+			browser = new Browser(container, SWT.NONE);
+			data = new GridData();
+			//			data.widthHint = 800;
+			//			data.heightHint =600;
+			data.horizontalAlignment = GridData.FILL;
+			data.verticalAlignment = GridData.FILL;
+			data.horizontalSpan = 3;
+			data.grabExcessHorizontalSpace = true;
+			data.grabExcessVerticalSpace = true;
+			browser.setLayoutData(data);
+
+			final Label status = new Label(container, SWT.NONE);
+			data = new GridData(GridData.FILL_HORIZONTAL);
+			data.horizontalSpan = 2;
+			status.setLayoutData(data);
+
+			final ProgressBar progressBar = new ProgressBar(container, SWT.NONE);
+			data = new GridData();
+			data.horizontalAlignment = GridData.END;
+			progressBar.setLayoutData(data);
+
+			/* event handling */
+			Listener listener = event -> {
+				ToolItem item = (ToolItem) event.widget;
+				String string = (String) item.getData();
+				if (string.equals(Messages.HelpDialog_0))
+					browser.back();
+				else if (string.equals(Messages.HelpDialog_1))
+					browser.forward();
+				else if (string.equals(Messages.HelpDialog_2))
+					browser.stop();
+				else if (string.equals(Messages.HelpDialog_3))
+					browser.refresh();
+				else if (string.equals(Messages.HelpDialog_4))
+					browser.setUrl(location.getText());
+			};
+			browser.addProgressListener(new ProgressListener() {
+				@Override
+				public void changed(ProgressEvent event) {
+					if (event.total == 0) return;
+					int ratio = event.current * 100 / event.total;
+					progressBar.setSelection(ratio);
+				}
+				@Override
+				public void completed(ProgressEvent event) {
+					progressBar.setSelection(0);
+				}
+			});
+			browser.addStatusTextListener(event -> status.setText(event.text));
+			browser.addLocationListener(LocationListener.changedAdapter(event -> { if (event.top) location.setText(event.location);	}));
+			itemBack.addListener(SWT.Selection, listener);
+			itemForward.addListener(SWT.Selection, listener);
+			itemStop.addListener(SWT.Selection, listener);
+			itemRefresh.addListener(SWT.Selection, listener);
+			itemGo.addListener(SWT.Selection, listener);
+			location.addListener(SWT.DefaultSelection, e -> browser.setUrl(location.getText()));
+			browser.setUrl(Messages.HelpDialog_6);
+		} catch (SWTError e) {
+			MessageDialog.openWarning(container.getDisplay().getActiveShell(), Messages.HelpBrowser_7,Messages.HelpBrowser_8+e.getMessage());
+		}
+		return container;
+	}
+	
+	void handleShellCloseEvent(){
+		
+	}
+}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AttributeLabelProvider.java

@@ -69,7 +69,7 @@ public class AttributeLabelProvider extends LabelProvider implements IStyledLabe
 			ITx iTx = (ITx) element;
 			switch(field){
 			case NAME:
-				return new StyledString(iTx.getId().toString());
+				return new StyledString(String.format("%d", iTx.getId()));
 			case TX_TIME:
 				return new StyledString(waveformViewerPart.getScaledTime(iTx.getBeginTime()));
 			case TYPE:

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/DefaultValuesInitializer.java

@@ -68,6 +68,7 @@ public class DefaultValuesInitializer extends AbstractPreferenceInitializer {
 		
 		store.putBoolean(PreferenceConstants.DATABASE_RELOAD, true);
 		store.putBoolean(PreferenceConstants.SHOW_HOVER, true);
+		store.putBoolean(PreferenceConstants.SHOW_TX_DETAILS, false);
 		store.putInt(PreferenceConstants.TRACK_HEIGHT, 30);
         for (WaveformColors c : WaveformColors.values()) {
         	 store.put(c.name()+"_COLOR", StringConverter.asString(colors[c.ordinal()].getRGB())); //$NON-NLS-1$

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/PreferenceConstants.java

@@ -23,9 +23,12 @@ public class PreferenceConstants {
 	/** The Constant DATABASE_RELOAD. */
 	public static final String DATABASE_RELOAD="databaseReload"; //$NON-NLS-1$
 	
-	/** The Constant DATABASE_RELOAD. */
+	/** The Constant SHOW_HOVER. */
 	public static final String SHOW_HOVER="showWaveformHover"; //$NON-NLS-1$
 	
+	/** The Constant SHOW_TX_DETAILS. */
+	public static final String SHOW_TX_DETAILS="showTxDetails"; //$NON-NLS-1$
+	
 	/** The Constant TRACK_HEIGHT. */
 	public static final String TRACK_HEIGHT="trackHeigth"; //$NON-NLS-1$
 	

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/SCViewerPreferencesPage.java

@@ -39,6 +39,8 @@ public class SCViewerPreferencesPage extends FieldEditorPreferencePage {
 				getFieldEditorParent()));
 		addField(new BooleanFieldEditor(PreferenceConstants.SHOW_HOVER, Messages.SCViewerPreferencesPage_1,
 				getFieldEditorParent()));
+		addField(new BooleanFieldEditor(PreferenceConstants.SHOW_TX_DETAILS, Messages.SCViewerPreferencesPage_3,
+				getFieldEditorParent()));
 		addField(new IntegerFieldEditor(PreferenceConstants.TRACK_HEIGHT, Messages.SCViewerPreferencesPage_2,
 				getFieldEditorParent()));
 

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbContentProvider.java

@@ -19,7 +19,6 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
 
 import com.minres.scviewer.database.IHierNode;
 import com.minres.scviewer.database.IWaveform;
-import com.minres.scviewer.database.IWaveformDb;
 
 /**
  * The Class TxDbContentProvider providing the tree content of a database for the respective viewer.
@@ -52,9 +51,7 @@ public class TxDbContentProvider implements ITreeContentProvider {
 	 */
 	@Override
 	public Object[] getElements(Object inputElement) {
-		if(tableEntries && inputElement instanceof IWaveformDb){
+		if(inputElement instanceof IHierNode){
-			return new Object[]{};
-		}else if(inputElement instanceof IHierNode){
 			// make a copy as the laoder might continue to add waveforms
 			ArrayList<IHierNode> nodes = new ArrayList<>(((IHierNode)inputElement).getChildNodes());
 			return  nodes.stream().filter(n ->

plugins/com.minres.scviewer.ui/plugin.xml

@@ -139,19 +139,7 @@
                </visibleWhen>
             </command>
            <command
-                 commandId="com.minres.scviewer.ui.zoom"
+                 commandId="com.minres.scviewer.ui.zoom.in"
-                 id="com.minres.scviewer.ui.zoom.command"
-                 style="pulldown"
-                 tooltip="Set zoom level">
-              <visibleWhen
-                    checkEnabled="false">
-                 <reference
-                       definitionId="com.minres.scviewer.ui.waveEditorActive">
-                 </reference>
-              </visibleWhen>
-           </command>
-           <command
-                 commandId="com.minres.scviewer.ui.zoomin"
                  label="Zoom in"
                  style="push"
                  tooltip="Zoom into">
@@ -163,7 +151,7 @@
               </visibleWhen>
            </command>
            <command
-                 commandId="com.minres.scviewer.ui.zoomout"
+                 commandId="com.minres.scviewer.ui.zoom.out"
                  label="Zoom out"
                  style="push"
                  tooltip="Zoom out of">
@@ -176,119 +164,6 @@
            </command>
          </toolbar>
       </menuContribution>
-      <menuContribution
-            locationURI="menu:com.minres.scviewer.ui.zoom.command">
-         <command
-               commandId="com.minres.scviewer.ui.zoom"
-               label="100ps"
-               style="push"
-               tooltip="Resolution 100ps">
-            <parameter
-                  name="com.minres.scviewer.ui.zoom.level"
-                  value="5">
-            </parameter>
-         </command>
-         <command
-               commandId="com.minres.scviewer.ui.zoom"
-               label="1ns"
-               style="push"
-               tooltip="Resolution 1ns">
-            <parameter
-                  name="com.minres.scviewer.ui.zoom.level"
-                  value="6">
-            </parameter>
-         </command>
-         <command
-               commandId="com.minres.scviewer.ui.zoom"
-               label="10ns"
-               style="push"
-               tooltip="Resolution 10ns">
-            <parameter
-                  name="com.minres.scviewer.ui.zoom.level"
-                  value="7">
-            </parameter>
-         </command>
-         <command
-               commandId="com.minres.scviewer.ui.zoom"
-               label="100ns"
-               style="push"
-               tooltip="Resolution 100ns">
-            <parameter
-                  name="com.minres.scviewer.ui.zoom.level"
-                  value="8">
-            </parameter>
-         </command>
-         <command
-               commandId="com.minres.scviewer.ui.zoom"
-               label="1µs"
-               style="push"
-               tooltip="Resolution 1us">
-            <parameter
-                  name="com.minres.scviewer.ui.zoom.level"
-                  value="9">
-            </parameter>
-         </command>
-         <command
-               commandId="com.minres.scviewer.ui.zoom"
-               label="10µs"
-               style="push"
-               tooltip="Resolution 10us">
-            <parameter
-                  name="com.minres.scviewer.ui.zoom.level"
-                  value="10">
-            </parameter>
-         </command>
-         <command
-               commandId="com.minres.scviewer.ui.zoom"
-               label="100µs"
-               style="push"
-               tooltip="Resolution 100us">
-            <parameter
-                  name="com.minres.scviewer.ui.zoom.level"
-                  value="11">
-            </parameter>
-         </command>
-         <command
-               commandId="com.minres.scviewer.ui.zoom"
-               label="1ms"
-               style="push"
-               tooltip="Resolution 1ms">
-            <parameter
-                  name="com.minres.scviewer.ui.zoom.level"
-                  value="12">
-            </parameter>
-         </command>
-         <command
-               commandId="com.minres.scviewer.ui.zoom"
-               label="10ms"
-               style="push"
-               tooltip="Resolution 10ms">
-            <parameter
-                  name="com.minres.scviewer.ui.zoom.level"
-                  value="13">
-            </parameter>
-         </command>
-         <command
-               commandId="com.minres.scviewer.ui.zoom"
-               label="100ms"
-               style="push"
-               tooltip="Resolution 100ms">
-            <parameter
-                  name="com.minres.scviewer.ui.zoom.level"
-                  value="14">
-            </parameter>
-         </command>
-         <command
-               commandId="com.minres.scviewer.ui.zoom"
-               label="1s"
-               style="push"
-               tooltip="Resolution 1s">
-            <parameter
-                  name="com.minres.scviewer.ui.zoom.level"
-                  value="15">
-            </parameter>
-         </command>
-      </menuContribution>
       <menuContribution
             allPopups="false"
             locationURI="popup:com.minres.scviewer.ui.TxEditorPart">
@@ -305,7 +180,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="com.minres.scviewer.ui.zoomin"
+               commandId="com.minres.scviewer.ui.zoom.in"
                label="Zoom in"
                style="push"
                tooltip="Zoom into">
@@ -317,7 +192,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="com.minres.scviewer.ui.zoomout"
+               commandId="com.minres.scviewer.ui.zoom.out"
                label="Zoom out"
                style="push"
                tooltip="Zoom out of">
@@ -367,24 +242,21 @@
             name="Prev">
       </command>
       <command
-            defaultHandler="com.minres.scviewer.ui.handler.Zoom"
+            id="com.minres.scviewer.ui.zoom.in"
-            description="Set the zoom level"
-            id="com.minres.scviewer.ui.zoom"
-            name="Zoom">
-         <commandParameter
-               id="com.minres.scviewer.ui.zoom.level"
-               name="level"
-               optional="true">
-         </commandParameter>
-      </command>
-      <command
-            id="com.minres.scviewer.ui.zoomin"
             name="Zoom in">
       </command>
       <command
-            id="com.minres.scviewer.ui.zoomout"
+            id="com.minres.scviewer.ui.zoom.out"
             name="Zoom out">
       </command>
+      <command
+            id="com.minres.scviewer.ui.zoom.fit"
+            name="Zoom fit">
+      </command>
+      <command
+            id="com.minres.scviewer.ui.zoom.full"
+            name="Zoom full">
+      </command>
       <command
             id="com.minres.scviewer.ui.removeWave"
             name="Remove wave">
@@ -411,8 +283,8 @@
          </enabledWhen>
       </handler>
       <handler
-            class="com.minres.scviewer.ui.handler.ZoomInOut"
+            class="com.minres.scviewer.ui.handler.Zoom"
-            commandId="com.minres.scviewer.ui.zoomin">
+            commandId="com.minres.scviewer.ui.zoom.in">
          <enabledWhen>
             <reference
                   definitionId="com.minres.scviewer.ui.waveEditorActive">
@@ -420,8 +292,8 @@
          </enabledWhen>
       </handler>
       <handler
-            class="com.minres.scviewer.ui.handler.ZoomInOut"
+            class="com.minres.scviewer.ui.handler.Zoom"
-            commandId="com.minres.scviewer.ui.zoomout">
+            commandId="com.minres.scviewer.ui.zoom.out">
          <enabledWhen>
             <reference
                   definitionId="com.minres.scviewer.ui.waveEditorActive">
@@ -493,15 +365,11 @@
             icon="res/images/next-green.png">
       </image>
       <image
-            commandId="com.minres.scviewer.ui.zoom"
+            commandId="com.minres.scviewer.ui.zoom.in"
-            icon="res/images/zoom.png">
-      </image>
-      <image
-            commandId="com.minres.scviewer.ui.zoomin"
             icon="res/images/zoom_in.png">
       </image>
       <image
-            commandId="com.minres.scviewer.ui.zoomout"
+            commandId="com.minres.scviewer.ui.zoom.out"
             icon="res/images/zoom_out.png">
       </image>
       <image

plugins/com.minres.scviewer.ui/pom.xml

@@ -4,7 +4,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.2</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java

@@ -50,6 +50,7 @@ import com.minres.scviewer.database.IWaveformDbFactory;
 import com.minres.scviewer.database.ui.GotoDirection;
 import com.minres.scviewer.database.ui.IWaveformView;
 import com.minres.scviewer.database.ui.TrackEntry;
+import com.minres.scviewer.database.ui.ZoomKind;
 import com.minres.scviewer.database.ui.swt.WaveformViewFactory;
 import com.minres.scviewer.ui.views.TxOutlinePage;
 
@@ -66,13 +67,6 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage
 			waveformDbFactory=null;
 	}
 	
-	private final static String[] zoomLevel={
-		"1fs", "10fs", "100fs",
-		"1ps", "10ps", "100ps",
-		"1ns", "10ns", "100ns",
-		"1µs", "10µs", "10µs",
-		"1ms", "10ms", "100ms", "1s"};
-		
 	public static final String ID = "com.minres.scviewer.ui.TxEditorPart"; //$NON-NLS-1$
 
 	public static final String WAVE_ACTION_ID = "com.minres.scviewer.ui.action.AddToWave";
@@ -85,7 +79,6 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage
 	private Composite myParent;
 
     private StatusLineContributionItem cursorStatusLineItem;
-	private StatusLineContributionItem zoomStatusLineItem;
 
 	public TxEditorPart() {
 	}
@@ -132,7 +125,6 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage
 				}
 			}
 		}).run();
-		zoomStatusLineItem.setText("Zoom level: "+zoomLevel[waveformView.getZoomLevel()]);
 		cursorStatusLineItem.setText("Cursor: "+ waveformView.getCursorTime()/1000000+"ns");
 		MenuManager menuMgr = new MenuManager("#PopupMenu");
 //		menuMgr.setRemoveAllWhenShown(true);
@@ -306,11 +298,9 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage
 		// Initialize the editor part
 		setSite(site);
 		setInput(input);
-		zoomStatusLineItem = new StatusLineContributionItem("TxEditorZoomContributionItem");
         cursorStatusLineItem = new StatusLineContributionItem("TxEditorCursorContributionItem");
 		IActionBars actionBars = getEditorSite().getActionBars();
 		IStatusLineManager manager = actionBars.getStatusLineManager();
-		manager.add(zoomStatusLineItem);
         manager.add(cursorStatusLineItem);
 		actionBars.updateActionBars();
 	}
@@ -388,16 +378,8 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage
 		waveformView.moveSelection( next);		
 	}
 
-	public void setZoomLevel(Integer level) {
+	public void setZoom(ZoomKind kind) {
-		waveformView.setZoomLevel(level);
+		waveformView.getWaveformZoom().zoom(kind);		
-	}
-
-	public void setZoomFit() {
-		waveformView.setZoomLevel(6);		
-	}
-
-	public int getZoomLevel() {
-		return waveformView.getZoomLevel();
 	}
 
 	public void removeSelected() {