Changeset aa4b8379 in sasview for prview/perspectives/pr/inversion_panel.py

Timestamp:

Jun 18, 2008 4:10:06 PM (16 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:

3fd1ebc

Parents:

4972de2

Message:

Updated for interactive graphs. Improved for standalone use.

File:

• prview/perspectives/pr/inversion_panel.py (modified) (8 diffs)

prview/perspectives/pr/inversion_panel.py

@@ -115 +115 @@
     pos_err  = 1.0
     
-    def __init__(self, parent, id = -1, plots = None, **kwargs):
+    def __init__(self, parent, id = -1, plots = None, standalone=False, **kwargs):
         wx.Panel.__init__(self, parent, id = id, **kwargs)
         
@@ -147 +147 @@
         ## Data manager
         self.manager   = None
+        
+        ## Standalone flage
+        self.standalone = standalone
         
         self._do_layout()
@@ -181 +184 @@
             #self.label_sugg.Show()
         elif name=='plotname':
-            self.plot_data.SetValue(str(value))
-            self.plot_radio.SetValue(True)
+            if self.standalone==False:
+                self.plot_data.SetValue(str(value))
+                self.plot_radio.SetValue(True)
+                self._on_pars_changed(None)
+        elif name=='datafile':
+            self.data_file.SetValue(str(value))
+            self.file_radio.SetValue(True)
             self._on_pars_changed(None)
         else:
@@ -214 +222 @@
             self.alpha_estimate_ctl.GetValue()
         elif name=='plotname':
-            self.plot_data.GetValue()
+            if self.standalone==False:
+                self.plot_data.GetValue()
+        elif name=='datafile':
+            self.data_file.GetValue()
         else:
             wx.Panel.__getattr__(self, name)
@@ -230 +241 @@
 
         # ----- I(q) data -----
-        databox = wx.StaticBox(self, -1, "I(q) data")
+        databox = wx.StaticBox(self, -1, "I(q) data source")
         
         boxsizer1 = wx.StaticBoxSizer(databox, wx.VERTICAL)
@@ -248 +259 @@
         pars_sizer.Add(choose_button, (iy,3), (1,1), wx.RIGHT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         
-        iy += 1
-        self.plot_radio = wx.RadioButton(self, -1, "Plot data:")
-        self.plot_data = wx.TextCtrl(self, -1, size=(100,20))
-        self.plot_data.SetEditable(False)
-        pars_sizer.Add(self.plot_radio, (iy,0), (1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        pars_sizer.Add(self.plot_data, (iy,1), (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        if self.standalone==False:
+            iy += 1
+            self.plot_radio = wx.RadioButton(self, -1, "Plot data:")
+            self.plot_data = wx.TextCtrl(self, -1, size=(100,20))
+            self.plot_data.SetEditable(False)
+            pars_sizer.Add(self.plot_radio, (iy,0), (1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+            pars_sizer.Add(self.plot_data, (iy,1), (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         
         boxsizer1.Add(pars_sizer, 0, wx.EXPAND)
@@ -476 +488 @@
         # If the pars are valid, estimate alpha
         if flag:
-            if self.plot_radio.GetValue():
+            if self.standalone==False and self.plot_radio.GetValue():
                 dataset = self.plot_data.GetValue()
                 self.manager.estimate_plot_inversion(alpha=alpha, nfunc=nfunc, 
@@ -571 +583 @@
         
         if flag:
-            if self.plot_radio.GetValue():
+            if self.standalone==False and self.plot_radio.GetValue():
                 dataset = self.plot_data.GetValue()
-                self.manager.setup_plot_inversion(alpha=alpha, nfunc=nfunc, 
-                                                  d_max=dmax,
-                                                  q_min=qmin, q_max=qmax)
+                if len(dataset.strip())==0:
+                    message = "No data to invert. Select a data set before proceeding with P(r) inversion."
+                    wx.PostEvent(self.manager.parent, StatusEvent(status=message))
+                else:
+                    self.manager.setup_plot_inversion(alpha=alpha, nfunc=nfunc, 
+                                                      d_max=dmax,
+                                                      q_min=qmin, q_max=qmax)
             else:
                 path = self.data_file.GetValue()
-                self.manager.setup_file_inversion(alpha=alpha, nfunc=nfunc, 
-                                                  d_max=dmax, path=path,
-                                                  q_min=qmin, q_max=qmax
-                                                  )
+                if len(path.strip())==0:
+                    message = "No data to invert. Select a data set before proceeding with P(r) inversion."
+                    wx.PostEvent(self.manager.parent, StatusEvent(status=message))
+                else:
+                    self.manager.setup_file_inversion(alpha=alpha, nfunc=nfunc, 
+                                                      d_max=dmax, path=path,
+                                                      q_min=qmin, q_max=qmax
+                                                      )
                 
         else: