Changeset 328 for trunk

Timestamp:

12/13/07 20:27:11 (16 years ago)

Author:

smasson

Message:

bugfix, continuation of changeset:326

Location:

trunk/SRC/ToBeReviewed/PLOTS/DESSINE

Files:

• plt.pro (modified) (1 diff)
• pltt.pro (modified) (2 diffs)
• pltz.pro (modified) (2 diffs)

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

@@ -347 +347 @@
   IF keyword_set(strictfill) THEN BEGIN
     tmp = z2d ge max
-    tmp = 1b - byte(extrapolate(tmp, tmp, 1, x_periodic = keyword_set(key_periodic)*(nx EQ jpi) ))
-    trifield = triangule(temporary(tmp)*mask, coinmonte = coinmontemask $
-               , coindescend = coindescendmask, keep_cont = 0)
-    indicezoommask = (lindgen(jpi, jpj))[firstx:lastx, firsty:lasty]
+    IF total(tmp GE 1) THEN BEGIN 
+      tmp = 1b - byte(extrapolate(tmp, tmp, 1, x_periodic = keyword_set(key_periodic)*(nx EQ jpi) ))
+      trifield = triangule(temporary(tmp)*mask, coinmonte = coinmontemask $
+                           , coindescend = coindescendmask, keep_cont = 0)
+      indicezoommask = (lindgen(jpi, jpj))[firstx:lastx, firsty:lasty]
+    ENDIF
   ENDIF
 ; filling the mask values

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

@@ -474 +474 @@
       IF keyword_set(strictfill) THEN BEGIN
         tmp = z2d ge max
-        tmp = 1b - byte(extrapolate(tmp, tmp, 1))
-        key_save = key_periodic & key_periodic = 0
-        trifield = triangule(temporary(tmp)*mask, coinmonte = coinmontemaskaa $
-                             , coindescend = coindescendmaskaa, keep_cont = 0)
-        key_periodic = key_save
-        usetri = 2
+        IF total(tmp GE 1) THEN BEGIN 
+          tmp = 1b - byte(extrapolate(tmp, tmp, 1))
+          key_save = key_periodic & key_periodic = 0
+          trifield = triangule(temporary(tmp)*mask, coinmonte = coinmontemaskaa $
+                               , coindescend = coindescendmaskaa, keep_cont = 0)
+          key_periodic = key_save
+          usetri = 2
+        ENDIF
       ENDIF
       z2d = remplit(z2d,nite=2+keyword_set(nan), mask = mask, /basique, _extra=ex)
@@ -494 +496 @@
                                      , coindescend = coindescendmask)
       ENDIF
-      IF NOT keyword_set(strictfill) THEN trifield = triangulation
+      IF n_elements(key_save) EQ 0 THEN trifield = triangulation
 ;----------------------------------------------------------------------
       pltbase, z2d, xx, yy, mask, xx, yy, level_z2d, colnumb, contour = contour, /noerase $

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

@@ -311 +311 @@
   IF keyword_set(strictfill) THEN BEGIN
     tmp = z2d ge max
-    tmp = 1b - byte(extrapolate(tmp, tmp, 1))
-    key_save = key_periodic & key_periodic = 0
-    trifield = triangule(temporary(tmp)*mask, coinmonte = coinmontemask $
-                         , coindescend = coindescendmask, keep_cont = 0)
-    key_periodic = key_save
+    IF total(tmp GE 1) THEN BEGIN 
+      tmp = 1b - byte(extrapolate(tmp, tmp, 1))
+      key_save = key_periodic & key_periodic = 0
+      trifield = triangule(temporary(tmp)*mask, coinmonte = coinmontemask $
+                           , coindescend = coindescendmask, keep_cont = 0)
+      key_periodic = key_save
+    ENDIF
   ENDIF
   IF n_elements(fillxdir) EQ 0  THEN fillxdir = 1
@@ -347 +349 @@
 ;   if keyword_set(notri) then trifield = -1 $
 ;   ELSE trifield = triangule(mask,/basic)
-  if NOT keyword_set(strictfill) AND ((usetri GE 1 AND (vargrid EQ 'T' OR vargrid EQ 'W')) $
+  if n_elements(key_save) EQ 0 AND ((usetri GE 1 AND (vargrid EQ 'T' OR vargrid EQ 'W')) $
                                       OR (usetri EQ 2 AND (vargrid NE 'T' AND vargrid NE 'W'))) THEN $
                                          trifield = triangule(mask, /basic)