xarray-behave 0.35.4__tar.gz → 0.35.5__tar.gz

{xarray-behave-0.35.4 → xarray-behave-0.35.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xarray-behave
-Version: 0.35.4
+Version: 0.35.5
 Summary: xarray tools for behavioral data.
 Author-email: Jan Clemens <clemensjan@googlemail.com>
 Requires-Python: >3.6

{xarray-behave-0.35.4 → xarray-behave-0.35.5}/src/xarray_behave/__init__.py

@@ -1,6 +1,6 @@
 """xarray tools for behavioral data."""
 
-__version__ = "0.35.4"
+__version__ = "0.35.5"
 
 from .xarray_behave import assemble, assemble_metrics, load, save
 import os

{xarray-behave-0.35.4 → xarray-behave-0.35.5}/src/xarray_behave/gui/app.py

@@ -674,6 +674,10 @@ class MainWindow(QtWidgets.QMainWindow):
             if form_data["segment_minlen"] is None:
                 form_data["segment_minlen"] = 0
 
+            if form_data["filter_song"] == "no":
+                form_data["bandpass_low_freq"] = None
+                form_data["bandpass_up_freq"] = None
+
             if form_data["file"] != "Current file":
                 if form_data["folder"] != " ":
                     file_path = form_data["folder"]
@@ -696,6 +700,9 @@ class MainWindow(QtWidgets.QMainWindow):
                     segment_thres=form_data["event_thres"],
                     segment_fillgap=form_data["segment_fillgap"],
                     segment_minlen=form_data["segment_minlen"],
+                    bandpass_low_freq=form_data["bandpass_low_freq"],
+                    bandpass_up_freq=form_data["bandpass_up_freq"],
+                    resample=form_data["resample"],
                 )
                 return
             elif hasattr(self, "ds") and form_data["file"] == "Current file":
@@ -721,10 +728,10 @@ class MainWindow(QtWidgets.QMainWindow):
                 # select batch size so that at least 10 batches are run
                 # minimizes loss of annotations from batch size "quantization" errors
                 batch_size = 32
-                nb_batches = lambda batch_size: int(
+                nb_batches = int(
                     np.floor((audio.shape[0] - ((batch_size - 1) + params["nb_hist"])) / (params["stride"] * (batch_size)))
                 )
-                while nb_batches(batch_size) < 10 and batch_size > 1:
+                while nb_batches < 10 and batch_size > 1:
                     batch_size -= 1
 
                 logger.info("   Running inference on audio.")
@@ -733,10 +740,13 @@ class MainWindow(QtWidgets.QMainWindow):
                 fs_model = params["samplerate_x_Hz"]
                 fs_audio = self.ds.song_raw.attrs["sampling_rate_Hz"]
 
-                if form_data["resample_audio"] and fs_audio and fs_audio != fs_model:
+                if form_data["resample"] and fs_audio and fs_audio != fs_model:
                     logger.info(f"   Resampling. Audio rate is {fs_audio}Hz but model was trained on data with {fs_model}Hz.")
                     audio = das.utils.resample(audio, fs_audio, fs_model)
 
+                import rich
+
+                rich.print(form_data)
                 events, segments, _, _ = das.predict.predict(
                     audio,
                     model_path,
@@ -749,6 +759,10 @@ class MainWindow(QtWidgets.QMainWindow):
                     segment_thres=form_data["event_thres"],
                     segment_fillgap=form_data["segment_fillgap"],
                     segment_minlen=form_data["segment_minlen"],
+                    bandpass_low_freq=form_data["bandpass_low_freq"],
+                    bandpass_up_freq=form_data["bandpass_up_freq"],
+                    resample=form_data["resample"],
+                    fs_audio=fs_audio,
                 )
 
                 # Process detected song

{xarray-behave-0.35.4 → xarray-behave-0.35.5}/src/xarray_behave/gui/forms/das_predict.yaml

@@ -65,11 +65,32 @@ main:
   default: True
   help: Appends '_proposals' to song name. Individual proposals can be corrected and approved.
 
-- name: resample_audio
+- name: resample
   label: Resample audio to rate used for training
   type: bool
   default: True
 
+- name: filter_song
+  label: Bandpass filter audio
+  type: stacked
+  default: "no"
+  options: "no,yes"
+
+  "no":
+
+  "yes":
+  - name: bandpass_low_freq
+    label: Lower cutoff
+    type: double
+    default: 50.0
+    range: 0.0, 1000000.0
+
+  - name: bandpass_up_freq
+    label: Upper cutoff
+    type: double
+    default: 10000.0
+    range: 0.0, 1000000.0
+
 - type: text
   text: '<b>Event detection</b>'
 

{xarray-behave-0.35.4 → xarray-behave-0.35.5}/src/xarray_behave/gui/utils.py

@@ -115,8 +115,7 @@ class FastImageWidget(pg.GraphicsLayoutWidget):
             image_format ([type], optional): [description]. Defaults to QtGui.QImage.Format_RGB888.
             auto_scale (bool, optional): [description]. Defaults to False.
         """
-        qimg = QtGui.QImage(image, image.shape[1], image.shape[0], image_format)
-        # qimg = QtGui.QImage(image.ctypes.data, image.shape[1], image.shape[0], image_format)
+        qimg = QtGui.QImage(image, image.shape[1], image.shape[0], 3 * image.shape[1], image_format)
 
         qpix = QtGui.QPixmap(qimg)
         self.pixmapItem.setPixmap(qpix)