reportlab/platypus/tables.py
author rgbecker
Wed, 13 Feb 2008 10:58:03 +0000
changeset 2915 f2c1f8ef3b51
parent 2914 32e5bcc9b776
child 2938 5115bf2e8eeb
permissions -rwxr-xr-x
reportlab: obsoletisms removed
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2332
2a7ab4405e18 Remove $Header:, fix CopyRight & history
rgbecker
parents: 2314
diff changeset
     1
#Copyright ReportLab Europe Ltd. 2000-2004
494
54257447cfe9 Changed to indirect copyright
rgbecker
parents: 421
diff changeset
     2
#see license.txt for license details
2332
2a7ab4405e18 Remove $Header:, fix CopyRight & history
rgbecker
parents: 2314
diff changeset
     3
#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/platypus/tables.py
2a7ab4405e18 Remove $Header:, fix CopyRight & history
rgbecker
parents: 2314
diff changeset
     4
__version__=''' $Id$ '''
2190
e925cd300e9e merging Jython-branch
dragan1
parents: 2189
diff changeset
     5
16
f9c7525619fb Docstring & other fixes
rgbecker
parents: 7
diff changeset
     6
__doc__="""
6
eb791971b252 Added license, __version__ and Logi comment
rgbecker
parents: 0
diff changeset
     7
Tables are created by passing the constructor a tuple of column widths, a tuple of row heights and the data in
eb791971b252 Added license, __version__ and Logi comment
rgbecker
parents: 0
diff changeset
     8
row order. Drawing of the table can be controlled by using a TableStyle instance. This allows control of the
eb791971b252 Added license, __version__ and Logi comment
rgbecker
parents: 0
diff changeset
     9
color and weight of the lines (if any), and the font, alignment and padding of the text.
268
8414113fa500 more documentation changes
aaron_watters
parents: 253
diff changeset
    10
327
0944cd1f3f80 Adjusted doc string
rgbecker
parents: 326
diff changeset
    11
None values in the sequence of row heights or column widths, mean that the corresponding rows
0944cd1f3f80 Adjusted doc string
rgbecker
parents: 326
diff changeset
    12
or columns should be automatically sized.
0944cd1f3f80 Adjusted doc string
rgbecker
parents: 326
diff changeset
    13
0944cd1f3f80 Adjusted doc string
rgbecker
parents: 326
diff changeset
    14
All the cell values should be convertible to strings; embedded newline '\\n' characters
0944cd1f3f80 Adjusted doc string
rgbecker
parents: 326
diff changeset
    15
cause the value to wrap (ie are like a traditional linefeed).
0944cd1f3f80 Adjusted doc string
rgbecker
parents: 326
diff changeset
    16
268
8414113fa500 more documentation changes
aaron_watters
parents: 253
diff changeset
    17
See the test output from running this module as a script for a discussion of the method for constructing
8414113fa500 more documentation changes
aaron_watters
parents: 253
diff changeset
    18
tables and table styles.
6
eb791971b252 Added license, __version__ and Logi comment
rgbecker
parents: 0
diff changeset
    19
"""
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
    20
from reportlab.platypus.flowables import Flowable, Preformatted
1207
49a514d10cb0 make tables one point off not bomb mysteriously in paid production installations.
aaron_watters
parents: 1169
diff changeset
    21
from reportlab import rl_config
2384
6d44252e1042 platypus: added ptocontainer, moved tables test
rgbecker
parents: 2374
diff changeset
    22
from reportlab.lib.styles import PropertySet, ParagraphStyle
168
02bac1346c69 Tables changed to use reportlab.lib.colors instead of
andy_robinson
parents: 129
diff changeset
    23
from reportlab.lib import colors
1103
857af510186d Added identity method to Flowables
rgbecker
parents: 906
diff changeset
    24
from reportlab.lib.utils import fp_str
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
    25
from reportlab.pdfbase.pdfmetrics import stringWidth
312
b39b1a2ed9d5 support explicit \n line splitting in cells
aaron_watters
parents: 268
diff changeset
    26
import operator, string
2468
ca16d1756555 tables.py: 2.1 compatibility changes
rptlab
parents: 2467
diff changeset
    27
from types import TupleType, ListType, StringType, FloatType, IntType
6
eb791971b252 Added license, __version__ and Logi comment
rgbecker
parents: 0
diff changeset
    28
128
a0676f013314 Splitting layout.py
rgbecker
parents: 122
diff changeset
    29
class CellStyle(PropertySet):
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    30
    defaults = {
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    31
        'fontname':'Times-Roman',
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    32
        'fontsize':10,
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    33
        'leading':12,
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    34
        'leftPadding':6,
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    35
        'rightPadding':6,
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    36
        'topPadding':3,
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    37
        'bottomPadding':3,
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    38
        'firstLineIndent':0,
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    39
        'color':colors.black,
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    40
        'alignment': 'LEFT',
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    41
        'background': (1,1,1),
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    42
        'valign': 'BOTTOM',
2575
0cba68b93555 reportlab-utf8 moved to trunk
rgbecker
parents: 2574
diff changeset
    43
        'href': None,
0cba68b93555 reportlab-utf8 moved to trunk
rgbecker
parents: 2574
diff changeset
    44
        'destination':None,
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    45
        }
6
eb791971b252 Added license, __version__ and Logi comment
rgbecker
parents: 0
diff changeset
    46
2469
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
    47
LINECAPS={None: None, 'butt':0,'round':1,'projecting':2,'squared':2}
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
    48
LINEJOINS={None: None, 'miter':0, 'mitre':0, 'round':1,'bevel':2}
1699
37fa8717925f Improved line styles, allow for cap etc
rgbecker
parents: 1683
diff changeset
    49
730
48a169b27fe4 changed handling of table element styles for better space/time. old code left commented
aaron_watters
parents: 684
diff changeset
    50
# experimental replacement
48a169b27fe4 changed handling of table element styles for better space/time. old code left commented
aaron_watters
parents: 684
diff changeset
    51
class CellStyle1(PropertySet):
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    52
    fontname = "Times-Roman"
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    53
    fontsize = 10
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    54
    leading = 12
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    55
    leftPadding = 6
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    56
    rightPadding = 6
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    57
    topPadding = 3
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    58
    bottomPadding = 3
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    59
    firstLineIndent = 0
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    60
    color = colors.black
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    61
    alignment = 'LEFT'
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    62
    background = (1,1,1)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    63
    valign = "BOTTOM"
2575
0cba68b93555 reportlab-utf8 moved to trunk
rgbecker
parents: 2574
diff changeset
    64
    href = None
0cba68b93555 reportlab-utf8 moved to trunk
rgbecker
parents: 2574
diff changeset
    65
    destination = None
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    66
    def __init__(self, name, parent=None):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    67
        self.name = name
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    68
        if parent is not None:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    69
            parent.copy(self)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    70
    def copy(self, result=None):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    71
        if result is None:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    72
            result = CellStyle1()
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    73
        for name in dir(self):
2730
b3fc23a74fd1 reportlab: Dirk Holtwick's editor's fixes :)
rgbecker
parents: 2590
diff changeset
    74
            setattr(result, name, getattr(self, name))
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    75
        return result
730
48a169b27fe4 changed handling of table element styles for better space/time. old code left commented
aaron_watters
parents: 684
diff changeset
    76
CellStyle = CellStyle1
48a169b27fe4 changed handling of table element styles for better space/time. old code left commented
aaron_watters
parents: 684
diff changeset
    77
6
eb791971b252 Added license, __version__ and Logi comment
rgbecker
parents: 0
diff changeset
    78
class TableStyle:
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    79
    def __init__(self, cmds=None, parent=None, **kw):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    80
        #handle inheritance from parent first.
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    81
        commands = []
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    82
        if parent:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    83
            # copy the parents list at construction time
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    84
            commands = commands + parent.getCommands()
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    85
            self._opts = parent._opts
2574
d81949596070 reportlab: changes to accomodate barcodes
rgbecker
parents: 2523
diff changeset
    86
            for a in ('spaceBefore','spaceAfter'):
d81949596070 reportlab: changes to accomodate barcodes
rgbecker
parents: 2523
diff changeset
    87
                if hasattr(parent,a):
d81949596070 reportlab: changes to accomodate barcodes
rgbecker
parents: 2523
diff changeset
    88
                    setattr(self,a,getattr(parent,a))
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    89
        if cmds:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    90
            commands = commands + list(cmds)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    91
        self._cmds = commands
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    92
        self._opts={}
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    93
        self._opts.update(kw)
1435
4d0f57749e18 Added _opts to TableStyle for possible keepWithNext
rgbecker
parents: 1253
diff changeset
    94
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    95
    def add(self, *cmd):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    96
        self._cmds.append(cmd)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    97
    def __repr__(self):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    98
        L = map(repr, self._cmds)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
    99
        import string
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   100
        L = string.join(L, "  \n")
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   101
        return "TableStyle(\n%s\n) # end TableStyle" % L
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   102
    def getCommands(self):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   103
        return self._cmds
338
f5eb86d4224f Cosmetics and error testing
rgbecker
parents: 333
diff changeset
   104
f5eb86d4224f Cosmetics and error testing
rgbecker
parents: 333
diff changeset
   105
TableStyleType = type(TableStyle())
419
469fe11a010b Additions/Improvements to LINE CMD Splitting
rgbecker
parents: 403
diff changeset
   106
_SeqTypes = (TupleType, ListType)
356
377367fe28cb Table argument order changed
rgbecker
parents: 354
diff changeset
   107
377367fe28cb Table argument order changed
rgbecker
parents: 354
diff changeset
   108
def _rowLen(x):
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   109
    return type(x) not in _SeqTypes and 1 or len(x)
419
469fe11a010b Additions/Improvements to LINE CMD Splitting
rgbecker
parents: 403
diff changeset
   110
2271
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   111
def _calc_pc(V,avail):
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   112
    '''check list V for percentage or * values
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   113
    1) absolute values go through unchanged
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   114
    2) percentages are used as weights for unconsumed space
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   115
    3) if no None values were seen '*' weights are
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   116
    set equally with unclaimed space
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   117
    otherwise * weights are assigned as None'''
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   118
    R = []
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   119
    r = R.append
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   120
    I = []
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   121
    i = I.append
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   122
    J = []
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   123
    j = J.append
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   124
    s = avail
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   125
    w = n = 0.
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   126
    for v in V:
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   127
        if type(v) is type(""):
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   128
            v = v.strip()
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   129
            if not v:
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   130
                v = None
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   131
                n += 1
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   132
            elif v.endswith('%'):
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   133
                v = float(v[:-1])
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   134
                w += v
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   135
                i(len(R))
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   136
            elif v=='*':
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   137
                j(len(R))
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   138
            else:
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   139
                v = float(v)
