Changeset 6d3d5ff in sasview

Timestamp:

Feb 2, 2011 5:52:03 PM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

c8deee5

Parents:

52725d6

Message:

working on save state for prview

Location:

prview

Files:

• images/ball.png (added)
• perspectives/pr/inversion_panel.py (modified) (9 diffs)
• perspectives/pr/pr.py (modified) (1 diff)

prview/perspectives/pr/inversion_panel.py

@@ -77 +77 @@
         self.distance_explorator_ctl = None
         ## Data manager
-        self.manager   = None
+        self._manager   = None
         ## Standalone flage
         self.standalone = standalone
@@ -255 +255 @@
         state = self.get_state()
             
-        self.manager.save_data(filepath=path, prstate=state)
+        self._manager.save_data(filepath=path, prstate=state)
         
         return state
+    
+    def get_data(self):
+        """
+        """
+        return self._manager.get_data()
     
     def get_state(self):
@@ -362 +367 @@
         
     def set_manager(self, manager):
-        self.manager = manager
+        self._manager = manager
         
     def _do_layout(self):
@@ -720 +725 @@
         Resets inversion parameters
         """
-        self.nfunc = self.manager.DEFAULT_NFUNC
-        self.d_max = self.manager.DEFAULT_DMAX
-        self.alpha = self.manager.DEFAULT_ALPHA
+        self.nfunc = self._manager.DEFAULT_NFUNC
+        self.d_max = self._manager.DEFAULT_DMAX
+        self.alpha = self._manager.DEFAULT_ALPHA
         self.qmin_ctl.SetValue("")
         self.qmax_ctl.SetValue("")
@@ -754 +759 @@
             
             dataset = self.plot_data.GetValue()
-            self.manager.estimate_plot_inversion(alpha=alpha, nfunc=nfunc, 
+            self._manager.estimate_plot_inversion(alpha=alpha, nfunc=nfunc, 
                                                  d_max=dmax,
                                                  q_min=qmin, q_max=qmax,
@@ -823 +828 @@
         try:
             nfunc = int(self.nfunc_ctl.GetValue())
-            npts = self.manager.get_npts()
+            npts = self._manager.get_npts()
             if npts > 0 and nfunc > npts:
                 message = "Number of function terms should be smaller "
                 message += "than the number of points"
-                wx.PostEvent(self.manager.parent, StatusEvent(status=message))
+                wx.PostEvent(self._manager.parent, StatusEvent(status=message))
                 raise ValueError, message
             self.nfunc_ctl.SetBackgroundColour(wx.WHITE)
@@ -871 +876 @@
         """
         from explore_dialog import ExploreDialog
-        if self.manager._last_pr is not None:
-            pr = self.manager._create_plot_pr()
+        if self._manager._last_pr is not None:
+            pr = self._manager._create_plot_pr()
             dialog = ExploreDialog(pr, 10, None, -1, "")
             dialog.ShowModal()
         else:
             message = "No data to analyze. Please load a data set to proceed."
-            wx.PostEvent(self.manager.parent, StatusEvent(status=message))
+            wx.PostEvent(self._manager.parent, StatusEvent(status=message))
             
     def _on_invert(self, evt):
@@ -897 +902 @@
                 message = "No data to invert. Select a data set before"
                 message += " proceeding with P(r) inversion."
-                wx.PostEvent(self.manager.parent, StatusEvent(status=message))
+                wx.PostEvent(self._manager.parent, StatusEvent(status=message))
             else:
-                self.manager.setup_plot_inversion(alpha=alpha, nfunc=nfunc, 
+                self._manager.setup_plot_inversion(alpha=alpha, nfunc=nfunc, 
                                                   d_max=dmax,
                                                   q_min=qmin, q_max=qmax,
@@ -914 +919 @@
         Choose a new input file for I(q)
         """
-        if not self.manager is None:
+        if not self._manager is None:
             self.plot_data.SetValue(str(data.name))
             try:
-                self.manager.show_data(data=data, reset=True)
+                self._manager.show_data(data=data, reset=True)
                 self._on_pars_changed(None)
                 self._on_invert(None)

prview/perspectives/pr/pr.py

@@ -108 +108 @@
         # Create a CanSAS/Pr reader
         self.state_reader = Reader(self.set_state)
+        self._extensions = '.prv'
         l = Loader()
         l.associate_file_reader('.prv', self.state_reader)
-        l.associate_file_reader(".sav", self.state_reader)
+        l.associate_file_reader(".svs", self.state_reader)
                 
         # Log startup
         logging.info("Pr(r) plug-in started")
         
+    def get_data(self):
+        """
+        """
+        return self.current_plottable
+    
     def set_state(self, state, datainfo=None):
         """