Changes in / [0639476:8d3d20a] in sasview
- Files:
-
- 22 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
docs/sphinx-docs/source/user/analysis.rst
rec860a8f rec860a8f 8 8 .. toctree:: 9 9 :maxdepth: 1 10 10 11 11 Model Fitting <sasgui/perspectives/fitting/fitting> 12 12 13 13 P(r) Inversion <sasgui/perspectives/pr/pr_help> 14 14 15 15 Invariant Calculation <sasgui/perspectives/invariant/invariant_help> 16 17 Correlation Function <sasgui/perspectives/corfunc/corfunc_help> -
sasview/local_config.py
rc1fdf84 rc1fdf84 95 95 GUIFRAME_WIDTH = 1150 96 96 GUIFRAME_HEIGHT = 840 97 PLUGIN_STATE_EXTENSIONS = ['.fitv', '.inv', '.prv' ]97 PLUGIN_STATE_EXTENSIONS = ['.fitv', '.inv', '.prv', '.cor'] 98 98 PLUGINS_WLIST = ['Fitting files (*.fitv)|*.fitv', 99 99 'Invariant files (*.inv)|*.inv', 100 'P(r) files (*.prv)|*.prv'] 100 'P(r) files (*.prv)|*.prv', 101 'Corfunc files (*.cor)|*.cor'] 101 102 PLOPANEL_WIDTH = 415 102 103 PLOPANEL_HEIGTH = 370 -
sasview/sasview.py
rcde6e52 rcde6e52 148 148 logging.error(traceback.format_exc()) 149 149 150 # Corfunc perspective 151 try: 152 import sas.sasgui.perspectives.corfunc as module 153 corfunc_plug = module.Plugin() 154 self.gui.add_perspective(corfunc_plug) 155 except: 156 logging.error("Unable to load corfunc module") 157 150 158 #Calculator perspective 151 159 try: -
src/sas/sasgui/guiframe/events.py
rd85c194 r6ffa0dd 8 8 # plot Qrange 9 9 (PlotQrangeEvent, EVT_PLOT_QRANGE) = wx.lib.newevent.NewEvent() 10 # set plot limits 11 (PlotLimitEvent, EVT_PLOT_LIM) = wx.lib.newevent.NewEvent() 10 12 # print the messages on statusbar 11 13 (StatusEvent, EVT_STATUS) = wx.lib.newevent.NewEvent() 12 #create a panel slicer 14 #create a panel slicer 13 15 (SlicerPanelEvent, EVT_SLICER_PANEL) = wx.lib.newevent.NewEvent() 14 #print update paramaters for panel slicer 16 #print update paramaters for panel slicer 15 17 (SlicerParamUpdateEvent, EVT_SLICER_PARS_UPDATE) = wx.lib.newevent.NewEvent() 16 #update the slicer from the panel 18 #update the slicer from the panel 17 19 (SlicerParameterEvent, EVT_SLICER_PARS) = wx.lib.newevent.NewEvent() 18 20 #slicer event -
src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py
r895c9cb r245ae18 95 95 self.parent.SetFocus() 96 96 97 # If true, there are 3 qrange bars 98 self.is_corfunc = False 99 97 100 98 101 def get_symbol_label(self): … … 214 217 if active_ctrl == None: 215 218 return 219 if hasattr(event, 'is_corfunc'): 220 self.is_corfunc = event.is_corfunc 216 221 if event.id in self.plots.keys(): 217 222 ctrl = event.ctrl … … 222 227 values = [max(x_data.min(), float(ctrl[0].GetValue())), 223 228 min(x_data.max(), float(ctrl[1].GetValue()))] 229 if len(ctrl) == 3: 230 colors.append('purple') 231 values.append(min(x_data.max(), float(ctrl[2].GetValue()))) 224 232 if self.ly == None: 225 233 self.ly = [] … … 232 240 xval = float(active_ctrl.GetValue()) 233 241 position = self.get_data_xy_vals(xval) 234 if position != None :242 if position != None and not self.is_corfunc: 235 243 wx.PostEvent(self.parent, StatusEvent(status=position)) 236 244 except: … … 293 301 ly0x = ly[0].get_xdata() 294 302 ly1x = ly[1].get_xdata() 303 ly2x = None 304 if self.is_corfunc: ly2x = ly[2].get_xdata() 295 305 self.q_ctrl[0].SetBackgroundColour('white') 296 306 self.q_ctrl[1].SetBackgroundColour('white') … … 306 316 self.q_ctrl[0].SetValue(str(pos_x)) 307 317 self.q_ctrl[1].SetBackgroundColour('pink') 318 elif ly2x is not None and ly1x >= ly2x: 319 if self.vl_ind == 1: 320 ly[2].set_xdata(posx) 321 ly[2].set_zorder(nop) 322 self.q_ctrl[2].SetValue(str(pos_x)) 323 elif self.vl_ind == 2: 324 ly[1].set_xdata(posx) 325 ly[1].set_zorder(nop) 326 self.q_ctrl[1].SetValue(str(pos_x)) 327 308 328 309 329 def _get_cusor_lines(self, event): … … 325 345 dqmin = math.fabs(event.xdata - self.ly[0].get_xdata()) 326 346 dqmax = math.fabs(event.xdata - self.ly[1].get_xdata()) 327 is_qmax = dqmin > dqmax 328 if is_qmax: 329 self.vl_ind = 1 347 if not self.is_corfunc: 348 is_qmax = dqmin > dqmax 349 if is_qmax: 350 self.vl_ind = 1 351 else: 352 self.vl_ind = 0 330 353 else: 331 self.vl_ind = 0 354 dqmax2 = math.fabs(event.xdata - self.ly[2].get_xdata()) 355 closest = min(dqmin, dqmax, dqmax2) 356 self.vl_ind = { dqmin: 0, dqmax: 1, dqmax2: 2 }.get(closest) 332 357 333 358 def cusor_line(self, event): -
src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py
rd85c194 r6ffa0dd 16 16 from sas.sasgui.guiframe.events import EVT_NEW_PLOT 17 17 from sas.sasgui.guiframe.events import EVT_PLOT_QRANGE 18 from sas.sasgui.guiframe.events import EVT_PLOT_LIM 18 19 from sas.sasgui.guiframe.events import DeletePlotPanelEvent 19 20 from sas.sasgui.guiframe.plugin_base import PluginBase … … 79 80 self.parent.Bind(EVT_NEW_PLOT, self._on_plot_event) 80 81 self.parent.Bind(EVT_PLOT_QRANGE, self._on_plot_qrange) 82 self.parent.Bind(EVT_PLOT_LIM, self._on_plot_lim) 81 83 # We have no initial panels for this plug-in 82 84 return [] … … 95 97 return 96 98 panel.on_plot_qrange(event) 99 100 def _on_plot_lim(self, event=None): 101 if event == None: 102 return 103 if event.id in self.plot_panels.keys(): 104 panel = self.plot_panels[event.id] 105 elif event.group_id in self.plot_panels.keys(): 106 panel = self.plot_panels[event.group_id] 107 else: 108 return 109 if hasattr(event, 'xlim'): 110 panel.subplot.set_xlim(event.xlim) 111 if hasattr(event, 'ylim'): 112 panel.subplot.set_ylim(event.ylim) 113 97 114 98 115 def _on_show_panel(self, event): … … 312 329 new_panel = self.create_2d_panel(data, group_id) 313 330 self.create_panel_helper(new_panel, data, group_id, title) 331 if hasattr(event, 'xlim'): 332 new_panel.subplot.set_xlim(event.xlim) 333 if hasattr(event, 'ylim'): 334 new_panel.subplot.set_ylim(event.ylim) 314 335 return
Note: See TracChangeset
for help on using the changeset viewer.