Changeset 55fd102 in sasview

Timestamp:

Sep 22, 2008 9:49:59 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:

2e83ff3

Parents:

916a15f

Message:

modified constraint button

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (3 diffs)
• fitting.py (modified) (4 diffs)
• modelpage.py (modified) (2 diffs)
• simfitpage.py (modified) (3 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -102 +102 @@
         self.sizer4.Add(self.xmin,(iy, ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         self.xmin.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
+        self.xmin.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
         self.xmin.Hide()
         ix += 2
@@ -108 +109 @@
         self.sizer4.Add(self.xmax,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         self.xmax.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
+        self.xmax.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
         self.xmax.Hide()
         #Set chisqr  result into TextCtrl
@@ -448 +450 @@
             ctl1.SetValue(str (format_number(value)))
             ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
+            ctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
             self.sizer2.Add(ctl1, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
             ix += 1

sansview/perspectives/fitting/fitting.py

@@ -96 +96 @@
             @return: a list of menu items with call-back function
         """
-        
         self.graph=graph
         for item in graph.plottables:
@@ -416 +415 @@
             model.name="M"+str(self.index_model)
             self.index_model += 1  
-            self.page_finder[current_pg].set_theory("Fitness")
+            #self.page_finder[current_pg].set_theory("Fitness")
             self.page_finder[current_pg].set_model(model,M_name)
             self.plot_helper(currpage= current_pg,qmin= None,qmax= None)
@@ -449 +448 @@
             if data!=None:
                 theory = Theory1D(x=[], y=[])
-                theory.name = self.page_finder[page].get_theory()
+                theory.name = model.name
                 theory.group_id = data.group_id
               
@@ -524 +523 @@
             new_plot.xaxis("\\rm{Q}", 'A^{-1}')
             new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
-            new_plot.group_id = model.name
+            new_plot.group_id ="Fitness"
          
             wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Analytical model"))

sansview/perspectives/fitting/modelpage.py

@@ -229 +229 @@
             ctl1.SetValue(str (format_number(value)))
             ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
+            ctl1.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
             self.sizer2.Add(ctl1, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
            
@@ -264 +265 @@
                      name=str(item[0].GetLabelText())
                      value= float(item[1].GetValue())
-                     print "modelpage: name. value",name , value
                      self.model.setParam(name,value)
                      self.manager.draw_model(self.model)

sansview/perspectives/fitting/simfitpage.py

@@ -23 +23 @@
         self.sizer3 = wx.GridBagSizer(5,5)
         self.sizer1 = wx.GridBagSizer(5,5)
-        self.sizer2 = wx.GridBagSizer(5,5)
+        #self.sizer2 = wx.GridBagSizer(5,5)
+        self.sizer2  = wx.BoxSizer(wx.HORIZONTAL)
         self.vbox  = wx.BoxSizer(wx.VERTICAL)
         self.vbox.Add(self.sizer3)
@@ -38 +39 @@
                         wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         wx.EVT_CHECKBOX(self, self.cb1.GetId(), self.select_all_model_name)
-        wx.EVT_CHECKBOX(self, self.cb1.GetId(), self.select_all_model_name)
+       
         ix  = 0
         iy  = 1
         text=wx.StaticText(self, -1, 'Constraint')
-        self.sizer2.Add(text,(iy, ix),(1,1),\
-                        wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        self.sizer2.Add(text,0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
         ix  = 0
         iy  += 1
         self.ctl2 = wx.TextCtrl(self, -1, style=wx.TE_MULTILINE)
         self.ctl2.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
-        self.sizer2.Add(self.ctl2, (iy, ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        self.ctl2.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
+        self.sizer2.Add(self.ctl2, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
         ix +=2
-        self.sizer2.Add(self.btFit,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        self.sizer2.Add(self.btFit, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
         self.params=[]
         self.model_list=[]
@@ -56 +57 @@
         self.page_finder={}
         iy +=1
-        self.sizer2.Add((20,20),(iy, ix))
+        #self.sizer2.Add((20,20),(iy, ix))
+        self.sizer2.Add((20,20), 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
         self.vbox.Layout()
         self.vbox.Fit(self)