2284
b181b45c6792 Minor changes
rgbecker
parents: 2277
diff changeset
   140
                s -= v
2271
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   141
        elif v is None:
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   142
            n += 1
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   143
        else:
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   144
            s -= v
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   145
        r(v)
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   146
    s = max(0.,s)
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   147
    f = s/max(100.,w)
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   148
    for i in I:
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   149
        R[i] *= f
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   150
        s -= R[i]
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   151
    s = max(0.,s)
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   152
    m = len(J)
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   153
    if m:
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   154
        v =  n==0 and s/m or None
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   155
        for j in J:
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   156
            R[j] = v
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   157
    return R
356
377367fe28cb Table argument order changed
rgbecker
parents: 354
diff changeset
   158
2412
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   159
def _hLine(canvLine, scp, ecp, y, hBlocks, FUZZ=rl_config._FUZZ):
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   160
    '''
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   161
    Draw horizontal lines; do not draw through regions specified in hBlocks
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   162
    This also serves for vertical lines with a suitable canvLine
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   163
    '''
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   164
    if hBlocks: hBlocks = hBlocks.get(y,None)
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   165
    if not hBlocks or scp>=hBlocks[-1][1]-FUZZ or ecp<=hBlocks[0][0]+FUZZ:
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   166
        canvLine(scp,y,ecp,y)
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   167
    else:
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   168
        i = 0
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   169
        n = len(hBlocks)
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   170
        while scp<ecp-FUZZ and i<n:
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   171
            x0, x1 = hBlocks[i]
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   172
            if x1<=scp+FUZZ or x0>=ecp-FUZZ:
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   173
                i += 1
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   174
                continue
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   175
            i0 = max(scp,x0)
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   176
            i1 = min(ecp,x1)
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   177
            if i0>scp: canvLine(scp,y,i0,y)
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   178
            scp = i1
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   179
        if scp<ecp-FUZZ: canvLine(scp,y,ecp,y)
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   180
2414
81be267fa92c tables.py: extend span line blocking to multi lines
rgbecker
parents: 2412
diff changeset
   181
def _multiLine(scp,ecp,y,canvLine,ws,count):
81be267fa92c tables.py: extend span line blocking to multi lines
rgbecker
parents: 2412
diff changeset
   182
    offset = 0.5*(count-1)*ws
81be267fa92c tables.py: extend span line blocking to multi lines
rgbecker
parents: 2412
diff changeset
   183
    y += offset
81be267fa92c tables.py: extend span line blocking to multi lines
rgbecker
parents: 2412
diff changeset
   184
    for idx in xrange(count):
81be267fa92c tables.py: extend span line blocking to multi lines
rgbecker
parents: 2412
diff changeset
   185
        canvLine(scp, y, ecp, y)
81be267fa92c tables.py: extend span line blocking to multi lines
rgbecker
parents: 2412
diff changeset
   186
        y -= ws
81be267fa92c tables.py: extend span line blocking to multi lines
rgbecker
parents: 2412
diff changeset
   187
2469
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
   188
def _convert2int(value, map, low, high, name, cmd):
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
   189
    '''private converter tries map(value) low<=int(value)<=high or finally an error'''
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
   190
    try:
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
   191
        return map[value]
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
   192
    except KeyError:
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
   193
        try:
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
   194
            ivalue = int(value)
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
   195
            if low<=ivalue<=high: return ivalue
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
   196
        except:
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
   197
            pass
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
   198
    raise ValueError('Bad %s value %s in %s'%(name,value,str(cmd)))
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
   199
2472
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   200
def _endswith(obj,s):
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   201
    try:
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   202
        return obj.endswith(s)
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   203
    except:
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   204
        return 0
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   205
2879
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   206
def spanFixDim(V0,V,spanCons,FUZZ=rl_config._FUZZ):
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   207
    #assign required space to variable rows equally to existing calculated values
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   208
    M = {}
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   209
    for (x0,x1),v in spanCons.iteritems():
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   210
        t = sum([V[x]+M.get(x,0) for x in xrange(x0,x1+1)])
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   211
        if t>=v-FUZZ: continue      #already good enough
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   212
        X = [x for x in xrange(x0,x1+1) if V0[x] is None]   #variable candidates
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   213
        if not X: continue          #something wrong here mate
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   214
        v -= t
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   215
        v /= float(len(X))
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   216
        for x in X:
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   217
            M[x] = max(M.get(x,v),v)
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   218
    for x,v in M.iteritems():
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   219
        V[x] += v
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   220
221
3d71b66b14c6 Changes related to removal of SimpleFlowDocument
rgbecker
parents: 168
diff changeset
   221
class Table(Flowable):
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   222
    def __init__(self, data, colWidths=None, rowHeights=None, style=None,
2495
4952531cccfb tables.py: allow for h/vAlign constructor agruments to be used
rgbecker
parents: 2481
diff changeset
   223
                repeatRows=0, repeatCols=0, splitByRow=1, emptyTableAction=None, ident=None,
4952531cccfb tables.py: allow for h/vAlign constructor agruments to be used
rgbecker
parents: 2481
diff changeset
   224
                hAlign=None,vAlign=None):
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   225
        self.ident = ident
2495
4952531cccfb tables.py: allow for h/vAlign constructor agruments to be used
rgbecker
parents: 2481
diff changeset
   226
        self.hAlign = hAlign or 'CENTER'
4952531cccfb tables.py: allow for h/vAlign constructor agruments to be used
rgbecker
parents: 2481
diff changeset
   227
        self.vAlign = vAlign or 'MIDDLE'
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   228
        if type(data) not in _SeqTypes:
2915
f2c1f8ef3b51 reportlab: obsoletisms removed
rgbecker
parents: 2914
diff changeset
   229
            raise ValueError("%s invalid data type" % self.identity())
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   230
        self._nrows = nrows = len(data)
2221
cd3b787b38a9 corrected erroneous comment
andy_robinson
parents: 2220
diff changeset
   231
        self._cellvalues = []
2401
cd68d7a84d05 CanvasAdapter related changes
rgbecker
parents: 2397
diff changeset
   232
        _seqCW = type(colWidths) in _SeqTypes
cd68d7a84d05 CanvasAdapter related changes
rgbecker
parents: 2397
diff changeset
   233
        _seqRH = type(rowHeights) in _SeqTypes
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   234
        if nrows: self._ncols = ncols = max(map(_rowLen,data))
2401
cd68d7a84d05 CanvasAdapter related changes
rgbecker
parents: 2397
diff changeset
   235
        elif colWidths and _seqCW: ncols = len(colWidths)
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   236
        else: ncols = 0
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   237
        if not emptyTableAction: emptyTableAction = rl_config.emptyTableAction
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   238
        if not (nrows and ncols):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   239
            if emptyTableAction=='error':
2915
f2c1f8ef3b51 reportlab: obsoletisms removed
rgbecker
parents: 2914
diff changeset
   240
                raise ValueError("%s must have at least a row and column" % self.identity())
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   241
            elif emptyTableAction=='indicate':
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   242
                self.__class__ = Preformatted
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   243
                global _emptyTableStyle
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   244
                if '_emptyTableStyle' not in globals().keys():
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   245
                    _emptyTableStyle = ParagraphStyle('_emptyTableStyle')
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   246
                    _emptyTableStyle.textColor = colors.red
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   247
                    _emptyTableStyle.backColor = colors.yellow
2194
6bc71309eb18 Modified version of Henning von Bargen's LongTables optimisation
rgbecker
parents: 2190
diff changeset
   248
                Preformatted.__init__(self,'%s(%d,%d)' % (self.__class__.__name__,nrows,ncols), _emptyTableStyle)
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   249
            elif emptyTableAction=='ignore':
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   250
                self.__class__ = Spacer
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   251
                Spacer.__init__(self,0,0)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   252
            else:
2915
f2c1f8ef3b51 reportlab: obsoletisms removed
rgbecker
parents: 2914
diff changeset
   253
                raise ValueError('%s bad emptyTableAction: "%s"' % (self.identity(),emptyTableAction))
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   254
            return
1533
e25c4dda4840 Added emptyTableAction
rgbecker
parents: 1499
diff changeset
   255
2589
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   256
        # we need a cleanup pass to ensure data is strings - non-unicode and non-null
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   257
        self._cellvalues = self.normalizeData(data)
2401
cd68d7a84d05 CanvasAdapter related changes
rgbecker
parents: 2397
diff changeset
   258
        if not _seqCW: colWidths = ncols*[colWidths]
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   259
        elif len(colWidths) != ncols:
2915
f2c1f8ef3b51 reportlab: obsoletisms removed
rgbecker
parents: 2914
diff changeset
   260
            raise ValueError("%s data error - %d columns in data but %d in column widths" % (self.identity(),ncols, len(colWidths)))
2401
cd68d7a84d05 CanvasAdapter related changes
rgbecker
parents: 2397
diff changeset
   261
        if not _seqRH: rowHeights = nrows*[rowHeights]
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   262
        elif len(rowHeights) != nrows:
2915
f2c1f8ef3b51 reportlab: obsoletisms removed
rgbecker
parents: 2914
diff changeset
   263
            raise ValueError("%s data error - %d rows in data but %d in row heights" % (self.identity(),nrows, len(rowHeights)))
2812
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   264
        for i in xrange(nrows):
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   265
            if len(data[i]) != ncols:
2915
f2c1f8ef3b51 reportlab: obsoletisms removed
rgbecker
parents: 2914
diff changeset
   266
                raise ValueError("%s not enough data columns in row %d!" % (self.identity(),i))
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   267
        self._rowHeights = self._argH = rowHeights
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   268
        self._colWidths = self._argW = colWidths
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   269
        cellrows = []
2812
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   270
        for i in xrange(nrows):
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   271
            cellcols = []
2812
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   272
            for j in xrange(ncols):
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   273
                cellcols.append(CellStyle(`(i,j)`))
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   274
            cellrows.append(cellcols)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   275
        self._cellStyles = cellrows
350
0916ae478b25 Table splitting start
rgbecker
parents: 342
diff changeset
   276
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   277
        self._bkgrndcmds = []
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   278
        self._linecmds = []
1883
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   279
        self._spanCmds = []
2812
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   280
        self._nosplitCmds = []
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   281
        self.repeatRows = repeatRows
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   282
        self.repeatCols = repeatCols
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   283
        self.splitByRow = splitByRow
6
eb791971b252 Added license, __version__ and Logi comment
rgbecker
parents: 0
diff changeset
   284
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   285
        if style:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   286
            self.setStyle(style)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   287
    def __repr__(self):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   288
        "incomplete, but better than nothing"
