Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ protected List<Pulse> getPulses(int n, IndexedTable it, DataBank wfBank) {
short[] samples = new short[n];
for (int i=0; i<wfBank.rows(); ++i) {
for (int j=0; j<n; ++j)
samples[j] = wfBank.getShort(String.format("s%d",j+1), i);
samples[j] = wfBank.getShort(j+5, i);
long timestamp = wfBank.getLong("timestamp",i);
int time = wfBank.getInt("time",i);
List<Pulse> p = it==null ? extract(null, i, timestamp, time, samples) :
Expand All @@ -146,7 +146,7 @@ protected List<Pulse> getPulses(int n, IndexedTable it, Bank wfBank) {
short[] samples = new short[n];
for (int i=0; i<wfBank.getRows(); ++i) {
for (int j=0; j<n; ++j)
samples[j] = wfBank.getShort(String.format("s%d",j+1), i);
samples[j] = wfBank.getShort(j+5, i);
// FIXME: Can speed this up (but looks like not for DataBank?):
//samples[j] = wfBank.getShort(String.format(5+j,j+1), i);
int time = wfBank.getInt("time",i);
Expand Down