dcscope 2.25.4__tar.gz → 2.26.0__tar.gz

{dcscope-2.25.4 → dcscope-2.26.0}/CHANGELOG

@@ -1,3 +1,11 @@
+2.26.0
+ - feat: edit, duplicate and remove polygon filters in the "Filter" view
+ - fix: override-check in filter export did not work
+ - enh: enable disk caching for kernel density estimate data
+ - enh: bring windows to front when requesting controls via Block Matrix
+ - docs: update screenshots
+ - ref: disable caching for plots (fully done in dclab)
+ - setup: bump dclab to 0.69.2 (KDE caching, polygon filter stability)
 2.25.4
  - setup: bump dclab to 0.68.0 (open SWMR files in read mode)
 2.25.3

{dcscope-2.25.4/dcscope.egg-info → dcscope-2.26.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dcscope
-Version: 2.25.4
+Version: 2.26.0
 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>
@@ -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.68.0
+Requires-Dist: dclab[dcor,export,http,s3]>=0.69.2
 Requires-Dist: h5py>=2.8.0
 Requires-Dist: numpy>=1.21
 Requires-Dist: pygments

{dcscope-2.25.4 → dcscope-2.26.0}/dcscope/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.25.4'
-__version_tuple__ = version_tuple = (2, 25, 4)
+__version__ = version = '2.26.0'
+__version_tuple__ = version_tuple = (2, 26, 0)
 
-__commit_id__ = commit_id = 'g568f827e5'
+__commit_id__ = commit_id = 'g5867420fb'

{dcscope-2.25.4 → dcscope-2.26.0}/dcscope/gui/analysis/ana_filter.py

@@ -19,6 +19,7 @@ class FilterPanel(QtWidgets.QWidget):
     """
     #: Emitted when the user wants to create a new polygon filter
     request_new_polygon_filter = QtCore.pyqtSignal()
+    request_edit_polygon_filter = QtCore.pyqtSignal(int)
 
     # widgets emit these whenever they changed the pipeline
     pp_mod_send = QtCore.pyqtSignal(dict)
@@ -45,6 +46,20 @@ class FilterPanel(QtWidgets.QWidget):
         self.pushButton_apply.clicked.connect(self.write_filter)
         self.pushButton_reset.clicked.connect(self.update_content)
 
+        # polygon buttons
+        self.pushButton_polygon_add.clicked.connect(
+            self.request_new_polygon_filter)
+        self.pushButton_polygon_edit.clicked.connect(
+            self.on_polygon_edit)
+        self.pushButton_polygon_duplicate.clicked.connect(
+            self.on_polygon_duplicate)
+        self.pushButton_polygon_remove.clicked.connect(
+            self.on_polygon_remove)
+
+        # polygon selection
+        self.listWidget_polygon.itemSelectionChanged.connect(
+            self.on_polygon_selection)
+
         self.comboBox_filters.currentIndexChanged.connect(self.update_content)
         self.toolButton_moreless.clicked.connect(self.on_moreless)
         self.label_box_edit.setVisible(False)
@@ -54,6 +69,7 @@ class FilterPanel(QtWidgets.QWidget):
         self.pp_mod_recv.connect(self.on_pp_mod_recv)
 
     def read_filter_state(self):
+        """Read filter state from UI"""
         state = {
             "filter used": self.checkBox_enable.isChecked(),
             "identifier": self.current_filter.identifier,
@@ -68,15 +84,23 @@ class FilterPanel(QtWidgets.QWidget):
             rc = self._box_range_controls[feat]
             box[feat] = rc.read_pipeline_state()
         state["box filters"] = box
+
         # polygon filters
+        state["polygon filters"] = self.read_filter_state_polygon()
+
+        return state
+
+    def read_filter_state_polygon(self):
+        """Read polygon filter state from UI"""
         pflist = []
         for key in self._polygon_checkboxes:
-            if self._polygon_checkboxes[key].isChecked():
+            if (self._polygon_checkboxes[key].checkState()
+                    == QtCore.Qt.CheckState.Checked):
                 pflist.append(key)
-        state["polygon filters"] = pflist
-        return state
+        return pflist
 
     def write_filter_state(self, state):
+        """Write filter state to UI"""
         if self.current_filter.identifier != state["identifier"]:
             raise ValueError("Filter identifier mismatch!")
         self.checkBox_enable.setChecked(state["filter used"])
@@ -97,12 +121,17 @@ class FilterPanel(QtWidgets.QWidget):
                 rc.reset_range()
 
         # polygon filters
-        pflist = state["polygon filters"]
+        self.write_filter_state_polygon(state["polygon filters"])
+
+    def write_filter_state_polygon(self, state):
+        """Write polygon filter state to UI"""
         for key in self._polygon_checkboxes:
-            if key in pflist:
-                self._polygon_checkboxes[key].setChecked(True)
+            if key in state:
+                self._polygon_checkboxes[key].setCheckState(
+                    QtCore.Qt.CheckState.Checked)
             else:
-                self._polygon_checkboxes[key].setChecked(False)
+                self._polygon_checkboxes[key].setCheckState(
+                    QtCore.Qt.CheckState.Unchecked)
 
     def _populate_box_filters(self):
         """Dynamically update available pipeline box filters
@@ -184,6 +213,71 @@ class FilterPanel(QtWidgets.QWidget):
             new_id = self.pipeline.duplicate_filter(filt_id)
             self.pp_mod_send.emit({"pipeline": {"filter_added": new_id}})
 
+    def get_polygon_filter_selection(self):
+        """Return selected polygon filters"""
+        items = self.listWidget_polygon.selectedItems()
+        pfs = []
+        pf_ids = []
+        for (pfid, item) in self._polygon_checkboxes.items():
+            if item in items:
+                pf_ids.append(pfid)
+                pfs.append(dclab.PolygonFilter.get_instance_from_id(pfid))
+        return pf_ids, pfs
+
+    @QtCore.pyqtSlot()
+    def on_polygon_selection(self):
+        num_selected = len(self.listWidget_polygon.selectedItems())
+        if num_selected == 0:
+            self.widget_selection.setEnabled(False)
+        else:
+            self.widget_selection.setEnabled(True)
+            self.pushButton_polygon_edit.setEnabled(num_selected == 1)
+
+    @QtCore.pyqtSlot()
+    def on_polygon_duplicate(self):
+        pf_ids, pfs = self.get_polygon_filter_selection()
+
+        if len(pf_ids) > 1:
+            button_reply = QtWidgets.QMessageBox.question(
+                self,
+                "Duplicate multiple polygon filters?",
+                f"Are you sure you want to duplicate {len(pf_ids)} "
+                f"polygon filters?")
+            yes = button_reply == QtWidgets.QMessageBox.StandardButton.Yes
+        else:
+            yes = True
+
+        if yes:
+            for pf in pfs:
+                pf_copy = pf.copy()
+                pf_copy.name = pf.name + "+"
+
+            self.update_polygon_filters()
+
+    @QtCore.pyqtSlot()
+    def on_polygon_edit(self):
+        pf_ids, _ = self.get_polygon_filter_selection()
+
+        if len(pf_ids) == 1:
+            self.request_edit_polygon_filter.emit(pf_ids[0])
+
+    @QtCore.pyqtSlot()
+    def on_polygon_remove(self):
+        pf_ids, pfs = self.get_polygon_filter_selection()
+
+        button_reply = QtWidgets.QMessageBox.question(
+            self,
+            "Polygon filter removal?",
+            "Are you sure you want to remove the following polygon "
+            "filters?\n" + "\n".join([f" - {pf.name}" for pf in pfs]))
+        yes = button_reply == QtWidgets.QMessageBox.StandardButton.Yes
+
+        if yes:
+            for pfid in pf_ids:
+                dclab.PolygonFilter.remove(pfid)
+
+            self.update_polygon_filters()
+
     @QtCore.pyqtSlot(dict)
     def on_pp_mod_recv(self, data):
         """We received a signal that something changed"""
@@ -312,33 +406,32 @@ class FilterPanel(QtWidgets.QWidget):
 
     def update_polygon_filters(self):
         """Update the layout containing the polygon filters"""
-        self.verticalLayout_poly.setAlignment(QtCore.Qt.AlignmentFlag.AlignTop)
         # clear layout
-        for ii in reversed(range(self.verticalLayout_poly.count())):
-            item = self.verticalLayout_poly.itemAt(ii).widget()
-            if item is not None:
-                item.hide()
-                item.deleteLater()
+        for _ in range(self.listWidget_polygon.count()):
+            self.listWidget_polygon.takeItem(0)
+
         self._polygon_checkboxes = {}  # must come after getting the state
         if dclab.PolygonFilter.instances:
+            self.listWidget_polygon.setEnabled(True)
             for pf in dclab.PolygonFilter.instances:
-                widget = QtWidgets.QWidget()
-                hbox = QtWidgets.QHBoxLayout()
-                hbox.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft)
-                hbox.setContentsMargins(0, 0, 0, 0)
-                chb = QtWidgets.QCheckBox()
-                hbox.addWidget(chb)
-                hbox.addWidget(QtWidgets.QLabel(pf.name))
-                widget.setLayout(hbox)
-                self.verticalLayout_poly.addWidget(widget)
-                self._polygon_checkboxes[pf.unique_id] = chb
+                item = QtWidgets.QListWidgetItem(pf.name)
+                item.setFlags(
+                    item.flags() | QtCore.Qt.ItemFlag.ItemIsUserCheckable)
+                item.setCheckState(QtCore.Qt.CheckState.Unchecked)
+                self.listWidget_polygon.addItem(item)
+                item.setToolTip(f"{pf.unique_id}: {pf.name}")
+                self._polygon_checkboxes[pf.unique_id] = item
         else:
