pikers
/
piker
3
0
Fork 0
Code Issues 4 Pull Requests 6 Packages Projects Releases Wiki Activity

Drop log scaling support since uppx driven scaling seems way faster/better

m4_corrections
Tyler Goodlet 2022-04-24 17:08:16 -04:00
parent 8959f04791
commit 516dd26f08
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
piker/ui/_compression.py
View File

@ -162,7 +162,7 @@ def ohlc_to_m4_line(
flat, flat,
px_width=px_width, px_width=px_width,
uppx=uppx, uppx=uppx,
log_scale=bool(uppx) # log_scale=bool(uppx)
) )
x = np.broadcast_to(x[:, None], y.shape) x = np.broadcast_to(x[:, None], y.shape)
x = (x + np.array([-0.43, 0, 0, 0.43])).flatten() x = (x + np.array([-0.43, 0, 0, 0.43])).flatten()
@ -182,7 +182,7 @@ def ds_m4(
px_width: int, px_width: int,
uppx: Optional[float] = None, uppx: Optional[float] = None,
xrange: Optional[float] = None, xrange: Optional[float] = None,
log_scale: bool = True, # log_scale: bool = True,
) -> tuple[int, np.ndarray, np.ndarray]: ) -> tuple[int, np.ndarray, np.ndarray]:
''' '''
@ -211,27 +211,27 @@ def ds_m4(
# optionally log-scale down the "supposed pxs on screen" # optionally log-scale down the "supposed pxs on screen"
# as the units-per-px (uppx) get's large. # as the units-per-px (uppx) get's large.
if log_scale: # if log_scale:
assert uppx, 'You must provide a `uppx` value to use log scaling!' # assert uppx, 'You must provide a `uppx` value to use log scaling!'
# uppx = uppx * math.log(uppx, 2) # # uppx = uppx * math.log(uppx, 2)
# scaler = 2**7 / (1 + math.log(uppx, 2)) # # scaler = 2**7 / (1 + math.log(uppx, 2))
scaler = round( # scaler = round(
max( # max(
# NOTE: found that a 16x px width brought greater # # NOTE: found that a 16x px width brought greater
# detail, likely due to dpi scaling? # # detail, likely due to dpi scaling?
# px_width=px_width * 16, # # px_width=px_width * 16,
2**7 / (1 + math.log(uppx, 2)), # 2**7 / (1 + math.log(uppx, 2)),
1 # 1
) # )
) # )
# px_width *= scaler # px_width *= scaler
# else: # else:
# px_width *= 16 # px_width *= 16
assert px_width > 1 # width of screen in pxs? # should never get called unless actually needed
assert uppx > 0 assert px_width > 1 and uppx > 0
# NOTE: if we didn't pre-slice the data to downsample # NOTE: if we didn't pre-slice the data to downsample
# you could in theory pass these as the slicing params, # you could in theory pass these as the slicing params,
@ -248,13 +248,13 @@ def ds_m4(
# uppx *= max(4 / (1 + math.log(uppx, 2)), 1) # uppx *= max(4 / (1 + math.log(uppx, 2)), 1)
pxw = math.ceil(xrange / uppx) pxw = math.ceil(xrange / uppx)
px_width = math.ceil(px_width) # px_width = math.ceil(px_width)
# ratio of indexed x-value to width of raster in pixels. # ratio of indexed x-value to width of raster in pixels.
# this is more or less, uppx: units-per-pixel. # this is more or less, uppx: units-per-pixel.
# w = xrange / float(px_width) # w = xrange / float(px_width)
# uppx = uppx * math.log(uppx, 2) # uppx = uppx * math.log(uppx, 2)
w2 = px_width / uppx # w2 = px_width / uppx
# scale up the width as the uppx get's large # scale up the width as the uppx get's large
w = uppx # * math.log(uppx, 666) w = uppx # * math.log(uppx, 666)
@ -269,18 +269,18 @@ def ds_m4(
# we have room for all output down-samples. # we have room for all output down-samples.
pts_per_pixel, r = divmod(xrange, frames) pts_per_pixel, r = divmod(xrange, frames)
if r: if r:
while r: # while r:
frames += 1 frames += 1
pts_per_pixel, r = divmod(xrange, frames) pts_per_pixel, r = divmod(xrange, frames)
print( # print(
f'uppx: {uppx}\n' # f'uppx: {uppx}\n'
f'xrange: {xrange}\n' # f'xrange: {xrange}\n'
f'px_width: {px_width}\n' # f'px_width: {px_width}\n'
f'pxw: {pxw}\n' # f'pxw: {pxw}\n'
f'WTF w:{w}, w2:{w2}\n' # f'WTF w:{w}, w2:{w2}\n'
f'frames: {frames}\n' # f'frames: {frames}\n'
) # )
assert frames >= (xrange / uppx) assert frames >= (xrange / uppx)
# call into ``numba`` # call into ``numba``