Changeset 6ef7ac5a in sasview for simview/perspectives/simulation/simulation.py

Timestamp:

Dec 31, 2009 6:26:14 PM (14 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6bbcbd9

Parents:

7e8601f

Message:

simview: update simulation when Q range and point density are changed from the control panel; show P(r) plot.

File:

• simview/perspectives/simulation/simulation.py (modified) (7 diffs)

simview/perspectives/simulation/simulation.py

@@ -71 +71 @@
 ## Default number of q point for simulation output
 DEFAULT_Q_NPTS = 10
+## Default number of real-space points per Angstrom cube
+DEFAULT_PT_DENSITY = 0.1
    
 class Plugin:
@@ -105 +107 @@
 
         # Central simulation panel
-        self.paramPanel = ShapeParameters.ShapeParameterPanel(self.parent, style=wx.RAISED_BORDER)
+        self.paramPanel = ShapeParameters.ShapeParameterPanel(self.parent, 
+                                                              q_min = self.q_min,
+                                                              q_max = self.q_max,
+                                                              q_npts = self.q_npts,
+                                                              pt_density = DEFAULT_PT_DENSITY,
+                                                              style=wx.RAISED_BORDER)
         
         # Simulation
         self.volCanvas = VolumeCanvas.VolumeCanvas()
-        self.volCanvas.setParam('lores_density', 0.1)
+        self.volCanvas.setParam('lores_density', DEFAULT_PT_DENSITY)
         self.adapter = ShapeAdapter.ShapeVisitor()
         self._data_1D = None
@@ -128 +135 @@
         self.parent.Bind(ShapeParameters.EVT_ADD_SHAPE, self._onAddShape)
         self.parent.Bind(ShapeParameters.EVT_DEL_SHAPE, self._onDelShape)
+        self.parent.Bind(ShapeParameters.EVT_Q_RANGE, self._on_q_range_changed)
+        self.parent.Bind(ShapeParameters.EVT_PT_DENSITY, self._on_pt_density_changed)
 
         return [self.plotPanel, self.paramPanel]
@@ -166 +175 @@
         # Refresh the 3D viewer
         self._refresh_3D_viewer()   
+        
+    def _on_q_range_changed(self, evt):
+        """
+            Modify the Q range of the simulation output
+        """
+        if evt.q_min is not None:
+            self.q_min = evt.q_min
+        if evt.q_max is not None:
+            self.q_max = evt.q_max
+        if evt.npts is not None:
+            self.q_npts = evt.npts
+        
+        # Q-values for plotting simulated I(Q)
+        step = (self.q_max-self.q_min)/(self.q_npts-1)
+        self.x = numpy.arange(self.q_min, self.q_max+step*0.01, step)    
+         
+        # Compute the simulated I(Q)
+        self._simulate_Iq()
+        
+    def _on_pt_density_changed(self, evt):
+        """
+            Modify the Q range of the simulation output
+        """
+        if evt.npts is not None:
+            self.volCanvas.setParam('lores_density', evt.npts)
+         
+        # Compute the simulated I(Q)
+        self._simulate_Iq()
         
     def _simulate_Iq(self):
@@ -212 +249 @@
         # Create the plotting event to pop up the I(Q) plot.
         new_plot = Data1D(x=self.x, y=output, dy=error)
-        new_plot.name = "Simulation"
+        new_plot.name = "I(Q) Simulation"
         new_plot.group_id = "simulation_output"
         new_plot.xaxis("\\rm{Q}", 'A^{-1}')
         new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
-        wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Simulation output"))
+        wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Simulation I(Q)"))
+        
+        # Create the plotting event to pop up the P(r) plot.
+        r, pr = self.volCanvas.getPrData()
+        new_plot = Data1D(x=r, y=pr, dy=[0]*len(r))
+        new_plot.name = "P(r) Simulation"
+        new_plot.group_id = "simulated_pr"
+        new_plot.xaxis("\\rm{r}", 'A')
+        new_plot.yaxis("\\rm{P(r)} ","cm^{-3}") 
+        
+        wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Simulated P(r)"))        
+        
         
         # Notify the user of the simlation time and update the basic
@@ -235 +283 @@
     def populate_menu(self, id, owner):
         """
-            -- TEMPORARY --
             Create a menu for the plug-in
-            
-            #TODO: remove this method once:
-                1- P(r) is plotted with the I(q) simulation result
-        """
-        # Shapes
-        shapes = wx.Menu()
- 
-        #TODO: Save P(r) should be replaced by plotting P(r) for each simulation
-        id = wx.NewId()
-        shapes.Append(id, '&Save P(r) output')
-        wx.EVT_MENU(self.parent, id, self._onSavePr)
-
-        return [(id+1, shapes, "Save P(r)")]  
+        """
+        return []  
     
     def _change_point_density(self, point_density):
@@ -257 +293 @@
         """
         self.volCanvas.setParam('lores_density', point_density)
-    
-    def _onSavePr(self, evt):
-        """
-            Save the current P(r) output to a file
-            TODO: refactor this away once P(r) is plotted
-        """      
-        path = None
-        dlg = wx.FileDialog(None, "Choose a file", self._default_save_location, "", "*.txt", wx.SAVE)
-        if dlg.ShowModal() == wx.ID_OK:
-            path = dlg.GetPath()
-            self._default_save_location = os.path.dirname(path)
-        dlg.Destroy()
-        
-        if not path == None:
-            self.volCanvas.write_pr(path)    
     
     def help(self, evt):