Merge pull request #120 from stefanv/scivi_rename

PKG: Rename scivi to skivi.

DEPENDS.txt

@@ -25,5 +25,5 @@ You can use this scikit with the basic requirements listed above, but some
 functionality is only available with the following installed:
 
 `PyQt4 <http://wiki.python.org/moin/PyQt>`_
-   The `qt` plugin that provides ``imshow(x, fancy=True)`` and `scivi`.
+   The `qt` plugin that provides ``imshow(x, fancy=True)`` and `skivi`.
 

setup.py

@@ -95,7 +95,7 @@ if __name__ == "__main__":
 
         entry_points={
             'console_scripts': [
-                'scivi = skimage.scripts.scivi:main']
+                'skivi = skimage.scripts.skivi:main']
             },
 
         cmdclass={'build_py': build_py},

skimage/io/_plugins/qt_plugin.py

@@ -134,8 +134,8 @@ def imshow(arr, fancy=False):
     if not fancy:
         iw = ImageWindow(arr, window_manager)
     else:
-        from scivi import SciviImageWindow
-        iw = SciviImageWindow(arr, window_manager)
+        from skivi import SkiviImageWindow
+        iw = SkiviImageWindow(arr, window_manager)
 
     iw.show()
 

skimage/io/_plugins/skivi.py

@@ -1,15 +1,15 @@
 '''
-Scivi is written/maintained/developed by:
+Skivi is written/maintained/developed by:
 
 S. Chris Colbert - sccolbert@gmail.com
 
-Scivi is free software and is part of the scikits-image project.
+Skivi is free software and is part of the scikits-image project.
 
-Scivi is governed by the licenses of the scikits-image project.
+Skivi is governed by the licenses of the scikits-image project.
 
 Please report any bugs to the author.
 
-The scivi module is not meant to be used directly.
+The skivi module is not meant to be used directly.
 
 Use skimage.io.imshow(img, fancy=True)'''
 
@@ -119,7 +119,7 @@ class RGBHSVDisplay(QFrame):
 
 
 
-class SciviImageWindow(QMainWindow):
+class SkiviImageWindow(QMainWindow):
     def __init__(self, arr, mgr):
         QMainWindow.__init__(self)
 
@@ -143,7 +143,7 @@ class SciviImageWindow(QMainWindow):
         self.mgr.add_window(self)
         self.main_widget.show()
 
-        self.setWindowTitle('Scivi - The skimage viewer.')
+        self.setWindowTitle('Skivi - The skimage viewer.')
 
         self.mixer_panel = MixerPanel(self.arr)
         self.layout.addWidget(self.mixer_panel, 0, 2)

skimage/scripts/scivi

@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-
-if __name__ == "__main__":
-    from skimage.scripts import scivi
-    scivi.main()
-

skimage/scripts/skivi

@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+if __name__ == "__main__":
+    from skimage.scripts import skivi
+    skivi.main()
+

skimage/scripts/skivi.py

@@ -4,7 +4,7 @@ def main():
     import sys
 
     if len(sys.argv) != 2:
-        print "Usage: scivi <image-file>"
+        print "Usage: skivi <image-file>"
         sys.exit(-1)
 
     io.use_plugin('qt')