Changeset 22ae2f7 in sasview

Timestamp:

Feb 15, 2015 12:53:12 PM (10 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:

• models/include/cylinder.h (modified) (1 diff)
• perspectives/fitting/fitpage.py (modified) (3 diffs)

src/sas/models/include/cylinder.h

@@ -34 +34 @@
 
   /// Radius of the cylinder [A]
-  //  [DEFAULT]=radius=20.0 [A]
+  //  [DEFAULT]=radius=20.0 [A] 0.0 1e10
   Parameter radius;
 
   /// Length of the cylinder [A]
-  //  [DEFAULT]=length=400.0 [A]
+  //  [DEFAULT]=length=400.0 [A] 0.0 1e10
   Parameter length;
 

src/sas/perspectives/fitting/fitpage.py

@@ -3013 +3013 @@
                     if not self.is_mac:
                         ctl2.Hide()
-                    
+
                     ix += 1
                     ctl3 = self.ModelTextCtrl(self, -1,
@@ -3019 +3019 @@
                                               style=wx.TE_PROCESS_ENTER,
                                 text_enter_callback=self._onparamRangeEnter)
-         
+                    min_bound = self.model.details[item][1]
+                    if min_bound is not None:
+                        ctl3.SetValue(format_number(min_bound, True))
+
                     sizer.Add(ctl3, (iy, ix), (1, 1),
                               wx.EXPAND | wx.ADJUST_MINSIZE, 0)
@@ -3028 +3031 @@
                                               style=wx.TE_PROCESS_ENTER,
                                 text_enter_callback=self._onparamRangeEnter)
+                    max_bound = self.model.details[item][2]
+                    if max_bound is not None:
+                        ctl4.SetValue(format_number(max_bound, True))
                     sizer.Add(ctl4, (iy, ix), (1, 1),
                               wx.EXPAND | wx.FIXED_MINSIZE, 0)