Changeset 2dbb681 in sasview for sansview/perspectives/fitting/fitpage1D.py

Timestamp:

Oct 21, 2008 10:30:12 AM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

5893cdb

Parents:

b3328d8

Message:

change window title

File:

• sansview/perspectives/fitting/fitpage1D.py (modified) (5 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -135 +135 @@
         ix +=2
         self.sizer1.Add(self.btFit,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        iy+= 1
-        ix = 3
+        ix+= 1
         self.sizer1.Add( self.btClose,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix= 1
+        iy+=1
+        self.sizer1.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         # contains link between  model ,all its parameters, and panel organization
         self.parameters=[]
@@ -183 +185 @@
             @return residuals
         """
-        print self.data.x
-        print self.data.y
-        print self.data.dy
         
         flag=self.checkFitRange()
@@ -293 +292 @@
         valueMax = self.xmax.GetValue()
         # Check for possible values entered
-        print "fitpage: checkfitrange:",valueMin,valueMax
+        #print "fitpage: checkfitrange:",valueMin,valueMax
         try:
             if (float(valueMax)> float(valueMin)):
@@ -341 +340 @@
         self.model = model
         keys = self.model.getParamList()
+        print "fitpage1D : dispersion list",self.model.getDispParamList()
         keys.sort()
         iy = 1
@@ -436 +436 @@
             for item in self.parameters:
                 try:
-                     name=str(item[0].GetLabelText())
-                     value= float(item[1].GetValue())
-                     self.model.setParam(name,value) 
+                     
+                    name=str(item[0].GetLabelText())
+                    value= float(item[1].GetValue())
+                    self.model.setParam(name,value) 
                 except:
                      wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\