diff --git a/pychron/core/ui/qt/tabular_editor.py b/pychron/core/ui/qt/tabular_editor.py index e7f6736f9..50e50871e 100644 --- a/pychron/core/ui/qt/tabular_editor.py +++ b/pychron/core/ui/qt/tabular_editor.py @@ -19,7 +19,6 @@ from pickle import dumps import six -from PyQt5.QtCore import QSize from pyface.qt import QtCore, QtGui from pyface.qt.QtGui import QHeaderView, QApplication from traits.api import ( @@ -377,7 +376,7 @@ def sizeHint(self): try: return super(_TableView, self).sizeHint() except TypeError: - return QSize() + return QtCore.QSize() # private def _copy(self): diff --git a/pychron/core/ui/qt/video_editor.py b/pychron/core/ui/qt/video_editor.py index 9d7cf2218..aca17496f 100644 --- a/pychron/core/ui/qt/video_editor.py +++ b/pychron/core/ui/qt/video_editor.py @@ -13,17 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. # =============================================================================== -from PyQt5 import QtWidgets -from PyQt5.QtCore import QTimer, QSize, Qt, QPoint -from PyQt5.QtGui import QImage, QPixmap, QPainter, QPen -from pyface.qt import QtCore +from pyface.qt import QtWidgets, QtCore +from pyface.qt.QtCore import QTimer, QSize, Qt, QPoint +from pyface.qt.QtGui import QImage, QPixmap, QPainter, QPen, QLabel from traitsui.basic_editor_factory import BasicEditorFactory try: import vlc except ImportError: pass -from PyQt5.QtWidgets import QLabel from traitsui.qt4.editor import Editor from traits.api import Any diff --git a/pychron/envisage/tasks/actions.py b/pychron/envisage/tasks/actions.py index 125cd5449..09de35c92 100644 --- a/pychron/envisage/tasks/actions.py +++ b/pychron/envisage/tasks/actions.py @@ -45,8 +45,8 @@ def get_key_binding(k_id): try: return user_key_map[k_id][0] - except KeyError: - pass + except (KeyError, IndexError, TypeError) as e: + print(f'Key binding "{k_id}" not found. {e}') class myTaskAction(TaskAction): diff --git a/pychron/experiment/utilities/human_error_checker.py b/pychron/experiment/utilities/human_error_checker.py index 7be532d29..b4651d8b7 100644 --- a/pychron/experiment/utilities/human_error_checker.py +++ b/pychron/experiment/utilities/human_error_checker.py @@ -250,6 +250,12 @@ def _check_run(self, run, inform, test): # self._mass_spec_required = True self._set_extraction_line_required(run) + # check for syn extraction + if run.extraction_script: + if "syn" in run.extraction_script: + if not run.syn_extraction_script: + return "syn extraction script missing" + def _set_extraction_line_required(self, run): if any( ( diff --git a/pychron/image/toupcam/camera_v2.py b/pychron/image/toupcam/camera_v2.py index b11d03aa9..b9b9c6d2f 100644 --- a/pychron/image/toupcam/camera_v2.py +++ b/pychron/image/toupcam/camera_v2.py @@ -21,7 +21,7 @@ from copy import copy from io import StringIO from PIL import Image -from PyQt5.QtGui import QImage +from pyface.qt.QtGui import QImage from numpy import zeros, uint8, uint32 # ============= enthought library imports ======================= diff --git a/pychron/updater/library_manager.py b/pychron/updater/library_manager.py index 847b214af..2ce15d808 100644 --- a/pychron/updater/library_manager.py +++ b/pychron/updater/library_manager.py @@ -17,7 +17,7 @@ import subprocess import sys -from PyQt5.QtWidgets import QApplication +from pyface.qt.QtGui import QApplication from traits.api import HasTraits, Str, List, Int, Button from traitsui.api import View, UItem, Item, TabularEditor, HGroup from traitsui.tabular_adapter import TabularAdapter