Changeset 150

Timestamp:

02/28/12 14:04:10 (12 years ago)

Author:

pinsard

Message:

first usage of matplotlib

Location:

trunk

Files:

• makefile (modified) (5 diffs)
• tests/demo1.sh (modified) (1 prop)
• tests/demo2.sh (modified) (1 prop)
• years_matplotlib.xsl (modified) (4 diffs)

trunk/makefile

@@ -6 +6 @@
 # génération des pages superbib
 #
+# TODO
+# ====
+#
+# ask for end-user graphic tool
+#
 # EVOLUTIONS
 # ==========
@@ -15 +20 @@
 # - fplod 20120228
 #
+#   * matplotlib ok on halios even if the image is too large
+#   * gnuplot process is also done but not use (to uggly)
 #   * ploticus command is now (version 2.41) pl
 #
@@ -227 +234 @@
         -@rm -f $(DIRTMP)/years_gnuplot.gnu
         -@rm -f $(DIRTMP)/years.ploticus
+        -@rm -f $(DIRTMP)/years_matplotlib.py
         -@rm -f $(DIRTMP)/years.png
         -@rm -f $(DIRTMP)/$(PRODUCT)02.xml
@@ -490 +498 @@
 $(DIRWWW)/images/years.png : \
 $(DIRTMP)/years.ploticus \
-$(DIRTMP)/years_gnuplot.gnu
+$(DIRTMP)/years_gnuplot.gnu \
+$(DIRTMP)/years_matplotlib.py
         @gnuplot years_gnuplot.gnu
         @pl -o $@ png $<        
+        @python years_matplotlib.py
+
+$(DIRTMP)/years_matplotlib.py : \
+$(DIRTMP)/biblio.xml \
+$(DIRSRC)/years_matplotlib.xsl \
+$(DIRSRC)/biblioentry_xml.xsl \
+$(DIRSRC)/message_lang.xsl
+        @xsltproc \
+        --param makedate "'$(MAKEDATE)'" \
+        --param path "'$(DIRWWW)/images/'" \
+        --output $@ \
+        $(DIRSRC)/years_matplotlib.xsl \
+        $<
 
 $(DIRTMP)/years_gnuplot.gnu : \
@@ -501 +523 @@
         @xsltproc \
         --param makedate "'$(MAKEDATE)'" \
-        --param path "'$(DIRTMP)'" \
+        --param path "'$(DIRWWW)/images/'" \
         --output $@ \
         $(DIRSRC)/years_gnuplot.xsl \

trunk/years_matplotlib.xsl

@@ -31 +31 @@
 see http://matplotlib.sourceforge.net/examples/pylab_examples/demo_ribbon_box.html
 
+doctest
+
 EVOLUTIONS
 ==========
 
 $Id$
+
 $URL$
+
+- fplod 20120228
+
+  * add yticks and ylim
+  * remove plot_shox to avoid interaction
 
 - fplod 20110627T144044Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -60 +68 @@
 ::
 
-  $ python graph1_<xsl:value-of select="years"/>.py
+  $ python years_matplotlib.py
 
 
@@ -94 +102 @@
    </xsl:for-each>
 
+ax.set_ylim(min(values)-1, max(values)+1)
 ax.set_xlim(dates[0]-0.5, dates[-1]+0.5)
+plot.yticks(np.arange(min(values)-1,max(values)+1,1))
 plot.bar(dates, values,width=0.5)
 
@@ -101 +111 @@
 #
 fig.savefig('<xsl:value-of select="$path"/>/years.png')
-
-plot.show()
 
 </xsl:template>