Changeset be0fe41 in sasview for calculatorview


Ignore:
Timestamp:
Jan 11, 2013 11:30:24 AM (12 years ago)
Author:
Jae Cho <jhjcho@…>
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:
440006a
Parents:
1b28ff5
Message:

multiplication model fix and other minor fixes

Location:
calculatorview/src/sans/perspectives/calculator
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py

    rdbc01f2 rbe0fe41  
    11521152        self.npixels_sizer = wx.BoxSizer(wx.HORIZONTAL) 
    11531153        self.box_sld = wx.StaticBox(self, -1,  
    1154                                     str("Scattering Length (Density)")) 
     1154                                    str("Mean SLD")) 
    11551155        self.box_node = wx.StaticBox(self, -1, str("Nodes")) 
    11561156        self.boxsizer_sld = wx.StaticBoxSizer(self.box_sld, wx.VERTICAL) 
  • calculatorview/src/sans/perspectives/calculator/model_editor.py

    r318b5bbb rbe0fe41  
    12681268         
    12691269        ## setParam to p model  
    1270         model_pre = name.split('_', 1)[0] 
    1271         new_name = name.split('_', 1)[1] 
     1270        model_pre = '' 
     1271        new_name = '' 
     1272        name_split = name.split('_', 1) 
     1273        if len(name_split) == 2: 
     1274            model_pre = name.split('_', 1)[0] 
     1275            new_name = name.split('_', 1)[1] 
    12721276        if model_pre == "p1": 
    12731277            if new_name in self.p_model1.getParamList(): 
     
    12761280             if new_name in self.p_model2.getParamList(): 
    12771281                self.p_model2.setParam(new_name, value) 
    1278         elif name.lower() == 'scale_factor': 
     1282        elif name == 'scale_factor': 
    12791283            self.params['scale_factor'] = value 
    12801284        else: 
Note: See TracChangeset for help on using the changeset viewer.