Ran update-copyright.py

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

diff --git a/hooke/plugin/superimpose.py b/hooke/plugin/superimpose.py
index fdd0a3338f73cd4c944ebc1fbccf620105b1bb9b..047af6805c13334ebb04cdcf39719a364cb99525 100644 (file)
--- a/hooke/plugin/superimpose.py
+++ b/hooke/plugin/superimpose.py
@@ -1,46 +1,62 @@
-#!/usr/bin/env python
+# Copyright (C) 2008-2012 Massimo Sandal <devicerandom@gmail.com>
+#                         W. Trevor King <wking@tremily.us>
+#
+# 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 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 <http://www.gnu.org/licenses/>.
 
-from libhooke import WX_GOOD
+from ..libhooke import WX_GOOD
 import wxversion
 wxversion.select(WX_GOOD)
 from wx import PostEvent
-
-import libhookecurve as lhc
 from numpy import arange, mean
 
-class superimposeCommands:
-    
+from .. import curve as lhc
+
+class superimposeCommands(object):
+
     def _plug_init(self):
         self.imposed=[]
-    
+
     def do_selimpose(self,args):
         '''
         SELIMPOSE (superimpose.py plugin)
         Hand-selects the curve portion to superimpose
         '''
         #fixme: set to superimpose should be in args
-        
+
         if args=='clear':
             self.imposed=[]
             return
-        
+
         current_set=1
-        
+
         points=self._measure_two_points()
         boundaries=[points[0].index, points[1].index]
         boundaries.sort()
-        
+
         theplot=self.plots[0]
         #append the selected section
         self.imposed.append([])
         self.imposed[-1].append(theplot.vectors[1][0][boundaries[0]:boundaries[1]]) #x
         self.imposed[-1].append(theplot.vectors[1][1][boundaries[0]:boundaries[1]]) #y
-        
+
         #align X first point
         self.imposed[-1][0] = [item-self.imposed[-1][0][0] for item in self.imposed[-1][0]]
         #align Y first point
         self.imposed[-1][1] = [item-self.imposed[-1][1][0] for item in self.imposed[-1][1]]
-                
+
     def do_plotimpose(self,args):
         '''
         PLOTIMPOSE (sumperimpose.py plugin)
@@ -49,16 +65,16 @@ class superimposeCommands:
         imposed_object=lhc.PlotObject()
         imposed_object.vectors=self.imposed
         print 'Plotting',len(imposed_object.vectors),'imposed curves'
-        
+
         imposed_object.normalize_vectors()
-        
+
         imposed_object.units=self.plots[0].units
         imposed_object.title='Imposed curves'
         imposed_object.destination=1
-        
-        plot_graph=self.list_of_events['plot_graph']       
+
+        plot_graph=self.list_of_events['plot_graph']
         PostEvent(self.frame,plot_graph(plots=[imposed_object]))
-        
+
     def do_plotavgimpose(self,args):
         '''
         PLOTAVGIMPOSE (superimpose.py plugin)
@@ -69,10 +85,10 @@ class superimposeCommands:
         min_x=[]
         for curve in self.imposed:
             min_x.append(min(curve[0]))
-            
+
         #find minimum extension
         min_ext_limit=max(min_x)
-        
+
         x_avg=arange(step,min_ext_limit,step)
         y_avg=[]
         for value in x_avg:
@@ -80,19 +96,19 @@ class superimposeCommands:
             for curve in self.imposed:
                 for xvalue, yvalue in zip(curve[0],curve[1]):
                     if xvalue >= (value+step) and xvalue <= (value-step):
-                        to_avg.append(yvalue)                                 
+                        to_avg.append(yvalue)
             y_avg.append(mean(to_avg))
-        
+
         print 'len x len y'
         print len(x_avg), len(y_avg)
         print y_avg
-            
+
         avg_object=lhc.PlotObject()
         avg_object.vectors=[[x_avg, y_avg]]
         avg_object.normalize_vectors()
         avg_object.units=self.plots[0].units
         avg_object.title="Average curve"
         avg_object.destination=1
-         
-        plot_graph=self.list_of_events['plot_graph']       
-        PostEvent(self.frame,plot_graph(plots=[avg_object]))
\ No newline at end of file
+
+        plot_graph=self.list_of_events['plot_graph']
+        PostEvent(self.frame,plot_graph(plots=[avg_object]))