From 28237bec70cbb970c5b987550cceaf54a594e005 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@drexel.edu>
Date: Wed, 5 May 2010 11:33:22 -0400
Subject: [PATCH] Convert from DOS to UNIX line endings.

This keeps the project consistent, since all my new files will have
UNIX line endings.  If people use tools that can't handle UNIX line
endings, we can always convert back later:

  for f in $(find . | grep -v '\.git'); do unix2dos "$f"; done
---
 conf/autopeak.ini                    |  182 +-
 conf/fit.ini                         |    4 +-
 conf/flatfilts.ini                   |  168 +-
 conf/general.ini                     |   42 +-
 conf/generalvclamp.ini               |   36 +-
 conf/hooke.conf                      |  224 +--
 conf/pca_config.txt                  |   64 +-
 conf/pcluster.ini                    |   18 +-
 conf/procplots.ini                   |   22 +-
 hooke/hooke.py                       | 2524 +++++++++++++-------------
 hooke/playlist.py                    |  394 ++--
 hooke/plugin/__init__.py             |  114 +-
 hooke/plugin/showconvoluted.py       |  122 +-
 hooke/ui/gui/hookeplaylist.py        |  212 +--
 hooke/ui/gui/hookepropertyeditor.py  | 1038 +++++------
 hooke/ui/gui/hookeresults.py         |  156 +-
 hooke/ui/gui/prettyformat.py         |  280 +--
 hooke/ui/gui/results.py              |  300 +--
 mfp_igor_scripts/ExportMFP1D.ipf     |  370 ++--
 mfp_igor_scripts/ExportMFP1DMenu.ipf |    6 +-
 20 files changed, 3138 insertions(+), 3138 deletions(-)

diff --git a/conf/autopeak.ini b/conf/autopeak.ini
index 3f6cf98..7fd1d87 100644
--- a/conf/autopeak.ini
+++ b/conf/autopeak.ini
@@ -1,91 +1,91 @@
-[autopeak]
-    [[auto_fit_nm]]
-        default = 5
-        minimum = 0
-        type = float
-        value = 5
-
-    [[auto_fit_points]]
-        default = 50
-        minimum = 0
-        type = integer
-        value = 50
-
-    [[auto_left_baseline]]
-        default = 20
-        minimum = 0
-        type = float
-        value = 20
-
-    [[auto_max_p]]
-        default = 10
-        minimum = 0
-        type = float
-        value = 10
-
-    [[auto_min_p]]
-        default = 0.005
-        minimum = 0
-        type = float
-        value = 0.005
-
-    [[auto_right_baseline]]
-        default = 20
-        minimum = 0
-        type = float
-        value = 20
-
-    [[auto_slope_span]]
-        default = 20
-        minimum = 0
-        type = integer
-        value = 20
-
-    [[baseline_clicks]]
-        default = 0
-        maximum = 20
-        minimum = 0
-        type = integer
-        value = 0
-
-    [[noauto]]
-        default = False
-        type = boolean
-        value = False
-
-    [[noflatten]]
-        default = False
-        type = boolean
-        value = False
-
-    [[pl]]
-        default = 5
-        minimum = 0
-        type = float
-        value = 5
-
-    [[rebase]]
-        default = True
-        type = boolean
-        value = False
-
-    [[reclick]]
-        default = False
-        type = boolean
-        value = False
-
-    [[temperature]]
-        default = 293
-        minimum = 0
-        type = float
-        value = 293
-
-    [[usepl]]
-        default = False
-        type = boolean
-        value = False
-
-    [[usepoints]]
-        default = False
-        type = boolean
-        value = False
+[autopeak]
+    [[auto_fit_nm]]
+        default = 5
+        minimum = 0
+        type = float
+        value = 5
+
+    [[auto_fit_points]]
+        default = 50
+        minimum = 0
+        type = integer
+        value = 50
+
+    [[auto_left_baseline]]
+        default = 20
+        minimum = 0
+        type = float
+        value = 20
+
+    [[auto_max_p]]
+        default = 10
+        minimum = 0
+        type = float
+        value = 10
+
+    [[auto_min_p]]
+        default = 0.005
+        minimum = 0
+        type = float
+        value = 0.005
+
+    [[auto_right_baseline]]
+        default = 20
+        minimum = 0
+        type = float
+        value = 20
+
+    [[auto_slope_span]]
+        default = 20
+        minimum = 0
+        type = integer
+        value = 20
+
+    [[baseline_clicks]]
+        default = 0
+        maximum = 20
+        minimum = 0
+        type = integer
+        value = 0
+
+    [[noauto]]
+        default = False
+        type = boolean
+        value = False
+
+    [[noflatten]]
+        default = False
+        type = boolean
+        value = False
+
+    [[pl]]
+        default = 5
+        minimum = 0
+        type = float
+        value = 5
+
+    [[rebase]]
+        default = True
+        type = boolean
+        value = False
+
+    [[reclick]]
+        default = False
+        type = boolean
+        value = False
+
+    [[temperature]]
+        default = 293
+        minimum = 0
+        type = float
+        value = 293
+
+    [[usepl]]
+        default = False
+        type = boolean
+        value = False
+
+    [[usepoints]]
+        default = False
+        type = boolean
+        value = False
diff --git a/conf/fit.ini b/conf/fit.ini
index d84e157..1fd229f 100644
--- a/conf/fit.ini
+++ b/conf/fit.ini
@@ -1,3 +1,3 @@
-[fit]
-flatten = 1
+[fit]
+flatten = 1
 temperature = 301
\ No newline at end of file
diff --git a/conf/flatfilts.ini b/conf/flatfilts.ini
index 391b47a..6f2bea9 100644
--- a/conf/flatfilts.ini
+++ b/conf/flatfilts.ini
@@ -1,84 +1,84 @@
-[convfilt]
-    [[blindwindow]]
-        default = 20
-        maximum = 10000
-        minimum = 0
-        type = float
-        value = 20
-
-    [[convolution]]
-        default = '[6.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0]'
-        type = string
-        #value = '[6.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0]'
-        value = '[11.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0]'
-
-    [[maxcut]]
-        default = 0.2
-        maximum = 1
-        minimum = 0
-        type = float
-        value = 0.2
-        visible = False
-
-    [[medianfilter]]
-        default = 7
-        maximum = 100
-        minimum = 0
-        type = integer
-        value = 7
-
-    [[mindeviation]]
-        default = 5
-        maximum = 100
-        minimum = 0
-        type = float
-        value = 5
-
-    [[minpeaks]]
-        default = 5
-        maximum = 20
-        minimum = 0
-        type = integer
-        value = 1
-
-    [[positive]]
-        default = False
-        type = boolean
-        value = False
-
-    [[seedouble]]
-        default = 10
-        maximum = 1000
-        minimum = 0
-        type = integer
-        value = 10
-
-    [[stable]]
-        default = 0.005
-        maximum = 1
-        minimum = 0
-        type = float
-        value = 0.005
-
-[flatfilt]
-    #[[median_filter]]
-        #default = 7
-        #maximum = 100
-        #minimum = 0
-        #type = integer
-        #value = 7
-
-    [[min_npks]]
-        default = 4
-        maximum = 10000
-        minimum = 1
-        type = integer
-        value = 4
-
-    [[min_deviation]]
-        default = 9
-        maximum = 100
-        minimum = 1
-        type = float
-        value = 9
-
+[convfilt]
+    [[blindwindow]]
+        default = 20
+        maximum = 10000
+        minimum = 0
+        type = float
+        value = 20
+
+    [[convolution]]
+        default = '[6.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0]'
+        type = string
+        #value = '[6.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0]'
+        value = '[11.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0]'
+
+    [[maxcut]]
+        default = 0.2
+        maximum = 1
+        minimum = 0
+        type = float
+        value = 0.2
+        visible = False
+
+    [[medianfilter]]
+        default = 7
+        maximum = 100
+        minimum = 0
+        type = integer
+        value = 7
+
+    [[mindeviation]]
+        default = 5
+        maximum = 100
+        minimum = 0
+        type = float
+        value = 5
+
+    [[minpeaks]]
+        default = 5
+        maximum = 20
+        minimum = 0
+        type = integer
+        value = 1
+
+    [[positive]]
+        default = False
+        type = boolean
+        value = False
+
+    [[seedouble]]
+        default = 10
+        maximum = 1000
+        minimum = 0
+        type = integer
+        value = 10
+
+    [[stable]]
+        default = 0.005
+        maximum = 1
+        minimum = 0
+        type = float
+        value = 0.005
+
+[flatfilt]
+    #[[median_filter]]
+        #default = 7
+        #maximum = 100
+        #minimum = 0
+        #type = integer
+        #value = 7
+
+    [[min_npks]]
+        default = 4
+        maximum = 10000
+        minimum = 1
+        type = integer
+        value = 4
+
+    [[min_deviation]]
+        default = 9
+        maximum = 100
+        minimum = 1
+        type = float
+        value = 9
+
diff --git a/conf/general.ini b/conf/general.ini
index 7b5e2cc..ca15d39 100644
--- a/conf/general.ini
+++ b/conf/general.ini
@@ -1,22 +1,22 @@
-[genlist]
-    [[folder]]
-        default = ''
-        type = folder
-        value = 'R:\Programming\Python\Gui\data\dwell'
-
-    [[filemask]]
-        default = '*.*'
-        type = string
-        value = '*.*'
-
-[loadlist]
-    [[filename]]
-        default = 'test.hkp'
-        type = filename
-        value = 'R:\Programming\Python\Gui\untitled.hkp'
-
-[savelist]
-    [[filename]]
-        default = 'untitled.hkp'
-        type = filename
+[genlist]
+    [[folder]]
+        default = ''
+        type = folder
+        value = 'R:\Programming\Python\Gui\data\dwell'
+
+    [[filemask]]
+        default = '*.*'
+        type = string
+        value = '*.*'
+
+[loadlist]
+    [[filename]]
+        default = 'test.hkp'
+        type = filename
+        value = 'R:\Programming\Python\Gui\untitled.hkp'
+
+[savelist]
+    [[filename]]
+        default = 'untitled.hkp'
+        type = filename
         value = 'R:\Programming\Python\Gui\untitled.hkp'
\ No newline at end of file
diff --git a/conf/generalvclamp.ini b/conf/generalvclamp.ini
index 45132fa..57af149 100644
--- a/conf/generalvclamp.ini
+++ b/conf/generalvclamp.ini
@@ -1,19 +1,19 @@
-[generalvclamp]
-    [[flatten]]
-        default = True
-        type = boolean
-        value = True
-
-    [[max_cycles]]
-        default = 1
-        maximum = 100
-        minimum = 0
-        type = integer
-        value = 1
-
-    [[force_multiplier]]
-        default = 1
-        maximum = 100
-        minimum = 0
-        type = float
+[generalvclamp]
+    [[flatten]]
+        default = True
+        type = boolean
+        value = True
+
+    [[max_cycles]]
+        default = 1
+        maximum = 100
+        minimum = 0
+        type = integer
+        value = 1
+
+    [[force_multiplier]]
+        default = 1
+        maximum = 100
+        minimum = 0
+        type = float
         value = 1
\ No newline at end of file
diff --git a/conf/hooke.conf b/conf/hooke.conf
index 9236b81..3741a2b 100644
--- a/conf/hooke.conf
+++ b/conf/hooke.conf
@@ -1,113 +1,113 @@
-<?xml version="1.0" ?>
-<!-- To comment something, put dashes and ! like here -->
-<config>
-
-
-<!--
-This section defines the Hooke installation.  confpath is hardcoded,
-since it's to find the config file(s) before your read them.
-    -->
-<install>
-    <docpath>
-        ./doc/
-    </docpath>
-</install>
-
-<!-- Internal variables. -->
-<display
-    ext="1"
-    colour_ext="None"
-    ret="1"
-    colour_ret="None"
-    correct="1"
-    colour_correct="None"
-    contact_point="0"
-    medfilt="0"
-    xaxes="0"
-    yaxes="0"
-    flatten="1"
-    fit_function="wlc"
-    temperature="301"
-    auto_fit_points="50"
-    auto_slope_span="20"
-    auto_delta_force="10"
-    auto_fit_nm="5"
-    auto_min_p="0.005"
-    auto_max_p="10"
-    baseline_clicks="0"
-    auto_left_baseline="20"
-    auto_right_baseline="20"
-    force_multiplier="1"
-    fc_showphase="0"
-    fc_showimposed="0"
-    fc_interesting="0"
-    tccd_threshold="0"
-    tccd_coincident="0"
-    centerzero="1"
-/>
-
-<!--
-The following section defines the default playlist to load at startup.
-    -->
-<defaultlist>
-    ./hooke/test/test.hkp
-</defaultlist>
-
-<!--
-This section defines which plugins have to be loaded by Hooke.
-     -->
-<plugins>
-    <fit/>
-    <curvetools/>
-    <procplots/>
-    <flatfilts/>
-    <generalclamp/>
-    <!-- dummyguiplug/ -->
-    <!-- superimpose/ -->
-    <generalvclamp/>
-    <massanalysis/>
-    <viewer/>
-    <!-- tutorial/ -->
-    <macro/>
-    <autopeak/>
-    <pcluster/>
-    <generaltccd/>
-    <multidistance/>
-    <jumpstat/>
-    <review/>
-    <multifit/>
-</plugins>
-
-<!--
-This section defines which drivers have to be loaded by Hooke.
-    -->
-<drivers>
-    <!--picoforce/-->
-    <picoforcealt/>
-    <hemingclamp/>
-    <csvdriver/>
-    <!-- tutorialdriver/ -->
-    <jpk/>
-    <mfp1dexport/>
-    <mcs/>
-    <!-- hdf5/ -->
-    <mfp3d/>
-</drivers>
-
-<!--
-This section defines which plot manipulators have to be loaded by Hooke,
-and -IMPORTANTLY- their order.
-    -->
-<plotmanips>
-    <correct/>
-    <median/>
-    <!-- absvalue/ -->
-    <flatten/>
-    <multiplier/>
-    <clamp/>
-    <threshold/>
+<?xml version="1.0" ?>
+<!-- To comment something, put dashes and ! like here -->
+<config>
+
+
+<!--
+This section defines the Hooke installation.  confpath is hardcoded,
+since it's to find the config file(s) before your read them.
+    -->
+<install>
+    <docpath>
+        ./doc/
+    </docpath>
+</install>
+
+<!-- Internal variables. -->
+<display
+    ext="1"
+    colour_ext="None"
+    ret="1"
+    colour_ret="None"
+    correct="1"
+    colour_correct="None"
+    contact_point="0"
+    medfilt="0"
+    xaxes="0"
+    yaxes="0"
+    flatten="1"
+    fit_function="wlc"
+    temperature="301"
+    auto_fit_points="50"
+    auto_slope_span="20"
+    auto_delta_force="10"
+    auto_fit_nm="5"
+    auto_min_p="0.005"
+    auto_max_p="10"
+    baseline_clicks="0"
+    auto_left_baseline="20"
+    auto_right_baseline="20"
+    force_multiplier="1"
+    fc_showphase="0"
+    fc_showimposed="0"
+    fc_interesting="0"
+    tccd_threshold="0"
+    tccd_coincident="0"
+    centerzero="1"
+/>
+
+<!--
+The following section defines the default playlist to load at startup.
+    -->
+<defaultlist>
+    ./hooke/test/test.hkp
+</defaultlist>
+
+<!--
+This section defines which plugins have to be loaded by Hooke.
+     -->
+<plugins>
+    <fit/>
+    <curvetools/>
+    <procplots/>
+    <flatfilts/>
+    <generalclamp/>
+    <!-- dummyguiplug/ -->
+    <!-- superimpose/ -->
+    <generalvclamp/>
+    <massanalysis/>
+    <viewer/>
+    <!-- tutorial/ -->
+    <macro/>
+    <autopeak/>
+    <pcluster/>
+    <generaltccd/>
+    <multidistance/>
+    <jumpstat/>
+    <review/>
+    <multifit/>
+</plugins>
+
+<!--
+This section defines which drivers have to be loaded by Hooke.
+    -->
+<drivers>
+    <!--picoforce/-->
+    <picoforcealt/>
+    <hemingclamp/>
+    <csvdriver/>
+    <!-- tutorialdriver/ -->
+    <jpk/>
+    <mfp1dexport/>
+    <mcs/>
+    <!-- hdf5/ -->
+    <mfp3d/>
+</drivers>
+
+<!--
+This section defines which plot manipulators have to be loaded by Hooke,
+and -IMPORTANTLY- their order.
+    -->
+<plotmanips>
+    <correct/>
+    <median/>
+    <!-- absvalue/ -->
+    <flatten/>
+    <multiplier/>
+    <clamp/>
+    <threshold/>
     <coincident/>
-    <centerzero/>
-</plotmanips>
-
-</config>
+    <centerzero/>
+</plotmanips>
+
+</config>
diff --git a/conf/pca_config.txt b/conf/pca_config.txt
index 8eb72a9..4ce44ef 100644
--- a/conf/pca_config.txt
+++ b/conf/pca_config.txt
@@ -1,33 +1,33 @@
-1,3,6,7,8,9x15,10,11
-0.000000
-1,2,3,4,5,6,7,8,9,10,11
-debug=false
-------------------------------------------
-#1 colonne della prima pca
-#2 limite filtro della densità (x es: "0.000008"; "0" per calcolo automatico.. 3,242311147)
-#3 colonne della secona pca (non usato)
-#4 attiva modalità debug (stampa anche immagini/coordinate di pca/density)
-------------------------------------------
-str(peak_number)+     # non considerato
-str(delta_mean)+      # 0
-str(delta_median)+    # 1 -
-str(force_mean)+      # 2
-str(force_median)+    # 3 -
-str(first_peak_cl)+   # 4 -
-str(last_peak_cl)+    # 5 -
-str(max_force)+       # 6
-str(min_force)+       # 7
-str(max_delta)+       # 8
-str(min_delta)+       # 9
-str(delta_stdev)+     # 10
-str(forces_stdev)+    # 11
-str(peaks_diff)+      # 12
-------------------------------------------
-Lancio di pCluster e pca:
- - cd 20080917_4s4wt_10mMtris_all
- - genlist *.*
- - setconv blindwindow 50
- - pcluster pl=0.35
-------------------------------------------
-Lancio della sola pca
+1,3,6,7,8,9x15,10,11
+0.000000
+1,2,3,4,5,6,7,8,9,10,11
+debug=false
+------------------------------------------
+#1 colonne della prima pca
+#2 limite filtro della densità (x es: "0.000008"; "0" per calcolo automatico.. 3,242311147)
+#3 colonne della secona pca (non usato)
+#4 attiva modalità debug (stampa anche immagini/coordinate di pca/density)
+------------------------------------------
+str(peak_number)+     # non considerato
+str(delta_mean)+      # 0
+str(delta_median)+    # 1 -
+str(force_mean)+      # 2
+str(force_median)+    # 3 -
+str(first_peak_cl)+   # 4 -
+str(last_peak_cl)+    # 5 -
+str(max_force)+       # 6
+str(min_force)+       # 7
+str(max_delta)+       # 8
+str(min_delta)+       # 9
+str(delta_stdev)+     # 10
+str(forces_stdev)+    # 11
+str(peaks_diff)+      # 12
+------------------------------------------
+Lancio di pCluster e pca:
+ - cd 20080917_4s4wt_10mMtris_all
+ - genlist *.*
+ - setconv blindwindow 50
+ - pcluster pl=0.35
+------------------------------------------
+Lancio della sola pca
  - pca 20080922_gb1x8_tris/pCluster_20090627_1328/coordinate_20080922_gb1x8_tris_blind50.txt
\ No newline at end of file
diff --git a/conf/pcluster.ini b/conf/pcluster.ini
index 1984027..a7f7168 100644
--- a/conf/pcluster.ini
+++ b/conf/pcluster.ini
@@ -1,10 +1,10 @@
-[pcluster]
-auto_fit_nm = 5
-auto_fit_points = 50
-auto_left_baseline = 20
-auto_max_p = 10
-auto_min_p = 0.005
-auto_right_baseline = 20
-auto_slope_span = 20
-baseline_clicks = 0
+[pcluster]
+auto_fit_nm = 5
+auto_fit_points = 50
+auto_left_baseline = 20
+auto_max_p = 10
+auto_min_p = 0.005
+auto_right_baseline = 20
+auto_slope_span = 20
+baseline_clicks = 0
 temperature = 301
\ No newline at end of file
diff --git a/conf/procplots.ini b/conf/procplots.ini
index ab6d1a5..2558ba5 100644
--- a/conf/procplots.ini
+++ b/conf/procplots.ini
@@ -1,12 +1,12 @@
-[procplots]
-    [[median]]
-        default = 0
-        maximum = 100
-        minimum = 0
-        type = integer
-        value = 0
-
-    [[correct]]
-        default = True
-        type = boolean
+[procplots]
+    [[median]]
+        default = 0
+        maximum = 100
+        minimum = 0
+        type = integer
+        value = 0
+
+    [[correct]]
+        default = True
+        type = boolean
         value = True
