initial redo of the ratings with too much fanciness

[neurodebian.git] / survey / results.rst

diff --git a/survey/results.rst b/survey/results.rst
index 391f0fb221b9414060e495fbe8bf6ba8242d0ddd..3e7607799aea39243e6c3af47890428625cd88c8 100644 (file)
--- a/survey/results.rst
+++ b/survey/results.rst
@@ -6,38 +6,44 @@ Current survey results
 Submitter background
 ~~~~~~~~~~~~~~~~~~~~
 
-.. figure:: figures/submissions_per_datamod.png
+.. figure:: figures/submissions_per_bg_datamod.png
+.. figure:: figures/submissions_per_bg_country.png
+.. figure:: figures/submissions_per_bg_employer.png
+.. figure:: figures/submissions_per_bg_position.png
 
-   Submissions caption
 
-Environment preferences
-~~~~~~~~~~~~~~~~~~~~~~~
+Scientific computing environment preferences
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. figure:: figures/ospref_by_env.png
+.. figure:: figures/time_by_env.png
+
 
 Environment ratings
 ~~~~~~~~~~~~~~~~~~~
 
-.. figure:: figures/ratings_pers_os.png
-.. figure:: figures/ratings_man_os.png
-.. figure:: figures/ratings_virt_host_os.png
+.. include:: figures/ratings_pers_os.rst
+.. include:: figures/ratings_man_os.rst
+.. include:: figures/ratings_virt_host_os.rst
+
 
 Software resources
 ~~~~~~~~~~~~~~~~~~
 
-.. figure:: figures/software_resources.png
+.. figure:: figures/submissions_per_software_resource.png
 
 Software popularity
 ~~~~~~~~~~~~~~~~~~~
 
-.. figure:: figures/sw_general.png
-.. figure:: figures/sw_dc.png
-.. figure:: figures/sw_img.png
-.. figure:: figures/sw_datamanage.png
-.. figure:: figures/sw_neusys.png
-.. figure:: figures/sw_electro.png
-.. figure:: figures/sw_bci.png
-.. figure:: figures/sw_acq.png
-.. figure:: figures/sw_rt.png
-.. figure:: figures/sw_psychophys.png
+.. figure:: figures/submissions_per_sw_general.png
+.. figure:: figures/submissions_per_virt_prod.png
+.. figure:: figures/submissions_per_sw_dc.png
+.. figure:: figures/submissions_per_sw_img.png
+.. figure:: figures/submissions_per_sw_datamanage.png
+.. figure:: figures/submissions_per_sw_neusys.png
+.. figure:: figures/submissions_per_sw_electro.png
+.. figure:: figures/submissions_per_sw_bci.png
+.. figure:: figures/submissions_per_sw_acq.png
+.. figure:: figures/submissions_per_sw_rt.png
+.. figure:: figures/submissions_per_sw_psychophys.png