Changeset 74 for trunk/SRC/ToBeReviewed/WIDGET/AUTOUR_de_XXX

Timestamp:

05/23/06 15:45:47 (18 years ago)

Author:

smasson

Message:

debug xxx and cie + clean data file + rm perldoc_idl

Location:

trunk/SRC/ToBeReviewed/WIDGET/AUTOUR_de_XXX

Files:

• .idlwave_catalog (modified) (1 diff)
• buildcmd.pro (modified) (4 diffs)
• buildreadcmd.pro (modified) (3 diffs)
• changefile.pro (modified) (2 diffs)
• scanfile.pro (modified) (1 diff)
• selectfile.pro (modified) (1 diff)
• xcreateanim.pro (modified) (4 diffs)
• xxxmenubar_event.pro (modified) (1 diff)

trunk/SRC/ToBeReviewed/WIDGET/AUTOUR_de_XXX/.idlwave_catalog

@@ -2 +2 @@
 ;; IDLWAVE catalog for library saxo
 ;; Automatically Generated -- do not edit.
-;; Created by idlwave_catalog on Thu May  4 08:42:55 2006
+;; Created by idlwave_catalog on Tue May 23 15:31:07 2006
 ;;
 (setq idlwave-library-catalog-libname "saxo")

trunk/SRC/ToBeReviewed/WIDGET/AUTOUR_de_XXX/buildcmd.pro

@@ -61 +61 @@
     'plt':procedure = 'plt'
     'pltz':procedure = 'pltz'
-    'pltz_diag':procedure = 'pltz'
+    'pltz diag up':procedure = 'pltz'
+    'pltz diag dn':procedure = 'pltz'
     'pltt':procedure = 'pltt'
-    'pltt_diag':procedure = 'pltt'
+    'pltt diag up':procedure = 'pltt'
+    'pltt diag dn':procedure = 'pltt'
     'xy':procedure = 'plt'
     'xz':procedure = 'pltz'
@@ -126 +128 @@
 ;
   widget_control, txtcmdid, get_value = widcmd
+  widcmd =  strtrim(widcmd, 2)
   IF widcmd[0] EQ '' THEN widcmd = 'zzz'
   
@@ -357 +360 @@
   endif
   box = box+']'
-  IF strpos(type, '_diag') NE -1 THEN BEGIN
+  IF strpos(type, ' diag up') NE -1 THEN BEGIN
     sendpoints = '[' + strtrim(boxzoom[0], 1) + ', ' + strtrim(boxzoom[2], 1) + $
                 ', ' + strtrim(boxzoom[1], 1) + ', ' + strtrim(boxzoom[3], 1) + ']'
   ENDIF
+  IF strpos(type, ' diag dn') NE -1 THEN BEGIN
+    sendpoints = '[' + strtrim(boxzoom[0], 1) + ', ' + strtrim(boxzoom[3], 1) + $
+                ', ' + strtrim(boxzoom[1], 1) + ', ' + strtrim(boxzoom[2], 1) + ']'
+  ENDIF
 ;---------------
 ; on determine typein
 ;---------------
-    IF strpos(type, '_diag') NE -1 THEN typein = ''''+strmid(type, 0, 4)+'''' $
+    IF strpos(type, ' diag ') NE -1 THEN typein = ''''+strmid(type, 0, 4)+'''' $
     ELSE typein = ''''+type+''''
 ;---------------
@@ -375 +382 @@
 ;------------------------------------------------------------
   Cmd = [readCmd, procedure+ ', field $' $
-         , '    , boxzoom = '+box+', typein='+typein+', small='+ssmall+' $']
+         , '    , boxzoom = '+box+', /findalways, typein='+typein+', small='+ssmall+' $']
   IF drawvecteur then Cmd = [Cmd, '    , vecteur = {u: fieldu,v: fieldv} $']
   IF drawover then Cmd = [Cmd, '    , contour = fieldover $']

trunk/SRC/ToBeReviewed/WIDGET/AUTOUR_de_XXX/buildreadcmd.pro