-            label = QtWidgets.QLabel("No polygon filters have been created "
-                                     + "yet.")
-            button = QtWidgets.QPushButton("Create polygon filter")
-            button.clicked.connect(self.request_new_polygon_filter)
-            self.verticalLayout_poly.addWidget(label)
-            self.verticalLayout_poly.addWidget(button)
+            self.listWidget_polygon.addItem(
+                "No polygon filters have been created yet.")
+            self.listWidget_polygon.setEnabled(False)
+            self.widget_selection.setEnabled(False)
+
+        if self.current_filter is not None:
+            filt_id = self.current_filter.identifier
+            filt_index = self.pipeline.filter_ids.index(filt_id)
+            pflist = self.pipeline.filters[filt_index].polylist
+            self.write_filter_state_polygon(pflist)
 
     @QtCore.pyqtSlot()
     def write_filter(self):

{dcscope-2.25.4 → dcscope-2.26.0}/dcscope/gui/analysis/ana_filter.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>701</width>
-    <height>538</height>
+    <width>702</width>
+    <height>655</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -26,17 +26,17 @@
      <item>
       <widget class="QComboBox" name="comboBox_filters">
        <property name="sizeAdjustPolicy">
-        <enum>QComboBox::AdjustToContents</enum>
+        <enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
+        <enum>QSizePolicy::Policy::Expanding</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -55,8 +55,7 @@
         <string>Duplicate</string>
        </property>
        <property name="icon">
