Changeset 19

Timestamp:

05/02/06 11:40:19 (18 years ago)

Author:

pinsard

Message:

upgrade of COULEURS according to cerbere.lodyc.jussieu.fr: /usr/home/smasson/SAXO_RD/ : files

Location:

trunk

Files:

• COULEURS (deleted)
• ToBeReviewed/COULEURS/color24.pro (copied) (copied from trunk/COULEURS/color24.pro)
• ToBeReviewed/COULEURS/colorbar.pro (copied) (copied from trunk/COULEURS/colorbar.pro) (6 diffs)
• ToBeReviewed/COULEURS/getcolor.pro (copied) (copied from trunk/COULEURS/getcolor.pro)
• ToBeReviewed/COULEURS/lct.pro (copied) (copied from trunk/COULEURS/lct.pro) (3 diffs)
• ToBeReviewed/COULEURS/newpalette.pro (copied) (copied from trunk/COULEURS/newpalette.pro)
• ToBeReviewed/COULEURS/palette.tbl (copied) (copied from trunk/COULEURS/palette.tbl) (1 prop)
• ToBeReviewed/COULEURS/palit.pro (copied) (copied from trunk/COULEURS/palit.pro) (2 diffs)
• ToBeReviewed/COULEURS/xlct.pro (copied) (copied from trunk/COULEURS/xlct.pro)
• ToBeReviewed/COULEURS/xpal.pro (copied) (copied from trunk/COULEURS/xpal.pro)

trunk/ToBeReviewed/COULEURS/colorbar.pro

@@ -27 +27 @@
 ;       CB_COLOR:    The color index of the bar outline and characters. Default
 ;                 is ncolors - 1 + bottom.
+;
+;       CB_LOG: to get logarithmic scale for the colorbar
 ;
 ;       CB_TITLE:    This is title for the color bar. The default is to have
@@ -117 +119 @@
               DIVISIONS=divisions, DISCRET=discret,CB_LABEL = cb_label, $
               FORMAT=format, POSITION=position, MAX=max, MIN=min, NCOLORS=ncolors, $
-              PSCOLOR=pscolor, CB_TITLE=cb_title, VERTICAL=vertical, TOP=top, RIGHT=right, _extra = ex
+              PSCOLOR=pscolor, CB_TITLE=cb_title, VERTICAL=vertical, TOP=top, RIGHT=right, CB_LOG = CB_log, _extra = ex
                                 ; Is the PostScript device selected?
 
@@ -258 +260 @@
          AXIS, YAXIS=1, YRANGE=[min, max], YTICKFORMAT=format, YTICKS=divisions, $
           YTICKLEN=0.1, YSTYLE=1, COLOR=cb_color, CHARTHICK=cb_charthick $
-          , CHARSIZE=cb_charsize, xtickname = cb_label
+          , CHARSIZE=cb_charsize, xtickname = cb_label, ylog = cb_log
 
       ENDIF ELSE BEGIN
@@ -271 +273 @@
          AXIS, YAXIS=1, YRANGE=[min, max], YTICKFORMAT='(A1)', YTICKS=divisions, $
           YTICKLEN=0.1, YTITLE=cb_title, YSTYLE=1, COLOR=cb_color $
-          , CHARSIZE=cb_charsize, CHARTHICK=cb_charthick
+          , CHARSIZE=cb_charsize, CHARTHICK=cb_charthick, ylog = cb_log
 
       ENDELSE
@@ -288 +290 @@
          AXIS, XTICKS=divisions, XSTYLE=1, COLOR=cb_color $
           , CHARSIZE=cb_charsize, CHARTHICK=cb_charthick, $
-          XTICKFORMAT=format, XTICKLEN=0.1, XRANGE=[min, max], XAXIS=1, xtickname = cb_label
+          XTICKFORMAT=format, XTICKLEN=0.1, XRANGE=[min, max], XAXIS=1, xtickname = cb_label, xlog = cb_log
 
       ENDIF ELSE BEGIN
@@ -297 +299 @@
           , CHARTHICK=cb_charthick, /NOERASE, $
           YTICKFORMAT='(A1)', XTICKFORMAT=format, XTICKLEN=0.1, $
-          XRANGE=[min, max], TITLE=cb_title, xtickname = cb_label
+          XRANGE=[min, max], TITLE=cb_title, xtickname = cb_label, xlog = cb_log
 
       ENDELSE

trunk/ToBeReviewed/COULEURS/lct.pro

@@ -15 +15 @@
 ; KEYWORD PARAMETERS: ceux de loadct
 ;
+;        LIGHTNESS: a scalar used to change the Lightness of the color
+;            palette to be abble to adjust according to the printer we use,
+;            the media (paper or slide)... 
+;               lightness < 1 to get lighter colors
+;                         > 1 to get darker colors
+;
 ; rq: si le mot cle file n''est pas specifie, on cherche un fichier
 ; contenant les palette du nom de palette.tbl.
@@ -28 +34 @@
 ;------------------------------------------------------------
 ;------------------------------------------------------------
-PRO lct, numero, GET_NAME = get_name, _EXTRA = ex
+PRO lct, numero, GET_NAME = get_name, LIGHTNESS = Lightness, _EXTRA = ex
 @common
 ; le mot cle file est passe par l''intermediere de EXTRA?
@@ -87 +93 @@
       ENDELSE 
 ;
-      if oldname EQ 'PS' then BEGIN 
-         tvlct,  rouge,  vert, bleu, /get
-         palit,  coefpalit
-      endif
+      if oldname EQ 'PS' AND keyword_set(lightness) then palit, lightness 
+;
       set_plot, oldname
       IF oldname EQ 'X' OR oldname EQ 'MAC' OR oldname EQ 'WIN' then BEGIN

trunk/ToBeReviewed/COULEURS/palit.pro

@@ -1 @@
-PRO palit, coef
+PRO palit, coef, red, green, blue
 ;+
 ;  Eclaircit la palette courante en jouant sur la luminosite
@@ -8 +8 @@
 ;  coef = 0.1 pour la QMS papier de l'IPSL convient tres bien
 ;-
-   @common
    IF n_elements(coef) EQ 0 THEN coef = 0.5
-   color_convert, rouge, vert, bleu, h, l, s, /rgb_hls
+   IF n_elements(red) EQ 0 THEN tvlct, red, green, blue, /get
+   color_convert, red, green, blue, h, l, s, /rgb_hls
    l = 1.-coef*(1.-l)
 ;