Changeset ba1f0b2 in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Apr 18, 2011 8:22:51 AM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

1a74523

Parents:

4bd492f

Message:

fixed 2D smear draw updating

File:

• sansview/perspectives/fitting/fitting.py (modified) (9 diffs)

sansview/perspectives/fitting/fitting.py

@@ -486 +486 @@
                         panel. _on_fit_complete()
   
-    def set_smearer(self, uid, smearer, qmin=None, qmax=None, draw=True):
+    def set_smearer(self, uid, smearer, qmin=None, qmax=None, draw=True, 
+                    enable2D=False):
         """
         Get a smear object and store it to a fit problem
@@ -497 +498 @@
             raise ValueError, msg
         self.page_finder[uid].set_smearer(smearer)
+        self.page_finder[uid].set_enable2D(enable2D)
         if draw:
             ## draw model 1D with smeared data
@@ -503 +505 @@
             if model is None:
                 return
+            enable1D = True
+            enable2D = self.page_finder[uid].get_enable2D()
+            if enable2D:
+                enable1D = False
+
             ## if user has already selected a model to plot
             ## redraw the model with data smeared
             smear = self.page_finder[uid].get_smearer()
             self.draw_model(model=model, data=data, page_id=uid, smearer=smear,
+                enable1D=enable1D, enable2D=enable2D,
                 qmin=qmin, qmax=qmax)
 
@@ -533 +541 @@
         if data.__class__.__name__ == "Data1D" or not enable2D:    
             ## draw model 1D with no loaded data
-            
             self._draw_model1D(model=model, 
                                data=data,
@@ -547 +554 @@
         else:     
             ## draw model 2D with no initial data
-             self._draw_model2D(model=model,
+            self._draw_model2D(model=model,
                                 page_id=page_id,
                                 data=data,
@@ -595 +602 @@
                     page = self.fit_panel.get_page_by_id(page_id)
                     templist = page.get_param_list()
+                    # missing fit parameters
+                    #if not templist:
+                    #    return
+                    # have the list
                     for element in templist:
                         name = str(element[1])
@@ -607 +618 @@
                     current_page_id = page_id
             except:
-                raise
-                #msg= "%s error: %s" % (engineType, sys.exc_value)
-                #wx.PostEvent(self.parent, StatusEvent(status=msg, info="error",
-                #                                      type="stop"))
-                #return 
+                #raise
+                msg= "%s error: %s" % (engineType, sys.exc_value)
+                wx.PostEvent(self.parent, StatusEvent(status=msg, info="error",
+                                                      type="stop"))
+                return 
         ## If a thread is already started, stop it
         #if self.calc_fit!= None and self.calc_fit.isrunning():
@@ -1083 +1094 @@
         if model == None:
             return
-       
+
         if self.page_finder[uid].get_model() is None:
             model.name = "M" + str(self.index_model)
@@ -1392 +1403 @@
             if (self.calc_2D is not None) and self.calc_2D.isrunning():
                 self.calc_2D.stop()
-
             self.calc_2D = Calc2D(x=x,
                                     y=y,