From: W. Trevor King <wking@drexel.edu>
Date: Tue, 3 Aug 2010 10:51:55 +0000 (-0400)
Subject: Consolidated point-handling modules in hooke.ui.gui into gui.dialog.points
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0b378ead3fd5bd512a09c0c69cdabdf478896e40;p=hooke.git

Consolidated point-handling modules in hooke.ui.gui into gui.dialog.points
---

diff --git a/hooke/ui/gui/clickedpoint.py b/hooke/ui/gui/clickedpoint.py
deleted file mode 100644
index 35c244c..0000000
--- a/hooke/ui/gui/clickedpoint.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-
-'''
-clickedpoint.py
-
-ClickedPoint class for Hooke.
-
-Copyright 2010 by Dr. Rolf Schmidt (Concordia University, Canada)
-
-This program is released under the GNU General Public License version 2.
-'''
-
-from scipy import arange
-
-class ClickedPoint(object):
-    '''
-    This class defines what a clicked point on the curve plot is.
-    '''
-    def __init__(self):
-
-        self.is_marker = None #boolean ; decides if it is a marker
-        self.is_line_edge = None #boolean ; decides if it is the edge of a line (unused)
-        self.absolute_coords = (None, None) #(float,float) ; the absolute coordinates of the clicked point on the graph
-        self.graph_coords = (None, None) #(float,float) ; the coordinates of the plot that are nearest in X to the clicked point
-        self.index = None #integer ; the index of the clicked point with respect to the vector selected
-        self.dest = None #0 or 1 ; 0=top plot 1=bottom plot
-
-    def find_graph_coords(self, xvector, yvector):
-        '''
-        Given a clicked point on the plot, finds the nearest point in the dataset (in X) that
-        corresponds to the clicked point.
-        '''
-        dists = []
-        for index in arange(1, len(xvector), 1):
-            dists.append(((self.absolute_coords[0] - xvector[index]) ** 2)+((self.absolute_coords[1] - yvector[index]) ** 2))
-
-        self.index=dists.index(min(dists))
-        self.graph_coords=(xvector[self.index], yvector[self.index])
diff --git a/hooke/ui/gui/dialog/points.py b/hooke/ui/gui/dialog/points.py
index 65ea3aa..e4d3652 100644
--- a/hooke/ui/gui/dialog/points.py
+++ b/hooke/ui/gui/dialog/points.py
@@ -1,4 +1,7 @@
-# Copyright (C) 2010 W. Trevor King <wking@drexel.edu>
+# Copyright (C) 2008-2010 Alberto Gomez-Casado
+#                         Fabrizio Benedetti
+#                         Massimo Sandal <devicerandom@gmail.com>
+#                         W. Trevor King <wking@drexel.edu>
 #
 # This file is part of Hooke.
 #
@@ -16,9 +19,37 @@
 # License along with Hooke.  If not, see
 # <http://www.gnu.org/licenses/>.
 
+from numpy import arange
+
 import wx
 
 
