From e4a14ee3a3abc585ea8c0b98ac39eb4f2cc9efc3 Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Fri, 3 Feb 2012 21:18:52 -0800
Subject: [PATCH] PKG: Rename scivi to skivi.

---
 DEPENDS.txt                                |  2 +-
 setup.py                                   |  2 +-
 skimage/io/_plugins/qt_plugin.py           |  4 ++--
 skimage/io/_plugins/{scivi.py => skivi.py} | 12 ++++++------
 skimage/scripts/scivi                      |  6 ------
 skimage/scripts/skivi                      |  6 ++++++
 skimage/scripts/{scivi.py => skivi.py}     |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)
 rename skimage/io/_plugins/{scivi.py => skivi.py} (96%)
 delete mode 100755 skimage/scripts/scivi
 create mode 100755 skimage/scripts/skivi
 rename skimage/scripts/{scivi.py => skivi.py} (83%)

diff --git a/DEPENDS.txt b/DEPENDS.txt
index 5d553d3e..07605862 100644
--- a/DEPENDS.txt
+++ b/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`.
 
diff --git a/setup.py b/setup.py
index fdd6ad75..560b67c9 100644
--- a/setup.py
+++ b/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},
diff --git a/skimage/io/_plugins/qt_plugin.py b/skimage/io/_plugins/qt_plugin.py
index b7afe92e..3841e978 100644
--- a/skimage/io/_plugins/qt_plugin.py
+++ b/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()
 
diff --git a/skimage/io/_plugins/scivi.py b/skimage/io/_plugins/skivi.py
similarity index 96%
rename from skimage/io/_plugins/scivi.py
rename to skimage/io/_plugins/skivi.py
index c56b19b5..ed6926cd 100644
--- a/skimage/io/_plugins/scivi.py
+++ b/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)
diff --git a/skimage/scripts/scivi b/skimage/scripts/scivi
deleted file mode 100755
index 15c6a397..00000000
--- a/skimage/scripts/scivi
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-
-if __name__ == "__main__":
-    from skimage.scripts import scivi
-    scivi.main()
-
diff --git a/skimage/scripts/skivi b/skimage/scripts/skivi
new file mode 100755
index 00000000..4469f015
--- /dev/null
+++ b/skimage/scripts/skivi
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+if __name__ == "__main__":
+    from skimage.scripts import skivi
+    skivi.main()
+
diff --git a/skimage/scripts/scivi.py b/skimage/scripts/skivi.py
similarity index 83%
rename from skimage/scripts/scivi.py
rename to skimage/scripts/skivi.py
index f6b5323f..610013cc 100644
--- a/skimage/scripts/scivi.py
+++ b/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')