Changeset 32

Timestamp:

09/14/09 16:46:30 (15 years ago)

Author:

pinsard

Message:

detection of OS; explicit xy, explicit marker size

Location:

trunk

Files:

• PROGRAMMES/carte_SST.m (modified) (1 diff)
• PROGRAMMES/reg_seriestemporelles.m (modified) (2 diffs)
• PROGRAMMES/tpacpandreg_startup.m (modified) (2 diffs)
• RESULTATS/regandsignif_seriestemporelles.m (modified) (2 diffs)
• adm/guides/makefile (modified) (5 diffs)
• adm/guides/tpacpandreg.css (modified) (1 diff)

trunk/PROGRAMMES/carte_SST.m

@@ -254 +254 @@
 clear print_printer;
 clear fullfilename;
-
-
-

trunk/PROGRAMMES/reg_seriestemporelles.m

@@ -65 +65 @@
 %
 % $Id$
+%
+% - fplod 2009-09-14T14:10:07Z aedon.locean-ipsl.upmc.fr (Darwin)
+%
+%   * explicit MarkerSize value to avoid difference between 
+%     octave 3.0.2 and octave 3.2.2 plots
+%   * explicit X and Y limits to avoid difference between
+%     matlab, octave 3.0.2 and octave 3.2.2 plots
 %
 % - fplod 2009-08-26T09:49:43Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -178 +185 @@
 ifigure=1;
 figure(ifigure);
-plot(SST,PC,'x')
+plot(SST,PC,'x','markersize', 6)
+xlim([21 28]);
+ylim([-1.5 1.5]);
 hold on
 

trunk/PROGRAMMES/tpacpandreg_startup.m

@@ -38 +38 @@
 % $Id$
 %
+% - fplod 2009-09-11T14:42:49Z aedon.locean-ipsl.upmc.fr (Darwin)
+%
+%   * la commande slCharacterEncoding('ISO-8859-1') n'est pas supporté
+%     sous Matlab/Windows : ajout de détection du systÚme pour supprimer cet
+%     appel
+%
 % - fplod 2009-08-25T10:36:26Z aedon.locean-ipsl.upmc.fr (Darwin)
 %
@@ -68 +74 @@
 %
 if (run_octave == 0)
- % to display help written in ISO-LATIN
- slCharacterEncoding('ISO-8859-1');
+ % detection of system architecture
+ computer_arch=computer('arch');
+ switch computer_arch
+  case {'mac','glnx86','gnlxa64'}
+   % to correctly display help written in ISO-LATIN
+   slCharacterEncoding('ISO-8859-1');
+  otherwise
+   % Nothing to do about encoding help written in ISO-LATIN on
+   % Windows
+   warning('www : you may have trouble to see help written in ISO-LATIN');
+  end
 end
 %

trunk/RESULTATS/regandsignif_seriestemporelles.m

@@ -65 +65 @@
 % $Id$
 %
+% - fplod 2009-09-14T14:10:07Z aedon.locean-ipsl.upmc.fr (Darwin)
+%
+%   * explicit MarkerSize value to avoid difference between 
+%     octave 3.0.2 and octave 3.2.2 plots
+%   * explicit X and Y limits to avoid difference between
+%     matlab, octave 3.0.2 and octave 3.2.2 plots
 % 
 % - fplod 2009-08-26T11:00:35Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -180 +186 @@
 ifigure=1;
 figure(ifigure); 
-plot(SST,PC,'x')
+plot(SST,PC,'x','markersize', 6)
+xlim([24 26]);
+ylim([-3 3]);
 hold on
 

trunk/adm/guides/makefile

@@ -124 +124 @@
         @-mkdir -p ${DIRWWW}/html/images/
         @-mkdir -p ${DIRWWW}/html/en/one/
+        @-mkdir -p ${DIRWWW}/html/fr/one/
         @-mkdir -p ${DIRWWW}/html/en/many/
+        @-mkdir -p ${DIRWWW}/html/fr/many/
         @-mkdir -p ${DIRWWW}/pdf/en/one/
+        @-mkdir -p ${DIRWWW}/pdf/fr/one/
         @-cp -p $(DIRSRC)/*.css ${DIRWWW}/html/css/
         @-cp $(DIRSRC)/*.gif $(DIRWWW)/html/images/
@@ -189 +192 @@
 html_one : \
 $(DIRWWW)/html/en/one/index.html \
-$(DIRWWW)/html/en/one/enonce.html
+$(DIRWWW)/html/fr/one/enonce.html
 
 html_many : \
@@ -197 +200 @@
 pdf : \
 $(DIRWWW)/pdf/en/one/$(PRODUCT).pdf \
-$(DIRWWW)/pdf/en/one/enonce.pdf
+$(DIRWWW)/pdf/fr/one/enonce.pdf
 
 tracwiki : \
@@ -234 +237 @@
         $<
 
-$(DIRWWW)/html/en/one/enonce.html : \
+$(DIRWWW)/html/fr/one/enonce.html : \
 $(DIRTMP)/enonce_full.xml \
 $(DIRSRC)/html.xsl \
@@ -321 +324 @@
         2> $(DIRTMP)/main_dblatex.err
 
-$(DIRWWW)/pdf/en/one/enonce.pdf : \
+$(DIRWWW)/pdf/fr/one/enonce.pdf : \
 $(DIRTMP)/enonce_full.xml
         @-dblatex \

trunk/adm/guides/tpacpandreg.css

@@ -8 +8 @@
 $Id$
 
-fplod 2009-08-13T08:15:21Z aedon.locean-ipsl.upmc.fr (Darwin)
-creation empty
+- fplod 2009-08-13T08:15:21Z aedon.locean-ipsl.upmc.fr (Darwin)
+
+  * creation empty
+
 */