2389
174fe506bf48 tables.py: robustify repr
rgbecker
parents: 2384
diff changeset
   289
        r = getattr(self,'_rowHeights','[unknown]')
174fe506bf48 tables.py: robustify repr
rgbecker
parents: 2384
diff changeset
   290
        c = getattr(self,'_colWidths','[unknown]')
174fe506bf48 tables.py: robustify repr
rgbecker
parents: 2384
diff changeset
   291
        cv = getattr(self,'_cellvalues','[unknown]')
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   292
        import pprint, string
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   293
        cv = pprint.pformat(cv)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   294
        cv = string.replace(cv, "\n", "\n  ")
2194
6bc71309eb18 Modified version of Henning von Bargen's LongTables optimisation
rgbecker
parents: 2190
diff changeset
   295
        return "%s(\n rowHeights=%s,\n colWidths=%s,\n%s\n) # end table" % (self.__class__.__name__,r,c,cv)
342
a6982189331d Added tables to PythonPoint
andy_robinson
parents: 338
diff changeset
   296
2589
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   297
    def normalizeData(self, data):
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   298
        """Takes a block of input data (list of lists etc.) and
2590
deaa612ecb4c friendlified way test suite runs
andy
parents: 2589
diff changeset
   299
        - coerces unicode strings to non-unicode UTF8
deaa612ecb4c friendlified way test suite runs
andy
parents: 2589
diff changeset
   300
        - coerces nulls to ''
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   301
        -
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   302
2589
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   303
        """
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   304
        def normCell(stuff):
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   305
            if stuff is None:
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   306
                return ''
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   307
            elif type(stuff) == type(u''):
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   308
                return stuff.encode('utf8')
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   309
            else:
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   310
                return stuff
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   311
        outData = []
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   312
        for row in data:
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   313
            outRow = [normCell(cell) for cell in row]
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   314
            outData.append(outRow)
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   315
        from pprint import pprint as pp
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   316
        #pp(outData)
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   317
        return outData
1af821ded9f1 added japanese splitting test, and table preprocessor to convert unicode->utf8
andy
parents: 2582
diff changeset
   318
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   319
    def identity(self, maxLen=30):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   320
        '''Identify our selves as well as possible'''
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   321
        if self.ident: return self.ident
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   322
        vx = None
1989
a91ec8282d6e Attempt to fix up identity for early errors
rgbecker
parents: 1917
diff changeset
   323
        nr = getattr(self,'_nrows','unknown')
a91ec8282d6e Attempt to fix up identity for early errors
rgbecker
parents: 1917
diff changeset
   324
        nc = getattr(self,'_ncols','unknown')
2299
d757841f2006 Fix proposed by Derik Barclay <dbarclay@givex.com>
rgbecker
parents: 2289
diff changeset
   325
        cv = getattr(self,'_cellvalues',None)
1989
a91ec8282d6e Attempt to fix up identity for early errors
rgbecker
parents: 1917
diff changeset
   326
        if cv and 'unknown' not in (nr,nc):
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   327
            b = 0
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   328
            for i in xrange(nr):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   329
                for j in xrange(nc):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   330
                    v = cv[i][j]
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   331
                    t = type(v)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   332
                    if t in _SeqTypes or isinstance(v,Flowable):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   333
                        if not t in _SeqTypes: v = (v,)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   334
                        r = ''
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   335
                        for vij in v:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   336
                            r = vij.identity(maxLen)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   337
                            if r and r[-4:]!='>...':
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   338
                                break
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   339
                        if r and r[-4:]!='>...':
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   340
                            ix, jx, vx, b = i, j, r, 1
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   341
                    else:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   342
                        v = v is None and '' or str(v)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   343
                        ix, jx, vx = i, j, v
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   344
                        b = (vx and t is StringType) and 1 or 0
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   345
                        if maxLen: vx = vx[:maxLen]
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   346
                    if b: break
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   347
                if b: break
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   348
        if vx:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   349
            vx = ' with cell(%d,%d) containing\n%s' % (ix,jx,repr(vx))
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   350
        else:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   351
            vx = '...'
1103
857af510186d Added identity method to Flowables
rgbecker
parents: 906
diff changeset
   352
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   353
        return "<%s at %d %d rows x %s cols>%s" % (self.__class__.__name__, id(self), nr, nc, vx)
1103
857af510186d Added identity method to Flowables
rgbecker
parents: 906
diff changeset
   354
2189
47cb423f5f1a Make _listCellGeom more specific
rgbecker
parents: 2185
diff changeset
   355
    def _listCellGeom(self, V,w,s,W=None,H=None,aH=72000):
2481
5620fd504c16 tables.py: fix vertical height bug
rgbecker
parents: 2475
diff changeset
   356
        if not V: return 0,0
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   357
        aW = w - s.leftPadding - s.rightPadding
2189
47cb423f5f1a Make _listCellGeom more specific
rgbecker
parents: 2185
diff changeset
   358
        aH = aH - s.topPadding - s.bottomPadding
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   359
        t = 0
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   360
        w = 0
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   361
        canv = getattr(self,'canv',None)
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   362
        sb0 = None
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   363
        for v in V:
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   364
            vw, vh = v.wrapOn(canv, aW, aH)
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   365
            sb = v.getSpaceBefore()
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   366
            sa = v.getSpaceAfter()
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   367
            if W is not None: W.append(vw)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   368
            if H is not None: H.append(vh)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   369
            w = max(w,vw)
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   370
            t += vh + sa + sb
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   371
            if sb0 is None:
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   372
                sb0 = sb
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   373
        return w, t - sb0 - sa
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   374
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   375
    def _listValueWidth(self,V,aH=72000,aW=72000):
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   376
        if not V: return 0,0
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   377
        t = 0
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   378
        w = 0
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   379
        canv = getattr(self,'canv',None)
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   380
        return max([v.wrapOn(canv,aW,aH)[0] for v in V])
1492
612646d068ca Ensure canv is set on sub flowables
rgbecker
parents: 1488
diff changeset
   381
2271
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   382
    def _calc_width(self,availWidth,W=None):
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   383
        if getattr(self,'_width_calculated_once',None): return
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   384
        #comments added by Andy to Robin's slightly terse variable names
2271
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   385
        if not W: W = _calc_pc(self._argW,availWidth)   #widths array
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   386
        if None in W:  #some column widths are not given
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   387
            canv = getattr(self,'canv',None)
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   388
            saved = None
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   389
            if self._spanCmds:
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   390
                colSpanCells = self._colSpanCells
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   391
                spanRanges = self._spanRanges
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   392
            else:
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   393
                colSpanCells = ()
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   394
                spanRanges = {}
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   395
            spanCons = {}
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   396
            if W is self._argW:
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   397
                W0 = W
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   398
                W = W[:]
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   399
            else:
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   400
                W0 = W[:]
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   401
            while None in W:
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   402
                j = W.index(None) #find first unspecified column
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   403
                f = lambda x,j=j: operator.getitem(x,j)
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   404
                V = map(f,self._cellvalues)  #values for this column
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   405
                S = map(f,self._cellStyles)  #styles for this column
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   406
                w = 0
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   407
                i = 0
2190
e925cd300e9e merging Jython-branch
dragan1
parents: 2189
diff changeset
   408
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   409
                for v, s in map(None, V, S):
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   410
                    ji = j,i
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   411
                    span = spanRanges.get(ji,None)
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   412
                    if ji in colSpanCells and not span: #if the current cell is part of a spanned region,
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   413
                        t = 0.0                         #assume a zero size.
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   414
                    else:#work out size
1917
25b37daf5ab7 Prepare for a more general idea of cell size
rgbecker
parents: 1912
diff changeset
   415
                        t = self._elementWidth(v,s)
25b37daf5ab7 Prepare for a more general idea of cell size
rgbecker
parents: 1912
diff changeset
   416
                        if t is None:
2915
f2c1f8ef3b51 reportlab: obsoletisms removed
rgbecker
parents: 2914
diff changeset
   417
                            raise ValueError("Flowable %s in cell(%d,%d) can't have auto width\n%s" % (v.identity(30),i,j,self.identity(30)))
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   418
                        t += s.leftPadding+s.rightPadding
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   419
                        if span:
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   420
                            c0 = span[0]
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   421
                            c1 = span[2]
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   422
                            if c0!=c1:
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   423
                                x = c0,c1
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   424
                                spanCons[x] = max(spanCons.get(x,t),t)
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   425
                                t = 0
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   426
                    if t>w: w = t   #record a new maximum
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   427
                    i += 1
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   428
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   429
                W[j] = w
1596
753865895a6f Jim Kraai's patch to preserve auto col width on subsequent pages
andy_robinson
parents: 1536
diff changeset
   430
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   431
            if spanCons:
2879
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   432
                spanFixDim(W0,W,spanCons)
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   433
2277
1473cfff7a24 Ensure _colWidths is defined
rgbecker
parents: 2271
diff changeset
   434
        self._colWidths = W
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   435
        width = 0
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   436
        self._colpositions = [0]        #index -1 is right side boundary; we skip when processing cells
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   437
        for w in W:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   438
            width = width + w
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   439
            self._colpositions.append(width)
1683
7fa753e4420a Removed all trailing whitespace
andy_robinson
parents: 1677
diff changeset
   440
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   441
        self._width = width
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   442
        self._width_calculated_once = 1
1596
753865895a6f Jim Kraai's patch to preserve auto col width on subsequent pages
andy_robinson
parents: 1536
diff changeset
   443
1917
25b37daf5ab7 Prepare for a more general idea of cell size
rgbecker
parents: 1912
diff changeset
   444
    def _elementWidth(self,v,s):
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   445
        if isinstance(v,(list,tuple)):
1917
25b37daf5ab7 Prepare for a more general idea of cell size
rgbecker
parents: 1912
diff changeset
   446
            w = 0
25b37daf5ab7 Prepare for a more general idea of cell size
rgbecker
parents: 1912
diff changeset
   447
            for e in v:
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   448
                ew = self._elementWidth(e,s)
1917
25b37daf5ab7 Prepare for a more general idea of cell size
rgbecker
parents: 1912
diff changeset
   449
                if ew is None: return None
25b37daf5ab7 Prepare for a more general idea of cell size
rgbecker
parents: 1912
diff changeset
   450
                w = max(w,ew)
25b37daf5ab7 Prepare for a more general idea of cell size
rgbecker
parents: 1912
diff changeset
   451
            return w
25b37daf5ab7 Prepare for a more general idea of cell size
rgbecker
parents: 1912
diff changeset
   452
        elif isinstance(v,Flowable) and v._fixedWidth:
