-                      rfa02d95
+                      r06e7c26
             wx.PostEvent(self._manager.parent, StatusEvent(status=\
                             "Fitting: %s"%msg, info="info"))
         if self.show_constraint.GetValue():
+        if not self.batch_on and self.show_constraint.GetValue():
             if not self._set_constraint():
                 return
 …
         if len(self.model_toFit)>=1:
             self._store_model()
             if self.show_constraint.GetValue() and\
+            if not self.batch_on and self.show_constraint.GetValue() and\
                              len(self.constraints_list)==0:
                 self._show_all_constraint()
 …
         self.hide_constraint.SetValue(True)
         self.show_constraint.SetValue(False)
+        print "self.show_constraint", self.show_constraint
         sizer_title.Add(wx.StaticText(self,-1," Model"))

park_integration/src/sans/fit/AbstractFitEngine.py

-                      rbd7a426
+                      r06e7c26
         #Dictionnary of fitArrange element (fit problems)
         self.fit_arrange_dict = {}
+        self.fitter_id = None
     def set_model(self, model,  id,  pars=[], constraints=[], data=None):
 …
     def __init__(self, model=None, param_list=None, data=None):
         self.calls = None
+        self.pars = []
         self.fitness = None
         self.chisqr = None
 …
         self.iterations = 0
         self.inputs = []
+        self.fitter_id = None
         if self.model is not None and self.data is not None:
             self.inputs = [(self.model, self.data)]

park_integration/src/sans/fit/Fitting.py

-                      rba7dceb
+                      r06e7c26
 class Fit:
+class Fit(object):
     """
     Wrap class that allows to select the fitting type.this class
 …
         #self._engine will contain an instance of ScipyFit or ParkFit
         self._engine = None
+        self.fitter_id = None
         self.set_engine(engine)
+    def __setattr__(self, name, value):
+        """
+        set fitter_id and its engine at the same time
+        """
+        if name == "fitter_id":
+            self.__dict__[name] = value
+            if hasattr(self, "_engine") and self._engine is not None:
+                self._engine.fitter_id = value
+        elif name == "_engine":
+            self.__dict__[name] = value
+            if hasattr(self, "fitter_id") and self.fitter_id is not None:
+                self._engine.fitter_id = self.fitter_id
+        else:
+            self.__dict__[name] = value
     def set_engine(self, word):
         """

r2605b879	r06e7c26
425	425	residuals, theory = m.fitness.residuals()
426	426	small_result = FResult(model=m.model, data=m.data.sans_data)
	427	small_result.fitter_id = self.fitter_id
427	428	small_result.theory = theory
428	429	small_result.residuals = residuals

ree19117	r06e7c26
90	90
91	91	result = FResult(model=model, data=data, param_list=self.param_list)
	92	result.pars = fitproblem[0].pars
	93	result.fitter_id = self.fitter_id
92	94	if handler is not None:
93	95	handler.set_result(result=result)

Note: See TracChangeset for help on using the changeset viewer.