Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rotated text location and remove background color to improve the fanchart display in ODF format (#0001072)

Browse Source 
svn: r8652
This commit is contained in:
Brian Matherly 2007-06-24 21:00:25 +00:00
parent f93fef3422
commit 343673f696
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-06-24 Brian Matherly <brian@gramps-project.org>
* src/docgen/ODFDoc.py (rotate_text, init): fix rotated text location and
remove background color to improve the fanchart display (#0001072)
2007-06-24 Alex Roitman <shura@gramps-project.org> 2007-06-24 Alex Roitman <shura@gramps-project.org>
* src/GrampsDb/_GrampsBSDDB.py (load): Typo. * src/GrampsDb/_GrampsBSDDB.py (load): Typo.
* src/DbLoader.py (read_file): Fix error reporting. * src/DbLoader.py (read_file): Fix error reporting.

33
src/docgen/ODFDoc.py
View File

@ -215,6 +215,20 @@ class ODFDoc(BaseDoc.BaseDoc,BaseDoc.TextDoc,BaseDoc.DrawDoc):
self.cntnt.write('/>\n') self.cntnt.write('/>\n')
self.cntnt.write('</style:style>\n') self.cntnt.write('</style:style>\n')
# Graphic style for items with a clear background
self.cntnt.write('<style:style style:name="clear" ')
self.cntnt.write('style:family="graphic">\n')
self.cntnt.write('\t<style:graphic-properties draw:stroke="none" ')
self.cntnt.write('draw:fill="none" draw:shadow="hidden" ')
self.cntnt.write('style:run-through="background" ')
self.cntnt.write('style:vertical-pos="from-top" ')
self.cntnt.write('style:vertical-rel="paragraph" ')
self.cntnt.write('style:horizontal-pos="from-left" ')
self.cntnt.write('style:horizontal-rel="paragraph" ')
self.cntnt.write('draw:wrap-influence-on-position="once-concurrent" ')
self.cntnt.write('style:flow-with-text="false"/>')
self.cntnt.write('</style:style>\n')
for style_name in styles.get_paragraph_style_names(): for style_name in styles.get_paragraph_style_names():
style = styles.get_paragraph_style(style_name) style = styles.get_paragraph_style(style_name)
@ -979,26 +993,23 @@ class ODFDoc(BaseDoc.BaseDoc,BaseDoc.TextDoc,BaseDoc.DrawDoc):
size = font.get_size() size = font.get_size()
height = size*(len(text)) height = size*(len(text))
oneline = (size/72.0)*2.54
width = 0 width = 0
for line in text: for line in text:
width = max(width,FontScale.string_width(font,line)) width = max(width,FontScale.string_width(font,line))
wcm = (width/72.0)*2.54*1.2 wcm = ReportUtils.pt2cm(width)
hcm = (height/72.0)*2.54*1.2 hcm = ReportUtils.pt2cm(height)
rangle = -((pi/180.0) * angle) rangle = (pi/180.0) * angle
self.cntnt.write('<draw:frame text:anchor-type="paragraph" ') self.cntnt.write('<draw:frame text:anchor-type="paragraph" ')
self.cntnt.write('draw:z-index="2" ') self.cntnt.write('draw:z-index="2" ')
self.cntnt.write('draw:style-name="%s" ' % style) self.cntnt.write('draw:style-name="clear" ')
self.cntnt.write('svg:height="%.2fpt" ' % hcm) self.cntnt.write('svg:height="%.2fcm" ' % hcm)
self.cntnt.write('fo:height="%.2fpt" ' % hcm)
self.cntnt.write('svg:width="%.2fcm" ' % wcm) self.cntnt.write('svg:width="%.2fcm" ' % wcm)
self.cntnt.write('fo:width="%.2fcm" ' % wcm)
self.cntnt.write('draw:transform="') self.cntnt.write('draw:transform="')
self.cntnt.write('rotate (%.8f) ' % rangle) self.cntnt.write('rotate (%.8f) ' % -rangle)
xloc = x-((wcm/2.0)*cos(-rangle)) xloc = x-((wcm/2.0)*cos(rangle))+((hcm/2.0)*sin(rangle))
yloc = y-((hcm)*sin(-rangle))-oneline yloc = y-((hcm/2.0)*cos(rangle))-((wcm/2.0)*sin(rangle))
self.cntnt.write('translate (%.3fcm %.3fcm)">\n' % (xloc,yloc)) self.cntnt.write('translate (%.3fcm %.3fcm)">\n' % (xloc,yloc))
self.cntnt.write('<draw:text-box>\n') self.cntnt.write('<draw:text-box>\n')
self.cntnt.write('<text:p text:style-name="X%s">' % pname) self.cntnt.write('<text:p text:style-name="X%s">' % pname)