-        <iconset theme="edit-paste">
-         <normaloff>.</normaloff>.</iconset>
+        <iconset theme="edit-paste"/>
        </property>
       </widget>
      </item>
@@ -69,8 +68,7 @@
         <string>Remove</string>
        </property>
        <property name="icon">
-        <iconset theme="remove">
-         <normaloff>.</normaloff>.</iconset>
+        <iconset theme="remove"/>
        </property>
       </widget>
      </item>
@@ -79,12 +77,12 @@
    <item>
     <widget class="Line" name="line">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout_5">
+    <layout class="QVBoxLayout" name="verticalLayout_5" stretch="0,2,1,0">
      <property name="leftMargin">
       <number>9</number>
      </property>
@@ -94,7 +92,7 @@
      <item>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <property name="sizeConstraint">
-        <enum>QLayout::SetMinimumSize</enum>
+        <enum>QLayout::SizeConstraint::SetMinimumSize</enum>
        </property>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
@@ -157,7 +155,7 @@
          <item>
           <spacer name="horizontalSpacer_3">
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -197,7 +195,7 @@
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_3">
         <property name="sizeConstraint">
-         <enum>QLayout::SetMaximumSize</enum>
+         <enum>QLayout::SizeConstraint::SetMaximumSize</enum>
         </property>
         <property name="leftMargin">
          <number>9</number>
