Changeset 279 for trunk/SRC/ToBeReviewed/WIDGET

Timestamp:

09/07/07 15:40:51 (17 years ago)

Author:

smasson

Message:

bugfix when using double precision calendar

Location:

trunk/SRC/ToBeReviewed/WIDGET

Files:

• AUTOUR_de_XXX/buildreadcmd.pro (modified) (1 diff)
• COMPOUND_WIDGET/cw_calendar.pro (modified) (12 diffs)

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

@@ -111 +111 @@
     date2 = date2jul(date2) - fakecal
   ENDIF
-  sdate1 = strtrim(date1, 1) & sdate2 = strtrim(date2, 1)
+  IF size(date1, /type) EQ 5 THEN sdate1 = string(date1, format='(f15.6)')+'d' $
+  ELSE sdate1 = string(date1, format='(i10)')+'L'
+  IF size(date2, /type) EQ 5 THEN sdate2 = string(date2, format='(f15.6)')+'d' $
+  ELSE sdate2 = string(date2, format='(i10)')+'L'
 ;---------------
 ; find boxzoom

trunk/SRC/ToBeReviewed/WIDGET/COMPOUND_WIDGET/cw_calendar.pro

@@ -68 +68 @@
 ;
 @cm_4cal
-
 ; get back the calendar and its related informations
   winfo_id = widget_info(id, find_by_uname = 'infocal')
   widget_control, winfo_id, get_uvalue = infowid
   key_caltype = infowid.caltype
-
 ; high freqeuncy calendar
   IF keyword_set(infowid.fakecal) THEN BEGIN
@@ -84 +82 @@
     ENDIF
   ENDIF ELSE BEGIN
-;
-    value = long(value[0])
-; make sure the value correspond
-    value = jul2date(date2jul(value))
-; define year month day
-    year = value/10000l
-    month = (value MOD 10000L)/100L
-    day = value MOD 100L
+    jdval = date2jul(value)
 ; check that the date exists in the calendar
-  if (where(abs(infowid.calendar - julday(month, day, year)) LT 1./86400.))[0] EQ - 1 then return
+    if (where(abs(infowid.calendar - jdval) LT 1.d/86400.d))[0] EQ - 1 then return
 ; update the value of infocal
     infowid.date = value
@@ -181 +172 @@
   if wid_id NE 0 then BEGIN
     widget_control, wid_id, get_value = wid_value
-    date = long(wid_value.combobox_gettext)
+    widget_control, wid_id, get_uvalue = wid_uvalue
+    date = double(wid_value.combobox_gettext) + wid_uvalue.hms[wid_value.combobox_index]
   ENDIF ELSE date = oldate MOD 100L
 ;-------------month---------------
@@ -224 +216 @@
 ; @uses
 ;
-; @restrictions
+; @restrictions<
 ;
 ; @examples
@@ -242 +234 @@
   winfo_id = widget_info(event.handler, find_by_uname = 'infocal')
   widget_control, winfo_id, get_uvalue = infowid
-  caldat, infowid.calendar, monthcal, daycal, yearcal
+  caldat, infowid.calendar, monthcal, daycal, yearcal, hourcal, mincal, seccal
 ; ... and the current date
   IF n_elements(date0) EQ 0 then date0 = get_cal_value(event.handler)
-  year0 = date0/10000L
-  month0 = (date0 MOD 10000L)/100L
-  day0 = date0 MOD 100L
+  jdate0 = date2jul(date0, month = month0, day = day0, year = year0)
 ; index of days/months/years according to date0
   case casename of
@@ -254 +244 @@
       index = where(monthcal EQ month0 AND yearcal EQ year0)
       current = daycal[index]
+      hms = hourcal[index] / 24.0d0 + mincal[index]/1440.0d0 + seccal[index] / 86400.0d0
     END
     'month':BEGIN
@@ -271 +262 @@
   ENDCASE
 ; we update the uvalue of the widget
-  widget_control, wid_id, set_uvalue = {name:casename}
+  IF casename EQ 'day' THEN widget_control, wid_id, set_uvalue = {name:casename, hms:hms}
 ; for event.out = 0, we store the previous position of the combobox to use
 ; it as the default position.
@@ -334 +325 @@
 ; $Id$
 ;-
-PRO move, event, casename
+PRO cw_cal_move, event, casename
 ;
   compile_opt strictarr, strictarrsubs
@@ -354 +345 @@
          widget_control, id, set_value = {combobox_select:selected}
 ; we call move for the next combobox
-      ENDIF ELSE move, event, possiblecase[whichcase+1]
+      ENDIF ELSE cw_cal_move, event, possiblecase[whichcase+1]
 ; it is possible to move from +/- 1
    ENDIF ELSE widget_control, id, set_value = {combobox_select:wvalue.combobox_index+event.out}
@@ -410 +401 @@
         selected = (widvalue.combobox_number-1)*(event.out EQ -1)
         widget_control, event.id, set_value = {combobox_select:selected}
-      ENDIF ELSE move, event, possiblecase[whichcase+1]
+      ENDIF ELSE cw_cal_move, event, possiblecase[whichcase+1]
     ENDIF
 ; if we changed month(year), we need to update the day (and month) list
@@ -484 +475 @@
   if keyword_set(caltype) then key_caltype = caltype
 ; months days years found in the calendar
-  caldat, calendar, monthcal, daycal, yearcal, hourcal, mincal, scdcal
+  caldat, calendar, monthcal, daycal, yearcal, hourcal, mincal, seccal
+  hmscal = hourcal / 24.0d0 + mincal/1440.0d0 + seccal / 86400.0d0
 ; starting date
   if n_elements(jdate0) EQ 0 then jdate0 = calendar[0]
@@ -523 +515 @@
       currentday = daycal[dayindex]
       currentday = strtrim(currentday, 1)
-      cmbbid = cw_combobox_pm(base, UVALUE = {name:'day'}, UNAME = 'day', value = currentday)
+      hms = hmscal[dayindex]
+      cmbbid = cw_combobox_pm(base, UVALUE = {name:'day', hms:hms}, UNAME = 'day', value = currentday)
       widget_control, cmbbid, set_value = {combobox_select:(where(long(currentday) EQ day0))[0]}
     endif