update

	modified:   .gitignore
		don't ignore png files
	new file:   resource/big.png
	new file:   resource/brush.png
	new file:   resource/pen1.png
	new file:   resource/pen2.png
	new file:   resource/small.png
		add resource files
	modified:   src/painter.py
		query when mouse up

.gitignore

@@ -3,6 +3,5 @@
 *.pkl
 *.mat
 
-*.png
-*.jpg
+test.jpg
 data/

src/painter.py

@@ -24,7 +24,7 @@ def __init__(self, screen, im):
 		# if style is False, png brush
 		self.style = False
 		# load brush style png
-		self.brush = pygame.image.load("brush.png").convert_alpha()
+		self.brush = pygame.image.load("../resource/brush.png").convert_alpha()
 		# set the current brush depends on size
 		self.brush_now = self.brush.subsurface((0,0), (1, 1))
 
@@ -113,17 +113,17 @@ def __init__(self, screen):
 			self.colors_rect.append(rect)
 
 		self.pens = [
-				pygame.image.load("pen1.png").convert_alpha(),
-				pygame.image.load("pen2.png").convert_alpha()
+				pygame.image.load("../resource/pen1.png").convert_alpha(),
+				pygame.image.load("../resource/pen2.png").convert_alpha()
 			]
 		self.pens_rect = []
 		for (i, img) in enumerate(self.pens):
 			rect = pygame.Rect(10, 10 + i * 64, 64, 64)
 			self.pens_rect.append(rect)
 
 		self.sizes = [
-				pygame.image.load("big.png").convert_alpha(),
-				pygame.image.load("small.png").convert_alpha()
+				pygame.image.load("../resource/big.png").convert_alpha(),
+				pygame.image.load("../resource/small.png").convert_alpha()
 			]
 		self.sizes_rect = []
 		for (i, img) in enumerate(self.sizes):
@@ -250,7 +250,7 @@ def run(self):
 						self.screen.fill((255, 255, 255))
 						self.im.clear()
 					elif event.key == K_s:
-						self.update(self.im.convert())
+						self.update()
 				elif event.type == MOUSEBUTTONDOWN:
 					# coarse judge here can save much time
 					if event.pos[0] < 80:
@@ -260,27 +260,29 @@ def run(self):
 				elif event.type == MOUSEMOTION:
 					if event.pos[0] < 80 or event.pos[0] >= 680:
 						self.brush.end_draw()
+						self.update()
 					else:
 						self.brush.draw(event.pos)
 				elif event.type == MOUSEBUTTONUP or event.type == ACTIVEEVENT and event.gain == 0:
 					self.brush.end_draw()
+					self.update()
 
 			self.menu.draw()
 			try:
 				self.board.update(self.queue.get_nowait())
 			except Empty:
 				pass
-			if self.process is not None and not self.process.is_alive():
-				self.process = None
 			self.board.draw()
 			pygame.display.update()
 
-	def update(self, d):
+	def update(self):
+		d = self.im.convert()
 		#query.query(self.mData, d)
 		#thread.start_new_thread(query.query, (self.mData, d))
-		if self.process is None:
-			self.process = Process(target = do_query, args = (self.mData, d, self.queue))
-			self.process.start()
+		if self.process is not None and self.process.is_alive():
+			self.process.terminate()
+		self.process = Process(target = do_query, args = (self.mData, d, self.queue))
+		self.process.start()
 
 if __name__ == '__main__':
 	app = Painter()