2471
76c745e075b2 tables.py: be evn more robust about width/drawWidth etc
rgbecker
parents: 2470
diff changeset
   453
            if hasattr(v, 'width') and type(v.width) in (IntType,FloatType): return v.width
76c745e075b2 tables.py: be evn more robust about width/drawWidth etc
rgbecker
parents: 2470
diff changeset
   454
            if hasattr(v, 'drawWidth') and type(v.drawWidth) in (IntType,FloatType): return v.drawWidth
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   455
        # Even if something is fixedWidth, the attribute to check is not
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   456
        # necessarily consistent (cf. Image.drawWidth).  Therefore, we'll
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   457
        # be extra-careful and fall through to this code if necessary.
2470
74a7b9da41e4 tables.py: fix for case when minWidth fails du eot attribute error
rgbecker
parents: 2469
diff changeset
   458
        if hasattr(v, 'minWidth'):
74a7b9da41e4 tables.py: fix for case when minWidth fails du eot attribute error
rgbecker
parents: 2469
diff changeset
   459
            try:
2471
76c745e075b2 tables.py: be evn more robust about width/drawWidth etc
rgbecker
parents: 2470
diff changeset
   460
                w = v.minWidth() # should be all flowables
76c745e075b2 tables.py: be evn more robust about width/drawWidth etc
rgbecker
parents: 2470
diff changeset
   461
                if type(w) in (FloatType,IntType): return w
2470
74a7b9da41e4 tables.py: fix for case when minWidth fails du eot attribute error
rgbecker
parents: 2469
diff changeset
   462
            except AttributeError:
74a7b9da41e4 tables.py: fix for case when minWidth fails du eot attribute error
rgbecker
parents: 2469
diff changeset
   463
                pass
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   464
        v = (v is not None and str(v) or '').split("\n")
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   465
        fontName = s.fontname
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   466
        fontSize = s.fontsize
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   467
        return max([stringWidth(x,fontName,fontSize) for x in v])
1917
25b37daf5ab7 Prepare for a more general idea of cell size
rgbecker
parents: 1912
diff changeset
   468
2271
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   469
    def _calc_height(self, availHeight, availWidth, H=None, W=None):
333
a9e94b0832a4 Fix auto hieght stuff
rgbecker
parents: 329
diff changeset
   470
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   471
        H = self._argH
2271
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   472
        if not W: W = _calc_pc(self._argW,availWidth)   #widths array
6
eb791971b252 Added license, __version__ and Logi comment
rgbecker
parents: 0
diff changeset
   473
2194
6bc71309eb18 Modified version of Henning von Bargen's LongTables optimisation
rgbecker
parents: 2190
diff changeset
   474
        hmax = lim = len(H)
2436
76dc9d73afa9 added longTableOptimize config variable
rgbecker
parents: 2414
diff changeset
   475
        longTable = getattr(self,'_longTableOptimize',rl_config.longTableOptimize)
2194
6bc71309eb18 Modified version of Henning von Bargen's LongTables optimisation
rgbecker
parents: 2190
diff changeset
   476
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   477
        if None in H:
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   478
            canv = getattr(self,'canv',None)
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   479
            saved = None
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   480
            #get a handy list of any cells which span rows. should be ignored for sizing
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   481
            if self._spanCmds:
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   482
                rowSpanCells = self._rowSpanCells
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   483
                colSpanCells = self._colSpanCells
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   484
                spanRanges = self._spanRanges
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   485
                colpositions = self._colpositions
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   486
            else:
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   487
                rowSpanCells = colSpanCells = ()
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   488
                spanRanges = {}
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   489
            if canv: saved = canv._fontname, canv._fontsize, canv._leading
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   490
            H0 = H
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   491
            H = H[:]    #make a copy as we'll change it
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   492
            self._rowHeights = H
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   493
            spanCons = {}
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   494
            FUZZ = rl_config._FUZZ
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   495
            while None in H:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   496
                i = H.index(None)
2194
6bc71309eb18 Modified version of Henning von Bargen's LongTables optimisation
rgbecker
parents: 2190
diff changeset
   497
                if longTable:
6bc71309eb18 Modified version of Henning von Bargen's LongTables optimisation
rgbecker
parents: 2190
diff changeset
   498
                    hmax = i
6bc71309eb18 Modified version of Henning von Bargen's LongTables optimisation
rgbecker
parents: 2190
diff changeset
   499
                    height = reduce(operator.add, H[:i], 0)
6bc71309eb18 Modified version of Henning von Bargen's LongTables optimisation
rgbecker
parents: 2190
diff changeset
   500
                    # we can stop if we have filled up all available room
6bc71309eb18 Modified version of Henning von Bargen's LongTables optimisation
rgbecker
parents: 2190
diff changeset
   501
                    if height > availHeight: break
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   502
                V = self._cellvalues[i] # values for row i
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   503
                S = self._cellStyles[i] # styles for row i
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   504
                h = 0
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   505
                j = 0
2819
0af8d3e7dfc9 tables.py: fix inspired by Yuan Hong's bug report
rgbecker
parents: 2814
diff changeset
   506
                for j,(v, s, w) in enumerate(map(None, V, S, W)): # value, style, width (lengths must match)
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   507
                    ji = j,i
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   508
                    span = spanRanges.get(ji,None)
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   509
                    if ji in rowSpanCells and not span:
2819
0af8d3e7dfc9 tables.py: fix inspired by Yuan Hong's bug report
rgbecker
parents: 2814
diff changeset
   510
                        continue # don't count it, it's either occluded or unreliable
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   511
                    else:
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   512
                        if isinstance(v,(tuple,list,Flowable)):
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   513
                            if isinstance(v,Flowable): v = (v,)
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   514
                            if w is None and not self._canGetWidth(v):
2915
f2c1f8ef3b51 reportlab: obsoletisms removed
rgbecker
parents: 2914
diff changeset
   515
                                raise ValueError("Flowable %s in cell(%d,%d) can't have auto width in\n%s" % (v[0].identity(30),i,j,self.identity(30)))
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   516
                            if canv: canv._fontname, canv._fontsize, canv._leading = s.fontname, s.fontsize, s.leading or 1.2*s.fontsize
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   517
                            if ji in colSpanCells:
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   518
                                if not span: continue
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   519
                                w = max(colpositions[span[2]+1]-colpositions[span[0]],w)
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   520
                            dW,t = self._listCellGeom(v,w or self._listValueWidth(v),s)
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   521
                            if canv: canv._fontname, canv._fontsize, canv._leading = saved
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   522
                            dW = dW + s.leftPadding + s.rightPadding
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   523
                            if not rl_config.allowTableBoundsErrors and dW>w:
2915
f2c1f8ef3b51 reportlab: obsoletisms removed
rgbecker
parents: 2914
diff changeset
   524
                                from reportlab.platypus.doctemplate import LayoutError
f2c1f8ef3b51 reportlab: obsoletisms removed
rgbecker
parents: 2914
diff changeset
   525
                                raise LayoutError("Flowable %s (%sx%s points) too wide for cell(%d,%d) (%sx* points) in\n%s" % (v[0].identity(30),fp_str(dW),fp_str(t),i,j, fp_str(w), self.identity(30)))
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   526
                        else:
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   527
                            v = (v is not None and str(v) or '').split("\n")
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   528
                            t = (s.leading or 1.2*s.fontSize)*len(v)
2819
0af8d3e7dfc9 tables.py: fix inspired by Yuan Hong's bug report
rgbecker
parents: 2814
diff changeset
   529
                        t += s.bottomPadding+s.topPadding
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   530
                        if span:
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   531
                            r0 = span[1]
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   532
                            r1 = span[3]
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   533
                            if r0!=r1:
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   534
                                x = r0,r1
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   535
                                spanCons[x] = max(spanCons.get(x,t),t)
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   536
                                t = 0
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   537
                    if t>h: h = t   #record a new maximum
2194
6bc71309eb18 Modified version of Henning von Bargen's LongTables optimisation
rgbecker
parents: 2190
diff changeset
   538
                H[i] = h
2200
be0cfccc662a Fixed up tabs and whitespace in all source files
andy_robinson
parents: 2194
diff changeset
   539
            if None not in H: hmax = lim
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   540
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   541
            if spanCons:
2879
0ba5481218bd tables.py: slightly better spanned row height calcs
rgbecker
parents: 2878
diff changeset
   542
                spanFixDim(H0,H,spanCons)
2878
a7af19b6f9fb reportlab: fix cell spanning bug in tables.py (from Volker Haas)
rgbecker
parents: 2819
diff changeset
   543
2194
6bc71309eb18 Modified version of Henning von Bargen's LongTables optimisation
rgbecker
parents: 2190
diff changeset
   544
        height = self._height = reduce(operator.add, H[:hmax], 0)
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   545
        self._rowpositions = [height]    # index 0 is actually topline; we skip when processing cells
2194
6bc71309eb18 Modified version of Henning von Bargen's LongTables optimisation
rgbecker
parents: 2190
diff changeset
   546
        for h in H[:hmax]:
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   547
            height = height - h
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   548
            self._rowpositions.append(height)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   549
        assert abs(height)<1e-8, 'Internal height error'
2194
6bc71309eb18 Modified version of Henning von Bargen's LongTables optimisation
rgbecker
parents: 2190
diff changeset
   550
        self._hmax = hmax
1596
753865895a6f Jim Kraai's patch to preserve auto col width on subsequent pages
andy_robinson
parents: 1536
diff changeset
   551
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   552
    def _calc(self, availWidth, availHeight):
2194
6bc71309eb18 Modified version of Henning von Bargen's LongTables optimisation
rgbecker
parents: 2190
diff changeset
   553
        #if hasattr(self,'_width'): return
1596
753865895a6f Jim Kraai's patch to preserve auto col width on subsequent pages
andy_robinson
parents: 1536
diff changeset
   554
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   555
        #in some cases there are unsizable things in
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   556
        #cells.  If so, apply a different algorithm
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   557
        #and assign some withs in a less (thanks to Gary Poster) dumb way.
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   558
        #this CHANGES the widths array.
2284
b181b45c6792 Minor changes
rgbecker
parents: 2277
diff changeset
   559
        if (None in self._colWidths or '*' in self._colWidths) and self._hasVariWidthElements():
2271
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   560
            W = self._calcPreliminaryWidths(availWidth) #widths
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   561
        else:
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   562
            W = None
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   563
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   564
        # need to know which cells are part of spanned
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   565
        # ranges, so _calc_height and _calc_width can ignore them
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   566
        # in sizing
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   567
        if self._spanCmds:
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   568
            self._calcSpanRanges()
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   569
            if None in self._argH:
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   570
                self._calc_width(availWidth,W=W)
