myokit 1.33.9__py3-none-any.whl → 1.35.0__py3-none-any.whl

myokit/gui/datalog_viewer.py

@@ -4,23 +4,16 @@
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
 #
-from __future__ import absolute_import, division
-from __future__ import print_function, unicode_literals
-
-# Standard library imports
+import configparser
 import gc
 import os
 import sys
 import traceback
 
-# Qt imports
 from myokit.gui import QtWidgets, QtGui, QtCore, Qt
 
-# Myokit
 import myokit
 import myokit.gui
-
-# Myokit components
 import myokit.formats.axon
 import myokit.formats.wcp
 
@@ -32,11 +25,12 @@ from myokit.gui import matplotlib_backend as backend
 # NumPy
 import numpy as np
 
-# ConfigParser in Python 2 and 3
+# SciPy: Only used to load matlab files.
 try:
-    import ConfigParser as configparser
+    import scipy.io
+    has_scipy = True
 except ImportError:
-    import configparser
+    has_scipy = False
 
 
 # Application title
@@ -108,33 +102,62 @@ class DataLogViewer(myokit.gui.MyokitApplication):
     Graphical interface for viewing DataLog data.
     """
     def __init__(self, *filenames):
-        super(DataLogViewer, self).__init__()
+        super().__init__()
+
         # Set Title, icon
         self.setWindowTitle(TITLE + ' ' + myokit.__version__)
+
         # Set size, center
         self.resize(800, 600)
         qr = self.frameGeometry()
-        cp = QtWidgets.QDesktopWidget().availableGeometry().center()
+        cp = QtGui.QGuiApplication.primaryScreen().availableGeometry().center()
         qr.moveCenter(cp)
         self.move(qr.topLeft())
-        # Add widget for Abf file tabs
-        self._tabs = QtWidgets.QTabWidget()
+
+        # Add widget for file tabs
+        self._tabs = TabWidget()
         self._tabs.setTabsClosable(True)
         self._tabs.tabCloseRequested.connect(self.action_close)
+        self._tabs.currentChanged.connect(self.fileTabChangeEvent)
         self.setCentralWidget(self._tabs)
+
         # Menu bar
         self.create_menu()
+
         # Tool bar
         self.create_toolbar()
+
         # Status bar
         self.statusBar().showMessage('Ready')
+
         # Current path
         self._path = QtCore.QDir.currentPath()
+
         # Load settings from ini file
         self.load_config()
+
+        # File-loading methods
+        self._load_actions = {
+            '.abf': self.load_abf_file,
+            '.atf': self.load_atf_file,
+            '.csv': self.load_datalog,
+            '.pro': self.load_abf_file,
+            '.txt': self.load_txt_file,
+            '.wcp': self.load_wcp_file,
+            '.zip': self.load_datalog,
+        }
+        if has_scipy:
+            self._load_actions['.mat'] = self.load_mat_file
+
         # Load any selected files
         for filename in filenames:
             self.load_file(filename)
+        tc = self._tabs.count()
+        if tc > 0:
+            if tc > 1:
+                self._tool_next_file.setEnabled(True)
+                self._tool_prev_file.setEnabled(True)
+            self._tabs.setCurrentIndex(0)
 
     def action_about(self):
         """
@@ -146,8 +169,16 @@ class DataLogViewer(myokit.gui.MyokitApplication):
         """
         Called when a tab should be closed
         """
+        # Remove tab
         tab = self._tabs.widget(index)
         self._tabs.removeTab(index)
+
+        # Update buttons
+        if self._tabs.count() < 2:
+            self._tool_next_file.setEnabled(False)
+            self._tool_prev_file.setEnabled(False)
+
+        # Delete tab
         if tab is not None:
             tab.deleteLater()
         gc.collect()
@@ -168,13 +199,49 @@ class DataLogViewer(myokit.gui.MyokitApplication):
         if filenames:
             # Save current number of tabs
             tab_count = self._tabs.count()
+
             # Load files
             for filename in filenames:
                 self.load_file(str(filename))
+
             # If loading went ok, show first of newly loaded files
-            if self._tabs.count() > tab_count:
+            tab_count_new = self._tabs.count()
+            if tab_count_new > tab_count:
                 self._tabs.setCurrentIndex(tab_count)
 
