Fixed compile warnings and performance bottlenecks in drawing

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

@@ -26,6 +26,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<groupId>com.minres.scviewer</groupId>
+	</project>
-	<version>1.0.0-SNAPSHOT</version>
-</project>

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

@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
+	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

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

@@ -38,6 +38,4 @@
 			</plugin>
 	</plugins>
 	</build>
-	<groupId>com.minres.scviewer</groupId>
+	</project>
-	<version>1.0.0-SNAPSHOT</version>
-</project>

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

@@ -1,7 +1,101 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+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.7
 org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+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.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+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.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+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.source=1.7

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

@@ -37,16 +37,13 @@ public class RulerPainter implements IPainter {
         String unit=waveCanvas.getUnitStr();
         int unitMultiplier=waveCanvas.getUnitMultiplier();
         long scaleFactor=waveCanvas.getScaleFactor();
-        long zoomLevel = waveCanvas.getZoomLevel();
+//        long zoomLevel = waveCanvas.getZoomLevel();
         long start=area.x*scaleFactor;
         long end=start+area.width*scaleFactor;
 
         long rulerTickMinor = rulerTickMinorC*scaleFactor;
         long rulerTickMajor = rulerTickMajorC*scaleFactor;
-        if(zoomLevel%3==1){
+
-        	rulerTickMinor/=3;
-        	rulerTickMajor/=3;
-        }
         int minorTickY = waveCanvas.rulerHeight-5;
         int majorTickY = waveCanvas.rulerHeight-15;
         int textY=waveCanvas.rulerHeight-20;

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

@@ -13,9 +13,13 @@ package com.minres.scviewer.database.swt.internal;
 import java.util.Map.Entry;
 import java.util.NavigableMap;
 
+import javax.swing.JPanel;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 
 import com.minres.scviewer.database.ISignal;
@@ -26,117 +30,232 @@ import com.minres.scviewer.database.ui.TrackEntry;
 import com.minres.scviewer.database.ui.WaveformColors;
 
 public class SignalPainter extends TrackPainter {
+	private class SignalChange {
+		long time;
+		ISignalChange value;
+		boolean fromMap;
+
+		public SignalChange(Entry<Long, ? extends ISignalChange> entry) {
+			time = entry.getKey();
+			value = entry.getValue();
+			fromMap = true;
+		}
+
+		public void set(Entry<Long, ? extends ISignalChange> entry, Long actTime) {
+			if (entry != null) {
+				time = entry.getKey();
+				value = entry.getValue();
+				fromMap = true;
+			} else {
+				time = actTime;
+				fromMap = false;
+			}
+		}
+
+		public void assign(SignalChange other) {
+			time = other.time;
+			value = other.value;
+			fromMap = other.fromMap;
+		}
+	}
 
 	/**
 	 * 
 	 */
+	private static final JPanel DUMMY_PANEL = new JPanel();
+
 	private final WaveformCanvas waveCanvas;
 	private ISignal<? extends ISignalChange> signal;
 
+	int yOffsetT;
+	int yOffsetM;
+	int yOffsetB;
+	int maxX;
+
 	public SignalPainter(WaveformCanvas txDisplay, boolean even, TrackEntry trackEntry) {
 		super(trackEntry, even);
 		this.waveCanvas = txDisplay;
-		this.signal=trackEntry.getSignal();
+		this.signal = trackEntry.getSignal();
+	}
+
+	private int getXEnd(long time) {
+		long ltmp = time / this.waveCanvas.getScaleFactor();
+		return ltmp > maxX ? maxX : (int) ltmp;
 	}
 
 	public void paintArea(GC gc, Rectangle area) {
-		if(trackEntry.selected)
+		if (trackEntry.selected)
 			gc.setBackground(this.waveCanvas.colors[WaveformColors.TRACK_BG_HIGHLITE.ordinal()]);
 		else
-			gc.setBackground(this.waveCanvas.colors[even?WaveformColors.TRACK_BG_EVEN.ordinal():WaveformColors.TRACK_BG_ODD.ordinal()]);
+			gc.setBackground(this.waveCanvas.colors[even ? WaveformColors.TRACK_BG_EVEN.ordinal() : WaveformColors.TRACK_BG_ODD.ordinal()]);
 		gc.setFillRule(SWT.FILL_EVEN_ODD);
 		gc.fillRectangle(area);
-		Entry<Long, ? extends ISignalChange> firstChange=signal.getEvents().floorEntry(area.x*this.waveCanvas.getScaleFactor());
+		long beginTime = area.x * this.waveCanvas.getScaleFactor();
-		Entry<Long, ? extends ISignalChange> lastTx=signal.getEvents().ceilingEntry((area.x+area.width)*this.waveCanvas.getScaleFactor());
+		long endTime = (area.x + area.width) * this.waveCanvas.getScaleFactor();
-		if(firstChange==null){
+		Entry<Long, ? extends ISignalChange> first = signal.getEvents().floorEntry(beginTime);
-			if(lastTx==null) return;
+		Entry<Long, ? extends ISignalChange> last = signal.getEvents().floorEntry(endTime);
-			firstChange = signal.getEvents().firstEntry();
+		if (first == null) {
-		} else if(lastTx==null){
+			if (last == null)
-			lastTx=signal.getEvents().lastEntry();
+				return;
+			first = signal.getEvents().firstEntry();
+		} else if (last == null) {
+			last = signal.getEvents().lastEntry();
 		}
 		gc.setForeground(this.waveCanvas.colors[WaveformColors.LINE.ordinal()]);
 		gc.setLineStyle(SWT.LINE_SOLID);
 		gc.setLineWidth(1);
-		Entry<Long, ? extends ISignalChange> left=firstChange;
+		NavigableMap<Long, ? extends ISignalChange> entries = signal.getEvents().subMap(first.getKey(), false, last.getKey(), true);
-		if(left.getValue() instanceof ISignalChangeSingle){
+		SignalChange left = new SignalChange(first);
-			NavigableMap<Long, ? extends ISignalChange> entries=signal.getEvents().subMap(firstChange.getKey(), false, lastTx.getKey(), true);
+		SignalChange right = new SignalChange(entries.size() > 0 ? entries.firstEntry() : first);
-			for(Entry<Long, ? extends ISignalChange> right:entries.entrySet()){
+		SignalStencil stencil = left.value instanceof ISignalChangeSingle ? new SingleBitStencil() : new MultiBitStencil(gc);
-			    int xEnd= (int)(right.getKey()/this.waveCanvas.getScaleFactor());
+
-			    int xBegin= (int)(left.getKey()/this.waveCanvas.getScaleFactor());
+		maxX = area.x + area.width;
-			    if(xEnd>xBegin){
+		yOffsetT = this.waveCanvas.getTrackHeight() / 5 + area.y;
-			        int yOffset = this.waveCanvas.getTrackHeight()/2;
+		yOffsetM = this.waveCanvas.getTrackHeight() / 2 + area.y;
-			        Color color = this.waveCanvas.colors[WaveformColors.SIGNALX.ordinal()];
+		yOffsetB = 4 * this.waveCanvas.getTrackHeight() / 5 + area.y;
-			        switch(((ISignalChangeSingle) left.getValue()).getValue()){
+		int xBegin = Math.max(area.x, (int) (left.time / this.waveCanvas.getScaleFactor()));
-			        case '1':
+		int xEnd = Math.max(area.x, getXEnd(right.time));
-			            color=this.waveCanvas.colors[WaveformColors.SIGNAL1.ordinal()];
+		boolean multiple = false;
-			            yOffset = this.waveCanvas.getTrackHeight()/5;
+		if (xEnd == xBegin) {
-			            break;
+			// this can trigger if
-			        case '0':
+			// a) left == right
-			            color=this.waveCanvas.colors[WaveformColors.SIGNAL0.ordinal()];
+			// b) left to close to right
-			            yOffset = 4*this.waveCanvas.getTrackHeight()/5;
+			if (left.time == right.time) {
-			            break;
+				right.time = endTime;
-			        case 'Z':
+
-			            color=this.waveCanvas.colors[WaveformColors.SIGNALZ.ordinal()];
+			} else {
-			            break;
+				multiple = true;
-			        default:	
+				long eTime = (xBegin + 1) * this.waveCanvas.getScaleFactor();
+				right.set(entries.floorEntry(eTime), endTime);
+				right.time = eTime;
 			}
-			        yOffset+=area.y;
+			xEnd = getXEnd(right.time);
-			        gc.setForeground(color);
+		}
-			        gc.drawLine(xBegin, yOffset, xEnd, yOffset);
+
-			        int yNext =  this.waveCanvas.getTrackHeight()/2;
+		do {
-			        switch(((ISignalChangeSingle) right.getValue()).getValue()){
+			stencil.draw(gc, area, left.value, right.value, xBegin, xEnd, multiple);
-			        case '1':
+			if (right.time >= endTime)
-			            yNext = this.waveCanvas.getTrackHeight()/5+area.y;
 				break;
-			        case '0':
+			left.assign(right);
-			            yNext = 4*this.waveCanvas.getTrackHeight()/5+area.y;
+			xBegin = xEnd;
-			            break;
+			right.set(entries.higherEntry(left.time), endTime);
-			        default:	
+			xEnd = getXEnd(right.time);
+			multiple = false;
+			if (xEnd == xBegin) {
+				multiple = true;
+				long eTime = (xBegin + 1) * this.waveCanvas.getScaleFactor();
+				right.set(entries.floorEntry(eTime), endTime);
+				xEnd = getXEnd(eTime);
 			}
-			        gc.drawLine(xEnd, yOffset, xEnd, yNext);
+		} while (left.time < endTime);
 	}
-			    left=right;
+
+	private interface SignalStencil {
+
+		public void draw(GC gc, Rectangle area, ISignalChange left, ISignalChange right, int xBegin, int xEnd, boolean multiple);
 	}
-		} else if(left.getValue() instanceof ISignalChangeMulti){
+
-			NavigableMap<Long,? extends ISignalChange> entries=signal.getEvents().subMap(firstChange.getKey(), false, lastTx.getKey(), true);
+	private class MultiBitStencil implements SignalStencil {
-			for(Entry<Long, ? extends ISignalChange> right:entries.entrySet()){
+
-				int yOffsetT = this.waveCanvas.getTrackHeight()/5+area.y;
+		private java.awt.Font tmpAwtFont;
-				int yOffsetM = this.waveCanvas.getTrackHeight()/2+area.y;
+		private int height;
-				int yOffsetB = 4*this.waveCanvas.getTrackHeight()/5+area.y;
+
-				Color colorBorder = this.waveCanvas.colors[WaveformColors.SIGNAL0.ordinal()];
+		public MultiBitStencil(GC gc) {
-				ISignalChangeMulti last = (ISignalChangeMulti) left.getValue();
+			FontData fd = gc.getFont().getFontData()[0];
-				if(last.getValue().toString().contains("X")){
+			height = gc.getDevice().getDPI().y * fd.getHeight() / 72;
-					colorBorder=this.waveCanvas.colors[WaveformColors.SIGNALX.ordinal()];
+			tmpAwtFont = new java.awt.Font(fd.getName(), fd.getStyle(), height);
-				}else if(last.getValue().toString().contains("Z")){
-					colorBorder=this.waveCanvas.colors[WaveformColors.SIGNALZ.ordinal()];
 		}
-				int beginTime= (int)(left.getKey()/this.waveCanvas.getScaleFactor());
+
-				int endTime= (int)(right.getKey()/this.waveCanvas.getScaleFactor());
+		public void draw(GC gc, Rectangle area, ISignalChange left, ISignalChange right, int xBegin, int xEnd, boolean multiple) {
+			Color colorBorder = waveCanvas.colors[WaveformColors.SIGNAL0.ordinal()];
+			ISignalChangeMulti last = (ISignalChangeMulti) left;
+			if (last.getValue().toString().contains("X")) {
+				colorBorder = waveCanvas.colors[WaveformColors.SIGNALX.ordinal()];
+			} else if (last.getValue().toString().contains("Z")) {
+				colorBorder = waveCanvas.colors[WaveformColors.SIGNALZ.ordinal()];
+			}
+			int width = xEnd - xBegin;
+			if (width > 1) {
 				int[] points = { 
-						beginTime,yOffsetM, 
+						xBegin,     yOffsetM, 
-						beginTime+1,yOffsetT, 
+						xBegin + 1, yOffsetT, 
-						endTime-1,yOffsetT, 
+						xEnd - 1,   yOffsetT, 
-						endTime,yOffsetM, 
+						xEnd,       yOffsetM, 
-						endTime-1,yOffsetB, 
+						xEnd - 1,   yOffsetB, 
-						beginTime+1,yOffsetB
+						xBegin + 1, yOffsetB
 				};
 				gc.setForeground(colorBorder);
 				gc.drawPolygon(points);
-				gc.setForeground(this.waveCanvas.colors[WaveformColors.SIGNAL_TEXT.ordinal()]);
+				gc.setForeground(waveCanvas.colors[WaveformColors.SIGNAL_TEXT.ordinal()]);
-				int size = gc.getDevice().getDPI().y * gc.getFont().getFontData()[0].getHeight()/72;
+				String label = "h'" + last.getValue().toHexString();
-				if(beginTime<area.x) beginTime=area.x;
+				Point bb = getBoxWidth(gc, label);
-				int width=endTime-beginTime;
+				if (xBegin < area.x) {
-				if(width>6) {
+					xBegin = area.x;
+					width = xEnd - xBegin;
+				}
+				if (width > (bb.x+1)) {
 					Rectangle old = gc.getClipping();
-					gc.setClipping(beginTime+3, yOffsetT, endTime-beginTime-5, yOffsetB-yOffsetT);
+					gc.setClipping(xBegin + 3, yOffsetT, xEnd - xBegin - 5, yOffsetB - yOffsetT);
-					gc.drawText("h'"+last.getValue().toHexString(), beginTime+3, yOffsetM-size/2-1);
+					gc.drawText(label, xBegin + 3, yOffsetM - bb.y / 2 - 1);
 					gc.setClipping(old);
 				}
-				left=right;
+			} else {
+				gc.setForeground(colorBorder);
+				gc.drawLine(xEnd, yOffsetT, xEnd, yOffsetB);
+			}
+		}
+
+		private Point getBoxWidth(GC gc, String label) {
+			return new Point(DUMMY_PANEL.getFontMetrics(tmpAwtFont).stringWidth(label), height);
+		}
+
+	}
+
+	private class SingleBitStencil implements SignalStencil {
+		public void draw(GC gc, Rectangle area, ISignalChange left, ISignalChange right, int xBegin, int xEnd, boolean multiple) {
+			if (multiple) {
+				gc.setForeground(waveCanvas.colors[WaveformColors.SIGNALU.ordinal()]);
+				gc.drawLine(xBegin, yOffsetT, xBegin, yOffsetB);
+				gc.drawLine(xEnd, yOffsetT, xEnd, yOffsetB);
+			} else {
+				Color color = waveCanvas.colors[WaveformColors.SIGNALX.ordinal()];
+				int yOffset = yOffsetM;
+				switch (((ISignalChangeSingle) left).getValue()) {
+				case '1':
+					color = waveCanvas.colors[WaveformColors.SIGNAL1.ordinal()];
+					yOffset = yOffsetT;
+					break;
+				case '0':
+					color = waveCanvas.colors[WaveformColors.SIGNAL0.ordinal()];
+					yOffset = yOffsetB;
+					break;
+				case 'Z':
+					color = waveCanvas.colors[WaveformColors.SIGNALZ.ordinal()];
+					break;
+				default:
+				}
+				gc.setForeground(color);
+				if (xEnd > maxX) {
+					gc.drawLine(xBegin, yOffset, maxX, yOffset);
+				} else {
+					gc.drawLine(xBegin, yOffset, xEnd, yOffset);
+					int yNext = yOffsetM;
+					switch (((ISignalChangeSingle) right).getValue()) {
+					case '1':
+						yNext = yOffsetT;
+						break;
+					case '0':
+						yNext = yOffsetB;
+						break;
+					default:
+					}
+					if (yOffset != yNext)
+						gc.drawLine(xEnd, yOffset, xEnd, yNext);
 				}
 			}
 		}
 
+	}
 
 	public ISignal<? extends ISignalChange> getSignal() {
 		return signal;

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

@@ -153,8 +153,9 @@ public class WaveformCanvas extends Canvas {
             colors[WaveformColors.TX_BORDER.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_RED);
             colors[WaveformColors.SIGNAL0.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_DARK_GREEN);
             colors[WaveformColors.SIGNAL1.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_DARK_GREEN);
-            colors[WaveformColors.SIGNALZ.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_GRAY);
+            colors[WaveformColors.SIGNALZ.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_DARK_YELLOW);
-            colors[WaveformColors.SIGNALX.ordinal()] = SWTResourceManager.getColor(255,  128,  182);
+            colors[WaveformColors.SIGNALX.ordinal()] = SWTResourceManager.getColor(255,  51,  51);
+            colors[WaveformColors.SIGNALU.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_YELLOW);
             colors[WaveformColors.SIGNAL_TEXT.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_WHITE);
             colors[WaveformColors.CURSOR.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_RED);
             colors[WaveformColors.CURSOR_DRAG.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_GRAY);

com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformViewer.java

@@ -724,11 +724,13 @@ public class WaveformViewer implements IWaveformViewer  {
 	public void moveCursor(GotoDirection direction) {
 		long time = getCursorTime();
 		NavigableMap<Long, ?> map=null;
+		if(currentWaveformSelection!=null) {
 			if(currentWaveformSelection.isStream()){
 				map=currentWaveformSelection.getStream().getEvents();
 			} else if(currentWaveformSelection.isSignal()){
 				map=currentWaveformSelection.getSignal().getEvents();
 			}
+		}
 		if(map!=null){
 			Entry<Long, ?> entry=direction==GotoDirection.PREV?map.lowerEntry(time):map.higherEntry(time);
 			if(entry!=null) {

com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/WaveformColors.java

@@ -14,7 +14,7 @@ public enum WaveformColors {
     LINE, LINE_HIGHLITE, 
     TRACK_BG_EVEN, TRACK_BG_ODD, TRACK_BG_HIGHLITE, 
     TX_BG, TX_BG_HIGHLITE, TX_BORDER,
-    SIGNAL0, SIGNAL1, SIGNALZ, SIGNALX, SIGNAL_TEXT, 
+    SIGNAL0, SIGNAL1, SIGNALZ, SIGNALX, SIGNALU, SIGNAL_TEXT, 
     CURSOR, CURSOR_DRAG, CURSOR_TEXT,
     MARKER, MARKER_TEXT, REL_ARROW, REL_ARROW_HIGHLITE
 }

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

@@ -9,5 +9,4 @@
   </parent>
   <packaging>eclipse-plugin</packaging>
   <version>1.1.0-SNAPSHOT</version>
-  <groupId>com.minres.scviewer</groupId>
+  </project>
-</project>

com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java

@@ -36,7 +36,7 @@ import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.TreeViewerColumn;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlAdapter;
 import org.eclipse.swt.events.ControlEvent;
@@ -125,7 +125,7 @@ public class TransactionDetails {
 		treeViewer.setLabelProvider(new TxPropertiesLabelProvider());
 		treeViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		treeViewer.addFilter(attributeFilter);
-		treeViewer.setSorter(viewSorter);
+		treeViewer.setComparator(viewSorter);
 		treeViewer.setAutoExpandLevel(2);
 
 		// Set up the table
@@ -138,7 +138,7 @@ public class TransactionDetails {
 		col1.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(AttributeLabelProvider.NAME)));
 		col1.getColumn().addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent event) {
-				((TxAttributeViewerSorter) treeViewer.getSorter()).doSort(COLUMN_FIRST);
+				((TxAttributeViewerSorter) treeViewer.getComparator()).doSort(COLUMN_FIRST);
 				treeViewer.refresh();
 			}
 		});
@@ -149,7 +149,7 @@ public class TransactionDetails {
 		col2.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(AttributeLabelProvider.TYPE)));
 		col2.getColumn().addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent event) {
-				((TxAttributeViewerSorter) treeViewer.getSorter()).doSort(COLUMN_SECOND);
+				((TxAttributeViewerSorter) treeViewer.getComparator()).doSort(COLUMN_SECOND);
 				treeViewer.refresh();
 			}
 		});
@@ -160,7 +160,7 @@ public class TransactionDetails {
 		col3.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(AttributeLabelProvider.VALUE)));
 		col3.getColumn().addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent event) {
-				((TxAttributeViewerSorter) treeViewer.getSorter()).doSort(COLUMN_SECOND);
+				((TxAttributeViewerSorter) treeViewer.getComparator()).doSort(COLUMN_SECOND);
 				treeViewer.refresh();
 			}
 		});
@@ -290,7 +290,7 @@ public class TransactionDetails {
 	/**
 	 * The Class TxAttributeViewerSorter.
 	 */
-	class TxAttributeViewerSorter extends ViewerSorter {
+	class TxAttributeViewerSorter extends ViewerComparator {
 		
 		/** The Constant ASCENDING. */
 		private static final int ASCENDING = 0;
@@ -345,7 +345,7 @@ public class TransactionDetails {
 					rc = getComparator().compare(p1.getDataType().name(), p2.getDataType().name());
 					break;
 				case COLUMN_THIRD:
-					rc = getComparator().compare(p1.getValue(), p2.getValue());
+					rc = getComparator().compare(p1.getValue().toString(), p2.getValue().toString());
 					break;
 				}
 				// If descending order, flip the direction

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

@@ -14,7 +14,6 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -22,7 +21,6 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

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

@@ -43,8 +43,9 @@ public class DefaultValuesInitializer extends AbstractPreferenceInitializer {
         colors[WaveformColors.TX_BORDER.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_RED);
         colors[WaveformColors.SIGNAL0.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_DARK_GREEN);
         colors[WaveformColors.SIGNAL1.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_DARK_GREEN);
-        colors[WaveformColors.SIGNALZ.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_GRAY);
+        colors[WaveformColors.SIGNALZ.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_YELLOW);
-        colors[WaveformColors.SIGNALX.ordinal()] = SWTResourceManager.getColor(255,  128,  182);
+        colors[WaveformColors.SIGNALX.ordinal()] = SWTResourceManager.getColor(255,  51,  51);
+        colors[WaveformColors.SIGNALU.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_DARK_YELLOW);
         colors[WaveformColors.SIGNAL_TEXT.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_WHITE);
         colors[WaveformColors.CURSOR.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_RED);
         colors[WaveformColors.CURSOR_DRAG.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_GRAY);

com.minres.scviewer.e4.product/SCViewer (restart).launch

@@ -16,13 +16,13 @@
 <stringAttribute key="location" value="${workspace_loc}/../runtime-com.minres.scviewer.e4.application.product"/>
 <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.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -clearPersistedState -data @none"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx4G -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="com.minres.scviewer.e4.application.product"/>
 <stringAttribute key="productFile" value="/com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.product"/>
-<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.codehaus.groovy@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.text@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.codehaus.groovy@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.text@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
 <stringAttribute key="selected_workspace_plugins" value="com.minres.scviewer.database.sqlite@default:default,com.minres.scviewer.database.text@default:default,com.minres.scviewer.database.ui.swt@default:default,com.minres.scviewer.database.ui@default:default,com.minres.scviewer.database.vcd@default:default,com.minres.scviewer.database@default:default,com.minres.scviewer.e4.application@default:default,com.opcoach.e4.preferences@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>

com.minres.scviewer.feature/pom.xml

@@ -8,6 +8,4 @@
   	<version>1.0.0-SNAPSHOT</version>
   	<relativePath>../com.minres.scviewer.parent</relativePath>
   </parent>
-  <groupId>com.minres.scviewer</groupId>
+  </project>
-  <version>1.0.0-SNAPSHOT</version>
-</project>

com.minres.scviewer.target/mars.target

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Mars Platform" sequenceNumber="130">
+<?pde version="3.8"?><target name="Mars Platform" sequenceNumber="135">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rcp.sdk.id" version="4.5.1.M20150904-0015"/>
 <unit id="org.eclipse.equinox.executable.feature.group" version="3.6.200.v20150602-1417"/>
+<unit id="org.eclipse.platform.sdk" version="4.5.2.M20160212-1500"/>
+<unit id="org.eclipse.rcp.sdk.id" version="4.5.2.M20160212-1500"/>
 <unit id="org.eclipse.rcptt.core.feature.group" version="2.0.1.201508201020"/>
-<unit id="org.eclipse.platform.sdk" version="4.5.1.M20150904-0015"/>
 <repository location="http://download.eclipse.org/releases/mars"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.codehaus.groovy24.feature.feature.group" version="2.9.2.xx-201508121448-e45"/>
+<unit id="org.codehaus.groovy24.feature.feature.group" version="2.9.2.xx-201701202248-e45"/>
 <repository location="http://dist.springsource.org/snapshot/GRECLIPSE/e4.5"/>
 </location>
 </locations>

com.minres.scviewer.target/pom.xml

@@ -16,6 +16,4 @@
   	<relativePath>../com.minres.scviewer.parent</relativePath>
   </parent>
 
-  <groupId>com.minres.scviewer</groupId>
+  </project>
-  <version>1.0.0-SNAPSHOT</version>
-</project>

com.minres.scviewer.ui/.classpath

@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

com.minres.scviewer.ui/pom.xml

@@ -8,6 +8,4 @@
   	<relativePath>../com.minres.scviewer.parent</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>
-  <groupId>com.minres.scviewer</groupId>
+  </project>
-  <version>1.0.0-SNAPSHOT</version>
-</project>