kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code cleanup (#13630). 

Contributed by F Schroedter.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11694 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Etienne Massip 2013-04-02 17:37:52 +00:00
parent 4a3864a180
commit 4224a0c3fe
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/redmine/export/pdf.rb
View File

@ -314,11 +314,11 @@ module Redmine
col_width_avg.map! {|x| x / k} col_width_avg.map! {|x| x / k}
# calculate columns width # calculate columns width
ratio = table_width / col_width_avg.inject(0) {|s,w| s += w} ratio = table_width / col_width_avg.inject(0, :+)
col_width = col_width_avg.map {|w| w * ratio} col_width = col_width_avg.map {|w| w * ratio}
# correct max word width if too many columns # correct max word width if too many columns
ratio = table_width / word_width_max.inject(0) {|s,w| s += w} ratio = table_width / word_width_max.inject(0, :+)
word_width_max.map! {|v| v * ratio} if ratio < 1 word_width_max.map! {|v| v * ratio} if ratio < 1
# correct and lock width of some columns # correct and lock width of some columns
@ -354,7 +354,7 @@ module Redmine
# calculate column normalizing ratio # calculate column normalizing ratio
if free_col_width == 0 if free_col_width == 0
ratio = table_width / col_width.inject(0) {|s,w| s += w} ratio = table_width / col_width.inject(0, :+)
else else
ratio = (table_width - fix_col_width) / free_col_width ratio = (table_width - fix_col_width) / free_col_width
end end
@ -426,13 +426,13 @@ module Redmine
col_width = [] col_width = []
unless query.inline_columns.empty? unless query.inline_columns.empty?
col_width = calc_col_width(issues, query, table_width, pdf) col_width = calc_col_width(issues, query, table_width, pdf)
table_width = col_width.inject(0) {|s,v| s += v} table_width = col_width.inject(0, :+)
end end
# use full width if the description is displayed # use full width if the description is displayed
if table_width > 0 && query.has_column?(:description) if table_width > 0 && query.has_column?(:description)
col_width = col_width.map {|w| w * (page_width - right_margin - left_margin) / table_width} col_width = col_width.map {|w| w * (page_width - right_margin - left_margin) / table_width}
table_width = col_width.inject(0) {|s,v| s += v} table_width = col_width.inject(0, :+)
end end
# title # title
@ -493,8 +493,7 @@ module Redmine
end end
# Renders MultiCells and returns the maximum height used # Renders MultiCells and returns the maximum height used
def issues_to_pdf_write_cells(pdf, col_values, col_widths, def issues_to_pdf_write_cells(pdf, col_values, col_widths, row_height, head=false)
row_height, head=false)
base_y = pdf.GetY base_y = pdf.GetY
max_height = row_height max_height = row_height
col_values.each_with_index do |column, i| col_values.each_with_index do |column, i|