+class ClickedPoint(object):
+    """Defines a clicked point from a curve plot.
+    """
+    def __init__(self):
+
+        self.is_marker=None #boolean ; decides if it is a marker
+        self.is_line_edge=None #boolean ; decides if it is the edge of a line (unused)
+        self.absolute_coords=(None,None) #(float,float) ; the absolute coordinates of the clicked point on the graph
+        self.graph_coords=(None,None) #(float,float) ; the coordinates of the plot that are nearest in X to the clicked point
+        self.index=None #integer ; the index of the clicked point with respect to the vector selected
+        self.dest=None #0 or 1 ; 0=top plot 1=bottom plot
+
+    def find_graph_coords(self,xvector,yvector):
+        """Find the point in the dataset that is closest to `self`.
+
+        Given a clicked point on the plot, finds the nearest point in
+        the dataset (in X) that corresponds to the clicked point.
+        """
+        dists=[]
+        for index in arange(1,len(xvector),1):
+            dists.append(((self.absolute_coords[0]-xvector[index])**2)+((self.absolute_coords[1]-yvector[index])**2))
+
+        self.index=dists.index(min(dists))
+        self.graph_coords=(xvector[self.index],yvector[self.index])
+
+
 def measure_N_points(hooke_frame, N, message='', block=0):
     '''
     General helper function for N-points measurements
diff --git a/hooke/ui/gui/plotcommands.py b/hooke/ui/gui/plotcommands.py
deleted file mode 100644
index ae17f2e..0000000
--- a/hooke/ui/gui/plotcommands.py
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright (C) 2010 W. Trevor King <wking@drexel.edu>
-#
-# 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/>.
-
-#PLOT INTERACTION COMMANDS
-#-------------------------------
-    def help_plot(self):
-        print '''
-PLOT
-Plots the current force curve
--------
-Syntax: plot
-        '''
-    def do_plot(self,args):
-        if self.current.identify(self.drivers) == False:
-            return
-        self.plots=self.current.curve.default_plots()
-        try:
-            self.plots=self.current.curve.default_plots()
-        except Exception, e:
-            print 'Unexpected error occurred in do_plot().'
-            print e
-            return
-
-        #apply the plotmanip functions eventually present
-        nplots=len(self.plots)
-        c=0
-        while c<nplots:
-            for function in self.plotmanip: #FIXME: something strange happens about self.plotmanip[0]
-                self.plots[c]=function(self.plots[c], self.current)
-
-            self.plots[c].xaxes=self.config['xaxes'] #FIXME: in the future, xaxes and yaxes should be set per-plot
-            self.plots[c].yaxes=self.config['yaxes']
-
-            c+=1
-
-        self._send_plot(self.plots)
-
-    def _delta(self, set=1):
-        '''
-        calculates the difference between two clicked points
-        '''
-        print 'Click two points'
-        points=self._measure_N_points(N=2, whatset=set)
-        dx=abs(points[0].graph_coords[0]-points[1].graph_coords[0])
-        dy=abs(points[0].graph_coords[1]-points[1].graph_coords[1])
-        unitx=self.plots[points[0].dest].units[0]
-        unity=self.plots[points[0].dest].units[1]
-        return dx,unitx,dy,unity
-
-    def do_delta(self,args):
-        '''
-        DELTA
-
-        Measures the delta X and delta Y between two points.
-        ----
-        Syntax: delta
-        '''
-        dx,unitx,dy,unity=self._delta()
-        print str(dx)+' '+unitx
-        print str(dy)+' '+unity
-
-    def _point(self, set=1):
-        '''calculates the coordinates of a single clicked point'''
-
-        print 'Click one point'
-        point=self._measure_N_points(N=1, whatset=set)
-
-        x=point[0].graph_coords[0]
-        y=point[0].graph_coords[1]
-        unitx=self.plots[point[0].dest].units[0]
-        unity=self.plots[point[0].dest].units[1]
-        return x,unitx,y,unity
-
-    def do_point(self,args):
-        '''
-        POINT
-
-        Returns the coordinates of a point on the graph.
-        ----
-        Syntax: point
-        '''
-        x,unitx,y,unity=self._point()
-        print str(x)+' '+unitx
-        print str(y)+' '+unity
-        to_dump='point '+self.current.path+' '+str(x)+' '+unitx+', '+str(y)+' '+unity
-        self.outlet.push(to_dump)
-
-
-    def do_close(self,args=None):
-        '''
-        CLOSE
-        Closes one of the two plots. If no arguments are given, the bottom plot is closed.
-        ------
-        Syntax: close [top,bottom]
-        '''
-        if args=='top':
-            to_close=0
-        elif args=='bottom':
-            to_close=1
-        else:
-            to_close=1
-
-        close_plot=self.list_of_events['close_plot']
-        wx.PostEvent(self.frame, close_plot(to_close=to_close))
-
-    def do_show(self,args=None):
-        '''
-        SHOW
-        Shows both plots.
-        '''
-        show_plots=self.list_of_events['show_plots']
-        wx.PostEvent(self.frame, show_plots())
-
-#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 _get_displayed_plot(self,dest=0):
-        '''
-        returns the currently displayed plot.
-        '''
-        wx.PostEvent(self.frame, self.list_of_events['get_displayed_plot'](dest=dest))
-        while 1:
-            try:
-                displayed_plot=self.events_from_gui.get()
-            except Empty:
-                pass
-            if displayed_plot:
-                break
-        return displayed_plot
-
-    def _send_plot(self,plots):
-        '''
-        sends a plot to the GUI
-        '''
-        wx.PostEvent(self.frame, self.list_of_events['plot_graph'](plots=plots))
-        return
-
-    def _find_plotmanip(self, name):
-        '''
-        returns a plot manipulator function from its name
-        '''
-        return self.plotmanip[self.config['plotmanips'].index(name)]
-
-    def _clickize(self, xvector, yvector, index):
-        '''
-        returns a ClickedPoint() object from an index and vectors of x, y coordinates
-        '''
-        point=ClickedPoint()
-        point.index=index
-        point.absolute_coords=xvector[index],yvector[index]
-        point.find_graph_coords(xvector,yvector)
-        return point
diff --git a/hooke/ui/gui/point_request.py b/hooke/ui/gui/point_request.py
deleted file mode 100644
index ef17dce..0000000
--- a/hooke/ui/gui/point_request.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (C) 2008-2010 Alberto Gomez-Casado
-#                         Fabrizio Benedetti
-#                         Massimo Sandal <devicerandom@gmail.com>
-#                         W. Trevor King <wking@drexel.edu>
-#
-# 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/>.
-
-class ClickedPoint(object):
-    '''
-    this class defines what a clicked point on the curve plot is
-    '''
-    def __init__(self):
-
-        self.is_marker=None #boolean ; decides if it is a marker
-        self.is_line_edge=None #boolean ; decides if it is the edge of a line (unused)
-        self.absolute_coords=(None,None) #(float,float) ; the absolute coordinates of the clicked point on the graph
-        self.graph_coords=(None,None) #(float,float) ; the coordinates of the plot that are nearest in X to the clicked point
-        self.index=None #integer ; the index of the clicked point with respect to the vector selected
-        self.dest=None #0 or 1 ; 0=top plot 1=bottom plot
-
-
-    def find_graph_coords_old(self, xvector, yvector):
-        '''
-        Given a clicked point on the plot, finds the nearest point in the dataset (in X) that
-        corresponds to the clicked point.
-        OLD & DEPRECATED - to be removed
-        '''
-
-        #FIXME: a general algorithm using min() is needed!
-        best_index=0
-        best_dist=10**9 #should be more than enough given the scale
-
-        for index in scipy.arange(1,len(xvector),1):
-            dist=((self.absolute_coords[0]-xvector[index])**2)+(100*((self.absolute_coords[1]-yvector[index])))**2
-                #TODO, generalize? y coordinate is multiplied by 100 due to scale differences in the plot
-            if dist<best_dist:
-                best_index=index
-                best_dist=dist
-
-        self.index=best_index
-        self.graph_coords=(xvector[best_index],yvector[best_index])
-        return
-
-    def find_graph_coords(self,xvector,yvector):
-        '''
-        Given a clicked point on the plot, finds the nearest point in the dataset (in X) that
-        corresponds to the clicked point.
-        '''
-        dists=[]
-        for index in scipy.arange(1,len(xvector),1):
-            dists.append(((self.absolute_coords[0]-xvector[index])**2)+((self.absolute_coords[1]-yvector[index])**2))
-
-        self.index=dists.index(min(dists))
-        self.graph_coords=(xvector[self.index],yvector[self.index])