Changeset 52 for trunk

Timestamp:

05/09/06 13:11:55 (18 years ago)

Author:

pinsard

Message:

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

Location:

trunk

Files:

• ToBeReviewed/WIDGET/findtopid.pro (copied) (copied from trunk/WIDGET/findtopid.pro)
• ToBeReviewed/WIDGET/slec.pro (copied) (copied from trunk/WIDGET/slec.pro) (1 diff)
• ToBeReviewed/WIDGET/xnotice.pro (copied) (copied from trunk/WIDGET/xnotice.pro)
• ToBeReviewed/WIDGET/xquestion.pro (copied) (copied from trunk/WIDGET/xquestion.pro)
• ToBeReviewed/WIDGET/xx.pro (copied) (copied from trunk/WIDGET/xx.pro) (1 diff)
• ToBeReviewed/WIDGET/xxx.pro (copied) (copied from trunk/WIDGET/xxx.pro) (10 diffs)
• WIDGET (deleted)

trunk/ToBeReviewed/WIDGET/slec.pro

@@ -1 @@
-FUNCTION slec,name,debut,fin, nomexp, PARENT = parent, BOITE=boite, _EXTRA = ex
-@common
+FUNCTION slec,name,debut,fin, nomexp, PARENT = parent, BOXZOOM=boxzoom, _EXTRA = ex
+;---------------------------------------------------------
+; include common
+@cm_4data
+  IF NOT keyword_set(key_forgetold) THEN BEGIN
+@updatenew
+@updatekwd
+  ENDIF
 ;------------------------------------------------------------ 
    case n_params() of
-      1:tab = nlec(name, PARENT = parent, BOITE=boite, _EXTRA = ex)
-      2:tab = nlec(name,debut, PARENT = parent, BOITE=boite, _EXTRA = ex)
-      3:tab = nlec(name,debut,fin, PARENT = parent, BOITE=boite, _EXTRA = ex)
-      4:tab = nlec(name,debut,fin, nomexp, PARENT = parent, BOITE=boite, _EXTRA = ex)
+      1:tab = nlec(name, PARENT = parent, BOXZOOM=boxzoom, _EXTRA = ex)
+      2:tab = nlec(name,debut, PARENT = parent, BOXZOOM=boxzoom, _EXTRA = ex)
+      3:tab = nlec(name,debut,fin, PARENT = parent, BOXZOOM=boxzoom, _EXTRA = ex)
+      4:tab = nlec(name,debut,fin, nomexp, PARENT = parent, BOXZOOM=boxzoom, _EXTRA = ex)
    endcase
 ;

trunk/ToBeReviewed/WIDGET/xx.pro

@@ -10 +10 @@
 ; nom de la fonction de lecture:
    if NOT keyword_set(funclec_name) then funclec_name = 'slec'
-   prefix = 'INF'
+   varexp = 'INF'
 ; liste des variables
    if NOT keyword_set(listvar) then listvar = ['tn','sn','un','vn', 'taux', 'tauy','hdep20','hdep28','hdep15','hturb','hpycn','htoth','emp','qn','qs', 'smltot11', 'smltot12', 'smltot13', 'smltot14', 'smltot15', 'smltot16', 'tmltot11', 'tmltot12', 'tmltot13', 'tmltot14', 'tmltot15', 'tmltot16']

trunk/ToBeReviewed/WIDGET/xxx.pro

@@ -69 +69 @@
    options = extractatt(top_uvalue, 'options')
    index = where(options EQ 'Ok button') & index = index[0]
-   currentplot = (extractatt(top_uvalue, 'petitout'))[2]-1
+   currentplot = (extractatt(top_uvalue, 'smallout'))[2]-1
    okbutton = extractatt(top_uvalue, 'optionsflag')
    okbutton = okbutton[index, currentplot]
@@ -112 +112 @@
             wset, win
             widget_control,event.top,get_uvalue=top_uvalue
-            numdessinin = (extractatt(top_uvalue, 'petitin'))[2]-1
+            numdessinin = (extractatt(top_uvalue, 'smallin'))[2]-1
             !p = (extractatt(top_uvalue, 'penvs'))[numdessinin]
             !x = (extractatt(top_uvalue, 'xenvs'))[numdessinin]
@@ -139 +139 @@
 ;------------------------------------------------------------
 ;------------------------------------------------------------
-PRO xxx, BOITE = boite, CALLERWIDID = CallerWidId, DATE1 = date1, DATE2 = date2, PETIT = petit, MULTISTRUCTURE = multistructure, REDRAW = redraw, SEPARATE = separate, UVALUE = uvalue, RESTORE = restore, _EXTRA = ex
+PRO xxx, BOXZOOM = boxzoom, CALLERWIDID = CallerWidId, DATE1 = date1, DATE2 = date2, SMALL = small, MULTISTRUCTURE = multistructure, REDRAW = redraw, SEPARATE = separate, UVALUE = uvalue, RESTORE = restore, _EXTRA = ex
 ;------------------------------------------------------------
 @common
@@ -150 +150 @@
 ; appele le nouveau widget que l''on est en train de mettre en place
    if keyword_set(restore) then BEGIN
-      restore = isafile(filename = restore, iodir = homedir)
+      restore = isafile(filename = restore, iodir = homedir, _extra = ex)
       if size(restore, /type) NE 7 then restore = 0 ELSE BEGIN 
