github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/coolprop/coolprop

Browse Source
This commit is contained in:
Ian Bell
2015-02-21 12:58:32 -07:00
parent e2110153aa d438d42eb8
commit 7cb2508192
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
dev/incompressible_liquids/CPIncomp/WriterObjects.py
View File

@@ -103,7 +103,7 @@ class SolutionDataWriter(object):
self.isportrait = True
self.resolveRef = True # Resolve references and print text
# # Latex document mode
# Latex document mode
# self.ext = "pgf"
# self.usebp = True
# self.ispage = False # Do you want a page or a figure?
@@ -888,6 +888,14 @@ class SolutionDataWriter(object):
annotateSettingsText['fontsize'] = 'small'
annotateSettingsText['fontweight'] = 'medium'
#ax.set_title('Fitting Report for {0}'.format(solObj.name))
yHead = 0.0
if self.ispage:
yHead = 0.8
ax.text(0.5, yHead, 'Fitting Report for {0}'.format(solObj.name), **annotateSettingsTitle)
yHead += 0.2
def myAnnotate(label,text,x=0.0,y=0.0):
dx = 0.005
ax.text(x-dx,y, label, **annotateSettingsLabel)
@@ -896,19 +904,8 @@ class SolutionDataWriter(object):
#ax.annotate(r'Enthalpy [$\mathdefault{10^5\!J/kg}$]', xy=(0.25, 0.03), **annotateSettings)
#ax.annotate(r'Enthalpy [$\mathdefault{10^5\!J/kg}$]', xy=(0.25, 0.03), **annotateSettings)
#ax.set_title('Fitting Report for {0}'.format(solObj.name))
if self.ispage:
yHead = 0.8
ax.text(0.5, yHead, 'Fitting Report for {0}'.format(solObj.name), **annotateSettingsTitle)
yHead += 0.2
dx = 0.50
dy = 0.10
else:
yHead = 0.0
dx = 0.50
dy = 0.075
dx = 0.50
dy = 0.10
xStart = 0.175 ; x = xStart
yStart = 0.575; y = yStart
@@ -919,6 +916,8 @@ class SolutionDataWriter(object):
else:
myAnnotate('Description: ',solObj.description,x=x,y=y); x += .0; y -= dy
# TODO: Debug bibtexer
refs = solObj.reference.split(",")
maxLength = 75
@@ -1011,14 +1010,14 @@ class SolutionDataWriter(object):
xmin = 0
xmax = 1
ymin = y+2*dy
ymin = y+1*dy
ymax = max(yStart,yHead)
ax.set_xlim((xmin,xmax))
ax.set_ylim((ymin,ymax))
#xpos,ypos = ax.transAxes.inverted().transform(ax.transData.transform((0,y)))
return [xmin,y+0.75*dy,xmax,y+0.75*dy]
return [xmin,y+0.5*dy,xmax,y+0.5*dy]
def printFitDetails(self):
pass
@@ -1195,13 +1194,13 @@ class SolutionDataWriter(object):
#TODO: Fix this problem: ValueError: Can only output finite numbers in PDF
if self.ext=="pdf" and self.usetex:
warn("This is a dangerous combination, be prepared to experience problems with the PDF backend. It might help to manually change the number of columns.")
warn("This is a dangerous combination, be prepared to experience problems with the PDF backend. It might help manually change the number of columns.")
else:
table_axis.legend(
legVal, legKey,
bbox_to_anchor=tuple(lims),
bbox_transform=table_axis.transData,
ncol=len(legVal), loc=10,
ncol=len(legVal), loc=9,
mode="expand", borderaxespad=0.,
numpoints=1, fontsize='small')
#table_axis.legend(handles, labels, bbox_to_anchor=(0.0, -0.1), loc=2, ncol=3)