[jToolkit-cvs] jToolkit/widgets chart.py,1.3,1.4

[<dav...@us...>]

Update of /cvsroot/jtoolkit/jToolkit/widgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12733

Modified Files:
	chart.py 
Log Message:
Added functionality to add a filter to the table query



Index: chart.py
===================================================================
RCS file: /cvsroot/jtoolkit/jToolkit/widgets/chart.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** chart.py	10 Feb 2004 07:50:11 -0000	1.3
--- chart.py	10 Feb 2004 07:52:56 -0000	1.4
***************
*** 15,19 ****
  # This class is just a container for option values.
  class SimpleChart(widgets.PlainContents):
!   def __init__(self, charttable, xcolumn, ycolumns, xstorageformat='TEXT', xdisplay=''):
      self.charttable = charttable
      self.xcolumn = xcolumn
--- 15,19 ----
  # This class is just a container for option values.
  class SimpleChart(widgets.PlainContents):
!   def __init__(self, charttable, xcolumn, ycolumns, xstorageformat='TEXT', xdisplay='', filter=None):
      self.charttable = charttable
      self.xcolumn = xcolumn
***************
*** 21,24 ****
--- 21,25 ----
      self.xstorageformat = xstorageformat
      self.xdisplay = xdisplay
+     self.filter = filter
      if not hasattr(self, 'chartSize'):
        self.chartSize = (250,250)
***************
*** 30,34 ****
  
    def getdata(self):
!     chartdata = self.charttable.gettablerows()
      if self.xstorageformat == 'DATETIME':
        self.xdata = [dates.formatdate(row[self.xcolumn],self.xdisplay) for row in chartdata]
--- 31,35 ----
  
    def getdata(self):
!     chartdata = self.charttable.gettablerows(self.filter)
      if self.xstorageformat == 'DATETIME':
        self.xdata = [dates.formatdate(row[self.xcolumn],self.xdisplay) for row in chartdata]