[Pyphant-devel] SF.net SVN: pyphant:[677] trunk/src

[<zk...@us...>]

Revision: 677
          http://pyphant.svn.sourceforge.net/pyphant/?rev=677&view=rev
Author:   zklaus
Date:     2010-04-19 18:15:08 +0000 (Mon, 19 Apr 2010)

Log Message:
-----------
Merge branch 'master' into svn-trunk

* master:
  Removed chaco from visualizers

Modified Paths:
--------------
    trunk/src/pyphant/setup.py
    trunk/src/workers/ImageProcessing/setup.py
    trunk/src/workers/OSC/setup.py
    trunk/src/workers/Statistics/setup.py
    trunk/src/workers/fmfile/setup.py
    trunk/src/workers/tools/setup.py

Removed Paths:
-------------
    trunk/src/visualizers/chaco/chaco/ImageVisualizer.py
    trunk/src/visualizers/chaco/chaco/__init__.py
    trunk/src/visualizers/chaco/setup.cfg
    trunk/src/visualizers/chaco/setup.py

Modified: trunk/src/pyphant/setup.py
===================================================================
--- trunk/src/pyphant/setup.py	2010-04-19 18:06:36 UTC (rev 676)
+++ trunk/src/pyphant/setup.py	2010-04-19 18:15:08 UTC (rev 677)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 __id__ = '$Id: $'

Deleted: trunk/src/visualizers/chaco/chaco/ImageVisualizer.py
===================================================================
--- trunk/src/visualizers/chaco/chaco/ImageVisualizer.py	2010-04-19 18:06:36 UTC (rev 676)
+++ trunk/src/visualizers/chaco/chaco/ImageVisualizer.py	2010-04-19 18:15:08 UTC (rev 677)
@@ -1,102 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2006-2007, Rectorate of the University of Freiburg
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-# * Neither the name of the Freiburg Materials Research Center,
-#   University of Freiburg nor the names of its contributors may be used to
-#   endorse or promote products derived from this software without specific
-#   prior written permission.
-#
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-u"""
-"""
-
-__id__ = "$Id$"
-__author__ = "$Author$"
-__version__ = "$Revision$"
-# $Source$
-
-import scipy
-import wx
-from enthought.chaco2 import api as chaco2
-from enthought.chaco2.tools import api as tools
-from enthought.enable2.wx_backend import Window
-from pyphant.core.Connectors import TYPE_IMAGE
-from enthought.chaco2.default_colormaps \
-     import color_map_name_dict
-
-class PlotFrame(wx.Frame):
-    name = 'New Image Visualizer'
-    def __init__(self, fieldContainer, *args, **kw):
-        kw["size"] = (600,600)
-        wx.Frame.__init__(*(self,None,)+args, **kw)
-        data = chaco2.ArrayPlotData()
-        data.set_data('imagedata', fieldContainer.data.data)
-        plot = chaco2.Plot(data)
-        plot.img_plot('imagedata',
-                      xbounds=fieldContainer.dimensions[0].data,
-                      ybounds=fieldContainer.dimensions[1].data,
-                      colormap = color_map_name_dict['jet'])
-        plot.overlays.append(tools.SimpleZoom(plot, tool_mode="box", always_on=True))
-        self.plot_window = Window(parent=self, component=plot)
-        sizer=wx.BoxSizer(wx.HORIZONTAL)
-        sizer.Add(self.plot_window.control, 1, wx.EXPAND)
-        self.SetSizer(sizer)
-        self.SetAutoLayout(True)
-        self.Show(True)
-        return
-
-## class ImageVisualizer(object):
-##     name='Image Visualizer'
-##     def __init__(self, fieldContainer):
-##         self.fieldContainer = fieldContainer
-##         self.execute()
-
-##     def execute(self):
-##         pylab.ioff()
-##         self.figure = pylab.figure()
-##         xmin=scipy.amin(self.fieldContainer.dimensions[0].data)
-##         xmax=scipy.amax(self.fieldContainer.dimensions[0].data)
-##         ymin=scipy.amin(self.fieldContainer.dimensions[1].data)
-##         ymax=scipy.amax(self.fieldContainer.dimensions[1].data)
-
-##         pylab.imshow(self.fieldContainer.data, extent=(xmin, xmax, ymin, ymax))
-##         pylab.xlabel(self.fieldContainer.dimensions[0].label)
-##         pylab.ylabel(self.fieldContainer.dimensions[1].label)
-##         pylab.title(self.fieldContainer.longname)
-
-##         class F(pylab.Formatter):
-##             def __init__(self, container, *args, **kwargs):
-##                 self.container=container
-##             def __call__(self, x, pos=None):
-##                 try:
-##                     return str(x*self.container.unit).replace('mu',r'\textmu{}')
-##                 except IndexError, error:
-##                     return str(x)
-##         ax=pylab.gca()
-##         pylab.colorbar(format=F(self.fieldContainer))
-##         pylab.ion()
-##         pylab.show()
-
-

