ndscope 0.22.2__tar.gz → 0.22.4__tar.gz

{ndscope-0.22.2 → ndscope-0.22.4}/CHANGELOG.md

@@ -10,6 +10,7 @@
 - Added system to place markers on plots, then jump between markers.
 - Fix bug where arrakis data could be timestamped wrong
 - Add --arrakis (choose default Arrakis data source) and --arrakis-server (specify an arrakis server) options.
+- Added raw data export to WAV sound files (one file per channel), a "play" button on the export tab that plays the visible data, and the export "show" button now opens files with the OS default application on Linux, Mac and Windows.
 
 ## 0.22.0 - 2026-08-24
 

{ndscope-0.22.2 → ndscope-0.22.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndscope
-Version: 0.22.2
+Version: 0.22.4
 Summary: Next-generation NDS time series plotting
 Author-email: Jameson Graef Rollins <jameson.rollins@ligo.org>, Patrick Thomas <patrick.thomas@ligo.org>, Erik von Reis <erik.vonreis@ligo.org>
 Maintainer-email: Jameson Graef Rollins <jameson.rollins@ligo.org>, Patrick Thomas <patrick.thomas@ligo.org>, Erik von Reis <erik.vonreis@ligo.org>
@@ -18,7 +18,7 @@ Description-Content-Type: text/markdown
 License-File: COPYING
 License-File: COPYING-GPL-3
 Requires-Dist: cairosvg
-Requires-Dist: dttlib>=0.11.3
+Requires-Dist: dttlib<0.13.0,>=0.12.2
 Requires-Dist: gpstime
 Requires-Dist: h5py
 Requires-Dist: matplotlib

ndscope-0.22.4/install_wheel

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+pyver="$(python3 --version | grep -oP '\d+\.\d+' | tr -d '.')"
+wheelpath="../dttlib/wheels/*${pyver}*.whl"
+wheelcount=$( ls ${wheelpath} 2> /dev/null | wc -l )
+if [[ $wheelcount -gt 0 ]]
+then
+  pip install "$(ls -tr ${wheelpath} )" --force-reinstall
+else
+  echo "no wheel file found for python${pyver}"
+fi

{ndscope-0.22.2 → ndscope-0.22.4}/ndscope/__version__.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.22.2'
-__version_tuple__ = version_tuple = (0, 22, 2)
+__version__ = version = '0.22.4'
+__version_tuple__ = version_tuple = (0, 22, 4)
 
-__commit_id__ = commit_id = 'g86e3ad200'
+__commit_id__ = commit_id = 'g3d3f44107'

{ndscope-0.22.2 → ndscope-0.22.4}/ndscope/cache.py

@@ -808,7 +808,7 @@ class DataCache(QtCore.QObject):
 
     def guess_invalid_channel(self, msg: str) -> str:
         """Transform 'Invalid channel name' messages into something more helpful"""
-        if "Invalid channel" in msg:
+        if "Invalid channel" in msg or ("Unavailable," in msg and "channel(s)" in msg):
             channels = self.channel_names()
             suspect = None
             if len(channels) == 1:

{ndscope-0.22.2 → ndscope-0.22.4}/ndscope/configuration/configuration.py

@@ -73,7 +73,9 @@ def _handle_environment() -> TOMLDocument:
     env_config = TOMLDocument()
 
     if "NDSSERVER" in os.environ:
-        env_config["data_source"] = {"urls": [f"nds://{os.environ['NDSSERVER']}"]}
+        env_config["data_source"] = {
+            "urls": [f"nds://{n}" for n in os.environ["NDSSERVER"].split(",")]
+        }
     elif "ARRAKIS_SERVER" in os.environ:
         env_config["data_source"] = {"urls": [os.environ["ARRAKIS_SERVER"]]}
 

{ndscope-0.22.2 → ndscope-0.22.4}/ndscope/export.py

@@ -1,5 +1,9 @@
+import logging
 import os
 import io
+import re
+import subprocess
+import sys
 from collections import OrderedDict
 from typing import Optional, Tuple
 import xml.etree.ElementTree as ET
@@ -8,6 +12,7 @@ import dttlib
 import yaml
 import numpy as np
 from qtpy import QtCore
+from qtpy.QtGui import QDesktopServices
 from pyqtgraph import exporters
 import h5py
 
@@ -22,6 +27,7 @@ except:
     cairosvg = None
 
 from scipy.io import savemat
+from scipy.io import wavfile
 import matplotlib.pyplot as plt
 
 from .data import DataBufferDict
@@ -29,12 +35,15 @@ from .template import get_channel_color
 
 ##################################################
 
+logger = logging.getLogger(__name__)
+
 EXPORT_FILTERS = [
     ("scene to Portable Network Graphic (*.png)", [".png"]),
     ("scene to Scalable Vector Graphic (*.svg)", [".svg"]),
     ("scene to Portable Document Format (*.pdf)", [".pdf"]),
     ("data to Hierarchical Data Format (*.hdf5 *.h5)", [".hdf5", ".h5"]),
     ("data to MATLAB Binary Format (*.mat)", [".mat"]),
+    ("data to WAV sound files, one per channel (*.wav)", [".wav"]),
     ("template to YAML (*.yaml *.yml)", [".yaml", ".yml"]),
 ]
 
@@ -83,6 +92,28 @@ def export_dialog(dialog_func, parent, path):
     return path
 
 
+def open_file(path) -> bool:
+    """Open file with the OS default application (Linux, Mac, Windows)
+
+    Returns True if the request was handed to the OS.  Success does
+    not guarantee the application started, only that it was launched.
+
+    """
+    if QDesktopServices.openUrl(QtCore.QUrl.fromLocalFile(os.path.abspath(path))):
+        return True
+    # fall back to native launchers if Qt couldn't find a handler
+    try:
+        if sys.platform.startswith("win"):
+            os.startfile(path)  # type: ignore
+        elif sys.platform == "darwin":
+            subprocess.Popen(["open", path])
+        else:
+            subprocess.Popen(["xdg-open", path])
+    except (OSError, AttributeError):
+        return False
+    return True
+
+
 def _write_file(data, path):
     with open(path, "wb") as f:
         f.write(data)
@@ -270,10 +301,82 @@ def export_data_mat(ddict: DataBufferDict, path, start, end, **kwargs):
     savemat(path, out)
 
 
+# lowest sample rate (Hz) written to a WAV header.  Slower channels
+# are sped up by a power of two so the result is audible.
+WAV_MIN_RATE_HZ = 8000
+
+
+def _wav_speedup(rate_hz: float) -> int:
+    """Power of two playback speed-up needed to reach WAV_MIN_RATE_HZ"""
+    factor = 1
+    while rate_hz * factor < WAV_MIN_RATE_HZ:
+        factor *= 2
+    return factor
+
+
+def _wav_samples(data) -> Optional[np.ndarray]:
+    """Convert channel data to float32 audio: mean removed, peak of 1.
+
+    Returns None if there is nothing to hear (empty, constant, or
+    non-finite data).
+
+    """
+    data = np.asarray(data, dtype=np.float64).ravel()
+    data = data[np.isfinite(data)]
+    if data.size == 0:
+        return None
+    data = data - data.mean()
+    peak = np.max(np.abs(data))
+    if peak == 0:
+        return None
+    return (data / peak).astype(np.float32)
+
+
+def _wav_filename(path, id) -> str:
+    base, ext = os.path.splitext(path)
+    chan = re.sub(r"[^A-Za-z0-9_.-]", "_", str(id.name))
+    stat = re.sub(r"[^A-Za-z0-9_.-]", "_", str(id.trend_stat.data_name()))
+    return f"{base}_{chan}_{stat}{ext}"
+
+
+def export_data_wav(
+    ddict: DataBufferDict,
+    path,
+    start: dttlib.PipInstant,
+    end: dttlib.PipInstant,
+    **kwargs,
+) -> list:
+    """Save each channel to its own WAV file
+
+    Files are named <path base>_<channel>_<stat>.wav.  Each channel
+    is written at its native sample rate, with the mean removed and
+    scaled to full range.  Channels with sample rates too low to hear
+    are sped up by a power of two (see WAV_MIN_RATE_HZ).  Returns the
+    list of paths written.
+
+    """
+    if ddict is None:
+        raise ValueError("No data to export")
+    written = []
+    for id, datad in ddict.items():
+        samples = _wav_samples(_get_data_slice(datad.original_struct, start, end))
+        if samples is None:
+            logger.info("wav export: no audible data for %s, skipping", id.name)
+            continue
+        rate = int(round(datad.sample_rate * _wav_speedup(datad.sample_rate)))
+        fpath = _wav_filename(path, id)
+        wavfile.write(fpath, rate, samples)
+        written.append(fpath)
+    if not written:
+        raise ValueError("No audible data to export")
+    return written
+
+
 DATA_EXPORT_FUNCS = {
     ".hdf5": export_data_hdf5,
     ".h5": export_data_hdf5,
     ".mat": export_data_mat,
+    ".wav": export_data_wav,
 }
 
 

{ndscope-0.22.2 → ndscope-0.22.4}/ndscope/plot.py

@@ -28,7 +28,7 @@ from . import cursors
 from . import markers
 from .dtt.channel_trend_id import ChannelTrendId
 from .axis import LogAxis
-from typing import Any, List, Tuple, Dict, TYPE_CHECKING, Optional
+from typing import Any, List, Tuple, Dict, TYPE_CHECKING, Optional, Set
 from weakref import WeakSet
 
 if TYPE_CHECKING:
@@ -384,6 +384,7 @@ class CurveView:
         self.args = args
         self.kwargs = kwargs
         self.curve.setData(x=x, y=y, *args, **kwargs)
+        self.original_t0 = t0
 
     def update_t0(self, t0: PipInstant):
         """
@@ -391,6 +392,8 @@ class CurveView:
         """
         delta = self.original_t0 - t0
         x = self.x + delta.to_seconds()
+        self.x[:] = x
+        self.original_t0 = t0
         self.curve.setData(x=x, y=self.y, *self.args, **self.kwargs)
 
 
@@ -486,6 +489,7 @@ class NDScopePlot(BasePlot):
 
         self.has_t_cursors = True
         self.has_y_cursors = True
+        self.latest_chan_ids: Set[ChannelTrendId] = set()
 
     def __del__(self):
         logger.info("deleting plot %s", str(self))
@@ -819,10 +823,20 @@ class NDScopePlot(BasePlot):
             self.markers.set_t0(t0)
             self._set_t_limits(t0.to_gpst_seconds())
 
+            # clear the latest chan_id list only when the trends change
+            # so that we collect all chan ids drawn for the current trend
+            if (
+                self.latest_chan_ids
+                and next(iter(self.latest_chan_ids)).trend_stat
+                != next(iter(data.buffers.keys())).trend_stat
+            ):
+                self.latest_chan_ids = set()
             for chan_id, curve_view in self.curve_view.items():
                 if chan_id not in data:
                     continue
 
+                self.latest_chan_ids.add(chan_id)
+
                 cd = data[chan_id]
 
                 # if cd.is_trend:
@@ -889,8 +903,10 @@ class NDScopePlot(BasePlot):
         Shift all curves to reflect a new t0
         needed in case fetch data doesn't ever return anything.
         """
-        for curve_view in self.curve_view.values():
-            curve_view.update_t0(t0)
+        for channel_id in self.latest_chan_ids:
+            if channel_id in self.curve_view:
+                curve_view = self.curve_view[channel_id]
+                curve_view.update_t0(t0)
         self.markers.set_t0(t0)
 
     def update_results(self, results: dict[str, "Result"]):

{ndscope-0.22.2 → ndscope-0.22.4}/ndscope/scope.py

@@ -7,6 +7,7 @@ import copy
 import logging
 import os
 import subprocess
+import tempfile
 import traceback
 import heapq
 from time import sleep
@@ -216,6 +217,11 @@ class NDScope(*load_ui("scope.ui")):
         # flag to indicate that we are in a base state with no
         # channels declared
         self._base = True
+        # paths written by multi-file exports, keyed by requested path
+        self._export_files: Dict[str, List[str]] = {}
+        # scratch directory for play_sound, created on first use and
+        # removed when the scope is garbage collected or exits
+        self._sound_dir: Optional[tempfile.TemporaryDirectory] = None
 
         # FIXME: HACK: this is an attempt to bypass the following bug:
         #
@@ -412,6 +418,7 @@ class NDScope(*load_ui("scope.ui")):
         self.exportPath.returnPressed.connect(self._export_save_handler)
         self.exportSaveButton.clicked.connect(self._export_save_handler)
         self.exportShowButton.clicked.connect(self._export_show_handler)
+        self.exportPlayButton.clicked.connect(self.play_sound)
         self.exportButton2.clicked.connect(self.snapshot)
 
         ##########
@@ -458,6 +465,7 @@ class NDScope(*load_ui("scope.ui")):
         self.exportShowButton.setIcon(
             self.style().standardIcon(QStyle.SP_FileDialogContentsView)  # type: ignore
         )
+        self.exportPlayButton.setIcon(self.style().standardIcon(QStyle.SP_MediaPlay))  # type: ignore
         # self.exportButton2.setIcon(self.style().standardIcon(QStyle.SP_DialogSaveButton))
 
         ##########
@@ -875,12 +883,13 @@ class NDScope(*load_ui("scope.ui")):
         if y_range:
             plot.set_y_range(y_range)
 
-        if y_range:
+        if x_range:
             plot.set_x_range(x_range)
 
         plot.lock_aspect_ratio(lock_aspect_ratio)
 
         self.set_font(self.font())
+        plot.showGrid(alpha=self.gridAlphaSelect.value())
 
         plot.row_stretch_factor = row_stretch_factor
         plot.col_stretch_factor = col_stretch_factor
@@ -991,6 +1000,7 @@ class NDScope(*load_ui("scope.ui")):
             plot.set_y_range(y_range)
 
         self.set_font(self.font())
+        plot.showGrid(alpha=self.gridAlphaSelect.value())
 
         plot.row_stretch_factor = row_stretch_factor
         plot.col_stretch_factor = col_stretch_factor
@@ -1441,8 +1451,7 @@ class NDScope(*load_ui("scope.ui")):
         """Stop online mode"""
         logger.info("STOP")
         self.data.online_stop()
-        # consider a stop as fetch for the stop range
-        self.last_cmd = ("fetch", {"t0": self.t0, "window": self.get_window()})
+        self.fetch(t0=self.t0, window=self.get_window())
 
     def _data_request(self, force=False, snapshot=False, singleshot=False):
         """
@@ -1471,7 +1480,8 @@ class NDScope(*load_ui("scope.ui")):
         elif self.data.online:
             extend = PipDuration.from_sec(0)
         else:
-            extend = (end - start) / 2
+            extend = (end - start) / 4
+            self._offline_ui()
 
         self.data.request(
             trend, (start - extend, end + extend), force, snapshot, singleshot
@@ -1612,12 +1622,6 @@ class NDScope(*load_ui("scope.ui")):
 
     # SLOT
     def data_retrieve_done(self, _tag: str, msg: Message | None = None, active=False):
-        if self.data.empty:
-            self._base_ui()
-        elif self.data.online:
-            self._online_ui()
-        else:
-            self._offline_ui()
         if msg is not None:
             error = msg.short_msg
         else:
@@ -2429,7 +2433,8 @@ class NDScope(*load_ui("scope.ui")):
     def export(self, path=None):
         """Export plot scene, data, or template to file.
 
-        Supports PNG, SVG, PDF image formats, HDF5 for data, and YAML
+        Supports PNG, SVG, PDF image formats, HDF5, MAT and WAV (one file per
+        channel) for data, and YAML
         for template.  A file select dialog will be presented if a
         path is not supplied.
 
@@ -2488,12 +2493,15 @@ class NDScope(*load_ui("scope.ui")):
             return
 
         try:
-            export_func(*args, **kwargs)
+            result = export_func(*args, **kwargs)
         except Exception as e:
             logger.info(traceback.format_exc())
             set_error(tag, f"Export failed: {str(e)}")
             return
 
+        if isinstance(result, list):
+            # exporters that write multiple files return their paths
+            self._export_files[path] = result
         ftype = ext[1:].upper()
         set_info(tag, f"Exported {obj} to {ftype}: {path}")
         self._export_complete.emit()
@@ -2505,21 +2513,57 @@ class NDScope(*load_ui("scope.ui")):
     def _export_show_handler(self):
         tag = "export"
         path = self.exportPath.text()
-        if not path or not os.path.exists(path):
+        if not path or not (os.path.exists(path) or path in self._export_files):
             set_error(tag, "No path, or no file at path.  Export first.")
             return
         ext = os.path.splitext(path)[1]
         if ext in [".hdf5", ".h5"]:
             export.matplot_h5(path)
         else:
-            try:
-                subprocess.Popen(["xdg-open", path])
-            except FileNotFoundError:
-                set_error(
-                    tag,
-                    "xdg-open binary not found.  Please install 'xdg-utils' package.",
-                )
-            # FIXME: catch open errors even though process backgrounded?
+            # multi-file exports (e.g. wav) open their first file
+            files = self._export_files.get(path)
+            target = files[0] if files else path
+            if not os.path.exists(target):
+                set_error(tag, f"No file at {target}.  Export first.")
+            elif not export.open_file(target):
+                set_error(tag, f"Could not open {target} with the default application.")
+            elif files and len(files) > 1:
+                set_info(tag, f"Opened {target} (1 of {len(files)} files)")
+
+    def play_sound(self):
+        """Export visible raw data to a temporary WAV file and play it
+
+        One file is written per channel, but only the first is played.
+
+        """
+        tag = "play"
+        data_block = self.get_current_data_block()
+        if data_block is None:
+            set_error(tag, "No data to play.")
+            return
+        if self._sound_dir is None:
+            self._sound_dir = tempfile.TemporaryDirectory(prefix="ndscope_")
+        window = self.get_window()
+        start = self.t0 + window[0]
+        end = self.t0 + window[1]
+        try:
+            files = export.export_data_wav(
+                data_block,
+                os.path.join(self._sound_dir.name, "temporary.wav"),
+                start,
+                end,
+            )
+        except Exception as e:
+            logger.info(traceback.format_exc())
+            set_error(tag, f"Could not create sound file: {str(e)}")
+            return
+        if not export.open_file(files[0]):
+            set_error(tag, f"Could not open {files[0]} with the default application.")
+            return
+        msg = f"Playing {os.path.basename(files[0])}"
+        if len(files) > 1:
+            msg += f" (1 of {len(files)} channels)"
+        set_info(tag, msg)
 
     def snapshot(self):
         """Take snapshot of scene (PNG) and copy to clipboard"""

{ndscope-0.22.2 → ndscope-0.22.4}/ndscope/scope.ui

@@ -1810,7 +1810,7 @@
                 </sizepolicy>
                </property>
                <property name="text">
-                <string>Export scene image (PNG, SVG, PDF), data (HDF5, MAT), or layout (YAML).
+                <string>Export scene image (PNG, SVG, PDF), data (HDF5, MAT, WAV), or layout (YAML).
 Format determined by file name extension (e.g. &quot;.png&quot; etc.).</string>
                </property>
                <property name="wordWrap">
@@ -1867,6 +1867,16 @@ Format determined by file name extension (e.g. &quot;.png&quot; etc.).</string>
                      </property>
                     </widget>
                    </item>
+                   <item>
+                    <widget class="QPushButton" name="exportPlayButton">
+                     <property name="toolTip">
+                      <string>export visible raw data to a temporary WAV file and play it (first channel only)</string>
+                     </property>
+                     <property name="text">
+                      <string>play</string>
+                     </property>
+                    </widget>
+                   </item>
                   </layout>
                  </item>
                 </layout>

{ndscope-0.22.2 → ndscope-0.22.4}/ndscope/template.py

@@ -241,6 +241,7 @@ def get_channel_color(channel: str, color=None):
 
     """
     global _CHANNEL_COLORS
+    global _PEN_GEN
     if color:
         if isinstance(color, str):
             if color[0] == "#":
@@ -267,6 +268,10 @@ def get_channel_color(channel: str, color=None):
                 )
         _CHANNEL_COLORS[channel] = rgb
     elif channel not in _CHANNEL_COLORS:
+        if _PEN_GEN is None:
+            raise ValueError(
+                "reset_colors() must be called once before calling g_channel_color()"
+            )
         color = _PEN_GEN.__next__()
         _CHANNEL_COLORS[channel] = color
     return color_RGB_to_24bit(_CHANNEL_COLORS[channel])
@@ -504,6 +509,7 @@ def template_from_chans(chan_layout):
     chans = []
     r = 0
     c = 0
+    template = _new_template()
     for chan in chan_layout + ["."]:
         if chan in [",", "."]:
             layout.append(
@@ -522,7 +528,6 @@ def template_from_chans(chan_layout):
         else:
             chans.append({chan: _new_curve(chan)})
             channels.append(chan)
-    template = _new_template()
     template["window-title"] = " ".join(channels)
     template["plots"] = layout
     logger.debug("created template from channel list")

{ndscope-0.22.2 → ndscope-0.22.4}/ndscope/test/test_util.py

@@ -285,6 +285,13 @@ class TestResolveDataSource:
         result = self.resolve_data_source("--nds", "test.server.com:31200")
         assert "test.server.com" in result
 
+    def test_multiple_ndsserver(self):
+        """only first nds server should be used"""
+        env = {"NDSSERVER": "nds.test:8088,nds2.test:8088"}
+        with patch.dict(os.environ, env, clear=True):
+            result = self.resolve_data_source()
+        assert result == "nds://nds.test:8088"
+
     def test_alias_cit(self):
         """'cit' alias should resolve to caltech server"""
         result = self.resolve_data_source("--nds", "cit")

{ndscope-0.22.2 → ndscope-0.22.4}/ndscope.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndscope
-Version: 0.22.2
+Version: 0.22.4
 Summary: Next-generation NDS time series plotting
 Author-email: Jameson Graef Rollins <jameson.rollins@ligo.org>, Patrick Thomas <patrick.thomas@ligo.org>, Erik von Reis <erik.vonreis@ligo.org>
 Maintainer-email: Jameson Graef Rollins <jameson.rollins@ligo.org>, Patrick Thomas <patrick.thomas@ligo.org>, Erik von Reis <erik.vonreis@ligo.org>
@@ -18,7 +18,7 @@ Description-Content-Type: text/markdown
 License-File: COPYING
 License-File: COPYING-GPL-3
 Requires-Dist: cairosvg
-Requires-Dist: dttlib>=0.11.3
+Requires-Dist: dttlib<0.13.0,>=0.12.2
 Requires-Dist: gpstime
 Requires-Dist: h5py
 Requires-Dist: matplotlib

{ndscope-0.22.2 → ndscope-0.22.4}/ndscope.egg-info/requires.txt

@@ -1,5 +1,5 @@
 cairosvg
-dttlib>=0.11.3
+dttlib<0.13.0,>=0.12.2
 gpstime
 h5py
 matplotlib

ndscope-0.22.4/ndscope.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.22.4",
+  "distance": 0,
+  "node": "g3d3f44107e580970a472e377e6630717e7b55895",
+  "dirty": false,
+  "branch": "sound_export",
+  "node_date": "2026-10-15"
+}

{ndscope-0.22.2 → ndscope-0.22.4}/pyproject.toml

@@ -40,7 +40,7 @@ classifiers=[
 
 dependencies = [
     "cairosvg",
-    "dttlib>=0.11.3",
+    "dttlib >=0.12.2, <0.13.0",
     "gpstime",
     "h5py",
     "matplotlib",

ndscope-0.22.2/install_wheel

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-pip install $(ls -tr ../dttlib/wheels/*cp311*.whl | tail -n 1) --force-reinstall

ndscope-0.22.2/ndscope.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "0.22.2",
-  "distance": 0,
-  "node": "g86e3ad2009e5aa0f230f580f687c697f6c3742c6",
-  "dirty": false,
-  "branch": "master",
-  "node_date": "2026-09-08"
-}