Changeset 119a11d in sasview for prview/perspectives
- Timestamp:
- May 21, 2008 11:30:21 AM (16 years ago)
- 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
- Location:
- prview/perspectives/pr
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
prview/perspectives/pr/inversion_panel.py
r634f1cf r119a11d 244 244 explanation += "The minimization involves a regularization term to ensure " 245 245 explanation += "a smooth P(r). The alpha parameter gives the size of that " 246 explanation += "term. The suggested value is the value above which the "246 explanation += "term. The suggested value is the value above which the " 247 247 explanation += "output P(r) will have only one peak." 248 248 label_explain = wx.StaticText(self, -1, explanation, size=(280,80)) … … 526 526 527 527 528 529 530 class HelpDialog(wx.Dialog): 531 def __init__(self, parent, id): 532 from sans.pr.invertor import help 533 wx.Dialog.__init__(self, parent, id, size=(400, 400)) 534 self.SetTitle("P(r) help") 535 536 537 vbox = wx.BoxSizer(wx.VERTICAL) 538 539 explanation = help() 540 541 label_explain = wx.StaticText(self, -1, explanation, size=(350,300)) 542 543 vbox.Add(label_explain, 0, wx.ALL|wx.EXPAND, 15) 544 545 546 static_line = wx.StaticLine(self, -1) 547 vbox.Add(static_line, 0, wx.EXPAND, 0) 548 549 button_OK = wx.Button(self, wx.ID_OK, "OK") 550 #button_Cancel = wx.Button(self, wx.ID_CANCEL, "Cancel") 551 552 sizer_button = wx.BoxSizer(wx.HORIZONTAL) 553 sizer_button.Add((20, 20), 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0) 554 sizer_button.Add(button_OK, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10) 555 #sizer_button.Add(button_Cancel, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10) 556 vbox.Add(sizer_button, 0, wx.EXPAND|wx.BOTTOM|wx.TOP, 10) 557 558 self.SetSizer(vbox) 559 self.SetAutoLayout(True) 560 561 self.Layout() 562 self.Centre() 563 564 528 565 class ParsDialog(wx.Panel): 529 566 """ … … 666 703 def OnInit(self): 667 704 wx.InitAllImageHandlers() 668 plots = {} 669 plots['a'] = TestPlot("data 1") 670 plots['b'] = TestPlot("data 2") 671 #plots['c'] = TestPlot("data 3") 672 #plots['d'] = TestPlot("data 1") 673 #plots['e'] = TestPlot("data 2") 674 #plots['f'] = TestPlot("data 3") 675 dialog = InversionDlg(None, -1, "P(r) parameters", plots) 705 dialog = HelpDialog(None, -1) 676 706 if dialog.ShowModal() == wx.ID_OK: 677 p rint dialog.get_content()707 pass 678 708 dialog.Destroy() 679 709 -
prview/perspectives/pr/pr.py
r634f1cf r119a11d 58 58 shapes.Append(id, '&Sphere test') 59 59 wx.EVT_MENU(owner, id, self._fit_pr) 60 60 61 return [(id, shapes, "P(r)")] 62 63 def help(self, evt): 64 """ 65 Show a general help dialog. 66 TODO: replace the text with a nice image 67 """ 68 from inversion_panel import HelpDialog 69 dialog = HelpDialog(None, -1) 70 if dialog.ShowModal() == wx.ID_OK: 71 dialog.Destroy() 72 else: 73 dialog.Destroy() 61 74 62 75 def _fit_pr(self, evt): -
prview/perspectives/pr/requirements.txt
r634f1cf r119a11d 19 19 15. Add online help for inputs and outputs (especially figures of merit) 20 20 16. Add help text to the interface (description of what we are minimizing, to explain alpha and nfunc). 21 17. Get rid of all output prints. 22 18. Clean up 23 19. Replace help dialog text with a nice image. Mention how to choose alpha and what the suggested alpha means.
Note: See TracChangeset
for help on using the changeset viewer.