Changeset 487 for trunk/SRC

Timestamp:

09/30/13 11:45:39 (11 years ago)

Author:

smasson

Message:

bugfix to be used in batch mode

Location:

trunk/SRC

Files:

• Grid/ncdf_meshread.pro (modified) (3 diffs)
• Grid/ncdf_meshroms.pro (modified) (3 diffs)
• Obsolete/meshlec.pro (modified) (1 diff)
• Postscript/closeps.pro (modified) (1 diff)
• Postscript/openps.pro (modified) (1 diff)
• Postscript/printps.pro (modified) (1 diff)

trunk/SRC/Grid/ncdf_meshread.pro

@@ -133 +133 @@
 ;
   if keyword_set(getdimensions) then begin
-    widget_control, noticebase, bad_id = nothing, /destroy
+    IF NOT keyword_set(key_batch) then widget_control, noticebase, bad_id = nothing, /destroy
     ncdf_close,  cdfid
     return
@@ -218 +218 @@
         ras = report(['the x axis (1st line of glamt) is not sorted in the increasing order after the automatic definition of key_shift', $
         'please use the keyword shift (and periodic) to suppress the automatic definition of key_shift (and key_periodic) and define by hand a more suitable value...'])
-        widget_control, noticebase, bad_id = nothing, /destroy
+        IF NOT keyword_set(key_batch) then widget_control, noticebase, bad_id = nothing, /destroy
         return
       ENDIF
@@ -633 +633 @@
   izmindta = izmindtasauve
 ;-------------------------------------------------------
-  widget_control, noticebase, bad_id = nothing, /destroy
+  IF NOT keyword_set(key_batch) then widget_control, noticebase, bad_id = nothing, /destroy
 ;
 ;====================================================

trunk/SRC/Grid/ncdf_meshroms.pro

@@ -127 +127 @@
 ;
   if keyword_set(getdimensions) then begin
-    widget_control, noticebase, bad_id = nothing, /destroy
+    IF NOT keyword_set(key_batch) then widget_control, noticebase, bad_id = nothing, /destroy
     ncdf_close,  cdfid
     return
@@ -198 +198 @@
         ras = report (['the x axis (1st line of glamt) is not sorted in the increasing order after the automatic definition of key_shift', $
         'please use the keyword shift (and periodic) to suppress the automatic definition of key_shift (and key_periodic) and define by hand a more suitable value...'])
-        widget_control, noticebase, bad_id = nothing, /destroy
+        IF NOT keyword_set(key_batch) then widget_control, noticebase, bad_id = nothing, /destroy
         return
       ENDIF
@@ -491 +491 @@
   izmindta = izmindtasauve
 ;-------------------------------------------------------
-  widget_control, noticebase, bad_id = nothing, /destroy
+  IF NOT keyword_set(key_batch) then widget_control, noticebase, bad_id = nothing, /destroy
 ;
 ;====================================================

trunk/SRC/Obsolete/meshlec.pro

@@ -337 +337 @@
 ;
    if not keyword_set(pasblabla) then print,'lecture '+nomfich+' finie'
-   widget_control, noticebase, bad_id = toto, /destroy
+   IF NOT keyword_set(key_batch) then widget_control, noticebase, bad_id = toto, /destroy
    if keyword_set(key_performance) THEN print, 'temps meshlec', systime(1)-tempsun
 

trunk/SRC/Postscript/closeps.pro

@@ -100 +100 @@
    set_default_device
 ;------------------------------------------------------------
-   if keyword_set(infowidget) then $
+   if keyword_set(infowidget) AND NOT keyword_set(batch) then $
     widget_control, long(infowidget), bad_id = toto, /destroy
 ;------------------------------------------------------------

trunk/SRC/Postscript/openps.pro

@@ -99 +99 @@
             file_basename(nameps, '.ps') + '.ps'
 ; add path (psdir) and check that nameps is ok
-   nameps = isafile(nameps, iodir = psdir, /new)
 ;------------------------------------------------------------
 ; we define xsize, ysize, xoffset and yoffset

trunk/SRC/Postscript/printps.pro

@@ -306 +306 @@
 ;------------------------------------------------------------
     ELSE:BEGIN 
+      IF keyword_set(key_batch) THEN return 
       base = widget_base(/row, title = 'Postscript file: ' $
                          + file_basename(nameps))