Skip to content

Commit d8130f8

Browse files
committed
cleaner display
1 parent 22770f6 commit d8130f8

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

src/methods/set_header.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function set_traceheader!(traceheaders::Array{BinaryTraceHeader,1},
1111
setfield!(traceheaders[t], name, x_typed[t])
1212
end
1313
catch e
14-
@warn "Unable to convert $x to $(ftype)"
14+
@warn "Unable to convert $(first(x)) to $(ftype) for header $(name)"
1515
throw(e)
1616
end
1717
end

src/types/BinaryFileHeader.jl

+5-2
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,14 @@ end
8181
fh_keys() = collect(keys(fh_byte2sample()))
8282

8383
function show(io::IO, bfh::BinaryFileHeader)
84-
84+
bf = fh_byte2sample()
8585
println("BinaryFileHeader:")
8686

8787
for field in fieldnames(BinaryFileHeader)
88-
s = @sprintf " %30s: %9d" String(field) getfield(bfh, field)
88+
byte = bf[String(field)] + 1
89+
next = byte + sizeof(getfield(bfh, field)) - 1
90+
sfield = "$(field) ($(byte)-$(next))"
91+
s = @sprintf " %40s: %9d" sfield getfield(bfh, field)
8992
println(s)
9093
end
9194
println("\n")

src/types/BinaryTraceHeader.jl

+5-1
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,14 @@ end
207207
Base.zeros(::Type{BinaryTraceHeader}, n::Integer) = [BinaryTraceHeader() for _=1:n]
208208

209209
function show(io::IO, bth::BinaryTraceHeader)
210+
th = th_byte2sample()
210211

211212
println("BinaryTraceHeader:")
212213
for field in fieldnames(BinaryTraceHeader)
213-
s = @sprintf " %30s: %9d" String(field) getfield(bth, field)
214+
byte = th[String(String(field))] + 1
215+
next = byte + sizeof(getfield(bth, field)) - 1
216+
sfield = "$(field) ($(byte)-$(next))"
217+
s = @sprintf " %40s: %9d" sfield getfield(bth, field)
214218
println(s)
215219
end
216220
println("\n")

0 commit comments

Comments
 (0)