fixed ps color bug

svn path=/trunk/matplotlib/; revision=980

Author: jdh2358

API_CHANGES

@@ -4,6 +4,8 @@ API CHANGES in matplotlib-0.73
 
   Removed all error handling from the verbose object
 
+  figure num of zero is now allowed
+
 API CHANGES in matplotlib-0.72
 
   Line2D, Text, and Patch copy_properties renamed update_from and

CHANGELOG

@@ -1,5 +1,9 @@
 New entries should be added at the top
 
+2005-02-121 fixed ps color bug - JDH
+
+2005-02-15 fixed missing qt file
+
 2005-02-15 banished error_msg and report_error.  Internal backend
            methods like error_msg_gtk are preserved.  backend writers,
            check your backends, and diff against 0.72 to make sure I

LICENSE/LICENSE_enthought.txt

@@ -0,0 +1,29 @@
+Copyright (c) 2001, 2002 Enthought, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  a. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+  b. 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.
+  c. Neither the name of the Enthought 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 REGENTS 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.
+

MANIFEST

@@ -4,7 +4,6 @@ CHANGELOG
 INSTALL
 INTERACTIVE
 KNOWN_BUGS
-MANIFEST
 MANIFEST.in
 Makefile
 NUMARRAY_ISSUES
@@ -331,6 +330,7 @@ examples/major_minor_demo1.py
 examples/major_minor_demo2.py
 examples/mathtext_demo.py
 examples/matplotlib_icon.py
+examples/matshow.py
 examples/movie_demo.py
 examples/mpl_with_glade.glade
 examples/mpl_with_glade.py
@@ -528,7 +528,6 @@ lib/matplotlib/image.py
 lib/matplotlib/legend.py
 lib/matplotlib/lines.py
 lib/matplotlib/mathtext.py
-lib/matplotlib/matlab.py
 lib/matplotlib/mlab.py
 lib/matplotlib/patches.py
 lib/matplotlib/path.py
@@ -551,13 +550,62 @@ lib/matplotlib/backends/backend_gtkagg.py
 lib/matplotlib/backends/backend_gtkcairo.py
 lib/matplotlib/backends/backend_paint.py
 lib/matplotlib/backends/backend_ps.py
+lib/matplotlib/backends/backend_qt.py
 lib/matplotlib/backends/backend_qtagg.py
 lib/matplotlib/backends/backend_svg.py
 lib/matplotlib/backends/backend_template.py
 lib/matplotlib/backends/backend_tkagg.py
 lib/matplotlib/backends/backend_wx.py
 lib/matplotlib/backends/backend_wxagg.py
 lib/matplotlib/backends/tkagg.py
+lib/matplotlib/enthought/__init__.py
+lib/matplotlib/enthought/resource/__init__.py
+lib/matplotlib/enthought/resource/resource_factory.py
+lib/matplotlib/enthought/resource/resource_manager.py
+lib/matplotlib/enthought/resource/resource_path.py
+lib/matplotlib/enthought/resource/resource_reference.py
+lib/matplotlib/enthought/traits/__init__.py
+lib/matplotlib/enthought/traits/category.py
+lib/matplotlib/enthought/traits/ctraits.c
+lib/matplotlib/enthought/traits/has_traits.py
+lib/matplotlib/enthought/traits/info_traits.py
+lib/matplotlib/enthought/traits/standard.py
+lib/matplotlib/enthought/traits/trait_base.py
+lib/matplotlib/enthought/traits/trait_db.py
+lib/matplotlib/enthought/traits/trait_errors.py
+lib/matplotlib/enthought/traits/trait_handlers.py
+lib/matplotlib/enthought/traits/trait_notifiers.py
+lib/matplotlib/enthought/traits/trait_numeric.py
+lib/matplotlib/enthought/traits/traits.py
+lib/matplotlib/enthought/traits/ui/__init__.py
+lib/matplotlib/enthought/traits/ui/editor.py
+lib/matplotlib/enthought/traits/ui/editor_factory.py
+lib/matplotlib/enthought/traits/ui/editors.py
+lib/matplotlib/enthought/traits/ui/group.py
+lib/matplotlib/enthought/traits/ui/handler.py
+lib/matplotlib/enthought/traits/ui/help.py
+lib/matplotlib/enthought/traits/ui/help_template.py
+lib/matplotlib/enthought/traits/ui/helper.py
+lib/matplotlib/enthought/traits/ui/include.py
+lib/matplotlib/enthought/traits/ui/item.py
+lib/matplotlib/enthought/traits/ui/menu.py
+lib/matplotlib/enthought/traits/ui/toolkit.py
+lib/matplotlib/enthought/traits/ui/tree_node.py
+lib/matplotlib/enthought/traits/ui/ui.py
+lib/matplotlib/enthought/traits/ui/ui_info.py
+lib/matplotlib/enthought/traits/ui/ui_traits.py
+lib/matplotlib/enthought/traits/ui/undo.py
+lib/matplotlib/enthought/traits/ui/view.py
+lib/matplotlib/enthought/traits/ui/view_element.py
+lib/matplotlib/enthought/traits/ui/view_elements.py
+lib/matplotlib/enthought/traits/ui/null/__init__.py
+lib/matplotlib/enthought/traits/ui/null/color_trait.py
+lib/matplotlib/enthought/traits/ui/null/font_trait.py
+lib/matplotlib/enthought/traits/ui/null/rgb_color_trait.py
+lib/matplotlib/enthought/traits/ui/null/rgba_color_trait.py
+lib/matplotlib/enthought/traits/ui/null/toolkit.py
+lib/matplotlib/enthought/util/__init__.py
+lib/matplotlib/enthought/util/resource.py
 lib/matplotlib/numerix/__init__.py
 lib/matplotlib/numerix/_na_imports.py
 lib/matplotlib/numerix/_nc_imports.py

