Commit 79ec1d9a authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rm default fit monitor

parent 526bc1f5
...@@ -9,6 +9,7 @@ BornAgain-1.19.0, released 2021.01.xx ...@@ -9,6 +9,7 @@ BornAgain-1.19.0, released 2021.01.xx
* Remove old R&T computations from API (now in Code/Legacy and Tests) * Remove old R&T computations from API (now in Code/Legacy and Tests)
* Make Python plot API entirely keyword based * Make Python plot API entirely keyword based
* Add support for q offset in QSpecScan (redmine 2496) * Add support for q offset in QSpecScan (redmine 2496)
* Remove default Python fit monitor, user must choose between GISAS and specular plotter
> GUI changes: > GUI changes:
* Add top-level menu View, with functionality moved in from other places * Add top-level menu View, with functionality moved in from other places
* Add accelerator keys to menus * Add accelerator keys to menus
......
...@@ -242,15 +242,7 @@ class ObserverCallbackWrapper(PyObserverCallback): ...@@ -242,15 +242,7 @@ class ObserverCallbackWrapper(PyObserverCallback):
def finalize(self, minimizer_result): def finalize(self, minimizer_result):
return self.finalize_cpp(self.convert_result(minimizer_result)) return self.finalize_cpp(self.convert_result(minimizer_result))
def create_default_plotter(self): def initPlot(self, every_nth, callback):
import ba_fitmonitor as bafim
self.m_plotter = bafim.PlotterGISAS()
return self.m_plotter.plot
def initPlot(self, every_nth, callback = None):
if not callback:
callback = self.create_default_plotter()
self.wrp_plot_observer = ObserverCallbackWrapper(callback) self.wrp_plot_observer = ObserverCallbackWrapper(callback)
return self.initPlot_cpp(every_nth, self.wrp_plot_observer) return self.initPlot_cpp(every_nth, self.wrp_plot_observer)
......
...@@ -3045,15 +3045,7 @@ class FitObjective(object): ...@@ -3045,15 +3045,7 @@ class FitObjective(object):
def finalize(self, minimizer_result): def finalize(self, minimizer_result):
return self.finalize_cpp(self.convert_result(minimizer_result)) return self.finalize_cpp(self.convert_result(minimizer_result))
def create_default_plotter(self): def initPlot(self, every_nth, callback):
import ba_fitmonitor as bafim
self.m_plotter = bafim.PlotterGISAS()
return self.m_plotter.plot
def initPlot(self, every_nth, callback = None):
if not callback:
callback = self.create_default_plotter()
self.wrp_plot_observer = ObserverCallbackWrapper(callback) self.wrp_plot_observer = ObserverCallbackWrapper(callback)
return self.initPlot_cpp(every_nth, self.wrp_plot_observer) return self.initPlot_cpp(every_nth, self.wrp_plot_observer)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment