Changeset f552ff3 in sasview for src/sas/perspectives


Ignore:
Timestamp:
Mar 24, 2015 10:42:33 PM (10 years ago)
Author:
butler
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:
f71700b
Parents:
dea2f6e (diff), 9f7fbd9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of https://github.com/SasView/sasview.git

Location:
src/sas/perspectives/pr
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/perspectives/pr/explore_dialog.py

    r8b21fa7 r0efb04d  
    257257        or when a new computation is finished. 
    258258        """ 
     259        self.npts_ctl.SetFocus() 
    259260        # Get the output type selection 
    260261        output_type = self.output_box.GetString(self.output_box.GetSelection()) 
     
    329330        # Ouput selection box 
    330331        selection_msg = wx.StaticText(self, -1, "Select a dependent variable:") 
    331         self.output_box = wx.ComboBox(self, -1) 
     332        self.output_box = wx.ComboBox(self, -1, style=wx.CB_READONLY) 
    332333        for item in self.results.outputs.keys(): 
    333334            self.output_box.Append(item, "") 
    334335        self.output_box.SetStringSelection(DEFAULT_OUTPUT) 
     336        self.output_box.SetEditable(False) 
    335337 
    336338        output_sizer = wx.GridBagSizer(5, 5) 
  • src/sas/perspectives/pr/inversion_panel.py

    rdea2f6e rf552ff3  
    703703        try: 
    704704            alpha = self.alpha_estimate_ctl.GetLabel() 
    705             self.alpha_ctl.SetValue(float(alpha)) 
     705            # Check that we have a number 
     706            float(alpha) 
     707            self.alpha_ctl.SetValue(alpha) 
     708        except ValueError: 
     709            logging.error("InversionControl._on_accept_alpha got a value that was not a number: %s" % alpha ) 
    706710        except: 
    707711            # No estimate or bad estimate, either do nothing 
     
    715719        try: 
    716720            nterms = self.nterms_estimate_ctl.GetLabel() 
    717             self.nfunc_ctl.SetValue(float(nterms)) 
     721            # Check that we have a number 
     722            float(nterms) 
     723            self.nfunc_ctl.SetValue(nterms) 
     724        except ValueError: 
     725            logging.error("InversionControl._on_accept_nterms got a value that was not a number: %s" % nterms ) 
    718726        except: 
    719727            # No estimate or bad estimate, either do nothing 
Note: See TracChangeset for help on using the changeset viewer.