Deleted: trunk/src/visualizers/chaco/chaco/__init__.py
===================================================================
--- trunk/src/visualizers/chaco/chaco/__init__.py	2010-04-19 18:06:36 UTC (rev 676)
+++ trunk/src/visualizers/chaco/chaco/__init__.py	2010-04-19 18:15:08 UTC (rev 677)
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2006-2007, Rectorate of the University of Freiburg
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-# * Neither the name of the Freiburg Materials Research Center,
-#   University of Freiburg nor the names of its contributors may be used to
-#   endorse or promote products derived from this software without specific
-#   prior written permission.
-#
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-u"""
-"""
-
-__id__ = "$Id$"
-__author__ = "$Author$"
-__version__ = "$Revision$"
-# $Source$
-

Deleted: trunk/src/visualizers/chaco/setup.cfg
===================================================================
--- trunk/src/visualizers/chaco/setup.cfg	2010-04-19 18:06:36 UTC (rev 676)
+++ trunk/src/visualizers/chaco/setup.cfg	2010-04-19 18:15:08 UTC (rev 677)
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1

Deleted: trunk/src/visualizers/chaco/setup.py
===================================================================
--- trunk/src/visualizers/chaco/setup.py	2010-04-19 18:06:36 UTC (rev 676)
+++ trunk/src/visualizers/chaco/setup.py	2010-04-19 18:15:08 UTC (rev 677)
@@ -1,32 +0,0 @@
-#!/usr/bin/env python2.5
-# -*- coding: utf-8 -*-
-
-u"""
-Pyphant Chaco Visualizers
-This package contains visualizers that make use of the enthought.chaco
-package.
-"""
-
-__author__ = "Klaus Zimmermann, Andreas W. Liehr"
-
-__id__ = '$Id$'
-__revision__ = '$Revision: 25 $'
-
-VERSION = '0.1'
-
-from setuptools import setup, find_packages
-
-setup(
-    name = "Pyphant Chaco Visualizer",
-    version = VERSION,
-    author = __author__,
-    description = __doc__,
-    install_requires=['pyphant>=0.4alpha3',
-                      'enthought.chaco2'],
-    packages = find_packages(),
-    entry_points = """
-    [pyphant.visualizers]
-    pil.image = chaco.ImageVisualizer:PlotFrame
-    """
-    )
-

Modified: trunk/src/workers/ImageProcessing/setup.py
===================================================================
--- trunk/src/workers/ImageProcessing/setup.py	2010-04-19 18:06:36 UTC (rev 676)
+++ trunk/src/workers/ImageProcessing/setup.py	2010-04-19 18:15:08 UTC (rev 677)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 """

Modified: trunk/src/workers/OSC/setup.py
===================================================================
--- trunk/src/workers/OSC/setup.py	2010-04-19 18:06:36 UTC (rev 676)
+++ trunk/src/workers/OSC/setup.py	2010-04-19 18:15:08 UTC (rev 677)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 """

Modified: trunk/src/workers/Statistics/setup.py
===================================================================
--- trunk/src/workers/Statistics/setup.py	2010-04-19 18:06:36 UTC (rev 676)
+++ trunk/src/workers/Statistics/setup.py	2010-04-19 18:15:08 UTC (rev 677)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 """

Modified: trunk/src/workers/fmfile/setup.py
===================================================================
--- trunk/src/workers/fmfile/setup.py	2010-04-19 18:06:36 UTC (rev 676)
+++ trunk/src/workers/fmfile/setup.py	2010-04-19 18:15:08 UTC (rev 677)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 """

Modified: trunk/src/workers/tools/setup.py
===================================================================
--- trunk/src/workers/tools/setup.py	2010-04-19 18:06:36 UTC (rev 676)
+++ trunk/src/workers/tools/setup.py	2010-04-19 18:15:08 UTC (rev 677)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 """


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.