RF: fixed order in 1 figure and deprecated need to import mvpa

[neurodebian.git] / survey / makestats

diff --git a/survey/makestats b/survey/makestats
index 708e459ba83997ab14698a76e34e9c5fd353694a..3fc697a91401586ef80a25980b64d99568dc2791 100755 (executable)
--- a/survey/makestats
+++ b/survey/makestats
@@ -1,6 +1,5 @@
 #!/usr/bin/python
 
-from mvpa.misc.plot.base import plot_bars
 from glob import glob
 try:
     from json import load as jload
@@ -216,6 +215,7 @@ def mkpic_os_per_env(db, destdir):
     pl.legend(loc='center left')
     pl.yticks(x + 0.4,  env_names[::-1])
     pl.ylim(-0.25, len(envs))
+    pl.xlim(0,1)
     pl.title("Operating system preference by environment")
     pl.xlabel("Fraction of submissions")
     pl.subplots_adjust(left=0.15, right=0.97)
@@ -238,12 +238,12 @@ def mkpic_time_per_env(db, destdir):
     x = np.arange(len(envs))
     bottoms = np.zeros(len(envs))
     for i, t in enumerate(time_order):
-        stat = [env_stats[e][t] for e in envs]
+        stat = [env_stats[e][t] for e in envs[::-1]]
         pl.barh(x, stat, left=bottoms, color=time_colors[i],
                label=db.get_nice_name(t), height=.6)
         bottoms += stat
-    pl.legend(loc='top left')
-    pl.yticks(x + 0.2,  env_names)
+    pl.legend(loc='lower left')
+    pl.yticks(x + 0.2,  env_names[::-1])
     pl.ylim(-0.4, len(envs))
     pl.title("Research activity time by environment")
     pl.xlabel("Fraction of submissions")
@@ -277,7 +277,7 @@ def mkpic_submissions_per_key(db, destdir, key, title, sortby='name',
         pl.yticks(x + 0.5,  ['' for s in stats])
         text_offset = pl.gca().get_xlim()[1] / 30.
         for i, s in enumerate(stats[::-1]):
-            pl.text(text_offset, i+.5, db.get_nice_name(s[0]),
+            pl.text(text_offset, i+.5, db.get_nice_name(s[0]) + " [%d]" % (s[1],),
                     horizontalalignment='left',
                     verticalalignment='center',
                     bbox=dict(facecolor='white', alpha=0.8, edgecolor='white'))
@@ -297,6 +297,8 @@ def mkpic_software(db, destdir):
             sortby='count')
 
 def mkpic_rating_by_os(db, env, items, destdir, title):
+    from mvpa.misc.plot.base import plot_bars
+
     pl.figure(figsize=(6.4, 4.8))
     for i, os in enumerate(os_order):
         ratings = [db.select_match(env,