Changeset 119a11d in sasview

Timestamp:

May 21, 2008 11:30:21 AM (17 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:

fa452e4

Parents:

9a11937

Message:

Added help and updated requirements

Location:

prview/perspectives/pr

Files:

• inversion_panel.py (modified) (3 diffs)
• pr.py (modified) (1 diff)
• requirements.txt (modified) (1 diff)

prview/perspectives/pr/inversion_panel.py

@@ -244 +244 @@
         explanation += "The minimization involves a regularization term to ensure "
         explanation += "a smooth P(r). The alpha parameter gives the size of that "  
-        explanation += "term. The suggested value is the value above which the"
+        explanation += "term. The suggested value is the value above which the "
         explanation += "output P(r) will have only one peak."
         label_explain = wx.StaticText(self, -1, explanation, size=(280,80))
@@ -526 +526 @@
         
 
+
+
+class HelpDialog(wx.Dialog):
+    def __init__(self, parent, id):
+        from sans.pr.invertor import help
+        wx.Dialog.__init__(self, parent, id, size=(400, 400))
+        self.SetTitle("P(r) help") 
+        
+
+        vbox = wx.BoxSizer(wx.VERTICAL)
+
+        explanation = help()
+           
+        label_explain = wx.StaticText(self, -1, explanation, size=(350,300))
+            
+        vbox.Add(label_explain, 0, wx.ALL|wx.EXPAND, 15)
+
+
+        static_line = wx.StaticLine(self, -1)
+        vbox.Add(static_line, 0, wx.EXPAND, 0)
+        
+        button_OK = wx.Button(self, wx.ID_OK, "OK")
+        #button_Cancel = wx.Button(self, wx.ID_CANCEL, "Cancel")
+        
+        sizer_button = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_button.Add((20, 20), 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        sizer_button.Add(button_OK, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
+        #sizer_button.Add(button_Cancel, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)        
+        vbox.Add(sizer_button, 0, wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
+
+        self.SetSizer(vbox)
+        self.SetAutoLayout(True)
+        
+        self.Layout()
+        self.Centre()
+
+
 class ParsDialog(wx.Panel):
     """
@@ -666 +703 @@
     def OnInit(self):
         wx.InitAllImageHandlers()
-        plots = {}
-        plots['a'] = TestPlot("data 1")
-        plots['b'] = TestPlot("data 2")
-        #plots['c'] = TestPlot("data 3")
-        #plots['d'] = TestPlot("data 1")
-        #plots['e'] = TestPlot("data 2")
-        #plots['f'] = TestPlot("data 3")
-        dialog = InversionDlg(None, -1, "P(r) parameters", plots)
+        dialog = HelpDialog(None, -1)
         if dialog.ShowModal() == wx.ID_OK:
-            print dialog.get_content()
+            pass
         dialog.Destroy()
         

prview/perspectives/pr/pr.py

@@ -58 +58 @@
         shapes.Append(id, '&Sphere test')
         wx.EVT_MENU(owner, id, self._fit_pr)
+        
         return [(id, shapes, "P(r)")]
+    
+    def help(self, evt):
+        """
+            Show a general help dialog. 
+            TODO: replace the text with a nice image
+        """
+        from inversion_panel import HelpDialog
+        dialog = HelpDialog(None, -1)
+        if dialog.ShowModal() == wx.ID_OK:
+            dialog.Destroy()
+        else:
+            dialog.Destroy()
     
     def _fit_pr(self, evt):

prview/perspectives/pr/requirements.txt

@@ -19 +19 @@
 15. Add online help for inputs and outputs (especially figures of merit)
 16. Add help text to the interface (description of what we are minimizing, to explain alpha and nfunc).
+17. Get rid of all output prints.
+18. Clean up
+19. Replace help dialog text with a nice image. Mention how to choose alpha and what the suggested alpha means.