+                # Enable next/previous file menu items
+                if tab_count_new > 1:
+                    self._tool_next_file.setEnabled(True)
+                    self._tool_prev_file.setEnabled(True)
+
+    def action_next_file(self):
+        """
+        Select the next open file.
+        """
+        self._tabs.next()
+
+    def action_next_var(self):
+        """
+        Select the next variable in the selected file.
+        """
+        tab = self._tabs.currentWidget()
+        if tab:
+            tab.next()
+
+    def action_prev_file(self):
+        """
+        Select the previous open file.
+        """
+        self._tabs.previous()
+
+    def action_prev_var(self):
+        """
+        Select the previous variable in the selected file
+        """
+        tab = self._tabs.currentWidget()
+        if tab:
+            tab.previous()
+
     def closeEvent(self, event=None):
         """
         Called when window is closed. To force a close (and trigger this
@@ -196,7 +263,7 @@ class DataLogViewer(myokit.gui.MyokitApplication):
         # File menu
         self._menu_file = self._menu.addMenu('&File')
         # File > Open
-        self._tool_open = QtWidgets.QAction('&Open', self)
+        self._tool_open = QtGui.QAction('&Open', self)
         self._tool_open.setShortcut('Ctrl+O')
         self._tool_open.setStatusTip('Open a file')
         self._tool_open.setIcon(QtGui.QIcon.fromTheme('document-open'))
@@ -205,21 +272,52 @@ class DataLogViewer(myokit.gui.MyokitApplication):
         # File > ----
         self._menu_file.addSeparator()
         # File > Quit
-        self._tool_exit = QtWidgets.QAction('&Quit', self)
+        self._tool_exit = QtGui.QAction('&Quit', self)
         self._tool_exit.setShortcut('Ctrl+Q')
         self._tool_exit.setStatusTip('Exit application.')
         self._tool_exit.setIcon(QtGui.QIcon.fromTheme('application-exit'))
         self._tool_exit.triggered.connect(self.close)
         self._menu_file.addAction(self._tool_exit)
+        # View menu
+        self._menu_view = self._menu.addMenu('&View')
+        # View > Next file
+        self._tool_next_file = QtGui.QAction('Next file', self)
+        self._tool_next_file.setShortcut('Ctrl+PgDown')
+        self._tool_next_file.setStatusTip('Select the next open file')
+        self._tool_next_file.triggered.connect(self.action_next_file)
+        self._tool_next_file.setEnabled(False)
+        self._menu_view.addAction(self._tool_next_file)
+        # View > Previous file
+        self._menu_view.addAction(self._tool_next_file)
+        self._tool_prev_file = QtGui.QAction('Previous file', self)
+        self._tool_prev_file.setShortcut('Ctrl+PgUp')
+        self._tool_prev_file.setStatusTip('Select the previous open file')
+        self._tool_prev_file.triggered.connect(self.action_prev_file)
+        self._tool_prev_file.setEnabled(False)
+        self._menu_view.addAction(self._tool_prev_file)
+        # View > Next variable
+        self._tool_next_var = QtGui.QAction('Next variable', self)
+        self._tool_next_var.setShortcut('PgDown')
+        self._tool_next_var.setStatusTip('Show the next variable')
+        self._tool_next_var.triggered.connect(self.action_next_var)
+        self._tool_next_var.setEnabled(False)
+        self._menu_view.addAction(self._tool_next_var)
+        # View > Previous var
+        self._tool_prev_var = QtGui.QAction('Previous variable', self)
+        self._tool_prev_var.setShortcut('PgUp')
+        self._tool_prev_var.setStatusTip('Show the previous variable')
+        self._tool_prev_var.triggered.connect(self.action_prev_var)
+        self._tool_prev_var.setEnabled(False)
+        self._menu_view.addAction(self._tool_prev_var)
         # Help menu
         self._menu_help = self._menu.addMenu('&Help')
         # Help > About
-        self._tool_about = QtWidgets.QAction('&About', self)
+        self._tool_about = QtGui.QAction('&About', self)
         self._tool_about.setStatusTip('View information about this program.')
         self._tool_about.triggered.connect(self.action_about)
         self._menu_help.addAction(self._tool_about)
         # Help > License
-        self._tool_license = QtWidgets.QAction('&License', self)
+        self._tool_license = QtGui.QAction('&License', self)
         self._tool_license.setStatusTip('View this program\'s license info.')
         self._tool_license.triggered.connect(self.action_license)
         self._menu_help.addAction(self._tool_license)
@@ -231,7 +329,8 @@ class DataLogViewer(myokit.gui.MyokitApplication):
         self._toolbar = self.addToolBar('tools')
         self._toolbar.setFloatable(False)
         self._toolbar.setMovable(False)
-        self._toolbar.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
+        self._toolbar.setToolButtonStyle(
+            Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
         self._toolbar.addAction(self._tool_open)
         #self._toolbar.addSeparator()
 
@@ -274,18 +373,8 @@ class DataLogViewer(myokit.gui.MyokitApplication):
         Loads a data file.
         """
         root, ext = os.path.splitext(os.path.basename(filename))
