Changes in src/sas/sasgui/perspectives/fitting/basepage.py [1f4d708:b4398819] in sasview
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/fitting/basepage.py
r1f4d708 rb4398819 641 641 # get the strings for report 642 642 report_str, text_str = self.state.report(fig_urls=refs) 643 644 643 # Show the dialog 645 644 report_list = [report_str, text_str, images] 646 dialog = ReportDialog(report_list, None, wx.ID_ANY, "")645 dialog = ReportDialog(report_list, imgRAM, refs, None, wx.ID_ANY, "") 647 646 dialog.Show() 648 647 … … 677 676 refs.append('memory:' + name) 678 677 imgRAM.AddFile(name, canvas.bitmap, wx.BITMAP_TYPE_PNG) 679 680 678 # append figs 681 679 images.append(fig) … … 1472 1470 # we need to check here ourselves. 1473 1471 if not is_modified: 1474 is_modified = (self._check_value_enter(self.fittable_param) 1475 or self._check_value_enter(self.fixed_param) 1476 or self._check_value_enter(self.parameters)) 1472 is_modified = self._check_value_enter(self.fittable_param) 1473 is_modified = self._check_value_enter( 1474 self.fixed_param) or is_modified 1475 is_modified = self._check_value_enter( 1476 self.parameters) or is_modified 1477 1477 1478 1478 # Here we should check whether the boundaries have been modified. … … 1536 1536 data=[self.data]) 1537 1537 # Check the values 1538 is_modified = (self._check_value_enter(self.fittable_param)1539 or self._check_value_enter(self.fixed_param)1540 or self._check_value_enter(self.parameters))1538 is_modified = self._check_value_enter(self.fittable_param) 1539 is_modified = self._check_value_enter(self.fixed_param) or is_modified 1540 is_modified = self._check_value_enter(self.parameters) or is_modified 1541 1541 1542 1542 # If qmin and qmax have been modified, update qmin and qmax and … … 2324 2324 2325 2325 # Update value in model if it has changed 2326 if value != self.model.getParam(name): 2326 if (value != self.model.getParam(name) or 2327 (np.isnan(value) and np.isnan(self.model.getParam(name)))): 2327 2328 self.model.setParam(name, value) 2328 2329 is_modified = True … … 2551 2552 # draw 2552 2553 self._draw_model() 2554 self.Layout() 2553 2555 self.Refresh() 2554 2556 except Exception: … … 2799 2801 Function called when 'Help' button is pressed next to model 2800 2802 of interest. This calls DocumentationWindow from 2801 documentation_window.py. It will load the top level of the model 2802 help documenation sphinx generated html if no model is presented. 2803 If a model IS present then if documention for that model exists 2804 it will load to that point otherwise again it will go to the top. 2805 For Wx2.8 and below is used (i.e. non-released through installer) 2806 a browser is loaded and the top of the model documentation only is 2807 accessible because webbrowser module does not pass anything after 2808 the # to the browser. 2803 documentation_window.py. It will load the top level of the html model 2804 help documenation sphinx generated if either a plugin model (which 2805 normally does not have an html help help file) is selected or if no 2806 model is selected. Otherwise, if a regula model is selected, the 2807 documention for that model will be sent to a browser window. 2808 2809 :todo the quick fix for no documentation in plugins is the if statment. 2810 However, the right way to do this would be to check whether the hmtl 2811 file exists and load the model docs if it does and the general docs if 2812 it doesn't - this will become important if we ever figure out how to 2813 build docs for plugins on the fly. Sep 9, 2018 -PDB 2809 2814 2810 2815 :param event: on Help Button pressed event 2811 2816 """ 2812 2817 2813 if self.model is not None: 2818 if (self.model is not None) and (self.categorybox.GetValue() 2819 != "Plugin Models"): 2814 2820 name = self.formfactorbox.GetValue() 2815 2821 _TreeLocation = 'user/models/%s.html' % name
Note: See TracChangeset
for help on using the changeset viewer.