Tools/SCViewer
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added E4 product and Maven build

Browse Source
This commit is contained in:
Eyck Jentzsch
2015-10-22 22:12:18 +02:00
parent 780d4894ad
commit c8e98b3d60
39 changed files with 976 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
com.minres.scviewer.database/META-INF/MANIFEST.MF
View File

@ -10,5 +10,4 @@ Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/component.xml,OSGI-INF/component2.xml
Require-Bundle: org.eclipse.equinox.ds;bundle-version="1.4.200",
org.eclipse.equinox.util;bundle-version="1.0.500",
org.eclipse.osgi.services;bundle-version="3.4.0",
org.eclipse.wb.core.lib
org.eclipse.osgi.services;bundle-version="3.4.0"

2
com.minres.scviewer.database/pom.xml
View File

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

20
com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java
View File

@ -12,13 +12,14 @@ package com.minres.scviewer.database.internal;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import com.google.common.base.Joiner;
import com.minres.scviewer.database.HierNode;
import com.minres.scviewer.database.IHierNode;
import com.minres.scviewer.database.ISignal;
@ -136,7 +137,7 @@ public class WaveformDb extends HierNode implements IWaveformDb {
}
}
stream.setName(name);
stream.setParentName(Joiner.on(".").join(path));
stream.setParentName(join(path, "."));
node.getChildNodes().add(stream);
Collections.sort(node.getChildNodes());
node=stream;
@ -144,7 +145,7 @@ public class WaveformDb extends HierNode implements IWaveformDb {
if(n1 != null) {
node=n1;
} else {
HierNode newNode = new HierNode(name, Joiner.on(".").join(path));
HierNode newNode = new HierNode(name, join(path, "."));
node.getChildNodes().add(newNode);
Collections.sort(node.getChildNodes());
node=newNode;
@ -164,5 +165,16 @@ public class WaveformDb extends HierNode implements IWaveformDb {
if(last>maxTime)
maxTime=last;
}
private static String join(Collection<?> col, String delim) {
StringBuilder sb = new StringBuilder();
Iterator<?> iter = col.iterator();
if (iter.hasNext())
sb.append(iter.next().toString());
while (iter.hasNext()) {
sb.append(delim);
sb.append(iter.next().toString());
}
return sb.toString();
}
}