-        actions = {
-            '.abf': self.load_abf_file,
-            '.atf': self.load_atf_file,
-            '.csv': self.load_datalog,
-            '.mat': self.load_mat_file,
-            '.pro': self.load_abf_file,
-            '.txt': self.load_txt_file,
-            '.wcp': self.load_wcp_file,
-            '.zip': self.load_datalog,
-        }
         try:
-            action = actions[ext.lower()]
+            action = self._load_actions[ext.lower()]
         except KeyError:
             QtWidgets.QMessageBox.critical(
                 self, TITLE, 'File format not recognized: ' + ext)
@@ -344,8 +433,7 @@ class DataLogViewer(myokit.gui.MyokitApplication):
         This method requires ``SciPy`` to be installed.
         """
         try:
-            from scipy.io import loadmat
-            mat = loadmat(filename)
+            mat = scipy.io.loadmat(filename)
         except Exception:
             e = traceback.format_exc()
             QtWidgets.QMessageBox.critical(self, TITLE, e)
@@ -408,18 +496,56 @@ class DataLogViewer(myokit.gui.MyokitApplication):
         """
         Shows this viewer.
         """
-        super(DataLogViewer, self).show()
+        super().show()
         QtWidgets.QApplication.processEvents()
 
+    def fileTabChangeEvent(self, index):
+        """
+        Different file tab selected.
+        """
+        if index >= 0:
+            tab = self._tabs.widget(index)
+            if tab.count() > 1:
+                self._tool_prev_var.setEnabled(True)
+                self._tool_next_var.setEnabled(True)
+                return
+        self._tool_prev_var.setEnabled(False)
+        self._tool_next_var.setEnabled(False)
+
+
+class TabWidget(QtWidgets.QTabWidget):
+    """
+    Tab widget that can move up and down when asked.
+    """
+    def next(self):
+        """
+        Select the next widget.
+        """
+        n = self.count()
+        if n < 2:
+            return
+        i = self.currentIndex() + 1
+        self.setCurrentIndex(0 if i >= n else i)
+
+    def previous(self):
+        """
+        Select the previous widget.
+        """
+        n = self.count()
+        if n < 2:
+            return
+        i = self.currentIndex() - 1
+        self.setCurrentIndex(n - 1 if i < 0 else i)
 
-class AbfTab(QtWidgets.QTabWidget):
+
+class AbfTab(TabWidget):
     """
     A widget displaying an ABF file.
     """
     def __init__(self, parent, abf):
-        super(AbfTab, self).__init__(parent)
+        super().__init__(parent)
         self.setTabsClosable(False)
-        self.setTabPosition(self.East)
+        self.setTabPosition(self.TabPosition.East)
         self._abf = abf
         self._figures = []
         self._axes = []
@@ -511,19 +637,19 @@ class AbfTab(QtWidgets.QTabWidget):
             axes.cla()
         del self._figures, self._axes
         gc.collect()
-        super(AbfTab, self).deleteLater()
+        super().deleteLater()
 
 
-class AtfTab(QtWidgets.QTabWidget):
+class AtfTab(TabWidget):
     """
     A widget displaying an AGF file.
     """
     def __init__(self, parent, atf):
-        super(AtfTab, self).__init__(parent)
+        super().__init__(parent)
         self._atf = atf
 
         self.setTabsClosable(False)
-        self.setTabPosition(self.East)
+        self.setTabPosition(self.TabPosition.East)
 
         self._figures = []
         self._axes = []
@@ -582,19 +708,19 @@ class AtfTab(QtWidgets.QTabWidget):
             axes.cla()
         del self._figures, self._axes
         gc.collect()
-        super(AtfTab, self).deleteLater()
+        super().deleteLater()
 
 
-class CsvTab(QtWidgets.QTabWidget):
+class CsvTab(TabWidget):
     """
     A widget displaying a CSV file.
 
     The given log must have a time variable set.
     """
     def __init__(self, parent, log, filename):
-        super(CsvTab, self).__init__(parent)
+        super().__init__(parent)
         self.setTabsClosable(False)
-        self.setTabPosition(self.East)
+        self.setTabPosition(self.TabPosition.East)
         self._log = log.npview()
         self._filename = filename
         self._figures = []
@@ -619,17 +745,33 @@ class CsvTab(QtWidgets.QTabWidget):
                 self, TITLE, 'Unable to load file: no data found.')
             return
 
-        # Add tab for each column
-        for k, v in log.items():
-            if k == time:
+        # Overlapping sweeps or neighboring cells?
+        keys = []
+        groups = {}
+        for key in log.keys():
+            if key == time:
                 continue
-            self.addTab(self.create_graph_tab(k, v), k)
+            index, var = myokit.split_key(key)
+            if index:
+                group = groups.get(var, None)
+                if group is None:
+                    groups[var] = [index]
+                    keys.append(var)
+                else:
+                    group.append(index)
+            else:
+                keys.append(var)
+
+        # Add tab for each column
+        for k in keys:
+            self.addTab(self.create_graph_tab(k, groups.get(k)), k)
 
-    def create_graph_tab(self, key, data):
+    def create_graph_tab(self, key, indices=None):
         """
