Ignore:
Timestamp:
03/28/07 08:50:03 (17 years ago)
Author:
smasson
Message:

cleaning + minor bugfix related to the path definition

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/SRC/Utilities/report.pro

    r232 r239  
    6969  res = -1                      ; 
    7070; we separate the text in different lines (separated by !C) if it is not already done... 
    71    if n_elements(text) EQ 1 then text = str_sep(text, '!C', /trim) 
     71  if n_elements(text) EQ 1 then text = str_sep(text, '!C', /trim) 
    7272; there is some widgets activated, it is easy, we call dialog_massage 
    73    if (widget_info(/managed))[0] NE 0 then BEGIN 
    74       res = dialog_message(text, dialog_parent = parent, QUESTION = question $ 
    75                            , title = routine_name(1), DEFAULT_NO = default_no, _extra = ex) 
    76       if keyword_set(question) THEN res = res EQ 'Yes' ELSE res = -1 
    77    ENDIF ELSE BEGIN 
     73  if (widget_info(/managed))[0] NE 0 then BEGIN 
     74    res = dialog_message(text, dialog_parent = parent, QUESTION = question $ 
     75                         , title = routine_name(1), DEFAULT_NO = default_no, _extra = ex) 
     76    if keyword_set(question) THEN res = res EQ 'Yes' ELSE res = -1 
     77  ENDIF ELSE BEGIN 
    7878; there is not any widget activated 
    7979; do we ask a question ? 
    80       if keyword_set(question) then BEGIN 
     80    if keyword_set(question) then BEGIN 
    8181; what i sthe answer by default ? 
    82          if keyword_set(default_no) then answer = 'n' ELSE answer = 'y' 
    83          default_answer = answer 
    84          if n_elements(text) GT 1 THEN $ 
    85           for i = 0, n_elements(text)-2 do print,text[i] 
    86          read, text[n_elements(text)-1]+' y/n (default answer is '+default_answer+')' , answer 
    87          answer = strlowcase(answer) ; 
     82      if keyword_set(default_no) then answer = 'n' ELSE answer = 'y' 
     83      default_answer = answer 
     84      if n_elements(text) GT 1 THEN $ 
     85        for i = 0, n_elements(text)-2 do print, text[i] 
     86      read, text[n_elements(text)-1]+' y/n (default answer is '+default_answer+')', answer 
     87      answer = strlowcase(answer) ; 
    8888; if the answer is not appropriated 
    89          while answer NE '' and answer NE 'y' and answer NE 'n' do begin 
    90             read, text[n_elements(text)-1]+' y/n (default answer is '+default_answer+')' , answer 
    91             answer = strlowcase(answer) 
    92          ENDWHILE               ; 
     89      while answer NE '' and answer NE 'y' and answer NE 'n' do begin 
     90        read, text[n_elements(text)-1]+' y/n (default answer is '+default_answer+')', answer 
     91        answer = strlowcase(answer) 
     92      ENDWHILE                  ; 
    9393; we adjust res in function of th answer 
    94          case answer of 
    95             '':res = default_answer EQ 'y' 
    96             'y':res = 1 
    97             'n':res = 0 
    98          endcase 
    99       endif ELSE BEGIN 
     94      case answer of 
     95        '':res = default_answer EQ 'y' 
     96        'y':res = 1 
     97        'n':res = 0 
     98      endcase 
     99    ENDIF 
     100  ENDELSE 
    100101; If we do not ask any question, we just make a print 
    101         IF keyword_set(simple) THEN prefix = '' ELSE prefix = '% '+routine_name(1)+': ' 
    102          if n_elements(text) GT 1 THEN $ 
    103           for i = 0, n_elements(text)-2 do print, prefix+text[i] 
    104          print, prefix+text[n_elements(text)-1] 
    105       ENDELSE 
    106    ENDELSE 
     102  IF NOT keyword_set(question) THEN BEGIN 
     103    IF keyword_set(simple) THEN prefix = '' ELSE prefix = '% '+routine_name(1)+': ' 
     104    if n_elements(text) GT 1 THEN $ 
     105      for i = 0, n_elements(text)-2 do print, prefix+text[i] 
     106    print, prefix+text[n_elements(text)-1] 
     107  ENDIF 
    107108 
    108109   return,  res 
Note: See TracChangeset for help on using the changeset viewer.