dcscope 2.28.0__tar.gz → 2.28.1__tar.gz

{dcscope-2.28.0 → dcscope-2.28.1}/.github/workflows/deploy_github.yml

@@ -34,6 +34,9 @@ jobs:
         python -m pip install --upgrade pip
         pip install setuptools wheel twine
         pip install .
+        # https://github.com/DC-analysis/DCscope/issues/228
+        # install pyqtgraph > 0.14.0 fixing SVG export issue
+        pip install git+https://github.com/pyqtgraph/pyqtgraph.git@4683d7a2d3f2b0a8412618a41dc780bd9cce339b
     - name: Build windows executable
       if: runner.os == 'windows'
       working-directory: ./build-recipes

{dcscope-2.28.0 → dcscope-2.28.1}/CHANGELOG

@@ -1,3 +1,9 @@
+2.28.1
+ - reg: limits of box filters incorrectly shown when QuickView was active
+ - enh: `Pipeline.get_min_max_coarse` handles inf data
+ - enh: align-right box filter selection button in Analysis View
+ - enh: disable "Apply" button when changing box filters in Analysis View
+ - build: include latest version of pyqtgraph to fix SVG export issue (#228)
 2.28.0
  - feat: introduce `TaskManager` and `TaskWorker` for more progress bars
  - fix: plot resized when applying plot settings in AnalysisView

{dcscope-2.28.0/dcscope.egg-info → dcscope-2.28.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dcscope
-Version: 2.28.0
+Version: 2.28.1
 Summary: User interface for deformability cytometry (DC)
 Author: Benedikt Hartmann, Eoghan O'Connell, Maximilian Schlögel, Paul Müller, Raghava Alajangi
 Maintainer-email: Paul Müller <dev@craban.de>

{dcscope-2.28.0 → dcscope-2.28.1}/dcscope/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.28.0'
-__version_tuple__ = version_tuple = (2, 28, 0)
+__version__ = version = '2.28.1'
+__version_tuple__ = version_tuple = (2, 28, 1)
 
-__commit_id__ = commit_id = 'ge5924c459'
+__commit_id__ = commit_id = 'g204651dbc'

{dcscope-2.28.0 → dcscope-2.28.1}/dcscope/gui/analysis/ana_filter.py

@@ -321,6 +321,7 @@ class FilterPanel(QtWidgets.QWidget):
     def on_moreless(self):
         """User wants to choose box filters"""
         if not self._box_edit_view:
+            self.ui.pushButton_apply.setEnabled(False)
             # get available features to show
             features, _ = self.get_features_labels()
             # create missing range controls if applicable (e.g. ml_score_???)
@@ -337,6 +338,7 @@ class FilterPanel(QtWidgets.QWidget):
             self.ui.label_box_edit.setVisible(True)
             self._box_edit_view = True
         else:
+            self.ui.pushButton_apply.setEnabled(True)
             # Hide all filters that are not active
             for _, rc in self._box_range_controls.items():
                 if not rc.is_active():
@@ -404,12 +406,14 @@ class FilterPanel(QtWidgets.QWidget):
             # compute min/max values
             mmdict = {}
             for feat in self.active_box_features:
-                mmdict[feat] = self.pipeline.get_min_max(feat=feat)
+                mmdict[feat] = self.pipeline.get_min_max_coarse(feat=feat)
             # update used features
             for feat in self._box_range_controls:
                 rc = self._box_range_controls[feat]
                 if feat in mmdict:
                     rc.setLimits(*mmdict[feat])
+                else:
+                    print("Ignoring feature", feat)
                 if self.current_filter is not None:
                     state = self.current_filter.__getstate__()
                     if feat not in state["box filters"]:

{dcscope-2.28.0 → dcscope-2.28.1}/dcscope/gui/analysis/ana_filter_ui.py

@@ -118,7 +118,7 @@ class Ui_Form(object):
         self.verticalLayout_3.addWidget(self.label_box_edit)
         self.toolButton_moreless = QtWidgets.QToolButton(parent=self.groupBox_box)
         self.toolButton_moreless.setObjectName("toolButton_moreless")
-        self.verticalLayout_3.addWidget(self.toolButton_moreless)
+        self.verticalLayout_3.addWidget(self.toolButton_moreless, 0, QtCore.Qt.AlignmentFlag.AlignRight)
         self.verticalLayout_5.addWidget(self.groupBox_box)
         self.groupBox = QtWidgets.QGroupBox(parent=Form)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Minimum)

{dcscope-2.28.0 → dcscope-2.28.1}/dcscope/pipeline/core.py

@@ -732,12 +732,27 @@ class Pipeline(object):
         for ds in dslist:
             if np.any(ds.filter.all):
                 if feat in ds:
-                    vmin = ds[feat].min()
-                    if not np.isnan(vmin):
+                    fdata = ds[feat]
+                    vmin = fdata.min()
+                    vmax = fdata.max()
+
+                    if np.any(np.isinf([vmin, vmax])):
+                        # Until now, we might have gotton away with our
+                        # custom h5attrs-backed ufuncs to get the minimum
+                        # and maximum of the feature data. But if there is
+                        # an inf present, then data is probably already loaded
+                        # into memory anyway. The following triggers loading
+                        # the entire feature data into memory for computing
+                        # the non-nan, non-inf minimum and maximum.
+                        fdata_valid = fdata[~np.isinf(fdata)]
+                        if fdata_valid.size:
+                            vmin = np.nanmin(fdata_valid)
+                            vmax = np.nanmax(fdata_valid)
+
+                    if not (np.isnan(vmin) or np.isinf(vmin)):
                         fmin = min(vmin, fmin)
 
-                    vmax = ds[feat].max()
-                    if not np.isnan(vmax):
+                    if not (np.isnan(vmax) or np.isinf(vmin)):
                         fmax = max(vmax, fmax)
                 else:
                     warnings.warn(f"Dataset {ds.identifier} does not "

{dcscope-2.28.0 → dcscope-2.28.1/dcscope.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dcscope
-Version: 2.28.0
+Version: 2.28.1
 Summary: User interface for deformability cytometry (DC)
 Author: Benedikt Hartmann, Eoghan O'Connell, Maximilian Schlögel, Paul Müller, Raghava Alajangi
 Maintainer-email: Paul Müller <dev@craban.de>

{dcscope-2.28.0 → dcscope-2.28.1}/dcscope.egg-info/SOURCES.txt

@@ -33,6 +33,8 @@ dcscope.egg-info/SOURCES.txt
 dcscope.egg-info/dependency_links.txt
 dcscope.egg-info/entry_points.txt
 dcscope.egg-info/requires.txt
+dcscope.egg-info/scm_file_list.json
+dcscope.egg-info/scm_version.json
 dcscope.egg-info/top_level.txt
 dcscope/gui/__init__.py
 dcscope/gui/helpers.py