- fixed scrolling sync issue

- fixed duplicate db entries
This commit is contained in:
ejentzsx
2015-02-04 16:20:59 +01:00
parent 310c9bbb8f
commit ac942481e3
11 changed files with 849 additions and 844 deletions

View File

@ -53,6 +53,7 @@ public class TextDbLoader implements IWaveformDbLoader{
@Override
boolean load(IWaveformDb db, File file) throws Exception {
this.db=db
this.streams=[]
FileInputStream fis = new FileInputStream(file)
byte[] buffer = new byte[x.size()]
def readCnt = fis.read(buffer, 0, x.size())

View File

@ -51,7 +51,11 @@ class Tx implements ITx {
@Override
public int compareTo(ITx o) {
return beginTime.compareTo(o.beginTime)
def res =beginTime.compareTo(o.beginTime)
if(res!=0)
return res
else
return id.compareTo(o.id)
}
}

View File

@ -8,12 +8,15 @@ class TxEvent implements ITxEvent {
final ITxEvent.Type type;
Tx transaction;
final Tx transaction;
final Long time
TxEvent(ITxEvent.Type type, ITx transaction) {
super();
this.type = type;
this.transaction = transaction;
this.time = type==ITxEvent.Type.BEGIN?transaction.beginTime:transaction.endTime
}
@Override
@ -23,15 +26,11 @@ class TxEvent implements ITxEvent {
@Override
int compareTo(IWaveformEvent o) {
time.compareTo(o.getTime())
time.compareTo(o.time)
}
Long getTime(){
type==ITxEvent.Type.BEGIN?transaction.beginTime:transaction.endTime
}
@Override
@Override
String toString() {
type.toString()+"@"+getTime()+" of tx #"+transaction.id;
type.toString()+"@"+time+" of tx #"+transaction.id;
}
}

View File

@ -92,8 +92,10 @@ class TxStream extends HierNode implements ITxStream {
}
private putEvent(ITxEvent event){
if(!events.containsKey(event.time)) events.put(event.time, [])
events[event.time]<<event
if(!events.containsKey(event.time))
events.put(event.time, [event])
else
events[event.time]<<event
}
@Override