W. Trevor King [Tue, 4 May 2010 07:16:05 +0000 (03:16 -0400)]
Removed busy loop from hooke/plugin/flatfilts.py.
Perhaps it was an attempt to pause briefly? If so, time.sleep() would
be better. It wasn't much of a pause though:
$ time python -c ''
real 0m0.111s
user 0m0.089s
sys 0m0.020s
$ time python -c 'for i in range(1000): k=0'
real 0m0.115s
user 0m0.090s
sys 0m0.024s
W. Trevor King [Tue, 4 May 2010 07:09:59 +0000 (03:09 -0400)]
Merged with trunk
fabrizio.benedetti.82 [Tue, 11 May 2010 09:23:48 +0000 (09:23 +0000)]
WLC and FJC output are now with 2 decimal precision. Added a comment on autopeak on how to use the 'manual' option
fabrizio.benedetti.82 [Mon, 10 May 2010 11:09:31 +0000 (11:09 +0000)]
Added the possibility to manually choose the peaks in 'autopeak' with the option 'manual'.
fabrizio.benedetti.82 [Fri, 7 May 2010 09:07:54 +0000 (09:07 +0000)]
Correct number of digits of many output, improvement in the utility 'cut' and 'txt'.
albertogomcas [Thu, 6 May 2010 09:07:37 +0000 (09:07 +0000)]
Fixes bad call to wlc/fjc fit
W. Trevor King [Tue, 4 May 2010 06:41:19 +0000 (02:41 -0400)]
Added modular directory structure.
Also some import and other cleanups to convince myself that the
reorganization was mostly working.
albertogomcas [Wed, 24 Mar 2010 15:41:09 +0000 (15:41 +0000)]
fit.py : extended FJC fit (models water bridges of PEG in water solutions)
fit quality parameter, ratio distance(fit-data)/std(flat_area)
multifit.py : WLC and eFJC as default fits
saves quality of fits
albertogomcas [Wed, 17 Mar 2010 08:58:25 +0000 (08:58 +0000)]
multifit.py : slope can be measured from data or form manual points
tried to scale better the YNarrow
albertogomcas [Wed, 17 Mar 2010 05:09:10 +0000 (05:09 +0000)]
multifit.py : slope can be measured manually
generalvclamp.py : change color of slope line to black
albertogomcas [Tue, 16 Mar 2010 08:39:37 +0000 (08:39 +0000)]
mfp3d.py : the retraction speed is extracted from Velocity, not RetractVelocity
albertogomcas [Mon, 15 Mar 2010 05:56:37 +0000 (05:56 +0000)]
multifit.py : some graphical niceties
albertogomcas [Fri, 12 Mar 2010 06:23:26 +0000 (06:23 +0000)]
multifit.py : proper formatting of help section
albertogomcas [Fri, 12 Mar 2010 03:08:59 +0000 (03:08 +0000)]
multifit.py : Fixed a wrong named var
libhook.py : Deleted deprecated message (irritates me :D)
albertogomcas [Thu, 11 Mar 2010 12:02:18 +0000 (12:02 +0000)]
multifit.py : new plugin, mouse input based
generalvclamp.py : separated code from do_slope into _slope allowing use in other funtions
hooke.conf: activate multifit plugin by default
albertogomcas [Wed, 10 Mar 2010 09:03:04 +0000 (09:03 +0000)]
review.py: fixed crash when a file is not valid
albertogomcas [Wed, 10 Mar 2010 05:58:50 +0000 (05:58 +0000)]
review.py: avoided crash when displaying final stats
hooke.conf: deactivate hdf5 by default, activate native mfp3d
mfp3d.py: adapted driver from Hooke GUI to work in this version
procplots.py: centerzero only uses last chunk of retract
FMjoin.py: utility script to put together all files from IgorPro force maps
fabrizio.benedetti.82 [Tue, 9 Mar 2010 16:44:29 +0000 (16:44 +0000)]
Corrected a bug for the command txt when it is invoked with an unvalid plot to export.
fabrizio.benedetti.82 [Fri, 5 Mar 2010 11:44:09 +0000 (11:44 +0000)]
A correction on autopeak.py due to the add of curvetools.py (a self. was missing)
illysam [Wed, 3 Mar 2010 13:08:41 +0000 (13:08 +0000)]
Hooke(GUI)
fixed default settings in ini files
illysam [Tue, 2 Mar 2010 20:46:08 +0000 (20:46 +0000)]
Hooke(GUI)
hooke.py
- added version information for ConfigObj and wxPropGrid in do_version
- added preferences for playlist an workdir
- UpdatePlot now only uses data and not results to set the scale decimals and prefixes
ReadMe.txt
- updated the Wiki page HookeGUI and used it as the ReadMe
hooke configspec.ini/hooke.ini
- removed section 'core'
drivers/mfp1d.py
- deflection and LVDT files can now be stored in the same folder (forgot about the filemask in do_genlist)
drivers/mfp3d.py
- improved file recognition
lib/curve.py
- renamed Multiplier/multiplier to Prefix/prefix
lib/libhooke.py
- moved pickup_contact_point to autopeak.py
lib/results.py
- removed old code
plugins/autopeak.py
- added pickup_contact_point (was in libhooke before)
plugins/core.ini
- added 'preferences'options: playlist and workdir
- renamed 'preferences'options: multiplier to prefix
plugins/generalvclamp.py
- renamed multiplier to prefix
plugins/playlist.ini and playlist.py
- added option: detect_mfp1d
plugins/plot.ini and plot.py
- renames option 'plot' to 'preferences'
- renamed multiplier to prefix
plugins/procplots.ini and procplots.py
- renamed multiplier to prefix
illysam [Mon, 1 Mar 2010 17:30:27 +0000 (17:30 +0000)]
Hooke(GUI)
hooke.py
- added check for off-screen window position on startup
- added note panel
- added check for existing plugin commands
- fixed access error on close (forgot to deregister a listener)
- added option to hide file extension from playlist and plot title
- added 'do_copylog'
- added general preferences
- modifed UpdatePlot to use individual scale formatter and legends for subplots
- added default settings for scale formatters and legends
- added general preference 'use_zero' to dispaly '0' on axes rather than e.g. '0.00'
hooke configspec.ini/hooke.ini
- added mfp1d driver
- added mfp3d driver
- removed curvetools plugin
drivers/mfp1dexport.py
- corrected spelling
drivers/picoforce.py
- removed detriggerize
drivers/mfp1d.py
- added driver for direct import of MFP-1D files
drivers/mfp3d.py
- added driver for direct import of MFP-3D files
lib/clickedpoint.py
- added object ClickedPoint to lib (was in libhooke before)
lib/curve.py
- added properties decimals, legend and multiplier to Curve
- added classes Data, Decimals, Multiplier and PrefixFormatter
lib/delta.py
- added object Delta to lib
lib/file.py
- rename self.notes to self.note
lib/libhooke.py
- added fit_interval_nm (was in curvetools before)
- added pickup_contact_point(was in curvetools before)
- added remove_extension
lib/playlist.py
- added note support
panels/ploy.py
- added 'x' and 'y' to status text
panels/note.py
- added note panel
plugins/autopeak.ini and autopeak.py
- added options: delta_force, plot_linewidth, plot_size and plot_style
plugins/core.ini
- added 'preferences'options: hide_curve_extension, legend, x_decimals, x_multiplier, y_decimals, y_multiplier and use_zero
- added 'copylog' options: destination and use_LVDT_folder
plugins/export.ini and export.py
- added 'notes' options: filename, folder, prefix and use_playlist_filename
- added do_notes
plugins/flatfilts.ini and flatfilts.py
- corrected some default values
- added warning about not applying the flatten plotmanipulator
plugins/generalvclamp.py
- updated copyright information
plugins/plot.ini and plot.py
- corrected some default values
- added support for options: decimals, legend and multiplier
plugins/procplots.ini and procplots.py
- corrected some default values
- added support for options: decimals, legend and multiplier to do_fft
fabrizio.benedetti.82 [Mon, 1 Mar 2010 13:50:51 +0000 (13:50 +0000)]
Corrected some bugs in the scale of graphs.
illysam [Thu, 25 Feb 2010 15:05:49 +0000 (15:05 +0000)]
HookeGUI
commands.py: plugins are now sorted in alphabetical order in the Commands panel
illysam [Thu, 25 Feb 2010 14:32:43 +0000 (14:32 +0000)]
Hooke(GUI)
hooke.py
- added GetPlotmanipulator()
- changed _delta() to return a delta class and not update the plot
- added multiplier support to UpdatePlot(), the user can now choose to display the scales in
pm/nm for x and pN/nN for y, if necessary, more multipliers can be added easily
- added decimals support to UpdatePlot(), the user can now choose how many decimals to display
- added legend support to UpdatePlot(), the user can now choose to display a legend
hooke.ini
- added plot plugin (handles global options for plot: multiplier, decimals, legend)
jpk.py
- added copyright information
prettyformat.py
- renamed variables to a more pythonic style
- added whitespace stripping option to prettyformat()
- added get_multiplier()
- added get_exponent()
- updated examples
autopeak.py
- added copyright information
fit.py
- removed specific import of libhooke.coth
- replaced whatset=1 by whatset=lh.RETRACTION
flatfilts.py
- added copyright information
- added apply_plotmanipulators option (all, none, flatten) to do_convfilt()
generalvclamp.ini/generalvclamp.py
- added options: decimals, multiplier, show_in_legend to [distance] and [force]
- added options: decimals, multiplier, show_in_legend to [distance] and [force]
- added options: baseline_color, baseline_show, baseline_show_in_legend, baseline_size, decimals,
maximum_color, maximum_show, maximum_show_in_legend, maximum_size, maximumrange_color,
maximumrange_show, maximumrange_show_in_legend, maximumrange_size and multiplier to [forcebase]
- added options: decimals, point_show_in_legend, slope_show_in_legend to [slope]
- added copyright information
- added prettyformat support to do_distance(), do_force(), do_forcebase(), do_slope()
- changed whatset=1 to whatset=lh.RETRACTION in linefit_between()
playlist.ini
- corrected folder location and default playlist file
plot.ini/plot.py
- added plot.ini
- modified plot.py to simply update the current plot (usually after changes are made to plot.ini)
procplots.py
- changed whatset=1 to whatset=lh.RETRACTION in do_fft()
results.ini
- changed [fit_function] to [result_type]
- added result type 'multidistance'
illysam [Mon, 22 Feb 2010 20:29:30 +0000 (20:29 +0000)]
HookeGUI
added curvetools.ini
added curvetools.py
added multidistance.ini
added multidistance.py
illysam [Fri, 19 Feb 2010 21:07:57 +0000 (21:07 +0000)]
hooke.py
- added ApplyPlotmanipulators()
- added configuration support to _delta()
- added linewidth option to UpdatePlot()
- 'fixed' GetDisplayedPlot()
hooke configspec.ini
- added curvetools plugin
hooke.ini
- added curvetools plugin
- added multidistance plugin
- removed plot plugin (do_replot() was moved to procplots.py)
curve.py
- added linewidth
playlist.py
- fixed the way the filename is retrieved from the playlist file
plugin.py
- added option section
- removed option key
- added comments
prettyformat.py
- fixed pretty_format() for 0 and NaN
results.py
- added class ResultsMultiDistance()
- fixed set_multipliers()
autopeak.ini/autopeak.py
- renamed 'peak_color' option to 'color'
- removed options: peak_show and peak_size (now in flatfilts.py-do_peaks())
- renamed x_values/y_values to retraction.x/retraction.y, respectively
- removed flatten plotmanipulator option (now in convfilt)
export.ini/export.py
- added append option
flatfilts.ini/flatfilts.py
- added apply_plotmanipulators option
- added configuration support to has_peaks()
- removed exec_has_peaks() as it is no longer necessary
generalvclamp.ini/generalvclamp.py
- added options: color, size to [distance]
- renamed 'show_points' to 'show' in [distance]
- added options: color, show, size to [force]
- added options: color, show, size to [forcebase]
- added options: point_color, point_show, point_size, slope_color, slope_linewidth, slope_show to [slope]
- added configuration support to do_distance(), do_force()
procplots.ini/procplots.py
- added option centerzero
- moved do_replot() form plot.py to procplots.py
results.py
- fixed do_show_results() to work with configuration options
albertogomcas [Thu, 18 Feb 2010 05:38:56 +0000 (05:38 +0000)]
Fixed some bugs
fabrizio.benedetti.82 [Thu, 11 Feb 2010 13:20:54 +0000 (13:20 +0000)]
Scale of axis are now in engineering format.
devicerandom [Wed, 10 Feb 2010 21:04:56 +0000 (21:04 +0000)]
(generalvclamp.py) Error checking in flatten plot manipulator - fixes issue 31
illysam [Sat, 6 Feb 2010 13:36:44 +0000 (13:36 +0000)]
added plotmanipulator centerzero to procplots.py
illysam [Fri, 5 Feb 2010 18:11:58 +0000 (18:11 +0000)]
Added ReadMe.txt and some docstrings
albertogomcas [Fri, 5 Feb 2010 05:56:15 +0000 (05:56 +0000)]
review.py plugin allows to review curves in groups of ten (à la Igor Pro), select some of them and save to a separate directory
devicerandom [Mon, 1 Feb 2010 16:09:54 +0000 (16:09 +0000)]
Added illysam branch
W. Trevor King (2010-6-3):
This branch originally had a separate root from the default branch,
despite being a fork. The history of the forking has been lost, so
I'm grafting it on at a likely place. The graft should help with
merging future changes, but don't consider it to be the true history
of this branch.
fabrizio.benedetti.82 [Wed, 27 Jan 2010 08:02:51 +0000 (08:02 +0000)]
Added two plugin: jumpstat.py and multidistance.py. Change to the function has_peaks. Moved some basics routines in the new file curvetools.py.
albertogomcas [Wed, 27 Jan 2010 03:52:42 +0000 (03:52 +0000)]
Command 'note' saves notes into 'hookedir/output' directory (a bit cleaner) and if the note file exists adds instead of overwriting the file.
albertogomcas [Wed, 27 Jan 2010 03:01:14 +0000 (03:01 +0000)]
New plotmanip 'centerzero' shifts the curves to 0 force
albertogomcas [Fri, 22 Jan 2010 07:14:22 +0000 (07:14 +0000)]
Support for HDF5 files created with Igor Pro (see wiki for how to create the HDF5 file)
albertogomcas [Fri, 22 Jan 2010 07:10:10 +0000 (07:10 +0000)]
Fix: genlist can now import files without extension
W. Trevor King [Thu, 17 Dec 2009 21:09:51 +0000 (16:09 -0500)]
Added Alberto's mailing list comments about lib*.py to their docstrings.
From the thread:
http://groups.google.com/group/hookesoftware/browse_thread/thread/
7b893284cc317ea6#
W. Trevor King [Thu, 17 Dec 2009 20:35:25 +0000 (15:35 -0500)]
Added config_dir to libhooke.HookeConfig to match new dir structure
W. Trevor King [Thu, 17 Dec 2009 20:02:55 +0000 (15:02 -0500)]
Added USAGE file based on code.google.com/p/hooke/wiki/BasicAnalysis
W. Trevor King [Thu, 17 Dec 2009 19:43:34 +0000 (14:43 -0500)]
All classes should at least subclass 'object' to avoid being old-style classes.
See, for example
http://www.python.org/doc/newstyle/
http://www.python.org/doc/2.5.2/ref/node33.html
W. Trevor King [Thu, 17 Dec 2009 19:32:21 +0000 (14:32 -0500)]
Removed sha-bang from non-executable python files + whitespace cleanups.
Whitespace cleanups mostly involved removing trailing whitespace.
W. Trevor King [Thu, 17 Dec 2009 19:19:40 +0000 (14:19 -0500)]
Added README and reorganized directory structure (breaks code)
devicerandom [Thu, 19 Nov 2009 19:10:11 +0000 (19:10 +0000)]
(fit.py) Quick kludgy patch for crash of issue 0028
devicerandom [Thu, 19 Nov 2009 19:01:28 +0000 (19:01 +0000)]
(fit.py) Fixed -maybe- FJC plotting
fabrizio.benedetti.82 [Thu, 19 Nov 2009 11:46:40 +0000 (11:46 +0000)]
(autopeak.py) Corrected a bug introduced in r208
fabrizio.benedetti.82 [Wed, 11 Nov 2009 15:08:17 +0000 (15:08 +0000)]
(autopeak.py) Repeatedly asks for correct input.
fabrizio.benedetti.82 [Tue, 3 Nov 2009 15:44:12 +0000 (15:44 +0000)]
Added multidistance plugin.
devicerandom [Sun, 1 Nov 2009 17:39:28 +0000 (17:39 +0000)]
(autopeak.py) fixed autopeak documentation
devicerandom [Sun, 1 Nov 2009 17:20:21 +0000 (17:20 +0000)]
(autopeak.py) autopeak can now use FJC or WLC
devicerandom [Sun, 1 Nov 2009 16:51:27 +0000 (16:51 +0000)]
(fit.py) wording output is consistent with fit function used
devicerandom [Sun, 1 Nov 2009 16:42:42 +0000 (16:42 +0000)]
(fit.py) WLC and FJC now aliases of fit command
devicerandom [Sat, 31 Oct 2009 22:23:58 +0000 (22:23 +0000)]
Got FJC drawing right.
devicerandom [Sat, 31 Oct 2009 22:09:24 +0000 (22:09 +0000)]
Better plotting of FJC but not there yet
devicerandom [Sat, 31 Oct 2009 21:38:54 +0000 (21:38 +0000)]
First steps towards FJC support. New variable fit_function for flexible switching, still errors in drawing, inconsistencies etc. but the numbers in output seem sensible
devicerandom [Thu, 29 Oct 2009 14:57:30 +0000 (14:57 +0000)]
Hopefully reverted to r193 after mbrucale's incident
marcobrucale [Thu, 29 Oct 2009 14:43:09 +0000 (14:43 +0000)]
marcobrucale [Thu, 29 Oct 2009 14:41:17 +0000 (14:41 +0000)]
devicerandom [Thu, 8 Oct 2009 18:57:56 +0000 (18:57 +0000)]
using numpy.mean to avoid warnings; still not perfect though
devicerandom [Thu, 8 Oct 2009 18:45:14 +0000 (18:45 +0000)]
correct parsing of args of peaks command; Fixes issue 0017
devicerandom [Fri, 28 Aug 2009 12:12:09 +0000 (12:12 +0000)]
added cut.py plugin (by Fabrizio Benedetti, EPFL, Lausanne)
devicerandom [Mon, 10 Aug 2009 22:18:17 +0000 (22:18 +0000)]
deleted spurious empty dir from tree
illysam [Fri, 7 Aug 2009 13:21:48 +0000 (13:21 +0000)]
fixed: plot does not display on Windows at program launch (troubleshooting issue 1)
fixed: driver tries to open a directory (issue 15)
illysam [Fri, 31 Jul 2009 19:39:18 +0000 (19:39 +0000)]
fixed counter issue
illysam [Wed, 29 Jul 2009 17:19:47 +0000 (17:19 +0000)]
Fixed MFP1D export from Igor 4 (wavenote was not complete)
illysam [Wed, 29 Jul 2009 13:34:33 +0000 (13:34 +0000)]
pancaldi.paolo [Fri, 24 Jul 2009 18:24:38 +0000 (18:24 +0000)]
adding a folder creation with the good plot files inside
devicerandom [Fri, 24 Jul 2009 14:58:44 +0000 (14:58 +0000)]
(hooke_cli.py) text export, now with measure units. Fixes issue 0014
devicerandom [Fri, 24 Jul 2009 14:35:36 +0000 (14:35 +0000)]
(mfp1dexport.py) Fixed k determination, at least until we find news on the mysteries of mfp export
devicerandom [Fri, 24 Jul 2009 14:12:19 +0000 (14:12 +0000)]
(mfp1dexport.py) Fixed trivial bug in K determination ; fixed optimistic __init__ leading to random crashes
devicerandom [Fri, 3 Jul 2009 17:55:00 +0000 (17:55 +0000)]
(hooke_cli.py) fixed export - bug 0011
pancaldi.paolo [Wed, 1 Jul 2009 23:10:06 +0000 (23:10 +0000)]
pCluster ver.1 ... working! oneClick style. Updated with automatic filter calculation.
pancaldi.paolo [Wed, 1 Jul 2009 23:04:44 +0000 (23:04 +0000)]
Updated with "debug" option and some explanation.
Maybe the last update!
devicerandom [Mon, 29 Jun 2009 20:21:41 +0000 (20:21 +0000)]
(mfp_igor_scripts) Scripts committed
devicerandom [Mon, 29 Jun 2009 20:16:20 +0000 (20:16 +0000)]
(mfp1dexport.py , mfp_igor_scripts) Initial indirect support for the MFP1D Asylum microscope files, via exporting scripts
pancaldi.paolo [Fri, 26 Jun 2009 14:45:09 +0000 (14:45 +0000)]
pcluster improved with density estimation and second PCA. next step will be to clean everything in order to use pCluster in oneClick style!
pancaldi.paolo [Fri, 26 Jun 2009 14:21:04 +0000 (14:21 +0000)]
updated with density limit
marcobrucale [Mon, 22 Jun 2009 10:52:13 +0000 (10:52 +0000)]
Just added a new config variable, "force_multiplier", which unsurprisingly muliplies each Y on an SMFS curve. Default value is 1. This is sometimes useful for calibration.
devicerandom [Tue, 26 May 2009 16:32:47 +0000 (16:32 +0000)]
(autopeak.py, etc.) added noflatten option to autopeak, plus small stuff here and there
devicerandom [Wed, 20 May 2009 11:35:11 +0000 (11:35 +0000)]
(mcs.py) lower- and upper- case both working
devicerandom [Thu, 7 May 2009 11:25:23 +0000 (11:25 +0000)]
(mcs.py , generaltccd.py) added first version of TCCD driver and utilities
marcobrucale [Thu, 30 Apr 2009 10:21:49 +0000 (10:21 +0000)]
Added a small feature in the 'autopeak' command. If the variable 'baseline_clicks' is set to -1, no baseline is calculated. Rather, the ordinate of the contact point (either hand-picked or automatically found depending on other autopeak arguments) is taken as the zero force point.
pancaldi.paolo [Fri, 24 Apr 2009 14:00:42 +0000 (14:00 +0000)]
add doublepca and triplepca functions
devicerandom [Fri, 20 Mar 2009 16:26:38 +0000 (16:26 +0000)]
(autopeak.py, flatfilts.py, hooke_cli.py) various error checkings
pancaldi.paolo [Fri, 13 Mar 2009 01:29:23 +0000 (01:29 +0000)]
PCA improved: it takes columns and multiplier factor from pca_config.txt or from second argument, and save a png file.
new MULTIPCA function: multiply selected column for values 1-100 and save all plots.
devicerandom [Wed, 11 Mar 2009 16:04:39 +0000 (16:04 +0000)]
(tutorial.py) updated plugin tutorial
pancaldi.paolo [Wed, 11 Mar 2009 14:31:34 +0000 (14:31 +0000)]
nothing of important (new function for building a file's coordinate)
devicerandom [Mon, 9 Mar 2009 19:37:43 +0000 (19:37 +0000)]
(pcluster.py) again, dirty stuff for testing
pancaldi.paolo [Mon, 9 Mar 2009 15:33:21 +0000 (15:33 +0000)]
add file configuration in order to choice the pca's columns
pancaldi.paolo [Mon, 9 Mar 2009 15:32:02 +0000 (15:32 +0000)]
configuration file for pca's columns
devicerandom [Fri, 6 Mar 2009 15:22:04 +0000 (15:22 +0000)]
(pcluster.py) testing stuff for test datasets
devicerandom [Wed, 4 Mar 2009 19:32:14 +0000 (19:32 +0000)]
(pcluster.py) fixed typo
pancaldi.paolo [Wed, 4 Mar 2009 19:21:49 +0000 (19:21 +0000)]
fixed many importants bugs: flatten, c_leng(ths) and p_leng(ths)
devicerandom [Wed, 4 Mar 2009 14:08:34 +0000 (14:08 +0000)]
(pcluster.py) fixed stupid crash
pancaldi.paolo [Wed, 4 Mar 2009 13:47:21 +0000 (13:47 +0000)]
little changing in the list of clustering coordinates (columns view)
devicerandom [Wed, 4 Mar 2009 13:07:50 +0000 (13:07 +0000)]
(flatfilts.py) fixed peaks command crashing (pcluster.py) fixed contact point determination
devicerandom [Tue, 3 Mar 2009 17:58:58 +0000 (17:58 +0000)]
(autopeak.py) fixed stuff about color management
devicerandom [Tue, 3 Mar 2009 15:58:29 +0000 (15:58 +0000)]
(generalvclamp.py) now linefit_between accepts whatset