OneEye Changeset - ac065d1dfcab

Changeset - ac065d1dfcab

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Laman - 6 years ago 2019-01-05 16:59:37

annotations accomodated for multiple boards present

1 file changed with 28 insertions and 12 deletions:

exp/color_sampler.py

0 comments (0 inline, 0 general)

exp/color_sampler.py

➞

Show inline comments

@@ @@ -19,25 +19,26 @@ class Sampler: @@
 	def __init__(self,dirname,annotations):
 		self.dirname=dirname
 		self.annotations=DataFile(annotations)
 		self.filenames=[f for f in sorted(os.listdir(self.dirname)) if f.endswith(".jpg")]
 		self.k=0
 		self.img=None
 		self.photo=None
 		self.letter="_"
 		self.hsv=(0,0,0)
 		self.pos=(0,0)
 		self.corners=Corners()
 		self.m=0
 		self._corners=[Corners()]
 		self._dirty=False
 		self._createGUI()
 	def sample(self,e):
 		try:
 			(r,g,b)=(x/255 for x in self.img.getpixel((e.x,e.y)))
 		except IndexError:
 			return
 		(h,s,v)=map(lambda x: round(x,3), rgb_to_hsv(r,g,b))
 		self.hsv=(h,s,v)
@@ @@ -47,40 +48,47 @@ class Sampler: @@
 	def printSample(self):
 		print("\t".join(map(str, (self.filenames[self.k],*self.pos,self.letter,*self.hsv))))
 	def showImage(self):
 		self.img=Image.open(os.path.join(self.dirname,self.filenames[self.k]))
 		(w,h)=self.img.size
 		self.photo=ImageTk.PhotoImage(self.img)
 		self.canvas.delete("all")
 		self.canvas.create_image(0,0,image=self.photo,anchor="nw")
 		self.canvas.configure(width=w,height=h)
 		self.corners=Corners(self.annotations.get(self.filenames[self.k]) or [])
 		self.m=0
 		corners=self.annotations.get(self.filenames[self.k]) or []
 		self._corners=[Corners(c) for c in corners+[[]]]
 		self._markCorners()
 	def switchImage(self,step):
 		self.save()
 		n=len(self.filenames)
 		self.k=(self.k+step+n)%n
 		self.showImage()
 	def switchCorners(self,step):
 		n=len(self._corners)
 		self.m=(self.m+step+n)%n
 		self._markCorners()
 	def setLetter(self,c):
 		self.letter=c
 		self.letterLabel.configure(text="Letter: {0}".format(c))
 	def addCorner(self,e):
 		self.corners.add(e.x,e.y)
-		self.annotations[self.filenames[self.k]]=list(self.corners)
+		self.annotations[self.filenames[self.k]]=[list(corns) for corns in self._corners if len(corns)>0]
 		self._dirty=True
 		self._markCorners()
 	def save(self):
 		if self._dirty:
 			self.annotations.save()
 			self.dirty=False
 	def _createGUI(self):
 		root=tk.Tk()
 		frame=tk.Frame(root)
 		frame.grid(column=0,row=0,sticky=(N,S,E,W))
@@ @@ -89,52 +97,60 @@ class Sampler: @@
 		self.canvas.grid(row=1,column=0)
 		bar=self._createBar(frame)
 		bar.grid(row=2,column=0,sticky=(E,W))
 		self.showImage()
 		self.canvas.bind('<1>',lambda e: self.printSample())
 		self.canvas.bind('<3>',self.addCorner)
 		self.canvas.bind("<Motion>",self.sample)
 		root.bind("<Left>",lambda e: self.switchImage(-1))
 		root.bind("<Right>",lambda e: self.switchImage(1))
 		root.bind("<Up>",lambda e: self.switchCorners(-1))
 		root.bind("<Down>",lambda e: self.switchCorners(1))
 		root.bind("<b>",lambda e: self.setLetter("b"))
 		root.bind("<e>",lambda e: self.setLetter("e"))
 		root.bind("<w>",lambda e: self.setLetter("w"))
 		root.mainloop()
 	def _createBar(self,frame):
 		bar=tk.Frame(frame,height=20,borderwidth=1,relief="sunken")
 		self.letterLabel=tk.Label(bar,width=8,text="Letter: _")
 		self.letterLabel.pack(side=LEFT)
 		self.posLabel=tk.Label(bar,width=16,text="(,)")
 		self.posLabel.pack(side=LEFT)
 		self.colorLabel=tk.Label(bar,width=20,text="HSV: (,,)")
 		self.colorLabel.pack(side=LEFT)
 		return bar
 	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.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")
 		for corns in self._corners:
 			for c in corns:
 				(x,y)=(c.x,c.y)
 				self.canvas.create_oval(x-2,y-2,x+2,y+2,fill="#00ff00",tags="mark")
 			if corns.is_canon():
 				(a,b,c,d)=corns
 				dash=tuple() if corns is self.corners else (4,4)
 				self.canvas.create_line(a.x,a.y,b.x,b.y,fill="#00ff00",dash=dash,tags="mark")
 				self.canvas.create_line(b.x,b.y,c.x,c.y,fill="#00ff00",dash=dash,tags="mark")
 				self.canvas.create_line(c.x,c.y,d.x,d.y,fill="#00ff00",dash=dash,tags="mark")
 				self.canvas.create_line(d.x,d.y,a.x,a.y,fill="#00ff00",dash=dash,tags="mark")
 	@property
 	def corners(self):
 		return self._corners[self.m]
 class DataFile(MutableMapping):
 	"""self._data: {filename: [EPoint,EPoint,EPoint,EPoint]}"""
 	def __init__(self,filename):
 		self.filename=filename
 		try:
 			with gzip.open(filename,mode="rt",encoding="utf8") as f:
 				self._data=json.load(f,object_hook=self.deserialize)
 		except OSError:
 			self._data=dict()

0 comments (0 inline, 0 general)