Use relative imports in skimage files

This commit is contained in:
Johannes Schönberger
2015-01-22 07:36:48 -05:00
parent ea95b5419b
commit ee5c6fbeb2
67 changed files with 149 additions and 155 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
__all__ = ['imread', 'imsave']
from skimage.util.dtype import convert
from ...util.dtype import convert
try:
import imread as _imread
@@ -33,7 +33,7 @@ def imsave(fname, arr, format_str=None):
arr : ndarray of uint8 or uint16
Array (image) to save.
format_str: str,optional
Format to save as.
Format to save as.
Notes
-----
+2 -3
View File
@@ -4,9 +4,8 @@ import numpy as np
from six import string_types
from PIL import Image
from skimage.util import img_as_ubyte, img_as_uint
from skimage.external.tifffile import (
imread as tif_imread, imsave as tif_imsave)
from ...util import img_as_ubyte, img_as_uint
from ...external.tifffile import imread as tif_imread, imsave as tif_imsave
def imread(fname, dtype=None, img_num=None, **kwargs):
+2 -2
View File
@@ -209,7 +209,7 @@ class SkiviImageWindow(QMainWindow):
self.rgb_hsv_disp.update_vals((x, y, r, g, b, h, s, v))
def save_to_stack(self):
from skimage import io
from ... import io
img = self.arr.copy()
io.push(img)
msg = dedent('''
@@ -227,7 +227,7 @@ class SkiviImageWindow(QMainWindow):
dialog.exec_()
def save_to_file(self):
from skimage import io
from ... import io
filename = str(QtGui.QFileDialog.getSaveFileName())
if len(filename) == 0:
return
+1 -1
View File
@@ -1 +1 @@
from skimage.external.tifffile import imread, imsave
from ...external.tifffile import imread, imsave
+1 -1
View File
@@ -2,7 +2,7 @@ import numpy as np
from . import _colormixer
from . import _histograms
import threading
from skimage.util import img_as_ubyte
from ...util import img_as_ubyte
# utilities to make life easier for plugin writers.