-        Creates a widget displaying the ``data`` stored under ``key``.
+        Creates a widget displaying the data stored under ``key``.
         """
         widget = QtWidgets.QWidget(self)
+
         # Create figure
         figure = matplotlib.figure.Figure()
         figure.suptitle(self._filename)
@@ -638,8 +780,14 @@ class CsvTab(QtWidgets.QTabWidget):
         axes = figure.add_subplot(1, 1, 1)
         axes.set_title(key)
         toolbar = backend.NavigationToolbar2QT(canvas, widget)
+
         # Draw lines
-        axes.plot(self._time, data)
+        if indices is None:
+            axes.plot(self._time, self._log[key])
+        else:
+            for i in indices:
+                axes.plot(self._time, self._log[i + key])
+
         # Create a layout
         vbox = QtWidgets.QVBoxLayout()
         vbox.addWidget(canvas)
@@ -659,17 +807,17 @@ class CsvTab(QtWidgets.QTabWidget):
             axes.cla()
         del self._figures, self._axes
         gc.collect()
-        super(CsvTab, self).deleteLater()
+        super().deleteLater()
 
 
-class MatTab(QtWidgets.QTabWidget):
+class MatTab(TabWidget):
     """
     A widget displaying a MAT file.
     """
     def __init__(self, parent, mat, filename):
-        super(MatTab, self).__init__(parent)
+        super().__init__(parent)
         self.setTabsClosable(False)
-        self.setTabPosition(self.East)
+        self.setTabPosition(self.TabPosition.East)
         self._figures = []
         self._filename = filename
         self._axes = []
@@ -747,17 +895,17 @@ class MatTab(QtWidgets.QTabWidget):
             axes.cla()
         del self._figures, self._axes
         gc.collect()
-        super(MatTab, self).deleteLater()
+        super().deleteLater()
 
 
-class TxtTab(QtWidgets.QTabWidget):
+class TxtTab(TabWidget):
     """
     A widget displaying a TXT file (with lots of heuristics!).
     """
     def __init__(self, parent, data, filename):
-        super(TxtTab, self).__init__(parent)
+        super().__init__(parent)
         self.setTabsClosable(False)
-        self.setTabPosition(self.East)
+        self.setTabPosition(self.TabPosition.East)
         self._figures = []
         self._filename = filename
         self._axes = []
@@ -829,17 +977,17 @@ class TxtTab(QtWidgets.QTabWidget):
             axes.cla()
         del self._figures, self._axes
         gc.collect()
-        super(TxtTab, self).deleteLater()
+        super().deleteLater()
 
 
-class WcpTab(QtWidgets.QTabWidget):
+class WcpTab(TabWidget):
     """
     A widget displaying a WCP file.
     """
     def __init__(self, parent, wcp):
-        super(WcpTab, self).__init__(parent)
+        super().__init__(parent)
         self.setTabsClosable(False)
-        self.setTabPosition(self.East)
+        self.setTabPosition(self.TabPosition.East)
         self._wcp = wcp
         self._figures = []
         self._axes = []
@@ -884,5 +1032,5 @@ class WcpTab(QtWidgets.QTabWidget):
             axes.cla()
         del self._figures, self._axes
         gc.collect()
-        super(WcpTab, self).deleteLater()
+        super().deleteLater()
 

myokit/gui/explorer.py

@@ -4,25 +4,16 @@
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
 #
-from __future__ import absolute_import, division
-from __future__ import print_function, unicode_literals
-
-# Standard library imports
-
-# Myokit
 import myokit
+import myokit.gui
 
-# Qt imports
 from myokit.gui import QtCore, QtGui, QtWidgets
-
-# GUI components
-import myokit.gui
+from myokit.gui import matplotlib_backend as backend
 from . import progress
 
 # Matplotlib (must be imported _after_ gui has had chance to set backend)
 import matplotlib
 import matplotlib.figure
-from myokit.gui import matplotlib_backend as backend
 
 
 # Constants
@@ -44,7 +35,7 @@ class Explorer(QtWidgets.QDialog):
     *Extends:* ``QtWidgets.QDialog``
     """
     def __init__(self, parent, sim_method, output_stream, duration=1000):