@@ -205,16 +203,16 @@
         <item>
          <widget class="QScrollArea" name="scrollArea_box">
           <property name="frameShape">
-           <enum>QFrame::NoFrame</enum>
+           <enum>QFrame::Shape::NoFrame</enum>
           </property>
           <property name="lineWidth">
            <number>0</number>
           </property>
           <property name="horizontalScrollBarPolicy">
-           <enum>Qt::ScrollBarAlwaysOff</enum>
+           <enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
           </property>
           <property name="sizeAdjustPolicy">
-           <enum>QAbstractScrollArea::AdjustToContents</enum>
+           <enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents</enum>
           </property>
           <property name="widgetResizable">
            <bool>true</bool>
@@ -224,7 +222,7 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>649</width>
+             <width>650</width>
              <height>68</height>
             </rect>
            </property>
@@ -265,43 +263,89 @@
         <string>Polygon filters</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
        </property>
-       <layout class="QVBoxLayout" name="verticalLayout_4">
+       <layout class="QHBoxLayout" name="horizontalLayout_6">
         <property name="sizeConstraint">
-         <enum>QLayout::SetMinimumSize</enum>
+         <enum>QLayout::SizeConstraint::SetMinimumSize</enum>
         </property>
         <item>
-         <widget class="QScrollArea" name="scrollArea_poly">
-          <property name="frameShape">
-           <enum>QFrame::NoFrame</enum>
-          </property>
-          <property name="horizontalScrollBarPolicy">
-           <enum>Qt::ScrollBarAlwaysOff</enum>
-          </property>
-          <property name="sizeAdjustPolicy">
-           <enum>QAbstractScrollArea::AdjustToContents</enum>
+         <widget class="QListWidget" name="listWidget_polygon">
+          <property name="selectionMode">
+           <enum>QAbstractItemView::SelectionMode::ExtendedSelection</enum>
           </property>
-          <property name="widgetResizable">
-           <bool>true</bool>
-          </property>
-          <widget class="QWidget" name="scrollAreaWidgetContents_2">
-           <property name="geometry">
-            <rect>
-             <x>0</x>
-             <y>0</y>
-             <width>649</width>
-             <height>116</height>
-            </rect>
-           </property>
-           <layout class="QVBoxLayout" name="verticalLayout_7">
-            <item>
-             <layout class="QVBoxLayout" name="verticalLayout_poly"/>
-            </item>
-           </layout>
-          </widget>
          </widget>
         </item>
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout_7">
+          <item>
+           <widget class="QPushButton" name="pushButton_polygon_add">
+            <property name="text">
+             <string>Create</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QWidget" name="widget_selection" native="true">
+            <layout class="QVBoxLayout" name="verticalLayout_4">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QLabel" name="label_3">
+               <property name="text">
+                <string>Selection</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="pushButton_polygon_edit">
+               <property name="text">
+                <string>Edit/View</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="pushButton_polygon_duplicate">
+               <property name="text">
+                <string>Duplicate</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="pushButton_polygon_remove">
+               <property name="text">
+                <string>Remove</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer">
+            <property name="orientation">
+             <enum>Qt::Orientation::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>0</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
        </layout>
       </widget>
      </item>