-         restore, isafile(file = restore, io = homedir)
+         restore, isafile(file = restore, iodir = homedir, _extra = ex)
          newgrid = *(extractatt(uvalue, 'meshparameters'))[0]
          change = changegrid(newgrid)
@@ -191 +191 @@
    graphtypeid = widget_droplist(base111, value = graphtype, uname = 'action', uvalue = {name:'action', choix:graphtype})
 ; configuration de la page
-   if n_elements(petit) eq 0 then BEGIN 
-      petitin = [1, 1, 1]
-      petitout = [1, 1, 1]
+   if n_elements(small) eq 0 then BEGIN 
+      smallin = [1, 1, 1]
+      smallout = [1, 1, 1]
    endif
    if keyword_set(uvalue) then begin
-      petitin = extractatt(uvalue, 'petitin')
-      petitout = extractatt(uvalue, 'petitout')
-   endif
-   nbredessin = petitin[0]*petitin[1]
-   numdessinin = petitin[2]-1
-;
-   rien = cw_miseenpage(base11, petitin, /row, /frame)
+      smallin = extractatt(uvalue, 'smallin')
+      smallout = extractatt(uvalue, 'smallout')
+   endif
+   nbredessin = smallin[0]*smallin[1]
+   numdessinin = smallin[2]-1
+;
+   rien = cw_miseenpage(base11, smallin, /row, /frame)
 ; mapping du boutton 'OK'
    if keyword_set(uvalue) then flag = extractatt(uvalue,'optionsflag') $
-;   ELSE flag = [0, key_portrait, 0, 1, 0, 0, 0]#replicate(1, petitin[2]-1)
+;   ELSE flag = [0, key_portrait, 0, 1, 0, 0, 0]#replicate(1, smallin[2]-1)
    ELSE flag = [1, key_portrait, 0, 0, 0, 0]#replicate(1, nbredessin)
-   currentflag = flag[*, petitin[2]-1]
+   currentflag = flag[*, smallin[2]-1]
    widget_control, baseok, map = currentflag[0]
 ;
@@ -236 +236 @@
       widget_control, widget_info(CallerWidId, find_by_uname = 'nom_exp'), get_value = value
       value = value[0]
-   ENDIF ELSE value = prefix
+   ENDIF ELSE value = varexp
    rien=widget_text(base11, value = value, uvalue={name:'nom_exp'}, uname='nom_exp', /editable)
 ; liste des variables
@@ -266 +266 @@
    vargrid = strupcase((*fileparameters[currentfile]).listgrid[selectvar])
    IF vargrid EQ 'W' then zgrid = 'W' ELSE zgrid = 'T'
-   rien = cw_domain(base1, uname = 'domain', uvalue = {name:'domain'}, /unzoom, /frame, boite = boite, row = 1-(key_portrait OR keyword_set(SEPARATE)), column = key_portrait OR keyword_set(SEPARATE))
+   rien = cw_domain(base1, uname = 'domain', uvalue = {name:'domain'}, /unzoom, /frame, boxzoom = boxzoom, row = 1-(key_portrait OR keyword_set(SEPARATE)), column = key_portrait OR keyword_set(SEPARATE))
 ;------------------------------------------------------------
 ; 3eme ligne
@@ -323 +323 @@
             globalcommand = extractatt(top_uvalue, 'globalcommand')
 ; on complete par le premiere et les dernieres lignes du programme
-            globalcommand = ['pro xxx2ps, NOERASE = noerase, POSTSCRIPT = postscript, PORTRAIT = portrait, LANDSCAPE = landscape' $
-                             , globalcommand $
-                             , 'return',  'end']
-            putfile, homedir+'xxx2ps.pro', globalcommand ; on l''ecrit
-            resolve_routine, 'xxx2ps' ; on le compile
-            xxx2ps, /noerase, portrait = portrait ; on l''applique
+            createpro, globalcommand, filename = myuniquetmpdir + 'xxx2ps.pro' $
+                       , KWDLIST = ', NOERASE = noerase, POSTSCRIPT = postscript, PORTRAIT = portrait, LANDSCAPE = landscape' $
+                       , KWDUSED = ', /noerase, PORTRAIT = portrait'
          END
          keyword_set(restore):begin
@@ -394 +391 @@
 ; variables se rapportant au widget en general
       *top_uvalue[0, 0] = 'options' & *top_uvalue[1, 0] = options
-      *top_uvalue[0, 1] = 'petitin' & *top_uvalue[1, 1] = petitin
-      *top_uvalue[0, 2] = 'petitout' & *top_uvalue[1, 2] = petitout
+      *top_uvalue[0, 1] = 'smallin' & *top_uvalue[1, 1] = smallin
+      *top_uvalue[0, 2] = 'smallout' & *top_uvalue[1, 2] = smallout
       *top_uvalue[0, 3] = 'graphid' & *top_uvalue[1, 3] = graphid
       *top_uvalue[0, 4] = 'alreadyvector' & *top_uvalue[1, 4] = -1
@@ -426 +423 @@
 ;
       widget_control, base, set_uvalue = top_uvalue
-      createhistory, base, petitin
+      createhistory, base, smallin
 ;
    ENDELSE