[Piuparts-commits] [piuparts] 01/01: Create graph of rc and non-rc bugs filed (and fixed).

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 6b04b63234b4e62f7977858084644c451e9d6c0b
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed May 21 19:39:55 2014 +0200

    Create graph of rc and non-rc bugs filed (and fixed).
---
 debian/changelog   |  3 ++-
 htdocs/index.tpl   |  2 +-
 piuparts-report.py | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75a5c20..702d4f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,8 @@ piuparts (0.59) UNRELEASED; urgency=low
       configurable.
     - fix log directory creation. (Closes: #746722)
     - fix spelling of "ditto". (Closes: #746724)
-    - create graph of bugs filed and display it piuparts.d.o welcome page.
+    - create graph of rc and non-rc bugs filed (and fixed) since the beginning
+      of piuparts testing and display it on piuparts.d.o welcome page.
     - move counts.txt from htdocs to master directory.
   * master-bin/gather_bts_stats: differate between rc and non-rc bugs.
   * Makefile: don't install crontabs and sudoers file anymore, except when
diff --git a/htdocs/index.tpl b/htdocs/index.tpl
index 320d682..013dae4 100644
--- a/htdocs/index.tpl
+++ b/htdocs/index.tpl
@@ -63,7 +63,7 @@
     </tr>
     <tr class="normalrow">
      <td class="contentcell2">
-      <img src="./bts_stats.png" width="100%" alt="Bugs submitted which were found using piuparts" \>
+      <img src="images/bts_stats.png" width="100%" alt="Bugs submitted which were found using piuparts" \>
      </td>
     </tr>
     <tr class="titlerow">
diff --git a/piuparts-report.py b/piuparts-report.py
index 4aca7a7..06fe5e1 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -1631,20 +1631,20 @@ def dwke_process_section(section, sectiondir, htmldir, problem_list, pkgsdb):
 
 def make_bts_stats_graph(master_dir, out_dir):
     countsfile = os.path.join(master_dir, "bts_stats.txt")
-    pngfile = os.path.join(out_dir, "bts_stats.png")
+    pngfile = os.path.join(out_dir, "images", "bts_stats.png")
     grdevices = importr('grDevices')
     grdevices.png(file=pngfile, width=1600, height=900, pointsize=10, res=100)
     r = robjects.r
     r('t <- (read.table("'+countsfile+'",sep=",",header=1,row.names=1))')
     r('cname <- c("date",rep(colnames(t)))')
     # make graph since day 1
-    r('v <- t[0:nrow(t),0:2]')
+    r('v <- t[0:nrow(t),0:4]')
     # tango colors again:
-    r('palette(c("#4e9a06", "#ef2929"))')
-    r('barplot(t(v),col = 1:3, \
+    r('palette(c("#4e9a06", "#a40000", "#8ae234", "#ef2929"))')
+    r('barplot(t(v),col = 1:5, \
         main="Bugs filed with tag=piuparts users=debian-qa at lists.debian.org archive=both", \
         xlab="", ylab="Number of bugs submitted and closed", space=0, border=NA)')
-    r('legend(x="bottom",legend=colnames(t), ncol=2,fill=1:3,xjust=0.5,yjust=0,bty="n")')
+    r('legend(x="bottom",legend=colnames(t), ncol=2,fill=1:5,xjust=0.5,yjust=0,bty="n")')
     grdevices.dev_off()
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git