diff --git a/com.minres.scviewer.database.sqlite/pom.xml b/com.minres.scviewer.database.sqlite/pom.xml
index 7c1250c..e7c3d17 100644
--- a/com.minres.scviewer.database.sqlite/pom.xml
+++ b/com.minres.scviewer.database.sqlite/pom.xml
@@ -4,7 +4,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 1.0.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
../com.minres.scviewer.parent
eclipse-plugin
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java b/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java
index 98eba3e..74a7622 100644
--- a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java
+++ b/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java
@@ -117,6 +117,7 @@ public class TxStream extends HierNode implements ITxStream {
sb.append(scvStream.getId());
resultSet = statement.executeQuery(sb.toString());
while (resultSet.next()) {
+ if(maxConcurrency==null) maxConcurrency=0;
Object value = resultSet.getObject("concurrencyLevel");
if(value!=null)
maxConcurrency=(Integer) value;
diff --git a/com.minres.scviewer.database.test/pom.xml b/com.minres.scviewer.database.test/pom.xml
index fad1edf..977912e 100644
--- a/com.minres.scviewer.database.test/pom.xml
+++ b/com.minres.scviewer.database.test/pom.xml
@@ -5,7 +5,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 1.0.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
../com.minres.scviewer.parent
eclipse-test-plugin
diff --git a/com.minres.scviewer.database.text/pom.xml b/com.minres.scviewer.database.text/pom.xml
index 5f4fe8f..94123fe 100644
--- a/com.minres.scviewer.database.text/pom.xml
+++ b/com.minres.scviewer.database.text/pom.xml
@@ -5,7 +5,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 1.0.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
../com.minres.scviewer.parent
eclipse-plugin
diff --git a/com.minres.scviewer.database.ui.swt/pom.xml b/com.minres.scviewer.database.ui.swt/pom.xml
index 6b6a315..de49454 100644
--- a/com.minres.scviewer.database.ui.swt/pom.xml
+++ b/com.minres.scviewer.database.ui.swt/pom.xml
@@ -6,7 +6,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 1.0.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
../com.minres.scviewer.parent
\ No newline at end of file
diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/Constants.java b/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/Constants.java
new file mode 100644
index 0000000..679fc92
--- /dev/null
+++ b/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/Constants.java
@@ -0,0 +1,9 @@
+package com.minres.scviewer.database.swt;
+
+public class Constants {
+
+ public final static String[] unitString={"fs", "ps", "ns", "us", "ms"};//, "s"};
+
+ public final static int[] unitMultiplier={1, 3, 10, 30, 100, 300};
+
+}
diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java b/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java
index 430e5b7..2845258 100644
--- a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java
+++ b/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java
@@ -41,6 +41,7 @@ import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.IWaveformEvent;
import com.minres.scviewer.database.RelationType;
+import com.minres.scviewer.database.swt.Constants;
import com.minres.scviewer.database.ui.IWaveformViewer;
import com.minres.scviewer.database.ui.TrackEntry;
import com.minres.scviewer.database.ui.WaveformColors;
@@ -56,11 +57,7 @@ public class WaveformCanvas extends Canvas {
String unit="ns";
private int level = 12;
-
- public final static String[] unitString={"fs", "ps", "ns", "us", "ms"};//, "s"};
-
- public final static int[] unitMultiplier={1, 3, 10, 30, 100, 300};
-
+
private long maxTime;
protected Point origin; /* original size */
@@ -225,12 +222,12 @@ public class WaveformCanvas extends Canvas {
}
public int getMaxZoomLevel(){
- return unitMultiplier.length*unitString.length-1;
+ return Constants.unitMultiplier.length*Constants.unitString.length-1;
}
public void setZoomLevel(int level) {
long oldScaleFactor=scaleFactor;
- if(level 1) {
diff --git a/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDSignal.java b/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDSignal.java
index b297534..3620c57 100644
--- a/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDSignal.java
+++ b/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDSignal.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package com.minres.scviewer.database.vcd;
+import java.util.Map.Entry;
import java.util.NavigableMap;
import java.util.TreeMap;
@@ -106,7 +107,11 @@ public class VCDSignal extends HierNode implements ISig
@Override
public T getWaveformEventsBeforeTime(Long time) {
- return values.floorEntry(time).getValue();
+ Entry e = values.floorEntry(time);
+ if(e==null)
+ return null;
+ else
+ return values.floorEntry(time).getValue();
}
@Override
diff --git a/com.minres.scviewer.database/pom.xml b/com.minres.scviewer.database/pom.xml
index 48149fe..b91d796 100644
--- a/com.minres.scviewer.database/pom.xml
+++ b/com.minres.scviewer.database/pom.xml
@@ -4,7 +4,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 1.0.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
../com.minres.scviewer.parent
eclipse-plugin
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
index 707989f..2b4e79f 100644
--- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
+++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
@@ -64,10 +64,13 @@ public class E4LifeCycle {
@PostContextCreate
void postContextCreate(IApplicationContext appContext, final IEventBroker eventBroker) {
final String[] args = (String[])appContext.getArguments().get(IApplicationContext.APPLICATION_ARGS);
- Options opt = new Options(args, 1);
- opt.getSet().addOption("c", Separator.BLANK, Multiplicity.ONCE);
- if (!opt.check(Options.DEFAULT_SET, true, true)) {
- System.exit(1);
+ Options opt = new Options(args, 0);
+ opt.getSet()
+ .addOption("clearPersistedState", Multiplicity.ZERO_OR_ONE)
+ .addOption("c", Separator.BLANK, Multiplicity.ZERO_OR_ONE);
+ if (!opt.check(Options.DEFAULT_SET, true, false)) {
+ System.err.println(opt.getCheckErrors());
+ System.exit(1);
}
final String confFile =opt.getSet().isSet("c")?opt.getSet().getOption("c").getResultValue(0):"";
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/OpenHandler.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/OpenHandler.java
index d9396f8..df60b5d 100644
--- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/OpenHandler.java
+++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/OpenHandler.java
@@ -30,31 +30,20 @@ public class OpenHandler {
@Execute
public void execute(Shell shell, MApplication app, EModelService modelService, EPartService partService){
FileDialog dialog = new FileDialog(shell, SWT.OPEN | SWT.MULTI);
-// dialog.setFilterExtensions (new String []{"vcd", "txdb", "txlog"});
dialog.setFilterExtensions (new String []{Messages.OpenHandler_0});
dialog.open();
String path = dialog.getFilterPath();
for(String fileName: dialog.getFileNames()){
File file = new File(path+File.separator+fileName);
if(file.exists()){
-// MPart part = MBasicFactory.INSTANCE.createPart();
-// part.setLabel(fileName);
-// part.setContributionURI("bundleclass://com.minres.scviewer.e4.application/"+ WaveformViewerPart.class.getName());
MPart part = partService .createPart("com.minres.scviewer.e4.application.partdescriptor.waveformviewer"); //$NON-NLS-1$
part.setLabel(file.getName());
-
-
MPartStack partStack = (MPartStack)modelService.find("org.eclipse.editorss", app); //$NON-NLS-1$
partStack.getChildren().add(part);
partService.showPart(part, PartState.ACTIVATE);
-// Object o = part.getObject();
-// if(o instanceof WaveformViewerPart)
-// ((WaveformViewerPart)o).setPartInput(file);
IEclipseContext ctx=part.getContext();
ctx.modify("input", file); //$NON-NLS-1$
- ctx.declareModifiable("input"); //$NON-NLS-1$
-
-
+ ctx.modify("config", ""); //$NON-NLS-1$
}
}
}
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
index 36061ab..06cb2d3 100644
--- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
+++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
@@ -75,6 +75,7 @@ import com.minres.scviewer.database.IWaveformDb;
import com.minres.scviewer.database.IWaveformDbFactory;
import com.minres.scviewer.database.IWaveformEvent;
import com.minres.scviewer.database.RelationType;
+import com.minres.scviewer.database.swt.Constants;
import com.minres.scviewer.database.swt.WaveformViewerFactory;
import com.minres.scviewer.database.ui.GotoDirection;
import com.minres.scviewer.database.ui.ICursor;
@@ -865,12 +866,6 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
updateAll();
}
- //FIXME: need to use unitString and unitMultiplier from class WaveformCanvas which is located in >com.minres.scviewer.database.swt.internal.
- //Trying to import com.minres.scviewer.database.swt.internal.WaveformCanvas results in the error:
- //'Access restriction: The type 'WaveformCanvas' is not API (restriction on required project 'com.minres.scviewer.database.ui.swt')'.
- public final static String[] unitString={"fs", "ps", "ns", "�s", "ms"};//, "s"};
- public final static int[] unitMultiplier={1, 3, 10, 30, 100, 300};
-
/**
* Sets the zoom fit.
*/
@@ -882,15 +877,10 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
//get area actually capable of displaying data, i.e. area of the receiver which is capable of displaying data
Rectangle clientArea = myParent.getClientArea();
long clientAreaWidth = clientArea.width;
-
- //System.out.println("ZoomLevel[] Array (Length " + zoomLevel.length + "): " + Arrays.toString(zoomLevel));
- //System.out.println("ClientArea myParent: " + myParent.getClientArea());
- //System.out.println("MaxTime: " + maxTime);
- //System.out.println("clientAreaWidth: " + clientAreaWidth);
-
+
boolean foundZoom=false;
//try to find existing zoomlevel where scaleFactor*clientAreaWidth >= maxTime, if one is found set it as new zoomlevel
- for (int level=0; level= maxTime) {
@@ -900,7 +890,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
}
}
//if no zoom level is found, set biggest one available
- if(!foundZoom) setZoomLevel(unitMultiplier.length*unitString.length-1);
+ if(!foundZoom) setZoomLevel(Constants.unitMultiplier.length*Constants.unitString.length-1);
updateAll();
}
diff --git a/com.minres.scviewer.e4.product/scviewer.product b/com.minres.scviewer.e4.product/scviewer.product
index 615d49f..3031c32 100644
--- a/com.minres.scviewer.e4.product/scviewer.product
+++ b/com.minres.scviewer.e4.product/scviewer.product
@@ -34,6 +34,9 @@
+ org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8
+ org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8
+ org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8
@@ -71,6 +74,7 @@
+
@@ -92,6 +96,7 @@
+
@@ -120,6 +125,7 @@
+
diff --git a/com.minres.scviewer.feature/pom.xml b/com.minres.scviewer.feature/pom.xml
index a67671a..323a625 100644
--- a/com.minres.scviewer.feature/pom.xml
+++ b/com.minres.scviewer.feature/pom.xml
@@ -5,7 +5,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 1.0.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
../com.minres.scviewer.parent
\ No newline at end of file
diff --git a/com.minres.scviewer.target/pom.xml b/com.minres.scviewer.target/pom.xml
index 2e5538b..75a143f 100644
--- a/com.minres.scviewer.target/pom.xml
+++ b/com.minres.scviewer.target/pom.xml
@@ -12,7 +12,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 1.0.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
../com.minres.scviewer.parent
diff --git a/com.minres.scviewer.ui/pom.xml b/com.minres.scviewer.ui/pom.xml
index 11f1e01..7552419 100644
--- a/com.minres.scviewer.ui/pom.xml
+++ b/com.minres.scviewer.ui/pom.xml
@@ -4,7 +4,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 1.0.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
../com.minres.scviewer.parent
eclipse-plugin
diff --git a/com.minres.scviewer.updateSite/pom.xml b/com.minres.scviewer.updateSite/pom.xml
index eb71dbd..b3a3c1e 100644
--- a/com.minres.scviewer.updateSite/pom.xml
+++ b/com.minres.scviewer.updateSite/pom.xml
@@ -6,7 +6,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 1.0.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
../com.minres.scviewer.parent