TODO

@@ -535,7 +535,7 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- user events and nav event clashing on tkagg coords_demo/win32
 
--- check signal connect and disconnect in interactive use with
+-- DONE check signal connect and disconnect in interactive use with
    multiple figure creation / deletion etc.
 
 -- DONE add xlim, ylim
@@ -583,13 +583,13 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- Humufr errobar
 
--- why is tkagg loading init 2x
+-- DONE why is tkagg loading init 2x
 
 -- DONE add ishold and spy
 
 -- Humufr's shared ticker bug
 
--- figure should increment the figure if one already exists
+-- DONE figure should increment the figure if one already exists
 
 -- CLOSED oplot
 
@@ -644,5 +644,13 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- DONE make subplot delaxes on other subplots under it.
 
--- fix transoffset->operator calls in _backend_agg.cpp to handle
+-- DONE fix transoffset->operator calls in _backend_agg.cpp to handle
    exceptions
+
+-- keypress mods on pan/zoom broken in QT in linux
+
+-- linestyles in contour
+
+-- check stabar in wx with toolbar = None or classic
+
+-- nan handling?

lib/matplotlib/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import generators
 """
 This is a matlab(TM) style functional interface the matplotlib.
 
@@ -140,6 +139,8 @@
 Most of the other commands are from the Numeric, MLab and FFT, with
 the exception of those in mlab.py provided by matplotlib.
 """
+from __future__ import generators
+
 __version__  = '0.72'
 __revision__ = '$Revision$'
 __date__     = '$Date$'

lib/matplotlib/axes.py

@@ -2459,6 +2459,11 @@ def set_position(self, pos):
 in relative 0,1 coords
 
 ACCEPTS: len(4) sequence of floats"""
+        l,b,w,h = pos
+        r = b+w
+        t = l+h
+        if w==0 or h==0:
+            raise ValueError('zero width or height illegal')
         for num,val in zip(pos, self._position):
             val.set(num)
 

lib/matplotlib/backends/backend_agg.py

@@ -307,6 +307,10 @@ def draw(self):
         """
         if __debug__: verbose.report('FigureCanvasAgg.draw', 'debug-annoying')
 
+        renderer = self.get_renderer()
+        self.figure.draw(renderer)
+
+    def get_renderer(self):
         l,b,w,h = self.figure.bbox.get_bounds()
         key = w, h, self.figure.dpi.get()
         try: self._lastKey, self.renderer
@@ -316,8 +320,8 @@ def draw(self):
         if need_new_renderer:
             self.renderer = RendererAgg(w, h, self.figure.dpi)
             self._lastKey = key
-        self.figure.draw(self.renderer)
-
+        return self.renderer
+    
     def tostring_rgb(self):
         if __debug__: verbose.report('FigureCanvasAgg.tostring_rgb', 'debug-annoying')
         return self.renderer.tostring_rgb()

