W. Trevor King [Sat, 14 Aug 2010 07:50:55 +0000 (03:50 -0400)]
Renamed bin/hooke -> bin/hk.py.
This fixes amantedpaz' crash from
http://code.google.com/p/hooke/issues/detail?id=40#c17
It turned out to not be related to issue8534, as I'd originally thought.
The crash looked like:
C:\hooke>c:\python26\python bin/hooke
...
Traceback (most recent call last):
File "<string>", line 1, in <module>
File "c:\python26\lib\multiprocessing\forking.py", line 341, in main
prepare(preparation_data)
File "c:\python26\lib\multiprocessing\forking.py", line 450, in prepare
file, path_name, etc = imp.find_module(main_name, dirs)
ImportError: No module named hooke
...
W. Trevor King [Fri, 13 Aug 2010 16:34:25 +0000 (12:34 -0400)]
Fleshed out hooke.plugin.command_stack except for save/load
W. Trevor King [Fri, 13 Aug 2010 15:27:13 +0000 (11:27 -0400)]
Remove superfluous doctest comment from test/load_playlist.py
W. Trevor King [Fri, 13 Aug 2010 15:26:27 +0000 (11:26 -0400)]
Lowercase initial word in some log messages.
W. Trevor King [Fri, 13 Aug 2010 14:56:11 +0000 (10:56 -0400)]
Consolidate UI command submission to hooke.ui.UserInterface._submit_command().
Currently this just ensures standardized logging, but eventually it
will allow us to easily record command histories in a UI-agnostic way.
W. Trevor King [Fri, 13 Aug 2010 11:31:19 +0000 (07:31 -0400)]
Removed hooke.compat.forking since issue8534 can't be monkey patched.
You'll have to apply simonsteiner's issue8534 patch
http://bugs.python.org/file17092/forking.patch
to your Python's multiprocessing.forking by hand (on MS Windows). See
http://bugs.python.org/issue8534
http://docs.python.org/library/multiprocessing.html#windows
Here's what happens on Linux:
1) main program starts running
2) monkey patch applied
3) multiprocessing.Process() forks off the subprocess.
a) child process inherits parent's memory, getting all currently
imported libraries for free.
b) child process continues successful run.
4) main process continues successful run.
Here's what happens on MS Windows:
1) main program starts running
2) monkey patch applied
3) multiprocessing.Process() spawns subprocess, feeding its pickling
state to the child through the connecting socket.
a) child process starts, loading (unpatched) base Python libraries
to figure out what it should do.
b) child process starts reading pickled parent state.
c) child process attempts to find hooke to unpickle parent state.
d) child process cannot find hooke (with unpatched
multiprocessing) and dies.
4) main process dies from lack of child.
After applying simonsteiner's issue8534 patch, Windows looks like:
1) main program starts running
2) multiprocessing.Process() spawns subprocess, feeding its pickling
state to the child through the connecting socket.
a) child process starts, loading (patched) base Python libraries
to figure out what it should do.
b) child process starts reading pickled parent state.
c) child process attempts to find hooke to unpickle parent state.
d) child process loads hooke.
e) child process continues successful run.
3) main process continues successful run.
W. Trevor King [Fri, 13 Aug 2010 11:03:02 +0000 (07:03 -0400)]
Added log warnings on monkey patch imports
W. Trevor King [Fri, 13 Aug 2010 02:08:24 +0000 (22:08 -0400)]
Use the playlist's basename if it doesn't colide with earlier playlists.
W. Trevor King [Fri, 13 Aug 2010 01:55:38 +0000 (21:55 -0400)]
Remove PlaylistArgument from plugin.playlist.SaveCommand now that it's a PlaylistCommand
W. Trevor King [Fri, 13 Aug 2010 01:38:04 +0000 (21:38 -0400)]
Added hooke.plugin.playlist.ApplyCommandStack and related changes.
Highlights:
* Added test/apply_command_stack.py testing the new command.
* Added hooke.plugin.playlist.PlaylistCommand mirroring CurveCommand.
* Added hooke.plugin.playlist.AddingPlaylistCommand mirroring
ColumnAddingCommand.
* Renamed CommandStack._execute -> .execute_command since it may be
used externally.
* Changed assorted log messages to use CommandMessage string-ification.
* Set Hooke.engine to None in the UI process.
* Set ._index during NoteIndexList.items() iteration.
W. Trevor King [Thu, 12 Aug 2010 22:01:41 +0000 (18:01 -0400)]
Added nicer CommandMessage string-ification methods
W. Trevor King [Thu, 12 Aug 2010 20:11:20 +0000 (16:11 -0400)]
Rename ./bin/hooke's --command-no-exit to --persist.
Inspired by the similar gnuplot option. Certainly less awkward than
our old option.
W. Trevor King [Thu, 12 Aug 2010 18:11:53 +0000 (14:11 -0400)]
Remove unnecessary doctest comments from test/get_curve.py
W. Trevor King [Thu, 12 Aug 2010 18:09:56 +0000 (14:09 -0400)]
Adjust test/get_curve.py for Curve.__str__, etc. changes in
d2317379f775
W. Trevor King [Thu, 12 Aug 2010 18:08:12 +0000 (14:08 -0400)]
Fix .split() -> .strip() typo in 'output peak column' arg for FlatPeaksCommand
W. Trevor King [Thu, 12 Aug 2010 17:59:26 +0000 (13:59 -0400)]
Add hooke.compat.forking to fix Python's ImportError issue8534.
multiprocessing can have problems importing modules from child processes. See
http://bugs.python.org/issue8534
http://code.google.com/p/hooke/issues/detail?id=40#c17
Importing hooke.compat.forking fixes this bug dynamically.
W. Trevor King [Thu, 12 Aug 2010 17:15:29 +0000 (13:15 -0400)]
Add successful Curve.command_stack maintenance.
Now commands successfully track CurveCommands applied to them, and run
them again when they're reloaded. Still to do:
* save/load .command_stacks with the playlist
* hooke.plugin.command_stack
W. Trevor King [Thu, 12 Aug 2010 17:10:37 +0000 (13:10 -0400)]
Move LocalHelpCommand and LocalExitCommand from ui.commandline to plugin.engine.
It's not a good idea to have UI-specific commands that get sent down
to the CommandEngine.
W. Trevor King [Thu, 12 Aug 2010 16:12:10 +0000 (12:12 -0400)]
Add --save-config to bin/hooke and don't silently save config file.
With the old implementation, setting --debug once would effectively
set it for all future calls :p. There should be an explicit 'save
config' command if the user wishes to do so.
W. Trevor King [Thu, 12 Aug 2010 15:33:41 +0000 (11:33 -0400)]
Change CommandMessage.command from Command instance to command's name.
No sense in building up large numbers of Command copies if you're
passing CommandMessages through a multiprocess.Queue and storing them
in CommandStacks.
W. Trevor King [Thu, 12 Aug 2010 15:12:29 +0000 (11:12 -0400)]
Add --debug option to bin/hooke and log CommandEngine.run_command()
W. Trevor King [Thu, 12 Aug 2010 15:02:06 +0000 (11:02 -0400)]
Added CurveEngine.run_command and reorganized CommandStack._execute
W. Trevor King [Thu, 12 Aug 2010 14:26:28 +0000 (10:26 -0400)]
Initial work on hooke.command_stack and hooke.playlist integration.
The current problem is figuring out how to run commands from a Curve
without Curves knowing about Hooke or CommandEngine instances.
W. Trevor King [Thu, 12 Aug 2010 11:31:09 +0000 (07:31 -0400)]
Remove superfluous ..plugin from imports in hooke.plugin.*
W. Trevor King [Thu, 12 Aug 2010 11:25:56 +0000 (07:25 -0400)]
We'll keep most command stack functionality in a new hooke.command_stack
W. Trevor King [Thu, 12 Aug 2010 11:16:19 +0000 (07:16 -0400)]
Moved QueueMessage and subclasses from hooke.ui to the more central hooke.engine.
W. Trevor King [Thu, 12 Aug 2010 11:09:21 +0000 (07:09 -0400)]
Remove superflous ~ from flatfilt docstring.
W. Trevor King [Thu, 12 Aug 2010 11:02:11 +0000 (07:02 -0400)]
Renamed hooke.plugin.macro -> hooke.plugin.command_stack
W. Trevor King [Thu, 12 Aug 2010 11:01:12 +0000 (07:01 -0400)]
Restored hooke.plugin.macro from revision
a008bd5c28ca.
It had been removed in the subsequent commit:
changeset: 519:
928a1a2f6041
branch: wtk
user: W. Trevor King <wking@drexel.edu>
date: Sat Aug 07 11:45:12 2010 -0400
files: conf/macro.conf hooke/plugin/__init__.py hooke/plugin/macro.py
description: Remove macro plugin.
...
In the commit comments, I explain that the hooke command line lacks
flexibility for function definition (e.g. no variables). However, you
can do a number of things by chaining commands together, so I'm
bringing back the macro plugin. I intend to reimagine macros as
editable "command stacks", which will allow for
* flexible loops
* undo/redo recent changes
* preserving processing through playlist save/load cycles.
This will get us most of the way to the goals expressed in commit
725a18055518 and a useful Hooke :).
W. Trevor King [Wed, 11 Aug 2010 23:46:46 +0000 (19:46 -0400)]
Updated FlatFilterCommand's argument handling.
W. Trevor King [Wed, 11 Aug 2010 22:06:56 +0000 (18:06 -0400)]
More detailed misnamed column error in ColumnAccessCommand._get_column
W. Trevor King [Wed, 11 Aug 2010 21:48:26 +0000 (17:48 -0400)]
Fix '@Sens. ZSensorSens' KeyError loading picoforce 0x07200000 curves.
Regression from
93e0e4284534. Of course, we still don't know where
the z-data is in the 0x07200000 curves,
http://code.google.com/p/hooke/issues/detail?id=26#c4
so its hard to know if this is the right sensitivity. It doesn't
crash anyway...
W. Trevor King [Wed, 11 Aug 2010 21:11:18 +0000 (17:11 -0400)]
Updated FlatPeaksCommand to ColumnAddingCommand.
W. Trevor King [Wed, 11 Aug 2010 20:25:47 +0000 (16:25 -0400)]
Updated vclamp to use new ColumnAddingCommand.
Also added 'ignore after last peak info name' argument to
SurfaceContactCommand"
This allows for the two-cycle surface detection mentioned in commit
725a18055518.
./bin/hooke -c 'load_playlist test/data/vclamp_wtk/playlist'
-c 'zero_surface_contact_point --block retract'
-c 'flat_filter_peaks --block retract --min_points 1'
-c 'zero_surface_contact_point --block retract
--ignore_after_last_peak_info_name "flat filter peaks"'
-c 'convert_distance_to_force --block retract'
-c 'remove_cantilever_from_extension --block retract'
-c 'flat_peaks_to_polymer_peaks --block retract'
-c 'polymer_fit_peaks --block retract' --command-no-exit
Note that `flat filter peaks`, `flat peaks to polymer peaks`, and
`polymer fit peaks` still need to be updated to ColumnAddingCommand
subclasses. Also, I might be missing a few column renames in the
above command. I'll include a working (and tested) command once I get
the other plugins up to speed with ColumnAddingCommand.
W. Trevor King [Wed, 11 Aug 2010 18:09:22 +0000 (14:09 -0400)]
Add CurveCommand, BlockCommand, ColumnAccessCommand, and ColumnAddingCommand.
Added to hooke.plugin.curve. These abstract out the boring
bookkeeping from many commands (so far only the ones in plugin.curve).
Also add test/derivative.py and rework hooke.util.calculus.derivative
to be less block-centric.
W. Trevor King [Wed, 11 Aug 2010 17:45:22 +0000 (13:45 -0400)]
Add test/difference.py
W. Trevor King [Wed, 11 Aug 2010 17:37:29 +0000 (13:37 -0400)]
Add test/export_block.py
W. Trevor King [Wed, 11 Aug 2010 17:25:46 +0000 (13:25 -0400)]
Add test/delta.py
W. Trevor King [Wed, 11 Aug 2010 17:23:12 +0000 (13:23 -0400)]
Add test/get_curve.py
W. Trevor King [Wed, 11 Aug 2010 17:20:10 +0000 (13:20 -0400)]
Remove outdated type TODOs from hooke/command (conversion handled by UIs).
W. Trevor King [Wed, 11 Aug 2010 17:19:05 +0000 (13:19 -0400)]
Print tutorial init message to stderr so it won't interfere with doctests.
e.g.
nosetests --with-doctest --doctest-tests test/curve_info.py
W. Trevor King [Wed, 11 Aug 2010 13:58:09 +0000 (09:58 -0400)]
Allow fallback to XeX notation for efor extreme powers in ppSI
W. Trevor King [Wed, 11 Aug 2010 13:57:19 +0000 (09:57 -0400)]
Remove post-fit L/N conversions from polymer_fit.py (handled in .fit() now).
W. Trevor King [Wed, 11 Aug 2010 13:46:02 +0000 (09:46 -0400)]
Add 'ignore index' argument to SurfaceContactCommand
W. Trevor King [Wed, 11 Aug 2010 13:31:58 +0000 (09:31 -0400)]
We don't seem to need to guess the scale in SurfacePositionModel
W. Trevor King [Wed, 11 Aug 2010 13:30:28 +0000 (09:30 -0400)]
Update ModelFitters in polymer_fit.py to match new diag/scale interpretation.
W. Trevor King [Wed, 11 Aug 2010 13:12:27 +0000 (09:12 -0400)]
Update SurfacePositionModel to match new diag/scale interpretation.
W. Trevor King [Wed, 11 Aug 2010 13:11:36 +0000 (09:11 -0400)]
Oops, correct my faulty interpretation of leastsq's 'diag' argument in fit.py
W. Trevor King [Tue, 10 Aug 2010 20:32:31 +0000 (16:32 -0400)]
Add TranslateFlatPeaksCommand.
This completes a simple velocity clamp force analysis approach. Consider:
./bin/hooke -c 'load_playlist test/data/test'
-c 'zero_block_surface_contact_point --block 1'
-c 'add_flattened_extension_array --block 1 --max_degree 1
--input_deflection_column "surface deflection (m)"'
-c 'add_block_force_array --block 1
--input_deflection_column "flattened deflection (m)"'
-c 'add_block_cantilever_adjusted_extension_array --block 1'
-c 'flat_filter_peaks --min_points 1'
-c 'flat_peaks_to_polymer_peaks --block 1'
-c 'polymer_fit_peaks --block 1'
--command-no-exit
Still to come:
* Better contact point fitting or flattening, since the above method
currently does a pretty bad job with the actual WLCs. Perhaps a
WLC-based zeroing could lead a second fitting iteration.
* A way to apply grouped commands like this to each curve in a playlist.
* Saving dicts in the playlist format or changing formats so the WLC
fitting parameters are accessible for further analysis (e.g. with
sawsim: http://dx.doi.org/10.1016/j.ijbiomac.2009.12.001 ).
W. Trevor King [Tue, 10 Aug 2010 20:16:37 +0000 (16:16 -0400)]
Adjust GUI initialization to handle already loaded playlists (via --command-no-exit, etc.)
W. Trevor King [Tue, 10 Aug 2010 20:15:50 +0000 (16:15 -0400)]
Fix tree method exposure in playlist GUI pansl
W. Trevor King [Tue, 10 Aug 2010 19:49:48 +0000 (15:49 -0400)]
Add --command-no-exit to bin/hooke, making hardcoded testing calls to execute_command() in gui superfluous.
W. Trevor King [Tue, 10 Aug 2010 19:42:35 +0000 (15:42 -0400)]
Log execution debug messages from the commandline UI (matching the GUI).
W. Trevor King [Tue, 10 Aug 2010 19:41:53 +0000 (15:41 -0400)]
Set hand1 logging handler level to WARN by default (avoids DEBUG clutter, etc.)
W. Trevor King [Tue, 10 Aug 2010 19:23:10 +0000 (15:23 -0400)]
Log warning for invalid section/option settings
W. Trevor King [Tue, 10 Aug 2010 17:10:40 +0000 (13:10 -0400)]
Use numpy.nan to hide unfit portions of polymer tension columns.
W. Trevor King [Tue, 10 Aug 2010 17:09:44 +0000 (13:09 -0400)]
Make ModelFitter._data_scale_factor determination more robust with wierd data.
W. Trevor King [Tue, 10 Aug 2010 15:57:04 +0000 (11:57 -0400)]
Add 'polymer fit' error reporting to PolymerFitPeaksCommand
W. Trevor King [Tue, 10 Aug 2010 15:49:13 +0000 (11:49 -0400)]
Added PolymerFitPeaksCommand to hooke.plugin.polymer_fit
W. Trevor King [Tue, 10 Aug 2010 15:09:00 +0000 (11:09 -0400)]
Collapse None entries for Argument.count == -1 in the GUI
W. Trevor King [Tue, 10 Aug 2010 14:59:24 +0000 (10:59 -0400)]
Enable hackish support for Argument.count == -1 (by setting it to 3)
W. Trevor King [Tue, 10 Aug 2010 12:52:43 +0000 (08:52 -0400)]
Update FlatPeaksCommand to use flexible column names.
W. Trevor King [Tue, 10 Aug 2010 12:34:12 +0000 (08:34 -0400)]
Better None-handling in convert and propertyeditor
W. Trevor King [Tue, 10 Aug 2010 12:33:32 +0000 (08:33 -0400)]
Allow None values for plot clicks or SI values
W. Trevor King [Tue, 10 Aug 2010 10:44:50 +0000 (06:44 -0400)]
Allow commandline to load without readline for non-Unix systems
W. Trevor King [Tue, 10 Aug 2010 00:10:33 +0000 (20:10 -0400)]
Update PolymerFitCommand to use flexible column names.
This allows you to fit multiple WLCs, etc. (by changing the 'output
tension column' name), so you can fit multiple peaks and/or multiple models.
W. Trevor King [Mon, 9 Aug 2010 16:00:25 +0000 (12:00 -0400)]
version 1.0.0.alpha
W. Trevor King [Mon, 9 Aug 2010 15:59:46 +0000 (11:59 -0400)]
Updated version information to 1.0.0.alpha (Ninken).
This is mostly to bring the `type` field of __version__ into agreement
with Python's alpha/beta/candidate/final. The bump to major version 1
is intended to reflect the major recoding of the Hooke internals that
I've been carrying out.
The name change (Kenzo -> Ninken) follows the list of Japanese
emperors
http://en.wikipedia.org/wiki/List_of_Emperors_of_Japan
This matches Seinei -> Kenzo progression, so I'm pretty sure this is
where the current naming scheme comes from.
W. Trevor King [Mon, 9 Aug 2010 15:29:24 +0000 (11:29 -0400)]
Add --version option to hooke.hooke.main
W. Trevor King [Mon, 1 Feb 2010 16:10:00 +0000 (16:10 +0000)]
version 0.9.0
W. Trevor King [Thu, 24 Apr 2008 13:50:00 +0000 (13:50 +0000)]
version 0.8.3
W. Trevor King [Mon, 9 Aug 2010 12:21:17 +0000 (08:21 -0400)]
Adjust Mercurial repository URL to avoid NFS mounting issues on the server side
W. Trevor King [Mon, 9 Aug 2010 12:15:19 +0000 (08:15 -0400)]
Allow hooke.ui to load with missing hooke.license submodule.
This is like similar code in hooke/__init__.py, and allows you to run
Hooke from a snapshot without generating the license.py file.
hooke/license.py is generated as needed by update_copyright.py, so
it's not tracked by the version control system. However, running
update_copyright.py requires a working Mercurial repository, which
users may not have if they installed from a VCS tarball, etc. This
code allows those users to run Hooke from such snapshots.
Official releases should bundle a generates license.py file, so in
that case this code is superfluous.
W. Trevor King [Mon, 9 Aug 2010 01:59:16 +0000 (21:59 -0400)]
Convert the old flatten plotmanip into vclamp's FlattenCommand
W. Trevor King [Sun, 8 Aug 2010 20:48:59 +0000 (16:48 -0400)]
Remove the old multiplier plotmanip from the vclamp plugin.
Anything you did with the multiplier plugin can be done with
ForceCommand. Perhaps ForceCommand should be a specific set of
defaults to a MultiplierCommand in the curve plugin, but until I see
good motivation for such genralization, I'll leave things the way they
are.
W. Trevor King [Sun, 8 Aug 2010 20:46:32 +0000 (16:46 -0400)]
Moved interesting old vclamp commands over into the curve plugin
W. Trevor King [Sun, 8 Aug 2010 20:41:47 +0000 (16:41 -0400)]
Remove old vclamp commands replaced by the curve plugin's DeltaCommand.
W. Trevor King [Sun, 8 Aug 2010 20:37:53 +0000 (16:37 -0400)]
Update CantileverAdjustedExtensionCommand to use flexible column names.
W. Trevor King [Sun, 8 Aug 2010 20:17:28 +0000 (16:17 -0400)]
Update ForceCommand to use flexible column names.
W. Trevor King [Sun, 8 Aug 2010 20:09:40 +0000 (16:09 -0400)]
Use .run vs. old ._run in vclamp.scale() to normalize params
W. Trevor King [Sun, 8 Aug 2010 20:06:21 +0000 (16:06 -0400)]
Update Git -> Mercurial repo link in doc/install.txt.
W. Trevor King [Sun, 8 Aug 2010 13:18:36 +0000 (09:18 -0400)]
Close parenthesis on column append in DifferenceCommand
W. Trevor King [Sat, 7 Aug 2010 22:46:22 +0000 (18:46 -0400)]
Update DifferenceCommand to use flexible column names.
W. Trevor King [Sat, 7 Aug 2010 22:28:36 +0000 (18:28 -0400)]
Update DerivativeCommand to use flexible column names.
W. Trevor King [Sat, 7 Aug 2010 22:11:37 +0000 (18:11 -0400)]
Create extra block holding PowerSpectrumCommand output data
W. Trevor King [Sat, 7 Aug 2010 21:37:41 +0000 (17:37 -0400)]
Update SurfaceContactCommand to use flexible column/info names.
W. Trevor King [Sat, 7 Aug 2010 20:57:09 +0000 (16:57 -0400)]
Added 'Analsis' section to doc/hacking.txt
W. Trevor King [Sat, 7 Aug 2010 19:51:14 +0000 (15:51 -0400)]
Remove Assistant panel from GUI (get help via mouseover tooltips instead).
W. Trevor King [Sat, 7 Aug 2010 19:44:26 +0000 (15:44 -0400)]
Updated doc/gui.txt and add and use Sphinx' todo extension.
W. Trevor King [Sat, 7 Aug 2010 18:54:01 +0000 (14:54 -0400)]
Added 'delta' command to hooke.plugin.curve
W. Trevor King [Sat, 7 Aug 2010 18:30:42 +0000 (14:30 -0400)]
Updated 'Configuring Hooke' section of tutorial.txt
W. Trevor King [Sat, 7 Aug 2010 18:22:38 +0000 (14:22 -0400)]
Set ._digest after saving in hooke.playlist.FilePlaylist.save()
The old implementation would complain of unsaved playlists upon
exiting if it was different from the originally loaded version, even
if you'd just saved the playlist! We also switch to the more robust
`with` syntax:
http://www.python.org/dev/peps/pep-0343/
W. Trevor King [Sat, 7 Aug 2010 18:17:33 +0000 (14:17 -0400)]
Update note section of tutorial.txt.
Also replace empty strings with None during
hooke.util.convert._string_to_string() conversion to allow clearing
notes etc.
Also cleaned up docstrings in hooke.plugin.note to better reflect the
change made in commit
5e44aef4859c.
W. Trevor King [Sat, 7 Aug 2010 18:05:09 +0000 (14:05 -0400)]
Fix POSIX URL and markup in tutorial.txt
W. Trevor King [Sat, 7 Aug 2010 18:03:17 +0000 (14:03 -0400)]
Fix POSIX footnote in tutorial.txt
W. Trevor King [Sat, 7 Aug 2010 17:58:37 +0000 (13:58 -0400)]
Add :: before new playlist creation code samples.
W. Trevor King [Sat, 7 Aug 2010 17:55:05 +0000 (13:55 -0400)]
Add 'new playlist' command and clean up 'Creating a playlist' in tutorial.txt.
W. Trevor King [Sat, 7 Aug 2010 16:50:17 +0000 (12:50 -0400)]
Fixed empytline -> emptyline typo in hooke.ui.commandline.
Also use cmd and args vs. old argv[0], argv[1:] in parseline for clarity.
W. Trevor King [Sat, 7 Aug 2010 16:34:05 +0000 (12:34 -0400)]
Fix another wget -o -> -O typo in doc/install.txt
W. Trevor King [Sat, 7 Aug 2010 16:27:44 +0000 (12:27 -0400)]
Removed cruft from procplots & vclamp plugins whose functionality has been replaced.