Changeset f3113c9 in sasview

Timestamp:

Feb 27, 2009 8:18: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:

e9e914f

Parents:

85e94e7

Message:

small bug fixed

Location:

sansview/perspectives/fitting

Files:

• fitpage1D.py (modified) (4 diffs)
• fitting.py (modified) (5 diffs)
• modelpage.py (modified) (3 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -241 +241 @@
         ix += 1
         self.sizer9.Add(self.btFit,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        
+        """
         id = wx.NewId()
         self.btStopFit =wx.Button(self,id,'Stop')
@@ -249 +249 @@
         ix += 1
         self.sizer9.Add(self.btStopFit,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        
+        """
         ix =0
         iy+=1 
@@ -334 +334 @@
         
     def onStopFit(self, event):
-        
         self.manager.stop_fit()
         self.btStopFit.Hide()
+        self.btFit.Show(True)
         self.vbox.Layout()
         self.SetScrollbars(20,20,55,40)
         self.Layout()
         self.parent.GetSizer().Layout()
+        
     def compute_chisqr(self):
         """ @param fn: function that return model value
@@ -434 +435 @@
                                             ymin=self.data.ymin, ymax=self.data.ymax,
                                             xmin=self.data.xmin,xmax=self.data.xmax)
-                self.btStopFit.Show()
+                #self.btStopFit.Show()
+                #self.btFit.Hide()
             else:
                  self.manager._on_single_fit(qmin=self.qmin_x,qmax=self.qmax_x)
-                 self.btStopFit.Show()
+                 #self.btStopFit.Show()
+                 #self.btFit.Hide()
             self.vbox.Layout()
             self.SetScrollbars(20,20,55,40)

sansview/perspectives/fitting/fitting.py

@@ -1 @@
-import os,os.path, re
+#import os,os.path, re
 import sys, wx, logging
 import string, numpy, math
@@ -13 +13 @@
 from fitpanel import FitPanel
 from fit_thread import FitThread
-import models,modelpage
+import models#,modelpage
 import fitpage1D
-import park
+#import park
 DEFAULT_BEAM = 0.005
 DEFAULT_QMIN = 0.0
@@ -47 +47 @@
         self.standalone=True
         ## Fit engine
-        self._fit_engine = 'scipy'
+        self._fit_engine = 'park'
         self.enable_model2D=False
         # list of selcted data
@@ -76 +76 @@
         #Set park engine
         id3 = wx.NewId()
-        self.menu1.AppendCheckItem(id3, "park") 
+        self.menu1.AppendCheckItem(id3, "scipy") 
         wx.EVT_MENU(owner, id3, self._onset_engine)
         
@@ -427 +427 @@
     def stop_fit(self):
         if self.calc_thread != None and self.calc_thread.isrunning():
-                    
-                    self.calc_thread.interrupt()
-                    self.calc_thread.stop()
-                    wx.PostEvent(self.parent, StatusEvent(status="Fitting  \
-        is cancelled" , type="stop"))
+            #self.calc_thread.interrupt()
+            self.calc_thread.stop()
+            wx.PostEvent(self.parent, StatusEvent(status="Fitting  \
+is cancelled" , type="stop"))
     def _on_single_fit(self,id=None,qmin=None, qmax=None,ymin=None, ymax=None,xmin=None,xmax=None):
         """ 

sansview/perspectives/fitting/modelpage.py

@@ -539 +539 @@
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         self.text2_3.Hide() 
+        
         ix +=1
         self.text2_5 = wx.StaticText(self, -1, 'Min')
@@ -547 +548 @@
         self.sizer5.Add(self.text2_6,(iy, ix),(1,1),\
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
+        if self.data ==None:
+            self.text2_5.Hide()
+            self.text2_6.Hide()
         ix +=1
         self.text2_4 = wx.StaticText(self, -1, 'Units')
@@ -604 +608 @@
                 ctl4.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
                 self.sizer5.Add(ctl4, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                
+                if self.data==None:
+                    ctl4.Hide()
+                    ctl3.Hide()
                 ix +=1
                 # Units