lib/matplotlib/backends/backend_ps.py

@@ -100,7 +100,7 @@ def set_color(self, r, g, b, store=1):
                 self._pswriter.write("%1.3f setgray\n"%r)
             else:
                 self._pswriter.write("%1.3f %1.3f %1.3f setrgbcolor\n"%(r,g,b))
-            self.color = (r,g,b)
+            if store: self.color = (r,g,b)
 
     def set_linewidth(self, linewidth):
         if linewidth != self.linewidth:
@@ -315,8 +315,6 @@ def _draw_markers(self, gc, path, x, y, transform):
             # apply affine transform x and y to define marker center
             #draw_marker_here
 
-        print 'I did nothing!'
-
     def _draw_lines(self, gc, points):
         """
         Draw many lines.  'points' is a list of point coordinates.

lib/matplotlib/backends/backend_qt.py

@@ -72,7 +72,8 @@ class FigureCanvasQT( qt.QWidget, FigureCanvasBase ):
                 qt.Qt.Key_Shift : 'shift',
                 qt.Qt.Key_Alt : 'alt',
                }
-
+    # left 1, middle 2, right 3
+    buttond = {1:1, 2:3, 4:2}
     def __init__( self, figure ):
         if DEBUG: print 'FigureCanvasQt: ', figure
         FigureCanvasBase.__init__( self, figure )
@@ -87,7 +88,9 @@ def mousePressEvent( self, event ):
         x = event.pos().x()
         # flipy so y=0 is bottom of canvas
         y = self.figure.bbox.height() - event.pos().y()
-        FigureCanvasBase.button_press_event( self, x, y, event.button() )
+        #print 'event.button()', event.button()
+        button = self.buttond[event.button()]
+        FigureCanvasBase.button_press_event( self, x, y, button )
         if DEBUG: print 'button pressed'
 
     def mouseMoveEvent( self, event ):
@@ -101,7 +104,8 @@ def mouseReleaseEvent( self, event ):
         x = event.x()
         # flipy so y=0 is bottom of canvas
         y = self.figure.bbox.height() - event.y()
-        FigureCanvasBase.button_release_event( self, x, y, event.button() )
+        button = button = self.buttond[event.button()]
+        FigureCanvasBase.button_release_event( self, x, y, button )
         if DEBUG: print 'button released'
         self.draw()
 
@@ -189,7 +193,9 @@ def __init__( self, canvas, window ):
         self.canvas = canvas
         qt.QToolBar.__init__( self, "Navigator2", window, qt.Qt.DockBottom )
         NavigationToolbar2.__init__( self, canvas )
-        
+        # If we don't do this, the status bar is hidden until needed.
+        self.window.statusBar().message( " " )
+         
     def _init_toolbar( self ):
         self.window.setUsesTextLabel( False )
         basedir = matplotlib.rcParams[ 'datapath' ]

lib/matplotlib/cm.py

@@ -10,9 +10,6 @@
 LUTSIZE = rcParams['image.lut']
 
 
-_cool_data = {'red':   ((),()),
-              'green': ((),()),
-              'blue':  ((),())}
 
 _bone_data = {'red':   ((0., 0., 0.),(1.0, 1.0, 1.0)),
               'green': ((0., 0., 0.),(1.0, 1.0, 1.0)),

lib/matplotlib/pylab.py

@@ -787,11 +787,6 @@ def figure(num=None, # autoincrement if None, else integer from 1-N
     if facecolor is None : facecolor = rcParams['figure.facecolor']
     if edgecolor is None : edgecolor = rcParams['figure.edgecolor']
 
-
-    if num==0:
-        raise ValueError('Figure number can not be 0.\n' + \
-                         'Hey, give me a break, this is matlab(TM) compatability')
-
     if num is None:
         allnums = [f.num for f in _pylab_helpers.Gcf.get_all_fig_managers()]
         if allnums:

setupext.py

@@ -495,7 +495,7 @@ def build_enthought(ext_modules, packages):
     packages.extend(['matplotlib/enthought',
                      'matplotlib/enthought/traits',
                      'matplotlib/enthought/traits/ui',
-                     'matplotlib/enthought/traits/ui/null',                     
+                     'matplotlib/enthought/traits/ui/null',
                      'matplotlib/enthought/resource',
                      'matplotlib/enthought/util',
                      ])