- fixed scrolling sync issue
- fixed duplicate db entries
This commit is contained in:
@ -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())
|
||||
|
@ -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)
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user