Changeset 483

Timestamp:

04/11/13 11:09:49 (11 years ago)

Author:

smasson

Message:

cleaner NaN mask in pltt

File:

• trunk/SRC/ToBeReviewed/PLOTS/DESSINE/pltt.pro (modified) (3 diffs)

trunk/SRC/ToBeReviewed/PLOTS/DESSINE/pltt.pro

@@ -469 +469 @@
          masknan = finite(z2d)
          IF NOT keyword_set(nofill) THEN z2d[where(masknan EQ 0)] = max
-         mask = temporary(mask)*temporary(masknan)
+         masksave = mask
+         mask = temporary(mask)*masknan
        ENDIF
       usetri = 0 ; default definition
@@ -483 +484 @@
         ENDIF
       ENDIF
-      z2d = remplit(z2d,nite=2+keyword_set(nan), mask = mask, /basique, _extra=ex)
+      z2d = remplit(z2d, nite = 2+keyword_set(nan), mask = mask, /basique, _extra = ex)
       if NOT keyword_set(strictfill) then z2d = min > z2d <  max
       if keyword_set(nan) then BEGIN
         triangulation = triangule(mask, /basic, coinmonte = coinmontemask $
                                   , coindescend = coindescendmask)
-        usetri = 1
+        trinan = triangule(masknan, /basic, coinmonte = coinmontenan $
+                                  , coindescend = coindescendnan)
+       usetri = 1
       ENDIF ELSE triangulation = -1
       IF size(gdep, /n_dimensions) EQ 2 THEN BEGIN
@@ -498 +501 @@
       IF n_elements(key_save) EQ 0 THEN trifield = triangulation
 ;----------------------------------------------------------------------
-      pltbase, z2d, xx, yy, mask, xx, yy, level_z2d, colnumb, contour = contour, /noerase $
+      pltbase, z2d, xx, yy, masksave, xx, yy, level_z2d, colnumb, contour = contour, /noerase $
        , c_linestyle=linestyle,c_labels=1-(indgen(n_elements(level_z2d)) MOD 2) $
        , trichamp = trifield, trimsk = triangulation, overplot = overplot $
        , c_thick=thick, performance = key_performance, nofill = nofill, usetri = usetri $
-       , coinmontemask=coinmontemask, coindescendmask=coindescendmask, _extra = ex
+       , coinmontemask=coinmontemask, coindescendmask=coindescendmask $
+       , coinmontenan = coinmontenan, coindescendnan = coindescendnan, masknan = masknan, trinan = trinan, _extra = ex
 ;------------------------------------------------------------
       if n_elements(contour) eq 4 then BEGIN ; it is the second time I pass in pltt