Changeset 22ae2f7 in sasview


Ignore:
Timestamp:
Feb 15, 2015 10:53:12 AM (9 years ago)
Author:
pkienzle
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:
8836849
Parents:
d8c4019
Message:

set default bounds from model in UI (closes #229)

Location:
src/sas
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/models/include/cylinder.h

    r79492222 r22ae2f7  
    3434 
    3535  /// Radius of the cylinder [A] 
    36   //  [DEFAULT]=radius=20.0 [A] 
     36  //  [DEFAULT]=radius=20.0 [A] 0.0 1e10 
    3737  Parameter radius; 
    3838 
    3939  /// Length of the cylinder [A] 
    40   //  [DEFAULT]=length=400.0 [A] 
     40  //  [DEFAULT]=length=400.0 [A] 0.0 1e10 
    4141  Parameter length; 
    4242 
  • src/sas/perspectives/fitting/fitpage.py

    r9e11cf5 r22ae2f7  
    30133013                    if not self.is_mac: 
    30143014                        ctl2.Hide() 
    3015                      
     3015 
    30163016                    ix += 1 
    30173017                    ctl3 = self.ModelTextCtrl(self, -1, 
     
    30193019                                              style=wx.TE_PROCESS_ENTER, 
    30203020                                text_enter_callback=self._onparamRangeEnter) 
    3021           
     3021                    min_bound = self.model.details[item][1] 
     3022                    if min_bound is not None: 
     3023                        ctl3.SetValue(format_number(min_bound, True)) 
     3024 
    30223025                    sizer.Add(ctl3, (iy, ix), (1, 1), 
    30233026                              wx.EXPAND | wx.ADJUST_MINSIZE, 0) 
     
    30283031                                              style=wx.TE_PROCESS_ENTER, 
    30293032                                text_enter_callback=self._onparamRangeEnter) 
     3033                    max_bound = self.model.details[item][2] 
     3034                    if max_bound is not None: 
     3035                        ctl4.SetValue(format_number(max_bound, True)) 
    30303036                    sizer.Add(ctl4, (iy, ix), (1, 1), 
    30313037                              wx.EXPAND | wx.FIXED_MINSIZE, 0) 
Note: See TracChangeset for help on using the changeset viewer.