p105 - commented import in Grapher as its not used yet, reverted bug i introduced in p90
This commit is contained in:
		
							parent
							
								
									96e9a0112f
								
							
						
					
					
						commit
						6926306147
					
				|  | @ -20,7 +20,7 @@ import pygtk | ||||||
| pygtk.require('2.0') | pygtk.require('2.0') | ||||||
| import gtk | import gtk | ||||||
| import os | import os | ||||||
| import pokereval | #import pokereval | ||||||
| 
 | 
 | ||||||
| try: | try: | ||||||
| 	from matplotlib.figure import Figure | 	from matplotlib.figure import Figure | ||||||
|  | @ -49,12 +49,12 @@ class GuiGraphViewer (threading.Thread): | ||||||
| 		site=self.siteTBuffer.get_text(self.siteTBuffer.get_start_iter(), self.siteTBuffer.get_end_iter()) | 		site=self.siteTBuffer.get_text(self.siteTBuffer.get_start_iter(), self.siteTBuffer.get_end_iter()) | ||||||
| 		 | 		 | ||||||
| 		if site=="PS": | 		if site=="PS": | ||||||
| 			site=1 |  | ||||||
| 		elif site=="FTP": |  | ||||||
| 			site=2 | 			site=2 | ||||||
|  | 		elif site=="FTP": | ||||||
|  | 			site=1 | ||||||
| 		else: | 		else: | ||||||
| 			print "invalid text in site selection in graph, defaulting to PS" | 			print "invalid text in site selection in graph, defaulting to PS" | ||||||
| 			site=1 | 			site=2 | ||||||
| 		 | 		 | ||||||
| 		self.fig = Figure(figsize=(5,4), dpi=100) | 		self.fig = Figure(figsize=(5,4), dpi=100) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -993,16 +993,14 @@ def recogniseGametypeID(cursor, topline, smallBlindLine, site_id, category, isTo | ||||||
| 	pos1=pos2+2 | 	pos1=pos2+2 | ||||||
| 	if isTourney: | 	if isTourney: | ||||||
| 		pos1-=1	 | 		pos1-=1	 | ||||||
| 	if (site_id==2): #ftp | 	if (site_id==1): #ftp | ||||||
| 		pos2=topline.find(" ", pos1) | 		pos2=topline.find(" ", pos1) | ||||||
| 	elif (site_id==1): #ps | 	elif (site_id==2): #ps | ||||||
| 		pos2=topline.find(")") | 		pos2=topline.find(")") | ||||||
| 	 | 	 | ||||||
| 	if pos2<=pos1: | 	if pos2<=pos1: | ||||||
| 		pos2=topline.find(")", pos1) | 		pos2=topline.find(")", pos1) | ||||||
| 	 | 	 | ||||||
| 	#pos2-=1 |  | ||||||
| 	 |  | ||||||
| 	if isTourney: | 	if isTourney: | ||||||
| 		big_bet=int(topline[pos1:pos2]) | 		big_bet=int(topline[pos1:pos2]) | ||||||
| 	else: | 	else: | ||||||
|  | @ -1136,10 +1134,10 @@ def recogniseSite(line): | ||||||
| #returns the ID of the given site | #returns the ID of the given site | ||||||
| def recogniseSiteID(cursor, site): | def recogniseSiteID(cursor, site): | ||||||
| 	if (site=="ftp"): | 	if (site=="ftp"): | ||||||
| 		return 2 | 		return 1 | ||||||
| 		#cursor.execute("SELECT id FROM Sites WHERE name = ('Full Tilt Poker')") | 		#cursor.execute("SELECT id FROM Sites WHERE name = ('Full Tilt Poker')") | ||||||
| 	elif (site=="ps"): | 	elif (site=="ps"): | ||||||
| 		return 1 | 		return 2 | ||||||
| 		#cursor.execute("SELECT id FROM Sites WHERE name = ('PokerStars')") | 		#cursor.execute("SELECT id FROM Sites WHERE name = ('PokerStars')") | ||||||
| 	else: | 	else: | ||||||
| 		raise FpdbError("invalid site in recogniseSiteID: "+site) | 		raise FpdbError("invalid site in recogniseSiteID: "+site) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user