\ No newline at end of file
diff --git a/hooke/hooke.py b/hooke/hooke.py
index 3662b51..547d7cc 100644
--- a/hooke/hooke.py
+++ b/hooke/hooke.py
@@ -1,1262 +1,1262 @@
-#!/usr/bin/env python
-
-'''
-HOOKE - A force spectroscopy review & analysis tool
-
-Copyright (C) 2008-2010 Massimo Sandal (University of Bologna, Italy).
-                        Rolf Schmidt (Concordia University, Canada).
-
-This program is released under the GNU General Public License version 2.
-'''
-
-from libhooke import WX_GOOD
-
-import wxversion
-wxversion.select(WX_GOOD)
-import copy
-import cStringIO
-import os
-import os.path
-import sys
-import glob
-import time
-
-import imp
-import wx
-import wx.html
-import wx.aui
-import wxmpl
-import wx.lib.agw.aui as aui
-import wx.propgrid as wxpg
-
-import libhooke as lh
-from config import config
-import drivers
-import plugins
-import hookecommands
-import hookeplaylist
-import hookepropertyeditor
-import hookeresults
-import playlist
-
-global __version__
-
-__version__ = lh.HOOKE_VERSION[0]
-__release_name__ = lh.HOOKE_VERSION[1]
-
-#TODO: order menu items, get rid of all unused IDs
-ID_ExportText = wx.NewId()
-ID_ExportImage = wx.NewId()
-ID_Config = wx.NewId()
-ID_About = wx.NewId()
-ID_Next = wx.NewId()
-ID_Previous = wx.NewId()
-
-ID_ViewAssistant = wx.NewId()
-ID_ViewCommands = wx.NewId()
-ID_ViewFolders = wx.NewId()
-ID_ViewOutput = wx.NewId()
-ID_ViewPlaylists = wx.NewId()
-ID_ViewProperties = wx.NewId()
-ID_ViewResults = wx.NewId()
-
-ID_CommandsList = wx.NewId()
-ID_CommandsListBox = wx.NewId()
-
-ID_TextContent = wx.NewId()
-ID_TreeContent = wx.NewId()
-ID_HTMLContent = wx.NewId()
-ID_SizeReportContent = wx.NewId()
-ID_DeletePerspective = wx.NewId()
-ID_SavePerspective = wx.NewId()
-
-ID_FirstPerspective = ID_SavePerspective + 1000
-#I hope we'll never have more than 1000 perspectives
-ID_FirstPlot = ID_SavePerspective + 2000
-
-class Hooke(wx.App):
-
-    def OnInit(self):
-        self.SetAppName('Hooke')
-        self.SetVendorName('')
-
-        #set the Hooke directory
-        lh.hookeDir = os.path.abspath(os.path.dirname(__file__))
-
-        windowPosition = (config['main']['left'], config['main']['top'])
-        windowSize = (config['main']['width'], config['main']['height'])
-
-        #setup the splashscreen
-        if config['splashscreen']['show']:
-            filename = lh.get_file_path('hooke.jpg', ['resources'])
-            if os.path.isfile(filename):
-                bitmap = wx.Image(filename).ConvertToBitmap()
-                splashStyle = wx.SPLASH_CENTRE_ON_SCREEN|wx.SPLASH_TIMEOUT
-                splashDuration = config['splashscreen']['duration']
-                wx.SplashScreen(bitmap, splashStyle, splashDuration, None, -1)
-                wx.Yield()
-                '''
-                we need for the splash screen to disappear
-                for whatever reason splashDuration and sleep do not correspond to each other
-                at least not on Windows
-                maybe it's because duration is in milliseconds and sleep in seconds
-                thus we need to increase the sleep time a bit
-                a factor of 1.2 seems to work quite well
-                '''
-                sleepFactor = 1.2
-                time.sleep(sleepFactor * splashDuration / 1000)
-
-        plugin_objects = []
-        for plugin in config['plugins']:
-            if config['plugins'][plugin]:
-                filename = ''.join([plugin, '.py'])
-                path = lh.get_file_path(filename, ['plugins'])
-                if os.path.isfile(path):
-                    #get the corresponding filename and path
-                    plugin_name = ''.join(['plugins.', plugin])
-                    module = __import__(plugin_name)
-                    #get the file that contains the plugin
-                    class_file = getattr(plugins, plugin)
-                    #get the class that contains the commands
-                    class_object = getattr(class_file, plugin + 'Commands')
-                    plugin_objects.append(class_object)
-
-        def make_command_class(*bases):
-            #create metaclass with plugins and plotmanipulators
-            return type(HookeFrame)("HookeFramePlugged", bases + (HookeFrame,), {})
-        frame = make_command_class(*plugin_objects)(parent=None, id=wx.ID_ANY, title='Hooke', pos=windowPosition, size=windowSize)
-        frame.Show(True)
-        self.SetTopWindow(frame)
-
-        return True
-
-    def OnExit(self):
-        #TODO: write values to ini file if necessary
-        return True
-
-
-class HookeFrame(wx.Frame):
-
-    def __init__(self, parent, id=-1, title='', pos=wx.DefaultPosition, size=wx.DefaultSize, style=wx.DEFAULT_FRAME_STYLE|wx.SUNKEN_BORDER|wx.CLIP_CHILDREN):
-        #call parent constructor
-        wx.Frame.__init__(self, parent, id, title, pos, size, style)
-        self.config = config
-        self.CreateApplicationIcon()
-        #self.configs contains: {the name of the Commands file: corresponding ConfigObj}
-        self.configs = {}
-        ##self.playlists contains: {the name of the playlist: [playlist, tabIndex, plotID]}
-        #self.playlists = {}
-        #self.plugins contains: {the name of the plugin: [caption, function]}
-        self.plugins = {}
-        #self.plotmanipulators list contains: [the name of the plotmanip, function, name of the module]
-        self.plotmanipulators = []
-
-        #tell FrameManager to manage this frame
-        self._mgr = aui.AuiManager()
-        self._mgr.SetManagedWindow(self)
-        #set the gradient style
-        self._mgr.GetArtProvider().SetMetric(aui.AUI_DOCKART_GRADIENT_TYPE, aui.AUI_GRADIENT_NONE)
-        #set transparent drag
-        self._mgr.SetFlags(self._mgr.GetFlags() ^ aui.AUI_MGR_TRANSPARENT_DRAG)
-
-        # set up default notebook style
-        self._notebook_style = aui.AUI_NB_DEFAULT_STYLE | aui.AUI_NB_TAB_EXTERNAL_MOVE | wx.NO_BORDER
-        self._notebook_theme = 0
-
-        #holds the perspectives: {name, [index, perspectiveStr]}
-        self._perspectives = {}
-
-        # min size for the frame itself isn't completely done.
-        # see the end up FrameManager::Update() for the test
-        # code. For now, just hard code a frame minimum size
-        self.SetMinSize(wx.Size(400, 300))
-        #create panels here
-        self.panelAssistant = self.CreatePanelAssistant()
-        self.panelCommands = self.CreatePanelCommands()
-        self.panelFolders = self.CreatePanelFolders()
-        self.panelPlaylists = self.CreatePanelPlaylists()
-        self.panelProperties = self.CreatePanelProperties()
-        self.panelOutput = self.CreatePanelOutput()
-        self.panelResults = self.CreatePanelResults()
-        self.plotNotebook = self.CreateNotebook()
-        #self.textCtrlCommandLine=self.CreateCommandLine()
-
-        # add panes
-        self._mgr.AddPane(self.panelFolders, aui.AuiPaneInfo().Name('Folders').Caption('Folders').Left().CloseButton(True).MaximizeButton(False))
-        self._mgr.AddPane(self.panelPlaylists, aui.AuiPaneInfo().Name('Playlists').Caption('Playlists').Left().CloseButton(True).MaximizeButton(False))
-        self._mgr.AddPane(self.plotNotebook, aui.AuiPaneInfo().Name('Plots').CenterPane().PaneBorder(False))
-        self._mgr.AddPane(self.panelCommands, aui.AuiPaneInfo().Name('Commands').Caption('Settings and commands').Right().CloseButton(True).MaximizeButton(False))
-        self._mgr.AddPane(self.panelProperties, aui.AuiPaneInfo().Name('Properties').Caption('Properties').Right().CloseButton(True).MaximizeButton(False))
-        self._mgr.AddPane(self.panelAssistant, aui.AuiPaneInfo().Name('Assistant').Caption('Assistant').Right().CloseButton(True).MaximizeButton(False))
-        self._mgr.AddPane(self.panelOutput, aui.AuiPaneInfo().Name('Output').Caption('Output').Bottom().CloseButton(True).MaximizeButton(False))
-        self._mgr.AddPane(self.panelResults, aui.AuiPaneInfo().Name('Results').Caption('Results').Bottom().CloseButton(True).MaximizeButton(False))
-        #self._mgr.AddPane(self.textCtrlCommandLine, aui.AuiPaneInfo().Name('CommandLine').CaptionVisible(False).Fixed().Bottom().Layer(2).CloseButton(False).MaximizeButton(False))
-        #self._mgr.AddPane(panelBottom, aui.AuiPaneInfo().Name("panelCommandLine").Bottom().Position(1).CloseButton(False).MaximizeButton(False))
-
-        # add the toolbars to the manager
-        self.toolbar=self.CreateToolBar()
-        self.toolbarNavigation=self.CreateToolBarNavigation()
-        self._mgr.AddPane(self.toolbar, aui.AuiPaneInfo().Name('toolbar').Caption('Toolbar').ToolbarPane().Top().Layer(1).Row(1).LeftDockable(False).RightDockable(False))
-        self._mgr.AddPane(self.toolbarNavigation, aui.AuiPaneInfo().Name('toolbarNavigation').Caption('Navigation').ToolbarPane().Top().Layer(1).Row(1).LeftDockable(False).RightDockable(False))
-        # "commit" all changes made to FrameManager
-        self._mgr.Update()
-        #create the menubar after the panes so that the default perspective
-        #is created with all panes open
-        self.CreateMenuBar()
-        self.statusbar = self.CreateStatusBar()
-        self._BindEvents()
-        #TODO: select item on startup (whatever item)
-        #self.listCtrlCommands.Select(0)
-        #self.OnListboxSelect(None)
-        name = self.config['perspectives']['active']
-        menu_item = self.GetPerspectiveMenuItem(name)
-        self.OnRestorePerspective(menu_item)
-        self.playlists = self.panelPlaylists.Playlists
-        #define the list of active drivers
-        self.drivers = []
-        for driver in self.config['drivers']:
-            if self.config['drivers'][driver]:
-                #get the corresponding filename and path
-                filename = ''.join([driver, '.py'])
-                path = lh.get_file_path(filename, ['drivers'])
-                #the driver is active for driver[1] == 1
-                if os.path.isfile(path):
-                    #driver files are located in the 'drivers' subfolder
-                    driver_name = ''.join(['drivers.', driver])
-                    module = __import__(driver_name)
-                    class_file = getattr(drivers, driver)
-                    for command in dir(class_file):
-                        if command.endswith('Driver'):
-                            self.drivers.append(getattr(class_file, command))
-        #import all active plugins and plotmanips
-        #the plotmanip_functions contains: {the name of the plotmanip: [method, class_object]}
-        plotmanip_functions = {}
-        #add 'general.ini' to self.configs (this is not a plugin and thus must be imported seperately)
-        ini_path = lh.get_file_path('general.ini', ['plugins'])
-        plugin_config = ConfigObj(ini_path)
-        #self.config.merge(plugin_config)
-        self.configs['general'] = plugin_config
-        #make sure we execute _plug_init() for every command line plugin we import
-        for plugin in self.config['plugins']:
-            if self.config['plugins'][plugin]:
-                filename = ''.join([plugin, '.py'])
-                path = lh.get_file_path(filename, ['plugins'])
-                if os.path.isfile(path):
-                    #get the corresponding filename and path
-                    plugin_name = ''.join(['plugins.', plugin])
-                    try:
-                        #import the module
-                        module = __import__(plugin_name)
-                        #prepare the ini file for inclusion
-                        ini_path = path.replace('.py', '.ini')
-                        #include ini file
-                        plugin_config = ConfigObj(ini_path)
-                        #self.config.merge(plugin_config)
-                        self.configs[plugin] = plugin_config
-                        #add to plugins
-                        commands = eval('dir(module.' + plugin+ '.' + plugin + 'Commands)')
-                        #keep only commands (ie names that start with 'do_')
-                        commands = [command for command in commands if command.startswith('do_')]
-                        if commands:
-                            self.plugins[plugin] = commands
-                        try:
-                            #initialize the plugin
-                            eval('module.' + plugin+ '.' + plugin + 'Commands._plug_init(self)')
-                        except AttributeError:
-                            pass
-                    except ImportError:
-                        pass
-        #initialize the commands tree
-        commands = dir(HookeFrame)
-        commands = [command for command in commands if command.startswith('do_')]
-        if commands:
-            self.plugins['general'] = commands
-        self.panelCommands.Initialize(self.plugins)
-        for command in dir(self):
-            if command.startswith('plotmanip_'):
-                plotmanip_functions[command] = [command, getattr(self, command)]
-        for name in self.config['plotmanipulators']['names']:
-            if self.config['plotmanipulators'].as_bool(name):
-                command_name = ''.join(['plotmanip_', name])
-                if command_name in plotmanip_functions:
-                    self.plotmanipulators.append(plotmanip_functions[command_name])
-        #load default list, if possible
-        self.do_loadlist(self.config['general']['list'])
-
-    def _BindEvents(self):
-        self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground)
-        self.Bind(wx.EVT_SIZE, self.OnSize)
-        self.Bind(wx.EVT_CLOSE, self.OnClose)
-        # Show How To Use The Closing Panes Event
-        self.Bind(aui.EVT_AUI_PANE_CLOSE, self.OnPaneClose)
-        self.Bind(aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.OnNotebookPageClose)
-        #menu
-        self.Bind(wx.EVT_MENU, self.OnClose, id=wx.ID_EXIT)
-        self.Bind(wx.EVT_MENU, self.OnAbout, id=wx.ID_ABOUT)
-        #view
-        self.Bind(wx.EVT_MENU_RANGE, self.OnView, id=ID_ViewAssistant, id2=ID_ViewResults)
-        #perspectives
-        self.Bind(wx.EVT_MENU, self.OnDeletePerspective, id=ID_DeletePerspective)
-        self.Bind(wx.EVT_MENU, self.OnSavePerspective, id=ID_SavePerspective)
-        self.Bind(wx.EVT_MENU_RANGE, self.OnRestorePerspective, id=ID_FirstPerspective, id2=ID_FirstPerspective+1000)
-        #toolbar
-        self.Bind(wx.EVT_TOOL, self.OnExportImage, id=ID_ExportImage)
-        self.Bind(wx.EVT_TOOL, self.OnNext, id=ID_Next)
-        self.Bind(wx.EVT_TOOL, self.OnPrevious, id=ID_Previous)
-        #self.Bind(.EVT_AUITOOLBAR_TOOL_DROPDOWN, self.OnDropDownToolbarItem, id=ID_DropDownToolbarItem)
-        #dir control
-        treeCtrl = self.panelFolders.GetTreeCtrl()
-        #tree.Bind(wx.EVT_LEFT_UP, self.OnDirCtrl1LeftUp)
-        #tree.Bind(wx.EVT_LEFT_DOWN, self.OnGenericDirCtrl1LeftDown)
-        treeCtrl.Bind(wx.EVT_LEFT_DCLICK, self.OnDirCtrlLeftDclick)
-        #playlist tree
-        self.panelPlaylists.PlaylistsTree.Bind(wx.EVT_LEFT_DOWN, self.OnPlaylistsLeftDown)
-        self.panelPlaylists.PlaylistsTree.Bind(wx.EVT_LEFT_DCLICK, self.OnPlaylistsLeftDclick)
-        #commands tree
-        self.panelCommands.ExecuteButton.Bind(wx.EVT_BUTTON, self.OnExecute)
-        self.panelCommands.CommandsTree.Bind(wx.EVT_LEFT_DOWN, self.OnTreeCtrlCommandsLeftDown)
-        #property editor
-        self.panelProperties.pg.Bind(wxpg.EVT_PG_CHANGED, self.OnPropGridChanged)
-        self.panelProperties.pg.Bind(wxpg.EVT_PG_SELECTED, self.OnPropGridSelect)
-        #results panel
-        self.panelResults.results_list.OnCheckItem = self.OnResultsCheck
-
-    def _GetActiveCurveIndex(self):
-        playlist = self.GetActivePlaylist()
-        #get the selected item from the tree
-        selected_item = self.panelPlaylists.PlaylistsTree.GetSelection()
-        #test if a playlist or a curve was double-clicked
-        if self.panelPlaylists.PlaylistsTree.ItemHasChildren(selected_item):
-            return -1
-        else:
-            count = 0
-            selected_item = self.panelPlaylists.PlaylistsTree.GetPrevSibling(selected_item)
-            while selected_item.IsOk():
-                count += 1
-                selected_item = self.panelPlaylists.PlaylistsTree.GetPrevSibling(selected_item)
-            return count
-
-    def _GetActivePlaylistName(self):
-        #get the selected item from the tree
-        selected_item = self.panelPlaylists.PlaylistsTree.GetSelection()
-        #test if a playlist or a curve was double-clicked
-        if self.panelPlaylists.PlaylistsTree.ItemHasChildren(selected_item):
-            playlist_item = selected_item
-        else:
-            #get the name of the playlist
-            playlist_item = self.panelPlaylists.PlaylistsTree.GetItemParent(selected_item)
-        #now we have a playlist
-        return self.panelPlaylists.PlaylistsTree.GetItemText(playlist_item)
-
-    def _GetPlaylistTab(self, name):
-        for index, page in enumerate(self.plotNotebook._tabs._pages):
-            if page.caption == name:
-                return index
-        return -1
-
-    def _GetUniquePlaylistName(self, name):
-        playlist_name = name
-        count = 1
-        while playlist_name in self.playlists:
-            playlist_name = ''.join([name, str(count)])
-            count += 1
-        return playlist_name
-
-    def _SavePerspectiveToFile(self, name, perspective):
-        filename = ''.join([name, '.txt'])
-        filename = lh.get_file_path(filename, ['perspectives'])
-        perspectivesFile = open(filename, 'w')
-        perspectivesFile.write(perspective)
-        perspectivesFile.close()
-
-    def AddPlaylist(self, playlist=None, name='Untitled'):
-        #TODO: change cursor or progressbar (maybe in statusbar)
-        #self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
-        if playlist and playlist.count > 0:
-            playlist.name = self._GetUniquePlaylistName(name)
-            playlist.reset()
-            self.AddToPlaylists(playlist)
-
-    def AddPlaylistFromFiles(self, files=[], name='Untitled'):
-        #TODO: change cursor or progressbar (maybe in statusbar)
-        #self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
-        if files:
-            playlist = Playlist.Playlist(self.drivers)
-            for item in files:
-                playlist.add_curve(item)
-        if playlist.count > 0:
-            playlist.name = self._GetUniquePlaylistName(name)
-            playlist.reset()
-            self.AddToPlaylists(playlist)
-
-    def AddToPlaylists(self, playlist):
-        if playlist.has_curves:
-            #setup the playlist in the Playlist tree
-            tree_root = self.panelPlaylists.PlaylistsTree.GetRootItem()
-            playlist_root = self.panelPlaylists.PlaylistsTree.AppendItem(tree_root, playlist.name, 0)
-            #add all curves to the Playlist tree
-            curves = {}
-            for index, curve in enumerate(playlist.curves):
-                ##remove the extension from the name of the curve
-                ##TODO: optional?
-                #item_text, extension = os.path.splitext(curve.name)
-                #curve_ID = self.panelPlaylists.PlaylistsTree.AppendItem(playlist_root, item_text, 1)
-                curve_ID = self.panelPlaylists.PlaylistsTree.AppendItem(playlist_root, curve.name, 1)
-                if index == playlist.index:
-                    self.panelPlaylists.PlaylistsTree.SelectItem(curve_ID)
-            playlist.reset()
-            #create the plot tab and add playlist to the dictionary
-            plotPanel = wxmpl.PlotPanel(self, ID_FirstPlot + len(self.playlists))
-            notebook_tab = self.plotNotebook.AddPage(plotPanel, playlist.name, True)
-            tab_index = self.plotNotebook.GetSelection()
-            figure = plotPanel.get_figure()
-            self.playlists[playlist.name] = [playlist, figure]
-            self.panelPlaylists.PlaylistsTree.Expand(playlist_root)
-            self.statusbar.SetStatusText(playlist.get_status_string(), 0)
-            self.UpdatePlot()
-
-    def AppendToOutput(self, text):
-        self.panelOutput.AppendText(''.join([text, '\n']))
-
-    def CreateApplicationIcon(self):
-        iconFile = 'resources' + os.sep + 'microscope.ico'
-        icon = wx.Icon(iconFile, wx.BITMAP_TYPE_ICO)
-        self.SetIcon(icon)
-
-    def CreateCommandLine(self):
-        return wx.TextCtrl(self, -1, '', style=wx.NO_BORDER|wx.EXPAND)
-
-    def CreatePanelAssistant(self):
-        panel = wx.TextCtrl(self, -1, '', wx.Point(0, 0), wx.Size(150, 90), wx.NO_BORDER|wx.TE_MULTILINE)
-        panel.SetEditable(False)
-        return panel
-
-    def CreatePanelCommands(self):
-        return hookecommands.Commands(self)
-
-    def CreatePanelFolders(self):
-        #set file filters
-        filters = self.config['folders']['filters']
-        index = self.config['folders'].as_int('filterindex')
-        #set initial directory
-        folder = self.config['general']['workdir']
-        return wx.GenericDirCtrl(self, -1, dir=folder, size=(200, 250), style=wx.DIRCTRL_SHOW_FILTERS, filter=filters, defaultFilter=index)
-
-    def CreatePanelOutput(self):
-        return wx.TextCtrl(self, -1, '', wx.Point(0, 0), wx.Size(150, 90), wx.NO_BORDER|wx.TE_MULTILINE)
-
-    def CreatePanelPlaylists(self):
-        return hookeplaylist.Playlists(self)
-
-    def CreatePanelProperties(self):
-        return hookepropertyeditor.PropertyEditor(self)
-
-    def CreatePanelResults(self):
-        return hookeresults.Results(self)
-
-    def CreatePanelWelcome(self):
-        ctrl = wx.html.HtmlWindow(self, -1, wx.DefaultPosition, wx.Size(400, 300))
-        introStr = '<h1>Welcome to Hooke</h1>' + \
-                 '<h3>Features</h3>' + \
-                 '<ul>' + \
-                 '<li>View, annotate, measure force curves</li>' + \
-                 '<li>Worm-like chain fit of force peaks</li>' + \
-                 '<li>Automatic convolution-based filtering of empty curves</li>' + \
-                 '<li>Automatic fit and measurement of multiple force peaks</li>' + \
-                 '<li>Handles force-clamp force experiments (experimental)</li>' + \
-                 '<li>It is extensible by users by means of plugins and drivers</li>' + \
-                 '</ul>' + \
-                 '<p>See the <a href="/p/hooke/wiki/DocumentationIndex">DocumentationIndex</a> for more information</p>'
-        ctrl.SetPage(introStr)
-        return ctrl
-
-    def CreateMenuBar(self):
-        menu_bar = wx.MenuBar()
-        #file
-        file_menu = wx.Menu()
-        file_menu.Append(wx.ID_OPEN, '&Open playlist\tCtrl-O')
-        file_menu.Append(wx.ID_SAVE, 'Save playlist\tCtrl-S')
-        file_menu.AppendSeparator()
-        file_menu.Append(wx.ID_EXIT, 'Exit\tCtrl-Q')
-        #edit
-        edit_menu = wx.Menu()
-        edit_menu.Append(ID_ExportText, 'Export text...')
-        edit_menu.Append(ID_ExportImage, 'Export image...')
-        edit_menu.AppendSeparator();
-        edit_menu.Append(ID_Config, 'Preferences')
-        #view
-        view_menu = wx.Menu()
-        view_menu.AppendCheckItem(ID_ViewFolders, 'Folders\tF5')
-        view_menu.AppendCheckItem(ID_ViewPlaylists, 'Playlists\tF6')
-        view_menu.AppendCheckItem(ID_ViewCommands, 'Commands\tF7')
-        view_menu.AppendCheckItem(ID_ViewProperties, 'Properties\tF8')
-        view_menu.AppendCheckItem(ID_ViewAssistant, 'Assistant\tF9')
-        view_menu.AppendCheckItem(ID_ViewResults, 'Results\tF10')
-        view_menu.AppendCheckItem(ID_ViewOutput, 'Output\tF11')
-        #perspectives
-        self._perspectives_menu = self.CreatePerspectivesMenu()
-        #help
-        help_menu = wx.Menu()
-        help_menu.Append(wx.ID_ABOUT, 'About Hooke')
-        #put it all together
-        menu_bar.Append(file_menu, 'File')
-        menu_bar.Append(edit_menu, 'Edit')
-        menu_bar.Append(view_menu, 'View')
-        menu_bar.Append(self._perspectives_menu, "Perspectives")
-        menu_bar.Append(help_menu, 'Help')
-
-        self.SetMenuBar(menu_bar)
-
-    def CreateNotebook(self):
-        # create the notebook off-window to avoid flicker
-        client_size = self.GetClientSize()
-        ctrl = aui.AuiNotebook(self, -1, wx.Point(client_size.x, client_size.y), wx.Size(430, 200), self._notebook_style)
-        arts = [aui.AuiDefaultTabArt, aui.AuiSimpleTabArt, aui.VC71TabArt, aui.FF2TabArt, aui.VC8TabArt, aui.ChromeTabArt]
-        art = arts[self._notebook_theme]()
-        ctrl.SetArtProvider(art)
-        #uncomment if we find a nice icon
-        #page_bmp = wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_OTHER, wx.Size(16, 16))
-        ctrl.AddPage(self.CreatePanelWelcome(), "Welcome", False)
-        return ctrl
-
-    def CreatePerspectivesMenu(self):
-        menu = wx.Menu()
-        menu.Append(ID_SavePerspective, "Save Perspective")
-        menu.Append(ID_DeletePerspective, "Delete Perspective")
-        menu.AppendSeparator()
-        #add perspectives to menubar and _perspectives
-        perspectivesDirectory = os.path.join(lh.hookeDir, 'perspectives')
-        if os.path.isdir(perspectivesDirectory):
-            perspectiveFileNames = os.listdir(perspectivesDirectory)
-            for perspectiveFilename in perspectiveFileNames:
-                filename = lh.get_file_path(perspectiveFilename, ['perspectives'])
-                if os.path.isfile(filename):
-                    perspectiveFile = open(filename, 'rU')
-                    perspective = perspectiveFile.readline()
-                    perspectiveFile.close()
-                    if perspective != '':
-                        name, extension = os.path.splitext(perspectiveFilename)
-                        if extension == '.txt':
-                            menuItem = menu.AppendRadioItem(ID_FirstPerspective + len(self._perspectives), name)
-                            self._perspectives[name] = [len(self._perspectives), perspective]
-                            if self.config['perspectives']['active'] == name:
-                                menuItem.Check()
-        #in case there are no perspectives
-        if not self._perspectives:
-            perspective = self._mgr.SavePerspective()
-            self.config['perspectives']['default'] = 'Default'
-            self._perspectives['Default'] = [0, perspective]
-            menuItem = menu.AppendRadioItem(ID_FirstPerspective, 'Default')
-            menuItem.Check()
-            self._SavePerspectiveToFile('Default', perspective)
-        return menu
-
-    def CreateStatusbar(self):
-        statusbar = self.CreateStatusBar(2, wx.ST_SIZEGRIP)
-        statusbar.SetStatusWidths([-2, -3])
-        statusbar.SetStatusText('Ready', 0)
-        welcomeString=u'Welcome to Hooke (version '+__version__+', '+__release_name__+')!'
-        statusbar.SetStatusText(welcomeString, 1)
-        return statusbar
-
-    def CreateToolBar(self):
-        toolbar = wx.ToolBar(self, -1, wx.DefaultPosition, wx.DefaultSize, wx.TB_FLAT | wx.TB_NODIVIDER)
-        toolbar.SetToolBitmapSize(wx.Size(16,16))
-        toolbar_bmp1 = wx.ArtProvider_GetBitmap(wx.ART_QUESTION, wx.ART_OTHER, wx.Size(16, 16))
-        toolbar_bmpOpen = wx.ArtProvider_GetBitmap(wx.ART_FILE_OPEN, wx.ART_OTHER, wx.Size(16, 16))
-        toolbar_bmpSave = wx.ArtProvider_GetBitmap(wx.ART_FILE_SAVE, wx.ART_OTHER, wx.Size(16, 16))
-        toolbar_bmpExportText = wx.ArtProvider_GetBitmap(wx.ART_NORMAL_FILE, wx.ART_OTHER, wx.Size(16, 16))
-        toolbar_bmpExportImage = wx.ArtProvider_GetBitmap(wx.ART_MISSING_IMAGE, wx.ART_OTHER, wx.Size(16, 16))
-        toolbar.AddLabelTool(101, 'Open', toolbar_bmpOpen)
-        toolbar.AddLabelTool(102, 'Save', toolbar_bmpSave)
-        toolbar.AddSeparator()
-        toolbar.AddLabelTool(ID_ExportText, 'Export text...', toolbar_bmpExportText)
-        toolbar.AddLabelTool(ID_ExportImage, 'Export image...', toolbar_bmpExportImage)
-        toolbar.Realize()
-        return toolbar
-
-    def CreateToolBarNavigation(self):
-        toolbar = wx.ToolBar(self, -1, wx.DefaultPosition, wx.DefaultSize, wx.TB_FLAT | wx.TB_NODIVIDER)
-        toolbar.SetToolBitmapSize(wx.Size(16,16))
-        toolbar_bmpBack = wx.ArtProvider_GetBitmap(wx.ART_GO_BACK, wx.ART_OTHER, wx.Size(16, 16))
-        toolbar_bmpForward = wx.ArtProvider_GetBitmap(wx.ART_GO_FORWARD, wx.ART_OTHER, wx.Size(16, 16))
-        toolbar.AddLabelTool(ID_Previous, 'Previous', toolbar_bmpBack, shortHelp='Previous curve')
-        toolbar.AddLabelTool(ID_Next, 'Next', toolbar_bmpForward, shortHelp='Next curve')
-        toolbar.Realize()
-        return toolbar
-
-    def DeleteFromPlaylists(self, name):
-        if name in self.playlists:
-            del self.playlists[name]
-        tree_root = self.panelPlaylists.PlaylistsTree.GetRootItem()
-        item, cookie = self.panelPlaylists.PlaylistsTree.GetFirstChild(tree_root)
-        while item.IsOk():
-            playlist_name = self.panelPlaylists.PlaylistsTree.GetItemText(item)
-            if playlist_name == name:
-                try:
-                    self.panelPlaylists.PlaylistsTree.Delete(item)
-                except:
-                    pass
-            item = self.panelPlaylists.PlaylistsTree.GetNextSibling(item)
-        self.OnPlaylistsLeftDclick(None)
-
-    def DeletePlotPage(self, name):
-        index = self._GetPlaylistTab(name)
-        plot = self.playlists[name][1]
-        plot = None
-        self.plotNotebook.RemovePage(index)
-        self.DeleteFromPlaylists(name)
-
-    def GetActiveCurve(self):
-        playlist = self.GetActivePlaylist()
-        if playlist is not None:
-            return playlist.get_active_curve()
-        return None
-
-    def GetActivePlaylist(self):
-        playlist_name = self._GetActivePlaylistName()
-        if playlist_name in self.playlists:
-            return self.playlists[playlist_name][0]
-        return None
-
-    def GetActivePlot(self):
-        curve = self.GetActiveCurve()
-        if curve is not None:
-            return curve.plots[0]
-        return None
-
-    def GetDockArt(self):
-        return self._mgr.GetArtProvider()
-
-    def GetBoolFromConfig(self, *args):
-        if len(args) == 2:
-            plugin = args[0]
-            section = args[0]
-            key = args[1]
-        elif len(args) == 3:
-            plugin = args[0]
-            section = args[1]
-            key = args[2]
-        if self.configs.has_key(plugin):
-            config = self.configs[plugin]
-            return config[section][key].as_bool('value')
-        return None
-
-    def GetFloatFromConfig(self, *args):
-        if len(args) == 2:
-            plugin = args[0]
-            section = args[0]
-            key = args[1]
-        elif len(args) == 3:
-            plugin = args[0]
-            section = args[1]
-            key = args[2]
-        if self.configs.has_key(plugin):
-            config = self.configs[plugin]
-            return config[section][key].as_float('value')
-        return None
-
-    def GetIntFromConfig(self, *args):
-        if len(args) == 2:
-            plugin = args[0]
-            section = args[0]
-            key = args[1]
-        elif len(args) == 3:
-            plugin = args[0]
-            section = args[1]
-            key = args[2]
-        if self.configs.has_key(plugin):
-            config = self.configs[plugin]
-            return config[section][key].as_int('value')
-        return None
-
-    def GetStringFromConfig(self, *args):
-        if len(args) == 2:
-            plugin = args[0]
-            section = args[0]
-            key = args[1]
-        elif len(args) == 3:
-            plugin = args[0]
-            section = args[1]
-            key = args[2]
-        if self.configs.has_key(plugin):
-            config = self.configs[plugin]
-            return config[section][key]['value']
-        return None
-
-    def GetPerspectiveMenuItem(self, name):
-        index = self._perspectives[name][0]
-        perspective_Id = ID_FirstPerspective + index
-        menu_item = self.MenuBar.FindItemById(perspective_Id)
-        return menu_item
-
-    def HasPlotmanipulator(self, name):
-        '''
-        returns True if the plotmanipulator 'name' is loaded, False otherwise
-        '''
-        for plotmanipulator in self.plotmanipulators:
-            if plotmanipulator[0] == name:
-                return True
-        return False
-
-    def OnAbout(self, event):
-        msg = 'Hooke\n\n'+\
-            'A free, open source data analysis platform\n'+\
-            '(c) 2006-2008 Massimo Sandal\n\n'+\
-            '(c) 2009 Dr. Rolf Schmidt\n\n'+\
-            'Released under the GNU GPL v2'
-        dialog = wx.MessageDialog(self, msg, "About Hooke", wx.OK | wx.ICON_INFORMATION)
-        dialog.ShowModal()
-        dialog.Destroy()
-
-    def OnClose(self, event):
-        #apply changes
-        self.config['main']['height'] = str(self.GetSize().GetHeight())
-        self.config['main']['left'] = str(self.GetPosition()[0])
-        self.config['main']['top'] = str(self.GetPosition()[1])
-        self.config['main']['width'] = str(self.GetSize().GetWidth())
-        # Writing the configuration file to 'hooke.ini'
-        self.config.write()
-        self._mgr.UnInit()
-        del self._mgr
-        self.Destroy()
-
-    def OnDeletePerspective(self, event):
-        pass
-
-    def OnDirCtrlLeftDclick(self, event):
-        file_path = self.panelFolders.GetPath()
-        if os.path.isfile(file_path):
-            if file_path.endswith('.hkp'):
-                self.do_loadlist(file_path)
-            else:
-                pass
-        event.Skip()
-
-    def OnEraseBackground(self, event):
-        event.Skip()
-
-    def OnExecute(self, event):
-        item = self.panelCommands.CommandsTree.GetSelection()
-        if item.IsOk():
-            if self.panelCommands.CommandsTree.ItemHasChildren(item):
-                pass
-            else:
-                #get the plugin
-                parent = self.panelCommands.CommandsTree.GetItemParent(item)
-            if not self.panelCommands.CommandsTree.ItemHasChildren(item):
-                parent_text = self.panelCommands.CommandsTree.GetItemText(parent)
-                item_text = self.panelCommands.CommandsTree.GetItemText(item)
-                if item_text in ['genlist', 'loadlist', 'savelist']:
-                    property_values = self.panelProperties.GetPropertyValues()
-                    arg_str = ''
-                    for item in property_values:
-                        arg_str = ''.join([arg_str, item, '=r"', str(property_values[item]), '", '])
-                    command = ''.join(['self.do_', item_text, '(', arg_str, ')'])
-                else:
-                    command = ''.join(['self.do_', item_text, '()'])
-                exec(command)
-        pass
-
-    def OnExit(self, event):
-        self.Close()
-
-    def OnExportImage(self, event):
-        pass
-
-    def OnNext(self, event):
-        '''
-        NEXT
-        Go to the next curve in the playlist.
-        If we are at the last curve, we come back to the first.
-        -----
-        Syntax: next, n
-        '''
-        selected_item = self.panelPlaylists.PlaylistsTree.GetSelection()
-        if self.panelPlaylists.PlaylistsTree.ItemHasChildren(selected_item):
-            #GetFirstChild returns a tuple
-            #we only need the first element
-            next_item = self.panelPlaylists.PlaylistsTree.GetFirstChild(selected_item)[0]
-        else:
-            next_item = self.panelPlaylists.PlaylistsTree.GetNextSibling(selected_item)
-            if not next_item.IsOk():
-                parent_item = self.panelPlaylists.PlaylistsTree.GetItemParent(selected_item)
-                #GetFirstChild returns a tuple
-                #we only need the first element
-                next_item = self.panelPlaylists.PlaylistsTree.GetFirstChild(parent_item)[0]
-        self.panelPlaylists.PlaylistsTree.SelectItem(next_item, True)
-        playlist = self.playlists[self._GetActivePlaylistName()][0]
-        if playlist.count > 1:
-            playlist.next()
-            self.statusbar.SetStatusText(playlist.get_status_string(), 0)
-            self.UpdatePlot()
-
-    def OnNotebookPageClose(self, event):
-        ctrl = event.GetEventObject()
-        playlist_name = ctrl.GetPageText(ctrl._curpage)
-        self.DeleteFromPlaylists(playlist_name)
-
-    def OnPaneClose(self, event):
-        event.Skip()
-
-    def OnPlaylistsLeftDclick(self, event):
-        playlist_name = self._GetActivePlaylistName()
-        #if that playlist already exists
-        #we check if it is the active playlist (ie selected in panelPlaylists)
-        #and switch to it if necessary
-        if playlist_name in self.playlists:
-            index = self.plotNotebook.GetSelection()
-            current_playlist = self.plotNotebook.GetPageText(index)
-            #new_playlist = self.playlists[playlist_name][0]
-            #if current_playlist != new_playlist:
-            if current_playlist != playlist_name:
-                index = self._GetPlaylistTab(playlist_name)
-                self.plotNotebook.SetSelection(index)
-            #if a curve was double-clicked
-            item = self.panelPlaylists.PlaylistsTree.GetSelection()
-            #TODO: fix with get_active_curve
-            if not self.panelPlaylists.PlaylistsTree.ItemHasChildren(item):
-                index = self._GetActiveCurveIndex()
-            else:
-                index = 0
-            if index >= 0:
-                playlist = self.playlists[playlist_name][0]
-                playlist.index = index
-                self.statusbar.SetStatusText(playlist.get_status_string(), 0)
-                self.UpdatePlot()
-        #if you uncomment the following line, the tree will collapse/expand as well
-        #event.Skip()
-
-    def OnPlaylistsLeftDown(self, event):
-        hit_item, hit_flags = self.panelPlaylists.PlaylistsTree.HitTest(event.GetPosition())
-        if (hit_flags & wx.TREE_HITTEST_ONITEM) != 0:
-            #self.SetFocus()
-            self.panelPlaylists.PlaylistsTree.SelectItem(hit_item)
-            playlist_name = self._GetActivePlaylistName()
-            playlist = self.playlists[playlist_name][0]
-            #if a curve was clicked
-            item = self.panelPlaylists.PlaylistsTree.GetSelection()
-            if not self.panelPlaylists.PlaylistsTree.ItemHasChildren(item):
-                #TODO: fix with get_active_curve
-                index = self._GetActiveCurveIndex()
-                if index >= 0:
-                    #playlist = self.playlists[playlist_name][0]
-                    playlist.index = index
-                    #self.playlists[playlist_name][0].index = index
-            #else:
-                ##self.playlists[playlist_name][0].index = 0
-                #playlist.index = index
-            self.playlists[playlist_name][0] = playlist
-        event.Skip()
-
-    def OnPrevious(self, event):
-        '''
-        PREVIOUS
-        Go to the previous curve in the playlist.
-        If we are at the first curve, we jump to the last.
-        -------
-        Syntax: previous, p
-        '''
-        #playlist = self.playlists[self._GetActivePlaylistName()][0]
-        #select the previous curve and tell the user if we wrapped around
-        #self.AppendToOutput(playlist.previous())
-        selected_item = self.panelPlaylists.PlaylistsTree.GetSelection()
-        if self.panelPlaylists.PlaylistsTree.ItemHasChildren(selected_item):
-            previous_item = self.panelPlaylists.PlaylistsTree.GetLastChild(selected_item)
-        else:
-            previous_item = self.panelPlaylists.PlaylistsTree.GetPrevSibling(selected_item)
-            if not previous_item.IsOk():
-                parent_item = self.panelPlaylists.PlaylistsTree.GetItemParent(selected_item)
-                previous_item = self.panelPlaylists.PlaylistsTree.GetLastChild(parent_item)
-        self.panelPlaylists.PlaylistsTree.SelectItem(previous_item, True)
-        playlist = self.playlists[self._GetActivePlaylistName()][0]
-        if playlist.count > 1:
-            playlist.previous()
-            self.statusbar.SetStatusText(playlist.get_status_string(), 0)
-            self.UpdatePlot()
-
-    def OnPropGridChanged (self, event):
-        prop = event.GetProperty()
-        if prop:
-            item_section = self.panelProperties.SelectedTreeItem
-            item_plugin = self.panelCommands.CommandsTree.GetItemParent(item_section)
-            plugin = self.panelCommands.CommandsTree.GetItemText(item_plugin)
-            config = self.configs[plugin]
-            property_section = self.panelCommands.CommandsTree.GetItemText(item_section)
-            property_key = prop.GetName()
-            property_value = prop.GetValue()
-            config[property_section][property_key]['value'] = property_value
-
-    def OnPropGridSelect(self, event):
-        pass
-
-    def OnRestorePerspective(self, event):
-        name = self.MenuBar.FindItemById(event.GetId()).GetLabel()
-        self._mgr.LoadPerspective(self._perspectives[name][1])
-        self.config['perspectives']['active'] = name
-        self._mgr.Update()
-        all_panes = self._mgr.GetAllPanes()
-        for pane in all_panes:
-            if not pane.name.startswith('toolbar'):
-                if pane.name == 'Assistant':
-                    self.MenuBar.FindItemById(ID_ViewAssistant).Check(pane.window.IsShown())
-                if pane.name == 'Folders':
-                    self.MenuBar.FindItemById(ID_ViewFolders).Check(pane.window.IsShown())
-                if pane.name == 'Playlists':
-                    self.MenuBar.FindItemById(ID_ViewPlaylists).Check(pane.window.IsShown())
-                if pane.name == 'Commands':
-                    self.MenuBar.FindItemById(ID_ViewCommands).Check(pane.window.IsShown())
-                if pane.name == 'Properties':
-                    self.MenuBar.FindItemById(ID_ViewProperties).Check(pane.window.IsShown())
-                if pane.name == 'Output':
-                    self.MenuBar.FindItemById(ID_ViewOutput).Check(pane.window.IsShown())
-                if pane.name == 'Results':
-                    self.MenuBar.FindItemById(ID_ViewResults).Check(pane.window.IsShown())
-
-    def OnResultsCheck(self, index, flag):
-        curve = self.GetActiveCurve()
-        result = curve.data['results'][index]['visible'] = flag
-        self.UpdatePlot()
-
-    def OnSavePerspective(self, event):
-        def nameExists(name):
-            for item in self._perspectives_menu.GetMenuItems():
-                if item.GetText() == name:
-                    return True
-            return False
-
-        done = False
-        while not done:
-            dialog = wx.TextEntryDialog(self, 'Enter a name for the new perspective:', 'Save perspective')
-            dialog.SetValue('New perspective')
-            if dialog.ShowModal() != wx.ID_OK:
-                return
-            else:
-                name = dialog.GetValue()
-
-            if nameExists(name):
-                dialogConfirm = wx.MessageDialog(self, 'A file with this name already exists.\n\nDo you want to replace it?', 'Confirm', wx.YES_NO|wx.ICON_QUESTION|wx.CENTER)
-                if dialogConfirm.ShowModal() == wx.ID_YES:
-                    done = True
-            else:
-                done = True
-
-        perspective = self._mgr.SavePerspective()
-
-        if nameExists(name):
-            #check the corresponding menu item
-            menuItem = self.GetPerspectiveMenuItem(name)
-            #replace the perspectiveStr in _pespectives
-            index = self._perspectives[name][0]
-            self._perspectives[name] = [index, perspective]
-        else:
-            #simply add the new perspective to _perspectives
-            index = len(self._perspectives)
-            self._perspectives[name] = [len(self._perspectives), perspective]
-            menuItem = self._perspectives_menu.AppendRadioItem(ID_FirstPerspective + len(self._perspectives), name)
-
-        menuItem.Check()
-        self._SavePerspectiveToFile(name, perspective)
-        #uncheck all perspective menu items
-        #as these are radio items, one item has to be checked at all times
-        #the line 'menuItem.Check()' above actually checks a second item
-        #but does not toggle
-        #so we need to uncheck all other items afterwards
-        #weirdly enough, menuitem.Toggle() doesn't do this properly either
-        for item in self._perspectives_menu.GetMenuItems():
-            if item.IsCheckable():
-                if item.GetLabel() != name:
-                    item.Check(False)
-
-    def OnView(self, event):
-        menu_id = event.GetId()
-        menu_item = self.MenuBar.FindItemById(menu_id)
-        menu_label = menu_item.GetLabel()
-
-        pane = self._mgr.GetPane(menu_label)
-        pane.Show(not pane.IsShown())
-        #if we don't do the following, the Folders pane does not resize properly on hide/show
-        if pane.caption == 'Folders' and pane.IsShown() and pane.IsDocked():
-            #folders_size = pane.GetSize()
-            self.panelFolders.Fit()
-        self._mgr.Update()
-
-    def OnSize(self, event):
-        event.Skip()
-
-    def OnTreeCtrlCommandsLeftDown(self, event):
-        hit_item, hit_flags = self.panelCommands.CommandsTree.HitTest(event.GetPosition())
-        if (hit_flags & wx.TREE_HITTEST_ONITEM) != 0:
-            self.panelCommands.CommandsTree.SelectItem(hit_item)
-            self.panelProperties.SelectedTreeItem = hit_item
-            #if a command was clicked
-            properties = []
-            if not self.panelCommands.CommandsTree.ItemHasChildren(hit_item):
-                item_plugin = self.panelCommands.CommandsTree.GetItemParent(hit_item)
-                plugin = self.panelCommands.CommandsTree.GetItemText(item_plugin)
-                if self.configs.has_key(plugin):
-                    #config = self.panelCommands.CommandsTree.GetPyData(item_plugin)
-                    config = self.configs[plugin]
-                    section = self.panelCommands.CommandsTree.GetItemText(hit_item)
-                    #display docstring in help window
-                    doc_string = eval('self.do_' + section + '.__doc__')
-                    if section in config:
-                        for option in config[section]:
-                            properties.append([option, config[section][option]])
-            else:
-                module = self.panelCommands.CommandsTree.GetItemText(hit_item)
-                if module != 'general':
-                    doc_string = eval('plugins.' + module + '.' + module + 'Commands.__doc__')
-                else:
-                    doc_string = 'The module "general" contains Hooke core functionality'
-            if doc_string is not None:
-                self.panelAssistant.ChangeValue(doc_string)
-            hookepropertyeditor.PropertyEditor.Initialize(self.panelProperties, properties)
-        event.Skip()
-
-    def UpdatePlaylists(self):
-        #setup the playlist in the Playlist tree
-        tree_root = self.panelPlaylists.PlaylistsTree.GetRootItem()
-        playlist_root = self.panelPlaylists.PlaylistsTree.AppendItem(tree_root, playlist.name, 0)
-        #add all curves to the Playlist tree
-        curves = {}
-        for index, curve in enumerate(playlist.curves):
-            ##remove the extension from the name of the curve
-            ##TODO: optional?
-            #item_text, extension = os.path.splitext(curve.name)
-            #curve_ID = self.panelPlaylists.PlaylistsTree.AppendItem(playlist_root, item_text, 1)
-            curve_ID = self.panelPlaylists.PlaylistsTree.AppendItem(playlist_root, curve.name, 1)
-            if index == playlist.index:
-                self.panelPlaylists.PlaylistsTree.SelectItem(curve_ID)
-        #create the plot tab and add playlist to the dictionary
-        plotPanel = wxmpl.PlotPanel(self, ID_FirstPlot + len(self.playlists))
-        notebook_tab = self.plotNotebook.AddPage(plotPanel, playlist.name, True)
-        #tab_index = self.plotNotebook.GetSelection()
-        figure = plotPanel.get_figure()
-        #self.playlists[playlist.name] = [playlist, tab_index, figure]
-        self.playlists[playlist.name] = [playlist, figure]
-        self.panelPlaylists.PlaylistsTree.Expand(playlist_root)
-        self.statusbar.SetStatusText(playlist.get_status_string(), 0)
-        self.UpdatePlot()
-
-#HELPER FUNCTIONS
-#Everything sending an event should be here
-    def _measure_N_points(self, N, whatset=1):
-        '''
-        general helper function for N-points measures
-        '''
-        wx.PostEvent(self.frame,self.list_of_events['measure_points'](num_of_points=N, set=whatset))
-        while 1:
-            try:
-                points=self.frame.events_from_gui.get()
-                break
-            except Empty:
-                pass
-        return points
-
-    def _clickize(self, xvector, yvector, index):
-        '''
-        returns a ClickedPoint() object from an index and vectors of x, y coordinates
-        '''
-        point = lh.ClickedPoint()
-        point.index = index
-        point.absolute_coords = xvector[index], yvector[index]
-        point.find_graph_coords(xvector, yvector)
-        return point
-
-#PLAYLIST INTERACTION COMMANDS
-#-------------------------------
-    def do_genlist(self, folder=lh.hookeDir, filemask='*.*'):
-        '''
-        GENLIST
-        Generates a file playlist.
-        Note it doesn't *save* it: see savelist for this.
-
-        If [input files] is a directory, it will use all files in the directory for playlist.
-        So:
-        genlist dir
-        genlist dir/
-        genlist dir/*.*
-
-        are all equivalent syntax.
-        ------------
-        Syntax: genlist [input files]
-        '''
-        #args list is: input folder, file mask
-        if os.path.isdir(folder):
-            path = os.path.join(folder, filemask)
-            #expanding correctly the input list with the glob module :)
-            files = glob.glob(path)
-            files.sort()
-            #TODO: change cursor or progressbar (maybe in statusbar)
-            #self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
-            playlist = playlist.Playlist(self.drivers)
-            for item in files:
-                curve = playlist.add_curve(item)
-                plot = copy.deepcopy(curve.plots[0])
-                #add the 'raw' data
-                curve.add_data('raw', plot.vectors[0][0], plot.vectors[0][1], color=plot.colors[0], style='plot')
-                curve.add_data('raw', plot.vectors[1][0], plot.vectors[1][1], color=plot.colors[1], style='plot')
-                #apply all active plotmanipulators and add the 'manipulated' data
-                for plotmanipulator in self.plotmanipulators:
-                    plot = plotmanipulator[1](plot, curve)
-                    curve.set_data('manipulated', plot.vectors[0][0], plot.vectors[0][1], color=plot.colors[0], style='plot')
-                    curve.add_data('manipulated', plot.vectors[1][0], plot.vectors[1][1], color=plot.colors[1], style='plot')
-            if playlist.count > 0:
-                playlist.name = self._GetUniquePlaylistName(os.path.basename(folder))
-                playlist.reset()
-                self.AddToPlaylists(playlist)
-            self.AppendToOutput(playlist.get_status_string())
-        else:
-            self.AppendToOutput(''.join(['Cannot find folder ', folder]))
-
-    def do_loadlist(self, filename):
-        '''
-        LOADLIST
-        Loads a file playlist
-        -----------
-        Syntax: loadlist [playlist file]
-        '''
-        #TODO: check for duplicate playlists, ask the user for a unique name
-        #if self.playlist_name in self.playlists:
-
-        #add hkp extension if necessary
-        if not filename.endswith('.hkp'):
-            filename = ''.join([filename, '.hkp'])
-        #prefix with 'hookeDir' if just a filename or a relative path
-        filename = lh.get_file_path(filename)
-        if os.path.isfile(filename):
-            #TODO: change cursor
-            #self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
-            playlist_new = playlist.Playlist(self.drivers)
-            playlist_new.load(filename)
-            if playlist_new.count > 0:
-                for curve in playlist_new.curves:
-                    plot = copy.deepcopy(curve.plots[0])
-                    for plotmanip in self.plotmanipulators:
-                        #to_plot = plotmanip[1](to_plot, curve)
-                        plot = plotmanip[1](plot, curve)
-                        curve.set_data('manipulated', plot.vectors[0][0], plot.vectors[0][1], color=plot.colors[0], style='plot')
-                        curve.add_data('manipulated', plot.vectors[1][0], plot.vectors[1][1], color=plot.colors[1], style='plot')
-                self.AddToPlaylists(playlist_new)
-            #else:
-                ##TODO: display dialog
-            self.AppendToOutput(playlist_new.get_status_string())
-            #TODO: change cursor
-            #self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
-        else:
-            #TODO: display dialog
-            self.AppendToOutput(''.join['File ', filename, ' not found.\n'])
-        pass
-
-    def do_savelist(self, filename):
-        '''
-        SAVELIST
-        Saves the current file playlist on disk.
-        ------------
-        Syntax: savelist [filename]
-        '''
-
-        #self.playlist_generics['pointer'] = self._GetActiveCurveIndex
-        pointer = self._GetActiveCurveIndex()
-        #autocomplete filename if not specified
-        if not filename.endswith('.hkp'):
-            filename = filename.join(['.hkp'])
-
-        playlist = self.GetActivePlaylist()
-        playlist.set_XML()
-        playlist.save(filename)
-
-#PLOT INTERACTION COMMANDS
-#-------------------------------
-    def UpdatePlot(self):
-        def add_plot(plot):
-            if plot['visible'] and plot['x'] and plot['y']:
-                color = plot['color']
-                style = plot['style']
-                if style == 'plot':
-                    axes.plot(plot['x'], plot['y'], color=color, zorder=1)
-                if style == 'scatter':
-                    axes.scatter(plot['x'], plot['y'], color=color, s=0.5, zorder=2)
-
-        def add_plot2(plot):
-            if plot.visible and plot.x and plot.y:
-                if plot.style == 'plot':
-                    axes.plot(plot.x, plot.y, color=plot.color, zorder=1)
-                if plot.style == 'scatter':
-                    axes.scatter(plot.x, plot.y, color=plot.color, s=0.5, zorder=2)
-
-        playlist_name = self._GetActivePlaylistName()
-        index = self._GetActiveCurveIndex()
-        playlist = self.playlists[playlist_name][0]
-        curve = playlist.get_active_curve()
-        plot = playlist.get_active_plot()
-        figure = self.playlists[playlist_name][1]
-
-        figure.clf()
-        exclude = None
-        if curve.data.has_key('manipulated'):
-            exclude = 'raw'
-        elif curve.data.has_key('raw'):
-            exclude = 'manipulated'
-
-        if exclude is not None:
-            #TODO: what is this good for?
-            if not hasattr(self, 'subplot'):
-                axes = figure.add_subplot(111)
-
-            axes.set_title(plot.title)
-            axes.set_xlabel(plot.units[0])
-            axes.set_ylabel(plot.units[1])
-
-            for set_of_plots in curve.data:
-                if set_of_plots != exclude:
-                    plots = curve.data[set_of_plots]
-                    for each_plot in plots:
-                        add_plot(each_plot)
-
-            #TODO: add multiple results support
-            #for fit in curve.fits:
-            if curve.fits.has_key('wlc'):
-                for plot in curve.fits['wlc'].results:
-                    add_plot2(plot)
-                self.panelResults.DisplayResults(curve.fits['wlc'])
-            else:
-                self.panelResults.ClearResults()
-
-            axes.figure.canvas.draw()
-        else:
-            self.AppendToOutput('Not able to plot.')
-
-
-ID_PaneBorderSize = wx.ID_HIGHEST + 1
-ID_SashSize = ID_PaneBorderSize + 1
-ID_CaptionSize = ID_PaneBorderSize + 2
-ID_BackgroundColor = ID_PaneBorderSize + 3
-ID_SashColor = ID_PaneBorderSize + 4
-ID_InactiveCaptionColor =  ID_PaneBorderSize + 5
-ID_InactiveCaptionGradientColor = ID_PaneBorderSize + 6
-ID_InactiveCaptionTextColor = ID_PaneBorderSize + 7
-ID_ActiveCaptionColor = ID_PaneBorderSize + 8
-ID_ActiveCaptionGradientColor = ID_PaneBorderSize + 9
-ID_ActiveCaptionTextColor = ID_PaneBorderSize + 10
-ID_BorderColor = ID_PaneBorderSize + 11
-ID_GripperColor = ID_PaneBorderSize + 12
-
-
-#----------------------------------------------------------------------
-
-if __name__ == '__main__':
-
-    ## now, silence a deprecation warning for py2.3
-    #import warnings
-    #warnings.filterwarnings("ignore", "integer", DeprecationWarning, "wxPython.gdi")
-
-    redirect=True
-    if __debug__:
-        redirect=False
-    app = Hooke(redirect=redirect)
-
-    app.MainLoop()
-
-
+#!/usr/bin/env python
+
+'''
+HOOKE - A force spectroscopy review & analysis tool
+
+Copyright (C) 2008-2010 Massimo Sandal (University of Bologna, Italy).
+                        Rolf Schmidt (Concordia University, Canada).
+
+This program is released under the GNU General Public License version 2.
+'''
+
+from libhooke import WX_GOOD
+
+import wxversion
+wxversion.select(WX_GOOD)
+import copy
+import cStringIO
+import os
+import os.path
+import sys
+import glob
+import time
+
+import imp
+import wx
+import wx.html
+import wx.aui
+import wxmpl
+import wx.lib.agw.aui as aui
+import wx.propgrid as wxpg
+
+import libhooke as lh
+from config import config
+import drivers
+import plugins
+import hookecommands
+import hookeplaylist
+import hookepropertyeditor
+import hookeresults
+import playlist
+
+global __version__
+
+__version__ = lh.HOOKE_VERSION[0]
+__release_name__ = lh.HOOKE_VERSION[1]
+
+#TODO: order menu items, get rid of all unused IDs
+ID_ExportText = wx.NewId()
+ID_ExportImage = wx.NewId()
+ID_Config = wx.NewId()
+ID_About = wx.NewId()
+ID_Next = wx.NewId()
+ID_Previous = wx.NewId()
+
+ID_ViewAssistant = wx.NewId()
+ID_ViewCommands = wx.NewId()
+ID_ViewFolders = wx.NewId()
+ID_ViewOutput = wx.NewId()
+ID_ViewPlaylists = wx.NewId()
+ID_ViewProperties = wx.NewId()
+ID_ViewResults = wx.NewId()
+
+ID_CommandsList = wx.NewId()
+ID_CommandsListBox = wx.NewId()
+
+ID_TextContent = wx.NewId()
+ID_TreeContent = wx.NewId()
+ID_HTMLContent = wx.NewId()
+ID_SizeReportContent = wx.NewId()
+ID_DeletePerspective = wx.NewId()
+ID_SavePerspective = wx.NewId()
+
+ID_FirstPerspective = ID_SavePerspective + 1000
+#I hope we'll never have more than 1000 perspectives
+ID_FirstPlot = ID_SavePerspective + 2000
+
+class Hooke(wx.App):
+
+    def OnInit(self):
+        self.SetAppName('Hooke')
+        self.SetVendorName('')
+
+        #set the Hooke directory
+        lh.hookeDir = os.path.abspath(os.path.dirname(__file__))
+
+        windowPosition = (config['main']['left'], config['main']['top'])
+        windowSize = (config['main']['width'], config['main']['height'])
+
+        #setup the splashscreen
+        if config['splashscreen']['show']:
+            filename = lh.get_file_path('hooke.jpg', ['resources'])
+            if os.path.isfile(filename):
+                bitmap = wx.Image(filename).ConvertToBitmap()
+                splashStyle = wx.SPLASH_CENTRE_ON_SCREEN|wx.SPLASH_TIMEOUT
+                splashDuration = config['splashscreen']['duration']
+                wx.SplashScreen(bitmap, splashStyle, splashDuration, None, -1)
+                wx.Yield()
+                '''
+                we need for the splash screen to disappear
+                for whatever reason splashDuration and sleep do not correspond to each other
+                at least not on Windows
+                maybe it's because duration is in milliseconds and sleep in seconds
+                thus we need to increase the sleep time a bit
+                a factor of 1.2 seems to work quite well
+                '''
+                sleepFactor = 1.2
+                time.sleep(sleepFactor * splashDuration / 1000)
+
+        plugin_objects = []
+        for plugin in config['plugins']:
+            if config['plugins'][plugin]:
+                filename = ''.join([plugin, '.py'])
+                path = lh.get_file_path(filename, ['plugins'])
+                if os.path.isfile(path):
+                    #get the corresponding filename and path
+                    plugin_name = ''.join(['plugins.', plugin])
+                    module = __import__(plugin_name)
+                    #get the file that contains the plugin
+                    class_file = getattr(plugins, plugin)
+                    #get the class that contains the commands
+                    class_object = getattr(class_file, plugin + 'Commands')
+                    plugin_objects.append(class_object)
+
+        def make_command_class(*bases):
+            #create metaclass with plugins and plotmanipulators
+            return type(HookeFrame)("HookeFramePlugged", bases + (HookeFrame,), {})
+        frame = make_command_class(*plugin_objects)(parent=None, id=wx.ID_ANY, title='Hooke', pos=windowPosition, size=windowSize)
+        frame.Show(True)
+        self.SetTopWindow(frame)
+
+        return True
+
+    def OnExit(self):
+        #TODO: write values to ini file if necessary
+        return True
+
+
+class HookeFrame(wx.Frame):
+
+    def __init__(self, parent, id=-1, title='', pos=wx.DefaultPosition, size=wx.DefaultSize, style=wx.DEFAULT_FRAME_STYLE|wx.SUNKEN_BORDER|wx.CLIP_CHILDREN):
+        #call parent constructor
+        wx.Frame.__init__(self, parent, id, title, pos, size, style)
+        self.config = config
+        self.CreateApplicationIcon()
+        #self.configs contains: {the name of the Commands file: corresponding ConfigObj}
+        self.configs = {}
+        ##self.playlists contains: {the name of the playlist: [playlist, tabIndex, plotID]}
+        #self.playlists = {}
+        #self.plugins contains: {the name of the plugin: [caption, function]}
+        self.plugins = {}
+        #self.plotmanipulators list contains: [the name of the plotmanip, function, name of the module]
+        self.plotmanipulators = []
+
+        #tell FrameManager to manage this frame
+        self._mgr = aui.AuiManager()
+        self._mgr.SetManagedWindow(self)
+        #set the gradient style
+        self._mgr.GetArtProvider().SetMetric(aui.AUI_DOCKART_GRADIENT_TYPE, aui.AUI_GRADIENT_NONE)
+        #set transparent drag
+        self._mgr.SetFlags(self._mgr.GetFlags() ^ aui.AUI_MGR_TRANSPARENT_DRAG)
+
+        # set up default notebook style
+        self._notebook_style = aui.AUI_NB_DEFAULT_STYLE | aui.AUI_NB_TAB_EXTERNAL_MOVE | wx.NO_BORDER
+        self._notebook_theme = 0
+
+        #holds the perspectives: {name, [index, perspectiveStr]}
+        self._perspectives = {}
+
+        # min size for the frame itself isn't completely done.
+        # see the end up FrameManager::Update() for the test
+        # code. For now, just hard code a frame minimum size
+        self.SetMinSize(wx.Size(400, 300))
+        #create panels here
+        self.panelAssistant = self.CreatePanelAssistant()
+        self.panelCommands = self.CreatePanelCommands()
+        self.panelFolders = self.CreatePanelFolders()
+        self.panelPlaylists = self.CreatePanelPlaylists()
+        self.panelProperties = self.CreatePanelProperties()
+        self.panelOutput = self.CreatePanelOutput()
+        self.panelResults = self.CreatePanelResults()
+        self.plotNotebook = self.CreateNotebook()
+        #self.textCtrlCommandLine=self.CreateCommandLine()
+
+        # add panes
+        self._mgr.AddPane(self.panelFolders, aui.AuiPaneInfo().Name('Folders').Caption('Folders').Left().CloseButton(True).MaximizeButton(False))
+        self._mgr.AddPane(self.panelPlaylists, aui.AuiPaneInfo().Name('Playlists').Caption('Playlists').Left().CloseButton(True).MaximizeButton(False))
+        self._mgr.AddPane(self.plotNotebook, aui.AuiPaneInfo().Name('Plots').CenterPane().PaneBorder(False))
+        self._mgr.AddPane(self.panelCommands, aui.AuiPaneInfo().Name('Commands').Caption('Settings and commands').Right().CloseButton(True).MaximizeButton(False))
+        self._mgr.AddPane(self.panelProperties, aui.AuiPaneInfo().Name('Properties').Caption('Properties').Right().CloseButton(True).MaximizeButton(False))
+        self._mgr.AddPane(self.panelAssistant, aui.AuiPaneInfo().Name('Assistant').Caption('Assistant').Right().CloseButton(True).MaximizeButton(False))
+        self._mgr.AddPane(self.panelOutput, aui.AuiPaneInfo().Name('Output').Caption('Output').Bottom().CloseButton(True).MaximizeButton(False))
+        self._mgr.AddPane(self.panelResults, aui.AuiPaneInfo().Name('Results').Caption('Results').Bottom().CloseButton(True).MaximizeButton(False))
+        #self._mgr.AddPane(self.textCtrlCommandLine, aui.AuiPaneInfo().Name('CommandLine').CaptionVisible(False).Fixed().Bottom().Layer(2).CloseButton(False).MaximizeButton(False))
+        #self._mgr.AddPane(panelBottom, aui.AuiPaneInfo().Name("panelCommandLine").Bottom().Position(1).CloseButton(False).MaximizeButton(False))
+
+        # add the toolbars to the manager
+        self.toolbar=self.CreateToolBar()
+        self.toolbarNavigation=self.CreateToolBarNavigation()
+        self._mgr.AddPane(self.toolbar, aui.AuiPaneInfo().Name('toolbar').Caption('Toolbar').ToolbarPane().Top().Layer(1).Row(1).LeftDockable(False).RightDockable(False))
+        self._mgr.AddPane(self.toolbarNavigation, aui.AuiPaneInfo().Name('toolbarNavigation').Caption('Navigation').ToolbarPane().Top().Layer(1).Row(1).LeftDockable(False).RightDockable(False))
+        # "commit" all changes made to FrameManager
+        self._mgr.Update()
+        #create the menubar after the panes so that the default perspective
+        #is created with all panes open
+        self.CreateMenuBar()
+        self.statusbar = self.CreateStatusBar()
+        self._BindEvents()
+        #TODO: select item on startup (whatever item)
+        #self.listCtrlCommands.Select(0)
+        #self.OnListboxSelect(None)
+        name = self.config['perspectives']['active']
+        menu_item = self.GetPerspectiveMenuItem(name)
+        self.OnRestorePerspective(menu_item)
+        self.playlists = self.panelPlaylists.Playlists
+        #define the list of active drivers
+        self.drivers = []
+        for driver in self.config['drivers']:
+            if self.config['drivers'][driver]:
+                #get the corresponding filename and path
+                filename = ''.join([driver, '.py'])
+                path = lh.get_file_path(filename, ['drivers'])
+                #the driver is active for driver[1] == 1
+                if os.path.isfile(path):
+                    #driver files are located in the 'drivers' subfolder
+                    driver_name = ''.join(['drivers.', driver])
+                    module = __import__(driver_name)
+                    class_file = getattr(drivers, driver)
+                    for command in dir(class_file):
+                        if command.endswith('Driver'):
+                            self.drivers.append(getattr(class_file, command))
+        #import all active plugins and plotmanips
+        #the plotmanip_functions contains: {the name of the plotmanip: [method, class_object]}
+        plotmanip_functions = {}
+        #add 'general.ini' to self.configs (this is not a plugin and thus must be imported seperately)
+        ini_path = lh.get_file_path('general.ini', ['plugins'])
+        plugin_config = ConfigObj(ini_path)
+        #self.config.merge(plugin_config)
+        self.configs['general'] = plugin_config
+        #make sure we execute _plug_init() for every command line plugin we import
+        for plugin in self.config['plugins']:
+            if self.config['plugins'][plugin]:
+                filename = ''.join([plugin, '.py'])
+                path = lh.get_file_path(filename, ['plugins'])
+                if os.path.isfile(path):
+                    #get the corresponding filename and path
+                    plugin_name = ''.join(['plugins.', plugin])
+                    try:
+                        #import the module
+                        module = __import__(plugin_name)
+                        #prepare the ini file for inclusion
+                        ini_path = path.replace('.py', '.ini')
+                        #include ini file
+                        plugin_config = ConfigObj(ini_path)
+                        #self.config.merge(plugin_config)
+                        self.configs[plugin] = plugin_config
+                        #add to plugins
+                        commands = eval('dir(module.' + plugin+ '.' + plugin + 'Commands)')
+                        #keep only commands (ie names that start with 'do_')
+                        commands = [command for command in commands if command.startswith('do_')]
+                        if commands:
+                            self.plugins[plugin] = commands
+                        try:
+                            #initialize the plugin
+                            eval('module.' + plugin+ '.' + plugin + 'Commands._plug_init(self)')
+                        except AttributeError:
+                            pass
+                    except ImportError:
+                        pass
+        #initialize the commands tree
+        commands = dir(HookeFrame)
+        commands = [command for command in commands if command.startswith('do_')]
+        if commands:
+            self.plugins['general'] = commands
+        self.panelCommands.Initialize(self.plugins)
+        for command in dir(self):
+            if command.startswith('plotmanip_'):
+                plotmanip_functions[command] = [command, getattr(self, command)]
+        for name in self.config['plotmanipulators']['names']:
+            if self.config['plotmanipulators'].as_bool(name):
+                command_name = ''.join(['plotmanip_', name])
+                if command_name in plotmanip_functions:
+                    self.plotmanipulators.append(plotmanip_functions[command_name])
+        #load default list, if possible
+        self.do_loadlist(self.config['general']['list'])
+
+    def _BindEvents(self):
+        self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground)
+        self.Bind(wx.EVT_SIZE, self.OnSize)
+        self.Bind(wx.EVT_CLOSE, self.OnClose)
+        # Show How To Use The Closing Panes Event
+        self.Bind(aui.EVT_AUI_PANE_CLOSE, self.OnPaneClose)
+        self.Bind(aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.OnNotebookPageClose)
+        #menu
+        self.Bind(wx.EVT_MENU, self.OnClose, id=wx.ID_EXIT)
+        self.Bind(wx.EVT_MENU, self.OnAbout, id=wx.ID_ABOUT)
+        #view
+        self.Bind(wx.EVT_MENU_RANGE, self.OnView, id=ID_ViewAssistant, id2=ID_ViewResults)
+        #perspectives
+        self.Bind(wx.EVT_MENU, self.OnDeletePerspective, id=ID_DeletePerspective)
+        self.Bind(wx.EVT_MENU, self.OnSavePerspective, id=ID_SavePerspective)
+        self.Bind(wx.EVT_MENU_RANGE, self.OnRestorePerspective, id=ID_FirstPerspective, id2=ID_FirstPerspective+1000)
+        #toolbar
+        self.Bind(wx.EVT_TOOL, self.OnExportImage, id=ID_ExportImage)
+        self.Bind(wx.EVT_TOOL, self.OnNext, id=ID_Next)
+        self.Bind(wx.EVT_TOOL, self.OnPrevious, id=ID_Previous)
+        #self.Bind(.EVT_AUITOOLBAR_TOOL_DROPDOWN, self.OnDropDownToolbarItem, id=ID_DropDownToolbarItem)
+        #dir control
+        treeCtrl = self.panelFolders.GetTreeCtrl()
+        #tree.Bind(wx.EVT_LEFT_UP, self.OnDirCtrl1LeftUp)
+        #tree.Bind(wx.EVT_LEFT_DOWN, self.OnGenericDirCtrl1LeftDown)
+        treeCtrl.Bind(wx.EVT_LEFT_DCLICK, self.OnDirCtrlLeftDclick)
+        #playlist tree
+        self.panelPlaylists.PlaylistsTree.Bind(wx.EVT_LEFT_DOWN, self.OnPlaylistsLeftDown)
+        self.panelPlaylists.PlaylistsTree.Bind(wx.EVT_LEFT_DCLICK, self.OnPlaylistsLeftDclick)
+        #commands tree
+        self.panelCommands.ExecuteButton.Bind(wx.EVT_BUTTON, self.OnExecute)
+        self.panelCommands.CommandsTree.Bind(wx.EVT_LEFT_DOWN, self.OnTreeCtrlCommandsLeftDown)
+        #property editor
+        self.panelProperties.pg.Bind(wxpg.EVT_PG_CHANGED, self.OnPropGridChanged)
+        self.panelProperties.pg.Bind(wxpg.EVT_PG_SELECTED, self.OnPropGridSelect)
+        #results panel
+        self.panelResults.results_list.OnCheckItem = self.OnResultsCheck
+
+    def _GetActiveCurveIndex(self):
+        playlist = self.GetActivePlaylist()
+        #get the selected item from the tree
+        selected_item = self.panelPlaylists.PlaylistsTree.GetSelection()
+        #test if a playlist or a curve was double-clicked
+        if self.panelPlaylists.PlaylistsTree.ItemHasChildren(selected_item):
+            return -1
+        else:
+            count = 0
+            selected_item = self.panelPlaylists.PlaylistsTree.GetPrevSibling(selected_item)
+            while selected_item.IsOk():
+                count += 1
+                selected_item = self.panelPlaylists.PlaylistsTree.GetPrevSibling(selected_item)
+            return count
+
+    def _GetActivePlaylistName(self):
+        #get the selected item from the tree
+        selected_item = self.panelPlaylists.PlaylistsTree.GetSelection()
+        #test if a playlist or a curve was double-clicked
+        if self.panelPlaylists.PlaylistsTree.ItemHasChildren(selected_item):
+            playlist_item = selected_item
+        else:
+            #get the name of the playlist
+            playlist_item = self.panelPlaylists.PlaylistsTree.GetItemParent(selected_item)
+        #now we have a playlist
+        return self.panelPlaylists.PlaylistsTree.GetItemText(playlist_item)
+
+    def _GetPlaylistTab(self, name):
+        for index, page in enumerate(self.plotNotebook._tabs._pages):
+            if page.caption == name:
+                return index
+        return -1
+
+    def _GetUniquePlaylistName(self, name):
+        playlist_name = name
+        count = 1
+        while playlist_name in self.playlists:
+            playlist_name = ''.join([name, str(count)])
+            count += 1
+        return playlist_name
+
+    def _SavePerspectiveToFile(self, name, perspective):
+        filename = ''.join([name, '.txt'])
+        filename = lh.get_file_path(filename, ['perspectives'])
+        perspectivesFile = open(filename, 'w')
+        perspectivesFile.write(perspective)
+        perspectivesFile.close()
+
+    def AddPlaylist(self, playlist=None, name='Untitled'):
+        #TODO: change cursor or progressbar (maybe in statusbar)
+        #self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
+        if playlist and playlist.count > 0:
+            playlist.name = self._GetUniquePlaylistName(name)
+            playlist.reset()
+            self.AddToPlaylists(playlist)
+
+    def AddPlaylistFromFiles(self, files=[], name='Untitled'):
+        #TODO: change cursor or progressbar (maybe in statusbar)
+        #self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
+        if files:
+            playlist = Playlist.Playlist(self.drivers)
+            for item in files:
+                playlist.add_curve(item)
+        if playlist.count > 0:
+            playlist.name = self._GetUniquePlaylistName(name)
+            playlist.reset()
+            self.AddToPlaylists(playlist)
+
+    def AddToPlaylists(self, playlist):
+        if playlist.has_curves:
+            #setup the playlist in the Playlist tree
+            tree_root = self.panelPlaylists.PlaylistsTree.GetRootItem()
+            playlist_root = self.panelPlaylists.PlaylistsTree.AppendItem(tree_root, playlist.name, 0)
+            #add all curves to the Playlist tree
+            curves = {}
+            for index, curve in enumerate(playlist.curves):
+                ##remove the extension from the name of the curve
+                ##TODO: optional?
+                #item_text, extension = os.path.splitext(curve.name)
+                #curve_ID = self.panelPlaylists.PlaylistsTree.AppendItem(playlist_root, item_text, 1)
+                curve_ID = self.panelPlaylists.PlaylistsTree.AppendItem(playlist_root, curve.name, 1)
+                if index == playlist.index:
+                    self.panelPlaylists.PlaylistsTree.SelectItem(curve_ID)
+            playlist.reset()
+            #create the plot tab and add playlist to the dictionary
+            plotPanel = wxmpl.PlotPanel(self, ID_FirstPlot + len(self.playlists))
+            notebook_tab = self.plotNotebook.AddPage(plotPanel, playlist.name, True)
+            tab_index = self.plotNotebook.GetSelection()
+            figure = plotPanel.get_figure()
+            self.playlists[playlist.name] = [playlist, figure]
+            self.panelPlaylists.PlaylistsTree.Expand(playlist_root)
+            self.statusbar.SetStatusText(playlist.get_status_string(), 0)
+            self.UpdatePlot()
+
+    def AppendToOutput(self, text):
+        self.panelOutput.AppendText(''.join([text, '\n']))
+
+    def CreateApplicationIcon(self):
+        iconFile = 'resources' + os.sep + 'microscope.ico'
+        icon = wx.Icon(iconFile, wx.BITMAP_TYPE_ICO)
+        self.SetIcon(icon)
+
+    def CreateCommandLine(self):
+        return wx.TextCtrl(self, -1, '', style=wx.NO_BORDER|wx.EXPAND)
+
+    def CreatePanelAssistant(self):
+        panel = wx.TextCtrl(self, -1, '', wx.Point(0, 0), wx.Size(150, 90), wx.NO_BORDER|wx.TE_MULTILINE)
+        panel.SetEditable(False)
+        return panel
+
+    def CreatePanelCommands(self):
+        return hookecommands.Commands(self)
+
+    def CreatePanelFolders(self):
+        #set file filters
+        filters = self.config['folders']['filters']
+        index = self.config['folders'].as_int('filterindex')
+        #set initial directory
+        folder = self.config['general']['workdir']
+        return wx.GenericDirCtrl(self, -1, dir=folder, size=(200, 250), style=wx.DIRCTRL_SHOW_FILTERS, filter=filters, defaultFilter=index)
+
+    def CreatePanelOutput(self):
+        return wx.TextCtrl(self, -1, '', wx.Point(0, 0), wx.Size(150, 90), wx.NO_BORDER|wx.TE_MULTILINE)
+
+    def CreatePanelPlaylists(self):
+        return hookeplaylist.Playlists(self)
+
+    def CreatePanelProperties(self):
+        return hookepropertyeditor.PropertyEditor(self)
+
+    def CreatePanelResults(self):
+        return hookeresults.Results(self)
+
+    def CreatePanelWelcome(self):
+        ctrl = wx.html.HtmlWindow(self, -1, wx.DefaultPosition, wx.Size(400, 300))
+        introStr = '<h1>Welcome to Hooke</h1>' + \
+                 '<h3>Features</h3>' + \
+                 '<ul>' + \
+                 '<li>View, annotate, measure force curves</li>' + \
+                 '<li>Worm-like chain fit of force peaks</li>' + \
+                 '<li>Automatic convolution-based filtering of empty curves</li>' + \
+                 '<li>Automatic fit and measurement of multiple force peaks</li>' + \
+                 '<li>Handles force-clamp force experiments (experimental)</li>' + \
+                 '<li>It is extensible by users by means of plugins and drivers</li>' + \
+                 '</ul>' + \
+                 '<p>See the <a href="/p/hooke/wiki/DocumentationIndex">DocumentationIndex</a> for more information</p>'
+        ctrl.SetPage(introStr)
+        return ctrl
+
+    def CreateMenuBar(self):
+        menu_bar = wx.MenuBar()
+        #file
+        file_menu = wx.Menu()
+        file_menu.Append(wx.ID_OPEN, '&Open playlist\tCtrl-O')
+        file_menu.Append(wx.ID_SAVE, 'Save playlist\tCtrl-S')
+        file_menu.AppendSeparator()
+        file_menu.Append(wx.ID_EXIT, 'Exit\tCtrl-Q')
+        #edit
+        edit_menu = wx.Menu()
+        edit_menu.Append(ID_ExportText, 'Export text...')
+        edit_menu.Append(ID_ExportImage, 'Export image...')
+        edit_menu.AppendSeparator();
+        edit_menu.Append(ID_Config, 'Preferences')
+        #view
+        view_menu = wx.Menu()
+        view_menu.AppendCheckItem(ID_ViewFolders, 'Folders\tF5')
+        view_menu.AppendCheckItem(ID_ViewPlaylists, 'Playlists\tF6')
+        view_menu.AppendCheckItem(ID_ViewCommands, 'Commands\tF7')
+        view_menu.AppendCheckItem(ID_ViewProperties, 'Properties\tF8')
+        view_menu.AppendCheckItem(ID_ViewAssistant, 'Assistant\tF9')
+        view_menu.AppendCheckItem(ID_ViewResults, 'Results\tF10')
+        view_menu.AppendCheckItem(ID_ViewOutput, 'Output\tF11')
+        #perspectives
+        self._perspectives_menu = self.CreatePerspectivesMenu()
+        #help
+        help_menu = wx.Menu()
+        help_menu.Append(wx.ID_ABOUT, 'About Hooke')
+        #put it all together
+        menu_bar.Append(file_menu, 'File')
+        menu_bar.Append(edit_menu, 'Edit')
+        menu_bar.Append(view_menu, 'View')
+        menu_bar.Append(self._perspectives_menu, "Perspectives")
+        menu_bar.Append(help_menu, 'Help')
+
+        self.SetMenuBar(menu_bar)
+
+    def CreateNotebook(self):
+        # create the notebook off-window to avoid flicker
+        client_size = self.GetClientSize()
+        ctrl = aui.AuiNotebook(self, -1, wx.Point(client_size.x, client_size.y), wx.Size(430, 200), self._notebook_style)
+        arts = [aui.AuiDefaultTabArt, aui.AuiSimpleTabArt, aui.VC71TabArt, aui.FF2TabArt, aui.VC8TabArt, aui.ChromeTabArt]
+        art = arts[self._notebook_theme]()
+        ctrl.SetArtProvider(art)
+        #uncomment if we find a nice icon
+        #page_bmp = wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_OTHER, wx.Size(16, 16))
+        ctrl.AddPage(self.CreatePanelWelcome(), "Welcome", False)
+        return ctrl
+
+    def CreatePerspectivesMenu(self):
+        menu = wx.Menu()
+        menu.Append(ID_SavePerspective, "Save Perspective")
+        menu.Append(ID_DeletePerspective, "Delete Perspective")
+        menu.AppendSeparator()
+        #add perspectives to menubar and _perspectives
+        perspectivesDirectory = os.path.join(lh.hookeDir, 'perspectives')
+        if os.path.isdir(perspectivesDirectory):
+            perspectiveFileNames = os.listdir(perspectivesDirectory)
+            for perspectiveFilename in perspectiveFileNames:
+                filename = lh.get_file_path(perspectiveFilename, ['perspectives'])
+                if os.path.isfile(filename):
+                    perspectiveFile = open(filename, 'rU')
+                    perspective = perspectiveFile.readline()
+                    perspectiveFile.close()
+                    if perspective != '':
+                        name, extension = os.path.splitext(perspectiveFilename)
+                        if extension == '.txt':
+                            menuItem = menu.AppendRadioItem(ID_FirstPerspective + len(self._perspectives), name)
+                            self._perspectives[name] = [len(self._perspectives), perspective]
+                            if self.config['perspectives']['active'] == name:
+                                menuItem.Check()
+        #in case there are no perspectives
+        if not self._perspectives:
+            perspective = self._mgr.SavePerspective()
+            self.config['perspectives']['default'] = 'Default'
+            self._perspectives['Default'] = [0, perspective]
+            menuItem = menu.AppendRadioItem(ID_FirstPerspective, 'Default')
+            menuItem.Check()
+            self._SavePerspectiveToFile('Default', perspective)
+        return menu
+
+    def CreateStatusbar(self):
+        statusbar = self.CreateStatusBar(2, wx.ST_SIZEGRIP)
+        statusbar.SetStatusWidths([-2, -3])
+        statusbar.SetStatusText('Ready', 0)
+        welcomeString=u'Welcome to Hooke (version '+__version__+', '+__release_name__+')!'
+        statusbar.SetStatusText(welcomeString, 1)
+        return statusbar
+
+    def CreateToolBar(self):
+        toolbar = wx.ToolBar(self, -1, wx.DefaultPosition, wx.DefaultSize, wx.TB_FLAT | wx.TB_NODIVIDER)
+        toolbar.SetToolBitmapSize(wx.Size(16,16))
+        toolbar_bmp1 = wx.ArtProvider_GetBitmap(wx.ART_QUESTION, wx.ART_OTHER, wx.Size(16, 16))
+        toolbar_bmpOpen = wx.ArtProvider_GetBitmap(wx.ART_FILE_OPEN, wx.ART_OTHER, wx.Size(16, 16))
+        toolbar_bmpSave = wx.ArtProvider_GetBitmap(wx.ART_FILE_SAVE, wx.ART_OTHER, wx.Size(16, 16))
+        toolbar_bmpExportText = wx.ArtProvider_GetBitmap(wx.ART_NORMAL_FILE, wx.ART_OTHER, wx.Size(16, 16))
+        toolbar_bmpExportImage = wx.ArtProvider_GetBitmap(wx.ART_MISSING_IMAGE, wx.ART_OTHER, wx.Size(16, 16))
+        toolbar.AddLabelTool(101, 'Open', toolbar_bmpOpen)
+        toolbar.AddLabelTool(102, 'Save', toolbar_bmpSave)
+        toolbar.AddSeparator()
+        toolbar.AddLabelTool(ID_ExportText, 'Export text...', toolbar_bmpExportText)
+        toolbar.AddLabelTool(ID_ExportImage, 'Export image...', toolbar_bmpExportImage)
+        toolbar.Realize()
+        return toolbar
+
+    def CreateToolBarNavigation(self):
+        toolbar = wx.ToolBar(self, -1, wx.DefaultPosition, wx.DefaultSize, wx.TB_FLAT | wx.TB_NODIVIDER)
+        toolbar.SetToolBitmapSize(wx.Size(16,16))
+        toolbar_bmpBack = wx.ArtProvider_GetBitmap(wx.ART_GO_BACK, wx.ART_OTHER, wx.Size(16, 16))
+        toolbar_bmpForward = wx.ArtProvider_GetBitmap(wx.ART_GO_FORWARD, wx.ART_OTHER, wx.Size(16, 16))
+        toolbar.AddLabelTool(ID_Previous, 'Previous', toolbar_bmpBack, shortHelp='Previous curve')
+        toolbar.AddLabelTool(ID_Next, 'Next', toolbar_bmpForward, shortHelp='Next curve')
+        toolbar.Realize()
+        return toolbar
+
+    def DeleteFromPlaylists(self, name):
+        if name in self.playlists:
+            del self.playlists[name]
+        tree_root = self.panelPlaylists.PlaylistsTree.GetRootItem()
+        item, cookie = self.panelPlaylists.PlaylistsTree.GetFirstChild(tree_root)
+        while item.IsOk():
+            playlist_name = self.panelPlaylists.PlaylistsTree.GetItemText(item)
+            if playlist_name == name:
+                try:
+                    self.panelPlaylists.PlaylistsTree.Delete(item)
+                except:
+                    pass
+            item = self.panelPlaylists.PlaylistsTree.GetNextSibling(item)
+        self.OnPlaylistsLeftDclick(None)
+
+    def DeletePlotPage(self, name):
+        index = self._GetPlaylistTab(name)
+        plot = self.playlists[name][1]
+        plot = None
+        self.plotNotebook.RemovePage(index)
+        self.DeleteFromPlaylists(name)
+
+    def GetActiveCurve(self):
+        playlist = self.GetActivePlaylist()
+        if playlist is not None:
+            return playlist.get_active_curve()
+        return None
+
+    def GetActivePlaylist(self):
+        playlist_name = self._GetActivePlaylistName()
+        if playlist_name in self.playlists:
+            return self.playlists[playlist_name][0]
+        return None
+
+    def GetActivePlot(self):
+        curve = self.GetActiveCurve()
+        if curve is not None:
+            return curve.plots[0]
+        return None
+
+    def GetDockArt(self):
+        return self._mgr.GetArtProvider()
+
+    def GetBoolFromConfig(self, *args):
+        if len(args) == 2:
+            plugin = args[0]
+            section = args[0]
+            key = args[1]
+        elif len(args) == 3:
+            plugin = args[0]
+            section = args[1]
+            key = args[2]
+        if self.configs.has_key(plugin):
+            config = self.configs[plugin]
+            return config[section][key].as_bool('value')
+        return None
+
+    def GetFloatFromConfig(self, *args):
+        if len(args) == 2:
+            plugin = args[0]
+            section = args[0]
+            key = args[1]
+        elif len(args) == 3:
+            plugin = args[0]
+            section = args[1]
+            key = args[2]
+        if self.configs.has_key(plugin):
+            config = self.configs[plugin]
+            return config[section][key].as_float('value')
+        return None
+
+    def GetIntFromConfig(self, *args):
+        if len(args) == 2:
+            plugin = args[0]
+            section = args[0]
+            key = args[1]
+        elif len(args) == 3:
+            plugin = args[0]
+            section = args[1]
+            key = args[2]
+        if self.configs.has_key(plugin):
+            config = self.configs[plugin]
+            return config[section][key].as_int('value')
+        return None
+
+    def GetStringFromConfig(self, *args):
+        if len(args) == 2:
+            plugin = args[0]
+            section = args[0]
+            key = args[1]
+        elif len(args) == 3:
+            plugin = args[0]
+            section = args[1]
+            key = args[2]
+        if self.configs.has_key(plugin):
+            config = self.configs[plugin]
+            return config[section][key]['value']
+        return None
+
+    def GetPerspectiveMenuItem(self, name):
+        index = self._perspectives[name][0]
+        perspective_Id = ID_FirstPerspective + index
+        menu_item = self.MenuBar.FindItemById(perspective_Id)
+        return menu_item
+
+    def HasPlotmanipulator(self, name):
+        '''
+        returns True if the plotmanipulator 'name' is loaded, False otherwise
+        '''
+        for plotmanipulator in self.plotmanipulators:
+            if plotmanipulator[0] == name:
+                return True
+        return False
+
+    def OnAbout(self, event):
+        msg = 'Hooke\n\n'+\
+            'A free, open source data analysis platform\n'+\
+            '(c) 2006-2008 Massimo Sandal\n\n'+\
+            '(c) 2009 Dr. Rolf Schmidt\n\n'+\
+            'Released under the GNU GPL v2'
+        dialog = wx.MessageDialog(self, msg, "About Hooke", wx.OK | wx.ICON_INFORMATION)
+        dialog.ShowModal()
+        dialog.Destroy()
+
+    def OnClose(self, event):
+        #apply changes
+        self.config['main']['height'] = str(self.GetSize().GetHeight())
+        self.config['main']['left'] = str(self.GetPosition()[0])
+        self.config['main']['top'] = str(self.GetPosition()[1])
+        self.config['main']['width'] = str(self.GetSize().GetWidth())
+        # Writing the configuration file to 'hooke.ini'
+        self.config.write()
+        self._mgr.UnInit()
+        del self._mgr
+        self.Destroy()
+
+    def OnDeletePerspective(self, event):
+        pass
+
+    def OnDirCtrlLeftDclick(self, event):
+        file_path = self.panelFolders.GetPath()
+        if os.path.isfile(file_path):
+            if file_path.endswith('.hkp'):
+                self.do_loadlist(file_path)
+            else:
+                pass
+        event.Skip()
+
+    def OnEraseBackground(self, event):
+        event.Skip()
+
+    def OnExecute(self, event):
+        item = self.panelCommands.CommandsTree.GetSelection()
+        if item.IsOk():
+            if self.panelCommands.CommandsTree.ItemHasChildren(item):
+                pass
+            else:
+                #get the plugin
+                parent = self.panelCommands.CommandsTree.GetItemParent(item)
+            if not self.panelCommands.CommandsTree.ItemHasChildren(item):
+                parent_text = self.panelCommands.CommandsTree.GetItemText(parent)
+                item_text = self.panelCommands.CommandsTree.GetItemText(item)
+                if item_text in ['genlist', 'loadlist', 'savelist']:
+                    property_values = self.panelProperties.GetPropertyValues()
+                    arg_str = ''
+                    for item in property_values:
+                        arg_str = ''.join([arg_str, item, '=r"', str(property_values[item]), '", '])
+                    command = ''.join(['self.do_', item_text, '(', arg_str, ')'])
+                else:
+                    command = ''.join(['self.do_', item_text, '()'])
+                exec(command)
+        pass
+
+    def OnExit(self, event):
+        self.Close()
+
+    def OnExportImage(self, event):
+        pass
+
+    def OnNext(self, event):
+        '''
+        NEXT
+        Go to the next curve in the playlist.
+        If we are at the last curve, we come back to the first.
+        -----
+        Syntax: next, n
+        '''
+        selected_item = self.panelPlaylists.PlaylistsTree.GetSelection()
+        if self.panelPlaylists.PlaylistsTree.ItemHasChildren(selected_item):
+            #GetFirstChild returns a tuple
+            #we only need the first element
+            next_item = self.panelPlaylists.PlaylistsTree.GetFirstChild(selected_item)[0]
+        else:
+            next_item = self.panelPlaylists.PlaylistsTree.GetNextSibling(selected_item)
+            if not next_item.IsOk():
+                parent_item = self.panelPlaylists.PlaylistsTree.GetItemParent(selected_item)
+                #GetFirstChild returns a tuple
+                #we only need the first element
+                next_item = self.panelPlaylists.PlaylistsTree.GetFirstChild(parent_item)[0]
+        self.panelPlaylists.PlaylistsTree.SelectItem(next_item, True)
+        playlist = self.playlists[self._GetActivePlaylistName()][0]
+        if playlist.count > 1:
+            playlist.next()
+            self.statusbar.SetStatusText(playlist.get_status_string(), 0)
+            self.UpdatePlot()
+
+    def OnNotebookPageClose(self, event):
+        ctrl = event.GetEventObject()
+        playlist_name = ctrl.GetPageText(ctrl._curpage)
+        self.DeleteFromPlaylists(playlist_name)
+
+    def OnPaneClose(self, event):
+        event.Skip()
+
+    def OnPlaylistsLeftDclick(self, event):
+        playlist_name = self._GetActivePlaylistName()
+        #if that playlist already exists
+        #we check if it is the active playlist (ie selected in panelPlaylists)
+        #and switch to it if necessary
+        if playlist_name in self.playlists:
+            index = self.plotNotebook.GetSelection()
+            current_playlist = self.plotNotebook.GetPageText(index)
+            #new_playlist = self.playlists[playlist_name][0]
+            #if current_playlist != new_playlist:
+            if current_playlist != playlist_name:
+                index = self._GetPlaylistTab(playlist_name)
+                self.plotNotebook.SetSelection(index)
+            #if a curve was double-clicked
+            item = self.panelPlaylists.PlaylistsTree.GetSelection()
+            #TODO: fix with get_active_curve
+            if not self.panelPlaylists.PlaylistsTree.ItemHasChildren(item):
+                index = self._GetActiveCurveIndex()
+            else:
+                index = 0
+            if index >= 0:
+                playlist = self.playlists[playlist_name][0]
+                playlist.index = index
+                self.statusbar.SetStatusText(playlist.get_status_string(), 0)
+                self.UpdatePlot()
+        #if you uncomment the following line, the tree will collapse/expand as well
+        #event.Skip()
+
+    def OnPlaylistsLeftDown(self, event):
+        hit_item, hit_flags = self.panelPlaylists.PlaylistsTree.HitTest(event.GetPosition())
+        if (hit_flags & wx.TREE_HITTEST_ONITEM) != 0:
+            #self.SetFocus()
+            self.panelPlaylists.PlaylistsTree.SelectItem(hit_item)
+            playlist_name = self._GetActivePlaylistName()
+            playlist = self.playlists[playlist_name][0]
+            #if a curve was clicked
+            item = self.panelPlaylists.PlaylistsTree.GetSelection()
+            if not self.panelPlaylists.PlaylistsTree.ItemHasChildren(item):
+                #TODO: fix with get_active_curve
+                index = self._GetActiveCurveIndex()
+                if index >= 0:
+                    #playlist = self.playlists[playlist_name][0]
+                    playlist.index = index
+                    #self.playlists[playlist_name][0].index = index
+            #else:
+                ##self.playlists[playlist_name][0].index = 0
+                #playlist.index = index
+            self.playlists[playlist_name][0] = playlist
+        event.Skip()
+
+    def OnPrevious(self, event):
+        '''
+        PREVIOUS
+        Go to the previous curve in the playlist.
+        If we are at the first curve, we jump to the last.
+        -------
+        Syntax: previous, p
+        '''
+        #playlist = self.playlists[self._GetActivePlaylistName()][0]
+        #select the previous curve and tell the user if we wrapped around
+        #self.AppendToOutput(playlist.previous())
+        selected_item = self.panelPlaylists.PlaylistsTree.GetSelection()
+        if self.panelPlaylists.PlaylistsTree.ItemHasChildren(selected_item):
+            previous_item = self.panelPlaylists.PlaylistsTree.GetLastChild(selected_item)
+        else:
+            previous_item = self.panelPlaylists.PlaylistsTree.GetPrevSibling(selected_item)
+            if not previous_item.IsOk():
+                parent_item = self.panelPlaylists.PlaylistsTree.GetItemParent(selected_item)
+                previous_item = self.panelPlaylists.PlaylistsTree.GetLastChild(parent_item)
+        self.panelPlaylists.PlaylistsTree.SelectItem(previous_item, True)
+        playlist = self.playlists[self._GetActivePlaylistName()][0]
+        if playlist.count > 1:
+            playlist.previous()
+            self.statusbar.SetStatusText(playlist.get_status_string(), 0)
+            self.UpdatePlot()
+
+    def OnPropGridChanged (self, event):
+        prop = event.GetProperty()
+        if prop:
+            item_section = self.panelProperties.SelectedTreeItem
+            item_plugin = self.panelCommands.CommandsTree.GetItemParent(item_section)
+            plugin = self.panelCommands.CommandsTree.GetItemText(item_plugin)
+            config = self.configs[plugin]
+            property_section = self.panelCommands.CommandsTree.GetItemText(item_section)
+            property_key = prop.GetName()
+            property_value = prop.GetValue()
+            config[property_section][property_key]['value'] = property_value
+
+    def OnPropGridSelect(self, event):
+        pass
+
+    def OnRestorePerspective(self, event):
+        name = self.MenuBar.FindItemById(event.GetId()).GetLabel()
+        self._mgr.LoadPerspective(self._perspectives[name][1])
+        self.config['perspectives']['active'] = name
+        self._mgr.Update()
+        all_panes = self._mgr.GetAllPanes()
+        for pane in all_panes:
+            if not pane.name.startswith('toolbar'):
+                if pane.name == 'Assistant':
+                    self.MenuBar.FindItemById(ID_ViewAssistant).Check(pane.window.IsShown())
+                if pane.name == 'Folders':
+                    self.MenuBar.FindItemById(ID_ViewFolders).Check(pane.window.IsShown())
+                if pane.name == 'Playlists':
+                    self.MenuBar.FindItemById(ID_ViewPlaylists).Check(pane.window.IsShown())
+                if pane.name == 'Commands':
+                    self.MenuBar.FindItemById(ID_ViewCommands).Check(pane.window.IsShown())
+                if pane.name == 'Properties':
+                    self.MenuBar.FindItemById(ID_ViewProperties).Check(pane.window.IsShown())
+                if pane.name == 'Output':
+                    self.MenuBar.FindItemById(ID_ViewOutput).Check(pane.window.IsShown())
+                if pane.name == 'Results':
+                    self.MenuBar.FindItemById(ID_ViewResults).Check(pane.window.IsShown())
+
+    def OnResultsCheck(self, index, flag):
+        curve = self.GetActiveCurve()
+        result = curve.data['results'][index]['visible'] = flag
+        self.UpdatePlot()
+
+    def OnSavePerspective(self, event):
+        def nameExists(name):
+            for item in self._perspectives_menu.GetMenuItems():
+                if item.GetText() == name:
+                    return True
+            return False
+
+        done = False
+        while not done:
+            dialog = wx.TextEntryDialog(self, 'Enter a name for the new perspective:', 'Save perspective')
+            dialog.SetValue('New perspective')
+            if dialog.ShowModal() != wx.ID_OK:
+                return
+            else:
+                name = dialog.GetValue()
+
+            if nameExists(name):
+                dialogConfirm = wx.MessageDialog(self, 'A file with this name already exists.\n\nDo you want to replace it?', 'Confirm', wx.YES_NO|wx.ICON_QUESTION|wx.CENTER)
+                if dialogConfirm.ShowModal() == wx.ID_YES:
+                    done = True
+            else:
+                done = True
+
+        perspective = self._mgr.SavePerspective()
+
+        if nameExists(name):
+            #check the corresponding menu item
+            menuItem = self.GetPerspectiveMenuItem(name)
+            #replace the perspectiveStr in _pespectives
+            index = self._perspectives[name][0]
+            self._perspectives[name] = [index, perspective]
+        else:
+            #simply add the new perspective to _perspectives
+            index = len(self._perspectives)
+            self._perspectives[name] = [len(self._perspectives), perspective]
+            menuItem = self._perspectives_menu.AppendRadioItem(ID_FirstPerspective + len(self._perspectives), name)
+
+        menuItem.Check()
+        self._SavePerspectiveToFile(name, perspective)
+        #uncheck all perspective menu items
+        #as these are radio items, one item has to be checked at all times
+        #the line 'menuItem.Check()' above actually checks a second item
+        #but does not toggle
+        #so we need to uncheck all other items afterwards
+        #weirdly enough, menuitem.Toggle() doesn't do this properly either
+        for item in self._perspectives_menu.GetMenuItems():
+            if item.IsCheckable():
+                if item.GetLabel() != name:
+                    item.Check(False)
+
+    def OnView(self, event):
+        menu_id = event.GetId()
+        menu_item = self.MenuBar.FindItemById(menu_id)
+        menu_label = menu_item.GetLabel()
+
+        pane = self._mgr.GetPane(menu_label)
+        pane.Show(not pane.IsShown())
+        #if we don't do the following, the Folders pane does not resize properly on hide/show
+        if pane.caption == 'Folders' and pane.IsShown() and pane.IsDocked():
+            #folders_size = pane.GetSize()
+            self.panelFolders.Fit()
+        self._mgr.Update()
+
+    def OnSize(self, event):
+        event.Skip()
+
+    def OnTreeCtrlCommandsLeftDown(self, event):
+        hit_item, hit_flags = self.panelCommands.CommandsTree.HitTest(event.GetPosition())
+        if (hit_flags & wx.TREE_HITTEST_ONITEM) != 0:
+            self.panelCommands.CommandsTree.SelectItem(hit_item)
+            self.panelProperties.SelectedTreeItem = hit_item
+            #if a command was clicked
+            properties = []
+            if not self.panelCommands.CommandsTree.ItemHasChildren(hit_item):
+                item_plugin = self.panelCommands.CommandsTree.GetItemParent(hit_item)
+                plugin = self.panelCommands.CommandsTree.GetItemText(item_plugin)
+                if self.configs.has_key(plugin):
+                    #config = self.panelCommands.CommandsTree.GetPyData(item_plugin)
+                    config = self.configs[plugin]
+                    section = self.panelCommands.CommandsTree.GetItemText(hit_item)
+                    #display docstring in help window
+                    doc_string = eval('self.do_' + section + '.__doc__')
+                    if section in config:
+                        for option in config[section]:
+                            properties.append([option, config[section][option]])
+            else:
+                module = self.panelCommands.CommandsTree.GetItemText(hit_item)
+                if module != 'general':
+                    doc_string = eval('plugins.' + module + '.' + module + 'Commands.__doc__')
+                else:
+                    doc_string = 'The module "general" contains Hooke core functionality'
+            if doc_string is not None:
+                self.panelAssistant.ChangeValue(doc_string)
+            hookepropertyeditor.PropertyEditor.Initialize(self.panelProperties, properties)
+        event.Skip()
+
+    def UpdatePlaylists(self):
+        #setup the playlist in the Playlist tree
+        tree_root = self.panelPlaylists.PlaylistsTree.GetRootItem()
+        playlist_root = self.panelPlaylists.PlaylistsTree.AppendItem(tree_root, playlist.name, 0)
+        #add all curves to the Playlist tree
+        curves = {}
+        for index, curve in enumerate(playlist.curves):
+            ##remove the extension from the name of the curve
+            ##TODO: optional?
+            #item_text, extension = os.path.splitext(curve.name)
+            #curve_ID = self.panelPlaylists.PlaylistsTree.AppendItem(playlist_root, item_text, 1)
+            curve_ID = self.panelPlaylists.PlaylistsTree.AppendItem(playlist_root, curve.name, 1)
+            if index == playlist.index:
+                self.panelPlaylists.PlaylistsTree.SelectItem(curve_ID)
+        #create the plot tab and add playlist to the dictionary
+        plotPanel = wxmpl.PlotPanel(self, ID_FirstPlot + len(self.playlists))
+        notebook_tab = self.plotNotebook.AddPage(plotPanel, playlist.name, True)
+        #tab_index = self.plotNotebook.GetSelection()
+        figure = plotPanel.get_figure()
+        #self.playlists[playlist.name] = [playlist, tab_index, figure]
+        self.playlists[playlist.name] = [playlist, figure]
+        self.panelPlaylists.PlaylistsTree.Expand(playlist_root)
+        self.statusbar.SetStatusText(playlist.get_status_string(), 0)
+        self.UpdatePlot()
+
+#HELPER FUNCTIONS
+#Everything sending an event should be here
+    def _measure_N_points(self, N, whatset=1):
+        '''
+        general helper function for N-points measures
+        '''
+        wx.PostEvent(self.frame,self.list_of_events['measure_points'](num_of_points=N, set=whatset))
+        while 1:
+            try:
+                points=self.frame.events_from_gui.get()
+                break
+            except Empty:
+                pass
+        return points
+
+    def _clickize(self, xvector, yvector, index):
+        '''
+        returns a ClickedPoint() object from an index and vectors of x, y coordinates
+        '''
+        point = lh.ClickedPoint()
+        point.index = index
+        point.absolute_coords = xvector[index], yvector[index]
+        point.find_graph_coords(xvector, yvector)
+        return point
+
+#PLAYLIST INTERACTION COMMANDS
+#-------------------------------
+    def do_genlist(self, folder=lh.hookeDir, filemask='*.*'):
+        '''
+        GENLIST
+        Generates a file playlist.
+        Note it doesn't *save* it: see savelist for this.
+
+        If [input files] is a directory, it will use all files in the directory for playlist.
+        So:
+        genlist dir
+        genlist dir/
+        genlist dir/*.*
+
+        are all equivalent syntax.
+        ------------
+        Syntax: genlist [input files]
+        '''
+        #args list is: input folder, file mask
+        if os.path.isdir(folder):
+            path = os.path.join(folder, filemask)
+            #expanding correctly the input list with the glob module :)
+            files = glob.glob(path)
+            files.sort()
+            #TODO: change cursor or progressbar (maybe in statusbar)
+            #self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
+            playlist = playlist.Playlist(self.drivers)
+            for item in files:
+                curve = playlist.add_curve(item)
+                plot = copy.deepcopy(curve.plots[0])
+                #add the 'raw' data
+                curve.add_data('raw', plot.vectors[0][0], plot.vectors[0][1], color=plot.colors[0], style='plot')
+                curve.add_data('raw', plot.vectors[1][0], plot.vectors[1][1], color=plot.colors[1], style='plot')
+                #apply all active plotmanipulators and add the 'manipulated' data
+                for plotmanipulator in self.plotmanipulators:
+                    plot = plotmanipulator[1](plot, curve)
+                    curve.set_data('manipulated', plot.vectors[0][0], plot.vectors[0][1], color=plot.colors[0], style='plot')
+                    curve.add_data('manipulated', plot.vectors[1][0], plot.vectors[1][1], color=plot.colors[1], style='plot')
+            if playlist.count > 0:
+                playlist.name = self._GetUniquePlaylistName(os.path.basename(folder))
+                playlist.reset()
+                self.AddToPlaylists(playlist)
+            self.AppendToOutput(playlist.get_status_string())
+        else:
+            self.AppendToOutput(''.join(['Cannot find folder ', folder]))
+
+    def do_loadlist(self, filename):
+        '''
+        LOADLIST
+        Loads a file playlist
+        -----------
+        Syntax: loadlist [playlist file]
+        '''
+        #TODO: check for duplicate playlists, ask the user for a unique name
+        #if self.playlist_name in self.playlists:
+
+        #add hkp extension if necessary
+        if not filename.endswith('.hkp'):
+            filename = ''.join([filename, '.hkp'])
+        #prefix with 'hookeDir' if just a filename or a relative path
+        filename = lh.get_file_path(filename)
+        if os.path.isfile(filename):
+            #TODO: change cursor
+            #self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
+            playlist_new = playlist.Playlist(self.drivers)
+            playlist_new.load(filename)
+            if playlist_new.count > 0:
+                for curve in playlist_new.curves:
+                    plot = copy.deepcopy(curve.plots[0])
+                    for plotmanip in self.plotmanipulators:
+                        #to_plot = plotmanip[1](to_plot, curve)
+                        plot = plotmanip[1](plot, curve)
+                        curve.set_data('manipulated', plot.vectors[0][0], plot.vectors[0][1], color=plot.colors[0], style='plot')
+                        curve.add_data('manipulated', plot.vectors[1][0], plot.vectors[1][1], color=plot.colors[1], style='plot')
+                self.AddToPlaylists(playlist_new)
+            #else:
+                ##TODO: display dialog
+            self.AppendToOutput(playlist_new.get_status_string())
+            #TODO: change cursor
+            #self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
+        else:
+            #TODO: display dialog
+            self.AppendToOutput(''.join['File ', filename, ' not found.\n'])
+        pass
+
+    def do_savelist(self, filename):
+        '''
+        SAVELIST
+        Saves the current file playlist on disk.
+        ------------
+        Syntax: savelist [filename]
+        '''
+
+        #self.playlist_generics['pointer'] = self._GetActiveCurveIndex
+        pointer = self._GetActiveCurveIndex()
+        #autocomplete filename if not specified
+        if not filename.endswith('.hkp'):
+            filename = filename.join(['.hkp'])
+
+        playlist = self.GetActivePlaylist()
+        playlist.set_XML()
+        playlist.save(filename)
+
+#PLOT INTERACTION COMMANDS
+#-------------------------------
+    def UpdatePlot(self):
+        def add_plot(plot):
+            if plot['visible'] and plot['x'] and plot['y']:
+                color = plot['color']
+                style = plot['style']
+                if style == 'plot':
+                    axes.plot(plot['x'], plot['y'], color=color, zorder=1)
+                if style == 'scatter':
+                    axes.scatter(plot['x'], plot['y'], color=color, s=0.5, zorder=2)
+
+        def add_plot2(plot):
+            if plot.visible and plot.x and plot.y:
+                if plot.style == 'plot':
+                    axes.plot(plot.x, plot.y, color=plot.color, zorder=1)
+                if plot.style == 'scatter':
+                    axes.scatter(plot.x, plot.y, color=plot.color, s=0.5, zorder=2)
+
+        playlist_name = self._GetActivePlaylistName()
+        index = self._GetActiveCurveIndex()
+        playlist = self.playlists[playlist_name][0]
+        curve = playlist.get_active_curve()
+        plot = playlist.get_active_plot()
+        figure = self.playlists[playlist_name][1]
+
+        figure.clf()
+        exclude = None
+        if curve.data.has_key('manipulated'):
+            exclude = 'raw'
+        elif curve.data.has_key('raw'):
+            exclude = 'manipulated'
+
+        if exclude is not None:
+            #TODO: what is this good for?
+            if not hasattr(self, 'subplot'):
+                axes = figure.add_subplot(111)
+
+            axes.set_title(plot.title)
+            axes.set_xlabel(plot.units[0])
+            axes.set_ylabel(plot.units[1])
+
+            for set_of_plots in curve.data:
+                if set_of_plots != exclude:
+                    plots = curve.data[set_of_plots]
+                    for each_plot in plots:
+                        add_plot(each_plot)
+
+            #TODO: add multiple results support
+            #for fit in curve.fits:
+            if curve.fits.has_key('wlc'):
+                for plot in curve.fits['wlc'].results:
+                    add_plot2(plot)
+                self.panelResults.DisplayResults(curve.fits['wlc'])
+            else:
+                self.panelResults.ClearResults()
+
+            axes.figure.canvas.draw()
+        else:
+            self.AppendToOutput('Not able to plot.')
+
+
+ID_PaneBorderSize = wx.ID_HIGHEST + 1
+ID_SashSize = ID_PaneBorderSize + 1
+ID_CaptionSize = ID_PaneBorderSize + 2
+ID_BackgroundColor = ID_PaneBorderSize + 3
+ID_SashColor = ID_PaneBorderSize + 4
+ID_InactiveCaptionColor =  ID_PaneBorderSize + 5
+ID_InactiveCaptionGradientColor = ID_PaneBorderSize + 6
+ID_InactiveCaptionTextColor = ID_PaneBorderSize + 7
+ID_ActiveCaptionColor = ID_PaneBorderSize + 8
+ID_ActiveCaptionGradientColor = ID_PaneBorderSize + 9
+ID_ActiveCaptionTextColor = ID_PaneBorderSize + 10
+ID_BorderColor = ID_PaneBorderSize + 11
+ID_GripperColor = ID_PaneBorderSize + 12
+
+
+#----------------------------------------------------------------------
+
+if __name__ == '__main__':
+
+    ## now, silence a deprecation warning for py2.3
+    #import warnings
+    #warnings.filterwarnings("ignore", "integer", DeprecationWarning, "wxPython.gdi")
+
+    redirect=True
+    if __debug__:
+        redirect=False
+    app = Hooke(redirect=redirect)
+
+    app.MainLoop()
+
+
diff --git a/hooke/playlist.py b/hooke/playlist.py
index 12c6d26..a7a261e 100644
--- a/hooke/playlist.py
+++ b/hooke/playlist.py
@@ -1,197 +1,197 @@
-import copy
-import os
-import os.path
-import xml.dom.minidom
-
-from . import hooke as hooke
-from . import libhookecurve as lhc
-from . import libhooke as lh
-
-class Playlist(object):
-    def __init__(self, drivers):
-        self._saved = False
-        self.count = 0
-        self.curves = []
-        self.drivers = drivers
-        self.path = ''
-        self.genericsDict = {}
-        self.hiddenAttributes = ['curve', 'driver', 'name', 'plots']
-        self.index = -1
-        self.name = 'Untitled'
-        self.plotPanel = None
-        self.plotTab = None
-        self.xml = None
-
-    def add_curve(self, path, attributes={}):
-        curve = lhc.HookeCurve(path)
-        for key,value in attribures.items():
-            setattr(curve, key, value)
-        curve.identify(self.drivers)
-        curve.plots = curve.driver.default_plots()
-        self.curves.append(curve)
-        self._saved = False
-        self.count = len(self.curves)
-        return curve
-
-    def close_curve(self, index):
-        if index >= 0 and index < self.count:
-            self.curves.remove(index)
-
-    def filter_curves(self, keeper_fn=labmda curve:True):
-        playlist = copy.deepcopy(self)
-        for curve in reversed(playlist.curves):
-            if not keeper_fn(curve):
-                playlist.curves.remove(curve)
-        try: # attempt to maintain the same active curve
-            playlist.index = playlist.curves.index(self.get_active_curve())
-        except ValueError:
-            playlist.index = 0
-        playlist._saved = False
-        playlist.count = len(playlist.curves)
-        return playlist
-
-    def get_active_curve(self):
-        return self.curves[self.index]
-
-    #TODO: do we need this?
-    def get_active_plot(self):
-        return self.curves[self.index].plots[0]
-
-    def get_status_string(self):
-        if self.has_curves()
-            return '%s (%s/%s)' % (self.name, self.index + 1, self.count)
-        return 'The file %s does not contain any valid force curve data.' \
-            % self.name
-
-    def has_curves(self):
-        if self.count > 0:
-            return True
-        return False
-
-    def is_saved(self):
-        return self._saved
-
-    def load(self, path):
-        '''
-        loads a playlist file
-        '''
-        self.path = path
-        self.name = os.path.basename(path)
-        playlist = lh.delete_empty_lines_from_xmlfile(path)
-        self.xml = xml.dom.minidom.parse(path)
-        # Strip blank spaces:
-        self._removeWhitespaceNodes()
-
-        generics_list = self.xml.getElementsByTagName('generics')
-        curve_list = self.xml.getElementsByTagName('curve')
-        self._loadGenerics(generics_list)
-        self._loadCurves(curve_list)
-        self._saved = True
-
-    def _removeWhitespaceNodes(self, root_node=None):
-        if root_node == None:
-            root_node = self.xml
-        for node in root_node.childNodes:
-            if node.nodeType == node.TEXT_NODE and node.data.strip() == '':
-                root_node.removeChild(node) # drop this whitespace node
-            else:
-                _removeWhitespaceNodes(root_node=node) # recurse down a level
-
-    def _loadGenerics(self, generics_list, clear=True):
-        if clear:
-            self.genericsDict = {}
-        #populate generics
-        generics_list = self.xml.getElementsByTagName('generics')
-        for generics in generics_list:
-            for attribute in generics.attributes.keys():
-                self.genericsDict[attribute] = generics_list[0].getAttribute(attribute)
-        if self.genericsDict.has_key('pointer'):
-            index = int(self.genericsDict['pointer'])
-            if index >= 0 and index < len(self.curves):
-                self.index = index
-            else:
-                index = 0
-
-    def _loadCurves(self, curve_list, clear=True):
-        if clear:
-            self.curves = []
-        #populate playlist with curves
-        for curve in curve_list:
-            #rebuild a data structure from the xml attributes
-            curve_path = lh.get_file_path(element.getAttribute('path'))
-            #extract attributes for the single curve
-            attributes = dict([(k,curve.getAttribute(k))
-                               for k in curve.attributes.keys()])
-            attributes.pop('path')
-            curve = self.add_curve(os.path.join(path, curve_path), attributes)
-            if curve is not None:
-                for plot in curve.plots:
-                    curve.add_data('raw', plot.vectors[0][0], plot.vectors[0][1], color=plot.colors[0], style='plot')
-                    curve.add_data('raw', plot.vectors[1][0], plot.vectors[1][1], color=plot.colors[1], style='plot')
-
-    def next(self):
-        self.index += 1
-        if self.index > self.count - 1:
-            self.index = 0
-
-    def previous(self):
-        self.index -= 1
-        if self.index < 0:
-            self.index = self.count - 1
-
-    def reset(self):
-        if self.has_curves():
-            self.index = 0
-        else:
-            self.index = None
-
-    def save(self, path):
-        '''
-        saves the playlist in a XML file.
-        '''
-        try:
-            output_file = file(path, 'w')
-        except IOError, e:
-            #TODO: send message
-            print 'Cannot save playlist: %s' % e
-            return
-        self.xml.writexml(output_file, indent='\n')
-        output_file.close()
-        self._saved = True
-
-    def set_XML(self):
-        '''
-        Creates an initial playlist from a list of files.
-        A playlist is an XML document with the following syntax:
-          <?xml version="1.0" encoding="utf-8"?>
-          <playlist>
-            <generics pointer="0"/>
-            <curve path="/my/file/path/"/ attribute="value" ...>
-            <curve path="...">
-          </playlist>
-        Relative paths are interpreted relative to the location of the
-        playlist file.
-        '''
-        #create the output playlist, a simple XML document
-        implementation = xml.dom.minidom.getDOMImplementation()
-        #create the document DOM object and the root element
-        self.xml = implementation.createDocument(None, 'playlist', None)
-        root = self.xml.documentElement
-
-        #save generics variables
-        playlist_generics = self.xml.createElement('generics')
-        root.appendChild(playlist_generics)
-        self.genericsDict['pointer'] = self.index
-        for key in self.genericsDict.keys():
-            self.xml.createAttribute(key)
-            playlist_generics.setAttribute(key, str(self.genericsDict[key]))
-            
-        #save curves and their attributes
-        for item in self.curves:
-            playlist_curve = self.xml.createElement('curve')
-            root.appendChild(playlist_curve)
-            for key in item.__dict__:
-                if not (key in self.hiddenAttributes):
-                    self.xml.createAttribute(key)
-                    playlist_curve.setAttribute(key, str(item.__dict__[key]))
-        self._saved = False
+import copy
+import os
+import os.path
+import xml.dom.minidom
+
+from . import hooke as hooke
+from . import libhookecurve as lhc
+from . import libhooke as lh
+
+class Playlist(object):
+    def __init__(self, drivers):
+        self._saved = False
+        self.count = 0
+        self.curves = []
+        self.drivers = drivers
+        self.path = ''
+        self.genericsDict = {}
+        self.hiddenAttributes = ['curve', 'driver', 'name', 'plots']
+        self.index = -1
+        self.name = 'Untitled'
+        self.plotPanel = None
+        self.plotTab = None
+        self.xml = None
+
+    def add_curve(self, path, attributes={}):
+        curve = lhc.HookeCurve(path)
+        for key,value in attribures.items():
+            setattr(curve, key, value)
+        curve.identify(self.drivers)
+        curve.plots = curve.driver.default_plots()
+        self.curves.append(curve)
+        self._saved = False
+        self.count = len(self.curves)
+        return curve
+
+    def close_curve(self, index):
+        if index >= 0 and index < self.count:
+            self.curves.remove(index)
+
+    def filter_curves(self, keeper_fn=labmda curve:True):
+        playlist = copy.deepcopy(self)
+        for curve in reversed(playlist.curves):
+            if not keeper_fn(curve):
+                playlist.curves.remove(curve)
+        try: # attempt to maintain the same active curve
+            playlist.index = playlist.curves.index(self.get_active_curve())
+        except ValueError:
+            playlist.index = 0
+        playlist._saved = False
+        playlist.count = len(playlist.curves)
+        return playlist
+
+    def get_active_curve(self):
+        return self.curves[self.index]
+
+    #TODO: do we need this?
+    def get_active_plot(self):
+        return self.curves[self.index].plots[0]
+
+    def get_status_string(self):
+        if self.has_curves()
+            return '%s (%s/%s)' % (self.name, self.index + 1, self.count)
+        return 'The file %s does not contain any valid force curve data.' \
+            % self.name
+
+    def has_curves(self):
+        if self.count > 0:
+            return True
+        return False
+
+    def is_saved(self):
+        return self._saved
+
+    def load(self, path):
+        '''
+        loads a playlist file
+        '''
+        self.path = path
+        self.name = os.path.basename(path)
+        playlist = lh.delete_empty_lines_from_xmlfile(path)
+        self.xml = xml.dom.minidom.parse(path)
+        # Strip blank spaces:
+        self._removeWhitespaceNodes()
+
+        generics_list = self.xml.getElementsByTagName('generics')
+        curve_list = self.xml.getElementsByTagName('curve')
+        self._loadGenerics(generics_list)
+        self._loadCurves(curve_list)
+        self._saved = True
+
+    def _removeWhitespaceNodes(self, root_node=None):
+        if root_node == None:
+            root_node = self.xml
+        for node in root_node.childNodes:
+            if node.nodeType == node.TEXT_NODE and node.data.strip() == '':
+                root_node.removeChild(node) # drop this whitespace node
+            else:
+                _removeWhitespaceNodes(root_node=node) # recurse down a level
+
+    def _loadGenerics(self, generics_list, clear=True):
+        if clear:
+            self.genericsDict = {}
+        #populate generics
+        generics_list = self.xml.getElementsByTagName('generics')
+        for generics in generics_list:
+            for attribute in generics.attributes.keys():
+                self.genericsDict[attribute] = generics_list[0].getAttribute(attribute)
+        if self.genericsDict.has_key('pointer'):
+            index = int(self.genericsDict['pointer'])
+            if index >= 0 and index < len(self.curves):
+                self.index = index
+            else:
+                index = 0
+
+    def _loadCurves(self, curve_list, clear=True):
+        if clear:
+            self.curves = []
+        #populate playlist with curves
+        for curve in curve_list:
+            #rebuild a data structure from the xml attributes
+            curve_path = lh.get_file_path(element.getAttribute('path'))
+            #extract attributes for the single curve
+            attributes = dict([(k,curve.getAttribute(k))
+                               for k in curve.attributes.keys()])
+            attributes.pop('path')
+            curve = self.add_curve(os.path.join(path, curve_path), attributes)
+            if curve is not None:
+                for plot in curve.plots:
+                    curve.add_data('raw', plot.vectors[0][0], plot.vectors[0][1], color=plot.colors[0], style='plot')
+                    curve.add_data('raw', plot.vectors[1][0], plot.vectors[1][1], color=plot.colors[1], style='plot')
+
+    def next(self):
+        self.index += 1
+        if self.index > self.count - 1:
+            self.index = 0
+
+    def previous(self):
+        self.index -= 1
+        if self.index < 0:
+            self.index = self.count - 1
+
+    def reset(self):
+        if self.has_curves():
+            self.index = 0
+        else:
+            self.index = None
+
+    def save(self, path):
+        '''
+        saves the playlist in a XML file.
+        '''
+        try:
+            output_file = file(path, 'w')
+        except IOError, e:
+            #TODO: send message
+            print 'Cannot save playlist: %s' % e
+            return
+        self.xml.writexml(output_file, indent='\n')
+        output_file.close()
+        self._saved = True
+
+    def set_XML(self):
+        '''
+        Creates an initial playlist from a list of files.
+        A playlist is an XML document with the following syntax:
+          <?xml version="1.0" encoding="utf-8"?>
+          <playlist>
+            <generics pointer="0"/>
+            <curve path="/my/file/path/"/ attribute="value" ...>
+            <curve path="...">
+          </playlist>
+        Relative paths are interpreted relative to the location of the
+        playlist file.
+        '''
+        #create the output playlist, a simple XML document
+        implementation = xml.dom.minidom.getDOMImplementation()
+        #create the document DOM object and the root element
+        self.xml = implementation.createDocument(None, 'playlist', None)
+        root = self.xml.documentElement
+
+        #save generics variables
+        playlist_generics = self.xml.createElement('generics')
+        root.appendChild(playlist_generics)
+        self.genericsDict['pointer'] = self.index
+        for key in self.genericsDict.keys():
+            self.xml.createAttribute(key)
+            playlist_generics.setAttribute(key, str(self.genericsDict[key]))
+            
+        #save curves and their attributes
+        for item in self.curves:
+            playlist_curve = self.xml.createElement('curve')
+            root.appendChild(playlist_curve)
+            for key in item.__dict__:
+                if not (key in self.hiddenAttributes):
+                    self.xml.createAttribute(key)
+                    playlist_curve.setAttribute(key, str(item.__dict__[key]))
+        self._saved = False
diff --git a/hooke/plugin/__init__.py b/hooke/plugin/__init__.py
index bd85e3c..a9f8837 100644
--- a/hooke/plugin/__init__.py
+++ b/hooke/plugin/__init__.py
@@ -1,57 +1,57 @@
-#!/usr/bin/env python
-'''
-Commands and settings panel for Hooke
-
-Displays commands and settings for Hooke in a tree control
-(c) Dr. Rolf Schmidt, 2009
-'''
-
-from configobj import ConfigObj
-import os.path
-from validate import Validator
-import wx
-
-import libhooke as lh
-
-class Commands(wx.Panel):
-
-    def __init__(self, parent):
-        # Use the WANTS_CHARS style so the panel doesn't eat the Return key.
-        wx.Panel.__init__(self, parent, -1, style=wx.WANTS_CHARS|wx.NO_BORDER, size=(160, 200))
-
-        self.CommandsTree = wx.TreeCtrl(self, -1, wx.Point(0, 0), wx.Size(160, 250), wx.TR_DEFAULT_STYLE|wx.NO_BORDER|wx.TR_HIDE_ROOT)
-        imglist = wx.ImageList(16, 16, True, 2)
-        imglist.Add(wx.ArtProvider.GetBitmap(wx.ART_FOLDER, wx.ART_OTHER, wx.Size(16, 16)))
-        imglist.Add(wx.ArtProvider.GetBitmap(wx.ART_EXECUTABLE_FILE, wx.ART_OTHER, wx.Size(16, 16)))
-        self.CommandsTree.AssignImageList(imglist)
-        self.CommandsTree.AddRoot('Commands and Settings', 0)
-
-        self.ExecuteButton = wx.Button(self, -1, 'Execute')
-
-        sizer = wx.BoxSizer(wx.VERTICAL)
-        sizer.Add(self.CommandsTree, 1, wx.EXPAND)
-        sizer.Add(self.ExecuteButton, 0, wx.EXPAND)
-
-        self.SetSizer(sizer)
-        sizer.Fit(self)
-
-    def Initialize(self, plugins):
-        tree_root = self.CommandsTree.GetRootItem()
-        for plugin in plugins:
-            filename = ''.join([plugin, '.ini'])
-            path = lh.get_file_path(filename, ['plugins'])
-            config = ConfigObj()
-            if os.path.isfile(path):
-                config.filename = path
-                config.reload()
-                #append the ini file to the plugin
-                plugin_root = self.CommandsTree.AppendItem(tree_root, plugin, 0, data=wx.TreeItemData(config))
-            else:
-                plugin_root = self.CommandsTree.AppendItem(tree_root, plugin, 0)
-
-            #add all commands to the tree
-            for command in plugins[plugin]:
-                command_label = command.replace('do_', '')
-                #do not add the ini file to the command (we'll access the ini file of the plugin (ie parent) instead, see above)
-                self.CommandsTree.AppendItem(plugin_root, command_label, 1)
-            self.CommandsTree.Expand(plugin_root)
+#!/usr/bin/env python
+'''
+Commands and settings panel for Hooke
+
+Displays commands and settings for Hooke in a tree control
+(c) Dr. Rolf Schmidt, 2009
+'''
+
+from configobj import ConfigObj
+import os.path
+from validate import Validator
+import wx
+
+import libhooke as lh
+
+class Commands(wx.Panel):
+
+    def __init__(self, parent):
+        # Use the WANTS_CHARS style so the panel doesn't eat the Return key.
+        wx.Panel.__init__(self, parent, -1, style=wx.WANTS_CHARS|wx.NO_BORDER, size=(160, 200))
+
+        self.CommandsTree = wx.TreeCtrl(self, -1, wx.Point(0, 0), wx.Size(160, 250), wx.TR_DEFAULT_STYLE|wx.NO_BORDER|wx.TR_HIDE_ROOT)
+        imglist = wx.ImageList(16, 16, True, 2)
+        imglist.Add(wx.ArtProvider.GetBitmap(wx.ART_FOLDER, wx.ART_OTHER, wx.Size(16, 16)))
+        imglist.Add(wx.ArtProvider.GetBitmap(wx.ART_EXECUTABLE_FILE, wx.ART_OTHER, wx.Size(16, 16)))
+        self.CommandsTree.AssignImageList(imglist)
+        self.CommandsTree.AddRoot('Commands and Settings', 0)
+
+        self.ExecuteButton = wx.Button(self, -1, 'Execute')
+
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(self.CommandsTree, 1, wx.EXPAND)
+        sizer.Add(self.ExecuteButton, 0, wx.EXPAND)
+
+        self.SetSizer(sizer)
+        sizer.Fit(self)
+
+    def Initialize(self, plugins):
+        tree_root = self.CommandsTree.GetRootItem()
+        for plugin in plugins:
+            filename = ''.join([plugin, '.ini'])
+            path = lh.get_file_path(filename, ['plugins'])
+            config = ConfigObj()
+            if os.path.isfile(path):
+                config.filename = path
+                config.reload()
+                #append the ini file to the plugin
+                plugin_root = self.CommandsTree.AppendItem(tree_root, plugin, 0, data=wx.TreeItemData(config))
+            else:
+                plugin_root = self.CommandsTree.AppendItem(tree_root, plugin, 0)
+
+            #add all commands to the tree
+            for command in plugins[plugin]:
+                command_label = command.replace('do_', '')
+                #do not add the ini file to the command (we'll access the ini file of the plugin (ie parent) instead, see above)
+                self.CommandsTree.AppendItem(plugin_root, command_label, 1)
+            self.CommandsTree.Expand(plugin_root)
diff --git a/hooke/plugin/showconvoluted.py b/hooke/plugin/showconvoluted.py
index a2de586..719f980 100644
--- a/hooke/plugin/showconvoluted.py
+++ b/hooke/plugin/showconvoluted.py
@@ -1,61 +1,61 @@
-#!/usr/bin/env python
-
-'''
-SHOW CONVOLUTED CURVE PLUGIN FOR HOOKE
-
-This plugin contains a plotmanipulator to show the convoluted curve.
-(c) Dr. Rolf Schmidt, 2009
-'''
-
-import libpeakspot
-
-class showconvolutedCommands:
-
-    #def _plug_init(self):
-        #pass
-
-    def plotmanip_showconvoluted(self, plot, curve):
-        '''
-        BEGIN: taken from procplots.py
-        might need some tweaking
-        '''
-        #use only for force spectroscopy experiments!
-        if curve.driver.experiment != 'smfs':
-            return plot
-
-        '''
-        END: taken from procplots.py
-        '''
-
-        #need to convert the string that contains the list into a list
-        #convolution = eval(self.config['convfilt']['convolution']['value'])
-        convolution = eval(self.GetStringFromConfig('flatfilts', 'convfilt', 'convolution'))
-
-        xRet = plot.vectors[1][0]
-        yRet = plot.vectors[1][1]
-        convoluted = libpeakspot.conv_dx(yRet, convolution)
-        #convoluted=libpeakspot.conv_dx(yRet, [-20, -10, -6, 0, 12, 12, 12])
-        plot.add_set(xRet, convoluted)
-        #plot.vectors[1][1]=[i for i in convoluted]
-        #set contact point plot style to 'plot'
-        #and the color to red
-        plot.styles.append('plot')
-        plot.colors.append('black')
-        #peak_location, peak_size = self.has_peaks(plot, blindwindow, convolution, minpeaks)
-        peak_locations, peak_sizes = self.has_peaks(plot, curve)
-
-        if peak_locations:
-            peak_locations_x = []
-            peak_locations_y = []
-            for location in peak_locations:
-                peak_locations_x.append(xRet[location])
-                peak_locations_y.append(yRet[location])
-            plot.add_set(peak_locations_x, peak_locations_y)
-            plot.styles.append('scatter')
-            plot.colors.append('green')
-            plot.add_set(peak_locations_x, peak_sizes)
-            plot.styles.append('scatter')
-            plot.colors.append('magenta')
-
-        #Return the plot object.
-        return plot
+#!/usr/bin/env python
+
+'''
+SHOW CONVOLUTED CURVE PLUGIN FOR HOOKE
+
+This plugin contains a plotmanipulator to show the convoluted curve.
+(c) Dr. Rolf Schmidt, 2009
+'''
+
+import libpeakspot
+
+class showconvolutedCommands:
+
+    #def _plug_init(self):
+        #pass
+
+    def plotmanip_showconvoluted(self, plot, curve):
+        '''
+        BEGIN: taken from procplots.py
+        might need some tweaking
+        '''
+        #use only for force spectroscopy experiments!
+        if curve.driver.experiment != 'smfs':
+            return plot
+
+        '''
+        END: taken from procplots.py
+        '''
+
+        #need to convert the string that contains the list into a list
+        #convolution = eval(self.config['convfilt']['convolution']['value'])
+        convolution = eval(self.GetStringFromConfig('flatfilts', 'convfilt', 'convolution'))
+
+        xRet = plot.vectors[1][0]
+        yRet = plot.vectors[1][1]
+        convoluted = libpeakspot.conv_dx(yRet, convolution)
+        #convoluted=libpeakspot.conv_dx(yRet, [-20, -10, -6, 0, 12, 12, 12])
+        plot.add_set(xRet, convoluted)
+        #plot.vectors[1][1]=[i for i in convoluted]
+        #set contact point plot style to 'plot'
+        #and the color to red
+        plot.styles.append('plot')
+        plot.colors.append('black')
+        #peak_location, peak_size = self.has_peaks(plot, blindwindow, convolution, minpeaks)
+        peak_locations, peak_sizes = self.has_peaks(plot, curve)
+
+        if peak_locations:
+            peak_locations_x = []
+            peak_locations_y = []
+            for location in peak_locations:
+                peak_locations_x.append(xRet[location])
+                peak_locations_y.append(yRet[location])
+            plot.add_set(peak_locations_x, peak_locations_y)
+            plot.styles.append('scatter')
+            plot.colors.append('green')
+            plot.add_set(peak_locations_x, peak_sizes)
+            plot.styles.append('scatter')
+            plot.colors.append('magenta')
+
+        #Return the plot object.
+        return plot
diff --git a/hooke/ui/gui/hookeplaylist.py b/hooke/ui/gui/hookeplaylist.py
index 34b267f..5d731ae 100644
--- a/hooke/ui/gui/hookeplaylist.py
+++ b/hooke/ui/gui/hookeplaylist.py
@@ -1,106 +1,106 @@
-#import os
-#import os.path
-import wx
-#import xml.dom.minidom
-
-class Playlists(wx.Panel):
-
-    def __init__(self, parent):
-        # Use the WANTS_CHARS style so the panel doesn't eat the Return key.
-        wx.Panel.__init__(self, parent, -1, style=wx.WANTS_CHARS|wx.NO_BORDER, size=(160, 200))
-
-        self.PlaylistsTree = wx.TreeCtrl(self, -1, wx.Point(0, 0), wx.Size(160, 250), wx.TR_DEFAULT_STYLE | wx.NO_BORDER | wx.TR_HIDE_ROOT)
-        imglist = wx.ImageList(16, 16, True, 2)
-        imglist.Add(wx.ArtProvider.GetBitmap(wx.ART_FOLDER, wx.ART_OTHER, wx.Size(16, 16)))
-        imglist.Add(wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_OTHER, wx.Size(16, 16)))
-        self.PlaylistsTree.AssignImageList(imglist)
-        self.PlaylistsTree.AddRoot('Playlists', 0)
-        self.PlaylistsTree.Bind(wx.EVT_RIGHT_DOWN , self.OnContextMenu)
-
-        self.Playlists = {}
-
-        sizer = wx.BoxSizer(wx.VERTICAL)
-        sizer.Add(self.PlaylistsTree, 1, wx.EXPAND)
-        self.SetSizer(sizer)
-        sizer.Fit(self)
-
-    #def add_playlist(self, files=[], name='Untitled'):
-        ##TODO: change cursor or progressbar (maybe in statusbar)
-        ##self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
-        #if files:
-            #playlist = hookeplaylist.Playlist(self.drivers)
-            #for item in files:
-                #playlist.add_curve(item)
-        #if playlist.count > 0:
-            #playlist_name = name
-            #count = 1
-            #while playlist_name in self.Playlists:
-                #playlist_name = ''.join([name, str(count)])
-                #count += 1
-            #playlist.name = playlist_name
-            #playlist.reset()
-            #self.AddToPlaylists(playlist)
-
-    #def FilterPlaylist(self, curves_to_keep=[]):
-        #playlist_active = self.GetActivePlaylist()
-        #playlist_new = Playlist(self.drivers)
-        #for curve_index in curves_to_keep:
-            #playlist_new.curves.append(playlist_active.curves[curve_index])
-        #return playlist_new
-
-    def GetActivePlaylist(self):
-        playlist_name = self.GetActivePlaylistName()
-        if playlist_name in self.playlists:
-            return self.playlists[playlist_name][0]
-        else:
-            return None
-
-    def GetActivePlaylistName(self):
-        #get the selected item from the tree
-        selected_item = self.PlaylistsTree.GetSelection()
-        #test if a playlist or a curve was double-clicked
-        if self.PlaylistsTree.ItemHasChildren(selected_item):
-            playlist_item = selected_item
-        else:
-            #get the name of the playlist
-            playlist_item = self.PlaylistsTree.GetItemParent(selected_item)
-        #now we have a playlist
-        return self.PlaylistsTree.GetItemText(playlist_item)
-
-    def OnContextMenu(self, event):
-        hit_item, hit_flags = self.PlaylistsTree.HitTest(event.GetPosition())
-        if (hit_flags & wx.TREE_HITTEST_ONITEM) != 0:
-            self.PlaylistsTree.SelectItem(hit_item)
-            # only do this part the first time so the events are only bound once
-            #
-            # Yet another alternate way to do IDs. Some prefer them up top to
-            # avoid clutter, some prefer them close to the object of interest
-            # for clarity.
-            if not hasattr(self, 'ID_popupAdd'):
-                self.ID_popupAdd = wx.NewId()
-                self.ID_popupClose = wx.NewId()
-                self.Bind(wx.EVT_MENU, self.OnPopupAdd, id=self.ID_popupAdd)
-                self.Bind(wx.EVT_MENU, self.OnPopupClose, id=self.ID_popupClose)
-            # make a menu
-            menu = wx.Menu()
-            items = [['Add', self.ID_popupAdd] , ['Close', self.ID_popupClose]]
-            for item in items:
-                menu.Append(item[1], item[0])
-            # Popup the menu.  If an item is selected then its handler
-            # will be called before PopupMenu returns.
-            self.PopupMenu(menu)
-            menu.Destroy()
-
-    def OnPopupAdd(self, event):
-        pass
-
-    def OnPopupClose(self, event):
-        item = self.PlaylistsTree.GetSelection()
-        if self.PlaylistsTree.ItemHasChildren(item):
-            playlist_name = self.PlaylistsTree.GetItemText(item)
-            self.Parent.DeletePlotPage(playlist_name)
-            #del self.Playlists[playlist_name]
-            #TODO: delete playlist, close notebook tab
-            #self.Parent.AddToPlaylists()
-        else:
-            pass
+#import os
+#import os.path
+import wx
+#import xml.dom.minidom
+
+class Playlists(wx.Panel):
+
+    def __init__(self, parent):
+        # Use the WANTS_CHARS style so the panel doesn't eat the Return key.
+        wx.Panel.__init__(self, parent, -1, style=wx.WANTS_CHARS|wx.NO_BORDER, size=(160, 200))
+
+        self.PlaylistsTree = wx.TreeCtrl(self, -1, wx.Point(0, 0), wx.Size(160, 250), wx.TR_DEFAULT_STYLE | wx.NO_BORDER | wx.TR_HIDE_ROOT)
+        imglist = wx.ImageList(16, 16, True, 2)
+        imglist.Add(wx.ArtProvider.GetBitmap(wx.ART_FOLDER, wx.ART_OTHER, wx.Size(16, 16)))
+        imglist.Add(wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_OTHER, wx.Size(16, 16)))
+        self.PlaylistsTree.AssignImageList(imglist)
+        self.PlaylistsTree.AddRoot('Playlists', 0)
+        self.PlaylistsTree.Bind(wx.EVT_RIGHT_DOWN , self.OnContextMenu)
+
+        self.Playlists = {}
+
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(self.PlaylistsTree, 1, wx.EXPAND)
+        self.SetSizer(sizer)
+        sizer.Fit(self)
+
+    #def add_playlist(self, files=[], name='Untitled'):
+        ##TODO: change cursor or progressbar (maybe in statusbar)
+        ##self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
+        #if files:
+            #playlist = hookeplaylist.Playlist(self.drivers)
+            #for item in files:
+                #playlist.add_curve(item)
+        #if playlist.count > 0:
+            #playlist_name = name
+            #count = 1
+            #while playlist_name in self.Playlists:
+                #playlist_name = ''.join([name, str(count)])
+                #count += 1
+            #playlist.name = playlist_name
+            #playlist.reset()
+            #self.AddToPlaylists(playlist)
+
+    #def FilterPlaylist(self, curves_to_keep=[]):
+        #playlist_active = self.GetActivePlaylist()
+        #playlist_new = Playlist(self.drivers)
+        #for curve_index in curves_to_keep:
+            #playlist_new.curves.append(playlist_active.curves[curve_index])
+        #return playlist_new
+
+    def GetActivePlaylist(self):
+        playlist_name = self.GetActivePlaylistName()
+        if playlist_name in self.playlists:
+            return self.playlists[playlist_name][0]
+        else:
+            return None
+
+    def GetActivePlaylistName(self):
+        #get the selected item from the tree
+        selected_item = self.PlaylistsTree.GetSelection()
+        #test if a playlist or a curve was double-clicked
+        if self.PlaylistsTree.ItemHasChildren(selected_item):
+            playlist_item = selected_item
+        else:
+            #get the name of the playlist
+            playlist_item = self.PlaylistsTree.GetItemParent(selected_item)
+        #now we have a playlist
+        return self.PlaylistsTree.GetItemText(playlist_item)
+
+    def OnContextMenu(self, event):
+        hit_item, hit_flags = self.PlaylistsTree.HitTest(event.GetPosition())
+        if (hit_flags & wx.TREE_HITTEST_ONITEM) != 0:
+            self.PlaylistsTree.SelectItem(hit_item)
+            # only do this part the first time so the events are only bound once
+            #
+            # Yet another alternate way to do IDs. Some prefer them up top to
+            # avoid clutter, some prefer them close to the object of interest
+            # for clarity.
+            if not hasattr(self, 'ID_popupAdd'):
+                self.ID_popupAdd = wx.NewId()
+                self.ID_popupClose = wx.NewId()
+                self.Bind(wx.EVT_MENU, self.OnPopupAdd, id=self.ID_popupAdd)
+                self.Bind(wx.EVT_MENU, self.OnPopupClose, id=self.ID_popupClose)
+            # make a menu
+            menu = wx.Menu()
+            items = [['Add', self.ID_popupAdd] , ['Close', self.ID_popupClose]]
+            for item in items:
+                menu.Append(item[1], item[0])
+            # Popup the menu.  If an item is selected then its handler
+            # will be called before PopupMenu returns.
+            self.PopupMenu(menu)
+            menu.Destroy()
+
+    def OnPopupAdd(self, event):
+        pass
+
+    def OnPopupClose(self, event):
+        item = self.PlaylistsTree.GetSelection()
+        if self.PlaylistsTree.ItemHasChildren(item):
+            playlist_name = self.PlaylistsTree.GetItemText(item)
+            self.Parent.DeletePlotPage(playlist_name)
+            #del self.Playlists[playlist_name]
+            #TODO: delete playlist, close notebook tab
+            #self.Parent.AddToPlaylists()
+        else:
+            pass
diff --git a/hooke/ui/gui/hookepropertyeditor.py b/hooke/ui/gui/hookepropertyeditor.py
index 2854e36..402b6f3 100644
--- a/hooke/ui/gui/hookepropertyeditor.py
+++ b/hooke/ui/gui/hookepropertyeditor.py
@@ -1,519 +1,519 @@
-import sys
-import time
-import math
-import os.path
-import pdb
-
-import wx
-import wx.propgrid as wxpg
-import wx.stc
-
-
-class Display:
-    property_descriptor = []
-    def __init__(self):
-        pass
-
-
-class ValueObject:
-    def __init__(self):
-        pass
-
-
-class IntProperty2(wxpg.PyProperty):
-    """\
-    This is a simple re-implementation of wxIntProperty.
-    """
-    def __init__(self, label, name = wxpg.LABEL_AS_NAME, value=0):
-        wxpg.PyProperty.__init__(self, label, name)
-        self.SetValue(value)
-
-    def GetClassName(self):
-        """\
-        This is not 100% necessary and in future is probably going to be
-        automated to return class name.
-        """
-        return "IntProperty2"
-
-    def GetEditor(self):
-        return "TextCtrl"
-
-    def GetValueAsString(self, flags):
-        return str(self.GetValue())
-
-    def PyStringToValue(self, s, flags):
-        try:
-            v = int(s)
-            if self.GetValue() != v:
-                return v
-        except TypeError:
-            if flags & wxpg.PG_REPORT_ERROR:
-                wx.MessageBox("Cannot convert '%s' into a number."%s, "Error")
-        return False
-
-    def PyIntToValue(self, v, flags):
-        if (self.GetValue() != v):
-            return v
-
-
-class PyFilesProperty(wxpg.PyArrayStringProperty):
-    def __init__(self, label, name = wxpg.LABEL_AS_NAME, value=[]):
-        wxpg.PyArrayStringProperty.__init__(self, label, name, value)
-        self.SetValue(value)
-
-    def OnSetValue(self, v):
-        self.value = v
-        self.display = ', '.join(self.value)
-
-    def GetValueAsString(self, argFlags):
-        return self.display
-
-    def PyStringToValue(self, s, flags):
-        return [a.strip() for a in text.split(',')]
-
-    def OnEvent(self, propgrid, ctrl, event):
-        if event.GetEventType() == wx.wxEVT_COMMAND_BUTTON_CLICKED:
-            # Show dialog to select a string, call DoSetValue and
-            # return True, if value changed.
-            return True
-
-        return False
-
-
-class PyObjectPropertyValue:
-    """\
-    Value type of our sample PyObjectProperty. We keep a simple dash-delimited
-    list of string given as argument to constructor.
-    """
-    def __init__(self, s=None):
-        try:
-            self.ls = [a.strip() for a in s.split('-')]
-        except:
-            self.ls = []
-
-    def __repr__(self):
-        return ' - '.join(self.ls)
-
-
-
-class PyObjectProperty(wxpg.PyProperty):
-    """\
-    Another simple example. This time our value is a PyObject (NOTE: we can't
-    return an arbitrary python object in DoGetValue. It cannot be a simple
-    type such as int, bool, double, or string, nor an array or wxObject based.
-    Dictionary, None, or any user-specified Python object is allowed).
-    """
-    def __init__(self, label, name = wxpg.LABEL_AS_NAME, value=None):
-        wxpg.PyProperty.__init__(self, label, name)
-        self.SetValue(value)
-
-    def GetClassName(self):
-        return self.__class__.__name__
-
-    def GetEditor(self):
-        return "TextCtrl"
-
-    def GetValueAsString(self, flags):
-        return repr(self.GetValue())
-
-    def PyStringToValue(self, s, flags):
-        return PyObjectPropertyValue(s)
-
-
-class ShapeProperty(wxpg.PyEnumProperty):
-    """\
-    Demonstrates use of OnCustomPaint method.
-    """
-    def __init__(self, label, name = wxpg.LABEL_AS_NAME, value=-1):
-        wxpg.PyEnumProperty.__init__(self, label, name, ['Line','Circle','Rectangle'], [0,1,2], value)
-
-    def OnMeasureImage(self, index):
-        return wxpg.DEFAULT_IMAGE_SIZE
-
-    def OnCustomPaint(self, dc, rect, paint_data):
-        """\
-        paint_data.m_choiceItem is -1 if we are painting the control,
-        in which case we need to get the drawn item using DoGetValue.
-        """
-        item = paint_data.m_choiceItem
-        if item == -1:
-            item = self.DoGetValue()
-
-        dc.SetPen(wx.Pen(wx.BLACK))
-        dc.SetBrush(wx.Brush(wx.BLACK))
-
-        if item == 0:
-            dc.DrawLine(rect.x,rect.y,rect.x+rect.width,rect.y+rect.height)
-        elif item == 1:
-            half_width = rect.width / 2
-            dc.DrawCircle(rect.x+half_width,rect.y+half_width,half_width-3)
-        elif item == 2:
-            dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height)
-
-
-class LargeImagePickerCtrl(wx.Window):
-    """\
-    Control created and used by LargeImageEditor.
-    """
-    def __init__(self):
-        pre = wx.PreWindow()
-        self.PostCreate(pre)
-
-    def Create(self, parent, id_, pos, size, style = 0):
-        wx.Window.Create(self, parent, id_, pos, size, style | wx.BORDER_SIMPLE)
-        img_spc = size[1]
-        self.tc = wx.TextCtrl(self, -1, "", (img_spc,0), (2048,size[1]), wx.BORDER_NONE)
-        self.SetBackgroundColour(wx.WHITE)
-        self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
-        self.property = None
-        self.bmp = None
-        self.Bind(wx.EVT_PAINT, self.OnPaint)
-
-    def OnPaint(self, event):
-        dc = wx.BufferedPaintDC(self)
-
-        whiteBrush = wx.Brush(wx.WHITE)
-        dc.SetBackground(whiteBrush)
-        dc.Clear()
-
-        bmp = self.bmp
-        if bmp:
-            dc.DrawBitmap(bmp, 2, 2)
-        else:
-            dc.SetPen(wx.Pen(wx.BLACK))
-            dc.SetBrush(whiteBrush)
-            dc.DrawRectangle(2, 2, 64, 64)
-
-    def RefreshThumbnail(self):
-        """\
-        We use here very simple image scaling code.
-        """
-        if not self.property:
-            self.bmp = None
-            return
-
-        path = self.property.DoGetValue()
-
-        if not os.path.isfile(path):
-            self.bmp = None
-            return
-
-        image = wx.Image(path)
-        image.Rescale(64, 64)
-        self.bmp = wx.BitmapFromImage(image)
-
-    def SetProperty(self, property):
-        self.property = property
-        self.tc.SetValue(property.GetDisplayedString())
-        self.RefreshThumbnail()
-
-    def SetValue(self, s):
-        self.RefreshThumbnail()
-        self.tc.SetValue(s)
-
-    def GetLastPosition(self):
-        return self.tc.GetLastPosition()
-
-
-class LargeImageEditor(wxpg.PyEditor):
-    """\
-    Double-height text-editor with image in front.
-    """
-    def __init__(self):
-        wxpg.PyEditor.__init__(self)
-
-    def CreateControls(self, propgrid, property, pos, sz):
-        try:
-            h = 64 + 6
-            x = propgrid.GetSplitterPosition()
-            x2 = propgrid.GetClientSize().x
-            bw = propgrid.GetRowHeight()
-            lipc = LargeImagePickerCtrl()
-            if sys.platform == 'win32':
-                lipc.Hide()
-            lipc.Create(propgrid, wxpg.PG_SUBID1, (x,pos[1]), (x2-x-bw,h))
-            lipc.SetProperty(property)
-            # Hmmm.. how to have two-stage creation without subclassing?
-            #btn = wx.PreButton()
-            #pre = wx.PreWindow()
-            #self.PostCreate(pre)
-            #if sys.platform == 'win32':
-            #    btn.Hide()
-            #btn.Create(propgrid, wxpg.PG_SUBID2, '...', (x2-bw,pos[1]), (bw,h), wx.WANTS_CHARS)
-            btn = wx.Button(propgrid, wxpg.PG_SUBID2, '...', (x2-bw,pos[1]), (bw,h), wx.WANTS_CHARS)
-            return (lipc, btn)
-        except:
-            import traceback
-            print traceback.print_exc()
-
-    def UpdateControl(self, property, ctrl):
-        ctrl.SetValue(property.GetDisplayedString())
-
-    def DrawValue(self, dc, property, rect):
-        if not (property.GetFlags() & wxpg.PG_PROP_UNSPECIFIED):
-            dc.DrawText( property.GetDisplayedString(), rect.x+5, rect.y );
-
-    def OnEvent(self, propgrid, ctrl, event):
-        if not ctrl:
-            return False
-
-        evtType = event.GetEventType()
-
-        if evtType == wx.wxEVT_COMMAND_TEXT_ENTER:
-            if propgrid.IsEditorsValueModified():
-                return True
-
-        elif evtType == wx.wxEVT_COMMAND_TEXT_UPDATED:
-            if not property.HasFlag(wxpg.PG_PROP_UNSPECIFIED) or not ctrl or \
-               ctrl.GetLastPosition() > 0:
-
-                # We must check this since an 'empty' text event
-                # may be triggered when creating the property.
-                PG_FL_IN_SELECT_PROPERTY = 0x00100000
-                if not (propgrid.GetInternalFlags() & PG_FL_IN_SELECT_PROPERTY):
-                    event.Skip();
-                    event.SetId(propGrid.GetId());
-
-                propgrid.EditorsValueWasModified();
-
-        return False
-
-
-    def CopyValueFromControl(self, property, ctrl):
-        tc = ctrl.tc
-        res = property.SetValueFromString(tc.GetValue(),0)
-        # Changing unspecified always causes event (returning
-        # true here should be enough to trigger it).
-        if not res and property.IsFlagSet(wxpg.PG_PROP_UNSPECIFIED):
-            res = true
-
-        return res
-
-    def SetValueToUnspecified(self, ctrl):
-        ctrl.tc.Remove(0,len(ctrl.tc.GetValue()));
-
-    def SetControlStringValue(self, ctrl, txt):
-        ctrl.SetValue(txt)
-
-    def OnFocus(self, property, ctrl):
-        ctrl.tc.SetSelection(-1,-1)
-        ctrl.tc.SetFocus()
-
-
-class PropertyEditor(wx.Panel):
-
-    def __init__(self, parent):
-        # Use the WANTS_CHARS style so the panel doesn't eat the Return key.
-        wx.Panel.__init__(self, parent, -1, style=wx.WANTS_CHARS, size=(160, 200))
-
-        sizer = wx.BoxSizer(wx.VERTICAL)
-
-        self.pg = wxpg.PropertyGrid(self, style=wxpg.PG_SPLITTER_AUTO_CENTER|wxpg.PG_AUTO_SORT)
-
-        # Show help as tooltips
-        self.pg.SetExtraStyle(wxpg.PG_EX_HELP_AS_TOOLTIPS)
-
-        #pg.Bind(wxpg.EVT_PG_CHANGED, self.OnPropGridChange)
-        #pg.Bind(wxpg.EVT_PG_SELECTED, self.OnPropGridSelect)
-        #self.pg.Bind(wxpg.EVT_PG_RIGHT_CLICK, self.OnPropGridRightClick)
-
-        # Needed by custom image editor
-        wx.InitAllImageHandlers()
-
-        #
-        # Let's create a simple custom editor
-        #
-        # NOTE: Editor must be registered *before* adding a property that uses it.
-        self.pg.RegisterEditor(LargeImageEditor)
-
-        '''
-        #
-        # Add properties
-        #
-
-        pg.Append( wxpg.PropertyCategory("1 - Basic Properties") )
-        pg.Append( wxpg.StringProperty("String",value="Some Text") )
-        pg.Append( wxpg.IntProperty("Int",value=100) )
-        pg.Append( wxpg.FloatProperty("Float",value=100.0) )
-        pg.Append( wxpg.BoolProperty("Bool",value=True) )
-        pg.Append( wxpg.BoolProperty("Bool_with_Checkbox",value=True) )
-        pg.SetPropertyAttribute("Bool_with_Checkbox", "UseCheckbox", True)
-
-        pg.Append( wxpg.PropertyCategory("2 - More Properties") )
-        pg.Append( wxpg.LongStringProperty("LongString",value="This is a\\nmulti-line string\\nwith\\ttabs\\nmixed\\tin.") )
-        pg.Append( wxpg.DirProperty("Dir",value="C:\\Windows") )
-        pg.Append( wxpg.FileProperty("File",value="C:\\Windows\\system.ini") )
-        pg.Append( wxpg.ArrayStringProperty("ArrayString",value=['A','B','C']) )
-
-        pg.Append( wxpg.EnumProperty("Enum","Enum",
-                                     ['wxPython Rules','wxPython Rocks','wxPython Is The Best'],
-                                     [10,11,12],0) )
-        pg.Append( wxpg.EditEnumProperty("EditEnum","EditEnumProperty",['A','B','C'],[0,1,2],"Text Not in List") )
-
-        pg.Append( wxpg.PropertyCategory("3 - Advanced Properties") )
-        pg.Append( wxpg.DateProperty("Date",value=wx.DateTime_Now()) )
-        pg.Append( wxpg.FontProperty("Font",value=self.GetFont()) )
-        pg.Append( wxpg.ColourProperty("Colour",value=self.GetBackgroundColour()) )
-        pg.Append( wxpg.SystemColourProperty("SystemColour") )
-        pg.Append( wxpg.ImageFileProperty("ImageFile") )
-        pg.Append( wxpg.MultiChoiceProperty("MultiChoice",choices=['wxWidgets','QT','GTK+']) )
-
-        pg.Append( wxpg.PropertyCategory("4 - Additional Properties") )
-        pg.Append( wxpg.PointProperty("Point",value=self.GetPosition()) )
-        pg.Append( wxpg.SizeProperty("Size",value=self.GetSize()) )
-        pg.Append( wxpg.FontDataProperty("FontData") )
-        pg.Append( wxpg.IntProperty("IntWithSpin",value=256) )
-        pg.SetPropertyEditor("IntWithSpin","SpinCtrl")
-        pg.Append( wxpg.DirsProperty("Dirs",value=['C:/Lib','C:/Bin']) )
-        pg.SetPropertyHelpString( "String", "String Property help string!" )
-        pg.SetPropertyHelpString( "Dirs", "Dirs Property help string!" )
-
-        pg.SetPropertyAttribute( "File", wxpg.PG_FILE_SHOW_FULL_PATH, 0 )
-        pg.SetPropertyAttribute( "File", wxpg.PG_FILE_INITIAL_PATH, "C:\\Program Files\\Internet Explorer" )
-        pg.SetPropertyAttribute( "Date", wxpg.PG_DATE_PICKER_STYLE, wx.DP_DROPDOWN|wx.DP_SHOWCENTURY )
-
-        pg.Append( wxpg.PropertyCategory("5 - Custom Properties") )
-        pg.Append( IntProperty2("IntProperty2", value=1024) )
-
-        pg.Append( ShapeProperty("ShapeProperty", value=0) )
-        pg.Append( PyObjectProperty("PyObjectProperty") )
-
-        pg.Append( wxpg.ImageFileProperty("ImageFileWithLargeEditor") )
-        pg.SetPropertyEditor("ImageFileWithLargeEditor", "LargeImageEditor")
-
-
-        pg.SetPropertyClientData( "Point", 1234 )
-        if pg.GetPropertyClientData( "Point" ) != 1234:
-            raise ValueError("Set/GetPropertyClientData() failed")
-
-        # Test setting unicode string
-        pg.GetPropertyByName("String").SetValue(u"Some Unicode Text")
-
-        #
-        # Test some code that *should* fail (but not crash)
-        #try:
-            #a_ = pg.GetPropertyValue( "NotARealProperty" )
-            #pg.EnableProperty( "NotAtAllRealProperty", False )
-            #pg.SetPropertyHelpString( "AgaintNotARealProperty", "Dummy Help String" )
-        #except:
-            #pass
-            #raise
-
-        '''
-        sizer.Add(self.pg, 1, wx.EXPAND)
-        self.SetSizer(sizer)
-        sizer.SetSizeHints(self)
-
-        self.SelectedTreeItem = None
-
-    def GetPropertyValues(self):
-        #return self.pg.GetPropertyValues(as_strings=True)
-        return self.pg.GetPropertyValues()
-
-
-    def Initialize(self, properties):
-        pg = self.pg
-        pg.Clear()
-
-        if properties:
-            for element in properties:
-                if element[1]['type'] == 'integer':
-                    if 'value' in element[1]:
-                        property_value = element[1].as_int('value')
-                    else:
-                        property_value = element[1].as_int('default')
-                    property_control = wxpg.IntProperty(element[0], value=property_value)
-                    if 'maximum' in element[1]:
-                        property_control.SetAttribute('Max', element[1].as_int('maximum'))
-                    if 'minimum' in element[1]:
-                        property_control.SetAttribute('Min', element[1].as_int('minimum'))
-                    property_control.SetAttribute('Wrap', True)
-                    pg.Append(property_control)
-                    pg.SetPropertyEditor(element[0], 'SpinCtrl')
-
-                if element[1]['type'] == 'float':
-                    if 'value' in element[1]:
-                        property_value = element[1].as_float('value')
-                    else:
-                        property_value = element[1].as_float('default')
-                    property_control = wxpg.FloatProperty(element[0], value=property_value)
-                    if 'maximum' in element[1]:
-                        property_control.SetAttribute('Max', element[1].as_float('maximum'))
-                    if 'minimum' in element[1]:
-                        property_control.SetAttribute('Min', element[1].as_float('minimum'))
-                    property_control.SetAttribute('Wrap', True)
-                    pg.Append(property_control)
-                    pg.SetPropertyEditor(element[0], 'SpinCtrl')
-
-                if element[1]['type'] == 'boolean':
-                    if 'value' in element[1]:
-                        property_value = element[1].as_bool('value')
-                    else:
-                        property_value = element[1].as_bool('default')
-                    property_control = wxpg.BoolProperty(element[0], value=property_value)
-                    pg.Append(property_control)
-                    pg.SetPropertyAttribute(element[0], 'UseCheckbox', True)
-                if element[1]['type'] == 'string':
-                    if 'value' in element[1]:
-                        property_value = element[1]['value']
-                    else:
-                        property_value = element[1]['default']
-                    pg.Append(wxpg.StringProperty(element[0], value=property_value))
-                if element[1]['type'] == 'folder':
-                    if 'value' in element[1]:
-                        property_value = element[1]['value']
-                    else:
-                        property_value = element[1]['default']
-                    pg.Append(wxpg.DirProperty(element[0], value=property_value))
-                if element[1]['type'] == 'filename':
-                    if 'value' in element[1]:
-                        property_value = element[1]['value']
-                    else:
-                        property_value = element[1]['default']
-                    pg.Append(wxpg.FileProperty(element[0], value=property_value))
-                #if element[0] == 'category':
-                    #pg.Append(wxpg.PropertyCategory(element[1]))
-                #if element[0] == 'folder':
-                    #pg.Append(wxpg.DirProperty(element[1], value=element[2]))
-                #if element[0] == 'string':
-                    #pg.Append(wxpg.StringProperty(element[1], value=element[2]))
-
-        pg.Refresh()
-
-    def OnReserved(self, event):
-        pass
-
-
-#---------------------------------------------------------------------------
-
-
-class MemoDialog(wx.Dialog):
-    """\
-    Dialog for multi-line text editing.
-    """
-    def __init__(self, parent=None, title='', text='', pos=None, size=(500,500)):
-        wx.Dialog.__init__(self, parent, -1, title, style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
-
-        sizer = wx.BoxSizer(wx.VERTICAL)
-
-        tc = wx.TextCtrl(self, 11, text, style=wx.TE_MULTILINE)
-        self.tc = tc
-        topsizer.Add(tc,1,wx.EXPAND|wx.ALL,8)
-
-        rowsizer = wx.BoxSizer( wx.HORIZONTAL )
-        rowsizer.Add(wx.Button(self,wx.ID_OK,'Ok'),0,wx.ALIGN_RIGHT|wx.ALIGN_CENTRE_VERTICAL,8)
-        rowsizer.Add((0,0),1,wx.ALIGN_RIGHT|wx.ALIGN_CENTRE_VERTICAL,8)
-        rowsizer.Add(wx.Button(self,wx.ID_CANCEL,'Cancel'),0,wx.ALIGN_RIGHT|wx.ALIGN_CENTRE_VERTICAL,8)
-        topsizer.Add(rowsizer,0,wx.EXPAND|wx.ALL,8)
-
-        self.SetSizer( topsizer )
-        topsizer.Layout()
-
-        self.SetSize( size )
-        if not pos:
-            self.CenterOnScreen()
-        else:
-            self.Move(pos)
-
-
-#---------------------------------------------------------------------------
+import sys
+import time
+import math
+import os.path
+import pdb
+
+import wx
+import wx.propgrid as wxpg
+import wx.stc
+
+
+class Display:
+    property_descriptor = []
+    def __init__(self):
+        pass
+
+
+class ValueObject:
+    def __init__(self):
+        pass
+
+
+class IntProperty2(wxpg.PyProperty):
+    """\
+    This is a simple re-implementation of wxIntProperty.
+    """
+    def __init__(self, label, name = wxpg.LABEL_AS_NAME, value=0):
+        wxpg.PyProperty.__init__(self, label, name)
+        self.SetValue(value)
+
+    def GetClassName(self):
+        """\
+        This is not 100% necessary and in future is probably going to be
+        automated to return class name.
+        """
+        return "IntProperty2"
+
+    def GetEditor(self):
+        return "TextCtrl"
+
+    def GetValueAsString(self, flags):
+        return str(self.GetValue())
+
+    def PyStringToValue(self, s, flags):
+        try:
+            v = int(s)
+            if self.GetValue() != v:
+                return v
+        except TypeError:
+            if flags & wxpg.PG_REPORT_ERROR:
+                wx.MessageBox("Cannot convert '%s' into a number."%s, "Error")
+        return False
+
+    def PyIntToValue(self, v, flags):
+        if (self.GetValue() != v):
+            return v
+
+
+class PyFilesProperty(wxpg.PyArrayStringProperty):
+    def __init__(self, label, name = wxpg.LABEL_AS_NAME, value=[]):
+        wxpg.PyArrayStringProperty.__init__(self, label, name, value)
+        self.SetValue(value)
+
+    def OnSetValue(self, v):
+        self.value = v
+        self.display = ', '.join(self.value)
+
+    def GetValueAsString(self, argFlags):
+        return self.display
+
+    def PyStringToValue(self, s, flags):
+        return [a.strip() for a in text.split(',')]
+
+    def OnEvent(self, propgrid, ctrl, event):
+        if event.GetEventType() == wx.wxEVT_COMMAND_BUTTON_CLICKED:
+            # Show dialog to select a string, call DoSetValue and
+            # return True, if value changed.
+            return True
+
+        return False
+
+
+class PyObjectPropertyValue:
+    """\
+    Value type of our sample PyObjectProperty. We keep a simple dash-delimited
+    list of string given as argument to constructor.
+    """
+    def __init__(self, s=None):
+        try:
+            self.ls = [a.strip() for a in s.split('-')]
+        except:
+            self.ls = []
+
+    def __repr__(self):
+        return ' - '.join(self.ls)
+
+
+
+class PyObjectProperty(wxpg.PyProperty):
+    """\
+    Another simple example. This time our value is a PyObject (NOTE: we can't
+    return an arbitrary python object in DoGetValue. It cannot be a simple
+    type such as int, bool, double, or string, nor an array or wxObject based.
+    Dictionary, None, or any user-specified Python object is allowed).
+    """
+    def __init__(self, label, name = wxpg.LABEL_AS_NAME, value=None):
+        wxpg.PyProperty.__init__(self, label, name)
+        self.SetValue(value)
+
+    def GetClassName(self):
+        return self.__class__.__name__
+
+    def GetEditor(self):
+        return "TextCtrl"
+
+    def GetValueAsString(self, flags):
+        return repr(self.GetValue())
+
+    def PyStringToValue(self, s, flags):
+        return PyObjectPropertyValue(s)
+
+
+class ShapeProperty(wxpg.PyEnumProperty):
+    """\
+    Demonstrates use of OnCustomPaint method.
+    """
+    def __init__(self, label, name = wxpg.LABEL_AS_NAME, value=-1):
+        wxpg.PyEnumProperty.__init__(self, label, name, ['Line','Circle','Rectangle'], [0,1,2], value)
+
+    def OnMeasureImage(self, index):
+        return wxpg.DEFAULT_IMAGE_SIZE
+
+    def OnCustomPaint(self, dc, rect, paint_data):
+        """\
+        paint_data.m_choiceItem is -1 if we are painting the control,
+        in which case we need to get the drawn item using DoGetValue.
+        """
+        item = paint_data.m_choiceItem
+        if item == -1:
+            item = self.DoGetValue()
+
+        dc.SetPen(wx.Pen(wx.BLACK))
+        dc.SetBrush(wx.Brush(wx.BLACK))
+
+        if item == 0:
+            dc.DrawLine(rect.x,rect.y,rect.x+rect.width,rect.y+rect.height)
+        elif item == 1:
+            half_width = rect.width / 2
+            dc.DrawCircle(rect.x+half_width,rect.y+half_width,half_width-3)
+        elif item == 2:
+            dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height)
+
+
+class LargeImagePickerCtrl(wx.Window):
+    """\
+    Control created and used by LargeImageEditor.
+    """
+    def __init__(self):
+        pre = wx.PreWindow()
+        self.PostCreate(pre)
+
+    def Create(self, parent, id_, pos, size, style = 0):
+        wx.Window.Create(self, parent, id_, pos, size, style | wx.BORDER_SIMPLE)
+        img_spc = size[1]
+        self.tc = wx.TextCtrl(self, -1, "", (img_spc,0), (2048,size[1]), wx.BORDER_NONE)
+        self.SetBackgroundColour(wx.WHITE)
+        self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
+        self.property = None
+        self.bmp = None
+        self.Bind(wx.EVT_PAINT, self.OnPaint)
+
+    def OnPaint(self, event):
+        dc = wx.BufferedPaintDC(self)
+
+        whiteBrush = wx.Brush(wx.WHITE)
+        dc.SetBackground(whiteBrush)
+        dc.Clear()
+
+        bmp = self.bmp
+        if bmp:
+            dc.DrawBitmap(bmp, 2, 2)
+        else:
+            dc.SetPen(wx.Pen(wx.BLACK))
+            dc.SetBrush(whiteBrush)
+            dc.DrawRectangle(2, 2, 64, 64)
+
+    def RefreshThumbnail(self):
+        """\
+        We use here very simple image scaling code.
+        """
+        if not self.property:
+            self.bmp = None
+            return
+
+        path = self.property.DoGetValue()
+
+        if not os.path.isfile(path):
+            self.bmp = None
+            return
+
+        image = wx.Image(path)
+        image.Rescale(64, 64)
+        self.bmp = wx.BitmapFromImage(image)
+
+    def SetProperty(self, property):
+        self.property = property
+        self.tc.SetValue(property.GetDisplayedString())
+        self.RefreshThumbnail()
+
+    def SetValue(self, s):
+        self.RefreshThumbnail()
+        self.tc.SetValue(s)
+
+    def GetLastPosition(self):
+        return self.tc.GetLastPosition()
+
+
+class LargeImageEditor(wxpg.PyEditor):
+    """\
+    Double-height text-editor with image in front.
+    """
+    def __init__(self):
+        wxpg.PyEditor.__init__(self)
+
+    def CreateControls(self, propgrid, property, pos, sz):
+        try:
+            h = 64 + 6
+            x = propgrid.GetSplitterPosition()
+            x2 = propgrid.GetClientSize().x
+            bw = propgrid.GetRowHeight()
+            lipc = LargeImagePickerCtrl()
+            if sys.platform == 'win32':
+                lipc.Hide()
+            lipc.Create(propgrid, wxpg.PG_SUBID1, (x,pos[1]), (x2-x-bw,h))
+            lipc.SetProperty(property)
+            # Hmmm.. how to have two-stage creation without subclassing?
+            #btn = wx.PreButton()
+            #pre = wx.PreWindow()
+            #self.PostCreate(pre)
+            #if sys.platform == 'win32':
+            #    btn.Hide()
+            #btn.Create(propgrid, wxpg.PG_SUBID2, '...', (x2-bw,pos[1]), (bw,h), wx.WANTS_CHARS)
+            btn = wx.Button(propgrid, wxpg.PG_SUBID2, '...', (x2-bw,pos[1]), (bw,h), wx.WANTS_CHARS)
+            return (lipc, btn)
+        except:
+            import traceback
+            print traceback.print_exc()
+
+    def UpdateControl(self, property, ctrl):
+        ctrl.SetValue(property.GetDisplayedString())
+
+    def DrawValue(self, dc, property, rect):
+        if not (property.GetFlags() & wxpg.PG_PROP_UNSPECIFIED):
+            dc.DrawText( property.GetDisplayedString(), rect.x+5, rect.y );
+
+    def OnEvent(self, propgrid, ctrl, event):
+        if not ctrl:
+            return False
+
+        evtType = event.GetEventType()
+
+        if evtType == wx.wxEVT_COMMAND_TEXT_ENTER:
+            if propgrid.IsEditorsValueModified():
+                return True
+
+        elif evtType == wx.wxEVT_COMMAND_TEXT_UPDATED:
+            if not property.HasFlag(wxpg.PG_PROP_UNSPECIFIED) or not ctrl or \
+               ctrl.GetLastPosition() > 0:
+
+                # We must check this since an 'empty' text event
+                # may be triggered when creating the property.
+                PG_FL_IN_SELECT_PROPERTY = 0x00100000
+                if not (propgrid.GetInternalFlags() & PG_FL_IN_SELECT_PROPERTY):
+                    event.Skip();
+                    event.SetId(propGrid.GetId());
+
+                propgrid.EditorsValueWasModified();
+
+        return False
+
+
+    def CopyValueFromControl(self, property, ctrl):
+        tc = ctrl.tc
+        res = property.SetValueFromString(tc.GetValue(),0)
+        # Changing unspecified always causes event (returning
+        # true here should be enough to trigger it).
+        if not res and property.IsFlagSet(wxpg.PG_PROP_UNSPECIFIED):
+            res = true
+
+        return res
+
+    def SetValueToUnspecified(self, ctrl):
+        ctrl.tc.Remove(0,len(ctrl.tc.GetValue()));
+
+    def SetControlStringValue(self, ctrl, txt):
+        ctrl.SetValue(txt)
+
+    def OnFocus(self, property, ctrl):
+        ctrl.tc.SetSelection(-1,-1)
+        ctrl.tc.SetFocus()
+
+
+class PropertyEditor(wx.Panel):
+
+    def __init__(self, parent):
+        # Use the WANTS_CHARS style so the panel doesn't eat the Return key.
+        wx.Panel.__init__(self, parent, -1, style=wx.WANTS_CHARS, size=(160, 200))
+
+        sizer = wx.BoxSizer(wx.VERTICAL)
+
+        self.pg = wxpg.PropertyGrid(self, style=wxpg.PG_SPLITTER_AUTO_CENTER|wxpg.PG_AUTO_SORT)
+
+        # Show help as tooltips
+        self.pg.SetExtraStyle(wxpg.PG_EX_HELP_AS_TOOLTIPS)
+
+        #pg.Bind(wxpg.EVT_PG_CHANGED, self.OnPropGridChange)
+        #pg.Bind(wxpg.EVT_PG_SELECTED, self.OnPropGridSelect)
+        #self.pg.Bind(wxpg.EVT_PG_RIGHT_CLICK, self.OnPropGridRightClick)
+
+        # Needed by custom image editor
+        wx.InitAllImageHandlers()
+
+        #
+        # Let's create a simple custom editor
+        #
+        # NOTE: Editor must be registered *before* adding a property that uses it.
+        self.pg.RegisterEditor(LargeImageEditor)
+
+        '''
+        #
+        # Add properties
+        #
+
+        pg.Append( wxpg.PropertyCategory("1 - Basic Properties") )
+        pg.Append( wxpg.StringProperty("String",value="Some Text") )
+        pg.Append( wxpg.IntProperty("Int",value=100) )
+        pg.Append( wxpg.FloatProperty("Float",value=100.0) )
+        pg.Append( wxpg.BoolProperty("Bool",value=True) )
+        pg.Append( wxpg.BoolProperty("Bool_with_Checkbox",value=True) )
+        pg.SetPropertyAttribute("Bool_with_Checkbox", "UseCheckbox", True)
+
+        pg.Append( wxpg.PropertyCategory("2 - More Properties") )
+        pg.Append( wxpg.LongStringProperty("LongString",value="This is a\\nmulti-line string\\nwith\\ttabs\\nmixed\\tin.") )
+        pg.Append( wxpg.DirProperty("Dir",value="C:\\Windows") )
+        pg.Append( wxpg.FileProperty("File",value="C:\\Windows\\system.ini") )
+        pg.Append( wxpg.ArrayStringProperty("ArrayString",value=['A','B','C']) )
+
+        pg.Append( wxpg.EnumProperty("Enum","Enum",
+                                     ['wxPython Rules','wxPython Rocks','wxPython Is The Best'],
+                                     [10,11,12],0) )
+        pg.Append( wxpg.EditEnumProperty("EditEnum","EditEnumProperty",['A','B','C'],[0,1,2],"Text Not in List") )
+
+        pg.Append( wxpg.PropertyCategory("3 - Advanced Properties") )
+        pg.Append( wxpg.DateProperty("Date",value=wx.DateTime_Now()) )
+        pg.Append( wxpg.FontProperty("Font",value=self.GetFont()) )
+        pg.Append( wxpg.ColourProperty("Colour",value=self.GetBackgroundColour()) )
+        pg.Append( wxpg.SystemColourProperty("SystemColour") )
+        pg.Append( wxpg.ImageFileProperty("ImageFile") )
+        pg.Append( wxpg.MultiChoiceProperty("MultiChoice",choices=['wxWidgets','QT','GTK+']) )
+
+        pg.Append( wxpg.PropertyCategory("4 - Additional Properties") )
+        pg.Append( wxpg.PointProperty("Point",value=self.GetPosition()) )
+        pg.Append( wxpg.SizeProperty("Size",value=self.GetSize()) )
+        pg.Append( wxpg.FontDataProperty("FontData") )
+        pg.Append( wxpg.IntProperty("IntWithSpin",value=256) )
+        pg.SetPropertyEditor("IntWithSpin","SpinCtrl")
+        pg.Append( wxpg.DirsProperty("Dirs",value=['C:/Lib','C:/Bin']) )
+        pg.SetPropertyHelpString( "String", "String Property help string!" )
+        pg.SetPropertyHelpString( "Dirs", "Dirs Property help string!" )
+
+        pg.SetPropertyAttribute( "File", wxpg.PG_FILE_SHOW_FULL_PATH, 0 )
+        pg.SetPropertyAttribute( "File", wxpg.PG_FILE_INITIAL_PATH, "C:\\Program Files\\Internet Explorer" )
+        pg.SetPropertyAttribute( "Date", wxpg.PG_DATE_PICKER_STYLE, wx.DP_DROPDOWN|wx.DP_SHOWCENTURY )
+
+        pg.Append( wxpg.PropertyCategory("5 - Custom Properties") )
+        pg.Append( IntProperty2("IntProperty2", value=1024) )
+
+        pg.Append( ShapeProperty("ShapeProperty", value=0) )
+        pg.Append( PyObjectProperty("PyObjectProperty") )
+
+        pg.Append( wxpg.ImageFileProperty("ImageFileWithLargeEditor") )
+        pg.SetPropertyEditor("ImageFileWithLargeEditor", "LargeImageEditor")
+
+
+        pg.SetPropertyClientData( "Point", 1234 )
+        if pg.GetPropertyClientData( "Point" ) != 1234:
+            raise ValueError("Set/GetPropertyClientData() failed")
+
+        # Test setting unicode string
+        pg.GetPropertyByName("String").SetValue(u"Some Unicode Text")
+
+        #
+        # Test some code that *should* fail (but not crash)
+        #try:
+            #a_ = pg.GetPropertyValue( "NotARealProperty" )
+            #pg.EnableProperty( "NotAtAllRealProperty", False )
+            #pg.SetPropertyHelpString( "AgaintNotARealProperty", "Dummy Help String" )
+        #except:
+            #pass
+            #raise
+
+        '''
+        sizer.Add(self.pg, 1, wx.EXPAND)
+        self.SetSizer(sizer)
+        sizer.SetSizeHints(self)
+
+        self.SelectedTreeItem = None
+
+    def GetPropertyValues(self):
+        #return self.pg.GetPropertyValues(as_strings=True)
+        return self.pg.GetPropertyValues()
+
+
+    def Initialize(self, properties):
+        pg = self.pg
+        pg.Clear()
+
+        if properties:
+            for element in properties:
+                if element[1]['type'] == 'integer':
+                    if 'value' in element[1]:
+                        property_value = element[1].as_int('value')
+                    else:
+                        property_value = element[1].as_int('default')
+                    property_control = wxpg.IntProperty(element[0], value=property_value)
+                    if 'maximum' in element[1]:
+                        property_control.SetAttribute('Max', element[1].as_int('maximum'))
+                    if 'minimum' in element[1]:
+                        property_control.SetAttribute('Min', element[1].as_int('minimum'))
+                    property_control.SetAttribute('Wrap', True)
+                    pg.Append(property_control)
+                    pg.SetPropertyEditor(element[0], 'SpinCtrl')
+
+                if element[1]['type'] == 'float':
+                    if 'value' in element[1]:
+                        property_value = element[1].as_float('value')
+                    else:
+                        property_value = element[1].as_float('default')
+                    property_control = wxpg.FloatProperty(element[0], value=property_value)
+                    if 'maximum' in element[1]:
+                        property_control.SetAttribute('Max', element[1].as_float('maximum'))
+                    if 'minimum' in element[1]:
+                        property_control.SetAttribute('Min', element[1].as_float('minimum'))
+                    property_control.SetAttribute('Wrap', True)
+                    pg.Append(property_control)
+                    pg.SetPropertyEditor(element[0], 'SpinCtrl')
+
+                if element[1]['type'] == 'boolean':
+                    if 'value' in element[1]:
+                        property_value = element[1].as_bool('value')
+                    else:
+                        property_value = element[1].as_bool('default')
+                    property_control = wxpg.BoolProperty(element[0], value=property_value)
+                    pg.Append(property_control)
+                    pg.SetPropertyAttribute(element[0], 'UseCheckbox', True)
+                if element[1]['type'] == 'string':
+                    if 'value' in element[1]:
+                        property_value = element[1]['value']
+                    else:
+                        property_value = element[1]['default']
+                    pg.Append(wxpg.StringProperty(element[0], value=property_value))
+                if element[1]['type'] == 'folder':
+                    if 'value' in element[1]:
+                        property_value = element[1]['value']
+                    else:
+                        property_value = element[1]['default']
+                    pg.Append(wxpg.DirProperty(element[0], value=property_value))
+                if element[1]['type'] == 'filename':
+                    if 'value' in element[1]:
+                        property_value = element[1]['value']
+                    else:
+                        property_value = element[1]['default']
+                    pg.Append(wxpg.FileProperty(element[0], value=property_value))
+                #if element[0] == 'category':
+                    #pg.Append(wxpg.PropertyCategory(element[1]))
+                #if element[0] == 'folder':
+                    #pg.Append(wxpg.DirProperty(element[1], value=element[2]))
+                #if element[0] == 'string':
+                    #pg.Append(wxpg.StringProperty(element[1], value=element[2]))
+
+        pg.Refresh()
+
+    def OnReserved(self, event):
+        pass
+
+
+#---------------------------------------------------------------------------
+
+
+class MemoDialog(wx.Dialog):
+    """\
+    Dialog for multi-line text editing.
+    """
+    def __init__(self, parent=None, title='', text='', pos=None, size=(500,500)):
+        wx.Dialog.__init__(self, parent, -1, title, style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
+
+        sizer = wx.BoxSizer(wx.VERTICAL)
+
+        tc = wx.TextCtrl(self, 11, text, style=wx.TE_MULTILINE)
+        self.tc = tc
+        topsizer.Add(tc,1,wx.EXPAND|wx.ALL,8)
+
+        rowsizer = wx.BoxSizer( wx.HORIZONTAL )
+        rowsizer.Add(wx.Button(self,wx.ID_OK,'Ok'),0,wx.ALIGN_RIGHT|wx.ALIGN_CENTRE_VERTICAL,8)
+        rowsizer.Add((0,0),1,wx.ALIGN_RIGHT|wx.ALIGN_CENTRE_VERTICAL,8)
+        rowsizer.Add(wx.Button(self,wx.ID_CANCEL,'Cancel'),0,wx.ALIGN_RIGHT|wx.ALIGN_CENTRE_VERTICAL,8)
+        topsizer.Add(rowsizer,0,wx.EXPAND|wx.ALL,8)
+
+        self.SetSizer( topsizer )
+        topsizer.Layout()
+
+        self.SetSize( size )
+        if not pos:
+            self.CenterOnScreen()
+        else:
+            self.Move(pos)
+
+
+#---------------------------------------------------------------------------
diff --git a/hooke/ui/gui/hookeresults.py b/hooke/ui/gui/hookeresults.py
index b3f10c9..ecf71f0 100644
--- a/hooke/ui/gui/hookeresults.py
+++ b/hooke/ui/gui/hookeresults.py
@@ -1,78 +1,78 @@
-#!/usr/bin/env python
-
-import sys
-import wx
-from wx.lib.mixins.listctrl import CheckListCtrlMixin
-
-import prettyformat
-
-class CheckListCtrl(wx.ListCtrl, CheckListCtrlMixin):
-    def __init__(self, parent):
-        wx.ListCtrl.__init__(self, parent, -1, style=wx.LC_REPORT)
-        CheckListCtrlMixin.__init__(self)
-        self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnItemActivated)
-
-    def OnItemActivated(self, evt):
-        self.ToggleItem(evt.m_itemIndex)
-
-
-class Results(wx.Panel):
-    def __init__(self, parent):
-        wx.Panel.__init__(self, parent, -1)
-        self.results_list = CheckListCtrl(self)
-        sizer = wx.BoxSizer()
-        sizer.Add(self.results_list, 1, wx.EXPAND)
-        self.SetSizer(sizer)
-        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected, self.results_list)
-        self.Bind(wx.EVT_LIST_ITEM_DESELECTED, self.OnItemDeselected, self.results_list)
-        #self.results_list.OnCheckItem = self.OnCheckItem
-
-    def _GetWidthInPixels(self, text):
-        #TODO:
-        #Returns the width of a string in pixels
-        #Unfortunately, it does not work terribly well (although it should).
-        #Thus, we have to add a bit afterwards.
-        #Annoys the heck out of me.
-        font = self.results_list.GetFont()
-        dc = wx.WindowDC(self.results_list)
-        dc.SetFont(font)
-        width, height = dc.GetTextExtent(text)
-        return width
-
-    def ClearResults(self):
-        self.results_list.ClearAll()
-
-    def DisplayResults(self, results):
-        self.ClearResults()
-        header = results.header_as_list()
-        self.results_list.InsertColumn(0, 'Show')
-        for index, column in enumerate(header):
-            self.results_list.InsertColumn(index + 1, column, wx.LIST_FORMAT_RIGHT)
-
-        for result in results.results:
-            done = False
-            for index, column in enumerate(results.columns):
-                value_str = results.get_pretty_value(column, result.result[column])
-                if not done:
-                    index_col = self.results_list.InsertStringItem(sys.maxint, '')
-                    done = True
-                column_width = len(self.results_list.GetColumn(index + 1).GetText())
-                value_str = value_str.center(column_width)
-                self.results_list.SetStringItem(index_col, index + 1, value_str)
-                #self.results_list.SetItemData(index, result)
-
-        for index, result in enumerate(results.results):
-            if result.visible:
-                #if we use 'CheckItem' then 'UpdatePlot' is called (ie repeated updates)
-                self.results_list.SetItemImage(index, 1)
-                #self.results_list.CheckItem(index)
-        for index in range(self.results_list.GetColumnCount()):
-            column_text = self.results_list.GetColumn(index).GetText()
-            column_width = self._GetWidthInPixels(column_text)
-            self.results_list.SetColumnWidth(index, column_width + 15)
-
-    def OnItemSelected(self, evt):
-        pass
-
-    def OnItemDeselected(self, evt):
-        pass
+#!/usr/bin/env python
+
+import sys
+import wx
+from wx.lib.mixins.listctrl import CheckListCtrlMixin
+
+import prettyformat
+
+class CheckListCtrl(wx.ListCtrl, CheckListCtrlMixin):
+    def __init__(self, parent):
+        wx.ListCtrl.__init__(self, parent, -1, style=wx.LC_REPORT)
+        CheckListCtrlMixin.__init__(self)
+        self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnItemActivated)
+
+    def OnItemActivated(self, evt):
+        self.ToggleItem(evt.m_itemIndex)
+
+
+class Results(wx.Panel):
+    def __init__(self, parent):
+        wx.Panel.__init__(self, parent, -1)
+        self.results_list = CheckListCtrl(self)
+        sizer = wx.BoxSizer()
+        sizer.Add(self.results_list, 1, wx.EXPAND)
+        self.SetSizer(sizer)
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected, self.results_list)
+        self.Bind(wx.EVT_LIST_ITEM_DESELECTED, self.OnItemDeselected, self.results_list)
+        #self.results_list.OnCheckItem = self.OnCheckItem
+
+    def _GetWidthInPixels(self, text):
+        #TODO:
+        #Returns the width of a string in pixels
+        #Unfortunately, it does not work terribly well (although it should).
+        #Thus, we have to add a bit afterwards.
+        #Annoys the heck out of me.
+        font = self.results_list.GetFont()
+        dc = wx.WindowDC(self.results_list)
+        dc.SetFont(font)
+        width, height = dc.GetTextExtent(text)
+        return width
+
+    def ClearResults(self):
+        self.results_list.ClearAll()
+
+    def DisplayResults(self, results):
+        self.ClearResults()
+        header = results.header_as_list()
+        self.results_list.InsertColumn(0, 'Show')
+        for index, column in enumerate(header):
+            self.results_list.InsertColumn(index + 1, column, wx.LIST_FORMAT_RIGHT)
+
+        for result in results.results:
+            done = False
+            for index, column in enumerate(results.columns):
+                value_str = results.get_pretty_value(column, result.result[column])
+                if not done:
+                    index_col = self.results_list.InsertStringItem(sys.maxint, '')
+                    done = True
+                column_width = len(self.results_list.GetColumn(index + 1).GetText())
+                value_str = value_str.center(column_width)
+                self.results_list.SetStringItem(index_col, index + 1, value_str)
+                #self.results_list.SetItemData(index, result)
+
+        for index, result in enumerate(results.results):
+            if result.visible:
+                #if we use 'CheckItem' then 'UpdatePlot' is called (ie repeated updates)
+                self.results_list.SetItemImage(index, 1)
+                #self.results_list.CheckItem(index)
+        for index in range(self.results_list.GetColumnCount()):
+            column_text = self.results_list.GetColumn(index).GetText()
+            column_width = self._GetWidthInPixels(column_text)
+            self.results_list.SetColumnWidth(index, column_width + 15)
+
+    def OnItemSelected(self, evt):
+        pass
+
+    def OnItemDeselected(self, evt):
+        pass
diff --git a/hooke/ui/gui/prettyformat.py b/hooke/ui/gui/prettyformat.py
index 6454ad9..32ee405 100644
--- a/hooke/ui/gui/prettyformat.py
+++ b/hooke/ui/gui/prettyformat.py
@@ -1,141 +1,141 @@
-'''
-//
-// prettyformat.py - simple Python function to format values with nice prefixes
-// Version 1.0.1
-//
-// History
-// 2009 07 16: added negative number support
-//             added decimal-formatted output
-//
-// Copyright (c) 2009 Rolf Schmidt, Montreal
-// rschmidt@alcor.concordia.ca
-//
-// This procedure is released under the GNU General Public License version 2
-//
-'''
-
-import math
-from numpy import isnan
-
-def pretty_format(fValue, sUnit='', iDecimals=-1, iMultiplier=1, bLeadingSpaces=False):
-    if fValue != 0:
-        iLeadingSpaces = 0
-        if bLeadingSpaces:
-            iLeadingSpaces = 5
-        if iMultiplier == 1:
-            iMultiplier=get_multiplier(fValue)
-        sUnitString = ''
-        if sUnit != '':
-            sUnitString = ' ' + get_prefix(iMultiplier) + sUnit
-        if iDecimals >= 0:
-            formatString = '% ' + repr(iLeadingSpaces + iDecimals) + '.' + repr(iDecimals) + 'f'
-            return formatString % (fValue / iMultiplier) + sUnitString
-        else:
-            return str(fValue / iMultiplier) + sUnitString
-    else:
-        return '0'
-    return str(fValue / iMultiplier) + ' ' + get_prefix(fValue / iMultiplier) + sUnit
-
-def get_multiplier(fValue):
-    return pow(10, get_power(fValue))
-
-def get_power(fValue):
-    if fValue != 0 and not isnan(fValue):
-        #get the log10 from fValue (make sure the value is not negative)
-        dHelp = math.floor(math.log10(math.fabs(fValue)))
-        #reduce the log10 to a multiple of 3 and return it
-        return dHelp-(dHelp % 3)
-    else:
-        return 0
-
-def get_prefix(fValue):
-    #set up a dictionary to find the prefix
-    prefix = {
-        24: lambda: 'Y',
-        21: lambda: 'Z',
-        18: lambda: 'E',
-        15: lambda: 'P',
-        12: lambda: 'T',
-        9: lambda: 'G',
-        6: lambda: 'M',
-        3: lambda: 'k',
-        0: lambda: '',
-        -3: lambda: 'm',
-        -6: lambda: u'\u00B5',
-        -9: lambda: 'n',
-        -12: lambda: 'p',
-        -15: lambda: 'f',
-        -18: lambda: 'a',
-        -21: lambda: 'z',
-        -24: lambda: 'y',
-    }
-    if fValue != 0 and not isnan(fValue):
-        #get the log10 from fValue
-        dHelp = math.floor(math.log10(math.fabs(fValue)))
-    else:
-        dHelp = 0
-    #reduce the log10 to a multiple of 3 and create the return string
-    return prefix.get(dHelp - (dHelp % 3))()
-
-'''
-dTestValue=-2.4115665714484597e-008
-print 'Value: '+str(dTestValue)+')'
-print 'pretty_format example (value, unit)'
-print pretty_format(dTestValue, 'N')
-print'-----------------------'
-print 'pretty_format example (value, unit, decimals)'
-print pretty_format(dTestValue, 'N', 3)
-print'-----------------------'
-print 'pretty_format example (value, unit, decimals, multiplier)'
-print pretty_format(dTestValue, 'N', 5, 0.000001)
-print'-----------------------'
-print 'pretty_format example (value, unit, decimals, multiplier, leading spaces)'
-print pretty_format(0.0166276297705, 'N', 3, 0.001, True)
-print pretty_format(0.00750520813323, 'N', 3, 0.001, True)
-print pretty_format(0.0136453282825, 'N', 3, 0.001, True)
-'''
-'''
-#example use autoFormatValue
-dTestValue=0.00000000567
-print 'autoFormatValue example ('+str(dTestValue)+')'
-print autoFormatValue(dTestValue, 'N')
-#outputs 5.67 nN
-'''
-'''
-#example use of decimalFormatValue(fValue, iDecimals, sUnit):
-dTestValue=-2.4115665714484597e-008
-iDecimals=3
-print 'decimalFormatValue example ('+str(dTestValue)+')'
-print decimalFormatValue(dTestValue, iDecimals, 'N')
-#outputs -24.116 nN
-#change iDecimals to see the effect
-'''
-'''
-#example use formatValue
-dTestValue=0.000000000567
-print 'formatValue example ('+str(dTestValue)+')'
-#find the (common) multiplier
-iMultiplier=get_multiplier(dTestValue)
-#use the multiplier and a unit to format the value
-print formatValue(dTestValue, iMultiplier, 'N')
-#outputs 567.0 pN
-'''
-'''
-#to output a scale:
-#choose any value on the axis and find the multiplier and prefix for it
-#use those to format the rest of the scale
-#as values can span several orders of magnitude, you have to decide what units to use
-
-#tuple of values:
-scaleValues=0.000000000985, 0.000000001000, 0.000000001015
-#use this element (change to 1 or 2 to see the effect on the scale and label)
-iIndex=0
-#get the multiplier from the value at iIndex
-iMultiplier=get_multiplier(scaleValues[iIndex])
-print '\nScale example'
-iDecimals=3
-#print the scale
-for aValue in scaleValues: print decimalFormat(aValue/iMultiplier, iDecimals),
-#print the scale label using the value at iIndex
-print '\n'+get_prefix(scaleValues[iIndex])+'N'
+'''
+//
+// prettyformat.py - simple Python function to format values with nice prefixes
+// Version 1.0.1
+//
+// History
+// 2009 07 16: added negative number support
+//             added decimal-formatted output
+//
+// Copyright (c) 2009 Rolf Schmidt, Montreal
+// rschmidt@alcor.concordia.ca
+//
+// This procedure is released under the GNU General Public License version 2
+//
+'''
+
+import math
+from numpy import isnan
+
+def pretty_format(fValue, sUnit='', iDecimals=-1, iMultiplier=1, bLeadingSpaces=False):
+    if fValue != 0:
+        iLeadingSpaces = 0
+        if bLeadingSpaces:
+            iLeadingSpaces = 5
+        if iMultiplier == 1:
+            iMultiplier=get_multiplier(fValue)
+        sUnitString = ''
+        if sUnit != '':
+            sUnitString = ' ' + get_prefix(iMultiplier) + sUnit
+        if iDecimals >= 0:
+            formatString = '% ' + repr(iLeadingSpaces + iDecimals) + '.' + repr(iDecimals) + 'f'
+            return formatString % (fValue / iMultiplier) + sUnitString
+        else:
+            return str(fValue / iMultiplier) + sUnitString
+    else:
+        return '0'
+    return str(fValue / iMultiplier) + ' ' + get_prefix(fValue / iMultiplier) + sUnit
+
+def get_multiplier(fValue):
+    return pow(10, get_power(fValue))
+
+def get_power(fValue):
+    if fValue != 0 and not isnan(fValue):
+        #get the log10 from fValue (make sure the value is not negative)
+        dHelp = math.floor(math.log10(math.fabs(fValue)))
+        #reduce the log10 to a multiple of 3 and return it
+        return dHelp-(dHelp % 3)
+    else:
+        return 0
+
+def get_prefix(fValue):
+    #set up a dictionary to find the prefix
+    prefix = {
+        24: lambda: 'Y',
+        21: lambda: 'Z',
+        18: lambda: 'E',
+        15: lambda: 'P',
+        12: lambda: 'T',
+        9: lambda: 'G',
+        6: lambda: 'M',
+        3: lambda: 'k',
+        0: lambda: '',
+        -3: lambda: 'm',
+        -6: lambda: u'\u00B5',
+        -9: lambda: 'n',
+        -12: lambda: 'p',
+        -15: lambda: 'f',
+        -18: lambda: 'a',
+        -21: lambda: 'z',
+        -24: lambda: 'y',
+    }
+    if fValue != 0 and not isnan(fValue):
+        #get the log10 from fValue
+        dHelp = math.floor(math.log10(math.fabs(fValue)))
+    else:
+        dHelp = 0
+    #reduce the log10 to a multiple of 3 and create the return string
+    return prefix.get(dHelp - (dHelp % 3))()
+
+'''
+dTestValue=-2.4115665714484597e-008
+print 'Value: '+str(dTestValue)+')'
+print 'pretty_format example (value, unit)'
+print pretty_format(dTestValue, 'N')
+print'-----------------------'
+print 'pretty_format example (value, unit, decimals)'
+print pretty_format(dTestValue, 'N', 3)
+print'-----------------------'
+print 'pretty_format example (value, unit, decimals, multiplier)'
+print pretty_format(dTestValue, 'N', 5, 0.000001)
+print'-----------------------'
+print 'pretty_format example (value, unit, decimals, multiplier, leading spaces)'
+print pretty_format(0.0166276297705, 'N', 3, 0.001, True)
+print pretty_format(0.00750520813323, 'N', 3, 0.001, True)
+print pretty_format(0.0136453282825, 'N', 3, 0.001, True)
+'''
+'''
+#example use autoFormatValue
+dTestValue=0.00000000567
+print 'autoFormatValue example ('+str(dTestValue)+')'
+print autoFormatValue(dTestValue, 'N')
+#outputs 5.67 nN
+'''
+'''
+#example use of decimalFormatValue(fValue, iDecimals, sUnit):
+dTestValue=-2.4115665714484597e-008
+iDecimals=3
+print 'decimalFormatValue example ('+str(dTestValue)+')'
+print decimalFormatValue(dTestValue, iDecimals, 'N')
+#outputs -24.116 nN
+#change iDecimals to see the effect
+'''
+'''
+#example use formatValue
+dTestValue=0.000000000567
+print 'formatValue example ('+str(dTestValue)+')'
+#find the (common) multiplier
+iMultiplier=get_multiplier(dTestValue)
+#use the multiplier and a unit to format the value
+print formatValue(dTestValue, iMultiplier, 'N')
+#outputs 567.0 pN
+'''
+'''
+#to output a scale:
+#choose any value on the axis and find the multiplier and prefix for it
+#use those to format the rest of the scale
+#as values can span several orders of magnitude, you have to decide what units to use
+
+#tuple of values:
+scaleValues=0.000000000985, 0.000000001000, 0.000000001015
+#use this element (change to 1 or 2 to see the effect on the scale and label)
+iIndex=0
+#get the multiplier from the value at iIndex
+iMultiplier=get_multiplier(scaleValues[iIndex])
+print '\nScale example'
+iDecimals=3
+#print the scale
+for aValue in scaleValues: print decimalFormat(aValue/iMultiplier, iDecimals),
+#print the scale label using the value at iIndex
+print '\n'+get_prefix(scaleValues[iIndex])+'N'
 '''
\ No newline at end of file
diff --git a/hooke/ui/gui/results.py b/hooke/ui/gui/results.py
index 48c549c..c79b3be 100644
--- a/hooke/ui/gui/results.py
+++ b/hooke/ui/gui/results.py
@@ -1,150 +1,150 @@
-import prettyformat
-
-DEFAULT_COLOR = 'orange'
-DEFAULT_DECIMAL = 2
-DEFAULT_STYLE = 'plot'
-
-class Result:
-    def __init__(self):
-        self.color = DEFAULT_COLOR
-        self.result = {}
-        self.style = DEFAULT_STYLE
-        self.visible = True
-        self.x = []
-        self.y = []
-
-class Results:
-    def __init__(self):
-        self.columns = []
-        self.decimals = {}
-        self.has_multipliers = False
-        self.multipliers = {}
-        self.results = []
-        self.separator='\t'
-        self.units = {}
-
-    def get_pretty_value(self, column, value):
-        if self.has_multipliers and self.has_results():
-            multiplier = self.multipliers[column]
-            decimals = self.decimals[column]
-            return prettyformat.pretty_format(value, '', decimals, multiplier, True)
-        return str(value)
-
-    #def get_fit_result(self):
-        #if not(self.has_multipliers):
-            #self.set_multipliers()
-
-        #sResult = 'Contour length ['+prettyformat.get_prefix(self.multiplierContourLength) + 'm]' + self.separator
-        #sResult += prettyformat.pretty_format(self.contourLength[0], '', self.decimals, self.multiplierContourLength, True) + '\n'
-        #sResult += 'Persistence length ['+prettyformat.get_prefix(self.multiplierPersistenceLength) + 'm]' + self.separator
-        #sResult += prettyformat.pretty_format(self.persistenceLength[0], '', self.decimals, self.multiplierPersistenceLength, True) + '\n'
-        #sResult += 'Rupture force ['+prettyformat.get_prefix(self.multiplierRuptureForce) + 'N]' + self.separator
-        #sResult += prettyformat.pretty_format(self.ruptureForces[0], '', self.decimals, self.multiplierRuptureForce, True) + '\n'
-        #sResult += 'Loading rate ['+prettyformat.get_prefix(self.multiplierSlope) + 'N/m]' + self.separator
-        #sResult += prettyformat.pretty_format(self.slopes[0], '', self.decimals, self.multiplierSlope, True)+'\n'
-        #sResult += 'Sigma contour ['+prettyformat.get_prefix(self.multiplierContourLength) + 'm]' + self.separator
-        #sResult += prettyformat.pretty_format(self.contourLengthSigma[0], '', self.decimals, self.multiplierContourLength, True) + '\n'
-        #sResult += 'Sigma persistence ['+prettyformat.get_prefix(self.multiplierPersistenceLength) + 'm]' + self.separator
-        #sResult += prettyformat.pretty_format(self.persistenceLengthSigma[0], '', self.decimals, self.multiplierPersistenceLength, True)
-
-        #return sResult
-
-    #def get_fit_results(self, index):
-        #if index >= 0 and index < len(self.contourLength):
-            #if not(self.has_multipliers):
-                #self.set_multipliers()
-            #sLine = prettyformat.pretty_format(self.contourLength[index], '', self.decimals, self.multiplierContourLength, True) + self.separator
-            #sLine += prettyformat.pretty_format(self.persistenceLength[index], '', self.decimals, self.multiplierPersistenceLength, True) + self.separator
-            #sLine += prettyformat.pretty_format(self.ruptureForces[index], '', self.decimals, self.multiplierRuptureForce, True) + self.separator
-            #sLine += prettyformat.pretty_format(self.slopes[index], '', self.decimals, self.multiplierSlope, True) + self.separator
-            #sLine += prettyformat.pretty_format(self.contourLengthSigma[index], '', self.decimals, self.multiplierContourLength, True) + self.separator
-            #sLine += prettyformat.pretty_format(self.persistenceLengthSigma[index], '', self.decimals, self.multiplierPersistenceLength, True)
-
-            #return sLine
-        #else:
-            #return ''
-
-    def has_results(self):
-        return self.results
-
-    def header_as_list(self):
-        header = []
-        if self.has_results():
-            if not self.has_multipliers:
-                self.set_multipliers()
-            for column in self.columns:
-                #result will contain the results dictionary for 'column'
-                #result = self.results[0][0][column]
-                #result[1] contains the unit
-                unit_str = ''.join([prettyformat.get_prefix(self.multipliers[column]), self.units[column]])
-                header_str = ''.join([column, ' [', unit_str, ']'])
-                header.append(header_str)
-        return header
-
-    #def header_as_str(self):
-        #if self.has_results():
-            #if not self.has_multipliers:
-                #self.set_multipliers()
-            #header_str = ''
-            #for column in self.columns:
-                ##result will contain the results dictionary for 'column'
-                #result = self.results[0][0][column]
-                ##result[1] contains the unit
-                #unit_str = ''.join([prettyformat.get_prefix(self.multipliers[column]), result[1]])
-                #header_str = ''.join([header_str, result_str, ' [', unit_str, ']', self.separator])
-            #return header_str
-        #else:
-            #return None
-
-    def set_decimal(self, column, decimal=DEFAULT_DECIMAL):
-        if self.decimals.has_key(name):
-            self.decimals[name] = decimal
-
-    def set_decimals(self, decimals=DEFAULT_DECIMAL):
-        if decimals < 0:
-            #set default value if necessary
-            decimals = DEFAULT_DECIMAL
-        for column in self.columns:
-            self.decimals[column] = decimals
-
-    def set_multipliers(self, index=0):
-        if self.has_results():
-            if index >= 0 and index < len(self.results):
-                for column in self.columns:
-                    #result will contain the results dictionary at 'index'
-                    result = self.results[index][0]
-                    #in position 0 of the result we find the value
-                    self.multipliers[column] = prettyformat.get_multiplier(result[column][0])
-                self.has_multipliers = True
-        else:
-            self.has_multipliers = False
-
-
-class ResultsWLC(Results):
-    def __init__(self):
-        Results.__init__(self)
-        self.columns = ['Contour length', 'sigma contour length', 'Persistence length', 'sigma persistence length', 'Rupture force', 'Loading rate']
-        self.units['Contour length'] = 'm'
-        self.units['sigma contour length'] = 'm'
-        self.units['Persistence length'] = 'm'
-        self.units['sigma persistence length'] = 'm'
-        self.units['Rupture force'] = 'N'
-        self.units['Loading rate'] = 'N/m'
-        self.set_decimals(2)
-
-    def set_multipliers(self, index=0):
-        if self.has_results():
-            if index >= 0 and index < len(self.results):
-                for column in self.columns:
-                    #result will contain the results dictionary at 'index'
-                    result = self.results[index].result
-                    #in position 0 of the result we find the value
-                    if column == 'sigma contour length':
-                        self.multipliers[column] = self.multipliers['Contour length']
-                    elif column == 'sigma persistence length':
-                        self.multipliers[column] = self.multipliers['Persistence length']
-                    else:
-                        self.multipliers[column] = prettyformat.get_multiplier(result[column])
-                self.has_multipliers = True
-        else:
-            self.has_multipliers = False
+import prettyformat
+
+DEFAULT_COLOR = 'orange'
+DEFAULT_DECIMAL = 2
+DEFAULT_STYLE = 'plot'
+
+class Result:
+    def __init__(self):
+        self.color = DEFAULT_COLOR
+        self.result = {}
+        self.style = DEFAULT_STYLE
+        self.visible = True
+        self.x = []
+        self.y = []
+
+class Results:
+    def __init__(self):
+        self.columns = []
+        self.decimals = {}
+        self.has_multipliers = False
+        self.multipliers = {}
+        self.results = []
+        self.separator='\t'
+        self.units = {}
+
+    def get_pretty_value(self, column, value):
+        if self.has_multipliers and self.has_results():
+            multiplier = self.multipliers[column]
+            decimals = self.decimals[column]
+            return prettyformat.pretty_format(value, '', decimals, multiplier, True)
+        return str(value)
+
+    #def get_fit_result(self):
+        #if not(self.has_multipliers):
+            #self.set_multipliers()
+
+        #sResult = 'Contour length ['+prettyformat.get_prefix(self.multiplierContourLength) + 'm]' + self.separator
+        #sResult += prettyformat.pretty_format(self.contourLength[0], '', self.decimals, self.multiplierContourLength, True) + '\n'
+        #sResult += 'Persistence length ['+prettyformat.get_prefix(self.multiplierPersistenceLength) + 'm]' + self.separator
+        #sResult += prettyformat.pretty_format(self.persistenceLength[0], '', self.decimals, self.multiplierPersistenceLength, True) + '\n'
+        #sResult += 'Rupture force ['+prettyformat.get_prefix(self.multiplierRuptureForce) + 'N]' + self.separator
+        #sResult += prettyformat.pretty_format(self.ruptureForces[0], '', self.decimals, self.multiplierRuptureForce, True) + '\n'
+        #sResult += 'Loading rate ['+prettyformat.get_prefix(self.multiplierSlope) + 'N/m]' + self.separator
+        #sResult += prettyformat.pretty_format(self.slopes[0], '', self.decimals, self.multiplierSlope, True)+'\n'
+        #sResult += 'Sigma contour ['+prettyformat.get_prefix(self.multiplierContourLength) + 'm]' + self.separator
+        #sResult += prettyformat.pretty_format(self.contourLengthSigma[0], '', self.decimals, self.multiplierContourLength, True) + '\n'
+        #sResult += 'Sigma persistence ['+prettyformat.get_prefix(self.multiplierPersistenceLength) + 'm]' + self.separator
+        #sResult += prettyformat.pretty_format(self.persistenceLengthSigma[0], '', self.decimals, self.multiplierPersistenceLength, True)
+
+        #return sResult
+
+    #def get_fit_results(self, index):
+        #if index >= 0 and index < len(self.contourLength):
+            #if not(self.has_multipliers):
+                #self.set_multipliers()
+            #sLine = prettyformat.pretty_format(self.contourLength[index], '', self.decimals, self.multiplierContourLength, True) + self.separator
+            #sLine += prettyformat.pretty_format(self.persistenceLength[index], '', self.decimals, self.multiplierPersistenceLength, True) + self.separator
+            #sLine += prettyformat.pretty_format(self.ruptureForces[index], '', self.decimals, self.multiplierRuptureForce, True) + self.separator
+            #sLine += prettyformat.pretty_format(self.slopes[index], '', self.decimals, self.multiplierSlope, True) + self.separator
+            #sLine += prettyformat.pretty_format(self.contourLengthSigma[index], '', self.decimals, self.multiplierContourLength, True) + self.separator
+            #sLine += prettyformat.pretty_format(self.persistenceLengthSigma[index], '', self.decimals, self.multiplierPersistenceLength, True)
+
+            #return sLine
+        #else:
+            #return ''
+
+    def has_results(self):
+        return self.results
+
+    def header_as_list(self):
+        header = []
+        if self.has_results():
+            if not self.has_multipliers:
+                self.set_multipliers()
+            for column in self.columns:
+                #result will contain the results dictionary for 'column'
+                #result = self.results[0][0][column]
+                #result[1] contains the unit
+                unit_str = ''.join([prettyformat.get_prefix(self.multipliers[column]), self.units[column]])
+                header_str = ''.join([column, ' [', unit_str, ']'])
+                header.append(header_str)
+        return header
+
+    #def header_as_str(self):
+        #if self.has_results():
+            #if not self.has_multipliers:
+                #self.set_multipliers()
+            #header_str = ''
+            #for column in self.columns:
+                ##result will contain the results dictionary for 'column'
+                #result = self.results[0][0][column]
+                ##result[1] contains the unit
+                #unit_str = ''.join([prettyformat.get_prefix(self.multipliers[column]), result[1]])
+                #header_str = ''.join([header_str, result_str, ' [', unit_str, ']', self.separator])
+            #return header_str
+        #else:
+            #return None
+
+    def set_decimal(self, column, decimal=DEFAULT_DECIMAL):
+        if self.decimals.has_key(name):
+            self.decimals[name] = decimal
+
+    def set_decimals(self, decimals=DEFAULT_DECIMAL):
+        if decimals < 0:
+            #set default value if necessary
+            decimals = DEFAULT_DECIMAL
+        for column in self.columns:
+            self.decimals[column] = decimals
+
+    def set_multipliers(self, index=0):
+        if self.has_results():
+            if index >= 0 and index < len(self.results):
+                for column in self.columns:
+                    #result will contain the results dictionary at 'index'
+                    result = self.results[index][0]
+                    #in position 0 of the result we find the value
+                    self.multipliers[column] = prettyformat.get_multiplier(result[column][0])
+                self.has_multipliers = True
+        else:
+            self.has_multipliers = False
+
+
+class ResultsWLC(Results):
+    def __init__(self):
+        Results.__init__(self)
+        self.columns = ['Contour length', 'sigma contour length', 'Persistence length', 'sigma persistence length', 'Rupture force', 'Loading rate']
+        self.units['Contour length'] = 'm'
+        self.units['sigma contour length'] = 'm'
+        self.units['Persistence length'] = 'm'
+        self.units['sigma persistence length'] = 'm'
+        self.units['Rupture force'] = 'N'
+        self.units['Loading rate'] = 'N/m'
+        self.set_decimals(2)
+
+    def set_multipliers(self, index=0):
+        if self.has_results():
+            if index >= 0 and index < len(self.results):
+                for column in self.columns:
+                    #result will contain the results dictionary at 'index'
+                    result = self.results[index].result
+                    #in position 0 of the result we find the value
+                    if column == 'sigma contour length':
+                        self.multipliers[column] = self.multipliers['Contour length']
+                    elif column == 'sigma persistence length':
+                        self.multipliers[column] = self.multipliers['Persistence length']
+                    else:
+                        self.multipliers[column] = prettyformat.get_multiplier(result[column])
+                self.has_multipliers = True
+        else:
+            self.has_multipliers = False
diff --git a/mfp_igor_scripts/ExportMFP1D.ipf b/mfp_igor_scripts/ExportMFP1D.ipf
index d1234c3..8a3a4ce 100644
--- a/mfp_igor_scripts/ExportMFP1D.ipf
+++ b/mfp_igor_scripts/ExportMFP1D.ipf
@@ -1,185 +1,185 @@
-#pragma rtGlobals=1		// Use modern global access method.
-#pragma IgorVersion = 4.0
-#pragma version = 0.4
-
-//
-// ExportMFP1D.ipf - A procedure to export force curves from MFP1D to 'hooke'
-//
-// Copyright (c) 2009 Rolf Schmidt, Montreal
-// rschmidt@alcor.concordia.ca
-// 
-// This procedure is released under the GNU General Public License version 2
-//
-
-// History
-// 2009 07 24: v0.4
-// the wave note is now correctly and fully exported in Igor 4
-// 2009 06 29: v0.3
-// split functionality into ExportMFP1DFolder and ExportMFP1DWaves
-// ExportMFP1DFolder: export individual Igor binary waves file from a folder
-// ExportMFP1DWaves: export all currently open waves to a folder
-// 2009 06 26: v0.2.1
-// added the IgorVersion pragma
-// 2009 06 19: v0.2
-// changed the filename finding algorithm to work with Igor 4 and up
-// Igor 5 users can use the code marked 'the following only works in Igor 5 and up' instead
-// the procedure now catches 'Cancel' on NewPath
-// added version information
-// 2009 05 29: v0.1
-// changed the procedure so that it runs in Igor as well as in MFP (ie Igor with MFP plug-in)
-
-// How to use ExportMFP1D()
-// - save all current waves of interest (ExportMFP1D() kills all open waves before exporting files)
-// - execute ExportMFP1D() from the command line
-// - browse to a folder containing force curves (a 'force curve' consists of two files: one 'deflection' and one 'LVDT' file
-// - ExportMFP1D() will now iterate through all the waves in the folder, extract the header information and create four columns:
-//   1: approach (x) 2: approach (y) 3: retraction (x) 4; retraction (y)
-// - the resulting files are saved in the same folder and the same base name as the original files (ie without 'deflection' and 'LVDT')
-// CAUTION:  existing files will be overwritten!
-// - these files can then be analyzed with 'hooke'
-
-Function ExportMFP1DFolder()
-
-	String sList
-	Variable iCount
-
-	// set the path (used for opening the waves and saving the output files later)
-	NewPath /O /Q /M="Choose the folder that contains the waves" PathExport1D
-
-	KillWaves /A /Z
-	
-	if(V_flag>=0)
-		// get a list of all Igor binary waves in the folder
-		sList=IndexedFile(PathExport1D,-1,".ibw")
-		// load all waves
-		for(iCount=0; iCount<ItemsInList(sList); iCount+=1)
-			LoadWave /P=PathExport1D /Q StringFromList(iCount, sList)
-		endfor
-		ExportMFP1DWaves()
-	endif
-	// kill the export path
-	KillPath /Z PathExport1D
-End
-
-Function ExportMFP1DWaves()
-
-	String sFileName1
-	String sFileName2
-	String sLine
-	String sList
-	String sNote
-	String sWaveCombined
-	String sWaveDeflection
-	String sWaveLVDT
-	Variable iCount
-	Variable iLine
-	Variable iPoints
-	Variable iRefNum
-	Wave wApproachX
-	Wave wApproachY
-	Wave wRetractionX
-	Wave wRetractionY
-
-	// set the path (used for saving the output files later)
-	NewPath /O /Q /M="Choose the folder to save the waves" PathExport1D
-	
-	// get a list of all LVDT waves (could be deflection as well, they always come in a pair)
-	sList=WaveList("*LVDT*", ";", "")
-	
-	// iterate through all the LVDT waves
-	for(iCount=0; iCount<ItemsInList(sList); iCount+=1)
-		// create the wave names as string
-// the following only works in Igor 5 and up
-//			sWaveLVDT=ReplaceString(".ibw",StringFromList(iCount, sList), "")
-//			sWaveDeflection=ReplaceString("LVDT",sWaveLVDT, "deflection")
-//			sWaveCombined=ReplaceString("LVDT",sWaveLVDT, "_")
-// END: the following only works in Igor 5 and up
-
-// the following works in Igor 4 and up
-		// treat the filename as a key-value list with '.' as a separator
-		// use the first entry (ie 0) as the filename without extension
-		sWaveLVDT=StringFromList(0, StringFromList(iCount, sList), ".")
-		
-		// treat the filename as a key-value list with 'LVDT' as a separator
-		// use the first entry (ie 0) as the first part of the filename
-		sFileName1=StringFromList(0, sWaveLVDT, "LVDT")
-		// getting the second part of the filename is a bit trickier
-		// first, we 'remove' the first part of the filename by treating it as a key
-		// using 'LVDT' as a separator 
-		sFileName2=StringByKey(sFileName1, sWaveLVDT, "LVDT")
-		// unfortunately, StringByKey only removes the first character of the separator
-		// to get the second part of the filename, we use VD as the key and 'T' as the separator
-		sFileName2=StringByKey("VD", sFileName2, "T")
-		// then we create the wave names as follows:
-		sWaveDeflection=sFileName1+"deflection"+sFileName2
-		
-		sWaveCombined=sFileName1+"_"+sFileName2
-		
-// END: the following works in Igor 4 and up
-
-		// create the waves we need
-		Wave wLVDT=$sWaveLVDT
-		Wave wDeflection=$sWaveDeflection
-	
-		// open the output text file, add extension
-		Open /P=PathExport1D iRefNum as sWaveCombined+".txt"
-
-		// create the header
-		fprintf iRefNum, "Wave:"+sWaveCombined+"\r"
-		fprintf iRefNum, "WaveLVDT:"+sWaveLVDT+"\r"
-		fprintf iRefNum, "WaveDeflection:"+sWaveDeflection+"\r"
-
-		// the number of points (use WaveStats to get them) are identical for LVDT and Deflection
-		WaveStats /q wLVDT
-		iPoints=V_npnts/2
-		fprintf iRefNum, "Rows:"+num2str(iPoints)+"\r"
-
-		// add the note to the file
-		// the notes are identical for LVDT and Deflection
-// the following only works in Igor 5 and up
-//		fprintf iRefNum, note(wDeflection)
-// END: the following only works in Igor 5 and up
-		sNote=note(wLVDT)
-		// in order to get the correct number of lines in the note, we have to specify the EOF as \r\n
-		for(iLine=0; iLine<ItemsInList(sNote, "\r\n");iLine+=1)
-			// print every line to the output file
-			fprintf iRefNum, StringFromList(iLine, sNote, "\r\n")
-			// add a CR/LF for every but the last line
-			if(iLine<ItemsInList(sNote, "\r\n")-1)
-				fprintf iRefNum, "\r\n"
-			endif
-		endfor
-
-		// separate the approach from the retraction
-		// by simply taking the first half of the points to be the approach
-		// and the second half to be the retraction
-		// this probably has to be changed for dual pulls
-		Duplicate /O /R=[0, iPoints] wLVDT, wApproachX
-		Duplicate /O /R=[0, iPoints] wDeflection, wApproachY
-		Duplicate /O /R=[iPoints+1] wLVDT, wRetractionX
-		Duplicate /O /R=[iPoints+1] wDeflection, wRetractionY
-
-		// create four columns line by line
-		// 1: approach x 2: approach y 3: retraction x 4: retraction y
-		for(iLine=0; iLine<iPoints; iLine+=1)
-			sLine=num2str(wApproachX[iLine])+"\t"+num2str(wApproachY[iLine])
-			sLine=sLine+"\t"+num2str(wRetractionX[iLine])+"\t"+num2str(wRetractionY[iLine])
-			// add the line to the file
-			fprintf iRefNum, "\r"+sLine
-		endfor
-
-		// save the text file to disk
-		print "Exporting "+sWaveCombined
-		Close iRefNum
-	endfor
-
-	// print message
-	print "Export completed ("+num2str(ItemsInList(sList))+" files)"
-
-	// kill the temporary waves used
-	// given the names, it is unlikely that this function will interfere with data
-	KillWaves /Z wApproachX
-	KillWaves /Z wApproachY
-	KillWaves /Z wRetractionX
-	KillWaves /Z wRetractionY
-End
+#pragma rtGlobals=1		// Use modern global access method.
+#pragma IgorVersion = 4.0
+#pragma version = 0.4
+
+//
+// ExportMFP1D.ipf - A procedure to export force curves from MFP1D to 'hooke'
+//
+// Copyright (c) 2009 Rolf Schmidt, Montreal
+// rschmidt@alcor.concordia.ca
+// 
+// This procedure is released under the GNU General Public License version 2
+//
+
+// History
+// 2009 07 24: v0.4
+// the wave note is now correctly and fully exported in Igor 4
+// 2009 06 29: v0.3
+// split functionality into ExportMFP1DFolder and ExportMFP1DWaves
+// ExportMFP1DFolder: export individual Igor binary waves file from a folder
+// ExportMFP1DWaves: export all currently open waves to a folder
+// 2009 06 26: v0.2.1
+// added the IgorVersion pragma
+// 2009 06 19: v0.2
+// changed the filename finding algorithm to work with Igor 4 and up
+// Igor 5 users can use the code marked 'the following only works in Igor 5 and up' instead
+// the procedure now catches 'Cancel' on NewPath
+// added version information
+// 2009 05 29: v0.1
+// changed the procedure so that it runs in Igor as well as in MFP (ie Igor with MFP plug-in)
+
+// How to use ExportMFP1D()
+// - save all current waves of interest (ExportMFP1D() kills all open waves before exporting files)
+// - execute ExportMFP1D() from the command line
+// - browse to a folder containing force curves (a 'force curve' consists of two files: one 'deflection' and one 'LVDT' file
+// - ExportMFP1D() will now iterate through all the waves in the folder, extract the header information and create four columns:
+//   1: approach (x) 2: approach (y) 3: retraction (x) 4; retraction (y)
+// - the resulting files are saved in the same folder and the same base name as the original files (ie without 'deflection' and 'LVDT')
+// CAUTION:  existing files will be overwritten!
+// - these files can then be analyzed with 'hooke'
+
+Function ExportMFP1DFolder()
+
+	String sList
+	Variable iCount
+
+	// set the path (used for opening the waves and saving the output files later)
+	NewPath /O /Q /M="Choose the folder that contains the waves" PathExport1D
+
+	KillWaves /A /Z
+	
+	if(V_flag>=0)
+		// get a list of all Igor binary waves in the folder
+		sList=IndexedFile(PathExport1D,-1,".ibw")
+		// load all waves
+		for(iCount=0; iCount<ItemsInList(sList); iCount+=1)
+			LoadWave /P=PathExport1D /Q StringFromList(iCount, sList)
+		endfor
+		ExportMFP1DWaves()
+	endif
+	// kill the export path
+	KillPath /Z PathExport1D
+End
+
+Function ExportMFP1DWaves()
+
+	String sFileName1
+	String sFileName2
+	String sLine
+	String sList
+	String sNote
+	String sWaveCombined
+	String sWaveDeflection
+	String sWaveLVDT
+	Variable iCount
+	Variable iLine
+	Variable iPoints
+	Variable iRefNum
+	Wave wApproachX
+	Wave wApproachY
+	Wave wRetractionX
+	Wave wRetractionY
+
+	// set the path (used for saving the output files later)
+	NewPath /O /Q /M="Choose the folder to save the waves" PathExport1D
+	
+	// get a list of all LVDT waves (could be deflection as well, they always come in a pair)
+	sList=WaveList("*LVDT*", ";", "")
+	
+	// iterate through all the LVDT waves
+	for(iCount=0; iCount<ItemsInList(sList); iCount+=1)
+		// create the wave names as string
+// the following only works in Igor 5 and up
+//			sWaveLVDT=ReplaceString(".ibw",StringFromList(iCount, sList), "")
+//			sWaveDeflection=ReplaceString("LVDT",sWaveLVDT, "deflection")
+//			sWaveCombined=ReplaceString("LVDT",sWaveLVDT, "_")
+// END: the following only works in Igor 5 and up
+
+// the following works in Igor 4 and up
+		// treat the filename as a key-value list with '.' as a separator
+		// use the first entry (ie 0) as the filename without extension
+		sWaveLVDT=StringFromList(0, StringFromList(iCount, sList), ".")
+		
+		// treat the filename as a key-value list with 'LVDT' as a separator
+		// use the first entry (ie 0) as the first part of the filename
+		sFileName1=StringFromList(0, sWaveLVDT, "LVDT")
+		// getting the second part of the filename is a bit trickier
+		// first, we 'remove' the first part of the filename by treating it as a key
+		// using 'LVDT' as a separator 
+		sFileName2=StringByKey(sFileName1, sWaveLVDT, "LVDT")
+		// unfortunately, StringByKey only removes the first character of the separator
+		// to get the second part of the filename, we use VD as the key and 'T' as the separator
+		sFileName2=StringByKey("VD", sFileName2, "T")
+		// then we create the wave names as follows:
+		sWaveDeflection=sFileName1+"deflection"+sFileName2
+		
+		sWaveCombined=sFileName1+"_"+sFileName2
+		
+// END: the following works in Igor 4 and up
+
+		// create the waves we need
+		Wave wLVDT=$sWaveLVDT
+		Wave wDeflection=$sWaveDeflection
+	
+		// open the output text file, add extension
+		Open /P=PathExport1D iRefNum as sWaveCombined+".txt"
+
+		// create the header
+		fprintf iRefNum, "Wave:"+sWaveCombined+"\r"
+		fprintf iRefNum, "WaveLVDT:"+sWaveLVDT+"\r"
+		fprintf iRefNum, "WaveDeflection:"+sWaveDeflection+"\r"
+
+		// the number of points (use WaveStats to get them) are identical for LVDT and Deflection
+		WaveStats /q wLVDT
+		iPoints=V_npnts/2
+		fprintf iRefNum, "Rows:"+num2str(iPoints)+"\r"
+
+		// add the note to the file
+		// the notes are identical for LVDT and Deflection
+// the following only works in Igor 5 and up
+//		fprintf iRefNum, note(wDeflection)
+// END: the following only works in Igor 5 and up
+		sNote=note(wLVDT)
+		// in order to get the correct number of lines in the note, we have to specify the EOF as \r\n
+		for(iLine=0; iLine<ItemsInList(sNote, "\r\n");iLine+=1)
+			// print every line to the output file
+			fprintf iRefNum, StringFromList(iLine, sNote, "\r\n")
+			// add a CR/LF for every but the last line
+			if(iLine<ItemsInList(sNote, "\r\n")-1)
+				fprintf iRefNum, "\r\n"
+			endif
+		endfor
+
+		// separate the approach from the retraction
+		// by simply taking the first half of the points to be the approach
+		// and the second half to be the retraction
+		// this probably has to be changed for dual pulls
+		Duplicate /O /R=[0, iPoints] wLVDT, wApproachX
+		Duplicate /O /R=[0, iPoints] wDeflection, wApproachY
+		Duplicate /O /R=[iPoints+1] wLVDT, wRetractionX
+		Duplicate /O /R=[iPoints+1] wDeflection, wRetractionY
+
+		// create four columns line by line
+		// 1: approach x 2: approach y 3: retraction x 4: retraction y
+		for(iLine=0; iLine<iPoints; iLine+=1)
+			sLine=num2str(wApproachX[iLine])+"\t"+num2str(wApproachY[iLine])
+			sLine=sLine+"\t"+num2str(wRetractionX[iLine])+"\t"+num2str(wRetractionY[iLine])
+			// add the line to the file
+			fprintf iRefNum, "\r"+sLine
+		endfor
+
+		// save the text file to disk
+		print "Exporting "+sWaveCombined
+		Close iRefNum
+	endfor
+
+	// print message
+	print "Export completed ("+num2str(ItemsInList(sList))+" files)"
+
+	// kill the temporary waves used
+	// given the names, it is unlikely that this function will interfere with data
+	KillWaves /Z wApproachX
+	KillWaves /Z wApproachY
+	KillWaves /Z wRetractionX
+	KillWaves /Z wRetractionY
+End
diff --git a/mfp_igor_scripts/ExportMFP1DMenu.ipf b/mfp_igor_scripts/ExportMFP1DMenu.ipf
index a8cda3b..e13a34e 100644
--- a/mfp_igor_scripts/ExportMFP1DMenu.ipf
+++ b/mfp_igor_scripts/ExportMFP1DMenu.ipf
@@ -1,4 +1,4 @@
-Menu "hooke"
-	"Export folder", ExportMFP1DFolder()
-	"Export waves", ExportMFP1DWaves()
+Menu "hooke"
+	"Export folder", ExportMFP1DFolder()
+	"Export waves", ExportMFP1DWaves()
 End
\ No newline at end of file
-- 
2.26.2