Merge branch 'release/2.15.0'

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

.gitignore

@@ -8,4 +8,5 @@ SCViewer.xcf
 SCViewer_1.png
 copyrightLog.txt
 /workspace
-?*.launch
+?*.launch
+/.settings/

.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>

.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

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
-eclipse plugin (http://groovy.codehaus.org/Eclipse+Plugin or Market) has to be
-installed.
+To build the plugins the Eclipse SDK or PDE can be used.
 
-TODO
-====
-- add more tests
-- move to feature based product to allow automatic updates
-- improve graphics
-- catch-up e3 plugin to functionality of e4 product
-- add calculated traces
+Key Shortcuts
+=============
+
+Legend:
+
+* Left Mouse Button: LMB
+* 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.11.1-SNAPSHOT</version>
+  	<version>2.15.0</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.11.1-SNAPSHOT</version>
+  	<version>2.15.0</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.11.1-SNAPSHOT</version>
+  	<version>2.15.0</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.11.1-SNAPSHOT</version>
+  	<version>2.15.0</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.11.1-SNAPSHOT</version>
+  	<version>2.15.0</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.1.0-SNAPSHOT</version>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.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="sqlite-jdbc-3.8.7.jar"/>

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

@@ -1,8 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

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

@@ -4,7 +4,7 @@ Bundle-Name: SQLite transaction database
 Bundle-SymbolicName: com.minres.scviewer.database.sqlite
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0"
 Bundle-ClassPath: .,sqlite-jdbc-3.8.7.jar
 Service-Component: OSGI-INF/component.xml

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.11.1-SNAPSHOT</version>
+  	<version>2.15.0</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,18 +36,18 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	
 	private Integer maxConcurrency;
 
-	private TreeMap<Long, IEvent[]> events;
+	private IEventList events;
 
 	private List<RelationType> usedRelationsList;
 
-	public AbstractTxStream(IDatabase database, String name, long streamId) {
+	protected AbstractTxStream(IDatabase database, String name, long streamId) {
 		super(name);
 		this.database=database;
 		this.streamId=streamId;
 	}
 
 	@Override
-	public int getWidth() {
+	public int getRowCount() {
 		if(maxConcurrency==null){
 			StringBuilder sb = new StringBuilder();
 			sb.append("SELECT MAX(concurrencyLevel) as concurrencyLevel FROM ScvTx where stream=");
@@ -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();
-		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});
-		}
+		events.put(ev.getTime(), 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) {
-		Entry<Long, IEvent[]> e = events.floorEntry(time);
+	public IEvent[] getEventsBeforeTime(long time) {
+		EventEntry e = events.floorEntry(time);
 		if(e==null)
 			return new IEvent[]{};
 		else
-			return  events.floorEntry(time).getValue();
+			return  events.floorEntry(time).events;
 	}
 
 	@Override
@@ -126,4 +118,11 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 		return WaveformType.TRANSACTION;
 	}
 
+	/**
+	 * Calculate concurrency.
+	 */
+	public void calculateConcurrency() {
+	}
+
+
 }

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 {
@@ -56,7 +56,7 @@ public class SQLiteDbLoader implements IWaveformDbLoader {
 			if(!event.isEmpty())
 				return event.get(0).getTime()*scvSimProps.getTime_resolution();
 		} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
-				| InvocationTargetException | SQLException | IntrospectionException e) {
+				| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
 			e.printStackTrace();
 		}
 		return 0L;
@@ -73,7 +73,7 @@ public class SQLiteDbLoader implements IWaveformDbLoader {
 				streams.add(stream);
 			}
 		} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
-				| InvocationTargetException | SQLException | IntrospectionException e) {
+				| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
 		}
 		return streams;
 	}
@@ -99,7 +99,6 @@ public class SQLiteDbLoader implements IWaveformDbLoader {
 
 	@Override
 	public void load(IWaveformDb db, File file) throws InputFormatException {
-		dispose();
 		database=new SQLiteDatabase(file.getAbsolutePath(), db);
 		database.setData("TIMERESOLUTION", 1L);
 		SQLiteDatabaseSelectHandler<ScvSimProps> handler = new SQLiteDatabaseSelectHandler<>(ScvSimProps.class, database);
@@ -110,7 +109,7 @@ public class SQLiteDbLoader implements IWaveformDbLoader {
 			}
 			pcs.firePropertyChange(IWaveformDbLoader.LOADING_FINISHED, null, null);
 		} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
-				| InvocationTargetException | SQLException | IntrospectionException e) {
+				| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
 			throw new InputFormatException(e.toString());
 		}
 	}

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

@@ -28,7 +28,6 @@ import com.minres.scviewer.database.sqlite.tables.ScvTxEvent;
 import com.minres.scviewer.database.sqlite.tables.ScvTxRelation;
 import com.minres.scviewer.database.tx.ITx;
 import com.minres.scviewer.database.tx.ITxAttribute;
-import com.minres.scviewer.database.tx.ITxGenerator;
 import com.minres.scviewer.database.tx.ITxRelation;
 
 public class Tx implements ITx {
@@ -38,8 +37,8 @@ public class Tx implements ITx {
 	private TxGenerator trGenerator;
 	private ScvTx scvTx;
 	private List<ITxAttribute> attributes;
-	private Long begin;
-	private Long end;
+	private long begin=-1;
+	private long end=-1;
 	private List<ITxRelation> incoming;
 	private List<ITxRelation> outgoing;
 	
@@ -51,7 +50,7 @@ public class Tx implements ITx {
 	}
 
 	@Override
-	public Long getId() {
+	public long getId() {
 		return (long) scvTx.getId();
 	}
 
@@ -61,18 +60,17 @@ public class Tx implements ITx {
 	}
 
 	@Override
-	public ITxGenerator getGenerator() {
+	public IWaveform getGenerator() {
 		return trGenerator;
 	}
 
-	@Override
-	public int getConcurrencyIndex() {
+	int getConcurrencyIndex() {
 		return scvTx.getConcurrencyLevel();
 	}
 
 	@Override
-	public Long getBeginTime() {
-		if(begin==null){
+	public long getBeginTime() {
+		if(begin<0){
 		SQLiteDatabaseSelectHandler<ScvTxEvent> handler = new SQLiteDatabaseSelectHandler<>(ScvTxEvent.class,
 				database, "tx="+scvTx.getId()+" AND type="+ AssociationType.BEGIN.ordinal());
 		try {
@@ -80,15 +78,15 @@ public class Tx implements ITx {
 				begin= scvEvent.getTime()*(Long)database.getData("TIMERESOLUTION");
 			}
 		} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
-				| InvocationTargetException | SQLException | IntrospectionException e) {
+				| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
 		}
 		}
 		return begin;
 	}
 
 	@Override
-	public Long getEndTime() {
-		if(end==null){
+	public long getEndTime() {
+		if(end<0){
 		SQLiteDatabaseSelectHandler<ScvTxEvent> handler = new SQLiteDatabaseSelectHandler<>(ScvTxEvent.class,
 				database, "tx="+scvTx.getId()+" AND type="+ AssociationType.END.ordinal());
 		try {
@@ -96,7 +94,7 @@ public class Tx implements ITx {
 				end = scvEvent.getTime()*(Long)database.getData("TIMERESOLUTION");
 			}
 		} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
-				| InvocationTargetException | SQLException | IntrospectionException e) {
+				| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
 		}
 		}
 		return end;
@@ -114,7 +112,7 @@ public class Tx implements ITx {
 					
 				}
 			} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
-					| InvocationTargetException | SQLException | IntrospectionException e) {
+					| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
 			}
 		}
 		return attributes;
@@ -131,7 +129,7 @@ public class Tx implements ITx {
 					incoming.add(createRelation(scvRelation, false));
 				}
 			} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
-					| InvocationTargetException | SQLException | IntrospectionException e) {
+					| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
 			}
 		}
 		return incoming;
@@ -148,7 +146,7 @@ public class Tx implements ITx {
 					outgoing.add(createRelation(scvRelation, true));
 				}
 			} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
-					| InvocationTargetException | SQLException | IntrospectionException e) {
+					| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
 			}
 		}
 		return outgoing;
@@ -171,7 +169,7 @@ public class Tx implements ITx {
 			else
 				return new TxRelation(trStream.getRelationType(rel.getName()), that, this);
 		} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
-				| InvocationTargetException | SQLException | IntrospectionException e) {
+				| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
 			e.printStackTrace();
 		}
 
@@ -180,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();
 	}
 
@@ -56,4 +56,10 @@ public class TxEvent implements ITxEvent {
 	public WaveformType getType() {
 		return WaveformType.TRANSACTION;
 	}
+
+	@Override
+	public int getRowIndex() {
+		return ((Tx)tx).getConcurrencyIndex();
+	}
+
 }

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

@@ -22,9 +22,8 @@ import com.minres.scviewer.database.sqlite.db.SQLiteDatabaseSelectHandler;
 import com.minres.scviewer.database.sqlite.tables.ScvGenerator;
 import com.minres.scviewer.database.sqlite.tables.ScvTx;
 import com.minres.scviewer.database.tx.ITx;
-import com.minres.scviewer.database.tx.ITxGenerator;
 