@@ -313,7 +357,7 @@
        <item>
         <spacer name="horizontalSpacer_4">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -333,10 +377,10 @@
        <item>
         <spacer name="horizontalSpacer_5">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
          <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
+          <enum>QSizePolicy::Policy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>

{dcscope-2.25.4 → dcscope-2.26.0}/dcscope/gui/main.py

@@ -10,6 +10,7 @@ import webbrowser
 
 import dclab
 from dclab.lme4 import rsetup
+from dclab import cached
 import h5py
 import numpy
 import scipy
@@ -117,6 +118,16 @@ class DCscope(QtWidgets.QMainWindow):
             dclab.rtdc_dataset.fmt_s3.S3_SECRET_ACCESS_KEY = \
                 s3_secret_access_key
 
+        # setup memory and disk caching
+        cache_path = pathlib.Path(
+            QStandardPaths.writableLocation(
+                QStandardPaths.StandardLocation.CacheLocation))
+        store_keeper = cached.StoreKeeper.get_instance()
+        store_keeper.set_disk_store_path(cache_path)
+        store_keeper.set_interval(30)
+        store_keeper.set_disk_store_size_bytes(1024**3)
+        store_keeper.set_memory_store_size(200)
+
         #: Extensions
         store_path = pathlib.Path(
             QStandardPaths.writableLocation(
@@ -212,6 +223,8 @@ class DCscope(QtWidgets.QMainWindow):
         # polygon filter creation
         self.widget_ana_view.widget_filter.request_new_polygon_filter.connect(
             self.on_new_polygon_filter)
+        self.widget_ana_view.widget_filter.request_edit_polygon_filter.connect(
+            self.on_edit_polygon_filter)
 
         # Top of the pipeline modification hierarchy
         self.pp_mod_send.connect(self.on_pp_mod_recv)
@@ -630,13 +643,14 @@ class DCscope(QtWidgets.QMainWindow):
                 + "\n".join([str(p) for p in list(set(double_paths))])
             )
         if existing_paths:
-            resp = QtWidgets.QMessageBox.question(
+            button_reply = QtWidgets.QMessageBox.question(
                 self,
                 "Override existing files?",
                 "The following files already exist, override?\n\n"
                 + "\n".join([str(p) for p in existing_paths])
             )
-            if resp:
+            yes = button_reply == QtWidgets.QMessageBox.StandardButton.Yes
+            if yes:
                 # if the user agrees, these files will be overridden
                 existing_paths.clear()
         for path in filt_dict:
@@ -785,6 +799,7 @@ class DCscope(QtWidgets.QMainWindow):
 
     @QtCore.pyqtSlot()
     def on_new_polygon_filter(self):
+        """Create a new polygon filter"""
         if not self.pipeline.slots:
             msg = QtWidgets.QMessageBox()
             msg.setIcon(QtWidgets.QMessageBox.Icon.Critical)
@@ -793,6 +808,7 @@ class DCscope(QtWidgets.QMainWindow):
             msg.exec()
         else:
             self.toolButton_quick_view.setChecked(True)
+            self.mdiArea.setActiveSubWindow(self.subwindows["quick_view"])
             if not self.widget_quick_view.current_pipeline_element:
                 # select the first item in the pipeline
                 self.pp_mod_send.emit({"quickview": {
@@ -802,13 +818,39 @@ class DCscope(QtWidgets.QMainWindow):
                     "filt_id": self.pipeline.filter_ids[0],
                 }})
 
+            # adjusts QuickView size correctly
+            self.widget_quick_view.on_tool()
             self.widget_quick_view.on_poly_create()
+
+    @QtCore.pyqtSlot(int)
+    def on_edit_polygon_filter(self, polygon_filter_id):
+        """Edit a polygon filter"""
+        if not self.pipeline.slots:
+            msg = QtWidgets.QMessageBox()
+            msg.setIcon(QtWidgets.QMessageBox.Icon.Critical)
+            msg.setText("A dataset is required for editing a polygon filter!")
+            msg.setWindowTitle("No dataset loaded")
+            msg.exec()
+        else:
+            self.toolButton_quick_view.setChecked(True)
+            self.mdiArea.setActiveSubWindow(self.subwindows["quick_view"])
+            if not self.widget_quick_view.current_pipeline_element:
+                # select the first item in the pipeline
+                self.pp_mod_send.emit({"quickview": {
+                    "slot_index": 0,
+                    "filt_index": 0,
+                    "slot_id": self.pipeline.slot_ids[0],
+                    "filt_id": self.pipeline.filter_ids[0],
+                }})
+
             # adjusts QuickView size correctly
             self.widget_quick_view.on_tool()
+            self.widget_quick_view.on_poly_modify(polygon_filter_id)
 
     @widgets.show_wait_cursor
     @QtCore.pyqtSlot(str)
     def on_modify_filter(self, filt_id):
+        self.mdiArea.setActiveSubWindow(self.subwindows["analysis_view"])
         self.widget_ana_view.tabWidget.setCurrentWidget(
             self.widget_ana_view.tab_filter)
         self.widget_ana_view.widget_filter.show_filter(filt_id)
@@ -822,6 +864,7 @@ class DCscope(QtWidgets.QMainWindow):
     @widgets.show_wait_cursor
     @QtCore.pyqtSlot(str)
     def on_modify_plot(self, plot_id):
+        self.mdiArea.setActiveSubWindow(self.subwindows["analysis_view"])
         self.widget_ana_view.tabWidget.setCurrentWidget(
             self.widget_ana_view.tab_plot)
         self.widget_ana_view.widget_plot.show_plot(plot_id)
@@ -835,6 +878,7 @@ class DCscope(QtWidgets.QMainWindow):
     @widgets.show_wait_cursor
     @QtCore.pyqtSlot(str)
     def on_modify_slot(self, slot_id):
+        self.mdiArea.setActiveSubWindow(self.subwindows["analysis_view"])
         self.widget_ana_view.tabWidget.setCurrentWidget(
             self.widget_ana_view.tab_slot)
         self.widget_ana_view.widget_slot.show_slot(slot_id)
@@ -880,6 +924,7 @@ class DCscope(QtWidgets.QMainWindow):
             if not self.subwindows["quick_view"].isVisible():
                 self.toolButton_quick_view.setChecked(True)
                 self.subwindows["quick_view"].setVisible(True)
+            self.mdiArea.setActiveSubWindow(self.subwindows["quick_view"])
 
         # Send new signal to all receivers
         self.pp_mod_recv.emit(data)

{dcscope-2.25.4 → dcscope-2.26.0}/dcscope/gui/pipeline_plot.py

@@ -10,7 +10,7 @@ from pyqtgraph import exporters
 from pyqtgraph.graphicsItems.GradientEditorItem import Gradients
 
 
-from .. import plot_cache
+from .. import plotting
 from .. import util
 from .widgets import DCscopeColorBarItem
 
@@ -603,7 +603,7 @@ def add_scatter(plot_item, plot_state, rtdc_ds, slot_state, hash_flag):
     else:
         kde_type = "none"
 
-    x, y, kde, idx = plot_cache.get_scatter_data(
+    x, y, kde, idx = plotting.get_scatter_data(
         rtdc_ds=rtdc_ds,
         downsample=sca["downsample"] * sca["downsampling value"],
         xax=gen["axis x"],
@@ -674,7 +674,7 @@ def add_scatter(plot_item, plot_state, rtdc_ds, slot_state, hash_flag):
 def compute_contours(plot_state, rtdc_ds):
     gen = plot_state["general"]
     con = plot_state["contour"]
-    contours = plot_cache.get_contour_data(
+    contours = plotting.get_contour_lines(
         rtdc_ds=rtdc_ds,
         xax=gen["axis x"],
         yax=gen["axis y"],