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

Fix image scaling

Browse Source 
svn: r763
This commit is contained in:
Don Allingham 2002-02-08 00:28:47 +00:00
parent a647aac6be
commit 4a76aaa63c
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gramps/src/RelLib.py
View File

@ -26,6 +26,7 @@ __author__ = "Don Allingham"
from re import compile from re import compile
from Date import Date, compare_dates, not_too_old from Date import Date, compare_dates, not_too_old
from string import strip from string import strip
import os
CONF_VERY_HIGH = 4 CONF_VERY_HIGH = 4
CONF_HIGH = 3 CONF_HIGH = 3
@ -498,7 +499,7 @@ class Photo(SourceNote):
def setPath(self,path): def setPath(self,path):
"""set the file path to the passed path""" """set the file path to the passed path"""
self.path = path self.path = os.path.normpath(path)
def getPath(self): def getPath(self):
"""return the file path""" """return the file path"""

20
gramps/src/docgen/OpenOfficeDoc.py
View File

@ -226,13 +226,17 @@ class OpenOfficeDoc(TextDoc):
self._write_zip() self._write_zip()
def add_photo(self,name,pos,x_cm,y_cm): def add_photo(self,name,pos,x_cm,y_cm):
import gtk
import GdkImlib
image = GdkImlib.Image(name) image = ImgManip.ImgManip(name)
scale = float(image.rgb_width)/float(image.rgb_height) (x,y) = image.size()
act_width = int(((x_cm * scale)*2.54)*72) aspect_ratio = float(x)/float(y)
act_height = int(((y_cm * scale)*2.54)*72)
if aspect_ratio > x_cm/y_cm:
act_width = x_cm
act_height = y_cm/aspect_ratio
else:
act_height = y_cm
act_width = x_cm*aspect_ratio
self.photo_list.append((name,act_width,act_height)) self.photo_list.append((name,act_width,act_height))
@ -251,8 +255,8 @@ class OpenOfficeDoc(TextDoc):
self.f.write('draw:name="') self.f.write('draw:name="')
self.f.write(tag) self.f.write(tag)
self.f.write('" text:anchor-type="paragraph" ') self.f.write('" text:anchor-type="paragraph" ')
self.f.write('svg:width="%.3fcm" ' % (x_cm*scale)) self.f.write('svg:width="%.3fcm" ' % act_width)
self.f.write('svg:height="%.3fcm" ' % (y_cm*scale)) self.f.write('svg:height="%.3fcm" ' % act_height)
self.f.write('draw:z-index="0" ') self.f.write('draw:z-index="0" ')
self.f.write('xlink:href="#Pictures/') self.f.write('xlink:href="#Pictures/')
self.f.write(base) self.f.write(base)