From c29c764c9d2bc49c82d4164f5c5a32183df7035a Mon Sep 17 00:00:00 2001
From: Eric Lacosse <eric.lacosse@tuebingen.mpg.de>
Date: Mon, 30 Jan 2017 19:01:41 +0100
Subject: [PATCH] fixed issue 15
---
vviewer/loadImage.py | 1 -
vviewer/vviewer.py | 8 +++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/vviewer/loadImage.py b/vviewer/loadImage.py
index 165881d..ffc32b1 100644
--- a/vviewer/loadImage.py
+++ b/vviewer/loadImage.py
@@ -22,7 +22,6 @@ import ImageDialog
import Image3D
import Image4D
-
try:
import pyvista
except ImportError:
diff --git a/vviewer/vviewer.py b/vviewer/vviewer.py
index c7ce789..3ce8e0a 100755
--- a/vviewer/vviewer.py
+++ b/vviewer/vviewer.py
@@ -26,6 +26,8 @@ by these sections:
"""
from pyqtgraph.Qt import QtCore, QtGui
+#import sip
+#sip.setapi('QString', 2)
#from qt import QtCore, QtGui
import numpy as np
import math
@@ -824,7 +826,7 @@ class vviewer(QtGui.QMainWindow):
for i in range(len(filename_list)):
img = loadImage.loadImageFromFile(
- filename_list[i], self.preferences, type_list[i])
+ unicode(filename_list[i]), self.preferences, type_list[i])
# Saves the first part of the path as 'prefered_path'.
self.prefered_path = "/".join(filename_list[i].split('/')[:-1])
# Connects changes in the image dialog with rerendering the image.
@@ -1008,7 +1010,7 @@ class vviewer(QtGui.QMainWindow):
Loads a new file.
"""
# Gets the image instance from loadImage.
- img = loadImage.loadImageFromFile(filename, self.preferences, 0)
+ img = loadImage.loadImageFromFile(unicode(filename), self.preferences, 0)
# save path as prefered
self.prefered_path = "/".join(filename.split('/')[:-1])
img.dialog.sigImageChanged.connect(self.updateImages)
@@ -1089,7 +1091,7 @@ class vviewer(QtGui.QMainWindow):
# Go through list and add them one by one.
if fnames != []:
for filename in fnames:
- self.loadNewImage(filename)
+ self.loadNewImage(unicode(filename))
def deleteImage(self):
"""
--
GitLab