Changeset - f125391c937d
[Not reviewed]
default
0 4 0
Laman - 6 years ago 2018-12-30 18:47:24

corners: order canonization moved to the add method
4 files changed with 13 insertions and 7 deletions:
0 comments (0 inline, 0 general)
exp/color_sampler.py
Show inline comments
 
@@ -121,13 +121,13 @@ class Sampler:
 

	
 
	def _markCorners(self):
 
		self.canvas.delete("mark")
 
		for c in self.corners:
 
			(x,y)=(c.x,c.y)
 
			self.canvas.create_oval(x-2,y-2,x+2,y+2,fill="#00ff00",tags="mark")
 
		if self.corners.canonizeOrder():
 
		if self.corners.is_canon():
 
			(a,b,c,d)=self.corners
 
			self.canvas.create_line(a.x,a.y,b.x,b.y,fill="#00ff00",tags="mark")
 
			self.canvas.create_line(b.x,b.y,c.x,c.y,fill="#00ff00",tags="mark")
 
			self.canvas.create_line(c.x,c.y,d.x,d.y,fill="#00ff00",tags="mark")
 
			self.canvas.create_line(d.x,d.y,a.x,a.y,fill="#00ff00",tags="mark")
 

	
src/analyzer/corners.py
Show inline comments
 
@@ -5,12 +5,14 @@ from .epoint import EPoint
 
log=logging.getLogger(__name__)
 

	
 

	
 
class Corners:
 
	def __init__(self,cornerList=[]):
 
		self._corners=cornerList[:]
 
		self._is_canon=False
 
		self._canonizeOrder()
 

	
 
	## Adds a new corner if there are less than four, replaces the closest otherwise.
 
	def add(self,x,y):
 
		a=EPoint(x,y)
 
		# for i,c in enumerate(self.corners): # move an improperly placed point
 
			# if a.dist(c)<20:
 
@@ -26,12 +28,13 @@ class Corners:
 
		index,minDist=0,float('inf') # replace the corner closest to the clicked point
 
		for i,c in enumerate(self._corners):
 
			if a.dist(c)<minDist:
 
				index,minDist=i,a.dist(c)
 

	
 
		self._corners[index]=a
 
		self._canonizeOrder()
 

	
 
	## 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.
 
	#
 
@@ -48,22 +51,22 @@ class Corners:
 
	#  A DCB        |  -  |  -  |  -  |  -  |     0 | BD
 
	#
 
	#  For every non-degenerate quadrangle, there must be 1-3 edges going right-left (from a higher to a lower x coordinate).
 
	#  From these pick the one with the lowest slope (dy/dx) and declare its ending point the upper left corner. For the same slope pick the one further left.
 
	#
 
	#  @return True for a convex quadrangle, False for concave and degenerate cases.
 
	def canonizeOrder(self):
 
		if len(self._corners)!=4: return False # erroneus call
 
	def _canonizeOrder(self):
 
		if len(self._corners)!=4: self._is_canon=False
 

	
 
		a,b,c,d=self._corners
 
		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
 
		if any(x==0 for x in (abc,abd,acd,bcd)): self._is_canon=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
 
		swap=swaps[index//3]
 

	
 
@@ -79,23 +82,26 @@ class Corners:
 
				kIndex=ii
 
				lowestSlope=slope
 

	
 
		self._corners= self._corners[kIndex:] + self._corners[:kIndex] # rotate the upper left corner to the first place
 

	
 
		log.debug(self._corners)
 
		return True # success
 
		self._is_canon=True # success
 

	
 
	def scale(self,scale):
 
		self._corners=[c * scale for c in self._corners]
 

	
 
	def __iter__(self):
 
		return iter(self._corners)
 

	
 
	def __len__(self):
 
		return len(self._corners)
 

	
 
	def is_canon(self):
 
		return self._is_canon
 

	
 

	
 
## 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)
src/analyzer/grid.py
Show inline comments
 
@@ -18,13 +18,13 @@ class Grid:
 
	#
 
	#  The horizon can be used to construct a matrix for affine rectification of the image (restoring parallel lines parallelism). We transform the corner points by this matrix,
 
	#  interpolate them to get proper intersections' coordinates and then transform these back to get their placement at the original image.
 
	#
 
	#  The result is stored in grid.intersections, a boardSize*boardSize list with [row][column] coordinates.
 
	#
 
	#  @param corners list of EPoints in ABCD order per corners.Corners.canonizeOrder().
 
	#  @param corners iterable of 4 EPoints in ABCD order per corners.Corners._canonizeOrder().
 
	# !! Needs a check for proper initialization.
 
	def __init__(self,corners):
 
		# ad
 
		# bc
 
		a,b,c,d=[c.toProjective() for c in corners]
 

	
src/gui/imgview.py
Show inline comments
 
@@ -60,13 +60,13 @@ class ImgView(ResizableCanvas):
 
		self._img=img
 

	
 
	## Stores a grid corner located at x,y coordinates.
 
	def addCorner(self,x,y):
 
		self._corners.add(x,y)
 
		log.debug("click on %d,%d",x,y)
 
		if self._corners.canonizeOrder():
 
		if self._corners.is_canon():
 
			# transform corners from show coordinates to real coordinates
 
			self._boardGrid=Grid(self._corners)
 
			corners=[self._transformPoint(c) for c in self._corners]
 
			self._gui.detector.setCorners(corners)
 
			self._gui.preview()
 

	
0 comments (0 inline, 0 general)