@@ -76 +76 @@
   if size(exextra, /type) EQ 8 then extra = mixstru(exextra, extra)
   sextra = struct2string(extra)
-
 ;---------------
 ; find date1 and date2
@@ -113 +112 @@
     endif
   box = box+']'
-  IF strpos(type, '_diag') NE -1 THEN BEGIN
+  IF strpos(type, ' diag up') NE -1 THEN BEGIN
     sendpoints = '[' + strtrim(boxzoom[0], 1) + ', ' + strtrim(boxzoom[2], 1) + $
                 ', ' + strtrim(boxzoom[1], 1) + ', ' + strtrim(boxzoom[3], 1) + ']'
+  ENDIF
+  IF strpos(type, ' diag dn') NE -1 THEN BEGIN
+    sendpoints = '[' + strtrim(boxzoom[0], 1) + ', ' + strtrim(boxzoom[3], 1) + $
+                ', ' + strtrim(boxzoom[1], 1) + ', ' + strtrim(boxzoom[2], 1) + ']'
   ENDIF
 ;---------------
@@ -138 +141 @@
            , '; Do we change the grid?:', 'dummy = changegrid(meshparameters)' $
            , '; Read the data...' $
-           , 'if keyword_set(date1in) then date1 = date1in else date1 = ' + sdate1 $
-           , 'if keyword_set(date2in) then date2 = date2in else date2 = ' + sdate2 $
+           , 'if n_elements(date1in) ne 0 then date1 = date1in else date1 = ' + sdate1 $
+           , 'if n_elements(date2in) ne 0 then date2 = date2in else date2 = ' + sdate2 $
            , funclec_name+'('+snamevar+', date1, date2, '+snameexp $
            + ', timestep = '+strtrim(keyword_set(fakecal), 1)+', parent = '+strtrim(base, 2) $
-           + ', boxzoom = '+box+' $' $
+           + ', boxzoom = '+box+', /findalways $' $
            , '    , filename = '+sfilename+' $']
     if n_elements(sendpoints) NE 0 then $

trunk/SRC/ToBeReviewed/WIDGET/AUTOUR_de_XXX/changefile.pro

@@ -30 +30 @@
 ; Did we change the calendar?
   if array_equal(oldcalendar, newcalendar) NE 1 then begin
-@cm_4cal ; for key_caltype
+@cm_4cal 
+; for key_caltype
     key_caltype = (*(extractatt(top_uvalue, 'fileparameters'))[newfile]).caltype
+; fake or real calendar???
+    fakecal = (*(extractatt(top_uvalue, 'fileparameters'))[newfile]).fakecal
 ; Which dates were selected?    
     date1id = widget_info(base, find_by_uname = 'calendar1')
@@ -46 +49 @@
     basecal = widget_info(base, find_by_uname = 'basecal')
     rien = cw_calendar(basecal, newcalendar, jdate1, uname = 'calendar1' $
-                       , uvalue = {name:'calendar1'}, /frame)
+                       , FAKECAL = fakecal, uvalue = {name:'calendar1'}, /frame)
     rien = cw_calendar(basecal, newcalendar, jdate2, uname = 'calendar2' $
-                       , uvalue = {name:'calendar2'}, /frame)
+                       , FAKECAL = fakecal, uvalue = {name:'calendar2'}, /frame)
   ENDIF ELSE BEGIN 
     if keyword_set(date1) then begin

trunk/SRC/ToBeReviewed/WIDGET/AUTOUR_de_XXX/scanfile.pro

@@ -205 +205 @@
 ;
 ; high frequency calendar: more than one element per day
-          IF max(histogram([long(time)])) GT 1 THEN fakecal = 1 ELSE fakecal = 0
+          IF max(histogram([long(time-time[0])])) GT 1 THEN fakecal = 1 ELSE fakecal = 0
           date0fk = date2jul(19000101)
           IF keyword_set(fakecal) THEN time = date0fk+lindgen(jpt) $

trunk/SRC/ToBeReviewed/WIDGET/AUTOUR_de_XXX/selectfile.pro

