Merge git://git.assembla.com/fpdboz
This commit is contained in:
commit
6c6427af75
|
@ -63,7 +63,7 @@ class GuiBulkImport (threading.Thread):
|
||||||
if os.path.isdir(self.inputFile):
|
if os.path.isdir(self.inputFile):
|
||||||
self.import_dir()
|
self.import_dir()
|
||||||
else:
|
else:
|
||||||
self.importer.addImportFile()
|
self.importer.addImportFile(self.inputFile)
|
||||||
self.importer.runImport()
|
self.importer.runImport()
|
||||||
self.importer.clearFileList()
|
self.importer.clearFileList()
|
||||||
|
|
||||||
|
|
|
@ -51,8 +51,10 @@ class GuiGraphViewer (threading.Thread):
|
||||||
|
|
||||||
if site=="PS":
|
if site=="PS":
|
||||||
site=2
|
site=2
|
||||||
|
sitename="PokerStars: "
|
||||||
elif site=="FTP":
|
elif site=="FTP":
|
||||||
site=1
|
site=1
|
||||||
|
sitename="Full Tilt: "
|
||||||
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=2
|
site=2
|
||||||
|
@ -69,7 +71,9 @@ class GuiGraphViewer (threading.Thread):
|
||||||
self.ax.set_xlabel("Hands", fontsize = 12)
|
self.ax.set_xlabel("Hands", fontsize = 12)
|
||||||
self.ax.set_ylabel("$", fontsize = 12)
|
self.ax.set_ylabel("$", fontsize = 12)
|
||||||
self.ax.grid(color='g', linestyle=':', linewidth=0.2)
|
self.ax.grid(color='g', linestyle=':', linewidth=0.2)
|
||||||
self.ax.annotate ("All Hands, Site %s", (61,25), xytext =(0.1, 0.9) , textcoords ="axes fraction" ,)
|
text = "All Hands, " + sitename + str(name)
|
||||||
|
|
||||||
|
self.ax.annotate (text, (61,25), xytext =(0.1, 0.9) , textcoords ="axes fraction" ,)
|
||||||
|
|
||||||
#Get graph data from DB
|
#Get graph data from DB
|
||||||
line = self.getRingProfitGraph(name, site)
|
line = self.getRingProfitGraph(name, site)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user