2190
e925cd300e9e merging Jython-branch
dragan1
parents: 2189
diff changeset
   571
2812
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   572
        if self._nosplitCmds:
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   573
            self._calcNoSplitRanges()
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   574
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   575
        # calculate the full table height
2271
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   576
        self._calc_height(availHeight,availWidth,W=W)
1596
753865895a6f Jim Kraai's patch to preserve auto col width on subsequent pages
andy_robinson
parents: 1536
diff changeset
   577
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   578
        # calculate the full table width
2271
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   579
        self._calc_width(availWidth,W=W)
2190
e925cd300e9e merging Jython-branch
dragan1
parents: 2189
diff changeset
   580
1883
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   581
        if self._spanCmds:
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   582
            #now work out the actual rect for each spanned cell from the underlying grid
1883
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   583
            self._calcSpanRects()
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   584
1917
25b37daf5ab7 Prepare for a more general idea of cell size
rgbecker
parents: 1912
diff changeset
   585
    def _hasVariWidthElements(self, upToRow=None):
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   586
        """Check for flowables in table cells and warn up front.
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   587
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   588
        Allow a couple which we know are fixed size such as
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   589
        images and graphics."""
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   590
        if upToRow is None: upToRow = self._nrows
2812
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   591
        for row in xrange(min(self._nrows, upToRow)):
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   592
            for col in xrange(self._ncols):
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   593
                value = self._cellvalues[row][col]
1917
25b37daf5ab7 Prepare for a more general idea of cell size
rgbecker
parents: 1912
diff changeset
   594
                if not self._canGetWidth(value):
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   595
                    return 1
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   596
        return 0
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   597
1917
25b37daf5ab7 Prepare for a more general idea of cell size
rgbecker
parents: 1912
diff changeset
   598
    def _canGetWidth(self, thing):
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   599
        "Can we work out the width quickly?"
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   600
        if isinstance(thing,(ListType, TupleType)):
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   601
            for elem in thing:
1917
25b37daf5ab7 Prepare for a more general idea of cell size
rgbecker
parents: 1912
diff changeset
   602
                if not self._canGetWidth(elem):
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   603
                    return 0
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   604
            return 1
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   605
        elif isinstance(thing, Flowable):
1917
25b37daf5ab7 Prepare for a more general idea of cell size
rgbecker
parents: 1912
diff changeset
   606
            return thing._fixedWidth  # must loosen this up
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   607
        else: #string, number, None etc.
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   608
            #anything else gets passed to str(...)
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   609
            # so should be sizable
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   610
            return 1
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   611
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   612
    def _calcPreliminaryWidths(self, availWidth):
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   613
        """Fallback algorithm for when main one fails.
1883
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   614
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   615
        Where exact width info not given but things like
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   616
        paragraphs might be present, do a preliminary scan
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   617
        and assign some best-guess values."""
2271
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   618
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   619
        W = list(self._argW) # _calc_pc(self._argW,availWidth)
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   620
        verbose = 0
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   621
        totalDefined = 0.0
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   622
        percentDefined = 0
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   623
        percentTotal = 0
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   624
        numberUndefined = 0
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   625
        numberGreedyUndefined = 0
2271
602b23129c5d Added percentages
rgbecker
parents: 2221
diff changeset
   626
        for w in W:
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   627
            if w is None:
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   628
                numberUndefined += 1
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   629
            elif w == '*':
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   630
                numberUndefined += 1
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   631
                numberGreedyUndefined += 1
2472
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   632
            elif _endswith(w,'%'):
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   633
                percentDefined += 1
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   634
                percentTotal += float(w[:-1])
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   635
            else:
2468
ca16d1756555 tables.py: 2.1 compatibility changes
rptlab
parents: 2467
diff changeset
   636
                assert type(w) in (IntType, FloatType)
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   637
                totalDefined = totalDefined + w
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   638
        if verbose: print 'prelim width calculation.  %d columns, %d undefined width, %0.2f units remain' % (
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   639
            self._ncols, numberUndefined, availWidth - totalDefined)
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   640
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   641
        #check columnwise in each None column to see if they are sizable.
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   642
        given = []
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   643
        sizeable = []
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   644
        unsizeable = []
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   645
        minimums = {}
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   646
        totalMinimum = 0
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   647
        elementWidth = self._elementWidth
2812
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   648
        for colNo in xrange(self._ncols):
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   649
            w = W[colNo]
2472
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   650
            if w is None or w=='*' or _endswith(w,'%'):
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   651
                siz = 1
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   652
                current = final = None
2812
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   653
                for rowNo in xrange(self._nrows):
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   654
                    value = self._cellvalues[rowNo][colNo]
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   655
                    style = self._cellStyles[rowNo][colNo]
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   656
                    new = elementWidth(value,style)+style.leftPadding+style.rightPadding
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   657
                    final = max(current, new)
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   658
                    current = new
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   659
                    siz = siz and self._canGetWidth(value) # irrelevant now?
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   660
                if siz:
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   661
                    sizeable.append(colNo)
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   662
                else:
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   663
                    unsizeable.append(colNo)
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   664
                minimums[colNo] = final
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   665
                totalMinimum += final
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   666
            else:
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   667
                given.append(colNo)
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   668
        if len(given) == self._ncols:
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   669
            return
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   670
        if verbose: print 'predefined width:   ',given
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   671
        if verbose: print 'uncomputable width: ',unsizeable
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   672
        if verbose: print 'computable width:   ',sizeable
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   673
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   674
        # how much width is left:
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   675
        remaining = availWidth - (totalMinimum + totalDefined)
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   676
        if remaining > 0:
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   677
            # we have some room left; fill it.
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   678
            definedPercentage = (totalDefined/availWidth)*100
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   679
            percentTotal += definedPercentage
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   680
            if numberUndefined and percentTotal < 100:
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   681
                undefined = numberGreedyUndefined or numberUndefined
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   682
                defaultWeight = (100-percentTotal)/undefined
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   683
                percentTotal = 100
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   684
                defaultDesired = (defaultWeight/percentTotal)*availWidth
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   685
            else:
2472
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   686
                defaultWeight = defaultDesired = 1
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   687
            # we now calculate how wide each column wanted to be, and then
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   688
            # proportionately shrink that down to fit the remaining available
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   689
            # space.  A column may not shrink less than its minimum width,
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   690
            # however, which makes this a bit more complicated.
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   691
            desiredWidths = []
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   692
            totalDesired = 0
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   693
            effectiveRemaining = remaining
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   694
            for colNo, minimum in minimums.items():
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   695
                w = W[colNo]
2472
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   696
                if _endswith(w,'%'):
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   697
                    desired = (float(w[:-1])/percentTotal)*availWidth
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   698
                elif w == '*':
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   699
                    desired = defaultDesired
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   700
                else:
2472
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   701
                    desired = not numberGreedyUndefined and defaultDesired or 1
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   702
                if desired <= minimum:
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   703
                    W[colNo] = minimum
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   704
                else:
2472
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   705
                    desiredWidths.append(
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   706
                        (desired-minimum, minimum, desired, colNo))
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   707
                    totalDesired += desired
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   708
                    effectiveRemaining += minimum
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   709
            if desiredWidths: # else we're done
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   710
                # let's say we have two variable columns.  One wanted
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   711
                # 88 points, and one wanted 264 points.  The first has a
2472
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   712
                # minWidth of 66, and the second of 55.  We have 71 points
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   713
                # to divide up in addition to the totalMinimum (i.e.,
2472
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   714
                # remaining==71).  Our algorithm tries to keep the proportion
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   715
                # of these variable columns.
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   716
                #
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   717
                # To do this, we add up the minimum widths of the variable
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   718
                # columns and the remaining width.  That's 192.  We add up the
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   719
                # totalDesired width.  That's 352.  That means we'll try to
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   720
                # shrink the widths by a proportion of 192/352--.545454.
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   721
                # That would make the first column 48 points, and the second
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   722
                # 144 points--adding up to the desired 192.
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   723
                #
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   724
                # Unfortunately, that's too small for the first column.  It
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   725
                # must be 66 points.  Therefore, we go ahead and save that
2472
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   726
                # column width as 88 points.  That leaves (192-88==) 104
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   727
                # points remaining.  The proportion to shrink the remaining
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   728
                # column is (104/264), which, multiplied  by the desired
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   729
                # width of 264, is 104: the amount assigned to the remaining
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   730
                # column.
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   731
                proportion = effectiveRemaining/totalDesired
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   732
                # we sort the desired widths by difference between desired and
2754
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   733
                # and minimum values, a value called "disappointment" in the
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   734
                # code.  This means that the columns with a bigger
c24a6a23f5f9 tables.py: allow more flowables to be used
rgbecker
parents: 2730
diff changeset
   735
                # disappointment will have a better chance of getting more of
2472
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   736
                # the available space.
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   737
                desiredWidths.sort()
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   738
                finalSet = []
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   739
                for disappointment, minimum, desired, colNo in desiredWidths:
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   740
                    adjusted = proportion * desired
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   741
                    if adjusted < minimum:
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   742
                        W[colNo] = minimum
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   743
                        totalDesired -= desired
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   744
                        effectiveRemaining -= minimum
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   745
                        if totalDesired:
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   746
                            proportion = effectiveRemaining/totalDesired
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   747
                    else:
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   748
                        finalSet.append((minimum, desired, colNo))
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   749
                for minimum, desired, colNo in finalSet:
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   750
                    adjusted = proportion * desired
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   751
                    assert adjusted >= minimum
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   752
                    W[colNo] = adjusted
2467
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   753
        else:
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   754
            for colNo, minimum in minimums.items():
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   755
                W[colNo] = minimum
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   756
        if verbose: print 'new widths are:', W
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   757
        self._argW = self._colWidths = W
5630a2b21a90 tables.py, paragraph.py: Gary Poster's layout improvement patch
rgbecker
parents: 2465
diff changeset
   758
        return W
2190
e925cd300e9e merging Jython-branch
dragan1
parents: 2189
diff changeset
   759
2472
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   760
    def minWidth(self):
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   761
        W = list(self._argW)
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   762
        width = 0
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   763
        elementWidth = self._elementWidth
2474
5462fb8b792d tables.py: eliminate use of enumerate
rgbecker
parents: 2472
diff changeset
   764
        rowNos = xrange(self._nrows)
5462fb8b792d tables.py: eliminate use of enumerate
rgbecker
parents: 2472
diff changeset
   765
        values = self._cellvalues
5462fb8b792d tables.py: eliminate use of enumerate
rgbecker
parents: 2472
diff changeset
   766
        styles = self._cellStyles
