projects
/
hooke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ae09e7a
)
Cleanup command stack handling in hooke.plugin.polymer_fit.
author
W. Trevor King
<wking@drexel.edu>
Thu, 8 Mar 2012 15:37:23 +0000
(10:37 -0500)
committer
W. Trevor King
<wking@drexel.edu>
Thu, 8 Mar 2012 15:37:23 +0000
(10:37 -0500)
hooke/plugin/polymer_fit.py
patch
|
blob
|
history
diff --git
a/hooke/plugin/polymer_fit.py
b/hooke/plugin/polymer_fit.py
index 60a1284e28d8f1101dcff12d0825eb68393dfbfd..9f169bff914e89da04a84b815a8601636586ad16 100644
(file)
--- a/
hooke/plugin/polymer_fit.py
+++ b/
hooke/plugin/polymer_fit.py
@@
-941,6
+941,7
@@
Indicies of points bounding the selected data.
help=self.__doc__, plugin=plugin)
def _run(self, hooke, inqueue, outqueue, params):
help=self.__doc__, plugin=plugin)
def _run(self, hooke, inqueue, outqueue, params):
+ self._add_to_command_stack(params)
log = logging.getLogger('hooke')
params = self._setup_params(hooke, params)
data = self._block(hooke, params)
log = logging.getLogger('hooke')
params = self._setup_params(hooke, params)
data = self._block(hooke, params)
@@
-1130,6
+1131,7
@@
Index of the selected peak in the list of peaks. Use `None` to fit all peaks.
help=self.__doc__, plugin=plugin)
def _run(self, hooke, inqueue, outqueue, params):
help=self.__doc__, plugin=plugin)
def _run(self, hooke, inqueue, outqueue, params):
+ self._add_to_command_stack(params)
data = self._block(hooke, params)
fit_command = hooke.command_by_name['polymer fit']
inq = Queue()
data = self._block(hooke, params)
fit_command = hooke.command_by_name['polymer fit']
inq = Queue()
@@
-1145,6
+1147,7
@@
Index of the selected peak in the list of peaks. Use `None` to fit all peaks.
p['bounds'] = [peak.index, peak.post_index()]
p['output tension column'] = peak.name
p['fit parameters info name'] = peak.name
p['bounds'] = [peak.index, peak.post_index()]
p['output tension column'] = peak.name
p['fit parameters info name'] = peak.name
+ p['stack'] = False
fit_command.run(hooke, inq, outq, **p)
ret = outq.get()
if not isinstance(ret, Success):
fit_command.run(hooke, inq, outq, **p)
ret = outq.get()
if not isinstance(ret, Success):
@@
-1192,6
+1195,7
@@
instead.
help=self.__doc__, plugin=plugin)
def _run(self, hooke, inqueue, outqueue, params):
help=self.__doc__, plugin=plugin)
def _run(self, hooke, inqueue, outqueue, params):
+ self._add_to_command_stack(params)
data = self._block(hooke, params)
dist_data = self._get_column(
hooke=hooke, params=params, column_name='distance column')
data = self._block(hooke, params)
dist_data = self._get_column(
hooke=hooke, params=params, column_name='distance column')