From dfbd88cd4cae64e629f945ec78771308477ff9a5 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 16 Oct 2013 16:55:56 -0500 Subject: [PATCH] Use new events defined in stormdrain that split bounds update and data reflow --- LMA/hdf5_lma.py | 5 ++--- LMA/live.py | 5 ++--- NLDN.py | 6 +++++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/LMA/hdf5_lma.py b/LMA/hdf5_lma.py index 438e2be..4b65fdf 100644 --- a/LMA/hdf5_lma.py +++ b/LMA/hdf5_lma.py @@ -11,8 +11,7 @@ def __init__(self, h5filename, table_path=None, target=None, mode='r'): self.table = self.h5file.getNode(table_path) self.data = self.table[:] - self.bounds_updated_xchg = get_exchange('SD_bounds_updated') - self.bounds_updated_xchg.attach(self) + get_exchange('SD_reflow_start').attach(self) flash_table_path = table_path.replace('events', 'flashes') try: @@ -58,7 +57,7 @@ def update(self, index_name="hdf_row_idx", field_names=None): def send(self, msg): - """ SD_bounds_updated messages are sent here """ + """ SD_reflow_start messages are sent here """ # do we send the whole events table, or somehow dynamically determine that? diff --git a/LMA/live.py b/LMA/live.py index 4e095ca..dd2a6e8 100644 --- a/LMA/live.py +++ b/LMA/live.py @@ -92,8 +92,7 @@ class LiveLMADataset(object): def __init__(self, target=None, host=None, basedate=None): self.target = target - self.bounds_updated_xchg = get_exchange('SD_bounds_updated') - self.bounds_updated_xchg.attach(self) + get_exchange('SD_reflow_start').attach(self) self._t_offset = 0.0 if basedate is not None: @@ -123,7 +122,7 @@ def show(self, header, newdata): self.send("B4D_LMAnewsources_live") def send(self, msg): - """ SD_bounds_updated messages are sent here """ + """ SD_reflow_data messages are sent here """ # do we send the whole events table, or somehow dynamically determine that? if len(self._dataq) > 0: diff --git a/NLDN.py b/NLDN.py index 7de72b9..1453e09 100644 --- a/NLDN.py +++ b/NLDN.py @@ -12,7 +12,11 @@ class GroundMarkerHeightController(object): - + """ When the bounds of the current view change, it's necessary to adjust + the height at which the ground-level markers are plotted, since they should be along + the bottom edge of the height view (their height is actually arbitrary) in order + to remain visible. + """ def __init__(self, target=None, initial_height=0.0, alt_name='alt', alt_factor=1000.0): self.bounds_updated_xchg = get_exchange('SD_bounds_updated')