Changeset eccbf14 in sasview for src/sas


Ignore:
Timestamp:
Jul 5, 2016 9:56:31 AM (8 years ago)
Author:
wojciech
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:
b61bd57, 3409a90
Parents:
6fb559d (diff), 7c1d04a (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.
git-author:
wpotrzebowski <Wojciech.Potrzebowski@…> (07/05/16 04:03:13)
git-committer:
wpotrzebowski <Wojciech.Potrzebowski@…> (07/05/16 09:56:31)
Message:

Adding exception for reading the old custom models from plugin_models dir

Location:
src/sas/sasgui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/plottools/fitDialog.py

    rd7bb526 r7c1d04a  
    516516            if self.Rgerr_tctr.IsShown(): 
    517517                if rg != None and rg != 0: 
    518                     value = format_number(3 * float(cstA) / (2 * rg)) 
     518                    value = format_number(3 * float(errA) / (2 * rg)) 
    519519                else: 
    520520                    value = '' 
    521521                self.Rgerr_tctr.SetValue(value) 
    522522                if self.I0err_tctr.IsShown(): 
    523                     val = numpy.abs(numpy.exp(cstB) - numpy.exp(cstB + errB)) 
     523                    val = numpy.abs(numpy.exp(cstB) * errB) 
    524524                    self.I0err_tctr.SetValue(format_number(val)) 
    525525            if self.Diameter_tctr.IsShown(): 
     
    534534                self.Diametererr_tctr.SetValue(value) 
    535535            if self.RgQmin_tctr.IsShown(): 
    536                 value = format_number(rg * self.mini) 
     536                value = format_number(rg * self.floatInvTransform(self.mini)) 
    537537                self.RgQmin_tctr.SetValue(value) 
    538538            if self.RgQmax_tctr.IsShown(): 
    539                 value = format_number(rg * self.maxi) 
     539                value = format_number(rg * self.floatInvTransform(self.maxi)) 
    540540                self.RgQmax_tctr.SetValue(value) 
    541541 
  • src/sas/sasgui/perspectives/fitting/models.py

    r7673ecd r6fb559d  
    181181            try: 
    182182                model = load_custom_model(path) 
     183                plugins[model.name] = model 
    183184            except Exception: 
    184185                msg = traceback.format_exc() 
     
    187188                logging.warning("Failed to load plugin %r. See %s for details" 
    188189                                % (path, PLUGIN_LOG)) 
    189             plugins[model.name] = model 
    190  
     190             
    191191    return plugins 
    192192 
Note: See TracChangeset for help on using the changeset viewer.