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

* src/docgen/SvgDrawDoc.py: use proper init parameters for BaseDoc

Browse Source 
* src/docgen/PSDrawDoc.py: use proper init parameters for BaseDoc
* src/docgen/OpenOfficeDoc.py: handle rotation of text better
* src/Report.py: Proper init sequence for BaseDoc derived reports


svn: r2125
This commit is contained in:
Don Allingham 2003-09-14 04:50:44 +00:00
parent 209c8b64bb
commit efbbbf3823
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps2/src/Report.py
View File

@ -1274,6 +1274,7 @@ class TextReportDialog(ReportDialog):
def make_document(self):
"""Create a document of the type requested by the user."""
self.doc = self.format(self.selected_style,self.paper,
self.template_name,self.orien)
if self.print_report.get_active ():
@ -1313,7 +1314,9 @@ class DrawReportDialog(ReportDialog):
def make_document(self):
"""Create a document of the type requested by the user."""
self.doc = self.format(self.selected_style,self.paper,self.orien)
self.doc = self.format(self.selected_style,self.paper,
self.template_name,self.orien)
if self.print_report.get_active ():
self.doc.print_requested ()

16
gramps2/src/docgen/OpenOfficeDoc.py
View File

@ -28,7 +28,7 @@ import tempfile
import string
import zipfile
import time
from math import pi, cos, sin
from math import pi, cos, sin, fabs
#-------------------------------------------------------------------------
#
@ -86,11 +86,9 @@ class OpenOfficeDoc(BaseDoc.BaseDoc):
self.content_xml = tempfile.mktemp()
self.f = open(self.content_xml,"wb")
except IOError,msg:
errmsg = "%s\n%s" % (_("Could not create %s") % self.content_xml, msg)
raise Errors.ReportError(errmsg)
raise Errors.ReportError(_("Could not create %s") % self.content_xml, msg)
except:
raise Errors.ReportError("Could not create %s" % self.content_xml)
raise Errors.ReportError(_("Could not create %s") % self.content_xml)
def init(self):
self.f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
@ -776,9 +774,10 @@ class OpenOfficeDoc(BaseDoc.BaseDoc):
self.f.write('<draw:text-box draw:style-name="%s" ' % style)
self.f.write('draw:layer="layout" svg:width="%.3fcm" ' % wcm)
self.f.write('svg:height="%.3fpt" ' % hcm)
self.f.write('draw:transform="rotate (%.8f) ' % rangle)
self.f.write('draw:transform="')
self.f.write('rotate (%.8f) ' % rangle)
xloc = x-((wcm/2.0)*cos(-rangle))
yloc = y-((hcm)*sin(-rangle))-(hcm/2.0)
yloc = y-((hcm)*sin(-rangle))-oneline
self.f.write('translate (%.3fcm %.3fcm)"' % (xloc,yloc))
self.f.write('>')
self.f.write('<text:p text:style-name="X%s">' % pname)
@ -786,7 +785,7 @@ class OpenOfficeDoc(BaseDoc.BaseDoc):
self.f.write('<text:span text:style-name="F%s">\n' % pname)
self.write_text(string.join(text,'\n'))
self.f.write('</text:span>\n</text:p>\n</draw:text-box>\n')
def draw_path(self,style,path):
stype = self.draw_styles[style]
@ -807,6 +806,7 @@ class OpenOfficeDoc(BaseDoc.BaseDoc):
self.f.write('svg:x="%d" svg:y="%d" ' % (x,y))
self.f.write('svg:viewBox="0 0 %d %d" ' % (int(maxx-minx)*1000,int(maxy-miny)*1000))
self.f.write('draw:z-index="0" ')
self.f.write('svg:width="%.4fcm" ' % (maxx-minx))
self.f.write('svg:height="%.4fcm" ' % (maxy-miny))

2
gramps2/src/docgen/PSDrawDoc.py
View File

@ -54,7 +54,7 @@ def pt2cm(val):
#-------------------------------------------------------------------------
class PSDrawDoc(BaseDoc.BaseDoc):
def __init__(self,styles,type,orientation):
def __init__(self,styles,type,template,orientation):
BaseDoc.BaseDoc.__init__(self,styles,type,orientation)
self.f = None
self.filename = None

2
gramps2/src/docgen/SvgDrawDoc.py
View File

@ -44,7 +44,7 @@ import FontScale
#-------------------------------------------------------------------------
class SvgDrawDoc(BaseDoc.BaseDoc):
def __init__(self,styles,type,orientation):
def __init__(self,styles,type,template,orientation):
BaseDoc.BaseDoc.__init__(self,styles,type,orientation)
self.f = None
self.filename = None