Fixes legend; more software

diff --git a/survey/makestats b/survey/makestats
index a15b5f7dca214304306e0a7385098508dc7d81f5..d3bcf90c6dcf30546240fc89988f72ffdc37b0d0 100755 (executable)
--- a/survey/makestats
+++ b/survey/makestats
@@ -430,7 +430,7 @@ def main(srcdir, destdir):
                        "Personal environment", "I prefer this particular scientific software environment because ...")
     mkpic_rating_by_os_hor_joined(db, 'man_os', ['man_r%i' % i for i in range(1, 5)], destdir,
                        "Managed environment")
-    mkpic_rating_by_os_hor_joined(db, 'virt_host_os', ['man_r%i' % i for i in range(1, 4)], destdir,
+    mkpic_rating_by_os_hor_joined(db, 'virt_host_os', ['virt_r%i' % i for i in range(1, 4)], destdir,
                        "Virtual environment (by host OS)")
 
     # submission stats: this is RST

diff --git a/survey/results.rst b/survey/results.rst
index 3e7607799aea39243e6c3af47890428625cd88c8..cabaa6be39e47e0f93edecdec6f849e0d9dbc76c 100644 (file)
--- a/survey/results.rst
+++ b/survey/results.rst
@@ -15,12 +15,14 @@ Submitter background
 Scientific computing environment preferences
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. figure:: figures/ospref_by_env.png
 .. figure:: figures/time_by_env.png
+.. figure:: figures/ospref_by_env.png
 
-
-Environment ratings
-~~~~~~~~~~~~~~~~~~~
+The following figures show rating statistics grouped by the
+respective operating system and use the same system color code
+as in the figure above. The segments in each bar indicate the
+frequency of individual rating options (from *definitely disagree* to
+*definitely agree*) in up to four levels of color saturation.
 
 .. include:: figures/ratings_pers_os.rst
 .. include:: figures/ratings_man_os.rst

diff --git a/survey/survey.rst b/survey/survey.rst
index ae0add3d96f2fb66d45e1e112e0da97cce5a5977..106e79a07bc99cf0ea9ada4596c375cfcede1c2c 100644 (file)
--- a/survey/survey.rst
+++ b/survey/survey.rst
@@ -855,7 +855,7 @@ Electrophysiology, MEG/EEG
    <td class="response"><input type="checkbox" name="sw_electro" value="besa" />BESA</td>
    <td class="response"><input type="checkbox" name="sw_electro" value="biosig" />BioSig</td>
    <td class="response"><input type="checkbox" name="sw_electro" value="brainstorm" />BrainStorm</td>
-   <td class="response"><input type="checkbox" name="sw_electro" value="chronus" />Chronus</td>
+   <td class="response"><input type="checkbox" name="sw_electro" value="chronus" />Chronux</td>
    <td class="response"><input type="checkbox" name="sw_electro" value="eeglab" />EEGLAB</td>
    <td class="response"><input type="checkbox" name="sw_electro" value="elekta" />Elekta Neuromag</td>
    </tr><tr class="oddrow">
@@ -863,10 +863,12 @@ Electrophysiology, MEG/EEG
    <td class="response"><input type="checkbox" name="sw_electro" value="klustakwik" />KlustaKwik</td>
    <td class="response"><input type="checkbox" name="sw_electro" value="loreta" />LORETA/sLORETA</td>
    <td class="response"><input type="checkbox" name="sw_electro" value="mne" />MNE suite</td>
+   <td class="response"><input type="checkbox" name="sw_electro" value="mclust" />MClust</td>
    <td class="response"><input type="checkbox" name="sw_electro" value="neuroexplorer" />NeuroExplorer</td>
-   <td class="response"><input type="checkbox" name="sw_electro" value="openmeeg" />OpenMEEG</td>
    </tr><tr>
+   <td class="response"><input type="checkbox" name="sw_electro" value="openmeeg" />OpenMEEG</td>
    <td class="response"><input type="checkbox" name="sw_electro" value="openelectrophy" />Openelectrophy</td>
+   <td class="response"><input type="checkbox" name="sw_electro" value="plexon" />Plexon</td>
    <td class="response"><input type="checkbox" name="sw_electro" value="rtxi" />RTXI</td>
    <td class="response"><input type="checkbox" name="sw_electro" value="relacs" />Relacs</td>
    <td class="response"><input type="checkbox" name="sw_electro" value="trellis" />Trellis-neuro</td>