Ignore:
Timestamp:
05/09/06 13:04:45 (18 years ago)
Author:
pinsard
Message:

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

File:
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/ToBeReviewed/WIDGET/COMPOUND_WIDGET/cw_slide_slice.pro

    r49 r51  
    33   topid = findtopid(id) 
    44   domainid = widget_info(topid, find_by_uname = 'domain') 
    5    widget_control, domainid, get_value = boite 
    6    if boite[1]-boite[0] LT boite[3]-boite[2] then type = 'y' ELSE type = 'x' 
     5   widget_control, domainid, get_value = boxzoom 
     6   if boxzoom[1]-boxzoom[0] LT boxzoom[3]-boxzoom[2] then type = 'y' ELSE type = 'x' 
    77   thickid  = widget_info(topid, find_by_uname = 'thickness') 
    88   widget_control, thickid, get_uvalue = thicknessuval 
    … …  
    1111   sliderid = widget_info(topid, find_by_uname = 'slider') 
    1212   if type EQ 'y' then BEGIN 
    13       mini = floor(min([glamt, glamu], max = maxi)) 
     13      mini = floor(min([glamt, glamf], max = maxi)) 
    1414      maxi = ceil(maxi)-thickness 
    15       widget_control, sliderid, set_value = {slider_min:mini, slider_max:maxi, value:boite[0]<maxi} 
    16       thickness = boite[1]-boite[0] 
     15      widget_control, sliderid, set_value = {slider_min:mini, slider_max:maxi, value:boxzoom[0]<maxi} 
     16      thickness = boxzoom[1]-boxzoom[0] 
    1717   ENDIF ELSE BEGIN  
    18       mini = floor(min([gphit, gphiv], max = maxi)) 
     18      mini = floor(min([gphit, gphif], max = maxi)) 
    1919      maxi = ceil(maxi)-thickness 
    20       widget_control, sliderid, set_value = {slider_min:mini, slider_max:maxi, value:boite[2]<maxi} 
    21       thickness = boite[3]-boite[2] 
     20      widget_control, sliderid, set_value = {slider_min:mini, slider_max:maxi, value:boxzoom[2]<maxi} 
     21      thickness = boxzoom[3]-boxzoom[2] 
    2222   ENDELSE 
    2323   thicknessval = thicknessuval.choix 
    … …  
    4040   sliderid = widget_info(event.handler, find_by_uname = 'slider') 
    4141;   uniteid  = widget_info(event.handler, find_by_uname = 'unite') 
    42    widget_control, domainid, get_value = boite 
    43    if boite[1]-boite[0] LT boite[3]-boite[2] then type = 'y' ELSE type = 'x' 
     42   widget_control, domainid, get_value = boxzoom 
     43   if boxzoom[1]-boxzoom[0] LT boxzoom[3]-boxzoom[2] then type = 'y' ELSE type = 'x' 
    4444   widget_control, thickid, get_uvalue = thicknessuval 
    4545   widget_control, thickid, get_value = thickness 
    … …  
    4848 
    4949   if uval.name EQ 'thickness' then begin 
    50       if boite[1]-boite[0] LT boite[3]-boite[2] then type = 'y' ELSE type = 'x' 
     50      if boxzoom[1]-boxzoom[0] LT boxzoom[3]-boxzoom[2] then type = 'y' ELSE type = 'x' 
    5151      if type EQ 'y' then BEGIN 
    52          mini = floor(min([glamt, glamu], max = maxi)) 
     52         mini = floor(min([glamt, glamf], max = maxi)) 
    5353         maxi = ceil(maxi)-thickness 
    5454      ENDIF ELSE BEGIN  
    55          mini = floor(min([gphit, gphiv], max = maxi)) 
     55         mini = floor(min([gphit, gphif], max = maxi)) 
    5656         maxi = ceil(maxi)-thickness 
    5757      ENDELSE 
    … …  
    6464; 
    6565;    if uval.name EQ 'unite' then begin 
    66 ;       domdef, boite, grille = 'T' 
     66;       domdef, boxzoom, gridtype = 'T' 
    6767;       if unite EQ 'degre' then BEGIN 
    6868;          if strpos(type,'y') NE -1 then begin 
    69 ;             mini = floor(min([glamt, glamu], max = maxi)) 
     69;             mini = floor(min([glamt, glamf], max = maxi)) 
    7070;             maxi = ceil(maxi) 
    7171; print, lon1, mini, maxi 
    7272;             widget_control, sliderid, set_value = {value:lon1, slider_min_max:[mini, maxi]} 
    7373;          ENDIF ELSE BEGIN  
    74 ;             mini = floor(min([gphit, glamv], max = maxi)) 
     74;             mini = floor(min([gphit, glamf], max = maxi)) 
    7575;             maxi = ceil(maxi) 
    7676;             widget_control, sliderid, set_value = {value:lat1, slider_min_max:[mini, maxi]} 
    … …  
    7878;       ENDIF ELSE BEGIN 
    7979;          if strpos(type,'y') NE -1 then BEGIN 
    80 ; print, 'ds if',premierxt, 0, jpi-1 
    81 ;             widget_control, sliderid, set_value = {value:premierxt, slider_min_max:[0, jpi-1]} 
     80; print, 'ds if',firstxt, 0, jpi-1 
     81;             widget_control, sliderid, set_value = {value:firstxt, slider_min_max:[0, jpi-1]} 
    8282;          ENDIF ELSE BEGIN  
    83 ;             widget_control, sliderid, set_value = {value:premieryt, slider_min_max:[0, jpj-1]} 
     83;             widget_control, sliderid, set_value = {value:firstyt, slider_min_max:[0, jpj-1]} 
    8484;          ENDELSE 
    8585;       ENDELSE 
    … …  
    8888;   if unite EQ 'degre' then BEGIN 
    8989   if type EQ 'y' then begin 
    90       boite[0] = slider &  boite[1] = slider+thickness 
     90      boxzoom[0] = slider &  boxzoom[1] = slider+thickness 
    9191   ENDIF ELSE BEGIN  
    92       boite[2] = slider &  boite[3] = slider+thickness 
     92      boxzoom[2] = slider &  boxzoom[3] = slider+thickness 
    9393   ENDELSE  
    9494;    ENDIF ELSE BEGIN 
    9595;       if strpos(type,'y') NE -1 then begin 
    96 ;          boite[0] = glamt[slider, 0] &  boite[1] = glamu[slider+thickness, 0] 
     96;          boxzoom[0] = glamt[slider, 0] &  boxzoom[1] = glamf[slider+thickness, 0] 
    9797;       ENDIF ELSE BEGIN  
    98 ;          boite[2] = gphit[0, slider] &  boite[3] = gphiv[0, slider+thickness] 
     98;          boxzoom[2] = gphit[0, slider] &  boxzoom[3] = gphif[0, slider+thickness] 
    9999;       ENDELSE  
    100100;    ENDELSE 
    101    widget_control, domainid, set_value = boite 
     101   widget_control, domainid, set_value = boxzoom 
    102102   return, {CW_SLIDE_SLICE, ID:event.handler, TOP:event.top, HANDLER:0L} 
    103103end 
    104104;-------------------------------------------------------------------------------- 
    105 FUNCTION cw_slide_slice, parent, boite = boite, UVALUE = uvalue, UNAME = uname, FRAME = frame, ROW = row, COLUMN = column, _extra = ex 
     105FUNCTION cw_slide_slice, parent, boxzoom = boxzoom, UVALUE = uvalue, UNAME = uname, FRAME = frame, ROW = row, COLUMN = column, _extra = ex 
    106106@common 
    107107;------------------------------------------------ 
    … …  
    119119                      , FRAME = frame, _extra = ex)    
    120120;------------------------------------------------ 
    121    if NOT keyword_set(boite) then boite = [lon1, lon2, lat1, lat2] 
     121   if NOT keyword_set(boxzoom) then boxzoom = [lon1, lon2, lat1, lat2] 
    122122;    rien = cw_bgroup(base, ['degre', 'points'],/exclusive, /column, uname = 'unite', uvalue = {name:'unite'}, /return_name, set_value = 0, /no_release) 
    123123   thicknessval = indgen(21)+1 
    … …  
    126126   droplistid = cw_droplist_pm(base, value = thicknessval, uname = 'thickness', uvalue = {name:'thickness', choix:thicknessval}) 
    127127; 
    128    if boite[1]-boite[0] LT boite[3]-boite[2] then type = 'y' ELSE type = 'x' 
     128   if boxzoom[1]-boxzoom[0] LT boxzoom[3]-boxzoom[2] then type = 'y' ELSE type = 'x' 
    129129   if type EQ 'y' then BEGIN 
    130       mini = floor(min([glamt, glamu], max = maxi)) 
    131       thickness = boite[1]-boite[0] 
     130      mini = floor(min([glamt, glamf], max = maxi)) 
     131      thickness = boxzoom[1]-boxzoom[0] 
    132132      maxi = ceil(maxi)-thickness 
    133133      rien = cw_slider_pm(base, minimum = mini, maximum = (mini+1) > maxi $ 
    134                           , value = mini > boite[0] < maxi, /column, uname = 'slider' $ 
     134                          , value = mini > boxzoom[0] < maxi, /column, uname = 'slider' $ 
    135135                          , uvalue = {name:'slider'}) 
    136136   ENDIF ELSE BEGIN  
    137       mini = floor(min([gphit, gphiv], max = maxi)) 
    138       thickness = boite[3]-boite[2] 
     137      mini = floor(min([gphit, gphif], max = maxi)) 
     138      thickness = boxzoom[3]-boxzoom[2] 
    139139      maxi = ceil(maxi)-thickness 
    140140      rien = cw_slider_pm(base, minimum = mini, maximum =  (mini+1) > maxi $ 
    141                           , value = mini > boite[2] < maxi, /column, uname = 'slider' $ 
     141                          , value = mini > boxzoom[2] < maxi, /column, uname = 'slider' $ 
    142142                          , uvalue = {name:'slider'}) 
    143143   ENDELSE 
    … …  
    152152    
    153153;   if type EQ 'xt' then begin 
    154 ;       mini = floor(min([glamt,glamu,glamv], max = maxi)) 
     154;       mini = floor(min([glamt,glamf], max = maxi)) 
    155155;       maxi = ceil(maxi) 
    156156;    ENDIF ELSE BEGIN  
    157 ;       mini = floor(min([gphit,gphiu,gphiv], max = maxi)) 
     157;       mini = floor(min([gphit,gphif], max = maxi)) 
    158158;       maxi = ceil(maxi) 
    159159;    ENDELSE 
Note: See TracChangeset for help on using the changeset viewer.