Index: papco_color.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_color.pro,v
retrieving revision 1.3
diff -B -b -r1.3 papco_color.pro
315,316c315,316
<   bckg=widgetdata.default_bckg_color
<   forg=widgetdata.default_forg_color
---
>   bckg=widgetData.default.bckg_color
>   forg=widgetData.default.forg_color
392,393c392,393
<   bckg=widgetData.default_bckg_color
<   forg=widgetData.default_forg_color
---
>   bckg=widgetData.default.bckg_color
>   forg=widgetData.default.forg_color
803a804,805
>   endif else if ( !d.name eq 'PRINTER' ) then begin
>       decomposed=0
Index: papco_cursor.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_cursor.pro,v
retrieving revision 1.2
diff -B -b -r1.2 papco_cursor.pro
384c384
<    orbNr=widgetData.default_orbitInfo.number
---
>    orbNr=widgetData.default.orbitInfo.number
406c406,407
<       WIDGET_CONTROL, widgetData.ef_orbit, SET_VALUE=orbNr
---
>       WIDGET_CONTROL, widgetData.gui.ef_orbit, SET_VALUE=orbNr
>       widgetData.orbitNumber= orbNr
580c581
< 		                GROUP=widgetData.main_base)
---
> 		                GROUP=widgetData.gui.main_base)
767c768
< WIDGET_CONTROL, widgetData.dw_draw,  GET_VALUE=drawIndex
---
> WIDGET_CONTROL, widgetData.gui.dw_draw,  GET_VALUE=drawIndex
941,942c942,943
<           n_elements(widgetData.mouseAction)-1 : BEGIN ; multiple slices
<             index=where(widgetData.default_multiple_slice ne 0,c)
---
>           n_elements(widgetData.gui.mouseAction)-1 : BEGIN ; multiple slices
>             index=where(widgetData.default.multiple_slice ne 0,c)
955c956
<               uMa=widgetdata.mouseAction(widgetData.mouse_doesSlice).NAME
---
>               uMa=widgetData.gui.mouseAction(widgetData.mouse_doesSlice).NAME
972c973
<                 if widgetData.default_trap eq 1 then $
---
>                 if widgetData.default.trap eq 1 then $
1047c1048
<     WIDGET_CONTROL, widgetData.dw_draw, GET_VALUE=drawIndex
---
>     WIDGET_CONTROL, widgetData.gui.dw_draw, GET_VALUE=drawIndex
1072c1073
<     user_end_idx   = n_elements(widgetdata.mouseAction)-1
---
>     user_end_idx   = n_elements(widgetData.gui.mouseAction)-1
1404a1406,1407
>   if ( widgetData.headless ) then return, 0
> 
1406c1409
<   slice_name_list=widgetData.mouseAction.NAME
---
>   slice_name_list=widgetData.gui.mouseAction.NAME
Index: papco_defaults.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_defaults.pro,v
retrieving revision 1.4
diff -B -b -r1.4 papco_defaults.pro
54c54
<         widgetData.default_output_format=formatNames(event.value)
---
>         widgetData.default.output_format=formatNames(event.value)
56,75c56,75
<     'mpb_redraw'      : widgetData.default_redraw = abs(event.value-1)
<     'mpb_verbose'     : widgetData.default_verbose=abs(event.value-1)
<     'mpb_scroll'      : widgetData.default_scroll=event.value
<     'mpb_save_bitmap' : widgetData.default_save_bitmap=event.value
<     'mpb_wid_enable'  : widgetData.default_input_enable=event.value
<     'mpb_state'       : widgetData.default_states=event.value
<     'mpb_layout'      : widgetData.default_layout=event.value
<     'mpb_indent_str'  : widgetData.default_draw_ident=event.value
<     'mpb_error_box'   : widgetData.default_error_box=event.value
<     'mpb_us_europe'   : widgetData.default_us_europe=event.value
<     'mpb_numbering'   : widgetData.default_numbering=event.value
<     'mpb_slice_reload': widgetData.default_slice_reload=event.value
<     'mpb_right_label' : widgetData.default_right_label=event.value
<     'mpb_png_format'  : widgetData.default_png_format=event.value
<     'mpb_trap_errors' : widgetData.default_trap=abs(event.value-1)
<     'mpb_wget'        : widgetData.default_wget=abs(event.value-1)
<     'mpb_ask_wget'    : widgetData.default_ask_wget=event.value
<     'mpb_do_plots'    : widgetData.default_do_plots=event.value
<     'spb_ps'          : widgetData.default_ps_eps=0
<     'spb_eps'         : widgetData.default_ps_eps=1
---
>     'mpb_redraw'      : widgetData.default.redraw = abs(event.value-1)
>     'mpb_verbose'     : widgetData.default.verbose=abs(event.value-1)
>     'mpb_scroll'      : widgetData.default.scroll=event.value
>     'mpb_save_bitmap' : widgetData.default.save_bitmap=event.value
>     'mpb_wid_enable'  : widgetData.default.input_enable=event.value
>     'mpb_state'       : widgetData.default.states=event.value
>     'mpb_layout'      : widgetData.default.layout=event.value
>     'mpb_indent_str'  : widgetData.default.draw_ident=event.value
>     'mpb_error_box'   : widgetData.default.error_box=event.value
>     'mpb_us_europe'   : widgetData.default.us_europe=event.value
>     'mpb_numbering'   : widgetData.default.numbering=event.value
>     'mpb_slice_reload': widgetData.default.slice_reload=event.value
>     'mpb_right_label' : widgetData.default.right_label=event.value
>     'mpb_png_format'  : widgetData.default.png_format=event.value
>     'mpb_trap_errors' : widgetData.default.trap=abs(event.value-1)
>     'mpb_wget'        : widgetData.default.wget=abs(event.value-1)
>     'mpb_ask_wget'    : widgetData.default.ask_wget=event.value
>     'mpb_do_plots'    : widgetData.default.do_plots=event.value
>     'spb_ps'          : widgetData.default.ps_eps=0
>     'spb_eps'         : widgetData.default.ps_eps=1
79,80c79,80
<         widgetData.default_charsize=x
<         !P.CHARSIZE=widgetData.default_charsize
---
>         widgetData.default.charsize=x
>         !P.CHARSIZE=widgetData.default.charsize
82c82
<         widgetData.default_charthick=x
---
>         widgetData.default.charthick=x
84c84
<         widgetData.default_ps_mult=x
---
>         widgetData.default.ps_mult=x
87c87
<         widgetData.default_plot_size(0)=x
---
>         widgetData.default.plot_size(0)=x
89c89
<         widgetData.default_plot_size(1)=x
---
>         widgetData.default.plot_size(1)=x
92c92
<         widgetData.default_draw_size(0)=x
---
>         widgetData.default.draw_size(0)=x
94c94
<         widgetData.default_draw_size(1)=x
---
>         widgetData.default.draw_size(1)=x
96c96
<         widgetData.default_gif_size(0)=x
---
>         widgetData.default.gif_size(0)=x
98c98
<         widgetData.default_gif_size(1)=x
---
>         widgetData.default.gif_size(1)=x
100c100
<         widgetData.default_vert_slice_size(0)=x
---
>         widgetData.default.vert_slice_size(0)=x
102c102
<         widgetData.default_vert_slice_size(1)=x
---
>         widgetData.default.vert_slice_size(1)=x
106c106
<         widgetData.default_adjust_time=x
---
>         widgetData.default.adjust_time=x
108c108
<         widgetData.default_XTICKS=x
---
>         widgetData.default.XTICKS=x
110c110
<         widgetData.default_XLINES=x
---
>         widgetData.default.XLINES=x
112c112
<         widgetData.default_bckg_color=x
---
>         widgetData.default.bckg_color=x
114c114
<         widgetData.default_forg_color=x
---
>         widgetData.default.forg_color=x
126c126
< ;     widgetData.default_charfont=font_index(event.index)
---
> ;     widgetData.default.charfont=font_index(event.index)
160c160
< IF NOT widgetData.default_scroll THEN BEGIN
---
> IF NOT widgetData.default.scroll THEN BEGIN
174c174
<                          GROUP_LEADER=widgetdata.base, UVALUE='papco_defaults')
---
>                          GROUP_LEADER=widgetdata.gui.base, UVALUE='papco_defaults')
197c197
<             value=widgetData.default_charthick, $
---
>             value=widgetData.default.charthick, $
201c201
<             value=widgetData.default_charsize, $
---
>             value=widgetData.default.charsize, $
208c208
<              value=widgetData.default_ps_mult, $
---
>              value=widgetData.default.ps_mult, $
223c223
<    IF widgetData.default_ps_eps EQ 0 THEN BEGIN
---
>    IF widgetData.default.ps_eps EQ 0 THEN BEGIN
236c236
<                       value=widgetData.default_plot_size(0), $
---
>                       value=widgetData.default.plot_size(0), $
240c240
<                       value=widgetData.default_plot_size(1), $
---
>                       value=widgetData.default.plot_size(1), $
249c249
<                       value=widgetData.default_draw_size(0), $
---
>                       value=widgetData.default.draw_size(0), $
253c253
<                       value=widgetData.default_draw_size(1), $
---
>                       value=widgetData.default.draw_size(1), $
260c260
<                       value=widgetData.default_gif_size(0), $
---
>                       value=widgetData.default.gif_size(0), $
264c264
<                       value=widgetData.default_gif_size(1), $
---
>                       value=widgetData.default.gif_size(1), $
271c271
<                     value=widgetData.default_bckg_color, $
---
>                     value=widgetData.default.bckg_color, $
277c277
<                     value=widgetData.default_forg_color, $
---
>                     value=widgetData.default.forg_color, $
287c287
<                       value=widgetData.default_vert_slice_size(0), $
---
>                       value=widgetData.default.vert_slice_size(0), $
291c291
<                       value=widgetData.default_vert_slice_size(1), $
---
>                       value=widgetData.default.vert_slice_size(1), $
301c301
< pos = where(formatNames EQ widgetData.default_output_format, c)
---
> pos = where(formatNames EQ widgetData.default.output_format, c)
311c311
< WIDGET_CONTROL, mpb_png_format, SET_VALUE=widgetData.default_png_format
---
> WIDGET_CONTROL, mpb_png_format, SET_VALUE=widgetData.default.png_format
315c315
<                      value=widgetData.default_adjust_time, $
---
>                      value=widgetData.default.adjust_time, $
321c321
<                      value=widgetData.default_XTICKS, $
---
>                      value=widgetData.default.XTICKS, $
327c327
<                      value=widgetData.default_XLINES, $
---
>                      value=widgetData.default.XLINES, $
338c338
< WIDGET_CONTROL, mpb_layout, SET_VALUE=widgetData.default_layout
---
> WIDGET_CONTROL, mpb_layout, SET_VALUE=widgetData.default.layout
343c343
< WIDGET_CONTROL, mpb_scroll, SET_VALUE=widgetData.default_scroll
---
> WIDGET_CONTROL, mpb_scroll, SET_VALUE=widgetData.default.scroll
349c349
< WIDGET_CONTROL, mpb_ident_str, SET_VALUE=widgetData.default_draw_ident
---
> WIDGET_CONTROL, mpb_ident_str, SET_VALUE=widgetData.default.draw_ident
355c355
< WIDGET_CONTROL, mpb_wid_enable, SET_VALUE=widgetData.default_input_enable
---
> WIDGET_CONTROL, mpb_wid_enable, SET_VALUE=widgetData.default.input_enable
361c361
< WIDGET_CONTROL, mpb_save_bitmap, SET_VALUE=widgetData.default_save_bitmap
---
> WIDGET_CONTROL, mpb_save_bitmap, SET_VALUE=widgetData.default.save_bitmap
368c368
< WIDGET_CONTROL, mpb_us_europe, SET_VALUE=widgetData.default_us_europe
---
> WIDGET_CONTROL, mpb_us_europe, SET_VALUE=widgetData.default.us_europe
374c374
< IF widgetData.default_trap EQ 0 THEN set = 1 ELSE set = 0
---
> IF widgetData.default.trap EQ 0 THEN set = 1 ELSE set = 0
381c381
< IF widgetData.default_wget EQ 0 THEN set = 1 ELSE set = 0
---
> IF widgetData.default.wget EQ 0 THEN set = 1 ELSE set = 0
387c387
< WIDGET_CONTROL, mpb_ask_wget, SET_VALUE=widgetData.default_ask_wget
---
> WIDGET_CONTROL, mpb_ask_wget, SET_VALUE=widgetData.default.ask_wget
393c393
< WIDGET_CONTROL, mpb_numbering, SET_VALUE=widgetData.default_numbering
---
> WIDGET_CONTROL, mpb_numbering, SET_VALUE=widgetData.default.numbering
399c399
< WIDGET_CONTROL, mpb_slice_reload, SET_VALUE=widgetData.default_slice_reload
---
> WIDGET_CONTROL, mpb_slice_reload, SET_VALUE=widgetData.default.slice_reload
405c405
< WIDGET_CONTROL, mpb_state, SET_VALUE=widgetData.default_states
---
> WIDGET_CONTROL, mpb_state, SET_VALUE=widgetData.default.states
412c412
< WIDGET_CONTROL, mpb_right_label, SET_VALUE=widgetData.default_right_label
---
> WIDGET_CONTROL, mpb_right_label, SET_VALUE=widgetData.default.right_label
419c419
< WIDGET_CONTROL, mpb_error_box, SET_VALUE=widgetData.default_error_box
---
> WIDGET_CONTROL, mpb_error_box, SET_VALUE=widgetData.default.error_box
426c426
< WIDGET_CONTROL, mpb_do_plots, SET_VALUE=widgetData.default_do_plots
---
> WIDGET_CONTROL, mpb_do_plots, SET_VALUE=widgetData.default.do_plots
432c432
< IF widgetData.default_verbose EQ 0 THEN set = 1 ELSE set = 0
---
> IF widgetData.default.verbose EQ 0 THEN set = 1 ELSE set = 0
439c439
< IF widgetData.default_redraw EQ 0 THEN set = 1 ELSE set = 0
---
> IF widgetData.default.redraw EQ 0 THEN set = 1 ELSE set = 0
Index: papco_draw.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_draw.pro,v
retrieving revision 1.7
diff -B -b -r1.7 papco_draw.pro
88c88
<     WIDGET_CONTROL, widgetData.dw_draw,  GET_VALUE=drawIndex
---
>     WIDGET_CONTROL, widgetData.gui.dw_draw,  GET_VALUE=drawIndex
145,147c145
<   WIDGET_CONTROL, widgetData.ef_orbit, GET_VALUE=orbitNr ; this returns a
< 							 ; string-array
<   orbitNr=fix(orbitNr(0))
---
>   orbitNr= widgetData.orbitNumber
171c169
<   WIDGET_CONTROL, widgetData.dw_draw,  GET_VALUE=drawIndex
---
>   WIDGET_CONTROL, widgetData.gui.dw_draw,  GET_VALUE=drawIndex
224c222
<     device, SET_RESOLUTION=widgetData.default_draw_size
---
>     device, SET_RESOLUTION=widgetData.default.draw_size
243,244c241
< WIDGET_CONTROL, widgetData.ef_orbit, GET_VALUE=orbitNr
< orbitNr=fix(orbitNr(0))
---
> orbitNr= widgetData.orbitNumber
246c243
< !P.CHARSIZE=widgetData.default_charsize &  !P.FONT=-1
---
> !P.CHARSIZE=widgetData.default.charsize &  !P.FONT=-1
257c254
<       if widgetData.default_ps_eps then ext='.eps' else ext='.ps'
---
>       if widgetData.default.ps_eps then ext='.eps' else ext='.ps'
265c262
<       if widgetData.default_ps_eps then ext='.eps' else ext='.ps'
---
>       if widgetData.default.ps_eps then ext='.eps' else ext='.ps'
271a269
> help, useprinter
273c271
<     !P.CHARSIZE=widgetData.default_charsize
---
>     !P.CHARSIZE=widgetData.default.charsize
317c315
<                             DIALOG_PARENT=widgetData.main_base, $
---
>                             DIALOG_PARENT=widgetData.gui.main_base, $
324a323
>         help, /str, printerInfo
331c330
<       !P.CHARSIZE=widgetData.default_charsize &  !P.FONT=-1
---
>       !P.CHARSIZE=widgetData.default.charsize &  !P.FONT=-1
335c334
<       if widgetData.default_ps_eps then ext='.eps' else ext='.ps'
---
>       if widgetData.default.ps_eps then ext='.eps' else ext='.ps'
350c349
<       !P.CHARSIZE=widgetData.default_charsize &  !P.FONT=-1
---
>       !P.CHARSIZE=widgetData.default.charsize &  !P.FONT=-1
364,367c363,366
<       if widgetData.annotateFileName ne '' then begin
<         index=where(papco_drawn_window ne 0, c)
<         if c ne 0 then image(index)=papco_drawn_window(index)
<       endif
---
>      ;; if widgetData.annotateFileName ne '' then begin
>      ;;   index=where(papco_drawn_window ne 0, c)
>      ;;   if c ne 0 then image(index)=papco_drawn_window(index)
>      ;; endif
382c381
<   !P.CHARSIZE=widgetData.default_charsize &  !P.FONT=-1
---
>   !P.CHARSIZE=widgetData.default.charsize &  !P.FONT=-1
461c460
< if widgetData.default_error_box then begin
---
> if widgetData.default.error_box then begin
510c509
<   IF NOT(widgetData.default_draw_ident) then $
---
>   IF NOT(widgetData.default.draw_ident) then $
695c694
< default_verbose=widgetData.default_verbose
---
> default_verbose=widgetData.default.verbose
717,718d715
<     WIDGET_CONTROL, widgetData.ef_orbit, GET_VALUE=orbitNr
<     orbitNr=fix(orbitNr(0))
720c717,719
<     IF widgetData.default_orbitInfo.number NE orbitNr THEN BEGIN
---
>     orbitNr= widgetData.orbitNumber
> 
>     IF widgetData.default.orbitInfo.number NE orbitNr THEN BEGIN
823c822
< WIDGET_CONTROL, /HOURGLASS         ;set cursor to hourglass for plotting
---
> if ( not widgetData.headless ) then WIDGET_CONTROL, /HOURGLASS         ;set cursor to hourglass for plotting
827c826
< IF NOT widgetData.default_states THEN papco_save_current_state
---
> IF NOT widgetData.default.states THEN papco_save_current_state
830c829
< drawWidgetData.monitor->setTaskSize, numberOfPlots
---
> widgetData.monitor->setTaskSize, numberOfPlots
841a841,842
> always_redraw= getenv( 'papco_debug' ) eq '1'
> 
847c848
<     if not papco_check_plotinfos(plotNr) then begin
---
>     if always_redraw or ( not papco_check_plotinfos(plotNr) ) then begin
864c865
<     drawWidgetData.monitor->setProgress, i
---
>     widgetData.monitor->setProgress, i
892c893
<     drawWidgetData.monitor->setMessage, plotnr_str+': '+panel_kind
---
>     widgetData.monitor->setMessage, plotnr_str+': '+panel_kind
900c901
<     IF widgetData.default_redraw THEN BEGIN
---
>     IF widgetData.default.redraw THEN BEGIN
935,936c936,937
<     !P.CHARTHICK = widgetData.default_charthick
<     !P.CHARSIZE = widgetData.default_charsize
---
>     !P.CHARTHICK = widgetData.default.charthick
>     !P.CHARSIZE = widgetData.default.charsize
942,944c943,945
<     !X.TICKS     = widgetData.default_XTICKS
<     !X.STYLE     = widgetData.default_XSTYLE
<     !X.MINOR     = widgetData.default_XMINOR
---
>     !X.TICKS     = widgetData.default.XTICKS
>     !X.STYLE     = widgetData.default.XSTYLE
>     !X.MINOR     = widgetData.default.XMINOR
954c955
<     !X.TICKLEN   = widgetData.default_TICKLEN * ticklength_mult
---
>     !X.TICKLEN   = widgetData.default.TICKLEN * ticklength_mult
973c974
<         if ( drawWidgetData.monitor->isCancelled() ) then begin
---
>         if ( widgetData.monitor->isCancelled() ) then begin
1033c1034
<       if widgetData.default_trap eq 1 then $
---
>       if widgetData.default.trap eq 1 then $
1102c1103
<         if widgetData.default_trap eq 1 then $
---
>         if widgetData.default.trap eq 1 then $
1124c1125
<             IF widgetData.default_do_plots EQ 0 THEN output = 3
---
>             IF widgetData.default.do_plots EQ 0 THEN output = 3
1133c1134
<       if widgetData.default_trap eq 1 then $
---
>       if widgetData.default.trap eq 1 then $
1209c1210
<     if (widgetdata.default_numbering eq 0) AND $
---
>     if (widgetData.default.numbering eq 0) AND $
1212c1213
<       if widgetData.default_right_label eq 0 then begin ;outside numbering
---
>       if widgetData.default.right_label eq 0 then begin ;outside numbering
1225,1226c1226,1227
<   drawWidgetData.monitor->setProgress, i
<   drawWidgetData.monitor->finished
---
>   widgetData.monitor->setProgress, i
>   widgetData.monitor->finished
1245c1246
<     widgetData.default_save_bitmap then BEGIN
---
>     widgetData.default.save_bitmap then BEGIN
1247c1248
<     papco_drawn_window=tvrd(/TRUE)
---
>     papco_drawn_window=tvrd(TRUE=widgetdata.truecolor)
1258,1264d1258
<         ;papco_annotate needs to draw to a draw window first before
<         ;drawing to postscript. So make an unmapped one, and then delete it!
<         PAPCO_SET_PLOT, 'X'
<         dummy='papco_dummy'
<         papco_draw_window,dummy,/DUMMY
<         WIDGET_CONTROL, dummy,  GET_VALUE=drawIndex
<         WSET, drawIndex
1266c1260,1263
<           LOAD_FILE=widgetData.annotateFileName, /EXIT
---
>           LOAD_FILE=widgetData.annotateFileName, /EXIT, $
>           	/inline, /batch
>       end
>       'PRINTER': begin
1268,1270c1265,1266
<           LOAD_FILE=widgetData.annotateFileName, /EXIT, /PAPCO_PS
<         papco_draw_window,'papco_dummy',/CLOSE
<         SET_PLOT, 'PS'
---
>             LOAD_FILE=widgetData.annotateFileName, /EXIT, $
>             /inline, /batch
1273,1278d1268
<         PAPCO_SET_PLOT, 'X'
<         device,retain=2
<         dummy='papco_dummy'
<         papco_draw_window,dummy,/DUMMY
<         WIDGET_CONTROL, dummy,  GET_VALUE=drawIndex
<         WSET, drawIndex
1280,1284c1270,1271
<           LOAD_FILE=widgetData.annotateFileName, /EXIT
<         ;now read the annotation data into the graphics store buffer
<         papco_drawn_window=tvrd()
<         papco_draw_window,'papco_dummy',/CLOSE
<         SET_PLOT, 'Z'
---
>             LOAD_FILE=widgetData.annotateFileName, /EXIT, $
>             /inline, /batch
1289a1277,1280
>       'WIN': begin
>         papco_annotate, COLOR_INDICES=fixed_color, $
>           LOAD_FILE=widgetData.annotateFileName, /EXIT
> 	  end
Index: papco_draw_window.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_draw_window.pro,v
retrieving revision 1.3
diff -B -b -r1.3 papco_draw_window.pro
88,90c88,90
<     scr_xsize = widgetData.default_draw_size(0)
<     scr_ysize = widgetData.default_draw_size(1)
<     allow_scroll = widgetdata.default_scroll
---
>     scr_xsize = widgetData.default.draw_size(0)
>     scr_ysize = widgetData.default.draw_size(1)
>     allow_scroll = widgetData.default.scroll
93,95c93,95
<     if widgetData.default_layout eq 0 then begin
<         xsize=widgetData.default_draw_size(0)
<         ysize=widgetData.default_draw_size(1)
---
>     if widgetData.default.layout eq 0 then begin
>         xsize=widgetData.default.draw_size(0)
>         ysize=widgetData.default.draw_size(1)
97,98c97,98
<         xsize=widgetData.default_draw_size(1)
<         ysize=widgetData.default_draw_size(0)
---
>         xsize=widgetData.default.draw_size(1)
>         ysize=widgetData.default.draw_size(0)
124,125c124,125
<         xsize=widgetData.default_draw_size(0)
<         ysize=widgetData.default_draw_size(1)
---
>         xsize=widgetData.default.draw_size(0)
>         ysize=widgetData.default.draw_size(1)
131,132c131,132
<         xsize=widgetData.default_draw_size(0)
<         ysize=widgetData.default_draw_size(1)
---
>         xsize=widgetData.default.draw_size(0)
>         ysize=widgetData.default.draw_size(1)
138,139c138,139
<     if scroll then $
<       base=WIDGET_BASE(COLUMN=base_column, GROUP=widgetData.main_base,$
---
>     if scroll then begin
>         base=WIDGET_BASE(COLUMN=base_column, GROUP=widgetData.gui.main_base,$
141,144c141,147
<                        SCR_XSIZE=scr_xsize, SCR_YSIZE=scr_ysize) $
<     else $
<       base=WIDGET_BASE(COLUMN=base_column, GROUP=widgetData.main_base,$
<                        title=name)
---
>                          SCR_XSIZE=scr_xsize, SCR_YSIZE=scr_ysize, $
>                          /tlb_size_events, /kbrd_focus_events, uvalue='drawbase' ) 
>     endif else begin
>         base=WIDGET_BASE(COLUMN=base_column, GROUP=widgetData.gui.main_base,$
>                          title=name, $
>                         /tlb_size_events, /kbrd_focus_events, uvalue='drawbase' )
>     endelse
173c176
<     geometry=WIDGET_INFO(widgetData.pb_print, /GEOMETRY) ;set size for buttons
---
>     geometry=WIDGET_INFO(widgetData.gui.pb_print, /GEOMETRY) ;set size for buttons
241,242c244,245
<                     pb_del_old:pb_del_old, $
<                     monitor:monitor }
---
>                     pb_del_old:pb_del_old }
>     widgetData.monitor= monitor
256,258c259,261
<     widgetData.draw_window=!D.window
<     widgetData.dw_Draw=dw_Draw
<     widgetData.old_draw_id(widgetData.no_draw_window)=Base
---
>     widgetData.gui.draw_window=!D.window
>     widgetData.gui.dw_Draw=dw_Draw
>     widgetData.gui.old_draw_id(widgetData.no_draw_window)=Base
267a271,284
> pro papco_draw_base_size_event, event
> ;; indend to keep track of last draw window position, and to handle
> ;; resize events
>   
>   geom= widget_info( event.top, /geom )
>   ;;print, 'draw widget position= '+ strtrim(geom.xoffset,2) + ', '+strtrim(geom.yoffset,2)
>   ;;print, 'draw widget size= '+  strtrim(geom.xsize,2) + ', '+ strtrim(geom.ysize,2)
>   if ( tag_names( event, /structure_name ) eq 'WIDGET_KBRD_FOCUS' ) then begin
>   endif else begin
>       print, 'resize request  = '+  strtrim(event.x,2) + ', '+ strtrim(event.y,2)
>   endelse
>   ;;help,/str, geom
> end
> 
295a313,315
>     'drawbase': begin
>         papco_draw_base_size_event, event
>     end
338c358
<           Widget_Control, Widgetdata.Old_Draw_Id(I), /Destroy
---
>           Widget_Control, Widgetdata.gui.Old_Draw_Id(I), /Destroy
348c368
<           Widget_Control, Widgetdata.Old_Draw_Id(I), /Destroy
---
>           Widget_Control, Widgetdata.gui.Old_Draw_Id(I), /Destroy
353,355c373,375
<       Widget_Control, Widgetdata.pb_Draw_New, Sensitive=0
<       Widget_Control, Widgetdata.pb_Annotate, Sensitive=0
<       Widget_Control, Widgetdata.pb_Rm_Annot, Sensitive=0
---
>       Widget_Control, Widgetdata.gui.pb_Draw_New, Sensitive=0
>       Widget_Control, Widgetdata.gui.pb_Annotate, Sensitive=0
>       Widget_Control, Widgetdata.gui.pb_Rm_Annot, Sensitive=0
Index: papco_files.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_files.pro,v
retrieving revision 1.2
diff -B -b -r1.2 papco_files.pro
82c82
< IF NOT KEYWORD_SET(GROUP) THEN GROUP=widgetdata.base
---
> IF NOT KEYWORD_SET(GROUP) THEN GROUP=widgetdata.gui.base
176c176
<     filename=papco_pickfile(GROUP=widgetData.main_base, $
---
>     filename=papco_pickfile(GROUP=widgetData.gui.main_base, $
257c257
<           default_orbitInfo:widgetData.default_orbitInfo, $
---
>           default_orbitInfo:widgetData.default.orbitInfo, $
340c340
<     fName=papco_pickfile(GROUP=widgetData.main_base, $
---
>     fName=papco_pickfile(GROUP=widgetData.gui.main_base, $
395c395
<           default_orbitInfo:widgetData.default_orbitInfo, $
---
>           default_orbitInfo:widgetData.default.orbitInfo, $
405c405
<     widgetData.default_orbitInfo=OtherInfo.default_orbitInfo
---
>     widgetData.default.orbitInfo=OtherInfo.default_orbitInfo
599,600c599,600
<   !P.CHARSIZE  = widgetData.default_charsize
<   !P.CHARTHICK = widgetData.default_charthick
---
>   !P.CHARSIZE  = widgetData.default.charsize
>   !P.CHARTHICK = widgetData.default.charthick
603,605c603,605
<   !P.TICKLEN   = widgetData.default_TICKLEN
<   !X.TICKS     = widgetData.default_XTICKS
<   !X.STYLE     = widgetData.default_XSTYLE
---
>   !P.TICKLEN   = widgetData.default.TICKLEN
>   !X.TICKS     = widgetData.default.XTICKS
>   !X.STYLE     = widgetData.default.XSTYLE
607c607
<   !X.MINOR     = widgetData.default_XMINOR
---
>   !X.MINOR     = widgetData.default.XMINOR
655,659c655,659
< widgetdata.default_useprinter=widgetdata.printerinfo.useprinter
< widgetdata.default_printer=widgetdata.printerinfo.printer
< widgetdata.default_askforfilename=widgetdata.printerinfo.askforfilename
< widgetdata.default_filetype=widgetdata.printerinfo.filetype
< widgetdata.default_filename_tmpl=widgetdata.printerinfo.filename_tmpl
---
> widgetData.default.useprinter=widgetdata.printerinfo.useprinter
> widgetData.default.printer=widgetdata.printerinfo.printer
> widgetData.default.askforfilename=widgetdata.printerinfo.askforfilename
> widgetData.default.filetype=widgetdata.printerinfo.filetype
> widgetData.default.filename_tmpl=widgetdata.printerinfo.filename_tmpl
760c760
< if not keyword_set(QUIET) then begin
---
> if ( not widgetData.headless ) and ( not keyword_set(QUIET) ) then begin
774c774
<         strlowcase(widgetData.default_output_format)
---
>         strlowcase(widgetData.default.output_format)
782c782
<     progress_base=widget_base(GROUP_LEADER=widgetData.main_base, $
---
>     progress_base=widget_base(GROUP_LEADER=widgetData.gui.main_base, $
796c796,801
<     pb_cancel=widget_button(progress_base,value='Cancel', uvalue='pb_cancel')
---
> 
>     monitor_base= widget_base( progress_base, /row )
> 
>     pb_cancel=widget_button(monitor_base,value='Cancel', uvalue='pb_cancel')        
> 
>     
806c811
< keep_orbitInfo=widgetData.default_orbitInfo
---
> keep_orbitInfo=widgetData.default.orbitInfo
822c827,829
< ;--process all lines of time_str_array ----------------------------------------
---
> ;--process all lines of time_str_array
> ;------------------------------------------
> 
855c862,863
<     if not keyword_set(QUIET) then widget_control, lbl_current, set_value=line
---
>     if not widgetData.headless and $
>       not keyword_set(QUIET) then widget_control, lbl_current, set_value=line
944,945c952,953
<           ;-- modify the timerange according to widgetData.default_adjust_time
<           if widgetData.default_adjust_time ne 0 then papco_time_adjust
---
>           ;-- modify the timerange according to widgetData.default.adjust_time
>           if widgetData.default.adjust_time ne 0 then papco_time_adjust
950,951c958,961
<           widget_control, widgetData.ef_orbit, set_value=orbit
<           widgetData.default_orbitInfo=papco_GetOrbitInfoStruct()
---
>             if ( not widgetData.headless ) then $
>               widget_control, widgetData.gui.ef_orbit, set_value=orbit            
>             widgetData.orbitNumber= orbit
>             widgetData.default.orbitInfo=papco_GetOrbitInfoStruct()
963,964c973,974
<           ;-- modify the timerange according to widgetData.default_adjust_time
<           if widgetData.default_adjust_time ne 0 then papco_time_adjust
---
>           ;-- modify the timerange according to widgetData.default.adjust_time
>             if widgetData.default.adjust_time ne 0 then papco_time_adjust
980c990
<             !P.CHARSIZE=widgetData.default_charsize
---
>             !P.CHARSIZE=widgetData.default.charsize
1002c1012
<         if not keyword_set(QUIET) then begin
---
>         if not widgetData.headless and not keyword_set(QUIET) then begin
1020c1030
< widgetData.default_orbitInfo=keep_orbitInfo
---
> widgetData.default.orbitInfo=keep_orbitInfo
1114c1124
< keep_orbitInfo=widgetData.default_orbitInfo
---
> keep_orbitInfo=widgetData.default.orbitInfo
1248c1258
<             if widgetData.default_adjust_time ne 0 then papco_time_adjust
---
>             if widgetData.default.adjust_time ne 0 then papco_time_adjust
1252,1253c1262,1264
<             widget_control, widgetData.ef_orbit, set_value=orbit
<             widgetData.default_orbitInfo=papco_GetOrbitInfoStruct()
---
>               if ( not widgetData.headless ) then widget_control, widgetData.gui.ef_orbit, set_value=orbit
>               widgetData.orbitNumber= orbit
>             widgetData.default.orbitInfo=papco_GetOrbitInfoStruct()
1265,1266c1276,1277
<             ;-- modify the timerange widgetData.default_adjust_time
<             if widgetData.default_adjust_time ne 0 then papco_time_adjust
---
>             ;-- modify the timerange widgetData.default.adjust_time
>             if widgetData.default.adjust_time ne 0 then papco_time_adjust
1279c1290
<     widgetData.default_orbitInfo=keep_orbitInfo
---
>     widgetData.default.orbitInfo=keep_orbitInfo
1315c1326
<   widgetData.default_orbitInfo=keep_orbitInfo
---
>   widgetData.default.orbitInfo=keep_orbitInfo
1642c1653
< IF NOT KEYWORD_SET(GROUP) THEN GROUP=widgetdata.base
---
> IF NOT KEYWORD_SET(GROUP) THEN GROUP=widgetdata.gui.base
1780c1791
< widget_control, widgetdata.label_batch_time, GET_VALUE = this_time_str
---
> widget_control, widgetdata.gui.label_batch_time, GET_VALUE = this_time_str
1834c1845
<         widget_control,widgetdata.label_batch_time, SET_VALUE=time_str
---
>         widget_control,widgetdata.gui.label_batch_time, SET_VALUE=time_str
1933c1944
<   IF widgetData.default_states THEN BEGIN
---
>   IF widgetData.default.states THEN BEGIN
1978c1989
<   IF widgetData.default_states THEN BEGIN
---
>   IF widgetData.default.states THEN BEGIN
2025c2036
< IF widgetData.default_states THEN BEGIN
---
> IF widgetData.default.states THEN BEGIN
2073c2084
<         widgetData.default_font=new_font
---
>         widgetData.default.font=new_font
2114c2125
<         result=xfont(group=widgetdata.main_base)
---
>         result=xfont(group=widgetdata.gui.main_base)
2116c2127
<             widgetData.default_font=result
---
>             widgetData.default.font=result
2124c2135
<         result=xfont(group=widgetdata.main_base)
---
>         result=xfont(group=widgetdata.gui.main_base)
2126c2137
<             widgetData.default_font=result
---
>             widgetData.default.font=result
2140c2151
<         r=STRSPLIT(widgetData.default_font,'*',/EXTRACT)
---
>         r=STRSPLIT(widgetData.default.font,'*',/EXTRACT)
2161c2172
<                                     column=1, GROUP_LEADER= widgetData.base)
---
>                                     column=1, GROUP_LEADER= widgetData.gui.base)
2202c2213
<         r = DIALOG_MESSAGE(['New Font is set:'+ widgetData.default_font, $
---
>         r = DIALOG_MESSAGE(['New Font is set:'+ widgetData.default.font, $
Index: papco_find_modules.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_find_modules.pro,v
retrieving revision 1.1.1.1
diff -B -b -r1.1.1.1 papco_find_modules.pro
32c32,33
< paths=strlowcase(paths)
---
> 
> ;;;jbf  paths=strlowcase(paths)
Index: papco_get_remote_data.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_get_remote_data.pro,v
retrieving revision 1.9
diff -B -b -r1.9 papco_get_remote_data.pro
192a193,195
>   if ( err ne 0 and tries eq 0 ) then begin ;; failed
>       return, '???'
>   endif
263a267
>   tries=3
266c270,277
<   IF err NE 0 THEN GOTO, again
---
>   IF err NE 0 and tries gt 0 THEN begin
>       tries= tries-1
>       wait, 0.3
>       GOTO, again
>   endif
>   if err ne -1 and tries eq 0 then begin
>       return, 999
>   endif
349a361
>   tries=3
352c364,371
<   IF err NE 0 THEN GOTO, again
---
>   IF ( err NE 0 and tries gt 0 ) THEN begin
>       tries= tries-1
>       wait, 0.2
>       GOTO, again
>   endif
>   if ( err ne 0 and tries eq 0 ) then begin
>       return, 0
>   endif
531c550
< WIDGET_CONTROL, base, /REALIZE, MAP=0              ;sm
---
> WIDGET_CONTROL, base, map=0, /REALIZE              ;sm
539d557
< notdone= 1
540a559,560
> notdone=1
> 
620a641
> obj_destroy, monitor
967c988
<     if widgetData.default_wget EQ 0 then begin
---
>     if widgetData.default.wget EQ 0 then begin
1003c1024
<     IF widgetData.default_ask_wget EQ 0 THEN $
---
>     IF widgetData.default.ask_wget EQ 0 THEN $
Index: papco_idlver.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_idlver.pro,v
retrieving revision 1.4
diff -B -b -r1.4 papco_idlver.pro
55c55
<         return,xfont(/preserve,group=widgetdata.main_base)
---
>         return,xfont(/preserve,group=widgetdata.gui.main_base)
59c59
<         return,xxfont(/preserve,group=widgetdata.main_base)
---
>         return,xxfont(/preserve,group=widgetdata.gui.main_base)
Index: papco_module_configure.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_module_configure.pro,v
retrieving revision 1.2
diff -B -b -r1.2 papco_module_configure.pro
40c40
<                           group_leader=widgetData.base)
---
>                           group_leader=widgetData.gui.base)
Index: papco_opsys.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_opsys.pro,v
retrieving revision 1.9
diff -B -b -r1.9 papco_opsys.pro
1334a1335,1354
> 
> function papco_dirsep
>   if !version.os_family eq 'unix' then begin
>    	  return, '/'
>    endif else if !version.os_family eq 'Windows' then begin
>       return, '\'
>    endif else begin
>       message, 'OS not supported'
>    endelse
> end
> 
> function papco_pathsep
>   if !version.os_family eq 'unix' then begin
>    	  return, ':'
>    endif else if !version.os_family eq 'Windows' then begin
>       return, ';'
>    endif else begin
>       message, 'OS not supported'
>    endelse
> end
\ No newline at end of file
Index: papco_orbitinfo.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_orbitinfo.pro,v
retrieving revision 1.1.1.1
diff -B -b -r1.1.1.1 papco_orbitinfo.pro
708c708
<       WIDGET_CONTROL, widgetdata.base, HOURGLASS=1
---
>       WIDGET_CONTROL, widgetdata.gui.base, HOURGLASS=1
728c728
<       WIDGET_CONTROL, widgetdata.base, HOURGLASS=0
---
>       WIDGET_CONTROL, widgetdata.gui.base, HOURGLASS=0
Index: papco_output.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_output.pro,v
retrieving revision 1.4
diff -B -b -r1.4 papco_output.pro
131c131
< ;select correct file formay
---
> ;select correct file format
133c133
<     format=widgetData.default_output_format
---
>     format=widgetData.default.output_format
Index: papco_panel.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_panel.pro,v
retrieving revision 1.10
diff -B -b -r1.10 papco_panel.pro
618c618,619
<                                        ROW=ROW, COLUMN=COLUMN
---
>                                        ROW=ROW, COLUMN=COLUMN, $
>                                        fast_continue=fast_continue
637c638,639
<       pb_datacache= widget_button( action_base, uvalue='pb_datacache', value='DataCache' )
---
>       pb_datacache= widget_button( action_base, $
>                                    uvalue='pb_datacache', value='DataCache' )
642a645,648
>   if n_elements( fast_continue ) eq 0 then begin
>       fast_continue=0
>   endif
>   
660a667
>            fast_continue:fast_continue, $
734c741
< PRO papco_panel_Realize, aBase, widgetData, _extra=e
---
> PRO papco_panel_Realize, aBase, panelWidgetData, _extra=e
747c754
< names=TAG_NAMES(widgetData)
---
> names=TAG_NAMES(panelWidgetData)
752c759
<     widget_control, widgetData.dw_plotColor, get_value=windex
---
>     widget_control, panelWidgetData.dw_plotColor, get_value=windex
754,755c761,762
<     geom=widget_info(widgetData.dw_plotColor, /geometry)
<     n=widgetData.ps_numberOfColors
---
>     geom=widget_info(panelWidgetData.dw_plotColor, /geometry)
>     n=panelWidgetData.ps_numberOfColors
763c770
< papco_panel_Refresh, widgetData, /ALL
---
> papco_panel_Refresh, panelWidgetData, /ALL
1171c1178
< PRO papco_panel_AddFile_EditFile, widgetData
---
> PRO papco_panel_AddFile_EditFile, panelWidgetData
1175c1182
< widgetData2=widgetData
---
> widgetData2=panelWidgetData
1177c1184
< fname=papco_fname(widgetData.path+widgetData.filename)
---
> fname=papco_fname(panelWidgetData.path+panelWidgetData.filename)
1179c1186
< IF widgetData.status EQ 0 THEN BEGIN
---
> IF panelWidgetData.status EQ 0 THEN BEGIN
1187,1188c1194,1195
<        dummy=messageBox('Not able to create '+widgetData.path+ $
<                         widgetData.filename,$
---
>        dummy=messageBox('Not able to create '+panelWidgetData.path+ $
>                         panelWidgetData.filename,$
1191c1198
<        widgetData.status=0
---
>        panelWidgetData.status=0
1205,1206c1212,1213
< widgetData.status=1
< edit_base=PAPCO_WIDGET_BASE(TITLE=action+widgetData.filename, $
---
> panelWidgetData.status=1
> edit_base=PAPCO_WIDGET_BASE(TITLE=action+panelWidgetData.filename, $
1208c1215
<                             GROUP_LEADER=widgetData.base)
---
>                             GROUP_LEADER=panelWidgetData.base)
1216c1223
<                 GROUP_LEADER=widgetData.base
---
>                 GROUP_LEADER=panelWidgetData.base
1240c1247
< COMMON papco_panel_AddFile_EditFile, widgetData, edit_text, entries
---
> COMMON papco_panel_AddFile_EditFile, widgetData2, edit_text, entries
1251,1252c1258,1259
<         message,'Writing user file '+widgetData.path+widgetData.filename,/cont
<         fname=papco_fname(widgetData.path+widgetData.filename)
---
>         message,'Writing user file '+widgetData2.path+widgetData2.filename,/cont
>         fname=papco_fname(widgetData2.path+widgetData2.filename)
1811c1818
< PRO papco_panel_Refresh, widgetData,  ALL=ALL, ADD_FILE=ADD_FILE, $
---
> PRO papco_panel_Refresh, panelWidgetData,  ALL=ALL, ADD_FILE=ADD_FILE, $
1827c1834
< names=TAG_NAMES(widgetData)
---
> names=TAG_NAMES(panelWidgetData)
1856c1863
<      c_index=widgetData.channel
---
>      c_index=panelWidgetData.channel
1858c1865
<      widget_control, widgetData.spb_color(c_index), /SET_BUTTON
---
>      widget_control, panelWidgetData.spb_color(c_index), /SET_BUTTON
1864c1871
<        widget_control, widgetData.spb_color(i), $
---
>        widget_control, panelWidgetData.spb_color(i), $
1868c1875
<      widget_control, widgetData.dw_colorbar, get_value=windex
---
>      widget_control, panelWidgetData.dw_colorbar, get_value=windex
1871c1878
<      geom=widget_info(widgetData.dw_colorbar, /geometry)
---
>      geom=widget_info(panelWidgetData.dw_colorbar, /geometry)
1883c1890
<        index(widgetData.ps_selectColor) = 1
---
>        index(panelWidgetData.ps_selectColor) = 1
1887c1894
<            exe_str = "widget_control, widgetData." + bases(i) + $
---
>            exe_str = "widget_control, panelWidgetData." + bases(i) + $
1898c1905
<       WIDGET_CONTROL, widgetData.dw_ps_prev,  GET_VALUE=drawIndex
---
>       WIDGET_CONTROL, panelWidgetData.dw_ps_prev,  GET_VALUE=drawIndex
1901,1905c1908,1912
<       lstyle  = widgetData.LINESTYLE
<       psym    = widgetData.PSYM
<       thick   = widgetData.THICK
<       color   = widgetData.COLOR
<       symsize = widgetData.SYMSIZE
---
>       lstyle  = panelWidgetData.LINESTYLE
>       psym    = panelWidgetData.PSYM
>       thick   = panelWidgetData.THICK
>       color   = panelWidgetData.COLOR
>       symsize = panelWidgetData.SYMSIZE
1910c1917
<              widgetData.userstyle=1
---
>              panelWidgetData.userstyle=1
1914c1921
<              widgetData.userstyle=2
---
>              panelWidgetData.userstyle=2
1917c1924
<        else: widgetData.userstyle=0
---
>        else: panelWidgetData.userstyle=0
1920,1921c1927,1928
<       xdata=(randomu(seed,10)-0.5)*2  &  ydata=(randomu(seed,10)-0.5)*2
<       xr=[-1.2,1.2]
---
> ;;      xdata=(randomu(seed,10)-0.5)*2  &  ydata=(randomu(seed,10)-0.5)*2
> ;;      xr=[-1.2,1.2]
1923c1930
<       if NOT widgetData.is_ScatterPlot then BEGIN
---
>       if NOT panelWidgetData.is_ScatterPlot then BEGIN
1928,1929c1935,1942
<       if widgetData.userstyle ne 0 then begin
<         get_user_symbol, widgetData.userstyle, userx, usery
---
>       xdata=(randomu(-99L,100)-0.5)*2  
>       xdata= xdata( sort( xdata ) )
>       ydata=(randomu(-99L,100)/10-0.5)*2 - exp( ( xdata - .3 )^2 / 3 ) +1.9 + sin(xdata*2*!PI )
> 
>       xr=[-1.2,1.2]
> 
>       if panelWidgetData.userstyle ne 0 then begin
>         get_user_symbol, panelWidgetData.userstyle, userx, usery
1944c1956
<      case widgetData.status of
---
>      case panelWidgetData.status of
1948,1951c1960,1963
<            WIDGET_CONTROL, widgetData.status_button, SENSITIVE=1
<            WIDGET_CONTROL, widgetData.name_text, SENSITIVE=1
<            WIDGET_CONTROL, widgetData.load_button, SENSITIVE=0
<            WIDGET_CONTROL, widgetData.save_button, SENSITIVE=1
---
>            WIDGET_CONTROL, panelWidgetData.status_button, SENSITIVE=1
>            WIDGET_CONTROL, panelWidgetData.name_text, SENSITIVE=1
>            WIDGET_CONTROL, panelWidgetData.load_button, SENSITIVE=0
>            WIDGET_CONTROL, panelWidgetData.save_button, SENSITIVE=1
1956,1959c1968,1971
<            WIDGET_CONTROL, widgetData.status_button, SENSITIVE=1
<            WIDGET_CONTROL, widgetData.name_text, SENSITIVE=1
<            WIDGET_CONTROL, widgetData.save_button, SENSITIVE=1
<            WIDGET_CONTROL, widgetData.load_button, SENSITIVE=1
---
>            WIDGET_CONTROL, panelWidgetData.status_button, SENSITIVE=1
>            WIDGET_CONTROL, panelWidgetData.name_text, SENSITIVE=1
>            WIDGET_CONTROL, panelWidgetData.save_button, SENSITIVE=1
>            WIDGET_CONTROL, panelWidgetData.load_button, SENSITIVE=1
1964,1965c1976,1977
<            WIDGET_CONTROL, widgetData.status_button, SENSITIVE=0
<            WIDGET_CONTROL, widgetData.name_text, SENSITIVE=0
---
>            WIDGET_CONTROL, panelWidgetData.status_button, SENSITIVE=0
>            WIDGET_CONTROL, panelWidgetData.name_text, SENSITIVE=0
1970,1971c1982,1983
<            WIDGET_CONTROL, widgetData.status_button, SENSITIVE=0
<            WIDGET_CONTROL, widgetData.name_text, SENSITIVE=1
---
>            WIDGET_CONTROL, panelWidgetData.status_button, SENSITIVE=0
>            WIDGET_CONTROL, panelWidgetData.name_text, SENSITIVE=1
1976,1977c1988,1989
<            WIDGET_CONTROL, widgetData.status_button, SENSITIVE=0
<            WIDGET_CONTROL, widgetData.name_text, SENSITIVE=1
---
>            WIDGET_CONTROL, panelWidgetData.status_button, SENSITIVE=0
>            WIDGET_CONTROL, panelWidgetData.name_text, SENSITIVE=1
1980,1981c1992,1993
<      WIDGET_CONTROL, widgetData.status_text, SET_VALUE = status_text
<      WIDGET_CONTROL, widgetData.status_button, SET_VALUE = status_button
---
>      WIDGET_CONTROL, panelWidgetData.status_text, SET_VALUE = status_text
>      WIDGET_CONTROL, panelWidgetData.status_button, SET_VALUE = status_button
1988,1989c2000,2001
<     IF widgetData.manualYScaling EQ 1 THEN BEGIN
<         WIDGET_CONTROL, widgetData.yscaleInput_Base, SENSITIVE=1
---
>     IF panelWidgetData.manualYScaling EQ 1 THEN BEGIN
>         WIDGET_CONTROL, panelWidgetData.yscaleInput_Base, SENSITIVE=1
1991c2003
<         WIDGET_CONTROL, widgetData.yscaleInput_Base, SENSITIVE=0
---
>         WIDGET_CONTROL, panelWidgetData.yscaleInput_Base, SENSITIVE=0
1995,1996c2007,2008
<     WIDGET_CONTROL, widgetData.ef_yscaleFrom, GET_VALUE=from
<     WIDGET_CONTROL, widgetData.ef_yscaleTo,   GET_VALUE=to
---
>     WIDGET_CONTROL, panelWidgetData.ef_yscaleFrom, GET_VALUE=from
>     WIDGET_CONTROL, panelWidgetData.ef_yscaleTo,   GET_VALUE=to
1999,2000c2011,2012
<     IF (from LE 0) OR (to LE 0) THEN widgetData.yLinLog = 0
<     WIDGET_CONTROL, widgetData.mpb_ylinlog, SET_VALUE = widgetData.ylinlog
---
>     IF (from LE 0) OR (to LE 0) THEN panelWidgetData.yLinLog = 0
>     WIDGET_CONTROL, panelWidgetData.mpb_ylinlog, SET_VALUE = panelWidgetData.ylinlog
2007c2019
<      tags = tag_names(widgetData) & pos = strpos(tags, 'EF_ZSCALELB')
---
>      tags = tag_names(panelWidgetData) & pos = strpos(tags, 'EF_ZSCALELB')
2010,2015c2022,2027
<      IF (widgetData.manualZScaling / 100) THEN BEGIN
<        WIDGET_CONTROL, widgetData.ef_zScaleFrom, SENSITIVE=1
<        WIDGET_CONTROL, widgetData.ef_zScaleTo, SENSITIVE=1
<        WIDGET_CONTROL, widgetData.ef_zScaleFrom, set_value=widgetData.ZSCALEMIN
<        WIDGET_CONTROL, widgetData.ef_zScaleTo,   set_value=widgetData.ZSCALEMAX
<        IF c NE 0 THEN WIDGET_CONTROL, widgetData.ef_zScaleLb, SENSITIVE=0
---
>      IF (panelWidgetData.manualZScaling / 100) THEN BEGIN
>        WIDGET_CONTROL, panelWidgetData.ef_zScaleFrom, SENSITIVE=1
>        WIDGET_CONTROL, panelWidgetData.ef_zScaleTo, SENSITIVE=1
>        WIDGET_CONTROL, panelWidgetData.ef_zScaleFrom, set_value=panelWidgetData.ZSCALEMIN
>        WIDGET_CONTROL, panelWidgetData.ef_zScaleTo,   set_value=panelWidgetData.ZSCALEMAX
>        IF c NE 0 THEN WIDGET_CONTROL, panelWidgetData.ef_zScaleLb, SENSITIVE=0
2017,2019c2029,2031
<        WIDGET_CONTROL, widgetData.ef_zScaleFrom, SENSITIVE=0
<        WIDGET_CONTROL, widgetData.ef_zScaleTo, SENSITIVE=0
<        IF c NE 0 THEN WIDGET_CONTROL, widgetData.ef_zScaleLb, SENSITIVE=1
---
>        WIDGET_CONTROL, panelWidgetData.ef_zScaleFrom, SENSITIVE=0
>        WIDGET_CONTROL, panelWidgetData.ef_zScaleTo, SENSITIVE=0
>        IF c NE 0 THEN WIDGET_CONTROL, panelWidgetData.ef_zScaleLb, SENSITIVE=1
2022,2023c2034,2035
<      IF widgetData.zLinLog THEN BEGIN
<        WIDGET_CONTROL, widgetData.pb_zLog, /SET_BUTTON
---
>      IF panelWidgetData.zLinLog THEN BEGIN
>        WIDGET_CONTROL, panelWidgetData.pb_zLog, /SET_BUTTON
2025c2037
<        WIDGET_CONTROL, widgetData.pb_zLin, /SET_BUTTON
---
>        WIDGET_CONTROL, panelWidgetData.pb_zLin, /SET_BUTTON
2032,2040c2044,2052
<     IF widgetData.descr THEN $
<       WIDGET_CONTROL, widgetData.descr_entry, SENSITIVE=1 $
<       ELSE WIDGET_CONTROL, widgetData.descr_entry, SENSITIVE=0
<     IF widgetData.ylbl THEN $
<       WIDGET_CONTROL, widgetData.ylbl_entry, SENSITIVE=1 $
<       ELSE WIDGET_CONTROL, widgetData.ylbl_entry, SENSITIVE=0
<     IF widgetData.zlbl THEN $
<       WIDGET_CONTROL, widgetData.zlbl_entry, SENSITIVE=1 $
<       ELSE WIDGET_CONTROL, widgetData.zlbl_entry, SENSITIVE=0
---
>     IF panelWidgetData.descr THEN $
>       WIDGET_CONTROL, panelWidgetData.descr_entry, SENSITIVE=1 $
>       ELSE WIDGET_CONTROL, panelWidgetData.descr_entry, SENSITIVE=0
>     IF panelWidgetData.ylbl THEN $
>       WIDGET_CONTROL, panelWidgetData.ylbl_entry, SENSITIVE=1 $
>       ELSE WIDGET_CONTROL, panelWidgetData.ylbl_entry, SENSITIVE=0
>     IF panelWidgetData.zlbl THEN $
>       WIDGET_CONTROL, panelWidgetData.zlbl_entry, SENSITIVE=1 $
>       ELSE WIDGET_CONTROL, panelWidgetData.zlbl_entry, SENSITIVE=0
2042,2043c2054,2055
<     wid_ids = [widgetData.rs_base, widgetData.ls_base, widgetData.z_base]
<     CASE widgetData.descr_type OF
---
>     wid_ids = [panelWidgetData.rs_base, panelWidgetData.ls_base, panelWidgetData.z_base]
>     CASE panelWidgetData.descr_type OF
2054c2066
<      WIDGET_CONTROL, widgetData.mpb_unit,  set_value = widgetData.dataunits
---
>      WIDGET_CONTROL, panelWidgetData.mpb_unit,  set_value = panelWidgetData.dataunits
2068,2069c2080,2081
<         f = widgetData.(i7(0))
<         WIDGET_CONTROL, widgetData.(i1(0)), SENSITIVE = widgetData.(i2(0))
---
>         f = panelWidgetData.(i7(0))
>         WIDGET_CONTROL, panelWidgetData.(i1(0)), SENSITIVE = panelWidgetData.(i2(0))
2071,2072c2083,2084
<             string(widgetData.(i4(0)), FORMAT=f),35, /CENTER)
<         WIDGET_CONTROL, widgetData.(i3(0)), SET_VALUE = out
---
>             string(panelWidgetData.(i4(0)), FORMAT=f),35, /CENTER)
>         WIDGET_CONTROL, panelWidgetData.(i3(0)), SET_VALUE = out
2074,2075c2086,2087
<             string(widgetData.(i6(0)), FORMAT=f),35, /CENTER)
<         WIDGET_CONTROL, widgetData.(i5(0)), SET_VALUE = out
---
>             string(panelWidgetData.(i6(0)), FORMAT=f),35, /CENTER)
>         WIDGET_CONTROL, panelWidgetData.(i5(0)), SET_VALUE = out
2089c2101
<         f = widgetData.(i7(0))
---
>         f = panelWidgetData.(i7(0))
2092,2093c2104,2105
<             string(widgetData.(i4(0)), FORMAT=f),35, /CENTER)
<         WIDGET_CONTROL, widgetData.(i3(0)), SET_VALUE = out
---
>             string(panelWidgetData.(i4(0)), FORMAT=f),35, /CENTER)
>         WIDGET_CONTROL, panelWidgetData.(i3(0)), SET_VALUE = out
2095,2096c2107,2108
<             string(widgetData.(i6(0)), FORMAT=f),35, /CENTER)
<         WIDGET_CONTROL, widgetData.(i5(0)), SET_VALUE = out
---
>             string(panelWidgetData.(i6(0)), FORMAT=f),35, /CENTER)
>         WIDGET_CONTROL, panelWidgetData.(i5(0)), SET_VALUE = out
2102,2107c2114,2119
<     IF (widgetData.ticks EQ 0) AND $
<        (widgetData.mag_coord_ids(0)) NE -1 THEN BEGIN
<         IF widgetData.l_calc THEN BEGIN   ;see if L* is also allowed
<             widget_control, widgetData.mag_coord_ids(1), sensitive = 1
<             widget_control, widgetData.pitch_plot_base, sensitive = 1
<             widget_control, widgetData.mag_pitch_base, sensitive = 1
---
>     IF (panelWidgetData.ticks EQ 0) AND $
>        (panelWidgetData.mag_coord_ids(0)) NE -1 THEN BEGIN
>         IF panelWidgetData.l_calc THEN BEGIN   ;see if L* is also allowed
>             widget_control, panelWidgetData.mag_coord_ids(1), sensitive = 1
>             widget_control, panelWidgetData.pitch_plot_base, sensitive = 1
>             widget_control, panelWidgetData.mag_pitch_base, sensitive = 1
2109,2111c2121,2123
<             widget_control, widgetData.mag_coord_ids(1), sensitive = 0
<             widget_control, widgetData.pitch_plot_base, sensitive = 0
<             widget_control, widgetData.mag_pitch_base, sensitive = 0
---
>             widget_control, panelWidgetData.mag_coord_ids(1), sensitive = 0
>             widget_control, panelWidgetData.pitch_plot_base, sensitive = 0
>             widget_control, panelWidgetData.mag_pitch_base, sensitive = 0
2114,2116c2126,2128
<         WIDGET_CONTROL,widgetData.mag_pitch_base,GET_VALUE = set
<         set(widgetData.pitch_plot) = 1
<         widgetData.pitch_proc = 0
---
>         WIDGET_CONTROL,panelWidgetData.mag_pitch_base,GET_VALUE = set
>         set(panelWidgetData.pitch_plot) = 1
>         panelWidgetData.pitch_proc = 0
2118,2119c2130,2131
<           widgetData.pitch_proc = widgetData.pitch_proc+2^i
<         WIDGET_CONTROL,widgetData.mag_pitch_base,SET_VALUE = set
---
>           panelWidgetData.pitch_proc = panelWidgetData.pitch_proc+2^i
>         WIDGET_CONTROL,panelWidgetData.mag_pitch_base,SET_VALUE = set
2126c2138
< PRO papco_panel_exit, widgetData
---
> PRO papco_panel_exit, panelWidgetData
2128c2140
< names=TAG_NAMES(widgetData)
---
> names=TAG_NAMES(panelWidgetData)
2133,2135c2145,2147
<      WIDGET_CONTROL, widgetData.ef_yscaleFrom, GET_VALUE=from
<      WIDGET_CONTROL, widgetData.ef_yscaleTo, GET_VALUE=to
<      widgetData.yscaleMin=(from(0)) & widgetData.yscaleMax=(to(0))
---
>      WIDGET_CONTROL, panelWidgetData.ef_yscaleFrom, GET_VALUE=from
>      WIDGET_CONTROL, panelWidgetData.ef_yscaleTo, GET_VALUE=to
>      panelWidgetData.yscaleMin=(from(0)) & panelWidgetData.yscaleMax=(to(0))
2138,2139c2150,2151
<          WIDGET_CONTROL, widgetData.ef_yscaleLb, GET_VALUE=lb
<          widgetData.yscaleLb=(lb(0))
---
>          WIDGET_CONTROL, panelWidgetData.ef_yscaleLb, GET_VALUE=lb
>          panelWidgetData.yscaleLb=(lb(0))
2141,2144c2153,2156
<      if (widgetData.manualYScaling ge 0) and $
<        ( widgetData.yLinLog eq 1 ) then begin
<        if (widgetData.yscaleMin le 0) or $
<           (widgetData.yscaleMax le 0) then begin
---
>      if (panelWidgetData.manualYScaling ge 0) and $
>        ( panelWidgetData.yLinLog eq 1 ) then begin
>        if (panelWidgetData.yscaleMin le 0) or $
>           (panelWidgetData.yscaleMax le 0) then begin
2147c2159
<          ;return, widgetData
---
>          ;return, panelWidgetData
2155,2156c2167,2168
<      WIDGET_CONTROL, widgetData.ef_zscaleFrom, GET_VALUE=from
<      WIDGET_CONTROL, widgetData.ef_zscaleTo, GET_VALUE=to
---
>      WIDGET_CONTROL, panelWidgetData.ef_zscaleFrom, GET_VALUE=from
>      WIDGET_CONTROL, panelWidgetData.ef_zscaleTo, GET_VALUE=to
2158,2166c2170,2178
<      IF c NE 0 THEN WIDGET_CONTROL, widgetData.ef_zscaleLb, GET_VALUE=lb
<      widgetData.zscaleMin=FLOAT(from(0))
<      widgetData.zscaleMax=FLOAT(to(0))
<      IF c NE 0 THEN widgetData.manualzscaling = $
<        (widgetData.manualzscaling /100) * 100 + lb(0)
<      if (widgetData.manualZScaling eq 1) and $
<        ( widgetData.zLinLog eq 1 ) then begin
<        if (widgetData.zscaleMin le 0) or $
<          (widgetData.zscaleMax le 0) then begin
---
>      IF c NE 0 THEN WIDGET_CONTROL, panelWidgetData.ef_zscaleLb, GET_VALUE=lb
>      panelWidgetData.zscaleMin=FLOAT(from(0))
>      panelWidgetData.zscaleMax=FLOAT(to(0))
>      IF c NE 0 THEN panelWidgetData.manualzscaling = $
>        (panelWidgetData.manualzscaling /100) * 100 + lb(0)
>      if (panelWidgetData.manualZScaling eq 1) and $
>        ( panelWidgetData.zLinLog eq 1 ) then begin
>        if (panelWidgetData.zscaleMin le 0) or $
>          (panelWidgetData.zscaleMax le 0) then begin
2169c2181
<          ;return, widgetData
---
>          ;return, panelWidgetData
2177,2178c2189,2190
<     IF widgetdata.descr THEN BEGIN
<         WIDGET_CONTROL, widgetdata.descr_entry, GET_VALUE=descr_entry
---
>     IF panelWidgetData.descr THEN BEGIN
>         WIDGET_CONTROL, panelWidgetData.descr_entry, GET_VALUE=descr_entry
2183c2195
<         widgetdata.descr_str=descr_str
---
>         panelWidgetData.descr_str=descr_str
2190,2191c2202,2203
<     IF widgetdata.ylbl THEN BEGIN
<         WIDGET_CONTROL, widgetdata.ylbl_entry, GET_VALUE=descr_entry
---
>     IF panelWidgetData.ylbl THEN BEGIN
>         WIDGET_CONTROL, panelWidgetData.ylbl_entry, GET_VALUE=descr_entry
2196c2208
<         widgetdata.ylbl_str=descr_str
---
>         panelWidgetData.ylbl_str=descr_str
2203,2204c2215,2216
<     IF widgetdata.zlbl THEN BEGIN
<         WIDGET_CONTROL, widgetdata.zlbl_entry, GET_VALUE=descr_entry
---
>     IF panelWidgetData.zlbl THEN BEGIN
>         WIDGET_CONTROL, panelWidgetData.zlbl_entry, GET_VALUE=descr_entry
2209c2221
<         widgetdata.zlbl_str=descr_str
---
>         panelWidgetData.zlbl_str=descr_str
2211c2223
< print, widgetdata.zlbl_str
---
> print, panelWidgetData.zlbl_str
2217,2220c2229,2232
<     WIDGET_CONTROL, widgetdata.ef_ext_desc, GET_VALUE=x
<     widgetdata.descr_extend = x
<     WIDGET_CONTROL, widgetdata.ef_ext_ylbl, GET_VALUE=x
<     widgetdata.ylbl_extend = x
---
>     WIDGET_CONTROL, panelWidgetData.ef_ext_desc, GET_VALUE=x
>     panelWidgetData.descr_extend = x
>     WIDGET_CONTROL, panelWidgetData.ef_ext_ylbl, GET_VALUE=x
>     panelWidgetData.ylbl_extend = x
2227c2239
< ;*      FUNCTION papco_panel_Event, event, widgetData
---
> ;*      FUNCTION papco_panel_Event, event, panelWidgetData
2239c2251
< ;*	widgetData	a structure
---
> ;*	panelWidgetData	a structure
2255c2267
< FUNCTION papco_panel_Event, event, widgetData
---
> FUNCTION papco_panel_Event, event, panelWidgetData
2288,2289c2300,2301
<     widgetData.channel=fix(strfrom(uval, 9))
<     papco_panel_Refresh, widgetData, /COLBAR_STYLE
---
>     panelWidgetData.channel=fix(strfrom(uval, 9))
>     papco_panel_Refresh, panelWidgetData, /COLBAR_STYLE
2293c2305
< tags = tag_names(widgetData)
---
> tags = tag_names(panelWidgetData)
2297,2299c2309,2311
<     'spb_dynamic': widgetData.mag_dyn = event.select
<     'spb_mag_coord': widgetData.mag_coords = event.value
<     'spb_mag_proc' : widgetData.mag_proc = event.value
---
>     'spb_dynamic': panelWidgetData.mag_dyn = event.select
>     'spb_mag_coord': panelWidgetData.mag_coords = event.value
>     'spb_mag_proc' : panelWidgetData.mag_proc = event.value
2301,2302c2313,2314
<         WIDGET_CONTROL,widgetData.mag_pitch_base,GET_VALUE = set
<         widgetData.pitch_proc = 0
---
>         WIDGET_CONTROL,panelWidgetData.mag_pitch_base,GET_VALUE = set
>         panelWidgetData.pitch_proc = 0
2304c2316
<           widgetData.pitch_proc = widgetData.pitch_proc+2^i
---
>           panelWidgetData.pitch_proc = panelWidgetData.pitch_proc+2^i
2307,2308c2319,2320
<         widgetData.pitch_plot = event.value
<         papco_panel_Refresh, widgetData, /MAG_COORD
---
>         panelWidgetData.pitch_plot = event.value
>         papco_panel_Refresh, panelWidgetData, /MAG_COORD
2312,2313c2324,2325
<         widgetData.l_calc = event.value
<         papco_panel_Refresh, widgetData, /MAG_COORD
---
>         panelWidgetData.l_calc = event.value
>         papco_panel_Refresh, panelWidgetData, /MAG_COORD
2318c2330
<         widgetData.mag_coords = 0
---
>         panelWidgetData.mag_coords = 0
2320,2321c2332,2333
<           widgetData.mag_coords = widgetData.mag_coords+2^i
<         papco_panel_Refresh, widgetData, /MAG_COORD
---
>           panelWidgetData.mag_coords = panelWidgetData.mag_coords+2^i
>         papco_panel_Refresh, panelWidgetData, /MAG_COORD
2324c2336
<         widgetData.internal_model = event.index
---
>         panelWidgetData.internal_model = event.index
2327c2339
<         widgetData.external_model = event.index
---
>         panelWidgetData.external_model = event.index
2333,2334c2345,2346
<         widgetData.(idx(0)) = event.value * uval_str.vr + uval_str.v1
<         papco_panel_Refresh, widgetData, VAR_SEL = name
---
>         panelWidgetData.(idx(0)) = event.value * uval_str.vr + uval_str.v1
>         papco_panel_Refresh, panelWidgetData, VAR_SEL = name
2338,2339c2350,2351
<         widgetData.(idx(0)) = event.value * uval_str.vr + uval_str.v1
<         papco_panel_Refresh, widgetData, VAR_SEL = name
---
>         panelWidgetData.(idx(0)) = event.value * uval_str.vr + uval_str.v1
>         papco_panel_Refresh, panelWidgetData, VAR_SEL = name
2343,2344c2355,2356
<         widgetData.(idx(0)) = event.value
<         papco_panel_Refresh, widgetData, VAR_SEL = name
---
>         panelWidgetData.(idx(0)) = event.value
>         papco_panel_Refresh, panelWidgetData, VAR_SEL = name
2350,2351c2362,2363
<         widgetData.(idx(0)) = event.value * uval_str.vr + uval_str.v1
<         papco_panel_Refresh, widgetData, VAR_AVE = name
---
>         panelWidgetData.(idx(0)) = event.value * uval_str.vr + uval_str.v1
>         papco_panel_Refresh, panelWidgetData, VAR_AVE = name
2355,2356c2367,2368
<         widgetData.(idx(0)) = event.value * uval_str.vr + uval_str.v1
<         papco_panel_Refresh, widgetData, VAR_AVE = name
---
>         panelWidgetData.(idx(0)) = event.value * uval_str.vr + uval_str.v1
>         papco_panel_Refresh, panelWidgetData, VAR_AVE = name
2361,2362c2373,2374
<         widgetData.manualYScaling = event.value
<         papco_panel_Refresh, widgetData, /YSCALE
---
>         panelWidgetData.manualYScaling = event.value
>         papco_panel_Refresh, panelWidgetData, /YSCALE
2366,2367c2378,2379
<         widgetData.yLinLog = event.value
<         papco_panel_Refresh, widgetData, /YSCALE
---
>         panelWidgetData.yLinLog = event.value
>         papco_panel_Refresh, panelWidgetData, /YSCALE
2371c2383
<          widgetData.manualZScaling=100
---
>          panelWidgetData.manualZScaling=100
2373,2374c2385,2386
<          WIDGET_CONTROL, widgetData.ef_zscaleFrom, GET_VALUE=from
<          WIDGET_CONTROL, widgetData.ef_zscaleTo,   GET_VALUE=to
---
>          WIDGET_CONTROL, panelWidgetData.ef_zscaleFrom, GET_VALUE=from
>          WIDGET_CONTROL, panelWidgetData.ef_zscaleTo,   GET_VALUE=to
2377,2378c2389,2390
<          if (Min le 0) or (Max le 0) then widgetData.zLinLog=0
<          papco_panel_Refresh, widgetData, /ZSCALE
---
>          if (Min le 0) or (Max le 0) then panelWidgetData.zLinLog=0
>          papco_panel_Refresh, panelWidgetData, /ZSCALE
2382,2383c2394,2395
<       widgetData.manualZScaling=0
<       papco_panel_Refresh, widgetData, /ZSCALE
---
>       panelWidgetData.manualZScaling=0
>       papco_panel_Refresh, panelWidgetData, /ZSCALE
2389,2396c2401,2408
<          WIDGET_CONTROL, widgetData.ef_zscaleFrom, GET_VALUE=from
<          WIDGET_CONTROL, widgetData.ef_zscaleTo, GET_VALUE=to
<          widgetData.zscaleMin=FLOAT(from(0))
<          widgetData.zscaleMax=FLOAT(to(0))
<          if (widgetData.manualZScaling eq 1) then begin
<            if (widgetData.zscaleMin le 0) or $
<               (widgetData.zscaleMax le 0) then widgetData.zLinLog=0 $
<            else widgetData.zLinLog=1
---
>          WIDGET_CONTROL, panelWidgetData.ef_zscaleFrom, GET_VALUE=from
>          WIDGET_CONTROL, panelWidgetData.ef_zscaleTo, GET_VALUE=to
>          panelWidgetData.zscaleMin=FLOAT(from(0))
>          panelWidgetData.zscaleMax=FLOAT(to(0))
>          if (panelWidgetData.manualZScaling eq 1) then begin
>            if (panelWidgetData.zscaleMin le 0) or $
>               (panelWidgetData.zscaleMax le 0) then panelWidgetData.zLinLog=0 $
>            else panelWidgetData.zLinLog=1
2398c2410
<            widgetData.zLinLog=1
---
>            panelWidgetData.zLinLog=1
2400c2412
<          papco_panel_Refresh, widgetData, /ZSCALE
---
>          papco_panel_Refresh, panelWidgetData, /ZSCALE
2404,2405c2416,2417
<          widgetData.zLinLog=0
<          papco_panel_Refresh, widgetData, /ZSCALE
---
>          panelWidgetData.zLinLog=0
>          papco_panel_Refresh, panelWidgetData, /ZSCALE
2409,2411c2421,2423
<          done = 'Click to return to '+widgetData.panelKind+' panel editor'
<          xdisplayfile, papco_module_helpfile(widgetData.helpfile), $
<                        title=widgetData.panelKind+' - Online Help',$
---
>          done = 'Click to return to '+panelWidgetData.panelKind+' panel editor'
>          xdisplayfile, papco_module_helpfile(panelWidgetData.helpfile), $
>                        title=panelWidgetData.panelKind+' - Online Help',$
2423c2435
<         papco_data_cache_tool, widgetData.datacache, $
---
>         papco_data_cache_tool, panelWidgetData.datacache, $
2429c2441
<          widgetData.canceled=1
---
>          panelWidgetData.canceled=1
2433,2434c2445,2446
<         papco_panel_exit, widgetData
<         widgetData.canceled=0
---
>         papco_panel_exit, panelWidgetData
>         panelWidgetData.canceled=0
2439,2440c2451,2467
<         papco_panel_exit, widgetData
<         widgetData.canceled=2
---
>         papco_panel_exit, panelWidgetData
>         if ( panelWidgetData.fast_continue ) then begin
>             ;; note that panelWidgetData must have same tag names as plotInfoStruct
>             papco_SetPlotData, panelWidgetData, main_WidgetData.numberOfPlots
>             
>             n= main_widgetData.numberOfPlots
>             if n gt 0 then begin
>                 main_WidgetData.plotInfos(0:(n-1)).panelPosition= $
>                   main_WidgetData.plotInfos(0:(n-1)).panelPosition + $
>                   main_WidgetData.plotInfos(n).panelHeight
>                 main_WidgetData.plotInfos(n).panelPosition=0
>             ENDIF 
>             
>             main_WidgetData.numberOfPlots= main_WidgetData.numberOfPlots+1
>             papco_refresh, /LIST
>         endif else begin
>             panelWidgetData.canceled=2
2441a2469
>         endelse
2445,2447c2473,2475
<       widgetData.panelHeight=event.value
<       WIDGET_CONTROL, widgetData.sl_label, $
<         SET_VALUE=varprt(widgetData.panelHeight)
---
>       panelWidgetData.panelHeight=event.value
>       WIDGET_CONTROL, panelWidgetData.sl_label, $
>         SET_VALUE=varprt(panelWidgetData.panelHeight)
2451,2452c2479,2480
<         widgetData.ps_selectColor = event.value
<         papco_panel_Refresh, widgetData, /SELECT_PLOT_STYLE
---
>         panelWidgetData.ps_selectColor = event.value
>         papco_panel_Refresh, panelWidgetData, /SELECT_PLOT_STYLE
2456,2457c2484,2485
<         widgetData.PSYM = event.value
<         papco_panel_Refresh, widgetData, /PLOT_STYLE
---
>         panelWidgetData.PSYM = event.value
>         papco_panel_Refresh, panelWidgetData, /PLOT_STYLE
2461,2462c2489,2490
<         widgetData.THICK = event.value
<         papco_panel_Refresh, widgetData, /PLOT_STYLE
---
>         panelWidgetData.THICK = event.value
>         papco_panel_Refresh, panelWidgetData, /PLOT_STYLE
2466,2467c2494,2495
<         widgetData.LINESTYLE = event.value
<         papco_panel_Refresh, widgetData, /PLOT_STYLE
---
>         panelWidgetData.LINESTYLE = event.value
>         papco_panel_Refresh, panelWidgetData, /PLOT_STYLE
2471,2472c2499,2500
<         widgetData.SYMSIZE = event.value
<         papco_panel_Refresh, widgetData, /PLOT_STYLE
---
>         panelWidgetData.SYMSIZE = event.value
>         papco_panel_Refresh, panelWidgetData, /PLOT_STYLE
2476,2477c2504,2505
<         geom=widget_info(widgetData.dw_plotColor, /geometry)
<         n=widgetData.ps_numberOfColors
---
>         geom=widget_info(panelWidgetData.dw_plotColor, /geometry)
>         n=panelWidgetData.ps_numberOfColors
2479,2480c2507,2508
<         widgetData.COLOR=event.x/width
<         papco_panel_Refresh, widgetData, /PLOT_STYLE
---
>         panelWidgetData.COLOR=event.x/width
>         papco_panel_Refresh, panelWidgetData, /PLOT_STYLE
2484,2486c2512,2514
<       if papco_hasdir(widgetData.path) then begin
<         fname=dialog_pickfile(GROUP=widgetData.base, GET_PATH=getpath, $
<                               _EXTRA = widgetData.extra)
---
>       if papco_hasdir(panelWidgetData.path) then begin
>         fname=dialog_pickfile(GROUP=panelWidgetData.base, GET_PATH=getpath, $
>                               _EXTRA = panelWidgetData.extra)
2488c2516
<         if fname eq '' then return, widgetData
---
>         if fname eq '' then return, panelWidgetData
2491,2494c2519,2522
<         widgetData.path=getpath
<         widgetData.extra.path = getpath
<         WIDGET_CONTROL,widgetData.direc_text, SET_VALUE=getpath
<         WIDGET_CONTROL,widgetData.direc_text, SET_TEXT_SELECT=[strlen(getpath)]
---
>         panelWidgetData.path=getpath
>         panelWidgetData.extra.path = getpath
>         WIDGET_CONTROL,panelWidgetData.direc_text, SET_VALUE=getpath
>         WIDGET_CONTROL,panelWidgetData.direc_text, SET_TEXT_SELECT=[strlen(getpath)]
2496c2524
<         if file eq '' then return, widgetData
---
>         if file eq '' then return, panelWidgetData
2500,2501c2528,2529
<         IF keyword_set(widgetData.extra.FILTER) THEN BEGIN
<             filter = widgetData.extra.FILTER
---
>         IF keyword_set(panelWidgetData.extra.FILTER) THEN BEGIN
>             filter = panelWidgetData.extra.FILTER
2506,2511c2534,2539
<         widgetData.filename=file+'.'+ext
<         WIDGET_CONTROL,widgetData.name_text, SET_VALUE=widgetData.filename
<         WIDGET_CONTROL,widgetData.name_text, $
<           SET_TEXT_SELECT=[strlen(widgetData.filename)]
<         widgetData.status=1
<         papco_panel_Refresh, widgetData, /ADD_FILE
---
>         panelWidgetData.filename=file+'.'+ext
>         WIDGET_CONTROL,panelWidgetData.name_text, SET_VALUE=panelWidgetData.filename
>         WIDGET_CONTROL,panelWidgetData.name_text, $
>           SET_TEXT_SELECT=[strlen(panelWidgetData.filename)]
>         panelWidgetData.status=1
>         papco_panel_Refresh, panelWidgetData, /ADD_FILE
2513,2515c2541,2543
<         widgetData.status=2
<         papco_panel_Refresh, widgetData, /ADD_FILE
<         return, widgetData
---
>         panelWidgetData.status=2
>         papco_panel_Refresh, panelWidgetData, /ADD_FILE
>         return, panelWidgetData
2520,2521c2548,2549
<         WIDGET_CONTROL, widgetData.direc_text, GET_VALUE=path & path=path(0)
<         WIDGET_CONTROL, widgetData.name_text, GET_VALUE=name & name=name(0)
---
>         WIDGET_CONTROL, panelWidgetData.direc_text, GET_VALUE=path & path=path(0)
>         WIDGET_CONTROL, panelWidgetData.name_text, GET_VALUE=name & name=name(0)
2526,2529c2554,2557
<             widgetData.filename = ''
<             WIDGET_CONTROL, widgetData.name_text, SET_VALUE=''
<             widgetData.status=0
<             papco_panel_Refresh, widgetData, /ADD_FILE
---
>             panelWidgetData.filename = ''
>             WIDGET_CONTROL, panelWidgetData.name_text, SET_VALUE=''
>             panelWidgetData.status=0
>             papco_panel_Refresh, panelWidgetData, /ADD_FILE
2536c2564
<         WIDGET_CONTROL, widgetData.direc_text, GET_VALUE=path & path=path(0)
---
>         WIDGET_CONTROL, panelWidgetData.direc_text, GET_VALUE=path & path=path(0)
2543,2547c2571,2575
<             WIDGET_CONTROL, widgetData.direc_text, SET_VALUE=path
<             widgetData.path=path
<             widgetData.extra.path = path
<             widgetData.status=3
<             papco_panel_Refresh, widgetData, /ADD_FILE
---
>             WIDGET_CONTROL, panelWidgetData.direc_text, SET_VALUE=path
>             panelWidgetData.path=path
>             panelWidgetData.extra.path = path
>             panelWidgetData.status=3
>             papco_panel_Refresh, panelWidgetData, /ADD_FILE
2554c2582
<         WIDGET_CONTROL, widgetData.direc_text, GET_VALUE=path & path=path(0)
---
>         WIDGET_CONTROL, panelWidgetData.direc_text, GET_VALUE=path & path=path(0)
2559,2561c2587,2589
<             WIDGET_CONTROL, widgetData.direc_text, SET_VALUE=path
<             widgetData.path=path
<             widgetData.extra.path = path
---
>             WIDGET_CONTROL, panelWidgetData.direc_text, SET_VALUE=path
>             panelWidgetData.path=path
>             panelWidgetData.extra.path = path
2563,2564c2591,2592
<             widgetData.status=3
<             papco_panel_Refresh, widgetData, /ADD_FILE
---
>             panelWidgetData.status=3
>             papco_panel_Refresh, panelWidgetData, /ADD_FILE
2570c2598
<         WIDGET_CONTROL, widgetData.direc_text, GET_VALUE=path & path=path(0)
---
>         WIDGET_CONTROL, panelWidgetData.direc_text, GET_VALUE=path & path=path(0)
2572c2600
<           widgetData.status=2 & papco_panel_Refresh, widgetData, /ADD_FILE
---
>           panelWidgetData.status=2 & papco_panel_Refresh, panelWidgetData, /ADD_FILE
2575c2603
<               widgetData.status=3 & papco_panel_Refresh, widgetData, /ADD_FILE
---
>               panelWidgetData.status=3 & papco_panel_Refresh, panelWidgetData, /ADD_FILE
2578c2606
<         WIDGET_CONTROL, widgetData.name_text, GET_VALUE=name & name=name(0)
---
>         WIDGET_CONTROL, panelWidgetData.name_text, GET_VALUE=name & name=name(0)
2580c2608
<             widgetData.status=4 & papco_panel_Refresh, widgetData, /ADD_FILE
---
>             panelWidgetData.status=4 & papco_panel_Refresh, panelWidgetData, /ADD_FILE
2587,2588c2615,2616
<         IF keyword_set(widgetData.extra.FILTER) THEN BEGIN
<             filter = widgetData.extra.FILTER
---
>         IF keyword_set(panelWidgetData.extra.FILTER) THEN BEGIN
>             filter = panelWidgetData.extra.FILTER
2592c2620
<             WIDGET_CONTROL, widgetData.name_text, SET_VALUE = name
---
>             WIDGET_CONTROL, panelWidgetData.name_text, SET_VALUE = name
2598c2626
<             widgetData.status = 0 & papco_panel_Refresh, widgetData, /ADD_FILE
---
>             panelWidgetData.status = 0 & papco_panel_Refresh, panelWidgetData, /ADD_FILE
2600c2628
<             widgetData.status = 1 & papco_panel_Refresh, widgetData, /ADD_FILE
---
>             panelWidgetData.status = 1 & papco_panel_Refresh, panelWidgetData, /ADD_FILE
2602,2604c2630,2632
<         widgetData.path=path
<         widgetData.filename=name
<         widgetData.extra.path = path
---
>         panelWidgetData.path=path
>         panelWidgetData.filename=name
>         panelWidgetData.extra.path = path
2608,2609c2636,2637
<       papco_panel_AddFile_EditFile, widgetData
<       papco_panel_Refresh, widgetData, /ADD_FILE
---
>       papco_panel_AddFile_EditFile, panelWidgetData
>       papco_panel_Refresh, panelWidgetData, /ADD_FILE
2613c2641
<       widgetData.dataUnits=event.value
---
>       panelWidgetData.dataUnits=event.value
2617,2618c2645,2646
<         widgetData.descr_type=event.value
<         papco_panel_Refresh, widgetData, /DESCR
---
>         panelWidgetData.descr_type=event.value
>         papco_panel_Refresh, panelWidgetData, /DESCR
2622,2623c2650,2651
<       widgetData.descr=event.value
<       papco_panel_Refresh, widgetData, /DESCR
---
>       panelWidgetData.descr=event.value
>       papco_panel_Refresh, panelWidgetData, /DESCR
2626c2654
<     'ef_ext_desc': widgetData.descr_extend=event.value
---
>     'ef_ext_desc': panelWidgetData.descr_extend=event.value
2629,2630c2657,2658
<       widgetData.ylbl=event.value
<       papco_panel_Refresh, widgetData, /DESCR
---
>       panelWidgetData.ylbl=event.value
>       papco_panel_Refresh, panelWidgetData, /DESCR
2633c2661
<     'ef_ext_ylbl': widgetData.ylbl_extend=event.value
---
>     'ef_ext_ylbl': panelWidgetData.ylbl_extend=event.value
2636,2637c2664,2665
<       widgetData.zlbl=event.value
<       papco_panel_Refresh, widgetData, /DESCR
---
>       panelWidgetData.zlbl=event.value
>       papco_panel_Refresh, panelWidgetData, /DESCR
2641c2669
<     'spb_nogap' : widgetData.nogap = event.select
---
>     'spb_nogap' : panelWidgetData.nogap = event.select
2644c2672
<         widgetData.ba_option=event.value
---
>         panelWidgetData.ba_option=event.value
2648c2676
<         widgetData.ba_force = event.select
---
>         panelWidgetData.ba_force = event.select
2652c2680
<       widgetData.ba_from = event.value
---
>       panelWidgetData.ba_from = event.value
2658,2663c2686,2691
<       redo = widgetData.ba_option
<       force = widgetData.ba_force
<       proc_call=widgetData.make_batch_call
<       panelkind=widgetData.panelkind
<       IF widgetData.ba_from NE '' THEN from = widgetData.ba_from ELSE from = 0
<       if main_widgetData.default_trap eq 1 then $ ;see if error trapping is on
---
>       redo = panelWidgetData.ba_option
>       force = panelWidgetData.ba_force
>       proc_call=panelWidgetData.make_batch_call
>       panelkind=panelWidgetData.panelkind
>       IF panelWidgetData.ba_from NE '' THEN from = panelWidgetData.ba_from ELSE from = 0
>       if main_widgetData.default.trap eq 1 then $ ;see if error trapping is on
2671c2699
<       CALL_PROCEDURE, proc_call, widgetData, batch_times, filename,  $
---
>       CALL_PROCEDURE, proc_call, panelWidgetData, batch_times, filename,  $
2675c2703
<       main_widgetData.BATCHFILENAME=filename
---
>       main_WidgetData.BATCHFILENAME=filename
2688c2716
< return, widgetData
---
> return, panelWidgetData
Index: papco_plotedit.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_plotedit.pro,v
retrieving revision 1.5
diff -B -b -r1.5 papco_plotedit.pro
213c213
<                             GROUP=widgetData.main_base)
---
>                             GROUP=widgetData.gui.main_base)
263c263
<                           GROUP=widgetData.main_base, $
---
>                           GROUP=widgetData.gui.main_base, $
282c282
<                               GROUP=widgetData.main_base, $
---
>                               GROUP=widgetData.gui.main_base, $
295c295
<                             GROUP=widgetData.main_base)
---
>                             GROUP=widgetData.gui.main_base)
315c315
< CASE widgetData.edit_choice OF
---
> CASE widgetData.gui.edit_choice OF
423c423
<       widget_control, widgetData.lb_plotInfos, set_list_select=-1
---
>       widget_control, widgetData.gui.lb_plotInfos, set_list_select=-1
425,426c425,426
<         widget_control, widgetData.edit_buttons(i), sensitive=0
<     widget_control, widgetData.pb_overPlot, set_button=0
---
>         widget_control, widgetData.gui.edit_buttons(i), sensitive=0
>     widget_control, widgetData.gui.pb_overPlot, set_button=0
539c539
<                               GROUP=widgetData.main_base, $
---
>                               GROUP=widgetData.gui.main_base, $
559c559
<                                   GROUP=widgetData.main_base, $
---
>                                   GROUP=widgetData.gui.main_base, $
572c572
<                                 GROUP=widgetData.main_base, $
---
>                                 GROUP=widgetData.gui.main_base, $
577c577
<                                 GROUP=widgetData.main_base)
---
>                                 GROUP=widgetData.gui.main_base)
Index: papco_printer.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_printer.pro,v
retrieving revision 1.6
diff -B -b -r1.6 papco_printer.pro
168,169c168
<       WIDGET_CONTROL, widgetData.ef_orbit, GET_VALUE=orbNr
<       orbNr=long(orbNr(0))
---
>       orbNr=widgetData.orbitNumber
250c248
<   COMMON PAPCO_SELECTPRINTER, widgetData
---
>   COMMON PAPCO_SELECTPRINTER, selectWidgetData
257c255
<     WIDGET_CONTROL, widgetData.ef_FileName_tmpl, GET_VALUE=tmpl
---
>     WIDGET_CONTROL, selectWidgetData.ef_FileName_tmpl, GET_VALUE=tmpl
260c258
<     case widgetData.fileType of
---
>     case selectWidgetData.fileType of
271,272c269,270
<     WIDGET_CONTROL, widgetData.ef_FileName_tmpl, SET_VALUE=dir+file+ext
<     widgetData.fileName_tmpl=dir+file+ext
---
>     WIDGET_CONTROL, selectWidgetData.ef_FileName_tmpl, SET_VALUE=dir+file+ext
>     selectWidgetData.fileName_tmpl=dir+file+ext
276c274
<   IF widgetData.selectDefault THEN BEGIN
---
>   IF selectWidgetData.selectDefault THEN BEGIN
278c276
<     WIDGET_CONTROL, widgetData.destination, SENSITIVE=0
---
>     WIDGET_CONTROL, selectWidgetData.destination, SENSITIVE=0
280,281c278,279
<     WIDGET_CONTROL, widgetData.printer_select, SENSITIVE=1
<     WIDGET_CONTROL, widgetData.file_select, SENSITIVE=1
---
>     WIDGET_CONTROL, selectWidgetData.printer_select, SENSITIVE=1
>     WIDGET_CONTROL, selectWidgetData.file_select, SENSITIVE=1
283,287c281,285
<     IF NOT widgetData.askForFileName THEN BEGIN
<       WIDGET_CONTROL, widgetData.file_name_select, SENSITIVE=1
<       WIDGET_CONTROL, widgetData.ef_fileName_tmpl, $
< 		SET_VALUE=widgetData.fileName_tmpl
<     ENDIF ELSE WIDGET_CONTROL, widgetData.file_name_select, SENSITIVE=0
---
>     IF NOT selectWidgetData.askForFileName THEN BEGIN
>       WIDGET_CONTROL, selectWidgetData.file_name_select, SENSITIVE=1
>       WIDGET_CONTROL, selectWidgetData.ef_fileName_tmpl, $
> 		SET_VALUE=selectWidgetData.fileName_tmpl
>     ENDIF ELSE WIDGET_CONTROL, selectWidgetData.file_name_select, SENSITIVE=0
290c288
<     WIDGET_CONTROL, widgetData.destination, SENSITIVE=1
---
>     WIDGET_CONTROL, selectWidgetData.destination, SENSITIVE=1
292,295c290,293
<     IF widgetData.usePrinter THEN BEGIN
<       IF NOT widgetData.selectDefault THEN BEGIN
<         WIDGET_CONTROL, widgetData.printer_select, SENSITIVE=1
<         WIDGET_CONTROL, widgetData.file_select, SENSITIVE=0
---
>     IF selectWidgetData.usePrinter THEN BEGIN
>       IF NOT selectWidgetData.selectDefault THEN BEGIN
>         WIDGET_CONTROL, selectWidgetData.printer_select, SENSITIVE=1
>         WIDGET_CONTROL, selectWidgetData.file_select, SENSITIVE=0
298,299c296,297
<       WIDGET_CONTROL, widgetData.printer_select, SENSITIVE=0
<       WIDGET_CONTROL, widgetData.file_select, SENSITIVE=1
---
>       WIDGET_CONTROL, selectWidgetData.printer_select, SENSITIVE=0
>       WIDGET_CONTROL, selectWidgetData.file_select, SENSITIVE=1
301,305c299,303
<       IF NOT widgetData.askForFileName THEN BEGIN
<         WIDGET_CONTROL, widgetData.file_name_select, SENSITIVE=1
<         WIDGET_CONTROL, widgetData.ef_fileName_tmpl, $
<           SET_VALUE=widgetData.fileName_tmpl
<       ENDIF ELSE WIDGET_CONTROL, widgetData.file_name_select, SENSITIVE=0
---
>       IF NOT selectWidgetData.askForFileName THEN BEGIN
>         WIDGET_CONTROL, selectWidgetData.file_name_select, SENSITIVE=1
>         WIDGET_CONTROL, selectWidgetData.ef_fileName_tmpl, $
>           SET_VALUE=selectWidgetData.fileName_tmpl
>       ENDIF ELSE WIDGET_CONTROL, selectWidgetData.file_name_select, SENSITIVE=0
332,333c330,331
<   common papco_selectprinter, widgetdata
<   common plot_composer, mainwidgetdata
---
>   common papco_selectprinter, selectWidgetData
>   common plot_composer, widgetData
340,342c338,340
<         if x(0) eq 1 then widgetData.fileType=0
<         if x(1) eq 1 then widgetData.fileType=1
<         if (x(0) eq 1) AND (x(1) eq 1) then widgetData.fileType=2
---
>         if x(0) eq 1 then selectWidgetData.fileType=0
>         if x(1) eq 1 then selectWidgetData.fileType=1
>         if (x(0) eq 1) AND (x(1) eq 1) then selectWidgetData.fileType=2
347c345
<         widgetData.usePrinter=x
---
>         selectWidgetData.usePrinter=x
352c350
<         widgetData.printer=x
---
>         selectWidgetData.printer=x
359c357
<         widgetData.askForFileName=x
---
>         selectWidgetData.askForFileName=x
363c361
<         xdisplayfile,papco_helpfile(widgetData.helpfile), $
---
>         xdisplayfile,papco_helpfile(selectWidgetData.helpfile), $
367c365
<         widgetData.canceled=1
---
>         selectWidgetData.canceled=1
371,374c369,372
<         WIDGET_CONTROL, widgetData.ef_FileName_tmpl, GET_VALUE=tmpl
<         widgetData.fileName_tmpl=tmpl(0)
<         mainwidgetData.printerInfo.fileName_tmpl=tmpl(0)
<         WIDGET_CONTROL, widgetData.ef_FileName_dir, GET_VALUE=tmpl
---
>         WIDGET_CONTROL, selectWidgetData.ef_FileName_tmpl, GET_VALUE=tmpl
>         selectWidgetData.fileName_tmpl=tmpl(0)
>         widgetData.printerInfo.fileName_tmpl=tmpl(0)
>         WIDGET_CONTROL, selectWidgetData.ef_FileName_dir, GET_VALUE=tmpl
381c379
<         mainWidgetData.outputFilePath=dir
---
>         widgetData.outputFilePath=dir
383,387c381,385
<         mainWidgetData.PrintName= $
<           papco_checkdirname(mainWidgetData.outputFilePath) + $
<           widgetData.fileName_tmpl
<         widgetData.canceled=0
<         if widgetData.selectDefault eq 1 then papco_writeDefaultSettings
---
>         widgetData.PrintName= $
>           papco_checkdirname(widgetData.outputFilePath) + $
>           selectWidgetData.fileName_tmpl
>         selectWidgetData.canceled=0
>         if selectWidgetData.selectDefault eq 1 then papco_writeDefaultSettings
397,398c395,396
<         mainWidgetData.outputFilePath=dir
<         WIDGET_CONTROL, widgetData.ef_FileName_dir, SET_VALUE=dir
---
>         widgetData.outputFilePath=dir
>         WIDGET_CONTROL, selectWidgetData.ef_FileName_dir, SET_VALUE=dir
401c399
<        fname=dialog_PICKFILE( /READ, /directory, GROUP=widgetdata.base, $
---
>        fname=dialog_PICKFILE( /READ, /directory, GROUP=selectWidgetData.base, $
404c402
<                       PATH=mainWidgetData.outputFilePath, $
---
>                       PATH=widgetData.outputFilePath, $
407,408c405,406
<        mainWidgetData.outputFilePath=getpath
<        WIDGET_CONTROL, widgetData.ef_FileName_dir, SET_VALUE=getpath
---
>        widgetData.outputFilePath=getpath
>        WIDGET_CONTROL, selectWidgetData.ef_FileName_dir, SET_VALUE=getpath
499,500c497,498
<   COMMON PAPCO_SELECTPRINTER, widgetData
<   COMMON PLOT_COMPOSER, mainWidgetData
---
>   COMMON PAPCO_SELECTPRINTER, selectWidgetData
>   COMMON PLOT_COMPOSER, widgetData
545c543
<       x= widget_text( base, /wrap, ysize=3, $
---
>       x= widget_text( base, /align_left, /wrap, ysize=3, xsize=80, $
550c548
<                              os_printer ] )
---
>                              os_printer+'.  Do not use the printer''s landscape setting, instead select landscape under defaults' ] )
576c574
<   WIDGET_CONTROL, ef_FileName_dir, SET_VALUE=mainWidgetData.outputFilePath
---
>   WIDGET_CONTROL, ef_FileName_dir, SET_VALUE=widgetData.outputFilePath
583c581
<     SET_VALUE=mainWidgetData.printerinfo.fileName_tmpl
---
>     SET_VALUE=widgetData.printerinfo.fileName_tmpl
594c592
<   widgetData={PAPCO_SELECTPRINTER_8, $
---
>   selectWidgetData={PAPCO_SELECTPRINTER_8, $
615c613
<   RETURN, widgetData
---
>   RETURN, selectWidgetData
Index: papco.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco.pro,v
retrieving revision 1.9
diff -B -b -r1.9 papco.pro
145a146
> help, /str, !error_state
340c341
< default_print_choice=widgetdata.default_print_choice
---
> default_print_choice=widgetdata.default.print_choice
357c358
<                                GROUP=widgetdata.main_Base)
---
>                                GROUP=widgetData.gui.main_base)
385c386
<                    GROUP=widgetdata.main_base, $
---
>                    GROUP=widgetData.gui.main_base, $
455c456
<       if widgetdata.default_trap eq 1 then catch, error_status $
---
>       if widgetdata.default.trap eq 1 then catch, error_status $
469c470
<       WIDGET_CONTROL, widgetdata.pb_overPlot, set_button=0
---
>       WIDGET_CONTROL, widgetdata.gui.pb_overPlot, set_button=0
487c488
<         WIDGET_CONTROL, widgetdata.ef_startTime, GET_VALUE=val
---
>         WIDGET_CONTROL, widgetdata.gui.ef_startTime, GET_VALUE=val
507c508
<         WIDGET_CONTROL, widgetdata.ef_endTime, GET_VALUE=val
---
>         WIDGET_CONTROL, widgetdata.gui.ef_endTime, GET_VALUE=val
532c533
<            WIDGET_CONTROL, widgetdata.ef_orbit, get_value=this_orbit
---
>            WIDGET_CONTROL, widgetdata.gui.ef_orbit, get_value=this_orbit
535c536
<            WIDGET_CONTROL, widgetdata.ef_orbit, set_value=new_orbit
---
>            WIDGET_CONTROL, widgetdata.gui.ef_orbit, set_value=new_orbit
539,540c540,541
<            WIDGET_CONTROL, widgetdata.ef_minTime, GET_VALUE=startTime
<            WIDGET_CONTROL, widgetdata.ef_maxTime, GET_VALUE=endTime
---
>            WIDGET_CONTROL, widgetdata.gui.ef_minTime, GET_VALUE=startTime
>            WIDGET_CONTROL, widgetdata.gui.ef_maxTime, GET_VALUE=endTime
548,549c549,550
<            WIDGET_CONTROL, widgetdata.ef_minTime, SET_VALUE=newStartTime
<            WIDGET_CONTROL, widgetdata.ef_maxTime, SET_VALUE=newEndTime
---
>            WIDGET_CONTROL, widgetdata.gui.ef_minTime, SET_VALUE=newStartTime
>            WIDGET_CONTROL, widgetdata.gui.ef_maxTime, SET_VALUE=newEndTime
559c560
<        if widgetdata.default_draw_on_step then $
---
>        if widgetdata.default.draw_on_step then $
565c566
<          (widgetdata.time_choice_action eq 3): begin        ; from batch
---
>          (widgetData.time_choice_action eq 3): begin        ; from batch
569,570c570,571
<          (widgetdata.time_choice_action eq 1): begin        ; by orbit
<            WIDGET_CONTROL, widgetdata.ef_orbit, get_value=this_orbit
---
>          (widgetData.time_choice_action eq 1): begin        ; by orbit
>            WIDGET_CONTROL, widgetdata.gui.ef_orbit, get_value=this_orbit
573c574
<            WIDGET_CONTROL, widgetdata.ef_orbit, set_value=new_orbit
---
>            WIDGET_CONTROL, widgetdata.gui.ef_orbit, set_value=new_orbit
575,578c576,579
<          (widgetdata.time_choice_action eq 0) or $
<            (widgetdata.time_choice_action eq 2): begin ; manual / day
<            WIDGET_CONTROL, widgetdata.ef_minTime, GET_VALUE=startTime
<            WIDGET_CONTROL, widgetdata.ef_maxTime, GET_VALUE=endTime
---
>          (widgetData.time_choice_action eq 0) or $
>            (widgetData.time_choice_action eq 2): begin ; manual / day
>            WIDGET_CONTROL, widgetdata.gui.ef_minTime, GET_VALUE=startTime
>            WIDGET_CONTROL, widgetdata.gui.ef_maxTime, GET_VALUE=endTime
586,587c587,588
<            WIDGET_CONTROL, widgetdata.ef_minTime, SET_VALUE=newStartTime
<            WIDGET_CONTROL, widgetdata.ef_maxTime, SET_VALUE=newEndTime
---
>            WIDGET_CONTROL, widgetdata.gui.ef_minTime, SET_VALUE=newStartTime
>            WIDGET_CONTROL, widgetdata.gui.ef_maxTime, SET_VALUE=newEndTime
597c598
<        if widgetdata.default_draw_on_step then $
---
>        if widgetdata.default.draw_on_step then $
609c610
<          if widgetdata.default_adjust_time ne 0 then papco_time_adjust
---
>          if widgetdata.default.adjust_time ne 0 then papco_time_adjust
615,620c616,621
<         WIDGET_CONTROL,widgetdata.ef_orbit,SENSITIVE=0
<         WIDGET_CONTROL,widgetdata.pb_orbitSelect,SENSITIVE=0
<         widgetdata.default_satellite=Event.Value-1
<         sat_label=missions(widgetdata.default_satellite)
<         WIDGET_CONTROL,widgetdata.ef_orbit,SENSITIVE=1
<         WIDGET_CONTROL,widgetdata.pb_orbitSelect,SENSITIVE=1
---
>         WIDGET_CONTROL,widgetdata.gui.ef_orbit,SENSITIVE=0
>         WIDGET_CONTROL,widgetdata.gui.pb_orbitSelect,SENSITIVE=0
>         widgetdata.default.satellite=Event.Value-1
>         sat_label=missions(widgetdata.default.satellite)
>         WIDGET_CONTROL,widgetdata.gui.ef_orbit,SENSITIVE=1
>         WIDGET_CONTROL,widgetdata.gui.pb_orbitSelect,SENSITIVE=1
622,624c623,626
<         WIDGET_CONTROL, widgetdata.label_satellite, SET_VALUE=sat_label
<         widget_control, widgetdata.ef_orbit, set_value=0
<         widgetdata.default_orbitInfo.number=0
---
>         WIDGET_CONTROL, widgetdata.gui.label_satellite, SET_VALUE=sat_label
>         widget_control, widgetdata.gui.ef_orbit, set_value=0
>         widgetData.orbitNumber= 0
>         widgetdata.default.orbitInfo.number=0
630c632
<                            GROUP=widgetdata.main_Base
---
>                            GROUP=widgetdata.gui.main_Base
666c668
<            papco_select_from_batch, fln, GROUP=widgetdata.base
---
>            papco_select_from_batch, fln, GROUP=widgetData.gui.base
671c673
<        widget_control,widgetdata.label_batch_name, $
---
>        widget_control,widgetdata.gui.label_batch_name, $
673c675
<        widget_control,widgetdata.label_batch_time, $
---
>        widget_control,widgetdata.gui.label_batch_time, $
681c683
<        widget_control,widgetdata.label_batch_time, set_value=time_str
---
>        widget_control,widgetdata.gui.label_batch_time, set_value=time_str
689c691
<        widget_control,widgetdata.label_batch_time, set_value=time_str
---
>        widget_control,widgetdata.gui.label_batch_time, set_value=time_str
696c698
<        papco_select_from_batch, fln, GROUP=widgetdata.base
---
>        papco_select_from_batch, fln, GROUP=widgetData.gui.base
710,711c712,713
<           if widgetdata.default_orbitInfo.number ne 0 then $
<             orb_str=strtrim(string(widgetdata.default_orbitInfo.number),2)+', '
---
>           if widgetdata.default.orbitInfo.number ne 0 then $
>             orb_str=strtrim(string(widgetdata.default.orbitInfo.number),2)+', '
713c715
<                                          COUNTRY=widgetdata.default_us_europe)
---
>                                          COUNTRY=widgetdata.default.us_europe)
715c717
<                                        COUNTRY=widgetdata.default_us_europe)
---
>                                        COUNTRY=widgetdata.default.us_europe)
718c720
<           if widgetdata.time_choice_action EQ 0 then orb_str=''
---
>           if widgetData.time_choice_action EQ 0 then orb_str=''
731c733
<         n_slice=n_elements(widgetdata.mouseAction)
---
>         n_slice=n_elements(widgetData.gui.mouseAction)
733,735c735,737
<           slice_set=widgetdata.default_multiple_slice(0:n_slice-3)
<           result=papco_multiple_slice(widgetdata.mouseAction,slice_set )
<           widgetdata.default_multiple_slice(0:n_slice-3)=result
---
>           slice_set=widgetdata.default.multiple_slice(0:n_slice-3)
>           result=papco_multiple_slice(widgetData.gui.mouseAction,slice_set )
>           widgetdata.default.multiple_slice(0:n_slice-3)=result
741c743
<         widgetdata.slice_choice=Event.Value
---
>          widgetdata.gui.slice_choice=Event.Value
750c752
<             GROUP=widgetdata.main_Base, /SELECT_DEFAULT)
---
>             GROUP=widgetData.gui.main_base, /SELECT_DEFAULT)
759c761
<          choice=widgetdata.default_print_choice
---
>          choice=widgetdata.default.print_choice
762c764
<        widgetdata.default_print_choice=choice
---
>        widgetdata.default.print_choice=choice
768c770
<        widgetdata.edit_choice=Event.Value
---
>         widgetdata.gui.edit_choice=Event.Value
778,782c780,784
<            widget_control, widgetdata.lb_plotInfos, set_list_select=-1
<            for i=0, n_elements(widgetdata.edit_buttons)-1 do $
<              widget_control, widgetdata.edit_buttons(i), sensitive=0
<            widget_control, widgetdata.pb_overPlot, set_button=0
<            widget_control, widgetdata.pb_anchored, set_button=0
---
>            widget_control, widgetdata.gui.lb_plotInfos, set_list_select=-1
>            for i=0, n_elements(widgetdata.gui.edit_buttons)-1 do $
>              widget_control, widgetdata.gui.edit_buttons(i), sensitive=0
>            widget_control, widgetdata.gui.pb_overPlot, set_button=0
>            widget_control, widgetdata.gui.pb_anchored, set_button=0
784,786c786,788
<            for i=0, n_elements(widgetdata.edit_buttons)-1 do $
<              widget_control, widgetdata.edit_buttons(i), sensitive=1
<            widget_control, widgetdata.pb_overplot, $
---
>            for i=0, n_elements(widgetdata.gui.edit_buttons)-1 do $
>              widget_control, widgetdata.gui.edit_buttons(i), sensitive=1
>            widget_control, widgetdata.gui.pb_overplot, $
788c790
<            widget_control, widgetdata.pb_anchored, $
---
>            widget_control, widgetdata.gui.pb_anchored, $
889c891
<           widget_control, widgetdata.pb_overplot, $
---
>           widget_control, widgetdata.gui.pb_overplot, $
893c895
<          widget_control, widgetdata.pb_overplot, set_button=1, sensitive=0
---
>          widget_control, widgetdata.gui.pb_overplot, set_button=1, sensitive=0
902c904
<           widget_control, widgetdata.pb_anchored, $
---
>           widget_control, widgetdata.gui.pb_anchored, $
909,910c911,912
<     'spb_draw_on_step':  if widgetdata.default_draw_on_step then $
<        widgetdata.default_draw_on_step=0 else widgetdata.default_draw_on_step=1
---
>     'spb_draw_on_step':  if widgetdata.default.draw_on_step then $
>        widgetdata.default.draw_on_step=0 else widgetdata.default.draw_on_step=1
923,924c925,926
<             widget_control, widgetdata.pb_draw_new, sensitive=1
<             widget_control, widgetdata.pb_annotate, sensitive=1
---
>             widget_control, widgetdata.gui.pb_draw_new, sensitive=1
>             widget_control, widgetdata.gui.pb_annotate, sensitive=1
926,927c928,929
<               widget_control, widgetdata.pb_rm_annot, sensitive=1 else $
<               widget_control, widgetdata.pb_rm_annot, sensitive=0
---
>               widget_control, widgetdata.gui.pb_rm_annot, sensitive=1 else $
>               widget_control, widgetdata.gui.pb_rm_annot, sensitive=0
934,935c936,937
<        if widgetdata.dw_draw ne 0 then begin  ;desensitise old window
<          widget_control,widgetdata.dw_draw, sensitive=0
---
>        if widgetdata.gui.dw_draw ne 0 then begin  ;desensitise old window
>          widget_control,widgetdata.gui.dw_draw, sensitive=0
953c955
<        ;dosable draw window events (they get buffered and fire up the
---
>        ;disable draw window events (they get buffered and fire up the
955c957
<        dw_Draw=widgetdata.dw_Draw
---
>        dw_Draw=widgetdata.gui.dw_Draw
964,965c966,967
<          TV,papco_drawn_window
<          annotate, COLOR_INDICES=fixed_color, $
---
>          TV,papco_drawn_window, true=widgetData.truecolor
>          papco_annotate, COLOR_INDICES=fixed_color, $
967c969
<        endif else annotate, COLOR_INDICES=fixed_color
---
>        endif else papco_annotate, COLOR_INDICES=fixed_color
979,980c981,982
<            TV,papco_drawn_window
<          widget_control, widgetdata.pb_rm_annot, sensitive=0
---
>            TV,papco_drawn_window, true=widgetData.truecolor
>          widget_control, widgetdata.gui.pb_rm_annot, sensitive=0
1013c1015
<        papco_reconfigure, GROUP_LEADER=widgetdata.base
---
>        papco_reconfigure, GROUP_LEADER=widgetData.gui.base
1026c1028
<        if widgetdata.default_draw_on_step then $
---
>        if widgetdata.default.draw_on_step then $
1033c1035
<        if widgetdata.default_draw_on_step then $
---
>        if widgetdata.default.draw_on_step then $
1051c1053
<        papco_edit_batch, GROUP=widgetdata.base
---
>        papco_edit_batch, GROUP=widgetData.gui.base
1055c1057
<        papco_subtable_editor, GROUP=widgetdata.base
---
>        papco_subtable_editor, GROUP=widgetData.gui.base
1085c1087
<          WIDGET_CONTROL, widgetdata.base, /DESTROY
---
>          WIDGET_CONTROL, widgetdata.gui.base, /DESTROY
1160a1163,1167
>   if ( widgetData.headless ) then begin
>       if keyword_set( LIST ) then papco_RefreshList, LIST=LIST
>       return
>   endif
> 
1163,1165c1170,1172
<     choice= widgetdata.mouse_doesSlice < (n_elements(widgetdata.mouseaction)-1)
<     mouseAction=widgetdata.mouseaction(choice).NAME
<     WIDGET_CONTROL, widgetdata.text_mouse_action, $
---
>       choice= widgetdata.mouse_doesSlice < (n_elements(widgetdata.gui.mouseaction)-1)
>       mouseAction=widgetdata.gui.mouseaction(choice).NAME
>       WIDGET_CONTROL, widgetdata.gui.text_mouse_action, $
1172,1174c1179,1181
<     choice= widgetdata.slice_choice < (n_elements(widgetdata.sliceaction)-1)
<     sliceAction=widgetdata.sliceaction(choice).NAME
<     WIDGET_CONTROL, widgetdata.text_slice_action, $
---
>       choice= widgetdata.gui.slice_choice < (n_elements(widgetdata.gui.sliceaction)-1)
>       sliceAction=widgetdata.gui.sliceaction(choice).NAME
>       WIDGET_CONTROL, widgetdata.gui.text_slice_action, $
1182,1183c1189,1190
<     time_choice=widgetdata.time_choice(widgetdata.time_choice_action+1).name
<     WIDGET_CONTROL, widgetdata.text_time_choice_action, $
---
>     time_choice=widgetdata.gui.time_choice(widgetdata.time_choice_action+1).name
>     WIDGET_CONTROL, widgetdata.gui.text_time_choice_action, $
1188,1191c1195,1198
<         widget_control, widgetdata.orbitSelect_base, MAP=0
<         widget_control, widgetdata.manual_time_base, MAP=1
<         widget_control, widgetdata.day_time_base, MAP=0
<         widget_control, widgetdata.batch_time_base, MAP=0
---
>         widget_control, widgetdata.gui.orbitSelect_base, MAP=0
>         widget_control, widgetdata.gui.manual_time_base, MAP=1
>         widget_control, widgetdata.gui.day_time_base, MAP=0
>         widget_control, widgetdata.gui.batch_time_base, MAP=0
1194,1197c1201,1204
<         widget_control, widgetdata.orbitSelect_base, MAP=1
<         widget_control, widgetdata.manual_time_base, MAP=0
<         widget_control, widgetdata.day_time_base, MAP=0
<         widget_control, widgetdata.batch_time_base, MAP=0
---
>         widget_control, widgetdata.gui.orbitSelect_base, MAP=1
>         widget_control, widgetdata.gui.manual_time_base, MAP=0
>         widget_control, widgetdata.gui.day_time_base, MAP=0
>         widget_control, widgetdata.gui.batch_time_base, MAP=0
1200,1203c1207,1210
<         widget_control, widgetdata.orbitSelect_base, MAP=0
<         widget_control, widgetdata.manual_time_base, MAP=0
<         widget_control, widgetdata.day_time_base, MAP=1
<         widget_control, widgetdata.batch_time_base, MAP=0
---
>         widget_control, widgetdata.gui.orbitSelect_base, MAP=0
>         widget_control, widgetdata.gui.manual_time_base, MAP=0
>         widget_control, widgetdata.gui.day_time_base, MAP=1
>         widget_control, widgetdata.gui.batch_time_base, MAP=0
1206,1209c1213,1216
<         widget_control, widgetdata.orbitSelect_base, MAP=0
<         widget_control, widgetdata.manual_time_base, MAP=0
<         widget_control, widgetdata.day_time_base, MAP=0
<         widget_control, widgetdata.batch_time_base, MAP=1
---
>         widget_control, widgetdata.gui.orbitSelect_base, MAP=0
>         widget_control, widgetdata.gui.manual_time_base, MAP=0
>         widget_control, widgetdata.gui.day_time_base, MAP=0
>         widget_control, widgetdata.gui.batch_time_base, MAP=1
1222,1226c1229,1233
<       WIDGET_CONTROL, widgetdata.pb_previous, SENSITIVE=0
<       WIDGET_CONTROL, widgetdata.pb_next, SENSITIVE=0
<       WIDGET_CONTROL, widgetdata.ef_stepTime, SENSITIVE=0
<       WIDGET_CONTROL, widgetdata.sl_startTime, SENSITIVE=0
<       WIDGET_CONTROL, widgetdata.sl_startTime, $
---
>       WIDGET_CONTROL, widgetdata.gui.pb_previous, SENSITIVE=0
>       WIDGET_CONTROL, widgetdata.gui.pb_next, SENSITIVE=0
>       WIDGET_CONTROL, widgetdata.gui.ef_stepTime, SENSITIVE=0
>       WIDGET_CONTROL, widgetdata.gui.sl_startTime, SENSITIVE=0
>       WIDGET_CONTROL, widgetdata.gui.sl_startTime, $
1228,1229c1235,1236
<       WIDGET_CONTROL, widgetdata.ef_startTime, SENSITIVE=0
<       WIDGET_CONTROL, widgetdata.sl_endTime, SENSITIVE=0, $
---
>       WIDGET_CONTROL, widgetdata.gui.ef_startTime, SENSITIVE=0
>       WIDGET_CONTROL, widgetdata.gui.sl_endTime, SENSITIVE=0, $
1231c1238
<       WIDGET_CONTROL, widgetdata.ef_endTime, SENSITIVE=0
---
>       WIDGET_CONTROL, widgetdata.gui.ef_endTime, SENSITIVE=0
1237,1243c1244,1250
<       WIDGET_CONTROL, widgetdata.pb_previous, SENSITIVE=1
<       WIDGET_CONTROL, widgetdata.pb_next, SENSITIVE=1
<       WIDGET_CONTROL, widgetdata.ef_stepTime, SENSITIVE=1
<       WIDGET_CONTROL, widgetdata.sl_startTime, SENSITIVE=1
<       WIDGET_CONTROL, widgetdata.ef_startTime, SENSITIVE=1
<       WIDGET_CONTROL, widgetdata.sl_endTime, SENSITIVE=1
<       WIDGET_CONTROL, widgetdata.ef_endTime, SENSITIVE=1
---
>       WIDGET_CONTROL, widgetdata.gui.pb_previous, SENSITIVE=1
>       WIDGET_CONTROL, widgetdata.gui.pb_next, SENSITIVE=1
>       WIDGET_CONTROL, widgetdata.gui.ef_stepTime, SENSITIVE=1
>       WIDGET_CONTROL, widgetdata.gui.sl_startTime, SENSITIVE=1
>       WIDGET_CONTROL, widgetdata.gui.ef_startTime, SENSITIVE=1
>       WIDGET_CONTROL, widgetdata.gui.sl_endTime, SENSITIVE=1
>       WIDGET_CONTROL, widgetdata.gui.ef_endTime, SENSITIVE=1
1248c1255
<       WIDGET_CONTROL, widgetdata.sl_startTime, $
---
>       WIDGET_CONTROL, widgetdata.gui.sl_startTime, $
1251c1258
<       WIDGET_CONTROL, widgetdata.sl_endTime, $
---
>       WIDGET_CONTROL, widgetdata.gui.sl_endTime, $
1264c1271
<       WIDGET_CONTROL, widgetdata.ef_stepTime, SET_VALUE=deltaTimeStr
---
>       WIDGET_CONTROL, widgetdata.gui.ef_stepTime, SET_VALUE=deltaTimeStr
1267,1268c1274,1275
<      WIDGET_CONTROL, widgetdata.ef_orbit, $
<           SET_VALUE=strtrim(string(widgetdata.default_orbitInfo.number),2)
---
>      WIDGET_CONTROL, widgetdata.gui.ef_orbit, $
>           SET_VALUE=strtrim(string(widgetdata.default.orbitInfo.number),2)
1277c1284
<         WIDGET_CONTROL, widgetdata.ef_minTime, $
---
>         WIDGET_CONTROL, widgetdata.gui.ef_minTime, $
1279c1286
<                                           COUNTRY=widgetdata.default_us_europe)
---
>                                           COUNTRY=widgetdata.default.us_europe)
1282c1289
<         WIDGET_CONTROL, widgetdata.ef_maxTime, $
---
>         WIDGET_CONTROL, widgetdata.gui.ef_maxTime, $
1284c1291
<                                           COUNTRY=widgetdata.default_us_europe)
---
>                                           COUNTRY=widgetdata.default.us_europe)
1315c1322
<      WIDGET_CONTROL, widgetdata.ef_startTime, $
---
>      WIDGET_CONTROL, widgetdata.gui.ef_startTime, $
1317,1318c1324,1325
<                                         COUNTRY=widgetdata.default_us_europe)
<      WIDGET_CONTROL, widgetdata.sl_startTime, $
---
>                                         COUNTRY=widgetdata.default.us_europe)
>      WIDGET_CONTROL, widgetdata.gui.sl_startTime, $
1320c1327
<      WIDGET_CONTROL, widgetdata.ef_endTime, $
---
>      WIDGET_CONTROL, widgetdata.gui.ef_endTime, $
1322,1323c1329,1330
<                                         COUNTRY=widgetdata.default_us_europe)
<      WIDGET_CONTROL, widgetdata.sl_endTime, $
---
>                                         COUNTRY=widgetdata.default.us_europe)
>      WIDGET_CONTROL, widgetdata.gui.sl_endTime, $
1325c1332
<      WIDGET_CONTROL, widgetdata.ef_dayTime, $
---
>      WIDGET_CONTROL, widgetdata.gui.ef_dayTime, $
1328c1335
<                            COUNTRY=widgetdata.default_us_europe),0,10)
---
>                            COUNTRY=widgetdata.default.us_europe),0,10)
1333,1337c1340,1344
<     WIDGET_CONTROL,widgetdata.ef_orbit,SENSITIVE=0
<     WIDGET_CONTROL,widgetdata.pb_orbitSelect,SENSITIVE=0
<     sat_label=missions(widgetdata.default_satellite)
<     WIDGET_CONTROL,widgetdata.ef_orbit,SENSITIVE=1
<     WIDGET_CONTROL,widgetdata.pb_orbitSelect,SENSITIVE=1
---
>     WIDGET_CONTROL,widgetdata.gui.ef_orbit,SENSITIVE=0
>     WIDGET_CONTROL,widgetdata.gui.pb_orbitSelect,SENSITIVE=0
>     sat_label=missions(widgetdata.default.satellite)
>     WIDGET_CONTROL,widgetdata.gui.ef_orbit,SENSITIVE=1
>     WIDGET_CONTROL,widgetdata.gui.pb_orbitSelect,SENSITIVE=1
1339c1346
<     WIDGET_CONTROL, widgetdata.label_satellite, SET_VALUE=sat_label
---
>     WIDGET_CONTROL, widgetdata.gui.label_satellite, SET_VALUE=sat_label
1347,1350c1354,1357
<        widget_control, widgetdata.lb_plotInfos, set_list_select=sPlot*2
<        for i=0, n_elements(widgetdata.edit_buttons)-1 do $
<          widget_control, widgetdata.edit_buttons(i), sensitive=1
<        widget_control, widgetdata.pb_overplot, $
---
>        widget_control, widgetdata.gui.lb_plotInfos, set_list_select=sPlot*2
>        for i=0, n_elements(widgetdata.gui.edit_buttons)-1 do $
>          widget_control, widgetdata.gui.edit_buttons(i), sensitive=1
>        widget_control, widgetdata.gui.pb_overplot, $
1352c1359
<        widget_control, widgetdata.pb_anchored, $
---
>        widget_control, widgetdata.gui.pb_anchored, $
1355,1358c1362,1365
<        for i=0, n_elements(widgetdata.edit_buttons)-1 do $
<          widget_control, widgetdata.edit_buttons(i), sensitive=0
<        widget_control, widgetdata.pb_overplot, set_button=0
<        widget_control, widgetdata.pb_anchored, set_button=0
---
>        for i=0, n_elements(widgetdata.gui.edit_buttons)-1 do $
>          widget_control, widgetdata.gui.edit_buttons(i), sensitive=0
>        widget_control, widgetdata.gui.pb_overplot, set_button=0
>        widget_control, widgetdata.gui.pb_anchored, set_button=0
1367c1374
<     printAction=widgetdata.printAction(widgetdata.default_print_choice).name
---
>     printAction=widgetdata.gui.printAction(widgetdata.default.print_choice).name
1369c1376
<     WIDGET_CONTROL, widgetdata.text_print_action, $
---
>     WIDGET_CONTROL, widgetdata.gui.text_print_action, $
1373c1380
<     WIDGET_CONTROL, widgetdata.set_printer_file, $
---
>     WIDGET_CONTROL, widgetdata.gui.set_printer_file, $
1376,1378c1383,1385
<     if (widgetdata.default_print_choice eq 3) or $
<        (widgetdata.default_print_choice eq 4) then begin
<        WIDGET_CONTROL,widgetdata.set_printer_file, SENSITIVE=0
---
>     if (widgetdata.default.print_choice eq 3) or $
>        (widgetdata.default.print_choice eq 4) then begin
>        WIDGET_CONTROL,widgetdata.gui.set_printer_file, SENSITIVE=0
1380c1387
<       WIDGET_CONTROL,widgetdata.set_printer_file, SENSITIVE=1
---
>       WIDGET_CONTROL,widgetdata.gui.set_printer_file, SENSITIVE=1
1386,1388c1393,1395
<     choice= widgetdata.edit_choice
<     editAction=widgetdata.editAction(choice).name
<     WIDGET_CONTROL, widgetdata.text_edit_action, $
---
>     choice= widgetdata.gui.edit_choice
>     editAction=widgetdata.gui.editAction(choice).name
>     WIDGET_CONTROL, widgetdata.gui.text_edit_action, $
1395,1398c1402,1405
<         WIDGET_CONTROL, widgetdata.ef_startTime ,sensitive=0
<         WIDGET_CONTROL, widgetdata.sl_startTime ,sensitive=0
<         WIDGET_CONTROL, widgetdata.ef_endTime ,sensitive=0
<         WIDGET_CONTROL, widgetdata.sl_endTime ,sensitive=0
---
>         WIDGET_CONTROL, widgetdata.gui.ef_startTime ,sensitive=0
>         WIDGET_CONTROL, widgetdata.gui.sl_startTime ,sensitive=0
>         WIDGET_CONTROL, widgetdata.gui.ef_endTime ,sensitive=0
>         WIDGET_CONTROL, widgetdata.gui.sl_endTime ,sensitive=0
1400,1403c1407,1410
<         WIDGET_CONTROL, widgetdata.ef_startTime ,sensitive=1
<         WIDGET_CONTROL, widgetdata.sl_startTime ,sensitive=1
<         WIDGET_CONTROL, widgetdata.ef_endTime ,sensitive=1
<         WIDGET_CONTROL, widgetdata.sl_endTime ,sensitive=1
---
>         WIDGET_CONTROL, widgetdata.gui.ef_startTime ,sensitive=1
>         WIDGET_CONTROL, widgetdata.gui.sl_startTime ,sensitive=1
>         WIDGET_CONTROL, widgetdata.gui.ef_endTime ,sensitive=1
>         WIDGET_CONTROL, widgetdata.gui.sl_endTime ,sensitive=1
1409,1411c1416,1418
<     if widgetdata.default_draw_on_step then $
<       WIDGET_CONTROL, widgetdata.spb_step, SET_BUTTON=1 else $
<       WIDGET_CONTROL, widgetdata.spb_step, SET_BUTTON=0
---
>     if widgetdata.default.draw_on_step then $
>       WIDGET_CONTROL, widgetdata.gui.spb_step, SET_BUTTON=1 else $
>       WIDGET_CONTROL, widgetdata.gui.spb_step, SET_BUTTON=0
1444c1451
<    IF widgetdata.default_input_enable THEN return
---
>    IF widgetdata.default.input_enable THEN return
1447,1448c1454,1455
<    IF setEnable THEN WIDGET_CONTROL, widgetdata.main_base, HOURGLASS=1 $
<    ELSE  WIDGET_CONTROL, widgetdata.main_base, HOURGLASS=0
---
>    IF setEnable THEN WIDGET_CONTROL, widgetdata.gui.main_base, HOURGLASS=1 $
>    ELSE  WIDGET_CONTROL, widgetdata.gui.main_base, HOURGLASS=0
1452,1455c1459,1462
<       WIDGET_CONTROL, widgetdata.sl_startTime, SENSITIVE=setEnable
<       WIDGET_CONTROL, widgetdata.sl_endTime, SENSITIVE=setEnable
<       WIDGET_CONTROL, widgetdata.ef_endTime, SENSITIVE=setEnable
<       WIDGET_CONTROL, widgetdata.ef_startTime, SENSITIVE=setEnable
---
>       WIDGET_CONTROL, widgetdata.gui.sl_startTime, SENSITIVE=setEnable
>       WIDGET_CONTROL, widgetdata.gui.sl_endTime, SENSITIVE=setEnable
>       WIDGET_CONTROL, widgetdata.gui.ef_endTime, SENSITIVE=setEnable
>       WIDGET_CONTROL, widgetdata.gui.ef_startTime, SENSITIVE=setEnable
1457,1460c1464,1467
<       WIDGET_CONTROL, widgetdata.sl_startTime, SENSITIVE=0
<       WIDGET_CONTROL, widgetdata.sl_endTime, SENSITIVE=0
<       WIDGET_CONTROL, widgetdata.ef_endTime, SENSITIVE=0
<       WIDGET_CONTROL, widgetdata.ef_startTime, SENSITIVE=0
---
>       WIDGET_CONTROL, widgetdata.gui.sl_startTime, SENSITIVE=0
>       WIDGET_CONTROL, widgetdata.gui.sl_endTime, SENSITIVE=0
>       WIDGET_CONTROL, widgetdata.gui.ef_endTime, SENSITIVE=0
>       WIDGET_CONTROL, widgetdata.gui.ef_startTime, SENSITIVE=0
1463,1467c1470,1474
<    WIDGET_CONTROL, widgetdata.ef_orbit, SENSITIVE=setEnable
<    WIDGET_CONTROL, widgetdata.lb_plotInfos, SENSITIVE=setEnable
<    WIDGET_CONTROL, widgetdata.dw_plotInfos, SENSITIVE=setEnable
<    WIDGET_CONTROL, widgetdata.pb_print, SENSITIVE=setEnable
<    WIDGET_CONTROL, widgetdata.main_base, HOURGLASS=0
---
>    WIDGET_CONTROL, widgetdata.gui.ef_orbit, SENSITIVE=setEnable
>    WIDGET_CONTROL, widgetdata.gui.lb_plotInfos, SENSITIVE=setEnable
>    WIDGET_CONTROL, widgetdata.gui.dw_plotInfos, SENSITIVE=setEnable
>    WIDGET_CONTROL, widgetdata.gui.pb_print, SENSITIVE=setEnable
>    WIDGET_CONTROL, widgetdata.gui.main_base, HOURGLASS=0
1469,1470c1476,1477
<    FOR i=0, N_ELEMENTS(widgetdata.wid_toEnable)-1 DO $
<       WIDGET_CONTROL, widgetdata.wid_toEnable(i), SENSITIVE=setEnable
---
>    FOR i=0, N_ELEMENTS(widgetdata.gui.wid_toEnable)-1 DO $
>       WIDGET_CONTROL, widgetdata.gui.wid_toEnable(i), SENSITIVE=setEnable
1478c1485
<         widget_control, widgetdata.lb_plotInfos, set_list_select=sPlot*2
---
>         widget_control, widgetdata.gui.lb_plotInfos, set_list_select=sPlot*2
1480,1481c1487,1488
<    FOR i=0, N_ELEMENTS(widgetdata.edit_buttons) - 1 DO $
<       WIDGET_CONTROL, widgetdata.edit_buttons(i), SENSITIVE=setEnableEditButton
---
>    FOR i=0, N_ELEMENTS(widgetdata.gui.edit_buttons) - 1 DO $
>       WIDGET_CONTROL, widgetdata.gui.edit_buttons(i), SENSITIVE=setEnableEditButton
1486,1488c1493,1495
<      WIDGET_CONTROL, widgetdata.pb_draw_new, SENSITIVE=0
<      WIDGET_CONTROL, widgetdata.pb_annotate, SENSITIVE=0
<      WIDGET_CONTROL, widgetdata.pb_rm_annot, SENSITIVE=0
---
>      WIDGET_CONTROL, widgetdata.gui.pb_draw_new, SENSITIVE=0
>      WIDGET_CONTROL, widgetdata.gui.pb_annotate, SENSITIVE=0
>      WIDGET_CONTROL, widgetdata.gui.pb_rm_annot, SENSITIVE=0
1529c1538
<            _EXTRA=cmdl_defaults
---
>            _EXTRA=cmdl_defaults, headless=headless
1536d1544
< COMMON ADDBTN, addbuttons     ;contains labels of all add-in buttons
1540a1549,1557
> if n_elements( headless ) eq 0 then headless=0
>     
> if ( n_elements( widgetData ) ne 0 ) then begin
> 	if ( widget_info( widgetData.gui.base, /valid ) ) then begin
> 	   message, 'There appears to be another valid papco widget running.  Close this widget before restarting', /cont
> 	   return
> 	endif
> endif
> 
1557,1559d1573
< ;-- set the maximum number of panels allowed in PAPCO -------------------------
< max_no_of_panels=60
< 
1620,1681c1634,1636
< ; -----------------------------------------------------------------------------
< ; ---- MAIN BASE --------------------------------------------------------------
< ; -----------------------------------------------------------------------------
< 
< base = WIDGET_BASE(GROUP_LEADER=Group, COLUMN=1, /MAP, $
<                    TITLE=papco_Version(),  UVALUE='main_base')
< 
< DEFAULT_FONT={id:'DEFAULT_FONT',struct:{DEFAULT_FONT:''}}
< papco_readDefaultSettings, TAGID=DEFAULT_FONT
< FONT_ONLY=DEFAULT_FONT.struct.DEFAULT_FONT
< 
< DEFAULT_TRAP={id:'DEFAULT_TRAP',struct:{DEFAULT_TRAP:0}}
< papco_readDefaultSettings, TAGID=DEFAULT_TRAP
< ERR_CATCH_ONLY=DEFAULT_TRAP.struct.DEFAULT_TRAP
< 
< WIDGET_CONTROL, base, default_font=FONT_ONLY
< 
< ; -----------------------------------------------------------------------------
< ; ---- TOP BASE ---------------------------------------------------------------
< ; -----------------------------------------------------------------------------
< 
< top_base = WIDGET_BASE(base, COLUMN=1, /MAP)
< 
< ;--- define plot types --------------------------------------------------------
< ; count number of buttons to compute number of rows: only 10 buttons a row
< no_buttons=0
< IF fn ne 0 then begin
<     plot_types=strarr(fn)
<     FOR i=0,fn-1 DO no_buttons=no_buttons+1
< ENDIF
< no_row = (no_buttons+9)/10  &  no_buttons=0
< 
< ;--- Create hidden base of one button for sizing ------------------------------
< modules_out_base = WIDGET_BASE(top_base, column=1)
< modules_top_base= WIDGET_BASE(modules_out_base)
< 
< hidden_base = WIDGET_BASE(modules_top_base, ROW=1,  map = 0)
< ;set up a button for debugging, user edit of plot programs
< MenuDescStop = [{ CW_PDMENU_S, 3, strcenter('STOP PAPCO',12) }, $
<                 { CW_PDMENU_S, 2, 'hidden button' } ]
< 
< pdm_hidden = CW_PDMENU(hidden_base, MenuDescStop, UVALUE='pdm_stop_papco')
< 
< ;--- Module Buttons -----------------------------------------------------------
< modules_base = WIDGET_BASE(modules_top_base, ROW=no_row)
< 
< ;set size for module buttons
< geometry = WIDGET_INFO(pdm_hidden, /GEOMETRY)
< buttonGeometry={ysize:geometry.ysize,     xsize:geometry.xsize,    $
<                 yoffset:geometry.yoffset, xoffset:geometry.xoffset }
< 
< ; read modules directories for a list of plot type files. This gives the plot
< ; type names used to construct the add in buttons from procedures contained
< ; in the modules directory in the corresponding papcoadd_plottype.pro files.
< ; Some add-in buttons themselves call a submenu of a range of plot types. These
< ; plotypes are read in from the top of the files and added to the array
< ; plot_types.
< 
< ;--- add buttons for each module ----------------------------------------------
< IF fn ne 0 then BEGIN
<     plot_types=strarr(fn)
<     pb_plottype_arr=intarr(fn)
---
> ;--- define plot types
> if fn ne 0 then begin
>     modules=strarr(fn)
1683,1701c1638,1640
<         plot_types(i)=strplottype(strlowcase(addinfiles(i)))
<         proc_call='addplottype_'+plot_types(i)
<         ; trap errors on call to user defined interface routine.
<         IF ERR_CATCH_ONLY eq 1 then catch, error_status else error_status=0
< 
<         IF error_status ne 0 then begin ;call error handler
<             papco_error_handler, error_status, proc_call, plot_types(i), $
<               panelVector,  /NO_ERR_DRAW
<             error_status=0 &  catch, /CANCEL          ;disable error catching
<             CONTINUE
<         ENDIF 
< 
<         CALL_PROCEDURE, proc_call, modules_base, buttonGeometry, pb_plottype
<         catch, /CANCEL                     ;disable error catching
<         pb_plottype_arr(i)=pb_plottype
<         ;now resize the button to a standard size
<         widget_control, pb_plottype, xsize = geometry.xsize 
<         no_buttons=no_buttons+1
<     ENDFOR
---
>         modules[i]=strplottype(strlowcase(addinfiles[i]))        
>     endfor
> endif
1703c1642,1648
<     addbuttons=plot_types
---
> ;--- define missions
> path=papco_getenv('PAPCO_PATH')      ;read a list of "createorbitinfo" files
> files=findfile(path+'*createorbitinfo.pro',count=n)
> missions=strarr(n)  &  l1=strlen(path)
> for i=0,n-1 do $
>   missions(i)=strupcase(strmid(files(i),l1,strlen(files(i))-20-l1))
> ;---
1706,1709c1651,1655
<     plot_types=strarr(1)
<     papco_prt,outstr1+outstr2
<     papco_prt,';* checking for sub plot_types'
<     IF fn ne 0 then BEGIN
---
> plot_types=strarr(1)
> papco_prt,outstr1+outstr2
> papco_prt,';* checking for sub plot_types'
> 
> IF fn ne 0 then BEGIN
1724,1901c1670,1674
<     END
<     plot_types=plot_types(1:n_elements(plot_types)-1)
<     papco_prt,sepstr
<     papco_prt,';* All Add-in modules read'
<     papco_prt,sepstr
< ENDIF ELSE BEGIN
<     papco_prt,';* No Modules Configured'
<     papco_prt,outstr1+outstr2
<     papco_prt,''
<     pb_plottype_arr=[pdm_stop_papco]
<     addbuttons=''
< ENDELSE
< 
< ;---add empty buttons to always make 10 bttons a row --------------------------
< WHILE no_buttons LT no_row * 10 DO BEGIN
<     pb_empty_button = WIDGET_BUTTON(modules_base,  $
<                                     VALUE=strcenter('',12), $
<                                     UVALUE='pb_empty_button', $
<                                     _extra=buttonGeometry)
<     no_buttons=no_buttons+1
< ENDWHILE 
< 
< ; -----------------------------------------------------------------------------
< ; ---- MIDDLE BASE ------------------------------------------------------------
< ; -----------------------------------------------------------------------------
< 
<   middle_base = WIDGET_BASE(base,  ROW=1, /MAP)
< 
< ; -----------------------------------------------------------------------------
< ; ---- LEFT SIDE MIDDLE -------------------------------------------------------
< ; -----------------------------------------------------------------------------
< 
< leftSide_base = WIDGET_BASE(middle_base, COLUMN=1, /MAP)
< 
< ; ---- time choice / adjustment / step base -----------------------------------
< time_select_base=WIDGET_BASE(leftSide_base,  COLUMN=1, /MAP, /FRAME)
< 
< ; -- Time Range choice widgets  ---------------------------------------------
< time_entry_base=WIDGET_BASE(time_select_base, COLUMN=1)
< time_entry_label=WIDGET_LABEL(time_entry_base, /ALIGN_CENTER, $
<                               VALUE='Enter timerange (then hit return)')
< 
<   ;set up mappable bases ---
<   time_method_outer_base=WIDGET_BASE(time_entry_base,  ROW=1)
<   time_method_base=WIDGET_BASE(time_method_outer_base)
<   orbitSelect_base=WIDGET_BASE(time_method_base, $
<                                COLUMN=1, /ALIGN_CENTER)
<   manual_time_Base=WIDGET_BASE(time_method_base, $
<                                COLUMN=1, /ALIGN_CENTER, MAP=0)
<   day_time_Base=WIDGET_BASE(time_method_base, $
<                                COLUMN=1, /ALIGN_CENTER, MAP=0)
<   batch_time_Base=WIDGET_BASE(time_method_base, $
<                                COLUMN=1, /ALIGN_CENTER, MAP=0)
< 
<   ;By orbit entry base ---
<   enter_orbit_base = WIDGET_BASE(orbitSelect_base, ROW=1, /ALIGN_CENTER)
<   path=papco_getenv('PAPCO_PATH')      ;read a list of "createorbitinfo" files
<   files=findfile(path+'*createorbitinfo.pro',count=n)
<   missions=strarr(n)  &  l1=strlen(path)
<   for i=0,n-1 do $
<     missions(i)=strupcase(strmid(files(i),l1,strlen(files(i))-20-l1))
<   label_satellite = WIDGET_LABEL(enter_orbit_base, $
<                                  VALUE=strcenter(missions(0),12))
<   ef_orbit = CW_FIELD(enter_orbit_base, xsize=6, ysize=1, $
<                       /INTEGER, return_events=1, TITLE='Orbit:',$
<                       uvalue='ef_orbit')
< 
<   choose_sat_orb_base=WIDGET_BASE(orbitSelect_base, ROW=1, /ALIGN_CENTER)
<   Satellite_list = [ { CW_PDMENU_S, 3, strcenter('Satellite',10) } ]
<   for i=0,n-1 do $
<     Satellite_list=[Satellite_list, { CW_PDMENU_S, 0, missions(i) } ]
<   Satellite_list(n).(0)=2
< 
<   pdm_satellite=CW_PDMENU(choose_sat_orb_base, Satellite_list, $
<                           UVALUE='pdm_satellite')
<   pb_orbitSelect = WIDGET_BUTTON(choose_sat_orb_base, $
<                                  UVALUE='pb_orbitSelect', $
<                                  VALUE='List Orbits')
< 
<   ;Manual entry base ---
<   ef_minTime=CW_FIELD(manual_time_base, ysize=1, string=1, return_events=1, $
<                       uvalue='ef_minTime', title='from:')
<   ef_maxTime=CW_FIELD(manual_time_base, ysize=1, string=1,return_events=1, $
<                       uvalue='ef_maxTime', title='  to:')
< 
<   ;By day entry base---
<   ef_DayTime=CW_FIELD(day_time_base, xsize=10, ysize=1, $
<                       string=1, return_events=1, $
<                       uvalue='ef_DayTime', title='Select Day:')
< 
<   ;By batch entry base---
<   label_batch_base=WIDGET_BASE(batch_time_base,COLUMN=1)
<   label_batch_name=WIDGET_LABEL(label_batch_base, $
<     VALUE=strcenter('no batch file chosen',39))
<   label_batch_time=WIDGET_LABEL(label_batch_base, $
<     VALUE=strcenter('no time read',39))
<   batch_action=WIDGET_BASE(batch_time_base,ROW=1)
<   pb_read_batch=WIDGET_BUTTON(batch_action,$
<                               UVALUE='pb_read_batch', $
<                               VALUE='Select File')
<   pb_next_batch=WIDGET_BUTTON(batch_action,$
<                               UVALUE='pb_next_batch', $
<                               VALUE=' Next ')
<   pb_prev_batch=WIDGET_BUTTON(batch_action,$
<                               UVALUE='pb_prev_batch', $
<                               VALUE=' Prev ')
<   pb_pick_batch=WIDGET_BUTTON(batch_action,$
<                               UVALUE='pb_pick_batch', $
<                               VALUE=' Pick ')
< 
<   ; -- Time choice method -----------------------------------------------------
<   time_choice_base=WIDGET_BASE(time_method_outer_base, COLUMN=1)
<   ; set papco time choice methods
<   time_choice= [ { CW_PDMENU_S, 3, strcenter('Method:',8)}, $
<                  { CW_PDMENU_S, 0, ' Manual     (start / end)       '}, $
<                  { CW_PDMENU_S, 0, ' By Orbit   (Satellite orbit #) '}, $
<                  { CW_PDMENU_S, 0, ' By Day     (00:00 -> 24:00)    '}, $
<                  { CW_PDMENU_S, 2, ' From Batch (Times from file)   '}  ]
< 
<   pdm_time_choice_action=CW_PDMENU(time_choice_base, time_choice, $
<                                    UVALUE='pdm_time_choice_action')
<   text_time_choice_action=WIDGET_LABEL(time_choice_base, $
<                                    VALUE=strcenter(' not  set ',12) )
< 
<   ; -- Add to Batch button ----------------------------------------------------
<   pb_batch = WIDGET_BUTTON(time_choice_base,VALUE='--> Batch', $
<                            UVALUE='pb_batch', /ALIGN_CENTER)
< 
<   ; -- time-select-sliders ----------------------------------------------------
<   sl_startTime = WIDGET_SLIDER(time_select_base, /DRAG, /SUPPRESS, $
<                                MAXIMUM=1, MINIMUM=0, $
<                                UVALUE='sl_startTime', $
<                                XSIZE=buttonGeometry.xsize*3.4, VALUE=0)
< 
<   timerange_label_base = WIDGET_BASE(time_select_base, /ROW, /MAP)
<   ef_startTime = CW_FIELD(timerange_label_base, /RETURN_EVENTS, $
<                         TITLE='From',  VALUE='00:00', UVALUE='ef_startTime')
<   ef_endTime = CW_FIELD(timerange_label_base,  /RETURN_EVENTS, $
<                         TITLE='to',  VALUE='00:00', UVALUE='ef_endTime')
< 
<   sl_endTime = WIDGET_SLIDER(time_select_base, /DRAG, /SUPPRESS, $
<                              MAXIMUM=1,  MINIMUM=0, $
<                              UVALUE='sl_endTime', $
<                              XSIZE=buttonGeometry.xsize*3.4, VALUE=0)
< 
<   ; this empty base generates a timer-event that clears the drawn time-range
<   clearTimeRange=WIDGET_BASE(time_select_base, UVALUE='clearTimeRange')
< 
<   ; -- Time Step Buttons ------------------------------------------------------
<   steptime_base = WIDGET_BASE(time_select_base, /COLUMN, /MAP)
<   dummy_base = WIDGET_BASE(steptime_base, /ROW)
< 
<   pb_previous = WIDGET_BUTTON(dummy_base, VALUE=' <-- ', UVALUE='pb_previous')
<   pb_next = WIDGET_BUTTON(dummy_base,     VALUE=' --> ', UVALUE='pb_next')
< 
<   lb_steptime = WIDGET_LABEL(dummy_base,  VALUE='Step:')
<   ef_steptime = WIDGET_TEXT(dummy_base,   VALUE='000 00:00:00', XSIZE=13)
< 
<   step_toggle_base=WIDGET_BASE(dummy_base, ROW=1, /NONEXCLUSIVE)
<   spb_step=WIDGET_BUTTON(step_toggle_base, /FRAME,$
<                          VALUE='Draw on step', UVALUE='spb_draw_on_step')
< 
< ; --- Mouse-behaviour ---------------------------------------------------------
< mouse_behaviour_Base=WIDGET_BASE(leftSide_base, ROW=1, /FRAME)
< ; The mouse actions zoom, slice, level zero ,Paneldata and haircursor are
< ; provided by papco. Here further user defined mouse actions can be added.
< ; User mouse functions are read from the env. var. USER_MOUSE_ACTIONS.
< ; Format for user added slice: 'user_slice_a/user_slice_b/user_slice_c'
< ; Seperate words by underscores, slices types by backslash.
< 
< ; set papco mouse actions
< mouseAction= [ { CW_PDMENU_S, 3, strcenter('Mouse Action:',13)}, $
<                { CW_PDMENU_S, 0, ' papco Zoom              '}, $
<                { CW_PDMENU_S, 0, ' papco Vertical Slice    '}, $
<                { CW_PDMENU_S, 0, ' papco Access Level Zero '}, $
<                { CW_PDMENU_S, 0, ' papco Write Paneldata   '}, $
<                { CW_PDMENU_S, 0, ' papco Hair Cursor       '}, $
<                { CW_PDMENU_S, 0, ' papco Horizontal Slice  '} ]
---
> END
> plot_types=plot_types(1:n_elements(plot_types)-1)
> papco_prt,sepstr
> papco_prt,';* All Add-in modules read'
> papco_prt,sepstr
1903,1915c1676,1679
< ; check for env. variable for user mouse actions - expand mouseAction
< papco_prt,''
< u_actions=getenv('USER_MOUSE_ACTIONS')
< if strlen(u_actions) eq 0 then message,'No user mouse actions', /info $
< else begin
<     u_actions=u_actions+'/ '
<     u_actions=str_sep(u_actions,'/')
<     for i=0,n_elements(u_actions)-2 do begin
<       new_action=' USER '+strsubst(u_actions(i),'_',' ')+' '
<       mouseAction = [mouseAction, { CW_PDMENU_S, 0, new_action } ]
<       message,'Added user slice '+$
<         strformat(new_action,30,/left )+' slice = '+varprt(2l^(5+i)), /info
<     endfor
---
> if ( headless ) then begin
>     gui={ gui_dummy, base:0L, font:'' }
> endif else begin
>     papco_create_main_widget, gui, modules
1917,2194d1680
< mouseAction=[mouseAction, { CW_PDMENU_S, 0, ' papco Multiple Slice ' } ]
< mouseAction(n_elements(mouseAction)-1).FLAGS=2
< papco_prt,''
< 
< pdm_mouse_action=CW_PDMENU(mouse_behaviour_Base, mouseAction, $
<                            UVALUE='pdm_mouse_action')
< text_mouse_action=WIDGET_LABEL(mouse_behaviour_Base, $
<                                VALUE=strcenter('   not set yet   ',35) )
< 
< ; --- Slice behaviour ---------------------------------------------------------
< slice_behaviour_Base=WIDGET_BASE(leftSide_base, ROW=1, /FRAME)
< 
< ; set papco slice actions
< sliceAction= [ { CW_PDMENU_S, 3, strcenter('Slice Action:',13)}, $
<                { CW_PDMENU_S, 0, ' single panel         '}, $
<                { CW_PDMENU_S, 0, ' global per plot_type '}, $
<                { CW_PDMENU_S, 2, ' global all panels    '}  ]
< 
< pdm_slice_action=CW_PDMENU(slice_behaviour_Base, sliceAction, $
<                                  UVALUE='pdm_slice_action')
< text_slice_action=WIDGET_LABEL(slice_behaviour_Base, $
<                                  VALUE=strcenter('   not set yet   ',35) )
< 
< ; --- Papco_Prt behaviour------------------------------------------------------
< print_behaviour_Base=WIDGET_BASE(leftSide_base, ROW=1, /FRAME)
< 
<   ; set papco print actions
<   printAction= [ { CW_PDMENU_S, 3, strcenter('Print Action:',13)}, $
<                  { CW_PDMENU_S, 0, ' -> default printer       '}, $
<                  { CW_PDMENU_S, 0, ' -> default file          '}, $
<                  { CW_PDMENU_S, 0, ' -> select printer / file '}, $
<                  { CW_PDMENU_S, 0, ' select default output    '}, $
<                  { CW_PDMENU_S, 0, ' ------------------------ '}, $
<                  { CW_PDMENU_S, 0, ' batch -> screen preview  '}, $
<                  { CW_PDMENU_S, 0, ' batch -> data output     '}, $
<                  { CW_PDMENU_S, 2, ' batch -> default file    '}  ]
< 
<   pdm_print_action=CW_PDMENU(print_behaviour_Base, printAction, $
<                                                    UVALUE='pdm_print_action')
<   text_print_action=WIDGET_LABEL(print_behaviour_Base, $
<                                  VALUE=strcenter('   not set yet   ',35) )
< 
< ; --- Edit behaviour ---------------------------------------------------------
<   edit_behaviour_Base=WIDGET_BASE(leftSide_base, ROW=1, /FRAME)
< 
<   ; set papco edit actions
<   editAction= [ { CW_PDMENU_S, 3, strcenter('Edit Action:',13)}, $
<                 { CW_PDMENU_S, 0, ' local                '}, $
<                 { CW_PDMENU_S, 0, ' global per plot_type '}, $
<                 { CW_PDMENU_S, 2, ' global all           '}  ]
< 
<   pdm_edit_action=CW_PDMENU(edit_behaviour_Base, editAction, $
<                                                    UVALUE='pdm_edit_action')
<   text_edit_action=WIDGET_LABEL(edit_behaviour_Base, $
<                                  VALUE=strcenter('   not set yet   ',35) )
< 
< ; -----------------------------------------------------------------------------
< ; ---- RIGHT SIDE MIDDLE ------------------------------------------------------
< ; -----------------------------------------------------------------------------
< 
< geometry=WIDGET_INFO(leftSide_base, /geometry)
< rightSide_base = WIDGET_BASE(middle_base, COLUMN=1, /MAP, $
<                              ysize=geometry.YSIZE+3)
< 
< ; --- Panel Editor ------------------------------------------------------------
< PanelEdit_base = WIDGET_BASE(rightSide_Base,  ROW=1, /MAP, $
<                              YSIZE=geometry.YSIZE)
< 
< ; --- Panel list and Draw schematic ------------------------------------------
< xsize=540
< 
< ;work out size of panel list and draw window needed for max no of panels
< lines_in_list=max_no_of_panels*2
< dummy=strarr(lines_in_list) & dummy(1)='moment...'
< ysize=lines_in_list*16+8
< 
< plotList_Base=widget_base(PanelEdit_Base, ROW=1, $
<                           scr_xsize=xsize, /scroll)
< 
< dw_plotInfos = WIDGET_DRAW(plotList_base, xsize=125)
< list_base = widget_base(plotList_base)
< 
< lb_plotInfos = WIDGET_LIST(list_base, VALUE = dummy, $
<                            YSIZE=lines_in_list,  XSIZE=80, $
<                            UVALUE='lb_plotInfos')
< 
< geom=WIDGET_INFO(lb_plotInfos, /geometry)
< WIDGET_CONTROL, dw_plotInfos, YSIZE=geom.scr_ysize+2*geom.margin
< 
< ; --- Panel Edit buttons ------------------------------------------------------
< infoButtons_base = WIDGET_BASE(PanelEdit_base, column=1, MAP=1)
< 
< bitmapButtons_base=WIDGET_BASE(infoButtons_base, COLUMN=1)
< 
< ; --- Position UP/DOWN buttons ------------------------------------------------
<   updownbuttons_base=WIDGET_BASE(bitmapButtons_base, COLUMN=1, /FRAME)
<   dummy = WIDGET_LABEL(updownbuttons_base, VALUE='Position')
<   upButton_base=WIDGET_BASE(updownbuttons_base, ROW=1)
<   BMPUP = get_new_button(/BMPUP)
<   pb_MoveUp = WIDGET_BUTTON(upButton_base, VALUE=BMPUP, $
<                             UVALUE='pb_MoveUp')
<   dummy = WIDGET_LABEL(upButton_base, VALUE='  Up  ')
<   downButton_base=WIDGET_BASE(updownbuttons_base, ROW=1)
<   BMPDOWN = get_new_button(/BMPDOWN)
<   pb_MoveDown = WIDGET_BUTTON(downButton_base, VALUE=BMPDOWN, $
<                               UVALUE='pb_MoveDown')
<   dummy = WIDGET_LABEL(downButton_base, VALUE=' Down ')
< 
< ; --- absolute size INCREAS/DECREASE buttons ----------------------------------
<   enlargeShrinkButtons_Base= WIDGET_BASE(bitmapButtons_base, COLUMN=1, /FRAME)
<   dummy = WIDGET_LABEL(enlargeShrinkButtons_Base, VALUE='Absolute size')
<   enlargeButton_Base= WIDGET_BASE(enlargeShrinkButtons_Base, ROW=1)
<   BMP_ENLARGE = get_new_button(/BMP_ENLARGE)
<   pb_Enlarge = WIDGET_BUTTON(enlargeButton_Base, VALUE=BMP_ENLARGE, $
<                              UVALUE='pb_Enlarge')
<   dummy = WIDGET_LABEL(enlargeButton_Base, VALUE='Increase')
<   shrinkButton_Base= WIDGET_BASE(enlargeShrinkButtons_Base, ROW=1)
<   BMP_SHRINK = get_new_button(/BMP_SHRINK)
<   pb_Shrink = WIDGET_BUTTON(shrinkButton_Base,VALUE=BMP_SHRINK, $
<                             UVALUE='pb_Shrink')
<   dummy = WIDGET_LABEL(shrinkButton_Base, VALUE='Decrease')
< 
< ; --- relative size INCREAS/DECREASE buttons ----------------------------------
<   enlShrOthers_Base= WIDGET_BASE(bitmapButtons_base, COLUMN=1, /FRAME)
<   dummy = WIDGET_LABEL(enlShrOthers_Base, VALUE='Relative size')
<   enlOthers_Base= WIDGET_BASE(enlShrOthers_Base, ROW=1)
<   BMP_OTHERS_ENLARGE = get_new_button(/BMP_OTHERS_ENLARGE)
<   pb_ShrinkOthers = WIDGET_BUTTON(enlOthers_base,$
<                                    VALUE=BMP_OTHERS_ENLARGE, $
<                                    UVALUE='pb_ShrinkOthers')
<   dummy = WIDGET_LABEL(enlOthers_Base, VALUE='Increase')
<   shrOthers_Base= WIDGET_BASE(enlShrOthers_Base, ROW=1)
<   BMP_OTHERS_SHRINK = get_new_button(/BMP_OTHERS_SHRINK)
<   pb_EnlargeOthers= WIDGET_BUTTON(shrOthers_base,$
<                                   VALUE=BMP_OTHERS_SHRINK, $
<                                   UVALUE='pb_EnlargeOthers')
<   dummy = WIDGET_LABEL(shrOthers_base, VALUE='Decrease')
< 
< ;--- edit button base ---------------------------------------------------------
<   editButtons_base = WIDGET_BASE(infoButtons_base, COLUMN=1, MAP=1, /FRAME)
<   EditMenu = [ { CW_PDMENU_S, 3, strcenter('Edit',6) }, $
<                { CW_PDMENU_S, 0,       'Edit panel  ' }, $
<                { CW_PDMENU_S, 0,       'Change Type' }, $
<                { CW_PDMENU_S, 0,       'Delete panel'}, $
<                { CW_PDMENU_S, 2,       'Copy panel' }   ]
<   pb_EditPlot = CW_PDMENU(editButtons_base, EditMenu, $
<                           UVALUE='pb_EditPlot')
< 
<   ReformatMenu = [ { CW_PDMENU_S, 3, strcenter('Reformat',6) }, $
<                    { CW_PDMENU_S, 0,       'remove gaps'     }, $
<                    { CW_PDMENU_S, 0,       'reset all'       }, $
<                    { CW_PDMENU_S, 0,       'resort all'      }, $
<                    { CW_PDMENU_S, 2,       'undo overlaps'   }  ]
<   pb_Reformat = CW_PDMENU(editButtons_base, ReformatMenu, UVALUE='pb_Reformat')
< 
<   dummy=WIDGET_BASE(editButtons_base, /NONEXCLUSIVE, /COLUMN)
<   pb_overplot=WIDGET_BUTTON(dummy, VALUE=strcenter('overplot', 8), $
<                             UVALUE='pb_overplot')
<   pb_anchored=WIDGET_BUTTON(dummy, VALUE=strcenter('anchored', 8), $
<                             UVALUE='pb_anchored')
< ; -----------------------------------------------------------------------------
< ; ---- BOTTOM PART ------------------------------------------------------------
< ; -----------------------------------------------------------------------------
< 
< bottom_base = WIDGET_BASE(base, COLUMN=1, /MAP)
< 
< ;--- print settings output labels ---------------------------------------------
< 
< print_set_base = WIDGET_BASE(bottom_base, ROW=1, /MAP, /FRAME)
< 
< printer_info     = WIDGET_LABEL(print_set_base, $
<                           VALUE=strformat('Printer/file: ',15,/LEFT) )
< set_printer_file = WIDGET_LABEL(print_set_base, $
<                           VALUE=strcenter('Printer / file not set yet',125) )
< 
< ;--- set action buttons -------------------------------------------------------
< action_base = WIDGET_BASE(bottom_base, COLUMN=10, /MAP)
< 
< ; empty button for expansion
< ;  pb_empty_button = WIDGET_BUTTON(action_base,  $
< ;                        VALUE=strcenter('',10), $
< ;                        UVALUE='pb_empty_button', _extra=buttonGeometry)
< 
< ; button 1 ---
< pb_draw = WIDGET_BUTTON(action_base, $
<                         VALUE=strcenter('Draw', 10), $
<                         UVALUE='pb_draw', _extra=buttonGeometry)
< ; button 2 ---
< pb_draw_new = WIDGET_BUTTON(action_base, $
<                         VALUE=strcenter('Draw New', 10), $
<                         UVALUE='pb_draw_new', _extra=buttonGeometry)
< WIDGET_CONTROL, pb_draw_new, sensitive=0
< 
< ; button 3 ---
< pb_print=WIDGET_BUTTON(action_base, $
<                         VALUE=strcenter('Print', 10), $
<                         UVALUE='pb_print', _extra=buttonGeometry)
< ; button 4 ---
< pb_output = WIDGET_BUTTON(action_base,  $
<                         VALUE=strcenter('Output',10), $
<                         UVALUE='pb_output', _extra=buttonGeometry)
< ; button 5 ---
< pb_annotate = WIDGET_BUTTON(action_base, $
<                         VALUE=strcenter('Annotate', 10), $
<                         UVALUE='pb_annotate', _extra=buttonGeometry)
< WIDGET_CONTROL, pb_annotate, sensitive=0
< 
< ; button 6 ---
< pb_rm_annot = WIDGET_BUTTON(action_base, $
<                         VALUE=strcenter('Rm. Annot.', 10), $
<                         UVALUE='pb_rm_annot', _extra=buttonGeometry)
< WIDGET_CONTROL, pb_rm_annot, sensitive=0
< 
< ; button 7 ---
< pb_forward = WIDGET_BUTTON(action_base,  $
<                         VALUE=strcenter('Forward',10), $
<                         UVALUE='pb_forward', _extra=buttonGeometry)
< ; button 8 ---
< pb_back = WIDGET_BUTTON(action_base,  $
<                         VALUE=strcenter('Back',10), $
<                         UVALUE='pb_back', _extra=buttonGeometry)
< ; button 9 ---
<  pb_reset = WIDGET_BUTTON(action_base, $
<                         VALUE=strcenter('Reset', 10), $
<                         UVALUE='pb_reset', _extra=buttonGeometry)
< ; button 10 ---
< pb_new_config = WIDGET_BUTTON(action_base,  $
<                         VALUE=strcenter('New Config',10), $
<                         UVALUE='pb_new_config', _extra=buttonGeometry)
< ; button 11 ---
<   pb_default = WIDGET_BUTTON(action_base, $
<                         VALUE=strcenter('Defaults', 10), $
<                         UVALUE='pb_default', _extra=buttonGeometry)
< ; button 12 ---
< pb_font = WIDGET_BUTTON(action_base, $
<                         VALUE=strcenter('Font', 10), $
<                         UVALUE='pb_font',  _extra=buttonGeometry)
< ; button 13 ---
< pb_help = WIDGET_BUTTON(action_base, $
<                         VALUE=strcenter('Help', 10), $
<                         UVALUE='pb_help', _extra=buttonGeometry)
< ; button 14 ---
< pb_about = WIDGET_BUTTON(action_base, $
<                         VALUE=strcenter('About...', 10), $
<                         UVALUE='pb_about', _extra=buttonGeometry)
< ; button 15 ---
< pb_edit_batch = WIDGET_BUTTON(action_base,  $
<                         VALUE=strcenter('Edit Batch',10), $
<                         UVALUE='pb_edit_batch', _extra=buttonGeometry)
< ; button 16 ---
< pb_edit_color = WIDGET_BUTTON(action_base,  $
<                         VALUE=strcenter('Edit Color',10), $
<                         UVALUE='pb_edit_color', _extra=buttonGeometry)
< ; button 17 ---
< pb_load = WIDGET_BUTTON(action_base, $
<                         VALUE=strcenter('Load', 10), $
<                         UVALUE='pb_load', _extra=buttonGeometry)
< ; button 18 ---
< pb_save = WIDGET_BUTTON(action_base, $
<                         VALUE=strcenter('Save', 10), $
<                         UVALUE='pb_save', _extra=buttonGeometry)
< ; button 19 ---
< pb_done_save = WIDGET_BUTTON(action_base, $
<                         VALUE=strcenter('Save&Done', 10), $
<                         UVALUE='pb_done_save',  _extra=buttonGeometry)
< ; button 20 ---
< pb_done = WIDGET_BUTTON(action_base, $
<                         VALUE=strcenter('Done', 10), $
<                         UVALUE='pb_done', _extra=buttonGeometry)
< 
< ; -----------------------------------------------------------------------------
< ; --- DONE SETTING UP MAIN WIDGET ---------------------------------------------
< ; -----------------------------------------------------------------------------
< 
< ; --- Set widgets that are made (in)sensitive in papco_Input when papco is busy
< wid_toEnable=[base]
< edit_Buttons=[updownbuttons_base, enlargeShrinkButtons_Base, $
<               enlShrOthers_Base, editButtons_base]
2208,2209c1694,1695
< plotInfos=replicate(plotInfoTemplate, max_no_of_panels)
< anchored=bytarr(max_no_of_panels)
---
> plotInfos=replicate(plotInfoTemplate, (papco_defines()).max_no_of_panels )
> anchored=bytarr((papco_defines()).max_no_of_panels)
2218c1704,1765
< screen=get_screen_size()
---
> if ( headless ) then begin
>     screen= [-997,-996]
> endif else begin
>     screen=get_screen_size()
> endelse
> 
>     ;--------------------------------------------------------------------------
>     ;all tag names containing "default" will be saved in defaults.dat
> default= { default_11_01, $
>            redraw:1, $            ;enable redraw logic
>            vert_slice_size: [500,500], $ ;vertical slice draw window size
>            ask_wget:1,  $         ;ask confirmation before wget
>            scroll:1,  $           ;disable scrolling inside papco windows
>            save_bitmap:1,  $      ;enable saving of bitmap
>            input_enable:0, $      ;allow disable of widgets
>            do_plots:1, $          ;do plots or just do read of data
>            printerno:printerno, $ ;actual number of printers loaded
>            states:0, $            ;0 turns on papco_state files, 1 turns off
>            png_format:0, $
>            right_label:0, $
>            slice_reload:1, $
>            multiple_slice:intarr(16), $
>            draw_on_step:0, $     ;draw on time step or not
>            adjust_time:0.0, $              ;hours to add to ends of time range
>            numbering:0, $
>            satellite:0, $
>            trap:1, $                       ;set to trap user routine errors
>            wget:0, $                       ;set to enable remote get
>            print_choice:1, $
>            useprinter:printerInfo.useprinter, $
>            printer:printerInfo.printer, $
>            askforfilename:printerInfo.askforfilename, $
>            filetype:printerInfo.filetype, $
>            filename_tmpl:printerInfo.filename_tmpl, $
>            orbitInfo:default_orbitInfo, $
>            layout:0, $
>            verbose:0, $ ;sets verbose flag in get_error common flag for diag
>            error_box:1, $
>            charfont:3, $
>            font:'', $
>            charsize:1.0, $
>            charthick:1.0, $
>            output_format:'TXT', $
>            us_europe:1, $                  ;used to set US/Europe defaults
>            plot_size:[100.0,100.0],$       ;default plot scaling of full size
>            gif_size:[570,760], $           ;default output gif size
>            draw_size:[570,760], $          ;default draw window size
>            ps_mult:1.0, $                  ;scaling fonts to ps factor
>            ps_eps:0, $                     ;encapsulated postscript = 1
>            draw_ident:1, $
>            bckg_color:200, $
>            forg_color:0, $
>            TICKLEN:-0.015, $
>            XTICKS:6, $
>            XLINES:2, $
>            XSTYLE:1, $
>            XMINOR:10 $
>          }
> 
> if ( not headless ) then begin
>     default.font= gui.font
> end
2220,2221c1767,1770
< widgetdata= {PLOT_COMPOSER_70, $
<     base:base,  $                             ;ID of top level widget
---
> widgetdata= {PLOT_COMPOSER_11_01, $             
>              gui:gui, $
>              main_base:gui.base, $       ; copy left here for legacy modules
>              headless:headless, $    ; true if running in headless environment 
2229c1778
<     batchFilePath:papco_addpath(defaultdir, 'papco_products/batch'), $
---
>              batchFilePath:papco_addpath(defaultdir, 'papco_products'+papco_dirsep()+'batch'), $
2233c1782
<     annotateFilePath:papco_addpath(defaultdir, 'papco_products/annotate'), $
---
>              annotateFilePath:papco_addpath(defaultdir, 'papco_products'+papco_dirsep()+'annotate'), $
2247c1796
<     clearTimeRange:clearTimeRange, $          ;empty widget-base
---
>              time_choice_action:0, $   ;; method by which time is selected--currently part of state
2251a1801
>              orbitNumber:0, $
2253a1804
>              monitor:obj_new('papco_monitor'), $  ; progress monitor object
2255,2259d1805
<     main_base:base, $
<     orbitSelect_base:orbitSelect_base, $
<     manual_time_Base:manual_time_Base, $
<     day_time_Base:day_time_Base, $
<     batch_time_Base:batch_time_Base, $
2261,2262d1806
<     label_batch_name:label_batch_name, $
<     label_batch_time:label_batch_time, $
2264,2265d1807
<     pb_overplot:pb_overplot, $
<     pb_anchored:pb_anchored, $
2267,2303d1808
<     ef_startTime:ef_startTime, $
<     sl_startTime:sl_startTime, $
<     ef_endTime:ef_endTime, $
<     sl_endTime:sl_endTime, $
<     pb_previous:pb_previous, $
<     pb_next:pb_next, $
<     ef_stepTime:ef_stepTime, $
<     ef_orbit:ef_orbit, $
<     pdm_satellite:pdm_satellite, $
<     pb_orbitSelect:pb_orbitSelect, $
<     label_satellite:label_satellite, $
<     ef_minTime:ef_minTime, $
<     ef_maxTime:ef_maxTime, $
<     ef_DayTime:ef_DayTime, $
<     lb_plotInfos:lb_plotInfos, $
<     dw_draw:0l, $
<     dw_plotInfos:dw_plotInfos, $
<     spb_step:spb_step, $
<     time_choice:time_choice, $
<     time_choice_action:0, $
<     text_time_choice_action:text_time_choice_action, $
<     pdm_mouse_action:pdm_mouse_action, $
<     text_mouse_action:text_mouse_action, $
<     mouseAction:mouseAction, $
<     text_print_action:text_print_action, $
<     text_edit_action:text_edit_action, $
<     text_slice_action:text_slice_action, $
<     printAction:printAction, $
<     editAction:editAction, $
<     sliceAction:sliceAction, $
<     set_printer_file:set_printer_file, $
<     edit_choice:1, $
<     slice_choice:1, $
<     pb_print:pb_print, $
<     wid_toEnable:wid_toEnable, $
<     edit_buttons:edit_buttons, $
<     draw_window:0l, $
2307,2311d1811
<     old_draw_id:lonarr(100), $
<     pb_draw_new:pb_draw_new, $
<     pb_output:pb_output, $
<     pb_annotate:pb_annotate, $
<     pb_rm_annot:pb_rm_annot, $
2314a1815
>              truecolor:0, $                          ; 0=8bit, 1,2,3=true color
2316,2365c1817,1822
<     ;--------------------------------------------------------------------------
<     ;all tag names containing "default" will be saved in defaults.dat
<     default_redraw:1, $            ;enable redraw logic 
<     default_vert_slice_size: [500,500], $ ;vertical slice draw window size
<     default_ask_wget:1,  $         ;ask confirmation before wget
<     default_scroll:1,  $           ;disable scrolling inside papco windows
<     default_save_bitmap:1,  $      ;enable saving of bitmap
<     default_input_enable:0, $      ;allow disable of widgets
<     default_do_plots:1, $          ;do plots or just do read of data
<     default_printerno:printerno, $ ;actual number of printers loaded
<     default_states:0, $            ;0 turns on papco_state files, 1 turns off
<     default_png_format:0, $
<     default_right_label:0, $
<     default_slice_reload:1, $
<     default_multiple_slice:intarr(16), $
<     default_draw_on_step:0, $     ;draw on time step or not
<     default_adjust_time:0.0, $              ;hours to add to ends of time range
<     default_numbering:0, $
<     default_satellite:0, $
<     default_trap:1, $                       ;set to trap user routine errors
<     default_wget:0, $                       ;set to enable remote get
<     default_print_choice:1, $
<     default_useprinter:printerInfo.useprinter, $
<     default_printer:printerInfo.printer, $
<     default_askforfilename:printerInfo.askforfilename, $
<     default_filetype:printerInfo.filetype, $
<     default_filename_tmpl:printerInfo.filename_tmpl, $
<     default_orbitInfo:default_orbitInfo, $
<     default_layout:0, $
<     default_verbose:0, $ ;sets verbose flag in get_error common flag for diag
<     default_error_box:1, $
<     default_font:FONT_ONLY, $
<     default_charfont:3, $
<     default_charsize:1.0, $
<     default_charthick:1.0, $
<     default_output_format:'TXT', $
<     default_us_europe:1, $                  ;used to set US/Europe defaults
<     default_plot_size:[100.0,100.0],$       ;default plot scaling of full size
<     default_gif_size:[570,760], $           ;default output gif size
<     default_draw_size:[570,760], $          ;default draw window size
<     default_ps_mult:1.0, $                  ;scaling fonts to ps factor
<     default_ps_eps:0, $                     ;encapsulated postscript = 1
<     default_draw_ident:1, $
<     default_bckg_color:200, $
<     default_forg_color:0, $
<     default_TICKLEN:-0.015, $
<     default_XTICKS:6, $
<     default_XLINES:2, $
<     default_XSTYLE:1, $
<     default_XMINOR:10     }
---
>              default:default $
> }
> 
> if ( headless ) then begin
>     set_plot, 'Z'
> endif
2375c1832
<     widgetdata.default_fileName_tmpl
---
>     widgetdata.default.fileName_tmpl
2387a1845
> if ( not headless ) then begin
2389,2390c1847,1848
< IF keyword_set(BATCH) THEN map=0 ELSE map=1
< WIDGET_CONTROL, base, default_font=widgetdata.default_font, $
---
>     IF keyword_set(BATCH) THEN map=0 ELSE map=1
>     WIDGET_CONTROL, widgetData.gui.base, default_font=widgetdata.default.font, $
2391a1850
> endif
2421,2425c1880,1884
< widgetdata.printerinfo.useprinter=widgetdata.default_useprinter
< widgetdata.printerinfo.printer=widgetdata.default_printer
< widgetdata.printerinfo.askforfilename=widgetdata.default_askforfilename
< widgetdata.printerinfo.filetype=widgetdata.default_filetype
< widgetdata.printerinfo.filename_tmpl=widgetdata.default_filename_tmpl
---
> widgetdata.printerinfo.useprinter=widgetdata.default.useprinter
> widgetdata.printerinfo.printer=widgetdata.default.printer
> widgetdata.printerinfo.askforfilename=widgetdata.default.askforfilename
> widgetdata.printerinfo.filetype=widgetdata.default.filetype
> widgetdata.printerinfo.filename_tmpl=widgetdata.default.filename_tmpl
2427c1886
< IF keyword_set(VERBOSE) THEN widgetdata.default_verbose = VERBOSE
---
> IF keyword_set(VERBOSE) THEN widgetdata.default.verbose = VERBOSE
2441c1900
<         widgetdata.DEFAULT_FILENAME_TMPL
---
>         widgetdata.default.FILENAME_TMPL
2446a1906
>       if ( not headless ) then begin
2448c1908,1910
<       papco_finish,  /terminate & return
---
>       endif
>       papco_finish,  /terminate
>       return
2462,2463c1924,1927
< papco_refresh, /ALL
< XMANAGER, 'papco_main', base, /NO_BLOCK
---
> if ( not headless ) then begin
>     papco_refresh, /ALL
>     XMANAGER, 'papco_main', widgetData.gui.base, /NO_BLOCK
> endif
Index: papco_refresh_list.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_refresh_list.pro,v
retrieving revision 1.1.1.1
diff -B -b -r1.1.1.1 papco_refresh_list.pro
26d25
<   lb_plotInfos=widgetData.lb_plotInfos
28,46d26
< 
< ;--- set the dw_plotInfos-Widget to be the Graphics-Device --------------------
<   PAPCO_SET_PLOT, 'X'
<   WIDGET_CONTROL, widgetData.dw_plotInfos,  GET_VALUE=drawIndex
<   WSET, drawIndex
< 
< ;--- calculate the char-height of the list-box --------------------------------
< ;  the character-heights of list-boxes and the character-height in
< ;  DRAW-widgets is NOT the same. Therefor, we try to calculate it.
<   geom=WIDGET_INFO(lb_plotInfos, /GEOMETRY)
<   char_height=(geom.scr_ysize - 2*geom.margin) / geom.ysize
<   
< ;--- assign colors to bars in panel preview  
<   dw_list_bgColor=0             ; the color of the preview's background
<   dw_list_fgColor=blue          ; single non-overlap, non-overplot 
<   dw_list_warnColor=red         ; general conflicts
<   dw_list_oplotColor=dark_green ; valid overplots 
<   dw_list_oplotWarnColor=cyan   ; exact overlaps
<   
48,54d27
<   orbitDescriptions=strarr(max_panels*2)   
<   for i=0,max_panels-1 do orbitDescriptions(i*2)=string(i+1,format="(i2,':')")
<   
< ;--- first, erase the drawing-widget ------------------------------------------
< ;  erase, dw_list_bgColor
<   polyfill, [0,0, !d.x_size, !d.x_size], $
<     [-1,!d.y_size, !d.y_size, -1], color=dw_list_bgColor, /dev
62,66d34
< ; REINER, WHY DO YOU DO THIS ???
< ;    if LIST ne 2 then $
< ;      if n_elements(old_maxPlotNo) ne 0 then $
< ;      maxPlotNo = maxPlotNo > old_maxPlotNo
<       
106a75,116
>   endif else begin
>       old_maxPlotNo=0
>   endelse
>   
> 
>   if ( not widgetData.headless ) then begin
>       lb_plotInfos=widgetData.gui.lb_plotInfos
>       
> ;--- set the dw_plotInfos-Widget to be the Graphics-Device --------------------
>       PAPCO_SET_PLOT, 'X'
>       WIDGET_CONTROL, widgetData.gui.dw_plotInfos,  GET_VALUE=drawIndex
>       WSET, drawIndex
> 
> ;--- calculate the char-height of the list-box --------------------------------
> ;  the character-heights of list-boxes and the character-height in
> ;  DRAW-widgets is NOT the same. Therefor, we try to calculate it.
>       geom=WIDGET_INFO(lb_plotInfos, /GEOMETRY)
>       char_height=(geom.scr_ysize - 2*geom.margin) / geom.ysize
>       
> ;--- assign colors to bars in panel preview  
>       dw_list_bgColor=0             ; the color of the preview's background
>       dw_list_fgColor=blue          ; single non-overlap, non-overplot 
>       dw_list_warnColor=red         ; general conflicts
>       dw_list_oplotColor=dark_green ; valid overplots 
>       dw_list_oplotWarnColor=cyan   ; exact overlaps
>       
>       
>       orbitDescriptions=strarr(max_panels*2)   
>       for i=0,max_panels-1 do orbitDescriptions(i*2)=string(i+1,format="(i2,':')")
>       
> ;--- first, erase the drawing-widget ------------------------------------------
>       polyfill, [0,0, !d.x_size, !d.x_size], $
>         [-1,!d.y_size, !d.y_size, -1], color=dw_list_bgColor, /dev
>       
>       if numberOfPlots ne 0 then begin
>           
> ;--- what will the second element of panelVector be ? -------------------------
>           maxPlotNo= max( widgetData.plotInfos(0:(numberOfPlots-1)).panelPosition + $
>                           widgetData.plotInfos(0:(numberOfPlots-1)).panelHeight )
>           
>           old_maxPlotNo=maxPlotNo
>           
188c198,200
<   widget_control, widgetData.lb_plotInfos, set_value=orbitDescriptions
---
>       widget_control, widgetData.gui.lb_plotInfos, set_value=orbitDescriptions
> 
>   endif ;; not headless
190a203,226
>   
> 
>   
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
Index: papco_settime.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_settime.pro,v
retrieving revision 1.1.1.1
diff -B -b -r1.1.1.1 papco_settime.pro
70,71c70,72
<     widget_control, widgetData.ef_orbit, set_value=0
<     widgetData.default_orbitInfo.number=0 
---
>     widget_control, widgetData.gui.ef_orbit, set_value=0
>     widgetData.orbitNumber= 0
>     widgetData.default.orbitInfo.number=0 
103c104
<     widgetData.default_orbitInfo=orbitInfo
---
>     widgetData.default.orbitInfo=orbitInfo
116a118
>     widgetData.orbitNumber= anOrbitNr
129c131
<                          GROUP_LEADER=widgetdata.base, $
---
>                          GROUP_LEADER=widgetData.gui.base, $
170c172
<       WIDGET_CONTROL, widgetData.ef_DayTime, GET_VALUE=tday
---
>       WIDGET_CONTROL, widgetData.gui.ef_DayTime, GET_VALUE=tday
194,195c196,197
<    WIDGET_CONTROL, widgetData.ef_minTime, GET_VALUE=tminn
<    WIDGET_CONTROL, widgetData.ef_maxTime, GET_VALUE=tmaxx
---
>    WIDGET_CONTROL, widgetData.gui.ef_minTime, GET_VALUE=tminn
>    WIDGET_CONTROL, widgetData.gui.ef_maxTime, GET_VALUE=tmaxx
416c418
<     WIDGET_CONTROL, widgetData.dw_draw,  GET_VALUE=drawIndex
---
>     WIDGET_CONTROL, widgetData.gui.dw_draw,  GET_VALUE=drawIndex
444c446
<        WIDGET_CONTROL, widgetData.clearTimeRange, TIMER=3
---
>        WIDGET_CONTROL, widgetData.gui.clearTimeRange, TIMER=3
476,477c478,479
< ;-- modify the timerange according to widgetData.default_adjust_time
<   const_sec=long(widgetData.default_adjust_time*3600.0)
---
> ;-- modify the timerange according to widgetData.default.adjust_time
>   const_sec=long(widgetData.default.adjust_time*3600.0)
Index: papco_slices.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_slices.pro,v
retrieving revision 1.2
diff -B -b -r1.2 papco_slices.pro
129c129
<     Slice_Base=WIDGET_BASE(COLUMN=1, GROUP=widgetData.main_base, $
---
>     Slice_Base=WIDGET_BASE(COLUMN=1, GROUP=widgetData.gui.main_base, $
229c229
<     if widgetData.default_trap eq 1 then $
---
>     if widgetData.default.trap eq 1 then $
293c293
<         IF widgetData.default_trap EQ 1 THEN $
---
>         IF widgetData.default.trap EQ 1 THEN $
369c369
<     slice_base=widget_base(column=1, group=widgetdata.main_base, $
---
>     slice_base=widget_base(column=1, group=widgetData.gui.main_base, $
375,376c375,376
<       XSIZE=widgetdata.default_vert_slice_size(0), $
<       YSIZE=widgetdata.default_vert_slice_size(1))
---
>       XSIZE=widgetData.default.vert_slice_size(0), $
>       YSIZE=widgetData.default.vert_slice_size(1))
463c463
<     if widgetData.default_trap eq 1 then $
---
>     if widgetData.default.trap eq 1 then $
530c530
<       if widgetData.default_trap eq 1 then $
---
>       if widgetData.default.trap eq 1 then $
602c602
<     slice_Base=WIDGET_BASE(COLUMN=1, GROUP=widgetData.main_base, $
---
>     slice_Base=WIDGET_BASE(COLUMN=1, GROUP=widgetData.gui.main_base, $
679c679
<     if widgetData.default_trap eq 1 then $
---
>     if widgetData.default.trap eq 1 then $
773c773
<   multiple_slice_base=papco_widget_base(column=1, group=widgetdata.main_base, $
---
>   multiple_slice_base=papco_widget_base(column=1, group=widgetData.gui.main_base, $
842c842
< IF (count ne 0) AND (NOT widgetdata.default_slice_reload) THEN BEGIN 
---
> IF (count ne 0) AND (NOT widgetData.default.slice_reload) THEN BEGIN 
853c853
<       if widgetData.default_trap eq 1 then $
---
>       if widgetData.default.trap eq 1 then $
Index: papco_version.pro
===================================================================
RCS file: /data0/n/toaster/u/friedel/cvs/papco/papco/papco/papco_version.pro,v
retrieving revision 1.2
diff -B -b -r1.2 papco_version.pro
56c56
< ver = 'papco - Panel Plot Composer - version 10.6, 20 Nov 2003'
---
> ver = 'papco - Panel Plot Composer - version 10.6, Jeremy Develop'