@@ -213 +213 @@
   loadgrid, res.meshload, _extra = ex
 
-  glaminfo = moment(glamt)
-  IF finite(glaminfo[2]) EQ 0 THEN glaminfo = glaminfo[0:1]
-  gphiinfo = moment(gphit)
-  IF finite(gphiinfo[2]) EQ 0 THEN gphiinfo = gphiinfo[0:1]
-  ccmeshparameters = {filename: res.meshload $
-          , glaminfo:glaminfo $
-          , gphiinfo:gphiinfo $
-          , jpiglo:jpiglo, jpjglo:jpjglo, jpkglo:jpkglo $
-          , jpi:jpi, jpj:jpj, jpk:jpk $
-          , ixminmesh:ixminmesh, ixmaxmesh:ixmaxmesh $
-          , iyminmesh:iyminmesh, iymaxmesh:iymaxmesh $
-          , izminmesh:izminmesh, izmaxmesh:izmaxmesh $
-          , key_shift:key_shift, key_periodic:key_periodic $
-          , key_stride:key_stride, key_gridtype:key_gridtype $
-          , key_yreverse:key_yreverse, key_zreverse:key_zreverse $
-          , key_partialstep:key_partialstep, key_onearth:key_onearth}
-
   ccreadparameters = {funclec_name:'read_ncdf' $
           , jpidta:jpidta, jpjdta:jpjdta, jpkdta:jpkdta $

trunk/SRC/ToBeReviewed/WIDGET/AUTOUR_de_XXX/xcreateanim.pro

@@ -2 +2 @@
 @common
 ; on recupere les aguments contenus ds le widget
-   if tag_names(event, /structure_name) NE 'WIDGET_BUTTON' then return
-   widget_control, event.id, get_uvalue = uval
-   if n_elements(uval) EQ 0 then return
-   if uval EQ 'cancel' then begin
-      widget_control, event.top, /destroy
-      return
-   ENDIF
+  if tag_names(event, /structure_name) NE 'WIDGET_BUTTON' then return
+  widget_control, event.id, get_uvalue = uval
+  if n_elements(uval) EQ 0 then return
+  if uval EQ 'cancel' then begin
+    widget_control, event.top, /destroy
+    return
+  ENDIF
 ; on va ecrire l''animation!
 ;
-   widget_control, event.top, get_uvalue = local_uvalue
-   widget_control, local_uvalue.parent, get_uvalue = top_uvalue
-;
-   calendar = (*(extractatt(top_uvalue, 'fileparameters'))[local_uvalue.indexfile]).time_counter
-   key_caltype = (*(extractatt(top_uvalue, 'fileparameters'))[local_uvalue.indexfile]).caltype
-;
-   widget_control, widget_info(event.top, find_by_uname = 'Filename') $
-    , get_value = nomfic & nomfic = nomfic[0]
-;
-   widget_control, widget_info(event.top, find_by_uname = 'directorie') $
-    , get_value = animdir & animdir = animdir[0]
-;
-   widget_control, widget_info(event.top, find_by_uname = 'debut') $
-    , get_value = vdate1
-   index1 = where(calendar eq date2jul(vdate1)) & index1 = index1[0] 
-   if index1 EQ -1 then return
-;
-   widget_control, widget_info(event.handler, find_by_uname = 'fin') $
-    , get_value = vdate2
-   index2 = where(calendar eq date2jul(vdate2)) & index2 = index2[0] 
-   if index2 EQ -1 OR index2 LE index1 then return
+  widget_control, event.top, get_uvalue = local_uvalue
+  widget_control, local_uvalue.parent, get_uvalue = top_uvalue
+;
+  calendar = (*(extractatt(top_uvalue, 'fileparameters'))[local_uvalue.indexfile]).time_counter
+  key_caltype = (*(extractatt(top_uvalue, 'fileparameters'))[local_uvalue.indexfile]).caltype
+  fakecal = (*(extractatt(top_uvalue, 'fileparameters'))[local_uvalue.indexfile]).fakecal
+;
+  widget_control, widget_info(event.top, find_by_uname = 'Filename') $
+                  , get_value = nomfic & nomfic = nomfic[0]
+;
+  widget_control, widget_info(event.top, find_by_uname = 'directorie') $
+                  , get_value = animdir & animdir = animdir[0]
+;
+  widget_control, widget_info(event.top, find_by_uname = 'debut') $
+                  , get_value = vdate1
+  index1 = where(calendar eq date2jul(vdate1)) & index1 = index1[0] 
+  if index1 EQ -1 then return
+;
+  widget_control, widget_info(event.handler, find_by_uname = 'fin') $
+                  , get_value = vdate2
+  index2 = where(calendar eq date2jul(vdate2)) & index2 = index2[0] 
+  if index2 EQ -1 OR index2 LE index1 then return
 ; on detruit le widget avant de creer le fichier .ps
-   widget_control, event.top, /destroy 
-; test pour savoir quel type des calendrier on a
-   caldat, calendar, m, d
-   if total(d EQ 15) EQ n_elements(d) then mensuel = 1 ELSE mensuel = 0
-   if total(d EQ 1) EQ n_elements(d) AND total(m EQ 6) EQ n_elements(m) $
-    then annuel = 1 ELSE annuel = 0
+  widget_control, event.top, /destroy
 ;
 ; creation de la routine qui nous serviera pour faire le dessin
 ;
 ; on recupere la liste des instructions
-   globalcommand = extractatt(top_uvalue, 'globalcommand')
+  globalcommand = extractatt(top_uvalue, 'globalcommand')
 ; on complete par le premiere et les dernieres lignes du programme
-   createpro, globalcommand, filename = myuniquetmpdir + 'xxx2ps.pro' $
-              , KWDLIST = ', NOERASE = noerase, POSTSCRIPT = postscript, DATE1IN = date1in, DATE2IN = date2in'
+  createpro, globalcommand, filename = myuniquetmpdir + 'xxx2ps.pro' $
+             , KWDLIST = ', NOERASE = noerase, POSTSCRIPT = postscript, DATE1IN = date1in, DATE2IN = date2in'
 ;
 ;--------creation du fichier----------
 ;
 ;  recupere le nombre d'octets surlequel on code la palette
-   device, get_visual_depth = depth
+  device, get_visual_depth = depth
 ; taille de l''image (en nombre de pixel:
-   xsize = !d.x_size
-   ysize = !d.y_size
+  xsize = !d.x_size
+  ysize = !d.y_size
 ;
 ; on verifie que le nom du fichier termine bien par .gif
-   if strpos(nomfic, '.gif') EQ -1 then nomfic = nomfic+'.gif'
-
-   current_window = !d.window
-   window, /free, /pixmap, xsize=xsize, ysize=ysize
+  if strpos(nomfic, '.gif') EQ -1 then nomfic = nomfic+'.gif'
+
+  current_window = !d.window
+  window, /free, /pixmap, xsize = xsize, ysize = ysize
 
 
 ; indication du numero de l''image que l''on est en train de creer
-   base = widget_base()
-   sliderid = widget_slider(base, minimum = 1, maximum = index2-index1+1, value = 1 $
-                            , title = 'image number: ')
-   widget_control,base,/realize
+  base = widget_base()
+  sliderid = widget_slider(base, minimum = 1, maximum = index2-index1+1, value = 1 $
+                           , title = 'image number: ')
+  widget_control, base, /realize
 ;
 ; commencement du fichier gif. ecriture d''une image vide 
-   date = jul2date(calendar[index1])
-   xxx2ps, /noerase, date1in = date, date2in = date
-;
-;
-   image = tvrd(true = depth GT 8)
+  IF keyword_set(fakecal) THEN date = index1 ELSE date = jul2date(calendar[index1])
+  xxx2ps, /noerase, date1in = date, date2in = date
+;
+;
+  image = tvrd(true = depth GT 8)
 ;- If an 8-bit image was read, reduce the number of colors
-   if depth le 8 then begin
-      tvlct, red, green, blue, /get
-      reduce_colors, image, index
-      red = red[index]
-      green = green[index]
-      blue = blue[index]
-   endif            
-;
-   if depth gt 8 then $
+  if depth le 8 then begin
+    tvlct, red, green, blue, /get
+    reduce_colors, image, index
+    red = red[index]
+    green = green[index]
+    blue = blue[index]
+  endif            
+;
+  if depth gt 8 then $
 ;- Convert 24-bit image to 8-bit
-   image = color_quan(image, 1, red, green, blue, colors=256, get_translation = translation, /map_all)
-;
-;
-   write_gif,animdir+nomfic, image, red, green, blue, /multiple
-   wdelete, !d.window
+  image = color_quan(image, 1, red, green, blue, colors = 256, get_translation = translation, /map_all)
+;
+;
+  write_gif, animdir+nomfic, image, red, green, blue, /multiple
+  wdelete, !d.window
 ;
 ; boucle de creation et d''ecriture ds le fichier.
 ;
-   for ind = index1+1, index2 do BEGIN
+  IF index2 GT index1 THEN BEGIN
+    FOR ind = index1+1, index2 do BEGIN
 ;
       widget_control, sliderid, set_value = ind-index1+1 ; on bouge le slider
 ;
-      window, /free, /pixmap, xsize=xsize, ysize=ysize
-      date = jul2date(calendar[ind])
+      window, /free, /pixmap, xsize = xsize, ysize = ysize
+      IF keyword_set(fakecal) THEN date = ind ELSE date = jul2date(calendar[ind])
       xxx2ps, /noerase, date1 = date, date2 = date
 ;      
@@ -105 +102 @@
 ;
       if depth gt 8 then $
-      image = color_quan(image, 1, aaa, bbb, ccc, colors=256, translation = translation) ;
-;
-      write_gif,animdir+nomfic,image,red, green, blue, /multiple
+        image = color_quan(image, 1, aaa, bbb, ccc, colors = 256, translation = translation) ;
+;
+      write_gif, animdir+nomfic, image, red, green, blue, /multiple
       wdelete, !d.window
-   ENDFOR
+    ENDFOR
+  ENDIF 
 ; on met une derniere image blanche
-      window, /free, /pixmap, xsize=xsize, ysize=ysize
-      reinitplt
-      plot,  [0],  [0], /nodata
-      image = tvrd(true = depth GT 8)
-;
-      if depth gt 8 then $
-      image = color_quan(image, 1, aaa, bbb, ccc, colors=256, translation = translation) ;
-;
-      write_gif,animdir+nomfic,image,red, green, blue, /multiple
-      wdelete, !d.window
+  window, /free, /pixmap, xsize = xsize, ysize = ysize
+  reinitplt
+  plot,  [0],  [0], /nodata
+  image = tvrd(true = depth GT 8)
+;
+  if depth gt 8 then $
+    image = color_quan(image, 1, aaa, bbb, ccc, colors = 256, translation = translation) ;
+;
+  write_gif, animdir+nomfic, image, red, green, blue, /multiple
+  wdelete, !d.window
 ; fermeture du fichier
-   write_gif,animdir+nomfic,/close 
-   widget_control, base, /destroy 
+  write_gif, animdir+nomfic, /close 
+  widget_control, base, /destroy 
 ; rebascule en mode "normal"
-   thisOS = strupcase(strmid(!version.os_family, 0, 3))
-;
-   wset, current_window
+  thisOS = strupcase(strmid(!version.os_family, 0, 3))
+;
+  wset, current_window
 
 ; si on est sous x on essaie de lancer xanim...
 
-   if thisOS NE 'MAC' AND thisOS NE 'WIN' then begin
-      spawn, 'which xanim',result
-      if strpos(result[0],'xanim') EQ strlen(result[0])-5 then spawn, 'xanim '+animdir+nomfic+' &'
-   endif
-;
-   
-   return
+  if thisOS NE 'MAC' AND thisOS NE 'WIN' then begin
+    spawn, 'which xanim', result
+    if strpos(result[0], 'xanim') EQ strlen(result[0])-5 then spawn, 'xanim '+animdir+nomfic+' &'
+  endif
+;
+  
+  return
 end
 ;----------------------------------------------------------------
@@ -162 +160 @@
    indexfile = (where(filelist EQ filenames[0]))[0]
    calendar = (*(extractatt(top_uvalue, 'fileparameters'))[indexfile]).time_counter  
+   key_caltype = (*(extractatt(top_uvalue, 'fileparameters'))[indexfile]).caltype
+   fakecal = (*(extractatt(top_uvalue, 'fileparameters'))[indexfile]).fakecal
    if n_elements(filenames) GT 1 then begin
       for i = 1, n_elements(filenames)-1 do begin
@@ -186 +186 @@
    rien = widget_text(base,value=animdir, uname='directorie', /editable)
    rien = widget_label(base, value = 'starting date')
-   rien = cw_calendar(base, calendar, uname = 'debut', uvalue = {name:'calendar'}, /frame)
+   rien = cw_calendar(base, calendar, calendar[0] $
+                      , FAKECAL = fakecal, uname = 'debut', uvalue = {name:'calendar'}, /frame)
    rien = widget_label(base, value = 'ending date')
    rien = cw_calendar(base, calendar, calendar[n_elements(calendar)-1] $
-                      , uname = 'fin', uvalue = {name:'calendar'}, /frame)
+                      , FAKECAL = fakecal, uname = 'fin', uvalue = {name:'calendar'}, /frame)
    rien = widget_button(base,value='OK', uvalue = 'ok')
    rien = widget_button(base,value='Cancel', uvalue = 'cancel')

trunk/SRC/ToBeReviewed/WIDGET/AUTOUR_de_XXX/xxxmenubar_event.pro

@@ -32 +32 @@
       widget_control, vlstid, set_combobox_select = 0 > index[0]
 ; on s''occupe du calendrier
+      key_caltype = newfile.fileparameters.caltype
       date1id = widget_info(event.top, find_by_uname = 'calendar1')
       widget_control, date1id, get_value = date1
       widget_control, date1id, /destroy
-      if (where(newfile.fileparameters.time_counter EQ date1))[0] EQ -1 $
-      then date1 = newfile.fileparameters.time_counter[0]
+      jdate1 = jul2date(date1)
+      if (where(newfile.fileparameters.time_counter EQ jdate1))[0] EQ -1 $
+      then jdate1 = newfile.fileparameters.time_counter[0]
       date2id = widget_info(event.top, find_by_uname = 'calendar2')
       widget_control, date2id, get_value = date2
       widget_control, date2id, /destroy
-      if (where(newfile.fileparameters.time_counter EQ date2))[0] EQ -1 then date2 = date1
+      jdate2 = jul2date(date2)
+      if (where(newfile.fileparameters.time_counter EQ jdate2))[0] EQ -1 then jdate2 = jdate1
       basecal = widget_info(event.top, find_by_uname = 'basecal')
-      rien = cw_calendar(basecal, newfile.fileparameters.time_counter, date1, uname = 'calendar1' $
-                         , uvalue = {name:'calendar1'}, /frame)
-      rien = cw_calendar(basecal, newfile.fileparameters.time_counter, date2, uname = 'calendar2' $
-                         , uvalue = {name:'calendar2'}, /frame)
+      fakecal = newfile.fileparameters.fakecal
+      rien = cw_calendar(basecal, newfile.fileparameters.time_counter, jdate1, uname = 'calendar1' $
+                         , FAKECAL = fakecal, uvalue = {name:'calendar1'}, /frame)
+      rien = cw_calendar(basecal, newfile.fileparameters.time_counter, jdate2, uname = 'calendar2' $
+                         , FAKECAL = fakecal, uvalue = {name:'calendar2'}, /frame)
 ; on update les elements fileparameters, readparameters et meshparameters de la top_uvalue
       newfileparameters = ptrarr(currentfile+1, /allocate_heap)