From c7fa6206cf1efef7af35ee98b825bf2251726399 Mon Sep 17 00:00:00 2001 From: tonysyu Date: Fri, 17 May 2013 17:12:52 -0500 Subject: [PATCH] Add PySide compatibility for save dialogs --- skimage/viewer/utils/dialogs.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/skimage/viewer/utils/dialogs.py b/skimage/viewer/utils/dialogs.py index 849fcad7..642166ae 100644 --- a/skimage/viewer/utils/dialogs.py +++ b/skimage/viewer/utils/dialogs.py @@ -1,9 +1,6 @@ import os -try: - from PyQt4 import QtGui -except ImportError: - print("Could not import PyQt4 -- skimage.viewer not available.") +from ..qt import QtGui def open_file_dialog(default_format='png'): @@ -16,7 +13,12 @@ def open_file_dialog(default_format='png'): def save_file_dialog(default_format='png'): """Return user-selected file path.""" - filename = str(QtGui.QFileDialog.getSaveFileName()) + filename = QtGui.QFileDialog.getSaveFileName() + # Handle discrepancy between PyQt4 and PySide APIs. + if isinstance(filename, tuple): + filename = filename[0] + filename = str(filename) + if len(filename) == 0: return None #TODO: io plugins should assign default image formats