Add ability to select multiple y columns to gui.panel.plot

[hooke.git] / hooke / plugin / curve.py

diff --git a/hooke/plugin/curve.py b/hooke/plugin/curve.py
index 56b43799ffd358096b6ddd142853bf38acc42771..6221dbe0d4055fac0e1b80bad252a078dfcf7192 100644 (file)
--- a/hooke/plugin/curve.py
+++ b/hooke/plugin/curve.py
@@ -5,15 +5,15 @@
 #
 # This file is part of Hooke.
 #
-# Hooke is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation, either
-# version 3 of the License, or (at your option) any later version.
+# Hooke is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
 #
-# Hooke is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# Hooke is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
+# Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with Hooke.  If not, see
@@ -163,7 +163,7 @@ True if you want the column-naming header line.
             help=self.__doc__, plugin=plugin)
 
     def _run(self, hooke, inqueue, outqueue, params):
-        data = params['curve'].data[int(params['block'])] # HACK, int() should be handled by ui
+        data = params['curve'].data[params['block']]
 
         f = open(params['output'], 'w')
         if params['header'] == True:
@@ -172,11 +172,7 @@ True if you want the column-naming header line.
         f.close()
 
 class DifferenceCommand (Command):
-    """Calculate the derivative (actually, the discrete differentiation)
-    of a curve data block.
-
-    See :func:`hooke.util.calculus.derivative` for implementation
-    details.
+    """Calculate the difference between two blocks of data.
     """
     def __init__(self, plugin):
         super(DifferenceCommand, self).__init__(
@@ -213,7 +209,11 @@ Column of data block to differentiate.
         outqueue.put(out)
 
 class DerivativeCommand (Command):
-    """Calculate the difference between two blocks of data.
+    """Calculate the derivative (actually, the discrete differentiation)
+    of a curve data block.
+
+    See :func:`hooke.util.calculus.derivative` for implementation
+    details.
     """
     def __init__(self, plugin):
         super(DerivativeCommand, self).__init__(