Changeset 223

Timestamp:

12/20/07 16:06:24 (4 years ago)

Author:

dcollins

Message:

made inquest plot opions, overplot work

Location:

trunk/Code

Files:

• grab.pro (modified) (1 diff)
• gsh.pro (modified) (1 diff)
• gui.pro (modified) (4 diffs)
• main_window_event.pro (modified) (1 diff)

trunk/Code/grab.pro

@@ -93 +93 @@
                 LocalDomainLeft  = [0.0,0.0,0.0]
                 LocalDomainRight = [1.0,1.0,1.0]
-                LocalFinestWidth = [0.1,0.1,0.1]
+                dimsA = size(LocalA,/dimension)
+                LocalFinestWidth = (LocalDomainRight-LocalDomainLeft)/dimsA
             endelse
+            ;stop
             break
-            
+
         end
 

trunk/Code/gsh.pro

@@ -305 +305 @@
 
 
-;print, "Grids shown:", GoodList[0:nGood-1] + 1
+print, "Grids shown:", GoodList[0:nGood-1] + 1
 if ptr_valid(self.GridsInPlot) then ptr_free, self.GridsInPlot
 self.GridsInPlot = ptr_new(GoodList, /no_copy)

trunk/Code/gui.pro

@@ -55 +55 @@
 ;get new geometry, resize draw window, resize pixmap, replot data.
 case uname of
-    'inq_plot_opts': begin
-        print, "monkey"
-    end
+    'inq_plot_opts': (*top_uvalue).inq_plot_opts = event.value
+    'inquest_overplot': (*top_uvalue).inquest_overplot = event.value
     'inquest_persistent': (*top_uvalue).inquest_persistent = event.value
     'inquest_base': begin 
@@ -195 +194 @@
 if (*top_uvalue).ValidPlot EQ 1 then begin
     if (*top_uvalue).inquest_persistent EQ 1 then begin
-
-
-        ;get data, plot into inquest
+        
+        
+                                ;get data, plot into inquest
         indicies = (*(*top_uvalue).indexLine)
         Xaxis = (*(*top_uvalue).coordline)
         DataLine = (*(*top_uvalue).b)[indicies]
         wset, (*top_uvalue).inquest_pix_number ;use this next
-        plot, Xaxis, DataLine, psym = -5, xstyle=1
+        opts = ""
+        if (*top_uvalue).inq_plot_opts NE "" then opts = ","+(*top_uvalue).inq_plot_opts
+        if (*top_uvalue).inquest_overplot EQ 0 then begin
+            ret = execute('plot, Xaxis, DataLine, xstyle=1' + opts)
+        endif else begin
+            ret = execute('oplot, Xaxis,DataLine' + opts)
+        endelse
         wset, (*top_uvalue).inquest_window_number
         device,copy = [0,0,!d.x_size,!d.y_size,0,0,(*top_uvalue).inquest_pix_number]    
@@ -755 +760 @@
                                event_pro="menu_buttons", uname = "inquest_button",$
                                uvalue = ptr_new({base:inquest_base}) )
-inq_plot_opts  = cw_field(inq_tools,/row,title="plot opts",/string,value = 'this doesnt work yet', $
-                    uname="inq_plot_opts", xsize = 40 )
+inq_plot_opts  = cw_field(inq_tools,/row,title="plot opts",/string,value = 'psym = -5', $
+                    uname="inq_plot_opts", xsize = 40,/all_events )
 
 inq_pers = cw_bgroup(inq_tools,['no','yes'],/col,/exclusive ,set_value = 0, $
                 uname="inquest_persistent", /return_index, label_left='persistent', frame =1)
+
+inq_oplot = cw_bgroup(inq_tools,['no','yes'],/col,/exclusive ,set_value = 0, $
+                uname="inquest_overplot", /return_index, label_left='oplot', frame =1)
 
 inquest_button = widget_button(button_column,value = 'Inquest', $; xsize = button_x,ysize = button_y,$
@@ -938 +946 @@
                                'LineDrawn',0, 'HoldingEnd',0, 'DataLine',DataLine, $
                                'CoordLine',CoordLine, 'IndexLine',IndexLine,$
-                               'inq_plot_opts','', 'vis','hidden', 'inquest_persistent', 0)
+                               'inq_plot_opts','', 'vis','hidden', 'inquest_persistent',0,$
+                               'inquest_overplot', 0,'inquest_plotted', 0)
 ;Things unique to the main window
 main_uvalue = create_struct('object',self, $

trunk/Code/main_window_event.pro

@@ -124 +124 @@
                 DataLine = (*(*top_uvalue).b)[indicies]
                 wset, (*top_uvalue).inquest_pix_number ;use this next
-                plot, Xaxis, DataLine, psym = -5, xstyle=1
+
+                                ;Due to a design error, the first plot
+                                ;is done here. (as the line is drawn.)
+                                ;All persistent and oplots are done in
+                                ;the gui.
+                opts = ""
+                if (*top_uvalue).inq_plot_opts NE "" then opts = ","+(*top_uvalue).inq_plot_opts
+                ret = execute("plot, Xaxis, DataLine,/xstyle" + opts)
                 wset, (*top_uvalue).inquest_window_number