myokit 1.34.0__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
 
@@ -39,12 +32,6 @@ try:
 except ImportError:
     has_scipy = False
 
-# ConfigParser in Python 2 and 3
-try:
-    import ConfigParser as configparser
-except ImportError:
-    import configparser
-
 
 # Application title
 TITLE = 'Myokit DataLog Viewer (PROTOTYPE)'
@@ -115,7 +102,7 @@ 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__)
@@ -123,7 +110,7 @@ class DataLogViewer(myokit.gui.MyokitApplication):
         # 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())
 
@@ -276,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'))
@@ -285,7 +272,7 @@ 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'))
@@ -294,7 +281,7 @@ class DataLogViewer(myokit.gui.MyokitApplication):
         # View menu
         self._menu_view = self._menu.addMenu('&View')
         # View > Next file
-        self._tool_next_file = QtWidgets.QAction('Next file', self)
+        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)
@@ -302,21 +289,21 @@ class DataLogViewer(myokit.gui.MyokitApplication):
         self._menu_view.addAction(self._tool_next_file)
         # View > Previous file
         self._menu_view.addAction(self._tool_next_file)
-        self._tool_prev_file = QtWidgets.QAction('Previous file', self)
+        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 = QtWidgets.QAction('Next variable', self)
+        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 = QtWidgets.QAction('Previous variable', self)
+        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)
@@ -325,12 +312,12 @@ class DataLogViewer(myokit.gui.MyokitApplication):
         # 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)
@@ -342,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()
 
@@ -508,7 +496,7 @@ class DataLogViewer(myokit.gui.MyokitApplication):
         """
         Shows this viewer.
         """
-        super(DataLogViewer, self).show()
+        super().show()
         QtWidgets.QApplication.processEvents()
 
     def fileTabChangeEvent(self, index):
@@ -555,9 +543,9 @@ 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 = []
@@ -649,7 +637,7 @@ class AbfTab(TabWidget):
             axes.cla()
         del self._figures, self._axes
         gc.collect()
-        super(AbfTab, self).deleteLater()
+        super().deleteLater()
 
 
 class AtfTab(TabWidget):
@@ -657,11 +645,11 @@ 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 = []
@@ -720,7 +708,7 @@ class AtfTab(TabWidget):
             axes.cla()
         del self._figures, self._axes
         gc.collect()
-        super(AtfTab, self).deleteLater()
+        super().deleteLater()
 
 
 class CsvTab(TabWidget):
@@ -730,9 +718,9 @@ class CsvTab(TabWidget):
     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 = []
@@ -819,7 +807,7 @@ class CsvTab(TabWidget):
             axes.cla()
         del self._figures, self._axes
         gc.collect()
-        super(CsvTab, self).deleteLater()
+        super().deleteLater()
 
 
 class MatTab(TabWidget):
@@ -827,9 +815,9 @@ 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 = []
@@ -907,7 +895,7 @@ class MatTab(TabWidget):
             axes.cla()
         del self._figures, self._axes
         gc.collect()
-        super(MatTab, self).deleteLater()
+        super().deleteLater()
 
 
 class TxtTab(TabWidget):
@@ -915,9 +903,9 @@ 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 = []
@@ -989,7 +977,7 @@ class TxtTab(TabWidget):
             axes.cla()
         del self._figures, self._axes
         gc.collect()
-        super(TxtTab, self).deleteLater()
+        super().deleteLater()
 
 
 class WcpTab(TabWidget):
@@ -997,9 +985,9 @@ 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 = []
@@ -1044,5 +1032,5 @@ class WcpTab(TabWidget):
             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: