Allows drag dialog grabbed points to be changed before OK

dtmilano · dtmilano · commit 798db37a263e · 2014-11-04T22:18:41.000-05:00
diff --git a/.pydevproject b/.pydevproject
@@ -6,7 +6,5 @@
 <path>/AndroidViewClient/src</path>
 <path>/AndroidViewClient/examples</path>
 </pydev_pathproperty>
-<pydev_pathproperty name="org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH">
-<path>/usr/local/lib/python2.7/site-packages/PIL</path>
-</pydev_pathproperty>
+
 </pydev_project>
diff --git a/src/com/dtmilano/android/culebron.py b/src/com/dtmilano/android/culebron.py
@@ -16,9 +16,10 @@
 limitations under the License.
 
 @author: Diego Torres Milano
+
 '''
 
-__version__ = '8.12.3'
+__version__ = '8.12.4'
 
 import sys
 import threading
@@ -831,6 +832,9 @@ def onGrabEp(self):
     def onGrab(self, entry):
         '''
         Generic grab method.
+        
+        @param entry: the entry being grabbed
+        @type entry: Tkinter.Entry
         '''
         
         self.culebron.setOnTouchListener(self.onTouchListener)
@@ -840,9 +844,12 @@ def onGrab(self, entry):
     def onTouchListener(self, point):
         '''
         Listens for touch events and draws the corresponding shapes on the Culebron canvas.
-        If the starting point is being grabbed it draws the toucing point via
+        If the starting point is being grabbed it draws the touching point via
         C{Culebron.drawTouchedPoint()} and if the end point is being grabbed it draws
         using C{Culebron.drawDragLine()}.
+        
+        @param point: the point touched
+        @type point: tuple
         '''
         
         x = point[0]
@@ -852,9 +859,11 @@ def onTouchListener(self, point):
         self.onValidate(value)
         self.culebron.setGrab(False)
         if self.__grabbing == self.sp:
+            self.__cleanUpSpId()
             self.spX = x
             self.spY = y
         elif self.__grabbing == self.ep:
+            self.__cleanUpEpId()
             self.epX = x
             self.epY = y
         if self.spX and self.spY and not self.spId:
@@ -864,11 +873,19 @@ def onTouchListener(self, point):
         self.__grabbing = None
         self.culebron.setOnTouchListener(None)
 
-    def cleanUp(self):
+    def __cleanUpSpId(self):
         if self.spId:
             self.culebron.canvas.delete(self.spId)
+            self.spId = None
+
+    def __cleanUpEpId(self):
         if self.epId:
             self.culebron.canvas.delete(self.epId)
+            self.epId = None
+
+    def cleanUp(self):
+        self.__cleanUpSpId()
+        self.__cleanUpEpId()
 
 
 class HelpDialog(Tkinter.Toplevel):
