dcscope 2.22.1__tar.gz → 2.22.2__tar.gz

{dcscope-2.22.1 → dcscope-2.22.2}/.github/workflows/check.yml

@@ -73,8 +73,6 @@ jobs:
       # https://github.com/codecov/codecov-action/issues/1316 is resolved
       timeout-minutes: 1
       continue-on-error: true
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
     - name: Create app and check if it runs (macOS)
       if: runner.os == 'macOS'
       working-directory: ./build-recipes

{dcscope-2.22.1 → dcscope-2.22.2}/CHANGELOG

@@ -1,3 +1,11 @@
+2.22.2
+ - fix: error message dialog limited to traceback length of three
+ - fix: copy error text to clipboard did not work in error message dialog
+ - enh: decorate QEvent-accepting slots in `main.py`
+ - enh: do not export "contour" to HDF5 files ("mask" is sufficient and faster)
+ - docs: add missing image for data export
+ - ref: only use closeEvent when exiting DCscope GUI
+ - setup: bump dclab to 0.67.0
 2.22.1
  - feat: notify user when loaded data have different pipeline hashes (#217)
  - fix: prevent accidental polygon filter creation (#148)

{dcscope-2.22.1/dcscope.egg-info → dcscope-2.22.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dcscope
-Version: 2.22.1
+Version: 2.22.2
 Summary: User interface for deformability cytometry (DC)
 Author: Benedikt Hartmann, Eoghan O'Connell, Maximilian Schlögel, Paul Müller
 Maintainer-email: Paul Müller <dev@craban.de>
@@ -16,7 +16,7 @@ Classifier: Intended Audience :: Science/Research
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: dclab[dcor,export,http,s3]>=0.64.0
+Requires-Dist: dclab[dcor,export,http,s3]>=0.67.0
 Requires-Dist: h5py>=2.8.0
 Requires-Dist: numpy>=1.21
 Requires-Dist: pygments

{dcscope-2.22.1 → dcscope-2.22.2}/dcscope/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '2.22.1'
-__version_tuple__ = version_tuple = (2, 22, 1)
+__version__ = version = '2.22.2'
+__version_tuple__ = version_tuple = (2, 22, 2)
+
+__commit_id__ = commit_id = 'gc464d70c1'

{dcscope-2.22.1 → dcscope-2.22.2}/dcscope/gui/export/e2data.py

@@ -330,6 +330,10 @@ class ExportData(QtWidgets.QDialog):
             # do not allow exporting event index, since it will be
             # re-enumerated in any case.
             self.features.remove("index")
+            # do not allow exporting contour data, since that is covered
+            # by "mask" and takes ages to write/read.
+            if "contour" in self.features:
+                self.features.remove("contour")
         else:
             self.features = self.pipeline.get_features(scalar=True,
                                                        union=True,

{dcscope-2.22.1 → dcscope-2.22.2}/dcscope/gui/main.py

@@ -1,5 +1,6 @@
-import pathlib
 import importlib.resources
+import logging
+import pathlib
 import signal
 import sys
 import traceback
@@ -50,6 +51,8 @@ if theme_path.exists():
 else:
     warnings.warn("DCscope theme path not available")
 
+logger = logging.getLogger(__name__)
+
 
 class DCscope(QtWidgets.QMainWindow):
     plots_changed = QtCore.pyqtSignal()
@@ -130,7 +133,6 @@ class DCscope(QtWidgets.QMainWindow):
             self.on_action_clear_datasets)
         self.actionClearSession.triggered.connect(self.on_action_clear)
         self.actionOpenSession.triggered.connect(self.on_action_open)
-        self.actionQuit.triggered.connect(self.on_action_quit)
         self.actionSaveSession.triggered.connect(self.on_action_save)
         # Edit menu
         self.actionChangeDatasetOrder.triggered.connect(
@@ -513,6 +515,7 @@ class DCscope(QtWidgets.QMainWindow):
             self.subwindows_plots[plot_id] = sub
         sub.show()
 
+    @QtCore.pyqtSlot(QtCore.QEvent)
     def closeEvent(self, event):
         """Determine what happens when the user wants to quit"""
         if self.pipeline.slots or self.pipeline.filters:
@@ -523,6 +526,7 @@ class DCscope(QtWidgets.QMainWindow):
         else:
             event.accept()
 
+    @QtCore.pyqtSlot(QtCore.QEvent)
     def dragEnterEvent(self, e):
         """Whether files are accepted"""
         if e.mimeData().hasUrls():
@@ -530,6 +534,7 @@ class DCscope(QtWidgets.QMainWindow):
         else:
             e.ignore()
 
+    @QtCore.pyqtSlot(QtCore.QEvent)
     @widgets.show_wait_cursor
     def dropEvent(self, e):
         """Add dropped files to view"""
@@ -861,14 +866,6 @@ class DCscope(QtWidgets.QMainWindow):
         dlg.feature_changed.connect(self.on_quickview_refresh)
         dlg.exec()
 
-    @QtCore.pyqtSlot()
-    def on_action_quit(self):
-        """Determine what happens when the user wants to quit"""
-        if self.pipeline.slots or self.pipeline.filters:
-            if not self.on_action_clear():
-                return
-        QtCore.QCoreApplication.quit()
-
     @QtCore.pyqtSlot()
     def on_action_save(self):
         path, _ = QtWidgets.QFileDialog.getSaveFileName(
@@ -1065,22 +1062,29 @@ def excepthook(etype, value, trace):
         call last)``.
     """
     vinfo = f"Unhandled exception in DCscope version {version}:\n"
-    tmp = traceback.format_exception(etype, value, trace)
-    exception = "".join([vinfo]+tmp)
+    exc_long = "".join(
+        [vinfo] + traceback.format_exception(etype, value, trace))
+    exc_short = "".join(
+        [vinfo] + traceback.format_exception(etype, value, trace, limit=3))
+
+    logger.error(exc_long)
 
     errorbox = QtWidgets.QMessageBox()
     errorbox.setIcon(QtWidgets.QMessageBox.Icon.Critical)
+    copy_button = QtWidgets.QPushButton('Copy message to clipboard and close')
+    copy_button.clicked.connect(lambda: copy_text_to_clipboard(exc_long))
     errorbox.addButton(QtWidgets.QPushButton('Close'),
                        QtWidgets.QMessageBox.ButtonRole.YesRole)
-    errorbox.addButton(QtWidgets.QPushButton(
-        'Copy text && Close'), QtWidgets.QMessageBox.ButtonRole.NoRole)
-    errorbox.setText(exception)
-    ret = errorbox.exec()
-    print(exception)
-    if ret == 1:
-        cb = QtWidgets.QApplication.clipboard()
-        cb.clear(mode=cb.Mode.Clipboard)
-        cb.setText(exception)
+    errorbox.addButton(copy_button, QtWidgets.QMessageBox.ButtonRole.NoRole)
+    errorbox.setDetailedText(exc_long)
+    errorbox.setText(exc_short)
+    errorbox.exec()
+
+
+def copy_text_to_clipboard(text):
+    cb = QtWidgets.QApplication.clipboard()
+    cb.clear()
+    cb.setText(text)
 
 
 # Make Ctr+C close the app

{dcscope-2.22.1 → dcscope-2.22.2}/dcscope/gui/main.ui

@@ -39,7 +39,7 @@
           <normaloff>../../../../.designer/backup</normaloff>../../../../.designer/backup</iconset>
         </property>
         <property name="toolButtonStyle">
-         <enum>Qt::ToolButtonTextBesideIcon</enum>
+         <enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
         </property>
        </widget>
       </item>
@@ -59,7 +59,7 @@
          <bool>true</bool>
         </property>
         <property name="toolButtonStyle">
-         <enum>Qt::ToolButtonTextBesideIcon</enum>
+         <enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
         </property>
         <property name="autoRaise">
          <bool>true</bool>
@@ -76,7 +76,7 @@
           <normaloff>../../../../.designer/backup</normaloff>../../../../.designer/backup</iconset>
         </property>
         <property name="toolButtonStyle">
-         <enum>Qt::ToolButtonTextBesideIcon</enum>
+         <enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
         </property>
        </widget>
       </item>
@@ -99,7 +99,7 @@
          <bool>true</bool>
         </property>
         <property name="toolButtonStyle">
-         <enum>Qt::ToolButtonTextBesideIcon</enum>
+         <enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
         </property>
         <property name="autoRaise">
          <bool>true</bool>
@@ -109,7 +109,7 @@
       <item row="0" column="7">
        <spacer name="horizontalSpacer">
         <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+         <enum>Qt::Orientation::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -129,14 +129,14 @@
           <normaloff>../../../../.designer/backup</normaloff>../../../../.designer/backup</iconset>
         </property>
         <property name="toolButtonStyle">
-         <enum>Qt::ToolButtonTextBesideIcon</enum>
+         <enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
         </property>
        </widget>
       </item>
       <item row="0" column="3">
        <widget class="Line" name="line">
         <property name="orientation">
-         <enum>Qt::Vertical</enum>
+         <enum>Qt::Orientation::Vertical</enum>
         </property>
        </widget>
       </item>
@@ -153,7 +153,7 @@
          <bool>true</bool>
         </property>
         <property name="toolButtonStyle">
-         <enum>Qt::ToolButtonTextBesideIcon</enum>
+         <enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
         </property>
         <property name="autoRaise">
          <bool>true</bool>
@@ -171,7 +171,7 @@
        </sizepolicy>
       </property>
       <property name="orientation">
-       <enum>Qt::Horizontal</enum>
+       <enum>Qt::Orientation::Horizontal</enum>
       </property>
       <widget class="BlockMatrix" name="block_matrix" native="true"/>
       <widget class="QMdiArea" name="mdiArea">
@@ -182,22 +182,22 @@
         </sizepolicy>
        </property>
        <property name="frameShape">
-        <enum>QFrame::Panel</enum>
+        <enum>QFrame::Shape::Panel</enum>
        </property>
        <property name="frameShadow">
-        <enum>QFrame::Sunken</enum>
+        <enum>QFrame::Shadow::Sunken</enum>
        </property>
        <property name="lineWidth">
         <number>0</number>
        </property>
        <property name="verticalScrollBarPolicy">
-        <enum>Qt::ScrollBarAsNeeded</enum>
+        <enum>Qt::ScrollBarPolicy::ScrollBarAsNeeded</enum>
        </property>
        <property name="horizontalScrollBarPolicy">
-        <enum>Qt::ScrollBarAsNeeded</enum>
+        <enum>Qt::ScrollBarPolicy::ScrollBarAsNeeded</enum>
        </property>
        <property name="sizeAdjustPolicy">
-        <enum>QAbstractScrollArea::AdjustIgnored</enum>
+        <enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustIgnored</enum>
        </property>
        <property name="background">
         <brush brushstyle="SolidPattern">
@@ -219,7 +219,7 @@
      <x>0</x>
      <y>0</y>
      <width>1058</width>
-     <height>19</height>
+     <height>23</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File">
@@ -506,8 +506,7 @@
   </action>
   <action name="action_export_filter_ray_dataset">
    <property name="icon">
-    <iconset theme="filter_ray">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="filter_ray"/>
    </property>
    <property name="text">
     <string>Individual filter ray for each dataset (*.sof)</string>
@@ -575,5 +574,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>actionQuit</sender>
+   <signal>triggered()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>528</x>
+     <y>334</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>

{dcscope-2.22.1 → dcscope-2.22.2/dcscope.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dcscope
-Version: 2.22.1
+Version: 2.22.2
 Summary: User interface for deformability cytometry (DC)
 Author: Benedikt Hartmann, Eoghan O'Connell, Maximilian Schlögel, Paul Müller
 Maintainer-email: Paul Müller <dev@craban.de>
@@ -16,7 +16,7 @@ Classifier: Intended Audience :: Science/Research
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: dclab[dcor,export,http,s3]>=0.64.0
+Requires-Dist: dclab[dcor,export,http,s3]>=0.67.0
 Requires-Dist: h5py>=2.8.0
 Requires-Dist: numpy>=1.21
 Requires-Dist: pygments

{dcscope-2.22.1 → dcscope-2.22.2}/dcscope.egg-info/SOURCES.txt

@@ -359,6 +359,7 @@ docs/scrots/qg_emodulus_badtemp.png
 docs/scrots/qg_emodulus_config.png
 docs/scrots/qg_emodulus_feature.png
 docs/scrots/qg_emodulus_other.png
+docs/scrots/qg_export_data.png
 docs/scrots/qg_extensions.png
 docs/scrots/qg_lme4_diff_init.png
 docs/scrots/qg_lme4_diff_results.png

{dcscope-2.22.1 → dcscope-2.22.2}/dcscope.egg-info/requires.txt

@@ -1,4 +1,4 @@
-dclab[dcor,export,http,s3]>=0.64.0
+dclab[dcor,export,http,s3]>=0.67.0
 h5py>=2.8.0
 numpy>=1.21
 pygments

{dcscope-2.22.1 → dcscope-2.22.2}/pyproject.toml

@@ -29,7 +29,7 @@ classifiers = [
 ]
 license = "GPL-3.0-or-later"
 dependencies = [
-    "dclab[dcor,export,http,s3]>=0.64.0",
+    "dclab[dcor,export,http,s3]>=0.67.0",
     "h5py>=2.8.0",
     "numpy>=1.21",  # CVE-2021-33430
     "pygments",