5462fb8b792d tables.py: eliminate use of enumerate
rgbecker
parents: 2472
diff changeset
   767
        for colNo in xrange(len(W)):
5462fb8b792d tables.py: eliminate use of enumerate
rgbecker
parents: 2472
diff changeset
   768
            w = W[colNo]
2472
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   769
            if w is None or w=='*' or _endswith(w,'%'):
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   770
                final = 0
2474
5462fb8b792d tables.py: eliminate use of enumerate
rgbecker
parents: 2472
diff changeset
   771
                for rowNo in rowNos:
5462fb8b792d tables.py: eliminate use of enumerate
rgbecker
parents: 2472
diff changeset
   772
                    value = values[rowNo][colNo]
5462fb8b792d tables.py: eliminate use of enumerate
rgbecker
parents: 2472
diff changeset
   773
                    style = styles[rowNo][colNo]
2472
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   774
                    new = (elementWidth(value,style)+
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   775
                           style.leftPadding+style.rightPadding)
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   776
                    final = max(final, new)
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   777
                width += final
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   778
            else:
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   779
                width += float(w)
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   780
        return width # XXX + 1/2*(left and right border widths)
6795e616cdbe tables.py: added in Gary Poster's gary@zope.com latest patch
rgbecker
parents: 2471
diff changeset
   781
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   782
    def _calcSpanRanges(self):
1883
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   783
        """Work out rects for tables which do row and column spanning.
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   784
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   785
        This creates some mappings to let the later code determine
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   786
        if a cell is part of a "spanned" range.
1883
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   787
        self._spanRanges shows the 'coords' in integers of each
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   788
        'cell range', or None if it was clobbered:
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   789
          (col, row) -> (col0, row0, col1, row1)
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   790
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   791
        Any cell not in the key is not part of a spanned region
1883
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   792
        """
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   793
        self._spanRanges = spanRanges = {}
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   794
        for x in xrange(self._ncols):
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   795
            for y in xrange(self._nrows):
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   796
                spanRanges[x,y] = (x, y, x, y)
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   797
        self._colSpanCells = []
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   798
        self._rowSpanCells = []
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   799
        csa = self._colSpanCells.append
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   800
        rsa = self._rowSpanCells.append
1883
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   801
        for (cmd, start, stop) in self._spanCmds:
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   802
            x0, y0 = start
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   803
            x1, y1 = stop
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   804
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   805
            #normalize
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   806
            if x0 < 0: x0 = x0 + self._ncols
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   807
            if x1 < 0: x1 = x1 + self._ncols
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   808
            if y0 < 0: y0 = y0 + self._nrows
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   809
            if y1 < 0: y1 = y1 + self._nrows
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   810
            if x0 > x1: x0, x1 = x1, x0
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   811
            if y0 > y1: y0, y1 = y1, y0
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   812
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   813
            if x0!=x1 or y0!=y1:
2812
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   814
                if x0!=x1: #column span
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   815
                    for y in xrange(y0, y1+1):
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   816
                        for x in xrange(x0,x1+1):
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   817
                            csa((x,y))
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   818
                if y0!=y1: #row span
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   819
                    for y in xrange(y0, y1+1):
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   820
                        for x in xrange(x0,x1+1):
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   821
                            rsa((x,y))
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   822
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   823
                for y in xrange(y0, y1+1):
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   824
                    for x in xrange(x0,x1+1):
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   825
                        spanRanges[x,y] = None
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   826
                # set the main entry
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   827
                spanRanges[x0,y0] = (x0, y0, x1, y1)
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   828
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   829
    def _calcNoSplitRanges(self):
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   830
        """
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   831
        This creates some mappings to let the later code determine
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   832
        if a cell is part of a "nosplit" range.
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   833
        self._nosplitRanges shows the 'coords' in integers of each
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   834
        'cell range', or None if it was clobbered:
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   835
          (col, row) -> (col0, row0, col1, row1)
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   836
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   837
        Any cell not in the key is not part of a spanned region
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   838
        """
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   839
        self._nosplitRanges = nosplitRanges = {}
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   840
        for x in xrange(self._ncols):
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   841
            for y in xrange(self._nrows):
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   842
                nosplitRanges[x,y] = (x, y, x, y)
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   843
        self._colNoSplitCells = []
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   844
        self._rowNoSplitCells = []
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   845
        csa = self._colNoSplitCells.append
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   846
        rsa = self._rowNoSplitCells.append
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   847
        for (cmd, start, stop) in self._nosplitCmds:
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   848
            x0, y0 = start
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   849
            x1, y1 = stop
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   850
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   851
            #normalize
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   852
            if x0 < 0: x0 = x0 + self._ncols
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   853
            if x1 < 0: x1 = x1 + self._ncols
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   854
            if y0 < 0: y0 = y0 + self._nrows
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   855
            if y1 < 0: y1 = y1 + self._nrows
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   856
            if x0 > x1: x0, x1 = x1, x0
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   857
            if y0 > y1: y0, y1 = y1, y0
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   858
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   859
            if x0!=x1 or y0!=y1:
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   860
                #column span
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   861
                if x0!=x1:
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   862
                    for y in xrange(y0, y1+1):
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   863
                        for x in xrange(x0,x1+1):
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   864
                            csa((x,y))
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   865
                #row span
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   866
                if y0!=y1:
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   867
                    for y in xrange(y0, y1+1):
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   868
                        for x in xrange(x0,x1+1):
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   869
                            rsa((x,y))
2190
e925cd300e9e merging Jython-branch
dragan1
parents: 2189
diff changeset
   870
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   871
                for y in xrange(y0, y1+1):
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   872
                    for x in xrange(x0,x1+1):
2812
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   873
                        nosplitRanges[x,y] = None
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   874
                # set the main entry
2812
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   875
                nosplitRanges[x0,y0] = (x0, y0, x1, y1)
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   876
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   877
    def _calcSpanRects(self):
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   878
        """Work out rects for tables which do row and column spanning.
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   879
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   880
        Based on self._spanRanges, which is already known,
2190
e925cd300e9e merging Jython-branch
dragan1
parents: 2189
diff changeset
   881
        and the widths which were given or previously calculated,
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   882
        self._spanRects shows the real coords for drawing:
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   883
          (col, row) -> (x, y, width, height)
2190
e925cd300e9e merging Jython-branch
dragan1
parents: 2189
diff changeset
   884
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   885
        for each cell.  Any cell which 'does not exist' as another
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   886
        has spanned over it will get a None entry on the right
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   887
        """
2289
fc3840f8294d Attempt to fix the Mike Spanning example
rgbecker
parents: 2288
diff changeset
   888
        if getattr(self,'_spanRects',None): return
2412
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   889
        colpositions = self._colpositions
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   890
        rowpositions = self._rowpositions
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   891
        self._spanRects = spanRects = {}
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   892
        self._vBlocks = vBlocks = {}
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   893
        self._hBlocks = hBlocks = {}
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
   894
        for (coord, value) in self._spanRanges.items():
1883
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   895
            if value is None:
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   896
                spanRects[coord] = None
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   897
            else:
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   898
                col,row = coord
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   899
                col0, row0, col1, row1 = value
2412
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   900
                if col1-col0>0:
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   901
                    for _ in xrange(col0+1,col1+1):
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   902
                        vBlocks.setdefault(colpositions[_],[]).append((rowpositions[row1+1],rowpositions[row0]))
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   903
                if row1-row0>0:
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   904
                    for _ in xrange(row0+1,row1+1):
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   905
                        hBlocks.setdefault(rowpositions[_],[]).append((colpositions[col0],colpositions[col1+1]))
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   906
                x = colpositions[col0]
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   907
                y = rowpositions[row1+1]
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   908
                width = colpositions[col1+1] - x
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   909
                height = rowpositions[row0] - y
1883
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   910
                spanRects[coord] = (x, y, width, height)
2190
e925cd300e9e merging Jython-branch
dragan1
parents: 2189
diff changeset
   911
2412
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   912
        for _ in hBlocks, vBlocks:
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   913
            for value in _.values():
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
   914
                value.sort()
2190
e925cd300e9e merging Jython-branch
dragan1
parents: 2189
diff changeset
   915
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   916
    def setStyle(self, tblstyle):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   917
        if type(tblstyle) is not TableStyleType:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   918
            tblstyle = TableStyle(tblstyle)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   919
        for cmd in tblstyle.getCommands():
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   920
            self._addCommand(cmd)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   921
        for k,v in tblstyle._opts.items():
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   922
            setattr(self,k,v)
2574
d81949596070 reportlab: changes to accomodate barcodes
rgbecker
parents: 2523
diff changeset
   923
        for a in ('spaceBefore','spaceAfter'):
d81949596070 reportlab: changes to accomodate barcodes
rgbecker
parents: 2523
diff changeset
   924
            if not hasattr(self,a) and hasattr(tblstyle,a):
d81949596070 reportlab: changes to accomodate barcodes
rgbecker
parents: 2523
diff changeset
   925
                setattr(self,a,getattr(tblstyle,a))
350
0916ae478b25 Table splitting start
rgbecker
parents: 342
diff changeset
   926
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   927
    def _addCommand(self,cmd):
2393
6b3e47730acc tables.py: fix buglet in command adding
rgbecker
parents: 2392
diff changeset
   928
        if cmd[0] in ('BACKGROUND','ROWBACKGROUNDS','COLBACKGROUNDS'):
2392
6c59b0eb312d table color cycle changes
andy
parents: 2389
diff changeset
   929
            self._bkgrndcmds.append(cmd)
1883
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   930
        elif cmd[0] == 'SPAN':
eb6f902a0613 Initial try at column spanning
andy_robinson
parents: 1699
diff changeset
   931
            self._spanCmds.append(cmd)
2812
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   932
        elif cmd[0] == 'NOSPLIT':
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   933
            # we expect op, start, stop
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   934
            self._nosplitCmds.append(cmd)
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   935
        elif _isLineCommand(cmd):
1699
37fa8717925f Improved line styles, allow for cap etc
rgbecker
parents: 1683
diff changeset
   936
            # we expect op, start, stop, weight, colour, cap, dashes, join
2523
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   937
            cmd = list(cmd)
1699
37fa8717925f Improved line styles, allow for cap etc
rgbecker
parents: 1683
diff changeset
   938
            if len(cmd)<5: raise ValueError('bad line command '+str(cmd))
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
   939
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
   940
            #determine line cap value at position 5. This can be string or numeric.
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
   941
            if len(cmd)<6:
2523
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   942
                cmd.append(1)
1699
37fa8717925f Improved line styles, allow for cap etc
rgbecker
parents: 1683
diff changeset
   943
            else:
2469
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
   944
                cap = _convert2int(cmd[5], LINECAPS, 0, 2, 'cap', cmd)
2523
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   945
                cmd[5] = cap
2464
09cfec86fa5a tables.py: fixes to join/cap/dash from Gary Poster
rgbecker
parents: 2463
diff changeset
   946
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
   947
            #dashes at index 6 - this is a dash array:
2523
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   948
            if len(cmd)<7: cmd.append(None)
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
   949
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
   950
            #join mode at index 7 - can be string or numeric, look up as for caps
2523
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   951
            if len(cmd)<8: cmd.append(1)
1699
37fa8717925f Improved line styles, allow for cap etc
rgbecker
parents: 1683
diff changeset
   952
            else:
2469
a2c99a719070 tables.py: improve join/cap conversion
rgbecker
parents: 2468
diff changeset
   953
                join = _convert2int(cmd[7], LINEJOINS, 0, 2, 'join', cmd)
2523
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   954
                cmd[7] = join
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
   955
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
   956
            #linecount at index 8.  Default is 1, set to 2 for double line.
2523
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   957
            if len(cmd)<9: cmd.append(1)
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
   958
            else:
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
   959
                lineCount = cmd[8]
2523
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   960
                if lineCount is None:
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   961
                    lineCount = 1
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   962
                    cmd[8] = lineCount
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   963
                assert lineCount >= 1
2221
cd3b787b38a9 corrected erroneous comment
andy_robinson
parents: 2220
diff changeset
   964
            #linespacing at index 9. Not applicable unless 2+ lines, defaults to line
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
   965
            #width so you get a visible gap between centres
2523
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   966
            if len(cmd)<10: cmd.append(cmd[3])
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   967
            else:
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   968
                space = cmd[9]
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   969
                if space is None:
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   970
                    space = cmd[3]
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   971
                    cmd[9] = space
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
   972
            assert len(cmd) == 10
2414
81be267fa92c tables.py: extend span line blocking to multi lines
rgbecker
parents: 2412
diff changeset
   973
2523
0473810aff11 platypus: fix up None defaults for table line commands, add HRFlowable dash arg
rgbecker
parents: 2495
diff changeset
   974
            self._linecmds.append(tuple(cmd))
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   975
        else:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   976
            (op, (sc, sr), (ec, er)), values = cmd[:3] , cmd[3:]
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   977
            if sc < 0: sc = sc + self._ncols
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   978
            if ec < 0: ec = ec + self._ncols
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   979
            if sr < 0: sr = sr + self._nrows
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   980
            if er < 0: er = er + self._nrows
2812
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   981
            for i in xrange(sr, er+1):
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
   982
                for j in xrange(sc, ec+1):
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   983
                    _setCellStyle(self._cellStyles, i, j, op, values)
326
159576a5816e First try at auto sizing
rgbecker
parents: 312
diff changeset
   984
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   985
    def _drawLines(self):
1699
37fa8717925f Improved line styles, allow for cap etc
rgbecker
parents: 1683
diff changeset
   986
        ccap, cdash, cjoin = None, None, None
37fa8717925f Improved line styles, allow for cap etc
rgbecker
parents: 1683
diff changeset
   987
        self.canv.saveState()
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
   988
        for op, (sc,sr), (ec,er), weight, color, cap, dash, join, count, space in self._linecmds:
2185
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
   989
            if type(sr) is type('') and sr.startswith('split'): continue
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   990
            if sc < 0: sc = sc + self._ncols
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   991
            if ec < 0: ec = ec + self._ncols
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   992
            if sr < 0: sr = sr + self._nrows
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
   993
            if er < 0: er = er + self._nrows
2414
81be267fa92c tables.py: extend span line blocking to multi lines
rgbecker
parents: 2412
diff changeset
   994
            if cap!=None and ccap!=cap:
1699
37fa8717925f Improved line styles, allow for cap etc
rgbecker
parents: 1683
diff changeset
   995
                self.canv.setLineCap(cap)
37fa8717925f Improved line styles, allow for cap etc
rgbecker
parents: 1683
diff changeset
   996
                ccap = cap
2464
09cfec86fa5a tables.py: fixes to join/cap/dash from Gary Poster
rgbecker
parents: 2463
diff changeset
   997
            if dash is None or dash == []:
09cfec86fa5a tables.py: fixes to join/cap/dash from Gary Poster
rgbecker
parents: 2463
diff changeset
   998
                if cdash is not None:
09cfec86fa5a tables.py: fixes to join/cap/dash from Gary Poster
rgbecker
parents: 2463
diff changeset
   999
                    self.canv.setDash()
09cfec86fa5a tables.py: fixes to join/cap/dash from Gary Poster
rgbecker
parents: 2463
diff changeset
  1000
                    cdash = None
09cfec86fa5a tables.py: fixes to join/cap/dash from Gary Poster
rgbecker
parents: 2463
diff changeset
  1001
            elif dash != cdash:
09cfec86fa5a tables.py: fixes to join/cap/dash from Gary Poster
rgbecker
parents: 2463
diff changeset
  1002
                self.canv.setDash(dash)
09cfec86fa5a tables.py: fixes to join/cap/dash from Gary Poster
rgbecker
parents: 2463
diff changeset
  1003
                cdash = dash
09cfec86fa5a tables.py: fixes to join/cap/dash from Gary Poster
rgbecker
parents: 2463
diff changeset
  1004
            if join is not None and cjoin!=join:
09cfec86fa5a tables.py: fixes to join/cap/dash from Gary Poster
rgbecker
parents: 2463
diff changeset
  1005
                self.canv.setLineJoin(join)
09cfec86fa5a tables.py: fixes to join/cap/dash from Gary Poster
rgbecker
parents: 2463
diff changeset
  1006
                cjoin = join
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1007
            getattr(self,_LineOpMap.get(op, '_drawUnknown' ))( (sc, sr), (ec, er), weight, color, count, space)
1699
37fa8717925f Improved line styles, allow for cap etc
rgbecker
parents: 1683
diff changeset
  1008
        self.canv.restoreState()
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1009
        self._curcolor = None
248
c103b7a55e79 Color fixes; thanks to J Alet
rgbecker
parents: 221
diff changeset
  1010
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1011
    def _drawUnknown(self,  (sc, sr), (ec, er), weight, color, count, space):
2730
b3fc23a74fd1 reportlab: Dirk Holtwick's editor's fixes :)
rgbecker
parents: 2590
diff changeset
  1012
        #we are only called from _drawLines which is one level up
b3fc23a74fd1 reportlab: Dirk Holtwick's editor's fixes :)
rgbecker
parents: 2590
diff changeset
  1013
        import sys
b3fc23a74fd1 reportlab: Dirk Holtwick's editor's fixes :)
rgbecker
parents: 2590
diff changeset
  1014
        op = sys._getframe(1).f_locals['op']
b3fc23a74fd1 reportlab: Dirk Holtwick's editor's fixes :)
rgbecker
parents: 2590
diff changeset
  1015
        raise ValueError("Unknown line command '%s'" % op)
403
05b3be301e19 Started debugging Table split
rgbecker
parents: 361
diff changeset
  1016
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1017
    def _drawGrid(self, (sc, sr), (ec, er), weight, color, count, space):
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1018
        self._drawBox( (sc, sr), (ec, er), weight, color, count, space)
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1019
        self._drawInnerGrid( (sc, sr), (ec, er), weight, color, count, space)
403
05b3be301e19 Started debugging Table split
rgbecker
parents: 361
diff changeset
  1020
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1021
    def _drawBox(self,  (sc, sr), (ec, er), weight, color, count, space):
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1022
        self._drawHLines((sc, sr), (ec, sr), weight, color, count, space)
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1023
        self._drawHLines((sc, er+1), (ec, er+1), weight, color, count, space)
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1024
        self._drawVLines((sc, sr), (sc, er), weight, color, count, space)
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1025
        self._drawVLines((ec+1, sr), (ec+1, er), weight, color, count, space)
350
0916ae478b25 Table splitting start
rgbecker
parents: 342
diff changeset
  1026
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1027
    def _drawInnerGrid(self, (sc, sr), (ec, er), weight, color, count, space):
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1028
        self._drawHLines((sc, sr+1), (ec, er), weight, color, count, space)
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1029
        self._drawVLines((sc+1, sr), (ec, er), weight, color, count, space)
350
0916ae478b25 Table splitting start
rgbecker
parents: 342
diff changeset
  1030
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1031
    def _prepLine(self, weight, color):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1032
        if color != self._curcolor:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1033
            self.canv.setStrokeColor(color)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1034
            self._curcolor = color
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1035
        if weight != self._curweight:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1036
            self.canv.setLineWidth(weight)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1037
            self._curweight = weight
350
0916ae478b25 Table splitting start
rgbecker
parents: 342
diff changeset
  1038
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1039
    def _drawHLines(self, (sc, sr), (ec, er), weight, color, count, space):
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1040
        ecp = self._colpositions[sc:ec+2]
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1041
        rp = self._rowpositions[sr:er+1]
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1042
        if len(ecp)<=1 or len(rp)<1: return
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1043
        self._prepLine(weight, color)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1044
        scp = ecp[0]
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1045
        ecp = ecp[-1]
2412
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
  1046
        hBlocks = getattr(self,'_hBlocks',{})
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
  1047
        canvLine = self.canv.line
2220
7a77486a7ea7 Slightly more efficient linedrawing
rgbecker
parents: 2219
diff changeset
  1048
        if count == 1:
2412
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
  1049
            for y in rp:
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
  1050
                _hLine(canvLine, scp, ecp, y, hBlocks)
2220
7a77486a7ea7 Slightly more efficient linedrawing
rgbecker
parents: 2219
diff changeset
  1051
        else:
2414
81be267fa92c tables.py: extend span line blocking to multi lines
rgbecker
parents: 2412
diff changeset
  1052
            lf = lambda x0,y0,x1,y1,canvLine=canvLine, ws=weight+space, count=count: _multiLine(x0,x1,y0,canvLine,ws,count)
2412
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
  1053
            for y in rp:
2414
81be267fa92c tables.py: extend span line blocking to multi lines
rgbecker
parents: 2412
diff changeset
  1054
                _hLine(lf, scp, ecp, y, hBlocks)
403
05b3be301e19 Started debugging Table split
rgbecker
parents: 361
diff changeset
  1055
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1056
    def _drawHLinesB(self, (sc, sr), (ec, er), weight, color, count, space):
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1057
        self._drawHLines((sc, sr+1), (ec, er+1), weight, color, count, space)
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1058
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1059
    def _drawVLines(self, (sc, sr), (ec, er), weight, color, count, space):
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1060
        erp = self._rowpositions[sr:er+2]
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1061
        cp  = self._colpositions[sc:ec+1]
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1062
        if len(erp)<=1 or len(cp)<1: return
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1063
        self._prepLine(weight, color)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1064
        srp = erp[0]
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1065
        erp = erp[-1]