-public class TxGenerator extends AbstractTxStream implements ITxGenerator {
+public class TxGenerator extends AbstractTxStream {
 
 	private TxStream  stream;
 	
@@ -40,15 +39,10 @@ public class TxGenerator extends AbstractTxStream implements ITxGenerator {
 	}
 
 	@Override
-	public Long getId() {
+	public long getId() {
 		return (long) scvGenerator.getId();
 	}
 
-	@Override
-	public IWaveform getStream() {
-		return stream;
-	}
-
 	@Override
 	public String getName() {
 		return scvGenerator.getName();
@@ -56,7 +50,7 @@ public class TxGenerator extends AbstractTxStream implements ITxGenerator {
 
 	@Override
 	public boolean isSame(IWaveform other) {
-		return(other instanceof TxGenerator && this.getId().equals(other.getId()));
+		return(other instanceof TxGenerator && this.getId() == other.getId());
 	}
 
 	@Override
@@ -75,7 +69,7 @@ public class TxGenerator extends AbstractTxStream implements ITxGenerator {
 					transactions.put(scvTx.getId(), new Tx(database, (TxStream) stream, this, scvTx));
 				}
 			} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
-					| InvocationTargetException | SQLException | IntrospectionException e) {
+					| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
 				e.printStackTrace();
 			}
 		}

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

@@ -26,7 +26,6 @@ import com.minres.scviewer.database.sqlite.tables.ScvGenerator;
 import com.minres.scviewer.database.sqlite.tables.ScvStream;
 import com.minres.scviewer.database.sqlite.tables.ScvTx;
 import com.minres.scviewer.database.tx.ITx;
-import com.minres.scviewer.database.tx.ITxGenerator;
 
 public class TxStream extends AbstractTxStream {
 
@@ -50,11 +49,11 @@ public class TxStream extends AbstractTxStream {
 	}
 
 	@Override
-	public Long getId() {
+	public long getId() {
 		return (long) scvStream.getId();
 	}
 
-	public List<ITxGenerator> getGenerators() {
+	public List<IWaveform> getGenerators() {
 		if(generators==null){
 			SQLiteDatabaseSelectHandler<ScvGenerator> handler = new SQLiteDatabaseSelectHandler<>(
 					ScvGenerator.class, database, "stream="+scvStream.getId());
@@ -64,7 +63,7 @@ public class TxStream extends AbstractTxStream {
 					generators.put(scvGenerator.getId(), new TxGenerator(database, this, scvGenerator));
 				}
 			} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
-					| InvocationTargetException | SQLException | IntrospectionException e) {
+					| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
 				e.printStackTrace();
 			}
 		}
@@ -82,7 +81,7 @@ public class TxStream extends AbstractTxStream {
 					transactions.put(scvTx.getId(), new Tx(database, this, generators.get(scvTx.getGenerator()), scvTx));
 				}
 			} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
-					| InvocationTargetException | SQLException | IntrospectionException e) {
+					| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
 				e.printStackTrace();
 			}
 		}
@@ -90,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.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseSelectHandler.java

@@ -75,10 +75,11 @@ public class SQLiteDatabaseSelectHandler<T> extends AbstractDatabaseHandler<T> {
 	 * @throws IllegalAccessException
 	 * @throws IntrospectionException
 	 * @throws InvocationTargetException
+	 * @throws NoSuchMethodException 
 	 */
 	public synchronized List<T> selectObjects() throws SQLException,
 			InstantiationException, IllegalAccessException,
-			IntrospectionException, InvocationTargetException {
+			IntrospectionException, InvocationTargetException, IllegalArgumentException, NoSuchMethodException, SecurityException {
 
 		Connection connection = null;
 		Statement statement = null;
@@ -113,17 +114,18 @@ public class SQLiteDatabaseSelectHandler<T> extends AbstractDatabaseHandler<T> {
 	 * @throws IllegalAccessException
 	 * @throws IntrospectionException
 	 * @throws InvocationTargetException
+	 * @throws NoSuchMethodException 
 	 */
 	private List<T> createObjects(ResultSet resultSet)
 			throws SQLException, InstantiationException,
 			IllegalAccessException, IntrospectionException,
-			InvocationTargetException {
+			InvocationTargetException, IllegalArgumentException, NoSuchMethodException, SecurityException {
 
 		List<T> list = new ArrayList<>();
 
 		while (resultSet.next()) {
 
-			T instance = type.newInstance();
+			T instance = type.getDeclaredConstructor().newInstance();
 
 			for (Field field : type.getDeclaredFields()) {
 

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

@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<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/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+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.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

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

@@ -2,9 +2,9 @@ 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.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.osgi.framework;version="1.3.0"
 Require-Bundle: com.minres.scviewer.database,
  org.eclipse.osgi.services;bundle-version="3.4.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">
-   <implementation class="com.minres.scviewer.database.text.TextDbLoader"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="TextDbLoaderFactory">
+   <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.0-SNAPSHOT</version>
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.11.1-SNAPSHOT</version>
+		<version>2.15.0</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>

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

@@ -12,16 +12,16 @@
 package com.minres.scviewer.database.text;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Map.Entry;
-import java.util.NavigableMap;
-import java.util.TreeMap;
+import java.util.HashMap;
 
-import com.minres.scviewer.database.EventKind;
+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;
 import com.minres.scviewer.database.tx.ITxEvent;
 
 /**
@@ -29,6 +29,8 @@ import com.minres.scviewer.database.tx.ITxEvent;
  */
 abstract class AbstractTxStream extends HierNode implements IWaveform {
 
+	private final String fullName;
+
 	/** The id. */
 	private Long id;
 
@@ -36,10 +38,10 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	protected TextDbLoader loader;
 
 	/** The events. */
-	TreeMap<Long, IEvent[]> events = new TreeMap<>();
+	IEventList events = new EventList();
 
-	/** The concurrency calculated. */
-	boolean concurrencyCalculated = false;
+	/** The max concurrency. */
+	private int rowCount = -1;
 
 	/**
 	 * Instantiates a new abstract tx stream.
@@ -48,26 +50,29 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	 * @param id     the id
 	 * @param name   the name
 	 */
-	public AbstractTxStream(TextDbLoader loader, Long id, String name) {
+	protected AbstractTxStream(TextDbLoader loader, Long id, String name) {
 		super(name);
+		fullName=name;
 		this.loader = loader;
 		this.id = id;
 	}
 
+	/**
+	 * Gets the full hierarchical name.
+	 *
+	 * @return the full name
+	 */
+	@Override
+	public String getFullName() {
+		return  fullName;
+	}
 	/**
 	 * Adds the event.
 	 *
 	 * @param evt the evt
 	 */
 	public void addEvent(ITxEvent evt) {
-		if (!events.containsKey(evt.getTime()))
-			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);
-		}
+		events.put(evt.getTime(), evt);
 	}
 
 	/**
@@ -76,9 +81,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	 * @return the events
 	 */
 	@Override
-	public NavigableMap<Long, IEvent[]> getEvents() {
-		if (!concurrencyCalculated)
-			calculateConcurrency();
+	public IEventList getEvents() {
 		return events;
 	}
 
@@ -89,9 +92,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	 * @return the events at time
 	 */
 	@Override
-	public IEvent[] getEventsAtTime(Long time) {
-		if (!concurrencyCalculated)
-			calculateConcurrency();
+	public IEvent[] getEventsAtTime(long time) {
 		return events.get(time);
 	}
 
@@ -102,14 +103,12 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	 * @return the events before time
 	 */
 	@Override
-	public IEvent[] getEventsBeforeTime(Long time) {
-		if (!concurrencyCalculated)
-			calculateConcurrency();
-		Entry<Long, IEvent[]> e = events.floorEntry(time);
+	public IEvent[] getEventsBeforeTime(long time) {
+		EventEntry e = events.floorEntry(time);
 		if (e == null)
 			return new IEvent[] {};
 		else
-			return events.floorEntry(time).getValue();
+			return events.floorEntry(time).events;
 	}
 
 	/**
@@ -128,32 +127,63 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
 	 * @return the id
 	 */
 	@Override
-	public Long getId() {
+	public long getId() {
 		return id;
 	}
 
+	/**
+	 * Gets the width.
+	 *
+	 * @return the width
+	 */
+	@Override
+	public int getRowCount() {
+		if (rowCount<0)
+			calculateConcurrency();
+		return rowCount;
+	}
+
 	/**
 	 * Calculate concurrency.
 	 */
-	synchronized void calculateConcurrency() {
-		if (concurrencyCalculated)
+	void calculateConcurrency() {
+		if (rowCount>=0)
 			return;
-		ArrayList<Long> rowendtime = new ArrayList<>();
-		events.entrySet().stream().forEach(entry -> {
-			IEvent[] values = entry.getValue();
-			Arrays.asList(values).stream().filter(e -> e.getKind() == EventKind.BEGIN).forEach(evt -> {
-				Tx tx = (Tx) ((TxEvent) evt).getTransaction();
+		ArrayList<Long> rowEndTime = new ArrayList<>();
+		HashMap<Long, Integer> rowByTxId = new HashMap<>();
+		for(EventEntry entry: events) {
+			for(IEvent evt:entry.events) {
+				TxEvent txEvt = (TxEvent) evt;
+				ITx tx = txEvt.getTransaction();
 				int rowIdx = 0;
-				for (; rowIdx < rowendtime.size() && rowendtime.get(rowIdx) > tx.getBeginTime(); rowIdx++)
-					;
-				if (rowendtime.size() <= rowIdx)
-					rowendtime.add(tx.getEndTime());
-				else
-					rowendtime.set(rowIdx, tx.getEndTime());
-				tx.setConcurrencyIndex(rowIdx);
-			});
-		});
-		concurrencyCalculated = true;
+				switch(evt.getKind()) {
+				case END:
+					Long txId = txEvt.getTransaction().getId();
+					txEvt.setConcurrencyIndex(rowByTxId.get(txId));
+					rowByTxId.remove(txId);
+					break;
+				case SINGLE:
+					for (; rowIdx < rowEndTime.size() && rowEndTime.get(rowIdx)>tx.getBeginTime(); rowIdx++);
+					if (rowEndTime.size() <= rowIdx)
+						rowEndTime.add(tx.getEndTime());
+					else
+						rowEndTime.set(rowIdx, tx.getEndTime());
+					((TxEvent) evt).setConcurrencyIndex(rowIdx);
+					break;
+				case BEGIN:
+					for (; rowIdx < rowEndTime.size() && rowEndTime.get(rowIdx)>tx.getBeginTime(); rowIdx++);
+					if (rowEndTime.size() <= rowIdx)
+						rowEndTime.add(tx.getEndTime());
+					else
+						rowEndTime.set(rowIdx, tx.getEndTime());
+					((TxEvent) evt).setConcurrencyIndex(rowIdx);
+					rowByTxId.put(tx.getId(), rowIdx);
+					break;
+				}
+			}
+		}
+		rowCount=rowEndTime.size()>0?rowEndTime.size():1;
+		getChildNodes().parallelStream().forEach(c -> ((TxGenerator)c).calculateConcurrency());
 	}
 
 }

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

@@ -28,14 +28,15 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 
 import org.eclipse.collections.impl.map.mutable.UnifiedMap;
 import org.mapdb.DB;
-import org.mapdb.DB.TreeMapSink;
 import org.mapdb.DBMaker;
+import org.mapdb.HTreeMap;
 import org.mapdb.Serializer;
 
 import com.google.common.collect.HashMultimap;
@@ -55,6 +56,13 @@ import com.minres.scviewer.database.tx.ITx;
  */
 public class TextDbLoader implements IWaveformDbLoader {
 
+	/** the file size limit of a zipped txlog where the loader starts to use a file mapped database */
+	private static final long MEMMAP_LIMIT=256l*1024l*1024l;
+	
+	private static final long MAPDB_INITIAL_ALLOC = 512l*1024l*1024l;
+	
+	private static final long MAPDB_INCREMENTAL_ALLOC = 128l*1024l*1024l;
+	
 	/** The max time. */
 	private Long maxTime = 0L;
 
@@ -76,8 +84,6 @@ public class TextDbLoader implements IWaveformDbLoader {
 	/** The transactions. */
 	Map<Long, ScvTx> transactions = null;
 
-	Map<Long, Long> id2index = new HashMap<>();
-	
 	/** The attribute types. */
 	final Map<String, TxAttributeType> attributeTypes = UnifiedMap.newMap();
 
@@ -99,18 +105,59 @@ public class TextDbLoader implements IWaveformDbLoader {
 	/** The Constant x. */
 	static final byte[] x = "scv_tr_stream".getBytes();
 
+	/**
+	 * Adds the property change listener.
+	 *
+	 * @param l the l
+	 */
+	@Override
+	public void addPropertyChangeListener(PropertyChangeListener l) {
+		pcs.addPropertyChangeListener(l);
+	}
+
+	/**
+	 * Removes the property change listener.
+	 *
+	 * @param l the l
+	 */
+	@Override
+	public void removePropertyChangeListener(PropertyChangeListener l) {
+		pcs.removePropertyChangeListener(l);
+	}
+
 	/**
 	 * Gets the max time.
 	 *
 	 * @return the max time
 	 */
 	@Override
-	public Long getMaxTime() {
+	public long getMaxTime() {
 		return maxTime;
 	}
 
+	/**
+	 * Gets the transaction.
+	 *
+	 * @param txId the tx id
+	 * @return the transaction
+	 */
+	public ITx getTransaction(long txId) {
+		if (txCache.containsKey(txId))
+			return txCache.get(txId);
+		if(transactions.containsKey(txId)) {
+			Tx tx = new Tx(this, transactions.get(txId));
+			txCache.put(txId, tx);
+			return tx;
+		} else {
+			throw new IllegalArgumentException();
+		}
+	}
+
 	public ScvTx getScvTx(long id) {
-		return transactions.get(id2index.get(id));
+		if(transactions.containsKey(id))
+			return transactions.get(id);
+		else
+			throw new IllegalArgumentException();
 	}
 
 	/**
@@ -120,7 +167,18 @@ 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;
+	}
+
+	/**
+	 * Gets the all relation types.
+	 *
+	 * @return the all relation types
+	 */
+	public Collection<RelationType> getAllRelationTypes() {
+		return relationTypes.values();
 	}
 
 	/**
@@ -149,6 +207,22 @@ public class TextDbLoader implements IWaveformDbLoader {
 		return false;
 	}
 
+	/**
+	 * 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;
+		}
+	}
+
 	/**
 	 * Load.
 	 *
@@ -162,10 +236,9 @@ public class TextDbLoader implements IWaveformDbLoader {
 	public void load(IWaveformDb db, File file) throws InputFormatException {
 		dispose();
 		boolean gzipped = isGzipped(file);
-		if (file.length() < 75000000 * (gzipped ? 1 : 10)
+		if (file.length() < MEMMAP_LIMIT * (gzipped ? 1 : 10)
 				|| "memory".equals(System.getProperty("ScvBackingDB", "file")))
-			mapDb = DBMaker.memoryDirectDB().allocateStartSize(512l * 1024l * 1024l)
-					.allocateIncrement(128l * 1024l * 1024l).cleanerHackEnable().make();
+			mapDb = DBMaker.memoryDirectDB().make();
 		else {
 			File mapDbFile;
 			try {
@@ -175,32 +248,21 @@ public class TextDbLoader implements IWaveformDbLoader {
 				throw new InputFormatException(e.toString());
 			}
 			mapDb = DBMaker.fileDB(mapDbFile).fileMmapEnable() // Always enable mmap
-					.fileMmapEnableIfSupported().fileMmapPreclearDisable().allocateStartSize(512l * 1024l * 1024l)
-					.allocateIncrement(128l * 1024l * 1024l).cleanerHackEnable().make();
+					.fileMmapPreclearDisable().allocateStartSize(MAPDB_INITIAL_ALLOC)
+					.allocateIncrement(MAPDB_INCREMENTAL_ALLOC).cleanerHackEnable().make();
 			mapDbFile.deleteOnExit();
 		}
 		TextDbParser parser = new TextDbParser(this);
 		try {
-			parser.txSink = mapDb.treeMap("transactions", Serializer.LONG, Serializer.JAVA).createFromSink();
+			
+			parser.txSink = mapDb.hashMap("transactions", Serializer.LONG, Serializer.JAVA).create();
 			parser.parseInput(gzipped ? new GZIPInputStream(new FileInputStream(file)) : new FileInputStream(file));
-			transactions = parser.txSink.create();
+			transactions = parser.txSink;
 		} catch (IllegalArgumentException | ArrayIndexOutOfBoundsException e) {
 		} catch (Exception e) {
 			throw new InputFormatException(e.toString());
 		}
-		for (TxStream stream : txStreams.values()) {
-			Thread t = new Thread() {
-				@Override
-				public void run() {
-					try {
-						stream.calculateConcurrency();
-					} catch (Exception e) {
-						/* don't let exceptions bubble up */ }
-				}
-			};
-			threads.add(t);
-			t.start();
-		}
+		txStreams.values().parallelStream().forEach(TxStream::calculateConcurrency);
 	}
 
 	/**
@@ -222,31 +284,6 @@ public class TextDbLoader implements IWaveformDbLoader {
 		}
 	}
 
-	/**
-	 * 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;
-		}
-	}
-
-	/**
-	 * Gets the all relation types.
-	 *
-	 * @return the all relation types
-	 */
-	public Collection<RelationType> getAllRelationTypes() {
-		return relationTypes.values();
-	}
-
 	/**
 	 * The Class TextDbParser.
 	 */
@@ -275,7 +312,7 @@ public class TextDbLoader implements IWaveformDbLoader {
 		HashMap<Long, ScvTx> transactionById = new HashMap<>();
 
 		/** The tx sink. */
-		TreeMapSink<Long, ScvTx> txSink;
+		HTreeMap<Long, ScvTx> txSink;
 
 		/** The reader. */
 		BufferedReader reader = null;
@@ -286,7 +323,6 @@ public class TextDbLoader implements IWaveformDbLoader {
 		/** The attr value lut. */
 		Map<String, Integer> attrValueLut = new HashMap<>();
 
-		long indexCount = 0;
 		/**
 		 * Instantiates a new text db parser.
 		 *
@@ -313,6 +349,11 @@ public class TextDbLoader implements IWaveformDbLoader {
 			}
 			if (curLine != null)
 				parseLine(curLine, nextLine);
+			for(Entry<Long, ScvTx> e: transactionById.entrySet()) {
+				ScvTx scvTx = e.getValue();
+				scvTx.endTime=loader.maxTime;
+				txSink.put(e.getKey(), scvTx);
+			}
 		}
 
 		/**
@@ -348,10 +389,9 @@ public class TextDbLoader implements IWaveformDbLoader {
 			String[] tokens = curLine.split("\\s+");
 			if ("tx_record_attribute".equals(tokens[0])) {
 				Long id = Long.parseLong(tokens[1]);
-				String name = tokens[2].substring(1, tokens[2].length());
+				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))
-						: "";
+				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])) {
@@ -361,8 +401,6 @@ public class TextDbLoader implements IWaveformDbLoader {
 				ScvTx scvTx = new ScvTx(id, gen.stream.getId(), genId,
 						Long.parseLong(tokens[3]) * stringToScale(tokens[4]));
 				loader.maxTime = loader.maxTime > scvTx.beginTime ? loader.maxTime : scvTx.beginTime;
-				TxStream stream = loader.txStreams.get(gen.stream.getId());
-				stream.setConcurrency(stream.getConcurrency() + 1);
 				if (nextLine != null && nextLine.charAt(0) == 'a') {
 					int idx = 0;
 					while (nextLine != null && nextLine.charAt(0) == 'a') {
@@ -384,18 +422,14 @@ public class TextDbLoader implements IWaveformDbLoader {
 				TxGenerator gen = loader.txGenerators.get(scvTx.generatorId);
 				TxStream stream = loader.txStreams.get(gen.stream.getId());
 				if (scvTx.beginTime == scvTx.endTime) {
-					TxEvent evt = new TxEvent(loader, EventKind.SINGLE, id, scvTx.beginTime);
-					stream.addEvent(evt);
-					gen.addEvent(evt);
+					stream.addEvent(new TxEvent(loader, EventKind.SINGLE, id, scvTx.beginTime));
+					gen.addEvent(new TxEvent(loader, EventKind.SINGLE, id, scvTx.beginTime));
 				} else {
-					TxEvent begEvt = new TxEvent(loader, EventKind.BEGIN, id, scvTx.beginTime);
-					stream.addEvent(begEvt);
-					gen.addEvent(begEvt);
-					TxEvent endEvt = new TxEvent(loader, EventKind.END, id, scvTx.endTime);
-					stream.addEvent(endEvt);
-					gen.addEvent(endEvt);
+					stream.addEvent(new TxEvent(loader, EventKind.BEGIN, id, scvTx.beginTime));
+					gen.addEvent(new TxEvent(loader, EventKind.BEGIN, id, scvTx.beginTime));
+					stream.addEvent(new TxEvent(loader, EventKind.END, id, scvTx.endTime));
+					gen.addEvent(new TxEvent(loader, EventKind.END, id, scvTx.endTime));
 				}
-				stream.setConcurrency(stream.getConcurrency() - 1);
 				if (nextLine != null && nextLine.charAt(0) == 'a') {
 					int idx = 0;
 					while (nextLine != null && nextLine.charAt(0) == 'a') {
@@ -407,8 +441,7 @@ public class TextDbLoader implements IWaveformDbLoader {
 						nextLine = reader.readLine();
 					}
 				}
-				txSink.put(indexCount, scvTx);
-				loader.id2index.put(scvTx.getId(), indexCount++);
+				txSink.put(scvTx.getId(), scvTx);
 				transactionById.remove(id);
 			} else if ("tx_relation".equals(tokens[0])) {
 				Long tr2 = Long.parseLong(tokens[2]);
@@ -515,38 +548,4 @@ public class TextDbLoader implements IWaveformDbLoader {
 
 	}
 
-	/**
-	 * Gets the transaction.
-	 *
-	 * @param txId the tx id
-	 * @return the transaction
-	 */
-	public ITx getTransaction(long txId) {
-		if (txCache.containsKey(txId))
-			return txCache.get(txId);
-		Tx tx = new Tx(this, txId);
-		txCache.put(txId, tx);
-		return tx;
-	}
-
-	/**
-	 * Adds the property change listener.
-	 *
-	 * @param l the l
-	 */
-	@Override
-	public void addPropertyChangeListener(PropertyChangeListener l) {
-		pcs.addPropertyChangeListener(l);
-	}
-
-	/**
-	 * Removes the property change listener.
-	 *
-	 * @param l the l
-	 */
-	@Override
-	public void removePropertyChangeListener(PropertyChangeListener l) {
-		pcs.removePropertyChangeListener(l);
-	}
-
 }

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

@@ -19,7 +19,6 @@ import java.util.stream.Collectors;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.tx.ITx;
 import com.minres.scviewer.database.tx.ITxAttribute;
-import com.minres.scviewer.database.tx.ITxGenerator;
 import com.minres.scviewer.database.tx.ITxRelation;
 
 /**
@@ -29,9 +28,15 @@ class Tx implements ITx {
 
 	/** The loader. */
 	private final TextDbLoader loader;
+	
+	private ScvTx scvTx =null;
 
 	/** The id. */
-	private long id;
+	private final long id;
+
+	private final long generatorId;
+
+	private final long streamId;
 
 	/** The begin time. */
 	long beginTime = -1;
@@ -39,9 +44,6 @@ class Tx implements ITx {
 	/** The end time. */
 	long endTime = -1;
 
-	/** The concurrency index. */
-	private int concurrencyIndex;
-
 	/**
 	 * Instantiates a new tx.
 	 *
@@ -51,6 +53,10 @@ class Tx implements ITx {
 	public Tx(TextDbLoader loader, ScvTx scvTx) {
 		this.loader = loader;
 		id = scvTx.id;
+		generatorId=scvTx.generatorId;
+		streamId=scvTx.streamId;
+		beginTime=scvTx.beginTime;
+		endTime=scvTx.endTime;
 	}
 
 	/**
@@ -59,9 +65,11 @@ class Tx implements ITx {
 	 * @param loader the loader
 	 * @param txId   the tx id
 	 */
-	public Tx(TextDbLoader loader, long txId) {
+	public Tx(TextDbLoader loader, long id, long generatorId,  long streamId) {
 		this.loader = loader;
-		id = txId;
+		this.id = id;
+		this.generatorId=generatorId;
+		this.streamId = streamId;
 	}
 
 	/**
@@ -94,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());
 	}
 
 	/**
@@ -113,7 +121,7 @@ class Tx implements ITx {
 			return true;
 		if (obj == null || getClass() != obj.getClass())
 			return false;
-		return this.loader.getScvTx(id).equals(((Tx) obj).loader.getScvTx(id));
+		return this.getScvTx().equals(((Tx) obj).getScvTx());
 	}
 
 	/**
@@ -123,7 +131,7 @@ class Tx implements ITx {
 	 */
 	@Override
 	public int hashCode() {
-		return loader.getScvTx(id).hashCode();
+		return getScvTx().hashCode();
 	}
 
 	/**
@@ -142,8 +150,8 @@ class Tx implements ITx {
 	 * @return the id
 	 */
 	@Override
-	public Long getId() {
-		return loader.getScvTx(id).id;
+	public long getId() {
+		return getScvTx().id;
 	}
 
 	/**
@@ -153,7 +161,7 @@ class Tx implements ITx {
 	 */
 	@Override
 	public IWaveform getStream() {
-		return loader.txStreams.get(loader.getScvTx(id).streamId);
+		return loader.txStreams.get(streamId);
 	}
 
 	/**
@@ -162,8 +170,8 @@ class Tx implements ITx {
 	 * @return the generator
 	 */
 	@Override
-	public ITxGenerator getGenerator() {
-		return loader.txGenerators.get(loader.getScvTx(id).generatorId);
+	public IWaveform getGenerator() {
+		return loader.txGenerators.get(generatorId);
 	}
 
 	/**
@@ -172,9 +180,12 @@ class Tx implements ITx {
 	 * @return the begin time
 	 */
 	@Override
-	public Long getBeginTime() {
-		if (beginTime < 0)
-			beginTime = loader.getScvTx(id).beginTime;
+	public long getBeginTime() {
+		if (beginTime < 0) {
+			ScvTx tx = scvTx==null?loader.getScvTx(id):getScvTx();
+			beginTime = tx.beginTime;
+			endTime = tx.endTime;
+		}
 		return beginTime;
 	}
 
@@ -184,9 +195,12 @@ class Tx implements ITx {
 	 * @return the end time
 	 */
 	@Override
-	public Long getEndTime() {
-		if (endTime < 0)
-			endTime = loader.getScvTx(id).endTime;
+	public long getEndTime() {
+		if (endTime < 0) {
+			ScvTx tx = scvTx==null?loader.getScvTx(id):getScvTx();
+			beginTime = tx.beginTime;
+			endTime = tx.endTime;
+		}
 		return endTime;
 	}
 
@@ -196,26 +210,7 @@ class Tx implements ITx {
 	 * @param time the new end time
 	 */
 	void setEndTime(Long time) {
-		loader.getScvTx(id).endTime = time;
-	}
-
-	/**
-	 * Gets the concurrency index.
-	 *
-	 * @return the concurrency index
-	 */
-	@Override
-	public int getConcurrencyIndex() {
-		return concurrencyIndex;
-	}
-
-	/**
-	 * Sets the concurrency index.
-	 *
-	 * @param idx the new concurrency index
-	 */
-	void setConcurrencyIndex(int idx) {
-		concurrencyIndex = idx;
+		getScvTx().endTime = time;
 	}
 
 	/**
@@ -225,7 +220,12 @@ class Tx implements ITx {
 	 */
 	@Override
 	public List<ITxAttribute> getAttributes() {
-		return loader.getScvTx(id).attributes;
+		return getScvTx().attributes;
 	}
 
+	private ScvTx getScvTx() {
+		if(scvTx==null)
+			scvTx=loader.getScvTx(id);
+		return scvTx;
+	}
 }

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

@@ -32,6 +32,7 @@ class TxEvent implements ITxEvent {
 	/** The time. */
 	final long time;
 
+	private int concurrencyIdx=-1;
 	/**
 	 * Instantiates a new tx event.
 	 *
@@ -94,7 +95,7 @@ class TxEvent implements ITxEvent {
 	 * @return the time
 	 */
 	@Override
-	public Long getTime() {
+	public long getTime() {
 		return time;
 	}
 
@@ -107,4 +108,13 @@ class TxEvent implements ITxEvent {
 	public ITx getTransaction() {
 		return loader.getTransaction(transaction);
 	}
+
+	@Override
+	public int getRowIndex() {
+		return concurrencyIdx;
+	}
+
+	public void setConcurrencyIndex(int idx) {
+		concurrencyIdx=idx;
+	}
 }

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

@@ -15,12 +15,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.minres.scviewer.database.IWaveform;
-import com.minres.scviewer.database.tx.ITxGenerator;
 
 /**
  * The Class TxGenerator.
  */
-class TxGenerator extends AbstractTxStream implements ITxGenerator {
+class TxGenerator extends AbstractTxStream {
 
 	/** The stream. */
 	TxStream stream;
@@ -45,16 +44,6 @@ class TxGenerator extends AbstractTxStream implements ITxGenerator {
 		stream.addChild(this);
 	}
 
-	/**
-	 * Gets the stream.
-	 *
-	 * @return the stream
-	 */
-	@Override
-	public IWaveform getStream() {
-		return stream;
-	}
-
 	/**
 	 * Checks if is same.
 	 *
@@ -63,7 +52,7 @@ class TxGenerator extends AbstractTxStream implements ITxGenerator {
 	 */
 	@Override
 	public boolean isSame(IWaveform other) {
-		return (other instanceof TxGenerator && this.getId().equals(other.getId()));
+		return (other instanceof TxGenerator && this.getId()==other.getId());
 	}
 
 	/**
@@ -93,14 +82,15 @@ class TxGenerator extends AbstractTxStream implements ITxGenerator {
 	public String getKind() {
 		return stream.getKind();
 	}
-
+	
 	/**
-	 * Gets the width.
+	 * Gets the full hierarchical name.
 	 *
-	 * @return the width
+	 * @return the full name
 	 */
 	@Override
-	public int getWidth() {
-		return stream.getWidth();
+	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());
 	}
 
 	/**
@@ -55,40 +55,4 @@ class TxStream extends AbstractTxStream {
 		return kind;
 	}
 
-	/** The max concurrency. */
-	private int maxConcurrency = 0;
-
-	/** The concurrency. */
-	private int concurrency = 0;
-
-	/**
-	 * Sets the concurrency.
-	 *
-	 * @param concurrency the new concurrency
-	 */
-	void setConcurrency(int concurrency) {
-		this.concurrency = concurrency;
-		if (concurrency > maxConcurrency)
-			maxConcurrency = concurrency;
-	}
-
-	/**
-	 * Gets the concurrency.
-	 *
-	 * @return the concurrency
-	 */
-	int getConcurrency() {
-		return this.concurrency;
-	}
-
-	/**
-	 * Gets the width.
-	 *
-	 * @return the width
-	 */
-	@Override
-	public int getWidth() {
-		return maxConcurrency;
-	}
-
 }

plugins/com.minres.scviewer.database.ui.swt/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.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 kind="output" path="target/classes"/>

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

@@ -9,8 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -21,6 +21,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -66,6 +67,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -98,5 +100,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

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

@@ -2,9 +2,9 @@ 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-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.swt;bundle-version="3.103.1",
  com.minres.scviewer.database;bundle-version="1.0.0",
  com.google.guava;bundle-version="15.0.0",

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.11.1-SNAPSHOT</version>
+  	<version>2.15.0</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 int[] UNIT_MULTIPLIER={1, 3, 10, 30, 100, 300};
+	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 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

@@ -10,9 +10,11 @@
  *******************************************************************************/
 package com.minres.scviewer.database.ui.swt.internal;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Optional;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
@@ -21,8 +23,11 @@ import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Display;
 
+import com.minres.scviewer.database.IEvent;
+import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.RelationType;
 import com.minres.scviewer.database.tx.ITx;
+import com.minres.scviewer.database.tx.ITxEvent;
 import com.minres.scviewer.database.tx.ITxRelation;
 import com.minres.scviewer.database.ui.WaveformColors;
 
@@ -32,7 +37,7 @@ public class ArrowPainter implements IPainter {
 
 	private int yCtrlOffset = 30;
 
-	private WaveformCanvas waveCanvas;
+	private final WaveformCanvas waveCanvas;
 
 	private ITx tx;
 
@@ -48,8 +53,6 @@ public class ArrowPainter implements IPainter {
 	
 	long scaleFactor;
 
-	boolean deferUpdate;
-
 	public ArrowPainter(WaveformCanvas waveCanvas, RelationType relationType) {
 		this.waveCanvas = waveCanvas;
 		highlightType=relationType;
@@ -72,42 +75,53 @@ public class ArrowPainter implements IPainter {
 		this.tx = newTx;
 		iRect = new LinkedList<>();
 		oRect = new LinkedList<>();
-		scaleFactor = waveCanvas.getScaleFactor();
+		scaleFactor = waveCanvas.getScale();
 		if (tx != null) {
 			calculateGeometries();
 		}
 	}
 
-	protected void calculateGeometries() {
-		deferUpdate = false;
+	private int getConcurrencyIndex(ITx tx) {
+		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;
+	}
+	
+	protected boolean calculateGeometries() {
 		iRect.clear();
 		oRect.clear();
 		IWaveformPainter painter = waveCanvas.wave2painterMap.get(tx.getStream());
+		if(painter == null)
+			painter = waveCanvas.wave2painterMap.get(tx.getGenerator());
 		if (painter == null) { // stream has been added but painter not yet
 								// created
-			deferUpdate = true;
-			return;
+			return true;
 		}
-		int laneHeight = painter.getHeight() / tx.getStream().getWidth();
+		int laneHeight = painter.getHeight() / tx.getStream().getRowCount();
 		txRectangle = new Rectangle((int) (tx.getBeginTime() / scaleFactor),
-				waveCanvas.rulerHeight + painter.getVerticalOffset() + laneHeight * tx.getConcurrencyIndex(),
+				waveCanvas.rulerHeight + painter.getVerticalOffset() + laneHeight * getConcurrencyIndex(tx),
 				(int) ((tx.getEndTime() - tx.getBeginTime()) / scaleFactor), laneHeight);
 		deriveGeom(tx.getIncomingRelations(), iRect, false);
 		deriveGeom(tx.getOutgoingRelations(), oRect, true);
+		return false;
 	}
 
 	protected void deriveGeom(Collection<ITxRelation> relations, List<LinkEntry> res, boolean useTarget) {
 		for (ITxRelation iTxRelation : relations) {
 			ITx otherTx = useTarget ? iTxRelation.getTarget() : iTxRelation.getSource();
-			if (waveCanvas.wave2painterMap.containsKey(otherTx.getStream())) {
-				IWaveformPainter painter = waveCanvas.wave2painterMap.get(otherTx.getStream());
-				int height = waveCanvas.styleProvider.getTrackHeight();
-				Rectangle bb = new Rectangle(
-						(int) (otherTx.getBeginTime() / scaleFactor),
-						waveCanvas.rulerHeight + painter.getVerticalOffset() + height * otherTx.getConcurrencyIndex(),
-						(int) ((otherTx.getEndTime() - otherTx.getBeginTime()) / scaleFactor),
-						height);
-				res.add(new LinkEntry(bb, iTxRelation.getRelationType()));
+			for(IWaveform iWaveform: new IWaveform[]{otherTx.getStream(), otherTx.getGenerator()}) {
+				if (waveCanvas.wave2painterMap.containsKey(iWaveform)) {
+					IWaveformPainter painter = waveCanvas.wave2painterMap.get(iWaveform);
+					if(painter!=null) {
+						int height = waveCanvas.styleProvider.getTrackHeight();
+						Rectangle bb = new Rectangle(
+								(int) (otherTx.getBeginTime() / scaleFactor),
+								waveCanvas.rulerHeight + painter.getVerticalOffset() + height * getConcurrencyIndex(otherTx),
+								(int) ((otherTx.getEndTime() - otherTx.getBeginTime()) / scaleFactor),
+								height);
+						res.add(new LinkEntry(bb, iTxRelation.getRelationType()));				
+					}
+				}
 			}
 		}
 	}
@@ -119,11 +133,9 @@ public class ArrowPainter implements IPainter {
 		Color highliteColor = waveCanvas.styleProvider.getColor(WaveformColors.REL_ARROW_HIGHLITE);
 
 		if(tx==null) return;
-		if (!deferUpdate) {
-			scaleFactor = waveCanvas.getScaleFactor();
-			calculateGeometries();
-		}
-		if(deferUpdate) return;
+		scaleFactor = waveCanvas.getScale();
+		if(calculateGeometries())
+			return;
 		int correctionValue = (int)(selectionOffset);
 		Rectangle correctedTargetRectangle = new Rectangle(txRectangle.x+correctionValue, txRectangle.y, txRectangle.width, txRectangle.height);
 		for (LinkEntry entry : iRect) {

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((dTime/waveCanvas.getScaleFactorPow10())+waveCanvas.getUnitStr(), x+1, top);
+				proj.drawText(waveCanvas.timeToString(time), 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 WaveformCanvas waveCanvas;
+    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.getScaleFactor();
-
-        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 scaleFactor=waveCanvas.getScale();
+        long startTime=waveCanvas.getMinVisibleTime(); 
+        long endTime=waveCanvas.getMaxVisibleTime();
 
+        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 startMinorIncrPos = startPos+rulerTickMinor-modulo;
-        long startMinorIncrVal = startVal+rulerTickMinor-modulo;
+        long startTickTime = startTime+rulerTickMinor-(startTime % rulerTickMinor);
+        long majorTickDist = rulerTickMajor/scaleFactor;
         
         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);
-        
-        for (long pos = startMinorIncrPos, tick = startMinorIncrVal; pos < endPos; pos+= rulerTickMinor, tick += rulerTickMinor) {
-            int x0Pos = (int) (pos/scaleFactor);
-            long x0Val = tick/scaleFactor;
-            if ((tick % rulerTickMajor) == 0) {
-                gc.drawText(df.format(x0Val*unitMultiplier)+unit, x0Pos, area.y+textY);
+        int maxTextLength=0;
+        for (long tickTime = startTickTime; tickTime < endTime; tickTime+= rulerTickMinor) {
+            if ((tickTime % rulerTickMajor) == 0) {
+            	Point textSize = gc.textExtent(waveCanvas.timeToString(tickTime));
+            	maxTextLength=textSize.x>maxTextLength?textSize.x:maxTextLength;
+            }
+        }
+        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) {
-			time = entry.getKey();
-			value = entry.getValue()[0];
+		public SignalChange(EventEntry entry) {
+			time = entry.timestamp;
+			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();
-				value = entry.getValue()[0];
+				time = entry.timestamp;
+				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);
-		Entry<Long, IEvent[]> last = signal.getEvents().floorEntry(endTime);
-		if (first == null) {
-			if (last == null)
-				return;
+		EventEntry first = signal.getEvents().floorEntry(beginTime);
+		if (first == null)
 			first = signal.getEvents().firstEntry();
-		} else if (last == null) {
-			last = signal.getEvents().lastEntry();
-		}
+		beginTime = first.timestamp;
 		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);
-		SignalChange left = new SignalChange(first);
-		SignalChange right = new SignalChange(entries.size() > 0 ? entries.firstEntry() : first);
+		IEventList entries = signal.getEvents().subMap(beginTime, true, endTime);
+		SignalChange left = new SignalChange(entries.firstEntry());
+		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();
-				Entry<Long, IEvent[]> entry = entries.floorEntry(eTime);
-				if(entry!=null && entry.getKey()> right.time)
+				long eTime = (xSigChangeBeginPos + 1) * this.waveCanvas.getScale();
+				EventEntry entry = entries.floorEntry(eTime);
+				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(IEvent e: tp) {
+				for (EventEntry tp : ievents)
+					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(IEvent e:val) {
+				for (EventEntry val : values)
+					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,18 +10,17 @@
  *******************************************************************************/
 package com.minres.scviewer.database.ui.swt.internal;
 
-import java.util.Collection;
-import java.util.Map.Entry;
-import java.util.NavigableMap;
-import java.util.TreeSet;
+import java.util.TreeMap;
 
 import org.eclipse.swt.SWT;
 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;
@@ -37,19 +36,27 @@ public class StreamPainter extends TrackPainter{
 	private IWaveform stream;
 	private int txBase;
 	private int txHeight;
-	private TreeSet<ITx> seenTx;
+	// TODO: remove TreeMap usage
+	private TreeMap<ITx, ITxEvent> seenTx;
 
 	public StreamPainter(WaveformCanvas waveCanvas, boolean even, TrackEntry trackEntry) {
 		super(trackEntry, even);
 		this.waveCanvas = waveCanvas;
 		this.stream=trackEntry.waveform;
-		this.seenTx=new TreeSet<>();
+		this.seenTx=new TreeMap<>();
 	}
 
-	@SuppressWarnings("unchecked")
 	public void paintArea(Projection proj, Rectangle area) {
-		if(stream.getEvents().size()==0) return;
-		int trackHeight=trackEntry.height/stream.getWidth();
+		int trackHeight=trackEntry.height/stream.getRowCount();
+		if(stream.getEvents().size()==0) {
+			proj.setFillRule(SWT.FILL_EVEN_ODD);
+			proj.setLineStyle(SWT.LINE_SOLID);
+			proj.setLineWidth(1);
+			proj.setForeground(this.waveCanvas.styleProvider.getColor(WaveformColors.LINE));
+			for( int y1=area.y+trackHeight/2; y1<area.y+trackEntry.height; y1+=trackHeight)
+				proj.drawLine(area.x, y1, area.x+area.width, y1);
+			return;
+		}
 		txBase=trackHeight/5;
 		txHeight=trackHeight*3/5;
 		if(trackEntry.selected) {
@@ -60,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, ?> firstTx=stream.getEvents().floorEntry(beginTime);
-		Entry<Long, ?> lastTx=stream.getEvents().ceilingEntry(endTime);
-		if(firstTx==null) firstTx = stream.getEvents().firstEntry();
-		if(lastTx==null) lastTx=stream.getEvents().lastEntry();
+		IEventList events = stream.getEvents();
+		EventEntry firstTx = events.floorEntry(beginTime);
+		EventEntry lastTx = events.ceilingEntry(endTime);
+		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);
@@ -77,49 +85,53 @@ 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(ITxEvent txEvent:(Collection<?  extends ITxEvent>)firstTx.getValue())
-				drawTx(proj, area, txEvent.getTransaction(), false);
+			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);
-			boolean highlighed=false;
+			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(IEvent evt:entry.getValue()){
-					ITx tx = ((ITxEvent) evt).getTransaction();
-					highlighed|=selectedId==tx.getId();
+			for(EventEntry entry: events.subMap(firstTx.timestamp, true, lastTx.timestamp))
+				for(IEvent e:entry.events){
+					ITxEvent evt = (ITxEvent) e;
+					ITx tx = evt.getTransaction();
+					if(selectedId==tx.getId())
+						highlighed=evt;
 					switch(evt.getKind()) {
 					case BEGIN:
-						seenTx.add(tx);
+						seenTx.put(tx, evt);
 						break;
 					case END:
+						drawTx(proj, area, tx, evt.getRowIndex(), false);
 						seenTx.remove(tx);
+						break;
 					case SINGLE:
-						drawTx(proj, area, tx, false);
+						drawTx(proj, area, tx, evt.getRowIndex(), false);
 						break;
 					}
 				}
-			for(ITx tx:seenTx){
-				drawTx(proj, area, tx, false);
-			}
-			if(highlighed){
+			seenTx.entrySet().stream().forEach(e -> {
+				drawTx(proj, area, e.getKey(), e.getValue().getRowIndex(), false);
+			});
+			
+			if(highlighed!=null){
 				proj.setForeground(this.waveCanvas.styleProvider.getColor(WaveformColors.LINE_HIGHLITE));
-				drawTx(proj, area, waveCanvas.currentSelection, true);
+				drawTx(proj, area, highlighed.getTransaction(), highlighed.getRowIndex(), true);
 			}
 		}
 	}
 
-	protected void drawTx(Projection proj, Rectangle area, ITx tx, boolean highlighted ) {
+	protected void drawTx(Projection proj, Rectangle area, ITx tx, int concurrencyIndex, boolean highlighted ) {
 		// compute colors
 		Color[] transColor = waveCanvas.styleProvider.computeColor( tx.getGenerator().getName());
 
 		proj.setBackground(transColor[highlighted?1:0]);
 
-		int offset = tx.getConcurrencyIndex()*this.waveCanvas.styleProvider.getTrackHeight();
+		int offset = concurrencyIndex*this.waveCanvas.styleProvider.getTrackHeight();
 		Rectangle bb = new Rectangle(
-				(int)(tx.getBeginTime()/this.waveCanvas.getScaleFactor()), area.y+offset+txBase,
-				(int)((tx.getEndTime()-tx.getBeginTime())/this.waveCanvas.getScaleFactor()), txHeight);
+				(int)(tx.getBeginTime()/this.waveCanvas.getScale()), area.y+offset+txBase,
+				(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){
@@ -143,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;
@@ -162,27 +174,21 @@ public class StreamPainter extends TrackPainter{
 		this.stream = stream;
 	}
 
-	protected ITx getTxFromEntry(int lane, int offset, Entry<Long, IEvent[]> firstTx) {
-		long timePoint=offset*waveCanvas.getScaleFactor();
-		for(IEvent evt:firstTx.getValue()){
-			if(evt instanceof ITxEvent) {
-				ITx tx=((ITxEvent)evt).getTransaction();
-				if((evt.getKind()==EventKind.BEGIN || evt.getKind()==EventKind.SINGLE)&&
-						tx.getConcurrencyIndex()==lane && tx.getBeginTime()<=timePoint && tx.getEndTime()>=timePoint){
-					return ((ITxEvent)evt).getTransaction();
-				}
-			}
-		}
-		// now with some fuzziness
-		timePoint=(offset-5)*waveCanvas.getScaleFactor();
-		long timePointHigh=(offset+5)*waveCanvas.getScaleFactor();
-		for(IEvent evt:firstTx.getValue()){
-			if(evt instanceof ITxEvent) {
-				ITx tx=((ITxEvent)evt).getTransaction();
-				if((evt.getKind()==EventKind.BEGIN || evt.getKind()==EventKind.SINGLE) &&
-						tx.getConcurrencyIndex()==lane && tx.getBeginTime()<=timePointHigh && tx.getEndTime()>=timePoint){
-					return ((ITxEvent)evt).getTransaction();
-				}
+	protected ITx getTxFromEntry(int lane, int offset, IEvent[] firstTx) {
+		long timePoint=offset*waveCanvas.getScale();
+		long timePointLow=(offset-5)*waveCanvas.getScale();
+		long timePointHigh=(offset+5)*waveCanvas.getScale();
+		for(IEvent e:firstTx){
+			if(e instanceof ITxEvent) {
+				ITxEvent evt = (ITxEvent) e;
+				ITx tx=evt.getTransaction();
+				if(
+						(evt.getKind()==EventKind.SINGLE && evt.getTime()==timePoint) ||
+						(evt.getKind()==EventKind.SINGLE && evt.getTime()>timePointLow && evt.getTime()<timePointHigh) ||
+						(evt.getKind()==EventKind.BEGIN && evt.getRowIndex()==lane && evt.getTime()<=timePoint && tx.getEndTime()>=timePoint)
+						){
+					return tx;
+				} 
 			}
 		}
 		return null;

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

@@ -11,10 +11,12 @@
 package com.minres.scviewer.database.ui.swt.internal;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Optional;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlAdapter;
@@ -32,37 +34,44 @@ 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;
 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;
-    	
-    IWaveformStyleProvider styleProvider;
-        
-    private long scaleFactor = 1000000L; // 1ns
-    
-    String unit="ns";
-    
-    private int level = 12;
-        
-    private long maxTime;
-    
-    protected Point origin; /* original size */
-        
-    protected int rulerHeight=40;
-    
-    protected List<IPainter> painterList;
-    
-    ITx currentSelection;
-    
-    private List<SelectionAdapter> selectionListeners;
+	private boolean doubleBuffering = true;
+
+	IWaveformStyleProvider styleProvider;
+
+	private int scaleMagnitude = 6;
+	
+	private long scaleFactor = Constants.POWERS_OF_TEN[scaleMagnitude];
+	
+	private long maxTime;
+
+	protected Point origin; /* original size */
+
+	protected int rulerHeight=40;
+
+	protected List<IPainter> painterList;
+
+	ITx currentSelection;
+
+	private List<SelectionAdapter> selectionListeners;
 
 	private RulerPainter rulerPainter;
 
@@ -73,38 +82,38 @@ public class WaveformCanvas extends Canvas {
 	private List<CursorPainter> cursorPainters;
 
 	HashMap<IWaveform, IWaveformPainter> wave2painterMap;
-    /**
-     * Constructor for ScrollableCanvas.
-     * 
-     * @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);
-     * @param style
-     *            the style of this control.
-     */
-    public WaveformCanvas(final Composite parent, int style, IWaveformStyleProvider styleProvider) {
-        super(parent, style | SWT.DOUBLE_BUFFERED | SWT.NO_BACKGROUND | SWT.V_SCROLL | SWT.H_SCROLL);
-        this.styleProvider=styleProvider;
-    	addControlListener(new ControlAdapter() { /* resize listener. */
+	/**
+	 * Constructor for ScrollableCanvas.
+	 * 
+	 * @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);
+	 * @param style
+	 *            the style of this control.
+	 */
+	public WaveformCanvas(final Composite parent, int style, IWaveformStyleProvider styleProvider) {
+		super(parent, style | SWT.DOUBLE_BUFFERED | SWT.NO_BACKGROUND | SWT.V_SCROLL | SWT.H_SCROLL);
+		this.styleProvider=styleProvider;
+		addControlListener(new ControlAdapter() { /* resize listener. */
 			@Override
 			public void controlResized(ControlEvent event) {
-                syncScrollBars();
-            }
-        });
-        addPaintListener((final PaintEvent event) -> paint(event.gc));
-        painterList = new LinkedList<>();
-        origin = new Point(0, 0);
-        selectionListeners = new LinkedList<>();
-        cursorPainters= new ArrayList<>();
-        wave2painterMap=new HashMap<>();
-        
-        initScrollBars();
+				syncScrollBars();
+			}
+		});
+		addPaintListener((final PaintEvent event) -> paint(event.gc));
+		painterList = new LinkedList<>();
+		origin = new Point(0, 0);
+		selectionListeners = new LinkedList<>();
+		cursorPainters= new ArrayList<>();
+		wave2painterMap=new HashMap<>();
+
+		initScrollBars();
 		// order is important: it is bottom to top
-        trackAreaPainter=new TrackAreaPainter(this);
-        painterList.add(trackAreaPainter);
-        arrowPainter=new ArrowPainter(this, IWaveformView.NEXT_PREV_IN_STREAM);
-        painterList.add(arrowPainter);
-        rulerPainter=new RulerPainter(this);
-        painterList.add(rulerPainter);
+		trackAreaPainter=new TrackAreaPainter(this);
+		painterList.add(trackAreaPainter);
+		arrowPainter=new ArrowPainter(this, IWaveformView.NEXT_PREV_IN_STREAM);
+		painterList.add(arrowPainter);
+		rulerPainter=new RulerPainter(this);
+		painterList.add(rulerPainter);
 		CursorPainter cp = new CursorPainter(this, scaleFactor * 10, cursorPainters.size()-1);
 		painterList.add(cp);
 		cursorPainters.add(cp);
@@ -112,84 +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){
-    	if(arrowPainter!=null){
-    		boolean redraw = arrowPainter.getHighlightType()!=relationType; 
-    		arrowPainter.setHighlightType(relationType);
-    		if(redraw) redraw();
-    	}
-    }
-    
-    public Point getOrigin() {
-        return origin;
-    }
+	@Override
+	public void setScale(long factor) {
+		setScalingFactor(factor, (getMaxVisibleTime()+getMinVisibleTime())/2);
+	}
 
-    public int getWidth() {
-    	return getClientArea().width; 
-    }
-    public void setOrigin(Point origin) {
-        setOrigin(origin.x, origin.y);
-    }
+	@Override
+	public void setVisibleRange(long startTime, long endTime) {
+		assert(startTime<endTime);
+		long time_diff = endTime-startTime;
+		long factor = (time_diff*11/10)/getClientArea().width;
+		setScalingFactor(factor, startTime+time_diff/2);
+	}
 
-    public void setOrigin(int x, int y) {
-        checkWidget();
-        ScrollBar hBar = getHorizontalBar();
-        hBar.setSelection(-x);
-        x = -hBar.getSelection();
-        ScrollBar vBar = getVerticalBar();
-        vBar.setSelection(-y);
-        y = -vBar.getSelection();
-        origin.x = x;
-        origin.y = y;
-        syncScrollBars();
-    }
-
-    public long getMaxTime() {
-        return maxTime;
-    }
-
-    public void setMaxTime(long maxTime) {
-        this.maxTime = maxTime;
-        syncScrollBars();
-    }
-
-    public int getZoomLevel() {
-        return level;
-    }
-    
-    public int getMaxZoomLevel(){
-    	return Constants.UNIT_MULTIPLIER.length*Constants.UNIT_STRING.length-1;
-    }
-
-    public void setZoomLevel(int level) {
-		long tc=cursorPainters.get(0).getTime(); // cursor time
-		setZoomLevel(level, tc);
-    }
-
-    public void setZoomLevel(int level, long centerTime) {
-    	//FIXME: keep center if zoom-out and cursor is not in view
-    	long oldScaleFactor=scaleFactor;
-    	if(level<0) level = 0;
-    	if(level<Constants.UNIT_MULTIPLIER.length*Constants.UNIT_STRING.length){
-    		this.scaleFactor = (long) Math.pow(10, level/2d);
-    		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 xc=centerTime/oldScaleFactor; // cursor total x-offset
-			long xoffs=xc+origin.x; // cursor offset relative to left border
+	//@Override
+	public void setScalingFactor(long factor, long centerTime) {
+		Rectangle clientArea = getClientArea();
+		long clientAreaWidth = clientArea.width;
+		long maxFactor=maxTime/clientAreaWidth;
+		if(factor<0) {
+			if(factor== ZOOM_FIT) {
+				long cTime = getCursorPainters().get(0).getTime();
+				long time_diff = centerTime>cTime?centerTime-cTime:cTime-centerTime;
+				centerTime = (centerTime>cTime?cTime:centerTime)+time_diff/2;
+				factor = (time_diff*11/10)/clientAreaWidth;
+			} else if(factor== ZOOM_FULL)
+				factor = maxFactor;
+		} 
+		if(factor==0)
+			factor=1;
+		else if(factor>maxFactor)
+			factor=maxFactor;
+		if(factor!=scaleFactor || (getMaxVisibleTime()+getMinVisibleTime()/2) != centerTime) {
+			scaleFactor = factor;
+			scaleMagnitude = 0;
+			for(int i=Constants.POWERS_OF_TEN.length-1; i>0; i--) {
+				if(scaleFactor>=Constants.POWERS_OF_TEN[i]) {
+					scaleMagnitude = i;
+					break;
+				}
+			}
+			ITx tx = arrowPainter.getTx();
+			arrowPainter.setTx(null);
+			/*
+			 * xc = tc/oldScaleFactor
+			 * xoffs = xc+origin.x
+			 * xcn = tc/newScaleFactor
+			 * t0n = (xcn-xoffs)*scaleFactor
+			 */
+			long xoffs = clientAreaWidth/2;
 			long xcn=centerTime/scaleFactor; // new total x-offset
 			long originX=xcn-xoffs;
 			if(originX>0) {
@@ -197,318 +231,356 @@ public class WaveformCanvas extends Canvas {
 			}else {
 				origin.x=0;
 			}
-    		syncScrollBars();
-    		arrowPainter.setTx(tx);    		
-    		redraw();
-    		this.level = level;
-    	}
-    }
+			syncScrollBars();
+			arrowPainter.setTx(tx);    		
+			redraw();
+		}
+	}
 
-    public long getScaleFactor() {
-        return scaleFactor;
-    }
+	@Override
+	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() {
-    	int scale = level/Constants.UNIT_MULTIPLIER.length;
-    	double res = Math.pow(1000, scale);
-    	return (long) res;
-    }
+	public long getTimeForOffset(int xOffset){
+		return (xOffset-origin.x) * scaleFactor;
+	}
 
-    public String getUnitStr(){
-        return Constants.UNIT_STRING[level/Constants.UNIT_MULTIPLIER.length];
-    }
-     
-    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 addPainter(IPainter painter) {
+		painterList.add(painter);
+		redraw();
+	}
 
-    public void removePainter(IPainter painter) {
-        painterList.remove(painter);
-        redraw();
-    }
+	public void removePainter(IPainter painter) {
+		painterList.remove(painter);
+		redraw();
+	}
 
-    public void clearAllWaveformPainter() {
-    	clearAllWaveformPainter(true);
-    }
-    
-    void clearAllWaveformPainter(boolean update) {
-        trackAreaPainter.trackVerticalOffset.clear();
-        wave2painterMap.clear();
-        if(update) syncScrollBars();
-    }
+	public void clearAllWaveformPainter() {
+		clearAllWaveformPainter(true);
+	}
 
-    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();
-    }
+	void clearAllWaveformPainter(boolean update) {
+		trackAreaPainter.trackVerticalOffset.clear();
+		wave2painterMap.clear();
+		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. */
-    private void initScrollBars() {
-        ScrollBar horizontal = getHorizontalBar();
-        horizontal.setEnabled(false);
-        horizontal.setVisible(true);
-        horizontal.addSelectionListener(new SelectionAdapter() {
+	/* Initialize the scrollbar and register listeners. */
+	private void initScrollBars() {
+		ScrollBar horizontal = getHorizontalBar();
+		horizontal.setEnabled(false);
+		horizontal.setVisible(true);
+		horizontal.addSelectionListener(new SelectionAdapter() {
 			@Override
-            public void widgetSelected(SelectionEvent event) {
-                if (painterList.isEmpty())
-                    return;
-                setOrigin(-((ScrollBar) event.widget).getSelection(), origin.y);
-            }
-        });
-        ScrollBar vertical = getVerticalBar();
-        vertical.setEnabled(false);
-        vertical.setVisible(true);
-        vertical.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent event) {
+				if (painterList.isEmpty())
+					return;
+				setOrigin(-((ScrollBar) event.widget).getSelection(), origin.y);
+			}
+		});
+		ScrollBar vertical = getVerticalBar();
+		vertical.setEnabled(false);
+		vertical.setVisible(true);
+		vertical.addSelectionListener(new SelectionAdapter() {
 			@Override
-            public void widgetSelected(SelectionEvent event) {
-                if (painterList.isEmpty())
-                    return;
-                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()) {
-                int top = painter.getVerticalOffset() + styleProvider.getTrackHeight() * tx.getConcurrencyIndex();
-                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 widgetSelected(SelectionEvent event) {
+				if (painterList.isEmpty())
+					return;
+				setOrigin(origin.x, -((ScrollBar) event.widget).getSelection());
+			}
+		});
 	}
 
-    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);
-        }
-    }
+	/**
+	 * 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);
 
-    public int getRulerHeight() {
-        return rulerHeight;
-    }
+		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();
+	}
 
-    public void setRulerHeight(int rulerHeight) {
-        this.rulerHeight = rulerHeight;
-    }
+	/* 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());
 
-    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) {
-        selectionListeners.remove(selectionAdapter);
-    }
+	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;
+	}
 
-    /**
-     * 
-     */
-    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);
-        }
-    }
+	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;
+	}
 
-    long getMaxVisibleTime() {
-    	return (getClientArea().width+origin.x)*scaleFactor;
-    }
+	public void setSelected(ITx currentSelection) {
+		this.currentSelection = currentSelection;
+		if (currentSelection != null)
+			reveal(currentSelection);
+		arrowPainter.setTx(currentSelection);
+		redraw();
+	}
 
-    long getMinVisibleTime() {
-    	return origin.x * scaleFactor;
-    }
+	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()) {
+				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,
-									false);
+							setSelection(new StructuredSelection(entry.getValue()), (e.stateMask & SWT.CTRL) != 0, 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)
-				return; // don't react on modifier except shift
-			if (e.button == 1 && Math.abs(e.x - start.x) > 3) {
-				asyncUpdate(e.widget);
-				long startTime = waveformCanvas.getTimeForOffset(start.x);
-				long endTime = waveformCanvas.getTimeForOffset(end.x);
-				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));
+			if ((e.stateMask & SWT.MODIFIER_MASK & ~(SWT.SHIFT | SWT.CTRL)) != 0)
+				return; // don't react on modifier except shift and control
+			boolean isCtrl = (e.stateMask & SWT.CTRL)!=0;
+			boolean isShift = (e.stateMask & SWT.SHIFT)!=0;
+			if (e.button == 1) {
+				if (Math.abs(e.x - start.x) > 3) { // was drag event
 					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)) {
-				// set marker (button 1 and shift)
-				setMarkerTime(snapOffsetToEvent(start), selectedMarker);
-				asyncUpdate(e.widget);
+			} else if (e.button == 2) { // set marker (button 2)
+				setMarkerTime(selectedMarker, snapOffsetToEvent(start));
 			}
+			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;
-				Entry<Long, IEvent[]> ceilEntry = null;
+				EventEntry floorEntry = 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()
-							: ceilEntry.getKey();
+					time = time - floorEntry.timestamp < ceilEntry.timestamp - time ? floorEntry.timestamp
+							: 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) {
@@ -514,7 +509,7 @@ public class WaveformView implements IWaveformView {
 			streamEntry.vOffset = tracksVerticalHeight;
 			if (streamEntry.waveform.getType() == WaveformType.TRANSACTION) {
 				streamEntry.currentValue = "";
-				streamEntry.height *= streamEntry.waveform.getWidth();
+				streamEntry.height *= streamEntry.waveform.getRowCount();
 				painter = new StreamPainter(waveformCanvas, even, streamEntry);
 			} else if (streamEntry.waveform.getType() == WaveformType.SIGNAL) {
 				streamEntry.currentValue = "---";
@@ -579,20 +574,21 @@ public class WaveformView implements IWaveformView {
 						entry.currentValue = Double.toString(val);
 				}
 			} else if (entry.waveform.getType() == WaveformType.TRANSACTION) {
-				ITx[] resultsList = new ITx[entry.waveform.getWidth()];
-				Entry<Long, IEvent[]> firstTx = entry.waveform.getEvents().floorEntry(time);
+				ITx[] resultsList = new ITx[entry.waveform.getRowCount()];
+				EventEntry firstTx = entry.waveform.getEvents().floorEntry(time);
 				if (firstTx != null) {
 					do {
-						for (IEvent evt : firstTx.getValue()) {
-							if (evt instanceof ITxEvent) {
-								ITx tx = ((ITxEvent) evt).getTransaction();
+						for (IEvent e : firstTx.events) {
+							if (e instanceof ITxEvent) {
+								ITxEvent evt = ((ITxEvent) e);
+								ITx tx = evt.getTransaction();
 								if ((evt.getKind() == EventKind.BEGIN || evt.getKind() == EventKind.SINGLE)
 										&& tx.getBeginTime() <= time && tx.getEndTime() >= time
-										&& resultsList[tx.getConcurrencyIndex()] == null)
-									resultsList[tx.getConcurrencyIndex()] = ((ITxEvent) evt).getTransaction();
+										&& resultsList[evt.getRowIndex()] == null)
+									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();
@@ -750,27 +746,30 @@ public class WaveformView implements IWaveformView {
 				if (!add)
 					currentWaveformSelection.clear();
 				List<?> selList = sel.toList();
-				if (selList.get(0) instanceof ITx) {
-					ITx txSel = (ITx) selList.get(0);
-					TrackEntry trackEntry = selList.size() == 2 && selList.get(1) instanceof TrackEntry
-							? (TrackEntry) selList.get(1)
-							: null;
-					if (trackEntry == null) {
-						trackEntry = getEntryFor(txSel);
-						if (trackEntry == null && addIfNeeded) {
-							trackEntry = new TrackEntry(txSel.getStream(), styleProvider);
-							streams.add(trackEntry);
+				for(Object o: selList) {
+					if (o instanceof ITx) {
+						ITx txSel = (ITx) o;
+						TrackEntry trackEntry = selList.size() == 2 && selList.get(1) instanceof TrackEntry
+								? (TrackEntry) selList.get(1)
+										: null;
+						if (trackEntry == null) {
+							trackEntry = getEntryFor(txSel);
+							if (trackEntry == null && addIfNeeded) {
+								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 {
@@ -853,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();
@@ -865,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) {
@@ -882,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();
@@ -894,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);
 					}
 				}
@@ -928,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) {
@@ -957,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();
@@ -1036,7 +1035,7 @@ public class WaveformView implements IWaveformView {
 					TrackEntry trackEntry = trackVerticalOffset.get(firstKey);
 					IWaveform w = trackEntry.waveform;
 					if (w.getType() == WaveformType.TRANSACTION)
-						subArea.height *= w.getWidth();
+						subArea.height *= w.getRowCount();
 					drawTextFormat(gc, subArea, firstKey, w.getFullName(), trackEntry.selected);
 				} else {
 					for (Entry<Integer, TrackEntry> entry : trackVerticalOffset.subMap(firstKey, true, lastKey, true)
@@ -1044,7 +1043,7 @@ public class WaveformView implements IWaveformView {
 						IWaveform w = entry.getValue().waveform;
 						subArea.height = styleProvider.getTrackHeight();
 						if (w.getType() == WaveformType.TRANSACTION)
-							subArea.height *= w.getWidth();
+							subArea.height *= w.getRowCount();
 						drawTextFormat(gc, subArea, entry.getKey(), w.getFullName(), entry.getValue().selected);
 					}
 				}
@@ -1065,7 +1064,7 @@ public class WaveformView implements IWaveformView {
 					TrackEntry trackEntry = trackVerticalOffset.get(firstKey);
 					IWaveform w = trackEntry.waveform;
 					if (w.getType() == WaveformType.TRANSACTION)
-						subArea.height *= w.getWidth();
+						subArea.height *= w.getRowCount();
 					drawValue(gc, subArea, firstKey, trackEntry.currentValue, trackEntry.selected);
 				} else {
 					for (Entry<Integer, TrackEntry> entry : trackVerticalOffset.subMap(firstKey, true, lastKey, true)
@@ -1073,7 +1072,7 @@ public class WaveformView implements IWaveformView {
 						IWaveform w = entry.getValue().waveform;
 						subArea.height = styleProvider.getTrackHeight();
 						if (w.getType() == WaveformType.TRANSACTION)
-							subArea.height *= w.getWidth();
+							subArea.height *= w.getRowCount();
 						drawValue(gc, subArea, entry.getKey(), entry.getValue().currentValue,
 								entry.getValue().selected);
 					}
@@ -1113,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)
 	 * 
@@ -1133,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)
 	 * 
@@ -1172,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) {
-		if (waveformCanvas.getCursorPainters().size() > index + 1) {
-			final Long oldVal = waveformCanvas.getCursorPainters().get(1 + index).getTime();
-			waveformCanvas.getCursorPainters().get(1 + index).setTime(time);
+	public void setMarkerTime(int marker, long time) {
+		if (waveformCanvas.getCursorPainters().size() > marker + 1) {
+			final Long oldVal = waveformCanvas.getCursorPainters().get(1 + marker).getTime();
+			waveformCanvas.getCursorPainters().get(1 + marker).setTime(time);
 			pcs.firePropertyChange(MARKER_PROPERTY, oldVal, time);
 		}
 	}
@@ -1196,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;
 	}
 
@@ -1228,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));
 				}
 			}
 
@@ -1448,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;
-		Point o = waveformCanvas.getOrigin();
-		waveformCanvas.setOrigin(o.x - diff, o.y);
-		waveformCanvas.redraw();
+		long minTime = waveformCanvas.getMinVisibleTime();
+		long duration = waveformCanvas.getMaxVisibleTime()-minTime;
+		long diff = (duration * percent) / 100;
+		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) {
@@ -1531,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/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.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 kind="output" path="target/classes"/>

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

@@ -1,8 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

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

@@ -2,9 +2,9 @@ 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-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
  org.eclipse.osgi.services;bundle-version="3.4.0",
  com.google.guava;bundle-version="15.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">
-   <implementation class="com.minres.scviewer.database.vcd.VCDDbLoader"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="VCDDbLoaderFactory">
+   <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.11.1-SNAPSHOT</version>
+  	<version>2.15.0</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);
 
@@ -204,7 +204,7 @@ public class VCDDbLoader implements IWaveformDbLoader, IVCDDatabaseBuilder {
 	@Override
 	public int getNetWidth(int intValue) {
 		VCDSignal<?> signal = (VCDSignal<?>) signals.get(intValue);
-		return signal.getWidth();
+		return signal.getRowCount();
 	}
 
 	/* (non-Javadoc)

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 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;
 
@@ -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)) {
-			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});
-		}
+		values.put(time, 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) {
-    	Entry<Long, IEvent[]> e = values.floorEntry(time);
+    public IEvent[] getEventsBeforeTime(long 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
@@ -109,7 +100,7 @@ public class VCDSignal<T extends IEvent> extends HierNode implements IWaveform {
 	}
 
 	@Override
-	public int getWidth() {
+	public int getRowCount() {
 		return width;
 	}
 

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

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

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

@@ -1,9 +1,16 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+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.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

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

@@ -2,9 +2,9 @@ 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-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: com.minres.scviewer.database,
  com.minres.scviewer.database.tx
 Bundle-ActivationPolicy: lazy

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.11.1-SNAPSHOT</version>
+  	<version>2.15.0</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/HierNode.java

@@ -80,7 +80,7 @@ public class HierNode implements IHierNode {
 	}
 
 	/**
-	 * Gets the full name.
+	 * Gets the full hierarchical name.
 	 *
 	 * @return the full name
 	 */

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,8 +10,8 @@
  *******************************************************************************/
 package com.minres.scviewer.database;
 
-import java.util.NavigableMap;
 
+// TODO: Auto-generated Javadoc
 /**
  * The Interface IWaveform.
  *
@@ -24,7 +24,7 @@ public interface IWaveform extends IHierNode {
 	 *
 	 * @return the id
 	 */
-	public Long getId();
+	public long getId();
 
 	/**
 	 * Checks if is same.
@@ -39,7 +39,7 @@ public interface IWaveform extends IHierNode {
 	 *
 	 * @return the events
 	 */
-	public NavigableMap<Long, IEvent[]> getEvents();
+	public IEventList getEvents();
 
 	/**
 	 * Gets the events at time.
@@ -47,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.
@@ -55,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.
@@ -76,6 +76,6 @@ public interface IWaveform extends IHierNode {
 	 *
 	 * @return the width
 	 */
-	public int getWidth();
-
+	public int getRowCount();
+	
 }

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

@@ -8,20 +8,26 @@
  * Contributors:
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
-package com.minres.scviewer.database.tx;
+package com.minres.scviewer.database;
 
-import com.minres.scviewer.database.IWaveform;
+import java.io.File;
 
 /**
- * The Interface ITxGenerator.
+ * A factory for creating IWaveformDb objects.
  */
-public interface ITxGenerator extends IWaveform {
+public interface IWaveformDbLoaderFactory {
 
 	/**
-	 * Gets the stream.
+	 * Check if the loader produced by this factory can load the given file.
 	 *
-	 * @return the stream
+	 * @param inputFile the input file
+	 * @return true, if successful
 	 */
-	public IWaveform getStream();
-
+	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) {
-		loaders.add(loader);
+	public synchronized void bind(IWaveformDbLoaderFactory 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) {
-		loaders.remove(loader);
+	public synchronized void unbind(IWaveformDbLoaderFactory loader) {
+		loaderFactories.remove(loader);
 	}
 
 	/**
@@ -70,8 +71,8 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 	 *
 	 * @return the loaders
 	 */
-	public static List<IWaveformDbLoader> getLoaders() {
-		return Collections.unmodifiableList(loaders);
+	public static List<IWaveformDbLoaderFactory> getLoaders() {
+		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;
 	}
 
@@ -123,31 +124,32 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 	 */
 	@Override
 	public boolean load(File inp) {
-		for (IWaveformDbLoader loader : loaders) {
-			if (loader.canLoad(inp)) {
+		boolean retval = true;
+		for (IWaveformDbLoaderFactory loaderFactory : loaderFactories) {
+			if (loaderFactory.canLoad(inp)) {
+				IWaveformDbLoader loader = loaderFactory.getLoader();
+				loader.addPropertyChangeListener(this);
 				try {
-					loader.addPropertyChangeListener(this);
 					loader.load(this, inp);
-					loader.removePropertyChangeListener(this);
-					for (IWaveform w : loader.getAllWaves()) {
-						waveforms.put(w.getFullName(), w);
-					}
-					if (loader.getMaxTime() > maxTime) {
-						maxTime = loader.getMaxTime();
-					}
-					if (name == null)
-						name = getFileBasename(inp.getName());
-					buildHierarchyNodes();
-					relationTypes.addAll(loader.getAllRelationTypes());
-					pcs.firePropertyChange(IHierNode.LOADING_FINISHED, null, null);
-					loaded = true;
-					return true;
 				} catch (Exception e) {
-					return false;
+					retval=false;
 				}
+				loader.removePropertyChangeListener(this);
+				for (IWaveform w : loader.getAllWaves()) {
+					waveforms.put(w.getFullName(), w);
+				}
+				if (loader.getMaxTime() > maxTime) {
+					maxTime = loader.getMaxTime();
+				}
+				if (name == null)
+					name = getFileBasename(inp.getName());
+				buildHierarchyNodes();
+				relationTypes.addAll(loader.getAllRelationTypes());
 			}
 		}
-		return false;
+		pcs.firePropertyChange(IHierNode.LOADING_FINISHED, null, null);
+		loaded = true;
+		return retval;
 	}
 
 	/**
@@ -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) {
@@ -226,14 +219,13 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 					break;
 				}
 			}
-			if (childNode != null) {
+			if (childNode == null) {
+				HierNode newNode = new HierNode(name, node);
+				node.addChild(newNode);
+				node = newNode;
+			} else {
 				node = childNode;
-				break;
 			}
-			HierNode newNode = new HierNode(name, node);
-			node.addChild(newNode);
-			node = newNode;
-
 		}
 		node.addChild(waveform);
 		waveform.setParent(node);

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.
@@ -39,28 +39,21 @@ public interface ITx extends Comparable<ITx> {
 	 *
 	 * @return the generator
 	 */
-	public ITxGenerator getGenerator();
+	public IWaveform getGenerator();
 
 	/**
 	 * Gets the begin time.
 	 *
 	 * @return the begin time
 	 */
-	public Long getBeginTime();
+	public long getBeginTime();
 
 	/**
 	 * Gets the end time.
 	 *
 	 * @return the end time
 	 */
-	public Long getEndTime();
-
-	/**
-	 * Gets the concurrency index.
-	 *
-	 * @return the concurrency index
-	 */
-	public int getConcurrencyIndex();
+	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.
@@ -30,4 +30,12 @@ public interface ITxEvent extends IEvent {
 	 * @return the transaction
 	 */
 	public ITx getTransaction();
+
+	/**
+	 * Gets the concurrency index.
+	 *
+	 * @return the concurrency index
+	 */
+	public int getRowIndex();
+
 }

plugins/com.minres.scviewer.e4.application/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.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 kind="output" path="target/classes"/>

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

@@ -1,13 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

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="_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="_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="" 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>
-  <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>
+    <bindings xmi:id="_2-008EhnEeyp3vLifEzGbQ" elementId="com.minres.scviewer.e4.application.keybinding.help" keySequence="F1" command="_lqjIYEYEEeyPM8G0E2EYww"/>
   </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>
-  <bindingTables xmi:id="_mnMrUGVmEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.bindingtable.0" bindingContext="_iQ3kQGVmEeqSQM-A6dw9ig">
-    <bindings xmi:id="_n9yDwGVmEeqSQM-A6dw9ig" elementId="com.minres.scviewer.e4.application.keybinding.0" keySequence="M1+A" command="_bV-TMHXHEeWwZ-9vrAR2UQ">
+    <bindings xmi:id="_QcOn8EheEeyp3vLifEzGbQ" elementId="com.minres.scviewer.e4.application.keybinding.1" keySequence="M1+A" command="_bV-TMHXHEeWwZ-9vrAR2UQ"/>
+    <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>
+    <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="_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="_95PfunNmEeWBq8z1Dv39LA" elementId="org.eclipse.ui.contexts.window" name="In Windows"/>
     <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.11.1.qualifier
+Bundle-Version: 2.15.0
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.11.1",
@@ -36,7 +36,8 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.equinox.p2.engine;bundle-version="2.6.600",
  org.eclipse.equinox.p2.operations;bundle-version="2.5.700",
  org.eclipse.equinox.p2.metadata.repository;bundle-version="1.3.400"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+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

@@ -3,12 +3,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.e4.application</artifactId>
-	<version>2.11.1-SNAPSHOT</version>
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.11.1-SNAPSHOT</version>
+		<version>2.15.0</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

@@ -29,21 +29,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){
-		Object sel = selectionService.getSelection();
-		if( sel instanceof IStructuredSelection) {
-			Object o= ((IStructuredSelection)sel).getFirstElement();
-			return o instanceof IWaveform || o instanceof ITx || o instanceof TrackEntry;
+	public Boolean canExecute(EPartService partService){
+		MPart part = partService.getActivePart();
+		if(part.getObject() instanceof WaveformViewer){
+			Object sel = ((WaveformViewer)part.getObject()).getSelection();
+			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) {
-//		String param="next";
+		//	public void execute(EPartService partService) {
+		//		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);
-		if(designBrowser!=null){
-			designBrowser.selectAllWaveforms();
-		}
+		MPart part = partService.getActivePart();
+		if(part.getObject() instanceof WaveformViewer)
+			((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;
-	}	
-
 }