ajack       2004/02/23 09:00:05

  Modified:    python/gump/model project.py
               python/gump/document forrest.py
  Log:
  Attempting to work better with presenting floats.
  
  Revision  Changes    Path
  1.54      +10 -10    jakarta-gump/python/gump/model/project.py
  
  Index: project.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/model/project.py,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- project.py        23 Feb 2004 16:22:43 -0000      1.53
  +++ project.py        23 Feb 2004 17:00:05 -0000      1.54
  @@ -1409,15 +1409,15 @@
       def calculatePercentages(self):
           """ Keep counters correct """
           if self.projects > 0:            
  -            
self.successesPercentage=round((float(self.successes)*100)/self.projects,2)
  -            
self.failuresPercentage=round((float(self.failures)*100)/self.projects,2)
  -            self.prereqsPercentage=round((float(self.prereqs)*100)/self.projects,2)
  -            self.noworksPercentage=round((float(self.noworks)*100)/self.projects,2)
  -            
self.packagesPercentage=round((float(self.packages)*100)/self.projects,2)
  -            self.othersPercentage=round((float(self.others)*100)/self.projects,2)
  +            self.successesPercentage=(float(self.successes)*100)/self.projects
  +            self.failuresPercentage=(float(self.failures)*100)/self.projects
  +            self.prereqsPercentage=(float(self.prereqs)*100)/self.projects
  +            self.noworksPercentage=(float(self.noworks)*100)/self.projects
  +            self.packagesPercentage=(float(self.packages)*100)/self.projects
  +            self.othersPercentage=(float(self.others)*100)/self.projects
               
               # This is the overall success of a run...
  -            self.overallPercentage=(round((float(self.successes + 
self.packages)*100)/self.projects),2)
  +            self.overallPercentage=(float(self.successes + 
self.packages)*100)/self.projects
               
       def getOverallPercentage(self):
           """ Return the overall success """
  
  
  
  1.77      +14 -9     jakarta-gump/python/gump/document/forrest.py
  
  Index: forrest.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/document/forrest.py,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- forrest.py        23 Feb 2004 15:43:06 -0000      1.76
  +++ forrest.py        23 Feb 2004 17:00:05 -0000      1.77
  @@ -1418,12 +1418,17 @@
           
summaryTable=summarySection.createTable(['Projects','Successes','Failures','Prereqs',  
      \
               'No Works','Packages'])
           
  -        summaryTable.createRow([ `summary.projects`, \
  -                                `summary.successes` + ' (' + 
`summary.successesPercentage` + '%)', \
  -                                `summary.failures` + ' (' + 
`summary.failuresPercentage` + '%)',     \
  -                                `summary.prereqs` + ' (' + 
`summary.prereqsPercentage` + '%)', \
  -                                `summary.noworks` + ' (' + 
`summary.noworksPercentage` + '%)', \
  -                                `summary.packages` + ' (' + 
`summary.packagesPercentage` + '%)'] )
  +        summaryTable.createRow([ '%02d' % summary.projects, \
  +                                '%02d' % summary.successes + \
  +                                ' (' + '%02.2f' % summary.successesPercentage + 
'%)', \
  +                                '%02d' % summary.failures + \
  +                                ' (' + '%02.2f' % summary.failuresPercentage + 
'%)', \
  +                                '%02d' % summary.prereqs + \
  +                                ' (' + '%02.2f' % summary.prereqsPercentage + '%)', 
\
  +                                '%02d' % summary.noworks + \
  +                                ' (' + '%02.2f' % summary.noworksPercentage + '%)', 
\
  +                                '%02d' % summary.packages + \
  +                                ' (' + '%02.2f' % summary.packagesPercentage + 
'%)'] )
           
         
       def documentWorkList(self,xdocNode,workable,description='Work'):
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to