2412
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
  1066
        vBlocks = getattr(self,'_vBlocks',{})
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
  1067
        canvLine = lambda y0, x0, y1, x1, _line=self.canv.line: _line(x0,y0,x1,y1)
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
  1068
        if count == 1:
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
  1069
            for x in cp:
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
  1070
                _hLine(canvLine, erp, srp, x, vBlocks)
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
  1071
        else:
2414
81be267fa92c tables.py: extend span line blocking to multi lines
rgbecker
parents: 2412
diff changeset
  1072
            lf = lambda x0,y0,x1,y1,canvLine=canvLine, ws=weight+space, count=count: _multiLine(x0,x1,y0,canvLine,ws,count)
2412
b8bf2e639769 reportlab: table improvments and better documentation
rgbecker
parents: 2401
diff changeset
  1073
            for x in cp:
2414
81be267fa92c tables.py: extend span line blocking to multi lines
rgbecker
parents: 2412
diff changeset
  1074
                _hLine(lf, erp, srp, x, vBlocks)
326
159576a5816e First try at auto sizing
rgbecker
parents: 312
diff changeset
  1075
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1076
    def _drawVLinesA(self, (sc, sr), (ec, er), weight, color, count, space):
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1077
        self._drawVLines((sc+1, sr), (ec+1, er), weight, color, count, space)
403
05b3be301e19 Started debugging Table split
rgbecker
parents: 361
diff changeset
  1078
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1079
    def wrap(self, availWidth, availHeight):
1912
c8509682e3e0 Finished off sizing logic to go with row and column
andy_robinson
parents: 1883
diff changeset
  1080
        self._calc(availWidth, availHeight)
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1081
        #nice and easy, since they are predetermined size
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1082
        self.availWidth = availWidth
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1083
        return (self._width, self._height)
1495
fd32c1794998 Propagate font properties to Flowable cells
rgbecker
parents: 1492
diff changeset
  1084
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1085
    def onSplit(self,T,byRow=1):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1086
        '''
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1087
        This method will be called when the Table is split.
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1088
        Special purpose tables can override to do special stuff.
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1089
        '''
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1090
        pass
419
469fe11a010b Additions/Improvements to LINE CMD Splitting
rgbecker
parents: 403
diff changeset
  1091
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1092
    def _cr_0(self,n,cmds):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1093
        for c in cmds:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1094
            c = tuple(c)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1095
            (sc,sr), (ec,er) = c[1:3]
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1096
            if sr>=n: continue
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1097
            if er>=n: er = n-1
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1098
            self._addCommand((c[0],)+((sc, sr), (ec, er))+c[3:])
350
0916ae478b25 Table splitting start
rgbecker
parents: 342
diff changeset
  1099
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1100
    def _cr_1_1(self,n,repeatRows, cmds):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1101
        for c in cmds:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1102
            c = tuple(c)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1103
            (sc,sr), (ec,er) = c[1:3]
2185
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1104
            if sr in ('splitfirst','splitlast'): self._addCommand(c)
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1105
            else:
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1106
                if sr>=0 and sr>=repeatRows and sr<n and er>=0 and er<n: continue
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1107
                if sr>=repeatRows and sr<n: sr=repeatRows
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1108
                elif sr>=repeatRows and sr>=n: sr=sr+repeatRows-n
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1109
                if er>=repeatRows and er<n: er=repeatRows
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1110
                elif er>=repeatRows and er>=n: er=er+repeatRows-n
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1111
                self._addCommand((c[0],)+((sc, sr), (ec, er))+c[3:])
350
0916ae478b25 Table splitting start
rgbecker
parents: 342
diff changeset
  1112
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1113
    def _cr_1_0(self,n,cmds):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1114
        for c in cmds:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1115
            c = tuple(c)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1116
            (sc,sr), (ec,er) = c[1:3]
2185
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1117
            if sr in ('splitfirst','splitlast'): self._addCommand(c)
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1118
            else:
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1119
                if er>=0 and er<n: continue
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1120
                if sr>=0 and sr<n: sr=0
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1121
                if sr>=n: sr = sr-n
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1122
                if er>=n: er = er-n
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1123
                self._addCommand((c[0],)+((sc, sr), (ec, er))+c[3:])
350
0916ae478b25 Table splitting start
rgbecker
parents: 342
diff changeset
  1124
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1125
    def _splitRows(self,availHeight):
2443
41262322cc3d tables.py: added span rows split handling & test contributed by Andre Reitz
rgbecker
parents: 2436
diff changeset
  1126
        n=self._getFirstPossibleSplitRowPosition(availHeight)
41262322cc3d tables.py: added span rows split handling & test contributed by Andre Reitz
rgbecker
parents: 2436
diff changeset
  1127
        if n<=self.repeatRows: return []
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1128
        lim = len(self._rowHeights)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1129
        if n==lim: return [self]
350
0916ae478b25 Table splitting start
rgbecker
parents: 342
diff changeset
  1130
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1131
        repeatRows = self.repeatRows
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1132
        repeatCols = self.repeatCols
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1133
        splitByRow = self.splitByRow
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1134
        data = self._cellvalues
350
0916ae478b25 Table splitting start
rgbecker
parents: 342
diff changeset
  1135
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1136
        #we're going to split into two superRows
2194
6bc71309eb18 Modified version of Henning von Bargen's LongTables optimisation
rgbecker
parents: 2190
diff changeset
  1137
        #R0 = slelf.__class__( data[:n], self._argW, self._argH[:n],
2913
551ca1ae1ef2 tables.py: try to use keywords in onward calls
rgbecker
parents: 2891
diff changeset
  1138
        R0 = self.__class__( data[:n], colWidths=self._colWidths, rowHeights=self._argH[:n],
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1139
                repeatRows=repeatRows, repeatCols=repeatCols,
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1140
                splitByRow=splitByRow)
350
0916ae478b25 Table splitting start
rgbecker
parents: 342
diff changeset
  1141
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1142
        #copy the styles and commands
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1143
        R0._cellStyles = self._cellStyles[:n]
419
469fe11a010b Additions/Improvements to LINE CMD Splitting
rgbecker
parents: 403
diff changeset
  1144
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1145
        A = []
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1146
        # hack up the line commands
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1147
        for op, (sc,sr), (ec,er), weight, color, cap, dash, join, count, space in self._linecmds:
2185
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1148
            if type(sr)is type('') and sr.startswith('split'):
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1149
                A.append((op,(sc,sr), (ec,sr), weight, color, cap, dash, join, count, space))
2185
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1150
                if sr=='splitlast':
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1151
                    sr = er = n-1
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1152
                elif sr=='splitfirst':
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1153
                    sr = n
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1154
                    er = n
a45d3b2ebe37 Added splitfirst/last handling
rgbecker
parents: 2012
diff changeset
  1155
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1156
            if sc < 0: sc = sc + self._ncols
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1157
            if ec < 0: ec = ec + self._ncols
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1158
            if sr < 0: sr = sr + self._nrows
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1159
            if er < 0: er = er + self._nrows
419
469fe11a010b Additions/Improvements to LINE CMD Splitting
rgbecker
parents: 403
diff changeset
  1160
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1161
            if op in ('BOX','OUTLINE','GRID'):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1162
                if sr<n and er>=n:
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1163
                    # we have to split the BOX
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1164
                    A.append(('LINEABOVE',(sc,sr), (ec,sr), weight, color, cap, dash, join, count, space))
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1165
                    A.append(('LINEBEFORE',(sc,sr), (sc,er), weight, color, cap, dash, join, count, space))
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1166
                    A.append(('LINEAFTER',(ec,sr), (ec,er), weight, color, cap, dash, join, count, space))
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1167
                    A.append(('LINEBELOW',(sc,er), (ec,er), weight, color, cap, dash, join, count, space))
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1168
                    if op=='GRID':
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1169
                        A.append(('LINEBELOW',(sc,n-1), (ec,n-1), weight, color, cap, dash, join, count, space))
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1170
                        A.append(('LINEABOVE',(sc,n), (ec,n), weight, color, cap, dash, join, count, space))
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1171
                        A.append(('INNERGRID',(sc,sr), (ec,er), weight, color, cap, dash, join, count, space))
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1172
                else:
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1173
                    A.append((op,(sc,sr), (ec,er), weight, color, cap, dash, join, count, space))
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1174
            elif op in ('INNERGRID','LINEABOVE'):
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1175
                if sr<n and er>=n:
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1176
                    A.append(('LINEBELOW',(sc,n-1), (ec,n-1), weight, color, cap, dash, join, count, space))
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1177
                    A.append(('LINEABOVE',(sc,n), (ec,n), weight, color, cap, dash, join, count, space))
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1178
                A.append((op,(sc,sr), (ec,er), weight, color, cap, dash, join, count, space))
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1179
            elif op == 'LINEBELOW':
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1180
                if sr<n and er>=(n-1):
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1181
                    A.append(('LINEABOVE',(sc,n), (ec,n), weight, color, cap, dash, join, count, space))
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1182
                A.append((op,(sc,sr), (ec,er), weight, color))
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1183
            elif op == 'LINEABOVE':
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1184
                if sr<=n and er>=n:
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1185
                    A.append(('LINEBELOW',(sc,n-1), (ec,n-1), weight, color, cap, dash, join, count, space))
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1186
                A.append((op,(sc,sr), (ec,er), weight, color, cap, dash, join, count, space))
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1187
            else:
2219
5c1727997169 Multiple lines and decimal alignments now supported
andy_robinson
parents: 2200
diff changeset
  1188
                A.append((op,(sc,sr), (ec,er), weight, color, cap, dash, join, count, space))
419
469fe11a010b Additions/Improvements to LINE CMD Splitting
rgbecker
parents: 403
diff changeset
  1189
1677
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1190
        R0._cr_0(n,A)
1450177dd19e Exterminated all tab characters and added a test to make sure
andy_robinson
parents: 1658
diff changeset
  1191
        R0._cr_0(n,self._bkgrndcmds)
2475
24a8e6ffc36a tables.py: fixes to split + spans
rgbecker
parents: 2474
diff changeset
  1192
        R0._cr_0(n,self._spanCmds)
2812
3a861a4b4cf5 tables.py: support for NOSPLIT, imroved cell backgrounding
rgbecker
parents: 2754
diff changeset
  1193
        R0._cr_0(n,self._nosplitCmds)