From 064036241b02616f2cbdfa47bfc36afc13bc933f Mon Sep 17 00:00:00 2001 From: Markus Rosenstihl Date: Thu, 9 Jul 2026 14:45:25 +0200 Subject: [PATCH] small fixes --- src/damaris/data/Accumulation.py | 8 ++++---- src/damaris/gui/DamarisGUI.py | 9 ++++----- tests/res_test.py | 1 - 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/damaris/data/Accumulation.py b/src/damaris/data/Accumulation.py index de4395d..717e8c7 100644 --- a/src/damaris/data/Accumulation.py +++ b/src/damaris/data/Accumulation.py @@ -989,14 +989,14 @@ class Accumulation(Errorable, Drawable, DamarisFFT, Signalpath): self.lock.acquire() if self.sampling_rate != other.get_sampling_rate(): - raise ValueError("Accumulation: You cant add ADC-Results with diffrent sampling-rates") + raise ValueError("Accumulation: You can't add ADC-Results with different sampling-rates") if len(self.y[0]) != len(other): - raise ValueError("Accumulation: You cant add ADC-Results with diffrent number of samples") + raise ValueError("Accumulation: You can't add ADC-Results with different number of samples") if len(self.y) != other.get_number_of_channels(): - raise ValueError("Accumulation: You cant add ADC-Results with diffrent number of channels") + raise ValueError("Accumulation: You can't add ADC-Results with different number of channels") for i in range(len(self.index)): if self.index[i] != other.get_index_bounds(i): - raise ValueError("Accumulation: You cant add ADC-Results with diffrent indexing") + raise ValueError("Accumulation: You can't add ADC-Results with different indexing") for i in range(self.get_number_of_channels()): self.y[i] += other.y[i] diff --git a/src/damaris/gui/DamarisGUI.py b/src/damaris/gui/DamarisGUI.py index 31ec1c1..bb546ad 100644 --- a/src/damaris/gui/DamarisGUI.py +++ b/src/damaris/gui/DamarisGUI.py @@ -88,7 +88,6 @@ class logstream: def __del__( self ): pass - global log log = logstream( ) sys.stdout = log @@ -134,9 +133,6 @@ class LockFile: return False - - - class DamarisGUI: ExpScript_Display = 0 ResScript_Display = 1 @@ -2342,7 +2338,9 @@ class MonitorWidgets: # now let's add a button to the toolbar self.matplot_cursor_button = gtk.ToggleButton(label='') try: - image = gtk.Image.new_from_file("/usr/share/icons/breeze/actions/24/crosshairs-symbolic.svg") + icon_theme = gtk.IconTheme.get_default() + icon = icon_theme.load_icon("crosshairs", 24, 0) + image = gtk.Image.new_from_pixbuf(icon) self.matplot_cursor_button.set_image(image) except: pass @@ -2803,6 +2801,7 @@ class MonitorWidgets: self.matplot_cursor = matplotlib.widgets.Cursor(self.matplot_axes, useblit=False, color='red', linewidth=1) self.matplot_canvas.draw() + # TODO: Deactivate the pane button else: # Deactivate cursor diff --git a/tests/res_test.py b/tests/res_test.py index b14e47d..205074a 100644 --- a/tests/res_test.py +++ b/tests/res_test.py @@ -18,7 +18,6 @@ def result(): data["test"] = r accu+=ts accu.write_to_hdf(h5, "/", "name", "title") - print(accu) try: h5.close() except: