Bump version: 0.1.7 → 0.1.8 (+7 squashed commits)

Squashed commits:
[ac5bb36] Bump version: 0.1.8 → 0.1.9
[8acd6b2] ImportException --> ImportError
[ac410a8] matplotlib.pyplot has errors on import, put these in the functions
that rely on them directly.
[f128a20] Bump version: 0.1.6 → 0.1.7
[5866bea] Remove IPython utils.

These are out of date, and have problems on Linux (without a proper
visual backend).
[a519e56] Bump version: 0.1.5 → 0.1.6
[f45aa83] Bump version: 0.1.4 → 0.1.5

SimPEG/Mesh/TreeMesh.py

@@ -90,11 +90,6 @@
 #
 
 from SimPEG import np, sp, Utils, Solver
-import matplotlib.pyplot as plt
-import matplotlib
-from mpl_toolkits.mplot3d import Axes3D
-import matplotlib.colors as colors
-import matplotlib.cm as cmx
 
 try:
     import TreeUtils
@@ -1973,6 +1968,13 @@ class TreeMesh(BaseTensorMesh, InnerProducts):
         facesX=False, facesY=False, facesZ=False,
         edgesX=False, edgesY=False, edgesZ=False):
 
+
+        import matplotlib.pyplot as plt
+        import matplotlib
+        from mpl_toolkits.mplot3d import Axes3D
+        import matplotlib.colors as colors
+        import matplotlib.cm as cmx
+
         # self.number()
 
         axOpts = {'projection':'3d'} if self.dim == 3 else {}
@@ -2094,6 +2096,13 @@ class TreeMesh(BaseTensorMesh, InnerProducts):
     def plotImage(self, I, ax=None, showIt=False, grid=False, clim=None):
         if self.dim == 3: raise Exception('Use plot slice?')
 
+
+        import matplotlib.pyplot as plt
+        import matplotlib
+        from mpl_toolkits.mplot3d import Axes3D
+        import matplotlib.colors as colors
+        import matplotlib.cm as cmx
+
         if ax is None: ax = plt.subplot(111)
         jet = cm = plt.get_cmap('jet')
         cNorm  = colors.Normalize(
@@ -2123,6 +2132,13 @@ class TreeMesh(BaseTensorMesh, InnerProducts):
         assert vType in ['CC','F','E']
         assert self.dim == 3
 
+
+        import matplotlib.pyplot as plt
+        import matplotlib
+        from mpl_toolkits.mplot3d import Axes3D
+        import matplotlib.colors as colors
+        import matplotlib.cm as cmx
+
         szSliceDim = len(getattr(self, 'h'+normal.lower())) #: Size of the sliced dimension
         if ind is None: ind = int(szSliceDim/2)
         assert type(ind) in [int, long], 'ind must be an integer'
@@ -2269,6 +2285,13 @@ class CellLookUpException(TreeException):
 
 if __name__ == '__main__':
 
+
+    import matplotlib.pyplot as plt
+    import matplotlib
+    from mpl_toolkits.mplot3d import Axes3D
+    import matplotlib.colors as colors
+    import matplotlib.cm as cmx
+
     def topo(x):
         return np.sin(x*(2.*np.pi))*0.3 + 0.5
 

SimPEG/Mesh/View.py

@@ -1,8 +1,11 @@
 import numpy as np
-import matplotlib.pyplot as plt
-import matplotlib
-from mpl_toolkits.mplot3d import Axes3D
-from SimPEG.Utils import mkvc, animate
+from SimPEG.Utils import mkvc
+try:
+    import matplotlib.pyplot as plt
+    import matplotlib
+    from mpl_toolkits.mplot3d import Axes3D
+except ImportError, e:
+    print 'Trouble importing matplotlib.'
 
 
 class TensorView(object):
@@ -479,63 +482,6 @@ class TensorView(object):
         ax.grid(True)
         if showIt: plt.show()
 
-    def slicer(mesh, var, imageType='CC', normal='z', index=0, ax=None, clim=None):
-        assert normal in 'xyz', 'normal must be x, y, or z'
-        if ax is None: ax = plt.subplot(111)
-        I = mesh.r(var,'CC','CC','M')
-        axes = [p for p in 'xyz' if p not in normal.lower()]
-        if normal is 'x': I = I[index,:,:]
-        if normal is 'y': I = I[:,index,:]
-        if normal is 'z': I = I[:,:,index]
-        if clim is None: clim = [I.min(),I.max()]
-        p = ax.pcolormesh(getattr(mesh,'vectorN'+axes[0]),getattr(mesh,'vectorN'+axes[1]),I.T,vmin=clim[0],vmax=clim[1])
-        ax.axis('tight')
-        ax.set_xlabel(axes[0])
-        ax.set_ylabel(axes[1])
-        return p
-
-    def videoSlicer(mesh,var,imageType='CC',normal='z',figsize=(10,8)):
-        assert mesh.dim > 2, 'This is for 3D meshes only.'
-        # First set up the figure, the axis, and the plot element we want to animate
-        fig = plt.figure(figsize=figsize)
-        ax = plt.axes()
-        clim = [var.min(),var.max()]
-        plt.colorbar(mesh.slicer(var, imageType=imageType, normal=normal, index=0, ax=ax, clim=clim))
-        tlt = plt.title(normal)
-
-        def animateFrame(i):
-            mesh.slicer(var, imageType=imageType, normal=normal, index=i, ax=ax, clim=clim)
-            tlt.set_text(normal.upper()+('-Slice: %d, %4.4f' % (i,getattr(mesh,'vectorCC'+normal)[i])))
-
-        return animate(fig, animateFrame, frames=mesh.vnC['xyz'.index(normal)])
-
-    def video(mesh, var, function, figsize=(10, 8), colorbar=True, skip=1):
-        """
-        Call a function for a list of models to create a video.
-
-        ::
-
-            def function(var, ax, clim, tlt, i):
-                tlt.set_text('%d'%i)
-                return mesh.plotImage(var, imageType='CC', ax=ax, clim=clim)
-
-            mesh.video([model1, model2, ..., modeln],function)
-        """
-        # First set up the figure, the axis, and the plot element we want to animate
-        fig = plt.figure(figsize=figsize)
-        ax = plt.axes()
-        VAR = np.concatenate(var)
-        clim = [VAR.min(),VAR.max()]
-        tlt = plt.title('')
-        if colorbar:
-            plt.colorbar(function(var[0],ax,clim,tlt,0))
-
-        frames = np.arange(0,len(var),skip)
-        def animateFrame(j):
-            i = frames[j]
-            function(var[i],ax,clim,tlt,i)
-
-        return animate(fig, animateFrame, frames=len(frames))
 
 class CylView(object):