-        super(Explorer, self).__init__(parent)
+        super().__init__(parent)
         self.setWindowTitle('Myokit Explorer')
         self._sim_method = sim_method
         self._stream = output_stream
@@ -84,7 +75,8 @@ class Explorer(QtWidgets.QDialog):
         self._close_button = QtWidgets.QPushButton('Close')
         self._close_button.clicked.connect(self.action_close)
         # Create button layout
-        button_layout = QtWidgets.QBoxLayout(QtWidgets.QBoxLayout.LeftToRight)
+        button_layout = QtWidgets.QBoxLayout(
+            QtWidgets.QBoxLayout.Direction.LeftToRight)
         button_layout.addWidget(label1)
         button_layout.addWidget(self._pre_field)
         button_layout.addWidget(label2)
@@ -93,14 +85,16 @@ class Explorer(QtWidgets.QDialog):
         button_layout.addWidget(self._run_button)
         # Create graph options layout
         graph_option_layout = QtWidgets.QBoxLayout(
-            QtWidgets.QBoxLayout.LeftToRight)
+            QtWidgets.QBoxLayout.Direction.LeftToRight)
         graph_option_layout.addWidget(self._select_x)
         graph_option_layout.addWidget(self._select_y)
         # Create bottom layout
-        bottom_layout = QtWidgets.QBoxLayout(QtWidgets.QBoxLayout.LeftToRight)
+        bottom_layout = QtWidgets.QBoxLayout(
+            QtWidgets.QBoxLayout.Direction.LeftToRight)
         bottom_layout.addWidget(self._close_button)
         # Create central layout
-        layout = QtWidgets.QBoxLayout(QtWidgets.QBoxLayout.TopToBottom)
+        layout = QtWidgets.QBoxLayout(
+            QtWidgets.QBoxLayout.Direction.TopToBottom)
         layout.addLayout(button_layout)
         layout.addLayout(graph_option_layout)
         layout.addWidget(self._canvas)
@@ -155,11 +149,11 @@ class Explorer(QtWidgets.QDialog):
         """
         pbar = progress.ProgressBar(self, 'Creating simulation')
         QtWidgets.QApplication.processEvents(
-            QtCore.QEventLoop.ExcludeUserInputEvents)
+            QtCore.QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
         try:
             pbar.show()
             QtWidgets.QApplication.processEvents(
-                QtCore.QEventLoop.ExcludeUserInputEvents)
+                QtCore.QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
             # Create and run simulation
             out = self._sim_method()
             if type(out) == str:
@@ -168,7 +162,7 @@ class Explorer(QtWidgets.QDialog):
             else:
                 m, p, s = out
             QtWidgets.QApplication.processEvents(
-                QtCore.QEventLoop.ExcludeUserInputEvents)
+                QtCore.QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
             pre = float(self._pre_field.text())
             run = float(self._run_field.text())
             if pre:
@@ -176,7 +170,7 @@ class Explorer(QtWidgets.QDialog):
             d = s.run(run, progress=pbar.reporter()).npview()
             self._stream.write('Final state: \n' + m.format_state(s.state()))
             QtWidgets.QApplication.processEvents(
-                QtCore.QEventLoop.ExcludeUserInputEvents)
+                QtCore.QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
         except myokit.SimulationCancelledError:
             return
         except myokit.MyokitError as e:
@@ -189,7 +183,7 @@ class Explorer(QtWidgets.QDialog):
             pbar.close()
             pbar.deleteLater()
             QtWidgets.QApplication.processEvents(
-                QtCore.QEventLoop.ExcludeUserInputEvents)
+                QtCore.QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
         # Reset combo-box keys?
         reset_keys = True
         if self._keys: