OneEye Changeset - 5bf35728ab2b

Changeset - 5bf35728ab2b

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Laman - 8 years ago 2017-04-08 15:46:56

imgView fix: grid stays on its place on resize. refactored Corners a little

2 files changed with 23 insertions and 18 deletions:

src/corners.py

src/gui/imgview.py

0 comments (0 inline, 0 general)

src/corners.py

➞

Show inline comments

@@ @@ -23,25 +23,12 @@ class Corners: @@
 		for i,c in enumerate(self.corners):
 			if a.dist(c)<minDist:
 				index,minDist=i,a.dist(c)
 		self.corners[index]=a
 	## Computes twice the area of the triangle formed by points a,b,c.
+	#
 	#  @return positive value for points oriented counter-clockwise, negative for clockwise, zero for degenerate cases.
 	def _doubleTriangleArea(a,b,c):
 		return (a.x-b.x)*(c.y-a.y)-(c.x-a.x)*(a.y-b.y)
 	def _slope(a,b):
 		if(b.x==a.x): return float("inf")
 		return (b.y-a.y)/(b.x-a.x)
 	## Order the corners (0,1,2,3) so they make a quadrangle with vertices KLMN in counter-clockwise order, K being in the upper left.
+	#
 	#  For four points ABCD, there are 24 possible permutations corresponding to the desired KLMN.
 	#  When we relax the condition of K being the upper left one, we get six groups of four equivalent permutations. KLMN ~ LMNK ~ MNKL ~ NKLM.
+	#
 	#  We determine which of the points' triplets are oriented clockwise and which counter-clockwise (minus/plus in the table below)
@@ @@ -61,16 +48,16 @@ class Corners: @@
+	#
 	#  @return True for a convex quadrangle, False for concave and degenerate cases.
 	def canonizeOrder(self):
 		if len(self.corners)!=4: return False # erroneus call
 		a,b,c,d=self.corners
 		abc=Corners._doubleTriangleArea(a,b,c)
 		abd=Corners._doubleTriangleArea(a,b,d)
 		acd=Corners._doubleTriangleArea(a,c,d)
 		bcd=Corners._doubleTriangleArea(b,c,d)
 		abc=doubleTriangleArea(a,b,c)
 		abd=doubleTriangleArea(a,b,d)
 		acd=doubleTriangleArea(a,c,d)
 		bcd=doubleTriangleArea(b,c,d)
 		if any(x==0 for x in (abc,abd,acd,bcd)): return False # collinear degenerate
 		swaps=[(1,3),(0,1),(1,2),(0,3),(2,3),(0,0)]
 		index=(8 if abc>0 else 0)|(4 if abd>0 else 0)|(2 if acd>0 else 0)|(1 if bcd>0 else 0)
 		if index%3!=0: return False # concave degenerate
@@ @@ -80,14 +67,29 @@ class Corners: @@
 		kIndex=None
 		lowestSlope=float("inf")
 		for i,corner in enumerate(self.corners): # find the NK edge: going right-left with the lowest slope, secondarily the one going down
 			ii=(i+1)%4
-			slope=abs(Corners._slope(corner,self.corners[ii]))
+			slope=abs(getSlope(corner,self.corners[ii]))
 			if corner.x>self.corners[ii].x and (slope<lowestSlope or (slope==lowestSlope and corner.y<self.corners[ii].y)):
 				kIndex=ii
 				lowestSlope=slope
 		self.corners=self.corners[kIndex:]+self.corners[:kIndex] # rotate the upper left corner to the first place
 		return True # success
 	def scale(self,scale):
 		self.corners=[c*scale for c in self.corners]
 ## Computes twice the area of the triangle formed by points a,b,c.
+#
 #  @return positive value for points oriented counter-clockwise, negative for clockwise, zero for degenerate cases.
 def doubleTriangleArea(a,b,c):
 	return (a.x-b.x)*(c.y-a.y)-(c.x-a.x)*(a.y-b.y)
 def getSlope(a,b):
 	if(b.x==a.x): return float("inf")
 	return (b.y-a.y)/(b.x-a.x)

src/gui/imgview.py

➞

Show inline comments

@@ @@ -80,8 +80,11 @@ class ImgView(ResizableCanvas): @@
 	## Marks a point at the image with a green cross. Used for corners.
 	def markPoint(self,x,y):
 		self.create_line(x-3,y-3,x+4,y+4,fill="#00ff00")
 		self.create_line(x-3,y+3,x+4,y-4,fill="#00ff00")
 	def _onResize(self,event):
 		w=self._width
 		super()._onResize(event)
 		self._corners.scale(self._width/w)
 		self._boardGrid=Grid(self._corners.corners)
 		self.redraw()

0 comments (0 inline, 0 general)