xf.xf_index:
fprintf(self.logfile,
"NOTE !!! XF[%d]: parent_style_index is %d; out of order?\n",
@@ -1049,214 +1096,226 @@ def initialise_book(book):
handle_style,
handle_xf,
xf_epilogue,
- )
+ )
for method in methods:
setattr(book.__class__, method.__name__, method)
-##
-# A collection of the border-related attributes of an XF record.
-# Items correspond to those in the Excel UI's Format/Cells/Border tab.
-# An explanations of "colour index" is given in the Formatting
-# section at the start of this document.
-# There are five line style attributes; possible values and the
-# associated meanings are:
-# 0 = No line,
-# 1 = Thin,
-# 2 = Medium,
-# 3 = Dashed,
-# 4 = Dotted,
-# 5 = Thick,
-# 6 = Double,
-# 7 = Hair,
-# 8 = Medium dashed,
-# 9 = Thin dash-dotted,
-# 10 = Medium dash-dotted,
-# 11 = Thin dash-dot-dotted,
-# 12 = Medium dash-dot-dotted,
-# 13 = Slanted medium dash-dotted.
-# The line styles 8 to 13 appear in BIFF8 files (Excel 97 and later) only.
-# For pictures of the line styles, refer to OOo docs s3.10 (p22)
-# "Line Styles for Cell Borders (BIFF3-BIFF8)".
-#
-- New in version 0.6.1
class XFBorder(BaseObject, EqNeAttrs):
+ """
+ A collection of the border-related attributes of an ``XF`` record.
+ Items correspond to those in the Excel UI's Format -> Cells -> Border tab.
+
+ An explanations of "colour index" is given in :ref:`palette`.
+
+ There are five line style attributes; possible values and the
+ associated meanings are::
+
+ 0 = No line,
+ 1 = Thin,
+ 2 = Medium,
+ 3 = Dashed,
+ 4 = Dotted,
+ 5 = Thick,
+ 6 = Double,
+ 7 = Hair,
+ 8 = Medium dashed,
+ 9 = Thin dash-dotted,
+ 10 = Medium dash-dotted,
+ 11 = Thin dash-dot-dotted,
+ 12 = Medium dash-dot-dotted,
+ 13 = Slanted medium dash-dotted.
- ##
- # The colour index for the cell's top line
+ The line styles 8 to 13 appear in BIFF8 files (Excel 97 and later) only.
+ For pictures of the line styles, refer to OOo docs s3.10 (p22)
+ "Line Styles for Cell Borders (BIFF3-BIFF8)".
+
+ .. versionadded:: 0.6.1
+ """
+
+ #: The colour index for the cell's top line
top_colour_index = 0
- ##
- # The colour index for the cell's bottom line
+ #: The colour index for the cell's bottom line
bottom_colour_index = 0
- ##
- # The colour index for the cell's left line
+
+ #: The colour index for the cell's left line
left_colour_index = 0
- ##
- # The colour index for the cell's right line
+
+ #: The colour index for the cell's right line
right_colour_index = 0
- ##
- # The colour index for the cell's diagonal lines, if any
+
+ #: The colour index for the cell's diagonal lines, if any
diag_colour_index = 0
- ##
- # The line style for the cell's top line
+
+ #: The line style for the cell's top line
top_line_style = 0
- ##
- # The line style for the cell's bottom line
+
+ #: The line style for the cell's bottom line
bottom_line_style = 0
- ##
- # The line style for the cell's left line
+
+ #: The line style for the cell's left line
left_line_style = 0
- ##
- # The line style for the cell's right line
+
+ #: The line style for the cell's right line
right_line_style = 0
- ##
- # The line style for the cell's diagonal lines, if any
+
+ #: The line style for the cell's diagonal lines, if any
diag_line_style = 0
- ##
- # 1 = draw a diagonal from top left to bottom right
+
+ #: 1 = draw a diagonal from top left to bottom right
diag_down = 0
- ##
- # 1 = draw a diagonal from bottom left to top right
+
+ #: 1 = draw a diagonal from bottom left to top right
diag_up = 0
-##
-# A collection of the background-related attributes of an XF record.
-# Items correspond to those in the Excel UI's Format/Cells/Patterns tab.
-# An explanation of "colour index" is given in the Formatting
-# section at the start of this document.
-#
-- New in version 0.6.1
class XFBackground(BaseObject, EqNeAttrs):
+ """
+ A collection of the background-related attributes of an ``XF`` record.
+ Items correspond to those in the Excel UI's Format -> Cells -> Patterns tab.
+
+ An explanations of "colour index" is given in :ref:`palette`.
- ##
- # See section 3.11 of the OOo docs.
+ .. versionadded:: 0.6.1
+ """
+
+ #: See section 3.11 of the OOo docs.
fill_pattern = 0
- ##
- # See section 3.11 of the OOo docs.
+
+ #: See section 3.11 of the OOo docs.
background_colour_index = 0
- ##
- # See section 3.11 of the OOo docs.
+
+ #: See section 3.11 of the OOo docs.
pattern_colour_index = 0
-##
-# A collection of the alignment and similar attributes of an XF record.
-# Items correspond to those in the Excel UI's Format/Cells/Alignment tab.
-#
-- New in version 0.6.1
class XFAlignment(BaseObject, EqNeAttrs):
+ """
+ A collection of the alignment and similar attributes of an ``XF`` record.
+ Items correspond to those in the Excel UI's Format -> Cells -> Alignment tab.
- ##
- # Values: section 6.115 (p 214) of OOo docs
+ .. versionadded:: 0.6.1
+ """
+
+ #: Values: section 6.115 (p 214) of OOo docs
hor_align = 0
- ##
- # Values: section 6.115 (p 215) of OOo docs
+
+ #: Values: section 6.115 (p 215) of OOo docs
vert_align = 0
- ##
- # Values: section 6.115 (p 215) of OOo docs.
- # Note: file versions BIFF7 and earlier use the documented
- # "orientation" attribute; this will be mapped (without loss)
- # into "rotation".
+
+ #: Values: section 6.115 (p 215) of OOo docs.
+ #:
+ #: .. note::
+ #: file versions BIFF7 and earlier use the documented
+ #: :attr:`orientation` attribute; this will be mapped (without loss)
+ #: into :attr:`rotation`.
rotation = 0
- ##
- # 1 = text is wrapped at right margin
+
+ #: 1 = text is wrapped at right margin
text_wrapped = 0
- ##
- # A number in range(15).
+
+ #: A number in ``range(15)``.
indent_level = 0
- ##
- # 1 = shrink font size to fit text into cell.
+
+ #: 1 = shrink font size to fit text into cell.
shrink_to_fit = 0
- ##
- # 0 = according to context; 1 = left-to-right; 2 = right-to-left
- text_direction = 0
-##
-# A collection of the protection-related attributes of an XF record.
-# Items correspond to those in the Excel UI's Format/Cells/Protection tab.
-# Note the OOo docs include the "cell or style" bit
-# in this bundle of attributes.
-# This is incorrect; the bit is used in determining which bundles to use.
-#
-- New in version 0.6.1
+ #: 0 = according to context; 1 = left-to-right; 2 = right-to-left
+ text_direction = 0
class XFProtection(BaseObject, EqNeAttrs):
+ """
+ A collection of the protection-related attributes of an ``XF`` record.
+ Items correspond to those in the Excel UI's Format -> Cells -> Protection tab.
+ Note the OOo docs include the "cell or style" bit in this bundle of
+ attributes. This is incorrect; the bit is used in determining which bundles
+ to use.
+
+ .. versionadded:: 0.6.1
+ """
- ##
- # 1 = Cell is prevented from being changed, moved, resized, or deleted
- # (only if the sheet is protected).
+ #: 1 = Cell is prevented from being changed, moved, resized, or deleted
+ #: (only if the sheet is protected).
cell_locked = 0
- ##
- # 1 = Hide formula so that it doesn't appear in the formula bar when
- # the cell is selected (only if the sheet is protected).
- formula_hidden = 0
-##
-# eXtended Formatting information for cells, rows, columns and styles.
-#
-- New in version 0.6.1
-#
-# Each of the 6 flags below describes the validity of
-# a specific group of attributes.
-#
-# In cell XFs, flag==0 means the attributes of the parent style XF are used,
-# (but only if the attributes are valid there); flag==1 means the attributes
-# of this XF are used.
-# In style XFs, flag==0 means the attribute setting is valid; flag==1 means
-# the attribute should be ignored.
-# Note that the API
-# provides both "raw" XFs and "computed" XFs -- in the latter case, cell XFs
-# have had the above inheritance mechanism applied.
-#
+ #: 1 = Hide formula so that it doesn't appear in the formula bar when
+ #: the cell is selected (only if the sheet is protected).
+ formula_hidden = 0
class XF(BaseObject):
+ """
+ eXtended Formatting information for cells, rows, columns and styles.
+
+ Each of the 6 flags below describes the validity of
+ a specific group of attributes.
+
+ In cell XFs:
+
+ - ``flag==0`` means the attributes of the parent style ``XF`` are
+ used, (but only if the attributes are valid there);
+
+ - ``flag==1`` means the attributes of this ``XF`` are used.
- ##
- # 0 = cell XF, 1 = style XF
+ In style XFs:
+
+ - ``flag==0`` means the attribute setting is valid;
+ - ``flag==1`` means the attribute should be ignored.
+
+ .. note::
+ the API provides both "raw" XFs and "computed" XFs. In the latter case,
+ cell XFs have had the above inheritance mechanism applied.
+
+ .. versionadded:: 0.6.1
+ """
+
+ #: 0 = cell XF, 1 = style XF
is_style = 0
- ##
- # cell XF: Index into Book.xf_list
- # of this XF's style XF
- # style XF: 0xFFF
+
+ #: cell XF: Index into Book.xf_list of this XF's style XF
+ #:
+ #: style XF: 0xFFF
parent_style_index = 0
- ##
+
#
_format_flag = 0
- ##
+
#
_font_flag = 0
- ##
+
#
_alignment_flag = 0
- ##
+
#
_border_flag = 0
- ##
+
#
_background_flag = 0
- ##
- #
+
_protection_flag = 0
- ##
- # Index into Book.xf_list
+
+ #: Index into :attr:`~xlrd.book.Book.xf_list`
xf_index = 0
- ##
- # Index into Book.font_list
+
+ #: Index into :attr:`~xlrd.book.Book.font_list`
font_index = 0
- ##
- # Key into Book.format_map
- #
- # Warning: OOo docs on the XF record call this "Index to FORMAT record".
- # It is not an index in the Python sense. It is a key to a map.
- # It is true only for Excel 4.0 and earlier files
- # that the key into format_map from an XF instance
- # is the same as the index into format_list, and only
- # if the index is less than 164.
- #
+
+ #: Key into :attr:`~xlrd.book.Book.format_map`
+ #:
+ #: .. warning::
+ #: OOo docs on the XF record call this "Index to FORMAT record".
+ #: It is not an index in the Python sense. It is a key to a map.
+ #: It is true *only* for Excel 4.0 and earlier files
+ #: that the key into format_map from an XF instance
+ #: is the same as the index into format_list, and *only*
+ #: if the index is less than 164.
format_key = 0
- ##
- # An instance of an XFProtection object.
+
+ #: An instance of an :class:`XFProtection` object.
protection = None
- ##
- # An instance of an XFBackground object.
+
+ #: An instance of an :class:`XFBackground` object.
background = None
- ##
- # An instance of an XFAlignment object.
+
+ #: An instance of an :class:`XFAlignment` object.
alignment = None
- ##
- # An instance of an XFBorder object.
+
+ #: An instance of an :class:`XFBorder` object.
border = None
diff --git a/SUEWSPrepare/Modules/xlrd/formula.py b/SUEWSPrepare/Modules/xlrd/formula.py
index 7c56aa4..e26639b 100644
--- a/SUEWSPrepare/Modules/xlrd/formula.py
+++ b/SUEWSPrepare/Modules/xlrd/formula.py
@@ -1,21 +1,24 @@
-# -*- coding: cp1252 -*-
+# -*- coding: utf-8 -*-
+# Copyright (c) 2005-2012 Stephen John Machin, Lingfo Pty Ltd
+# This module is part of the xlrd package, which is released under a
+# BSD-style licence.
+# No part of the content of this file was derived from the works of
+# David Giffin.
+"""
+Module for parsing/evaluating Microsoft Excel formulas.
+"""
+
+from __future__ import print_function
-##
-# Module for parsing/evaluating Microsoft Excel formulas.
-#
-# Copyright 2005-2012 Stephen John Machin, Lingfo Pty Ltd
-# This module is part of the xlrd package, which is released under
-# a BSD-style licence.
-##
-
-# No part of the content of this file was derived from the works of David Giffin.
-
-from __future__ import print_function
import copy
+import operator as opr
from struct import unpack
+
+from .biffh import (
+ BaseObject, XLRDError, error_text_from_code, hex_char_dump,
+ unpack_string_update_pos, unpack_unicode_update_pos,
+)
from .timemachine import *
-from .biffh import unpack_unicode_update_pos, unpack_string_update_pos, \
- XLRDError, hex_char_dump, error_text_from_code, BaseObject
__all__ = [
'oBOOL', 'oERR', 'oNUM', 'oREF', 'oREL', 'oSTRG', 'oUNK',
@@ -30,7 +33,8 @@
'FMLA_TYPE_COND_FMT',
'FMLA_TYPE_DATA_VAL',
'FMLA_TYPE_NAME',
- ]
+ 'Operand', 'Ref3D',
+]
FMLA_TYPE_CELL = 1
FMLA_TYPE_SHARED = 2
@@ -48,7 +52,7 @@
8 : 'COND-FMT',
16: 'DATA-VAL',
32: 'NAME',
- }
+}
_TOKEN_NOT_ALLOWED = {
0x01: ALL_FMLA_TYPES - FMLA_TYPE_CELL, # tExp
@@ -64,7 +68,7 @@
0x2C: FMLA_TYPE_CELL + FMLA_TYPE_ARRAY, # tRefN
0x2D: FMLA_TYPE_CELL + FMLA_TYPE_ARRAY, # tAreaN
# plus weird stuff like tMem*
- }.get
+}.get
oBOOL = 3
oERR = 4
@@ -84,7 +88,7 @@
3 : "oBOOL",
4 : "oERR",
5 : "oMSNG",
- }
+}
listsep = ',' #### probably should depend on locale
@@ -108,7 +112,7 @@
50 : sztab3,
70 : sztab3,
80 : sztab4,
- }
+}
# For debugging purposes ... the name for each opcode
# (without the prefix "t" used on OOo docs)
@@ -376,7 +380,7 @@
377: ('ROUNDBAHTUP', 1, 1, 0x02, 1, 'V', 'V'),
378: ('THAIYEAR', 1, 1, 0x02, 1, 'V', 'V'),
379: ('RTD', 2, 5, 0x04, 1, 'V', 'V'),
- }
+}
tAttrNames = {
0x00: "Skip??", # seen in SAMPLES.XLS which shipped with Excel 5.0
@@ -388,7 +392,7 @@
0x20: "Assign",
0x40: "Space",
0x41: "SpaceVolatile",
- }
+}
error_opcodes = set([0x07, 0x08, 0x0A, 0x0B, 0x1C, 0x1D, 0x2F])
@@ -396,10 +400,10 @@
tIsectFuncs = (max, min, max, min, max, min)
def do_box_funcs(box_funcs, boxa, boxb):
- return tuple([
+ return tuple(
func(numa, numb)
for func, numa, numb in zip(box_funcs, boxa.coords, boxb.coords)
- ])
+ )
def adjust_cell_addr_biff8(rowval, colval, reldelta, browx=None, bcolx=None):
row_rel = (colval >> 15) & 1
@@ -469,7 +473,7 @@ def get_externsheet_local_range(bk, refx, blah=0):
try:
info = bk._externsheet_info[refx]
except IndexError:
- print("!!! get_externsheet_local_range: refx=%d, not in range(%d)" \
+ print("!!! get_externsheet_local_range: refx=%d, not in range(%d)"
% (refx, len(bk._externsheet_info)), file=bk.logfile)
return (-101, -101)
ref_recordx, ref_first_sheetx, ref_last_sheetx = info
@@ -513,7 +517,7 @@ def get_externsheet_local_range_b57(
nsheets = len(bk._all_sheets_map)
if not(0 <= ref_first_sheetx <= ref_last_sheetx < nsheets):
if blah:
- print("/// get_externsheet_local_range_b57(%d, %d, %d) -> ???" \
+ print("/// get_externsheet_local_range_b57(%d, %d, %d) -> ???"
% (raw_extshtx, ref_first_sheetx, ref_last_sheetx), file=bk.logfile)
print("--- first/last sheet not in range(%d)" % nsheets, file=bk.logfile)
return (-103, -103) # stuffed up somewhere :-(
@@ -527,80 +531,80 @@ class FormulaError(Exception):
pass
-##
-# Used in evaluating formulas.
-# The following table describes the kinds and how their values
-# are represented.
-#
-#
-#
-# | Kind symbol |
-# Kind number |
-# Value representation |
-#
-#
-# | oBOOL |
-# 3 |
-# integer: 0 => False; 1 => True |
-#
-#
-# | oERR |
-# 4 |
-# None, or an int error code (same as XL_CELL_ERROR in the Cell class).
-# |
-#
-#
-# | oMSNG |
-# 5 |
-# Used by Excel as a placeholder for a missing (not supplied) function
-# argument. Should *not* appear as a final formula result. Value is None. |
-#
-#
-# | oNUM |
-# 2 |
-# A float. Note that there is no way of distinguishing dates. |
-#
-#
-# | oREF |
-# -1 |
-# The value is either None or a non-empty list of
-# absolute Ref3D instances.
-# |
-#
-#
-# | oREL |
-# -2 |
-# The value is None or a non-empty list of
-# fully or partially relative Ref3D instances.
-# |
-#
-#
-# | oSTRG |
-# 1 |
-# A Unicode string. |
-#
-#
-# | oUNK |
-# 0 |
-# The kind is unknown or ambiguous. The value is None |
-#
-#
-#
-
class Operand(object):
+ """
+ Used in evaluating formulas.
+ The following table describes the kinds and how their values
+ are represented.
+
+ .. raw:: html
+
+
+
+ | Kind symbol |
+ Kind number |
+ Value representation |
+
+
+ | oBOOL |
+ 3 |
+ integer: 0 => False; 1 => True |
+
+
+ | oERR |
+ 4 |
+ None, or an int error code (same as XL_CELL_ERROR in the Cell class).
+ |
+
+
+ | oMSNG |
+ 5 |
+ Used by Excel as a placeholder for a missing (not supplied) function
+ argument. Should *not* appear as a final formula result. Value is None. |
+
+
+ | oNUM |
+ 2 |
+ A float. Note that there is no way of distinguishing dates. |
+
+
+ | oREF |
+ -1 |
+ The value is either None or a non-empty list of
+ absolute Ref3D instances.
+ |
+
+
+ | oREL |
+ -2 |
+ The value is None or a non-empty list of
+ fully or partially relative Ref3D instances.
+ |
+
+
+ | oSTRG |
+ 1 |
+ A Unicode string. |
+
+
+ | oUNK |
+ 0 |
+ The kind is unknown or ambiguous. The value is None |
+
+
+ """
- ##
- # None means that the actual value of the operand is a variable
- # (depends on cell data), not a constant.
+ #: None means that the actual value of the operand is a variable
+ #: (depends on cell data), not a constant.
value = None
- ##
- # oUNK means that the kind of operand is not known unambiguously.
+
+ #: oUNK means that the kind of operand is not known unambiguously.
kind = oUNK
- ##
- # The reconstituted text of the original formula. Function names will be
- # in English irrespective of the original language, which doesn't seem
- # to be recorded anywhere. The separator is ",", not ";" or whatever else
- # might be more appropriate for the end-user's locale; patches welcome.
+
+ #: The reconstituted text of the original formula. Function names will be
+ #: in English irrespective of the original language, which doesn't seem
+ #: to be recorded anywhere. The separator is ",", not ";" or whatever else
+ #: might be more appropriate for the end-user's locale; patches welcome.
text = '?'
def __init__(self, akind=None, avalue=None, arank=0, atext='?'):
@@ -618,40 +622,55 @@ def __repr__(self):
return "Operand(kind=%s, value=%r, text=%r)" \
% (kind_text, self.value, self.text)
-##
-# Represents an absolute or relative 3-dimensional reference to a box
-# of one or more cells.
-# -- New in version 0.6.0
-#
-#
-# The coords attribute is a tuple of the form:
-# (shtxlo, shtxhi, rowxlo, rowxhi, colxlo, colxhi)
-# where 0 <= thingxlo <= thingx < thingxhi.
-# Note that it is quite possible to have thingx > nthings; for example
-# Print_Titles could have colxhi == 256 and/or rowxhi == 65536
-# irrespective of how many columns/rows are actually used in the worksheet.
-# The caller will need to decide how to handle this situation.
-# Keyword: IndexError :-)
-#
-#
-# The components of the coords attribute are also available as individual
-# attributes: shtxlo, shtxhi, rowxlo, rowxhi, colxlo, and colxhi.
-#
-# The relflags attribute is a 6-tuple of flags which indicate whether
-# the corresponding (sheet|row|col)(lo|hi) is relative (1) or absolute (0).
-# Note that there is necessarily no information available as to what cell(s)
-# the reference could possibly be relative to. The caller must decide what if
-# any use to make of oREL operands. Note also that a partially relative
-# reference may well be a typo.
-# For example, define name A1Z10 as $a$1:$z10 (missing $ after z)
-# while the cursor is on cell Sheet3!A27.
-# The resulting Ref3D instance will have coords = (2, 3, 0, -16, 0, 26)
-# and relflags = (0, 0, 0, 1, 0, 0).
-# So far, only one possibility of a sheet-relative component in
-# a reference has been noticed: a 2D reference located in the "current sheet".
-#
This will appear as coords = (0, 1, ...) and relflags = (1, 1, ...).
class Ref3D(tuple):
+ """
+ Represents an absolute or relative 3-dimensional reference to a box
+ of one or more cells.
+
+ The ``coords`` attribute is a tuple of the form::
+
+ (shtxlo, shtxhi, rowxlo, rowxhi, colxlo, colxhi)
+
+ where ``0 <= thingxlo <= thingx < thingxhi``.
+
+ .. note::
+ It is quite possible to have ``thingx > nthings``; for example
+ ``Print_Titles`` could have ``colxhi == 256`` and/or ``rowxhi == 65536``
+ irrespective of how many columns/rows are actually used in the worksheet.
+ The caller will need to decide how to handle this situation.
+ Keyword: :class:`IndexError` :-)
+
+ The components of the coords attribute are also available as individual
+ attributes: ``shtxlo``, ``shtxhi``, ``rowxlo``, ``rowxhi``, ``colxlo``, and
+ ``colxhi``.
+
+ The ``relflags`` attribute is a 6-tuple of flags which indicate whether
+ the corresponding (sheet|row|col)(lo|hi) is relative (1) or absolute (0).
+
+ .. note::
+ There is necessarily no information available as to what cell(s)
+ the reference could possibly be relative to. The caller must decide what
+ if any use to make of ``oREL`` operands.
+
+ .. note:
+ A partially relative reference may well be a typo.
+ For example, define name ``A1Z10`` as ``$a$1:$z10`` (missing ``$`` after
+ ``z``) while the cursor is on cell ``Sheet3!A27``.
+
+ The resulting :class:`Ref3D` instance will have
+ ``coords = (2, 3, 0, -16, 0, 26)``
+ and ``relflags = (0, 0, 0, 1, 0, 0).
+
+ So far, only one possibility of a sheet-relative component in
+ a reference has been noticed: a 2D reference located in the
+ "current sheet".
+
+ This will appear as ``coords = (0, 1, ...)`` and
+ ``relflags = (1, 1, ...)``.
+
+ .. versionadded:: 0.6.0
+ """
def __init__(self, atuple):
self.coords = atuple[0:6]
@@ -677,7 +696,6 @@ def __repr__(self):
tConcat = 0x08
tLT, tLE, tEQ, tGE, tGT, tNE = range(0x09, 0x0F)
-import operator as opr
def nop(x):
return x
@@ -692,8 +710,8 @@ def _opr_gt(x, y): return x > y
def _opr_ne(x, y): return x != y
def num2strg(num):
- """Attempt to emulate Excel's default conversion
- from number to string.
+ """
+ Attempt to emulate Excel's default conversion from number to string.
"""
s = str(num)
if s.endswith(".0"):
@@ -717,13 +735,13 @@ def num2strg(num):
tGE: (_cmp_argdict, oBOOL, _opr_ge, 10, '>='),
tGT: (_cmp_argdict, oBOOL, _opr_gt, 10, '>'),
tNE: (_cmp_argdict, oBOOL, _opr_ne, 10, '<>'),
- }
+}
unop_rules = {
0x13: (lambda x: -x, 70, '-', ''), # unary minus
0x12: (lambda x: x, 70, '+', ''), # unary plus
0x14: (lambda x: x / 100.0, 60, '', '%'),# percent
- }
+}
LEAF_RANK = 90
FUNC_RANK = 90
@@ -739,7 +757,7 @@ def evaluate_name_formula(bk, nobj, namex, blah=0, level=0):
bv = bk.biff_version
reldelta = 1 # All defined name formulas use "Method B" [OOo docs]
if blah:
- print("::: evaluate_name_formula %r %r %d %d %r level=%d" \
+ print("::: evaluate_name_formula %r %r %d %d %r level=%d"
% (namex, nobj.name, fmlalen, bv, data, level), file=bk.logfile)
hex_char_dump(data, 0, fmlalen, fout=bk.logfile)
if level > STACK_PANIC_LEVEL:
@@ -767,7 +785,7 @@ def do_binop(opcd, stk):
'('[:bop.rank < rank],
bop.text,
')'[:bop.rank < rank],
- ])
+ ])
resop = Operand(result_kind, None, rank, otext)
try:
bconv = argdict[bop.kind]
@@ -797,7 +815,7 @@ def do_unaryop(opcode, result_kind, stk):
aop.text,
')'[:aop.rank < rank],
sym2,
- ])
+ ])
if val is not None:
val = func(val)
stk.append(Operand(result_kind, val, rank, otext))
@@ -821,7 +839,7 @@ def not_in_name_formula(op_arg, oname_arg):
oname = onames[opx] # + [" RVA"][optype]
sz = sztab[opx]
if blah:
- print("Pos:%d Op:0x%02x Name:t%s Sz:%d opcode:%02xh optype:%02xh" \
+ print("Pos:%d Op:0x%02x Name:t%s Sz:%d opcode:%02xh optype:%02xh"
% (pos, op, oname, sz, opcode, optype), file=bk.logfile)
print("Stack =", stack, file=bk.logfile)
if sz == -2:
@@ -851,7 +869,7 @@ def not_in_name_formula(op_arg, oname_arg):
'('[:bop.rank < rank],
bop.text,
')'[:bop.rank < rank],
- ])
+ ])
res = Operand(oREF)
res.text = otext
if bop.kind == oERR or aop.kind == oERR:
@@ -901,7 +919,7 @@ def not_in_name_formula(op_arg, oname_arg):
'('[:bop.rank < rank],
bop.text,
')'[:bop.rank < rank],
- ])
+ ])
res = Operand(oREF, None, rank, otext)
if bop.kind == oERR or aop.kind == oERR:
res.kind = oERR
@@ -932,7 +950,7 @@ def not_in_name_formula(op_arg, oname_arg):
'('[:bop.rank < rank],
bop.text,
')'[:bop.rank < rank],
- ])
+ ])
res = Operand(oREF, None, rank, otext)
if bop.kind == oERR or aop.kind == oERR:
res = oERR
@@ -996,7 +1014,7 @@ def not_in_name_formula(op_arg, oname_arg):
else:
sz = 4
if blah:
- print(" subop=%02xh subname=t%s sz=%d nc=%02xh" \
+ print(" subop=%02xh subname=t%s sz=%d nc=%02xh"
% (subop, subname, sz, nc), file=bk.logfile)
elif 0x1A <= opcode <= 0x1B: # tSheet, tEndSheet
assert bv < 50
@@ -1029,17 +1047,17 @@ def not_in_name_formula(op_arg, oname_arg):
funcx = unpack("<" + " BH"[nb], data[pos+1:pos+1+nb])[0]
func_attrs = func_defs.get(funcx, None)
if not func_attrs:
- print("*** formula/tFunc unknown FuncID:%d" \
+ print("*** formula/tFunc unknown FuncID:%d"
% funcx, file=bk.logfile)
spush(unk_opnd)
else:
func_name, nargs = func_attrs[:2]
if blah:
- print(" FuncID=%d name=%s nargs=%d" \
+ print(" FuncID=%d name=%s nargs=%d"
% (funcx, func_name, nargs), file=bk.logfile)
assert len(stack) >= nargs
if nargs:
- argtext = listsep.join([arg.text for arg in stack[-nargs:]])
+ argtext = listsep.join(arg.text for arg in stack[-nargs:])
otext = "%s(%s)" % (func_name, argtext)
del stack[-nargs:]
else:
@@ -1052,22 +1070,22 @@ def not_in_name_formula(op_arg, oname_arg):
prompt, nargs = divmod(nargs, 128)
macro, funcx = divmod(funcx, 32768)
if blah:
- print(" FuncID=%d nargs=%d macro=%d prompt=%d" \
+ print(" FuncID=%d nargs=%d macro=%d prompt=%d"
% (funcx, nargs, macro, prompt), file=bk.logfile)
func_attrs = func_defs.get(funcx, None)
if not func_attrs:
- print("*** formula/tFuncVar unknown FuncID:%d" \
+ print("*** formula/tFuncVar unknown FuncID:%d"
% funcx, file=bk.logfile)
spush(unk_opnd)
else:
func_name, minargs, maxargs = func_attrs[:3]
if blah:
- print(" name: %r, min~max args: %d~%d" \
+ print(" name: %r, min~max args: %d~%d"
% (func_name, minargs, maxargs), file=bk.logfile)
assert minargs <= nargs <= maxargs
assert len(stack) >= nargs
assert len(stack) >= nargs
- argtext = listsep.join([arg.text for arg in stack[-nargs:]])
+ argtext = listsep.join(arg.text for arg in stack[-nargs:])
otext = "%s(%s)" % (func_name, argtext)
res = Operand(oUNK, None, FUNC_RANK, otext)
if funcx == 1: # IF
@@ -1110,14 +1128,13 @@ def not_in_name_formula(op_arg, oname_arg):
if not tgtobj.evaluated:
### recursive ###
evaluate_name_formula(bk, tgtobj, tgtnamex, blah, level+1)
- if tgtobj.macro or tgtobj.binary \
- or tgtobj.any_err:
+ if tgtobj.macro or tgtobj.binary or tgtobj.any_err:
if blah:
tgtobj.dump(
bk.logfile,
header="!!! tgtobj has problems!!!",
footer="----------- --------",
- )
+ )
res = Operand(oUNK, None)
any_err = any_err or tgtobj.macro or tgtobj.binary or tgtobj.any_err
any_rel = any_rel or tgtobj.any_rel
@@ -1188,8 +1205,7 @@ def not_in_name_formula(op_arg, oname_arg):
shx1, shx2 = get_externsheet_local_range(bk, refx, blah)
else:
res = get_cell_addr(data, pos+15, bv, reldelta)
- raw_extshtx, raw_shx1, raw_shx2 = \
- unpack(" STACK_ALARM_LEVEL:
blah = 1
reldelta = fmlatype in (FMLA_TYPE_SHARED, FMLA_TYPE_NAME, FMLA_TYPE_COND_FMT, FMLA_TYPE_DATA_VAL)
data = fmla
bv = bk.biff_version
if blah:
- print("::: decompile_formula len=%d fmlatype=%r browx=%r bcolx=%r reldelta=%d %r level=%d" \
+ print("::: decompile_formula len=%d fmlatype=%r browx=%r bcolx=%r reldelta=%d %r level=%d"
% (fmlalen, fmlatype, browx, bcolx, reldelta, data, level), file=bk.logfile)
hex_char_dump(data, 0, fmlalen, fout=bk.logfile)
if level > STACK_PANIC_LEVEL:
@@ -1362,7 +1376,6 @@ def decompile_formula(bk, fmla, fmlalen,
stack = []
any_rel = 0
any_err = 0
- any_external = 0
unk_opnd = Operand(oUNK, None)
error_opnd = Operand(oERR, None)
spush = stack.append
@@ -1380,7 +1393,7 @@ def do_binop(opcd, stk):
'('[:bop.rank < rank],
bop.text,
')'[:bop.rank < rank],
- ])
+ ])
resop = Operand(result_kind, None, rank, otext)
stk.append(resop)
@@ -1394,7 +1407,7 @@ def do_unaryop(opcode, result_kind, stk):
aop.text,
')'[:aop.rank < rank],
sym2,
- ])
+ ])
stk.append(Operand(result_kind, None, rank, otext))
def unexpected_opcode(op_arg, oname_arg):
@@ -1417,7 +1430,7 @@ def unexpected_opcode(op_arg, oname_arg):
oname = onames[opx] # + [" RVA"][optype]
sz = sztab[opx]
if blah:
- print("Pos:%d Op:0x%02x opname:t%s Sz:%d opcode:%02xh optype:%02xh" \
+ print("Pos:%d Op:0x%02x opname:t%s Sz:%d opcode:%02xh optype:%02xh"
% (pos, op, oname, sz, opcode, optype), file=bk.logfile)
print("Stack =", stack, file=bk.logfile)
if sz == -2:
@@ -1458,7 +1471,7 @@ def unexpected_opcode(op_arg, oname_arg):
'('[:bop.rank < rank],
bop.text,
')'[:bop.rank < rank],
- ])
+ ])
res = Operand(oREF)
res.text = otext
if bop.kind == oERR or aop.kind == oERR:
@@ -1494,7 +1507,7 @@ def unexpected_opcode(op_arg, oname_arg):
'('[:bop.rank < rank],
bop.text,
')'[:bop.rank < rank],
- ])
+ ])
res = Operand(oREF, None, rank, otext)
if bop.kind == oERR or aop.kind == oERR:
res.kind = oERR
@@ -1521,7 +1534,7 @@ def unexpected_opcode(op_arg, oname_arg):
'('[:bop.rank < rank],
bop.text,
')'[:bop.rank < rank],
- ])
+ ])
res = Operand(oREF, None, rank, otext)
if bop.kind == oERR or aop.kind == oERR:
res = oERR
@@ -1569,7 +1582,7 @@ def unexpected_opcode(op_arg, oname_arg):
else:
sz = 4
if blah:
- print(" subop=%02xh subname=t%s sz=%d nc=%02xh" \
+ print(" subop=%02xh subname=t%s sz=%d nc=%02xh"
% (subop, subname, sz, nc), file=bk.logfile)
elif 0x1A <= opcode <= 0x1B: # tSheet, tEndSheet
assert bv < 50
@@ -1607,11 +1620,11 @@ def unexpected_opcode(op_arg, oname_arg):
else:
func_name, nargs = func_attrs[:2]
if blah:
- print(" FuncID=%d name=%s nargs=%d" \
+ print(" FuncID=%d name=%s nargs=%d"
% (funcx, func_name, nargs), file=bk.logfile)
assert len(stack) >= nargs
if nargs:
- argtext = listsep.join([arg.text for arg in stack[-nargs:]])
+ argtext = listsep.join(arg.text for arg in stack[-nargs:])
otext = "%s(%s)" % (func_name, argtext)
del stack[-nargs:]
else:
@@ -1624,7 +1637,7 @@ def unexpected_opcode(op_arg, oname_arg):
prompt, nargs = divmod(nargs, 128)
macro, funcx = divmod(funcx, 32768)
if blah:
- print(" FuncID=%d nargs=%d macro=%d prompt=%d" \
+ print(" FuncID=%d nargs=%d macro=%d prompt=%d"
% (funcx, nargs, macro, prompt), file=bk.logfile)
#### TODO #### if funcx == 255: # call add-in function
if funcx == 255:
@@ -1632,18 +1645,18 @@ def unexpected_opcode(op_arg, oname_arg):
else:
func_attrs = func_defs.get(funcx, None)
if not func_attrs:
- print("*** formula/tFuncVar unknown FuncID:%d" \
+ print("*** formula/tFuncVar unknown FuncID:%d"
% funcx, file=bk.logfile)
spush(unk_opnd)
else:
func_name, minargs, maxargs = func_attrs[:3]
if blah:
- print(" name: %r, min~max args: %d~%d" \
+ print(" name: %r, min~max args: %d~%d"
% (func_name, minargs, maxargs), file=bk.logfile)
assert minargs <= nargs <= maxargs
assert len(stack) >= nargs
assert len(stack) >= nargs
- argtext = listsep.join([arg.text for arg in stack[-nargs:]])
+ argtext = listsep.join(arg.text for arg in stack[-nargs:])
otext = "%s(%s)" % (func_name, argtext)
res = Operand(oUNK, None, FUNC_RANK, otext)
del stack[-nargs:]
@@ -1736,8 +1749,7 @@ def unexpected_opcode(op_arg, oname_arg):
shx1, shx2 = get_externsheet_local_range(bk, refx, blah)
else:
res = get_cell_addr(data, pos+15, bv, reldelta, browx, bcolx)
- raw_extshtx, raw_shx1, raw_shx2 = \
- unpack("> bk.logfile, "!!!! Self-referential !!!!"
@@ -1859,7 +1870,7 @@ def unexpected_opcode(op_arg, oname_arg):
pos += sz
any_rel = not not any_rel
if blah:
- print("End of formula. level=%d any_rel=%d any_err=%d stack=%r" % \
+ print("End of formula. level=%d any_rel=%d any_err=%d stack=%r" %
(level, not not any_rel, any_err, stack), file=bk.logfile)
if len(stack) >= 2:
print("*** Stack has unprocessed args", file=bk.logfile)
@@ -1895,7 +1906,7 @@ def dump_formula(bk, data, fmlalen, bv, reldelta, blah=0, isname=0):
sz = sztab[opx]
if blah:
- print("Pos:%d Op:0x%02x Name:t%s Sz:%d opcode:%02xh optype:%02xh" \
+ print("Pos:%d Op:0x%02x Name:t%s Sz:%d opcode:%02xh optype:%02xh"
% (pos, op, oname, sz, opcode, optype), file=bk.logfile)
if not optype:
if 0x01 <= opcode <= 0x02: # tExp, tTbl
@@ -2023,7 +2034,7 @@ def dump_formula(bk, data, fmlalen, bv, reldelta, blah=0, isname=0):
return
pos += sz
if blah:
- print("End of formula. any_rel=%d any_err=%d stack=%r" % \
+ print("End of formula. any_rel=%d any_err=%d stack=%r" %
(not not any_rel, any_err, stack), file=bk.logfile)
if len(stack) >= 2:
print("*** Stack has unprocessed args", file=bk.logfile)
@@ -2064,16 +2075,12 @@ def colnamerel(colx, colxrel, bcolx=None, r1c1=0):
return "C"
return colname((bcolx + colx) % 256)
-##
-# Utility function: (5, 7) => 'H6'
def cellname(rowx, colx):
- """ (5, 7) => 'H6' """
+ """Utility function: ``(5, 7)`` => ``'H6'``"""
return "%s%d" % (colname(colx), rowx+1)
-##
-# Utility function: (5, 7) => '$H$6'
def cellnameabs(rowx, colx, r1c1=0):
- """ (5, 7) => '$H$6' or 'R8C6'"""
+ """Utility function: ``(5, 7)`` => ``'$H$6'``"""
if r1c1:
return "R%dC%d" % (rowx+1, colx+1)
return "$%s$%d" % (colname(colx), rowx+1)
@@ -2090,10 +2097,8 @@ def cellnamerel(rowx, colx, rowxrel, colxrel, browx=None, bcolx=None, r1c1=0):
return r + c
return c + r
-##
-# Utility function: 7 => 'H', 27 => 'AB'
def colname(colx):
- """ 7 => 'H', 27 => 'AB' """
+ """Utility function: ``7`` => ``'H'``, ``27`` => ``'AB'``"""
alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
if colx <= 25:
return alphabet[colx]
@@ -2102,7 +2107,7 @@ def colname(colx):
return alphabet[xdiv26 - 1] + alphabet[xmod26]
def rangename2d(rlo, rhi, clo, chi, r1c1=0):
- """ (5, 20, 7, 10) => '$H$6:$J$20' """
+ """ ``(5, 20, 7, 10)`` => ``'$H$6:$J$20'`` """
if r1c1:
return
if rhi == rlo+1 and chi == clo+1:
@@ -2118,25 +2123,31 @@ def rangename2drel(rlo_rhi_clo_chi, rlorel_rhirel_clorel_chirel, browx=None, bco
r1c1 = True
return "%s:%s" % (
cellnamerel(rlo, clo, rlorel, clorel, browx, bcolx, r1c1),
- cellnamerel(rhi-1, chi-1, rhirel, chirel, browx, bcolx, r1c1)
- )
-##
-# Utility function:
-#
Ref3D((1, 4, 5, 20, 7, 10)) => 'Sheet2:Sheet3!$H$6:$J$20'
+ cellnamerel(rhi-1, chi-1, rhirel, chirel, browx, bcolx, r1c1),
+ )
+
+
def rangename3d(book, ref3d):
- """ Ref3D(1, 4, 5, 20, 7, 10) => 'Sheet2:Sheet3!$H$6:$J$20'
- (assuming Excel's default sheetnames) """
+ """
+ Utility function:
+ ``Ref3D(1, 4, 5, 20, 7, 10)`` =>
+ ``'Sheet2:Sheet3!$H$6:$J$20'``
+ (assuming Excel's default sheetnames)
+ """
coords = ref3d.coords
return "%s!%s" % (
sheetrange(book, *coords[:2]),
rangename2d(*coords[2:6]))
-##
-# Utility function:
-#
Ref3D(coords=(0, 1, -32, -22, -13, 13), relflags=(0, 0, 1, 1, 1, 1))
-# R1C1 mode => 'Sheet1!R[-32]C[-13]:R[-23]C[12]'
-# A1 mode => depends on base cell (browx, bcolx)
def rangename3drel(book, ref3d, browx=None, bcolx=None, r1c1=0):
+ """
+ Utility function:
+ ``Ref3D(coords=(0, 1, -32, -22, -13, 13), relflags=(0, 0, 1, 1, 1, 1))``
+
+ In R1C1 mode => ``'Sheet1!R[-32]C[-13]:R[-23]C[12]'``
+
+ In A1 mode => depends on base cell ``(browx, bcolx)``
+ """
coords = ref3d.coords
relflags = ref3d.relflags
shdesc = sheetrangerel(book, coords[:2], relflags[:2])
@@ -2154,7 +2165,7 @@ def quotedsheetname(shnames, shx):
-2: "internal; deleted sheet",
-3: "internal; macro sheet",
-4: "<>",
- }.get(shx, "?error %d?" % shx)
+ }.get(shx, "?error %d?" % shx)
if "'" in shname:
return "'" + shname.replace("'", "''") + "'"
if " " in shname:
diff --git a/SUEWSPrepare/Modules/xlrd/info.py b/SUEWSPrepare/Modules/xlrd/info.py
index a57a784..73a1685 100644
--- a/SUEWSPrepare/Modules/xlrd/info.py
+++ b/SUEWSPrepare/Modules/xlrd/info.py
@@ -1 +1 @@
-__VERSION__ = "0.9.4"
+__version__ = __VERSION__ = "1.1.0"
diff --git a/SUEWSPrepare/Modules/xlrd/licences.py b/SUEWSPrepare/Modules/xlrd/licences.py
deleted file mode 100644
index 1e262a9..0000000
--- a/SUEWSPrepare/Modules/xlrd/licences.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# -*- coding: cp1252 -*-
-
-"""
-Portions copyright 2005-2009, Stephen John Machin, Lingfo Pty Ltd
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-3. None of the names of Stephen John Machin, Lingfo Pty Ltd and any
-contributors may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-"""
-
-"""
-/*-
- * Copyright (c) 2001 David Giffin.
- * All rights reserved.
- *
- * Based on the the Java version: Andrew Khan Copyright (c) 2000.
- *
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by
- * David Giffin ."
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by
- * David Giffin ."
- *
- * THIS SOFTWARE IS PROVIDED BY DAVID GIFFIN ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID GIFFIN OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-"""
diff --git a/SUEWSPrepare/Modules/xlrd/sheet.py b/SUEWSPrepare/Modules/xlrd/sheet.py
index 721d17c..79c200d 100644
--- a/SUEWSPrepare/Modules/xlrd/sheet.py
+++ b/SUEWSPrepare/Modules/xlrd/sheet.py
@@ -1,40 +1,20 @@
-# -*- coding: cp1252 -*-
-
-##
-# Portions copyright 2005-2013 Stephen John Machin, Lingfo Pty Ltd
-# This module is part of the xlrd package, which is released under a BSD-style licence.
-##
-
-# 2010-04-25 SJM fix zoom factors cooking logic
-# 2010-04-15 CW r4253 fix zoom factors cooking logic
-# 2010-04-09 CW r4248 add a flag so xlutils knows whether or not to write a PANE record
-# 2010-03-29 SJM Fixed bug in adding new empty rows in put_cell_ragged
-# 2010-03-28 SJM Tailored put_cell method for each of ragged_rows=False (fixed speed regression) and =True (faster)
-# 2010-03-25 CW r4236 Slight refactoring to remove method calls
-# 2010-03-25 CW r4235 Collapse expand_cells into put_cell and enhance the raggedness. This should save even more memory!
-# 2010-03-25 CW r4234 remove duplicate chunks for extend_cells; refactor to remove put_number_cell and put_blank_cell which essentially duplicated the code of put_cell
-# 2010-03-10 SJM r4222 Added reading of the PANE record.
-# 2010-03-10 SJM r4221 Preliminary work on "cooked" mag factors; use at own peril
-# 2010-03-01 SJM Reading SCL record
-# 2010-03-01 SJM Added ragged_rows functionality
-# 2009-08-23 SJM Reduced CPU time taken by parsing MULBLANK records.
-# 2009-08-18 SJM Used __slots__ and sharing to reduce memory consumed by Rowinfo instances
-# 2009-05-31 SJM Fixed problem with no CODEPAGE record on extremely minimal BIFF2.x 3rd-party file
-# 2009-04-27 SJM Integrated on_demand patch by Armando Serrano Lombillo
-# 2008-02-09 SJM Excel 2.0: build XFs on the fly from cell attributes
-# 2007-12-04 SJM Added support for Excel 2.x (BIFF2) files.
-# 2007-10-11 SJM Added missing entry for blank cell type to ctype_text
-# 2007-07-11 SJM Allow for BIFF2/3-style FORMAT record in BIFF4/8 file
-# 2007-04-22 SJM Remove experimental "trimming" facility.
+# -*- coding: utf-8 -*-
+# Copyright (c) 2005-2013 Stephen John Machin, Lingfo Pty Ltd
+# This module is part of the xlrd package, which is released under a
+# BSD-style licence.
from __future__ import print_function
from array import array
-from struct import unpack, calcsize
+from struct import calcsize, unpack
+
from .biffh import *
+from .formatting import Format, nearest_colour_index
+from .formula import (
+ FMLA_TYPE_CELL, FMLA_TYPE_SHARED, decompile_formula, dump_formula,
+ rangename2d,
+)
from .timemachine import *
-from .formula import dump_formula, decompile_formula, rangename2d, FMLA_TYPE_CELL, FMLA_TYPE_SHARED
-from .formatting import nearest_colour_index, Format
DEBUG = 0
OBJ_MSO_DEBUG = 0
@@ -63,243 +43,279 @@
# The real thing is the visibility attribute from the BOUNDSHEET record.
("sheet_visible", 0),
("show_in_page_break_preview", 0),
- )
+)
-##
-# Contains the data for one worksheet.
-#
-# In the cell access functions, "rowx" is a row index, counting from zero, and "colx" is a
-# column index, counting from zero.
-# Negative values for row/column indexes and slice positions are supported in the expected fashion.
-#
-# For information about cell types and cell values, refer to the documentation of the {@link #Cell} class.
-#
-# WARNING: You don't call this class yourself. You access Sheet objects via the Book object that
-# was returned when you called xlrd.open_workbook("myfile.xls").
class Sheet(BaseObject):
- ##
- # Name of sheet.
+ """
+ Contains the data for one worksheet.
+
+ In the cell access functions, ``rowx`` is a row index, counting from
+ zero, and ``colx`` is a column index, counting from zero.
+ Negative values for row/column indexes and slice positions are supported in
+ the expected fashion.
+
+ For information about cell types and cell values, refer to the documentation
+ of the :class:`Cell` class.
+
+ .. warning::
+
+ You don't instantiate this class yourself. You access :class:`Sheet`
+ objects via the :class:`~xlrd.book.Book` object that
+ was returned when you called :func:`xlrd.open_workbook`.
+ """
+
+ #: Name of sheet.
name = ''
- ##
- # A reference to the Book object to which this sheet belongs.
- # Example usage: some_sheet.book.datemode
+ #: A reference to the :class:`~xlrd.book.Book` object to which this sheet
+ #: belongs.
+ #:
+ #: Example usage: ``some_sheet.book.datemode``
book = None
-
- ##
- # Number of rows in sheet. A row index is in range(thesheet.nrows).
+
+ #: Number of rows in sheet. A row index is in ``range(thesheet.nrows)``.
nrows = 0
- ##
- # Nominal number of columns in sheet. It is 1 + the maximum column index
- # found, ignoring trailing empty cells. See also open_workbook(ragged_rows=?)
- # and Sheet.{@link #Sheet.row_len}(row_index).
+ #: Nominal number of columns in sheet. It is one more than the maximum
+ #: column index found, ignoring trailing empty cells.
+ #: See also the ``ragged_rows`` parameter to :func:`~xlrd.open_workbook`
+ #: and :meth:`~xlrd.sheet.Sheet.row_len`.
ncols = 0
- ##
- # The map from a column index to a {@link #Colinfo} object. Often there is an entry
- # in COLINFO records for all column indexes in range(257).
- # Note that xlrd ignores the entry for the non-existent
- # 257th column. On the other hand, there may be no entry for unused columns.
- #
-- New in version 0.6.1. Populated only if open_workbook(formatting_info=True).
+
+ #: The map from a column index to a :class:`Colinfo` object. Often there is
+ #: an entry in ``COLINFO`` records for all column indexes in ``range(257)``.
+ #:
+ #: .. note::
+ #: xlrd ignores the entry for the non-existent
+ #: 257th column.
+ #:
+ #: On the other hand, there may be no entry for unused columns.
+ #:
+ #: .. versionadded:: 0.6.1
+ #:
+ #: Populated only if ``open_workbook(..., formatting_info=True)``
colinfo_map = {}
- ##
- # The map from a row index to a {@link #Rowinfo} object. Note that it is possible
- # to have missing entries -- at least one source of XLS files doesn't
- # bother writing ROW records.
- #
-- New in version 0.6.1. Populated only if open_workbook(formatting_info=True).
+ #: The map from a row index to a :class:`Rowinfo` object.
+ #:
+ #: ..note::
+ #: It is possible to have missing entries -- at least one source of
+ #: XLS files doesn't bother writing ``ROW`` records.
+ #:
+ #: .. versionadded:: 0.6.1
+ #:
+ #: Populated only if ``open_workbook(..., formatting_info=True)``
rowinfo_map = {}
- ##
- # List of address ranges of cells containing column labels.
- # These are set up in Excel by Insert > Name > Labels > Columns.
- #
-- New in version 0.6.0
- #
How to deconstruct the list:
- #
- # for crange in thesheet.col_label_ranges:
- # rlo, rhi, clo, chi = crange
- # for rx in xrange(rlo, rhi):
- # for cx in xrange(clo, chi):
- # print "Column label at (rowx=%d, colx=%d) is %r" \
- # (rx, cx, thesheet.cell_value(rx, cx))
- #
+ #: List of address ranges of cells containing column labels.
+ #: These are set up in Excel by Insert > Name > Labels > Columns.
+ #:
+ #: .. versionadded:: 0.6.0
+ #:
+ #: How to deconstruct the list:
+ #:
+ #: .. code-block:: python
+ #:
+ #: for crange in thesheet.col_label_ranges:
+ #: rlo, rhi, clo, chi = crange
+ #: for rx in xrange(rlo, rhi):
+ #: for cx in xrange(clo, chi):
+ #: print "Column label at (rowx=%d, colx=%d) is %r" \
+ #: (rx, cx, thesheet.cell_value(rx, cx))
col_label_ranges = []
- ##
- # List of address ranges of cells containing row labels.
- # For more details, see col_label_ranges above.
- #
-- New in version 0.6.0
+ #: List of address ranges of cells containing row labels.
+ #: For more details, see :attr:`col_label_ranges`.
+ #:
+ #: .. versionadded:: 0.6.0
row_label_ranges = []
- ##
- # List of address ranges of cells which have been merged.
- # These are set up in Excel by Format > Cells > Alignment, then ticking
- # the "Merge cells" box.
- #
-- New in version 0.6.1. Extracted only if open_workbook(formatting_info=True).
- #
How to deconstruct the list:
- #
- # for crange in thesheet.merged_cells:
- # rlo, rhi, clo, chi = crange
- # for rowx in xrange(rlo, rhi):
- # for colx in xrange(clo, chi):
- # # cell (rlo, clo) (the top left one) will carry the data
- # # and formatting info; the remainder will be recorded as
- # # blank cells, but a renderer will apply the formatting info
- # # for the top left cell (e.g. border, pattern) to all cells in
- # # the range.
- #
+ #: List of address ranges of cells which have been merged.
+ #: These are set up in Excel by Format > Cells > Alignment, then ticking
+ #: the "Merge cells" box.
+ #:
+ #: .. note::
+ #: The upper limits are exclusive: i.e. ``[2, 3, 7, 9]`` only
+ #: spans two cells.
+ #:
+ #: .. note:: Extracted only if ``open_workbook(..., formatting_info=True)``
+ #:
+ #: .. versionadded:: 0.6.1
+ #:
+ #: How to deconstruct the list:
+ #:
+ #: .. code-block:: python
+ #:
+ #: for crange in thesheet.merged_cells:
+ #: rlo, rhi, clo, chi = crange
+ #: for rowx in xrange(rlo, rhi):
+ #: for colx in xrange(clo, chi):
+ #: # cell (rlo, clo) (the top left one) will carry the data
+ #: # and formatting info; the remainder will be recorded as
+ #: # blank cells, but a renderer will apply the formatting info
+ #: # for the top left cell (e.g. border, pattern) to all cells in
+ #: # the range.
merged_cells = []
-
- ##
- # Mapping of (rowx, colx) to list of (offset, font_index) tuples. The offset
- # defines where in the string the font begins to be used.
- # Offsets are expected to be in ascending order.
- # If the first offset is not zero, the meaning is that the cell's XF's font should
- # be used from offset 0.
- #
This is a sparse mapping. There is no entry for cells that are not formatted with
- # rich text.
- #
How to use:
- #
- # runlist = thesheet.rich_text_runlist_map.get((rowx, colx))
- # if runlist:
- # for offset, font_index in runlist:
- # # do work here.
- # pass
- #
- # Populated only if open_workbook(formatting_info=True).
- #
-- New in version 0.7.2.
- #
- rich_text_runlist_map = {}
-
- ##
- # Default column width from DEFCOLWIDTH record, else None.
- # From the OOo docs:
- # """Column width in characters, using the width of the zero character
- # from default font (first FONT record in the file). Excel adds some
- # extra space to the default width, depending on the default font and
- # default font size. The algorithm how to exactly calculate the resulting
- # column width is not known.
- # Example: The default width of 8 set in this record results in a column
- # width of 8.43 using Arial font with a size of 10 points."""
- # For the default hierarchy, refer to the {@link #Colinfo} class.
- #
-- New in version 0.6.1
+
+ #: Mapping of ``(rowx, colx)`` to list of ``(offset, font_index)`` tuples.
+ #: The offset defines where in the string the font begins to be used.
+ #: Offsets are expected to be in ascending order.
+ #: If the first offset is not zero, the meaning is that the cell's ``XF``'s
+ #: font should be used from offset 0.
+ #:
+ #: This is a sparse mapping. There is no entry for cells that are not
+ #: formatted with rich text.
+ #:
+ #: How to use:
+ #:
+ #: .. code-block:: python
+ #:
+ #: runlist = thesheet.rich_text_runlist_map.get((rowx, colx))
+ #: if runlist:
+ #: for offset, font_index in runlist:
+ #: # do work here.
+ #: pass
+ #:
+ #: .. versionadded:: 0.7.2
+ #:
+ #: Populated only if ``open_workbook(..., formatting_info=True)``
+ rich_text_runlist_map = {}
+
+ #: Default column width from ``DEFCOLWIDTH`` record, else ``None``.
+ #: From the OOo docs:
+ #:
+ #: Column width in characters, using the width of the zero character
+ #: from default font (first FONT record in the file). Excel adds some
+ #: extra space to the default width, depending on the default font and
+ #: default font size. The algorithm how to exactly calculate the resulting
+ #: column width is not known.
+ #: Example: The default width of 8 set in this record results in a column
+ #: width of 8.43 using Arial font with a size of 10 points.
+ #:
+ #: For the default hierarchy, refer to the :class:`Colinfo` class.
+ #:
+ #: .. versionadded:: 0.6.1
defcolwidth = None
- ##
- # Default column width from STANDARDWIDTH record, else None.
- # From the OOo docs:
- # """Default width of the columns in 1/256 of the width of the zero
- # character, using default font (first FONT record in the file)."""
- # For the default hierarchy, refer to the {@link #Colinfo} class.
- #
-- New in version 0.6.1
+ #: Default column width from ``STANDARDWIDTH`` record, else ``None``.
+ #:
+ #: From the OOo docs:
+ #:
+ #: Default width of the columns in 1/256 of the width of the zero
+ #: character, using default font (first FONT record in the file).
+ #:
+ #: For the default hierarchy, refer to the :class:`Colinfo` class.
+ #:
+ #: .. versionadded:: 0.6.1
standardwidth = None
- ##
- # Default value to be used for a row if there is
- # no ROW record for that row.
- # From the optional DEFAULTROWHEIGHT record.
+ #: Default value to be used for a row if there is
+ #: no ``ROW`` record for that row.
+ #: From the *optional* ``DEFAULTROWHEIGHT`` record.
default_row_height = None
- ##
- # Default value to be used for a row if there is
- # no ROW record for that row.
- # From the optional DEFAULTROWHEIGHT record.
+ #: Default value to be used for a row if there is
+ #: no ``ROW`` record for that row.
+ #: From the *optional* ``DEFAULTROWHEIGHT`` record.
default_row_height_mismatch = None
- ##
- # Default value to be used for a row if there is
- # no ROW record for that row.
- # From the optional DEFAULTROWHEIGHT record.
+ #: Default value to be used for a row if there is
+ #: no ``ROW`` record for that row.
+ #: From the *optional* ``DEFAULTROWHEIGHT`` record.
default_row_hidden = None
- ##
- # Default value to be used for a row if there is
- # no ROW record for that row.
- # From the optional DEFAULTROWHEIGHT record.
+ #: Default value to be used for a row if there is
+ #: no ``ROW`` record for that row.
+ #: From the *optional* ``DEFAULTROWHEIGHT`` record.
default_additional_space_above = None
- ##
- # Default value to be used for a row if there is
- # no ROW record for that row.
- # From the optional DEFAULTROWHEIGHT record.
+ #: Default value to be used for a row if there is
+ #: no ``ROW`` record for that row.
+ #: From the *optional* ``DEFAULTROWHEIGHT`` record.
default_additional_space_below = None
- ##
- # Visibility of the sheet. 0 = visible, 1 = hidden (can be unhidden
- # by user -- Format/Sheet/Unhide), 2 = "very hidden" (can be unhidden
- # only by VBA macro).
+ #: Visibility of the sheet::
+ #:
+ #: 0 = visible
+ #: 1 = hidden (can be unhidden by user -- Format -> Sheet -> Unhide)
+ #: 2 = "very hidden" (can be unhidden only by VBA macro).
visibility = 0
- ##
- # A 256-element tuple corresponding to the contents of the GCW record for this sheet.
- # If no such record, treat as all bits zero.
- # Applies to BIFF4-7 only. See docs of the {@link #Colinfo} class for discussion.
+ #: A 256-element tuple corresponding to the contents of the GCW record for
+ #: this sheet. If no such record, treat as all bits zero.
+ #: Applies to BIFF4-7 only. See docs of the :class:`Colinfo` class for
+ #: discussion.
gcw = (0, ) * 256
- ##
- # A list of {@link #Hyperlink} objects corresponding to HLINK records found
- # in the worksheet.
-- New in version 0.7.2
+ #: A list of :class:`Hyperlink` objects corresponding to ``HLINK`` records
+ #: found in the worksheet.
+ #:
+ #: .. versionadded:: 0.7.2
hyperlink_list = []
- ##
- # A sparse mapping from (rowx, colx) to an item in {@link #Sheet.hyperlink_list}.
- # Cells not covered by a hyperlink are not mapped.
- # It is possible using the Excel UI to set up a hyperlink that
- # covers a larger-than-1x1 rectangle of cells.
- # Hyperlink rectangles may overlap (Excel doesn't check).
- # When a multiply-covered cell is clicked on, the hyperlink that is activated
- # (and the one that is mapped here) is the last in hyperlink_list.
- #
-- New in version 0.7.2
+ #: A sparse mapping from ``(rowx, colx)`` to an item in
+ #: :attr:`~xlrd.sheet.Sheet.hyperlink_list`.
+ #: Cells not covered by a hyperlink are not mapped.
+ #: It is possible using the Excel UI to set up a hyperlink that
+ #: covers a larger-than-1x1 rectangle of cells.
+ #: Hyperlink rectangles may overlap (Excel doesn't check).
+ #: When a multiply-covered cell is clicked on, the hyperlink that is
+ #: activated
+ #: (and the one that is mapped here) is the last in
+ #: :attr:`~xlrd.sheet.Sheet.hyperlink_list`.
+ #:
+ #: .. versionadded:: 0.7.2
hyperlink_map = {}
- ##
- # A sparse mapping from (rowx, colx) to a {@link #Note} object.
- # Cells not containing a note ("comment") are not mapped.
- #
-- New in version 0.7.2
- cell_note_map = {}
-
- ##
- # Number of columns in left pane (frozen panes; for split panes, see comments below in code)
+ #: A sparse mapping from ``(rowx, colx)`` to a :class:`Note` object.
+ #: Cells not containing a note ("comment") are not mapped.
+ #:
+ #: .. versionadded:: 0.7.2
+ cell_note_map = {}
+
+ #: Number of columns in left pane (frozen panes; for split panes, see
+ #: comments in code)
vert_split_pos = 0
- ##
- # Number of rows in top pane (frozen panes; for split panes, see comments below in code)
+ #: Number of rows in top pane (frozen panes; for split panes, see comments
+ #: in code)
horz_split_pos = 0
- ##
- # Index of first visible row in bottom frozen/split pane
+ #: Index of first visible row in bottom frozen/split pane
horz_split_first_visible = 0
- ##
- # Index of first visible column in right frozen/split pane
+ #: Index of first visible column in right frozen/split pane
vert_split_first_visible = 0
- ##
- # Frozen panes: ignore it. Split panes: explanation and diagrams in OOo docs.
+ #: Frozen panes: ignore it. Split panes: explanation and diagrams in
+ #: OOo docs.
split_active_pane = 0
- ##
- # Boolean specifying if a PANE record was present, ignore unless you're xlutils.copy
+ #: Boolean specifying if a ``PANE`` record was present, ignore unless you're
+ #: ``xlutils.copy``
has_pane_record = 0
- ##
- # A list of the horizontal page breaks in this sheet.
- # Breaks are tuples in the form (index of row after break, start col index, end col index).
- # Populated only if open_workbook(formatting_info=True).
- #
-- New in version 0.7.2
+ #: A list of the horizontal page breaks in this sheet.
+ #: Breaks are tuples in the form
+ #: ``(index of row after break, start col index, end col index)``.
+ #:
+ #: Populated only if ``open_workbook(..., formatting_info=True)``
+ #:
+ #: .. versionadded:: 0.7.2
horizontal_page_breaks = []
- ##
- # A list of the vertical page breaks in this sheet.
- # Breaks are tuples in the form (index of col after break, start row index, end row index).
- # Populated only if open_workbook(formatting_info=True).
- #
-- New in version 0.7.2
+ #: A list of the vertical page breaks in this sheet.
+ #: Breaks are tuples in the form
+ #: ``(index of col after break, start row index, end row index)``.
+ #:
+ #: Populated only if ``open_workbook(..., formatting_info=True)``
+ #:
+ #: .. versionadded:: 0.7.2
vertical_page_breaks = []
-
def __init__(self, book, position, name, number):
self.book = book
self.biff_version = book.biff_version
@@ -364,16 +380,13 @@ def __init__(self, book, position, name, number):
self.cooked_normal_view_mag_factor = 100
# Values (if any) actually stored on the XLS file
- self.cached_page_break_preview_mag_factor = None # from WINDOW2 record
- self.cached_normal_view_mag_factor = None # from WINDOW2 record
+ self.cached_page_break_preview_mag_factor = 0 # default (60%), from WINDOW2 record
+ self.cached_normal_view_mag_factor = 0 # default (100%), from WINDOW2 record
self.scl_mag_factor = None # from SCL record
self._ixfe = None # BIFF2 only
self._cell_attr_to_xfx = {} # BIFF2.0 only
- #### Don't initialise this here, use class attribute initialisation.
- #### self.gcw = (0, ) * 256 ####
-
if self.biff_version >= 80:
self.utter_max_rows = 65536
else:
@@ -387,10 +400,10 @@ def __init__(self, book, position, name, number):
# self._put_cell_rows_appended = 0
# self._put_cell_cells_appended = 0
-
- ##
- # {@link #Cell} object in the given row and column.
def cell(self, rowx, colx):
+ """
+ :class:`Cell` object in the given row and column.
+ """
if self.formatting_info:
xfx = self.cell_xf_index(rowx, colx)
else:
@@ -399,24 +412,27 @@ def cell(self, rowx, colx):
self._cell_types[rowx][colx],
self._cell_values[rowx][colx],
xfx,
- )
+ )
- ##
- # Value of the cell in the given row and column.
def cell_value(self, rowx, colx):
+ "Value of the cell in the given row and column."
return self._cell_values[rowx][colx]
- ##
- # Type of the cell in the given row and column.
- # Refer to the documentation of the {@link #Cell} class.
def cell_type(self, rowx, colx):
+ """
+ Type of the cell in the given row and column.
+
+ Refer to the documentation of the :class:`Cell` class.
+ """
return self._cell_types[rowx][colx]
- ##
- # XF index of the cell in the given row and column.
- # This is an index into Book.{@link #Book.xf_list}.
- #
-- New in version 0.6.1
def cell_xf_index(self, rowx, colx):
+ """
+ XF index of the cell in the given row and column.
+ This is an index into :attr:`~xlrd.book.Book.xf_list`.
+
+ .. versionadded:: 0.6.1
+ """
self.req_fmt_info()
xfx = self._cell_xf_indexes[rowx][colx]
if xfx > -1:
@@ -441,46 +457,49 @@ def cell_xf_index(self, rowx, colx):
self._xf_index_stats[3] += 1
return 15
- ##
- # Returns the effective number of cells in the given row. For use with
- # open_workbook(ragged_rows=True) which is likely to produce rows
- # with fewer than {@link #Sheet.ncols} cells.
- #
-- New in version 0.7.2
def row_len(self, rowx):
+ """
+ Returns the effective number of cells in the given row. For use with
+ ``open_workbook(ragged_rows=True)`` which is likely to produce rows
+ with fewer than :attr:`~Sheet.ncols` cells.
+
+ .. versionadded:: 0.7.2
+ """
return len(self._cell_values[rowx])
- ##
- # Returns a sequence of the {@link #Cell} objects in the given row.
def row(self, rowx):
+ """
+ Returns a sequence of the :class:`Cell` objects in the given row.
+ """
return [
self.cell(rowx, colx)
for colx in xrange(len(self._cell_values[rowx]))
- ]
+ ]
- ##
- # Returns a generator for iterating through each row.
def get_rows(self):
+ "Returns a generator for iterating through each row."
return (self.row(index) for index in range(self.nrows))
- ##
- # Returns a slice of the types
- # of the cells in the given row.
def row_types(self, rowx, start_colx=0, end_colx=None):
+ """
+ Returns a slice of the types of the cells in the given row.
+ """
if end_colx is None:
return self._cell_types[rowx][start_colx:]
return self._cell_types[rowx][start_colx:end_colx]
- ##
- # Returns a slice of the values
- # of the cells in the given row.
def row_values(self, rowx, start_colx=0, end_colx=None):
+ """
+ Returns a slice of the values of the cells in the given row.
+ """
if end_colx is None:
return self._cell_values[rowx][start_colx:]
return self._cell_values[rowx][start_colx:end_colx]
- ##
- # Returns a slice of the {@link #Cell} objects in the given row.
def row_slice(self, rowx, start_colx=0, end_colx=None):
+ """
+ Returns a slice of the :class:`Cell` objects in the given row.
+ """
nc = len(self._cell_values[rowx])
if start_colx < 0:
start_colx += nc
@@ -493,11 +512,12 @@ def row_slice(self, rowx, start_colx=0, end_colx=None):
return [
self.cell(rowx, colx)
for colx in xrange(start_colx, end_colx)
- ]
+ ]
- ##
- # Returns a slice of the {@link #Cell} objects in the given column.
def col_slice(self, colx, start_rowx=0, end_rowx=None):
+ """
+ Returns a slice of the :class:`Cell` objects in the given column.
+ """
nr = self.nrows
if start_rowx < 0:
start_rowx += nr
@@ -510,11 +530,12 @@ def col_slice(self, colx, start_rowx=0, end_rowx=None):
return [
self.cell(rowx, colx)
for rowx in xrange(start_rowx, end_rowx)
- ]
+ ]
- ##
- # Returns a slice of the values of the cells in the given column.
def col_values(self, colx, start_rowx=0, end_rowx=None):
+ """
+ Returns a slice of the values of the cells in the given column.
+ """
nr = self.nrows
if start_rowx < 0:
start_rowx += nr
@@ -527,11 +548,12 @@ def col_values(self, colx, start_rowx=0, end_rowx=None):
return [
self._cell_values[rowx][colx]
for rowx in xrange(start_rowx, end_rowx)
- ]
+ ]
- ##
- # Returns a slice of the types of the cells in the given column.
def col_types(self, colx, start_rowx=0, end_rowx=None):
+ """
+ Returns a slice of the types of the cells in the given column.
+ """
nr = self.nrows
if start_rowx < 0:
start_rowx += nr
@@ -544,13 +566,8 @@ def col_types(self, colx, start_rowx=0, end_rowx=None):
return [
self._cell_types[rowx][colx]
for rowx in xrange(start_rowx, end_rowx)
- ]
+ ]
- ##
- # Returns a sequence of the {@link #Cell} objects in the given column.
- def col(self, colx):
- return self.col_slice(colx)
- # Above two lines just for the docs. Here's the real McCoy:
col = col_slice
# === Following methods are used in building the worksheet.
@@ -558,18 +575,18 @@ def col(self, colx):
def tidy_dimensions(self):
if self.verbosity >= 3:
- fprintf(self.logfile,
+ fprintf(
+ self.logfile,
"tidy_dimensions: nrows=%d ncols=%d \n",
self.nrows, self.ncols,
- )
+ )
if 1 and self.merged_cells:
nr = nc = 0
umaxrows = self.utter_max_rows
umaxcols = self.utter_max_cols
for crange in self.merged_cells:
rlo, rhi, clo, chi = crange
- if not (0 <= rlo < rhi <= umaxrows) \
- or not (0 <= clo < chi <= umaxcols):
+ if not (0 <= rlo < rhi <= umaxrows) or not (0 <= clo < chi <= umaxcols):
fprintf(self.logfile,
"*** WARNING: sheet #%d (%r), MERGEDCELLS bad range %r\n",
self.number, self.name, crange)
@@ -577,14 +594,16 @@ def tidy_dimensions(self):
if chi > nc: nc = chi
if nc > self.ncols:
self.ncols = nc
+ self._first_full_rowx = -2
if nr > self.nrows:
# we put one empty cell at (nr-1,0) to make sure
# we have the right number of rows. The ragged rows
# will sort out the rest if needed.
- self.put_cell(nr-1, 0, XL_CELL_EMPTY, '', -1)
- if self.verbosity >= 1 \
- and (self.nrows != self._dimnrows or self.ncols != self._dimncols):
- fprintf(self.logfile,
+ self.put_cell(nr-1, 0, XL_CELL_EMPTY, UNICODE_LITERAL(''), -1)
+ if (self.verbosity >= 1 and
+ (self.nrows != self._dimnrows or self.ncols != self._dimncols)):
+ fprintf(
+ self.logfile,
"NOTE *** sheet %d (%r): DIMENSIONS R,C = %d,%d should be %d,%d\n",
self.number,
self.name,
@@ -592,7 +611,7 @@ def tidy_dimensions(self):
self._dimncols,
self.nrows,
self.ncols,
- )
+ )
if not self.ragged_rows:
# fix ragged rows
ncols = self.ncols
@@ -610,7 +629,7 @@ def tidy_dimensions(self):
rlen = len(trow)
nextra = ncols - rlen
if nextra > 0:
- s_cell_values[rowx][rlen:] = [''] * nextra
+ s_cell_values[rowx][rlen:] = [UNICODE_LITERAL('')] * nextra
trow[rlen:] = self.bt * nextra
if s_fmt_info:
s_cell_xf_indexes[rowx][rlen:] = self.bf * nextra
@@ -659,11 +678,11 @@ def put_cell_ragged(self, rowx, colx, ctype, value, xf_index):
num_empty += 1
# self._put_cell_row_widenings += 1
# types_row.extend(self.bt * num_empty)
- # values_row.extend([''] * num_empty)
+ # values_row.extend([UNICODE_LITERAL('')] * num_empty)
# if fmt_info:
# fmt_row.extend(self.bf * num_empty)
types_row[ltr:] = self.bt * num_empty
- values_row[ltr:] = [''] * num_empty
+ values_row[ltr:] = [UNICODE_LITERAL('')] * num_empty
if fmt_info:
fmt_row[ltr:] = self.bf * num_empty
types_row[colx] = ctype
@@ -717,7 +736,7 @@ def put_cell_unragged(self, rowx, colx, ctype, value, xf_index):
trow.extend(self.bt * nextra)
if self.formatting_info:
self._cell_xf_indexes[rowx].extend(self.bf * nextra)
- self._cell_values[rowx].extend([''] * nextra)
+ self._cell_values[rowx].extend([UNICODE_LITERAL('')] * nextra)
else:
scta = self._cell_types.append
scva = self._cell_values.append
@@ -729,7 +748,7 @@ def put_cell_unragged(self, rowx, colx, ctype, value, xf_index):
for _unused in xrange(self.nrows, nr):
# self._put_cell_rows_appended += 1
scta(bt * nc)
- scva([''] * nc)
+ scva([UNICODE_LITERAL('')] * nc)
if fmt_info:
scxa(bf * nc)
self.nrows = nr
@@ -743,8 +762,8 @@ def put_cell_unragged(self, rowx, colx, ctype, value, xf_index):
print("put_cell", rowx, colx, file=self.logfile)
raise
except:
- print("put_cell", rowx, colx, file=self.logfile)
- raise
+ print("put_cell", rowx, colx, file=self.logfile)
+ raise
# === Methods after this line neither know nor care about how cells are stored.
@@ -761,7 +780,7 @@ def read(self, bk):
XL_SHRFMLA_ETC_ETC = (
XL_SHRFMLA, XL_ARRAY, XL_TABLEOP, XL_TABLEOP2,
XL_ARRAY2, XL_TABLEOP_B2,
- )
+ )
self_put_cell = self.put_cell
local_unpack = unpack
bk_get_record_parts = bk.get_record_parts
@@ -843,8 +862,8 @@ def read(self, bk):
if not fmt_info: continue
rowx, bits1, bits2 = local_unpack('= 50:
rowx, colx, xf_index, result_str, flags = local_unpack('= 30:
rowx, colx, xf_index, result_str, flags = local_unpack(' 255: break # Excel does 0 to 256 inclusive
self.colinfo_map[colx] = c
@@ -1009,7 +1022,7 @@ def read(self, bk):
self.logfile,
"COLINFO sheet #%d cols %d-%d: wid=%d xf_index=%d flags=0x%04x\n",
self.number, first_colx, last_colx, c.width, c.xf_index, flags,
- )
+ )
c.dump(self.logfile, header='===')
elif rc == XL_DEFCOLWIDTH:
self.defcolwidth, = local_unpack("= 1:
- fprintf(self.logfile,
- "\n*** WARNING: Ignoring CONDFMT (conditional formatting) record\n" \
- "*** in Sheet %d (%r).\n" \
- "*** %d CF record(s); needs_recalc_or_redraw = %d\n" \
+ fprintf(
+ self.logfile,
+ "\n*** WARNING: Ignoring CONDFMT (conditional formatting) record\n"
+ "*** in Sheet %d (%r).\n"
+ "*** %d CF record(s); needs_recalc_or_redraw = %d\n"
"*** Bounding box is %s\n",
self.number, self.name, num_CFs, needs_recalc,
rangename2d(browx1, browx2+1, bcolx1, bcolx2+1),
- )
+ )
olist = [] # updated by the function
pos = unpack_cell_range_address_list_update_pos(
olist, data, 12, bv, addr_size=8)
# print >> self.logfile, repr(result), len(result)
if self.verbosity >= 1:
- fprintf(self.logfile,
- "*** %d individual range(s):\n" \
+ fprintf(
+ self.logfile,
+ "*** %d individual range(s):\n"
"*** %s\n",
len(olist),
- ", ".join([rangename2d(*coords) for coords in olist]),
- )
+ ", ".join(rangename2d(*coords) for coords in olist),
+ )
elif rc == XL_CF:
if not fmt_info: continue
cf_type, cmp_op, sz1, sz2, flags = unpack("> 28) & 1
patt_block = (flags >> 29) & 1
if self.verbosity >= 1:
- fprintf(self.logfile,
- "\n*** WARNING: Ignoring CF (conditional formatting) sub-record.\n" \
- "*** cf_type=%d, cmp_op=%d, sz1=%d, sz2=%d, flags=0x%08x\n" \
+ fprintf(
+ self.logfile,
+ "\n*** WARNING: Ignoring CF (conditional formatting) sub-record.\n"
+ "*** cf_type=%d, cmp_op=%d, sz1=%d, sz2=%d, flags=0x%08x\n"
"*** optional data blocks: font=%d, border=%d, pattern=%d\n",
cf_type, cmp_op, sz1, sz2, flags,
font_block, bord_block, patt_block,
- )
+ )
# hex_char_dump(data, 0, data_len, fout=self.logfile)
pos = 12
if font_block:
(font_height, font_options, weight, escapement, underline,
- font_colour_index, two_bits, font_esc, font_underl) = \
- unpack("<64x i i H H B 3x i 4x i i i 18x", data[pos:pos+118])
+ font_colour_index, two_bits, font_esc, font_underl) = unpack("<64x i i H H B 3x i 4x i i i 18x", data[pos:pos+118])
font_style = (two_bits > 1) & 1
posture = (font_options > 1) & 1
font_canc = (two_bits > 7) & 1
cancellation = (font_options > 7) & 1
if self.verbosity >= 1:
- fprintf(self.logfile,
- "*** Font info: height=%d, weight=%d, escapement=%d,\n" \
- "*** underline=%d, colour_index=%d, esc=%d, underl=%d,\n" \
+ fprintf(
+ self.logfile,
+ "*** Font info: height=%d, weight=%d, escapement=%d,\n"
+ "*** underline=%d, colour_index=%d, esc=%d, underl=%d,\n"
"*** style=%d, posture=%d, canc=%d, cancellation=%d\n",
font_height, weight, escapement, underline,
font_colour_index, font_esc, font_underl,
font_style, posture, font_canc, cancellation,
- )
+ )
pos += 118
if bord_block:
pos += 8
@@ -1195,17 +1212,13 @@ def read(self, bk):
fmla1 = data[pos:pos+sz1]
pos += sz1
if blah and sz1:
- fprintf(self.logfile,
- "*** formula 1:\n",
- )
+ fprintf(self.logfile, "*** formula 1:\n")
dump_formula(bk, fmla1, sz1, bv, reldelta=0, blah=1)
fmla2 = data[pos:pos+sz2]
pos += sz2
assert pos == data_len
if blah and sz2:
- fprintf(self.logfile,
- "*** formula 2:\n",
- )
+ fprintf(self.logfile, "*** formula 2:\n")
dump_formula(bk, fmla2, sz2, bv, reldelta=0, blah=1)
elif rc == XL_DEFAULTROWHEIGHT:
if data_len == 4:
@@ -1214,12 +1227,12 @@ def read(self, bk):
self.default_row_height, = unpack("= 80 and data_len >= 14:
- (options,
- self.first_visible_rowx, self.first_visible_colx,
- self.gridline_colour_index,
- self.cached_page_break_preview_mag_factor,
- self.cached_normal_view_mag_factor
+ (
+ options,
+ self.first_visible_rowx, self.first_visible_colx,
+ self.gridline_colour_index,
+ self.cached_page_break_preview_mag_factor,
+ self.cached_normal_view_mag_factor
) = unpack("= 30 # BIFF3-7
- (options,
- self.first_visible_rowx, self.first_visible_colx,
+ (
+ options,
+ self.first_visible_rowx, self.first_visible_colx,
) = unpack("= 0:
- print((
+ print(
"WARNING *** SCL rcd sheet %d: should have 0.1 <= num/den <= 4; got %d/%d"
- % (self.number, num, den)
- ), file=self.logfile)
+ % (self.number, num, den),
+ file=self.logfile,
+ )
result = 100
self.scl_mag_factor = result
elif rc == XL_PANE:
(
- self.vert_split_pos,
- self.horz_split_pos,
- self.horz_split_first_visible,
- self.vert_split_first_visible,
- self.split_active_pane,
+ self.vert_split_pos,
+ self.horz_split_pos,
+ self.horz_split_first_visible,
+ self.vert_split_first_visible,
+ self.split_active_pane,
) = unpack(" nchars_expected:
- msg = ("STRING/CONTINUE: expected %d chars, found %d"
+ msg = ("STRING/CONTINUE: expected %d chars, found %d"
% (nchars_expected, nchars_found))
raise XLRDError(msg)
rc, _unused_len, data = bk.get_record_parts()
@@ -1524,10 +1537,11 @@ def update_cooked_mag_factors(self):
zoom = self.cached_normal_view_mag_factor
if not (10 <= zoom <=400):
if blah:
- print((
+ print(
"WARNING *** WINDOW2 rcd sheet %d: Bad cached_normal_view_mag_factor: %d"
- % (self.number, self.cached_normal_view_mag_factor)
- ), file=self.logfile)
+ % (self.number, self.cached_normal_view_mag_factor),
+ file=self.logfile,
+ )
zoom = self.cooked_page_break_preview_mag_factor
self.cooked_normal_view_mag_factor = zoom
else:
@@ -1537,15 +1551,16 @@ def update_cooked_mag_factors(self):
else:
self.cooked_normal_view_mag_factor = self.scl_mag_factor
zoom = self.cached_page_break_preview_mag_factor
- if zoom == 0:
+ if not zoom:
# VALID, defaults to 60
zoom = 60
elif not (10 <= zoom <= 400):
if blah:
- print((
+ print(
"WARNING *** WINDOW2 rcd sheet %r: Bad cached_page_break_preview_mag_factor: %r"
- % (self.number, self.cached_page_break_preview_mag_factor)
- ), file=self.logfile)
+ % (self.number, self.cached_page_break_preview_mag_factor),
+ file=self.logfile,
+ )
zoom = self.cooked_normal_view_mag_factor
self.cooked_page_break_preview_mag_factor = zoom
@@ -1607,7 +1622,7 @@ def insert_new_BIFF20_xf(self, cell_attr, style=0):
FGE: XL_CELL_NUMBER,
FDT: XL_CELL_DATE,
FTX: XL_CELL_NUMBER, # Yes, a number can be formatted as text.
- }
+ }
fmt = book.format_map[xf.format_key]
cellty = cellty_from_fmtty[fmt.type]
self._xf_index_to_xl_type_map[xf.xf_index] = cellty
@@ -1634,7 +1649,7 @@ def fake_XF_from_BIFF20_cell_attr(self, cell_attr, style=0):
upkbits(xf.protection, prot_bits, (
(6, 0x40, 'cell_locked'),
(7, 0x80, 'formula_hidden'),
- ))
+ ))
xf.alignment.hor_align = halign_etc & 0x07
for mask, side in ((0x08, 'left'), (0x10, 'right'), (0x20, 'top'), (0x40, 'bottom')):
if halign_etc & mask:
@@ -1653,8 +1668,15 @@ def fake_XF_from_BIFF20_cell_attr(self, cell_attr, style=0):
xf.parent_style_index = (0x0FFF, 0)[style]
xf.alignment.vert_align = 2 # bottom
xf.alignment.rotation = 0
- for attr_stem in \
- "format font alignment border background protection".split():
+ attr_stems = [
+ 'format',
+ 'font',
+ 'alignment',
+ 'border',
+ 'background',
+ 'protection',
+ ]
+ for attr_stem in attr_stems:
attr = "_" + attr_stem + "_flag"
setattr(xf, attr, 1)
return xf
@@ -1663,18 +1685,22 @@ def req_fmt_info(self):
if not self.formatting_info:
raise XLRDError("Feature requires open_workbook(..., formatting_info=True)")
- ##
- # Determine column display width.
- #
-- New in version 0.6.1
- #
- # @param colx Index of the queried column, range 0 to 255.
- # Note that it is possible to find out the width that will be used to display
- # columns with no cell information e.g. column IV (colx=255).
- # @return The column width that will be used for displaying
- # the given column by Excel, in units of 1/256th of the width of a
- # standard character (the digit zero in the first font).
-
def computed_column_width(self, colx):
+ """
+ Determine column display width.
+
+ :param colx:
+ Index of the queried column, range 0 to 255.
+ Note that it is possible to find out the width that will be used to
+ display columns with no cell information e.g. column IV (colx=255).
+
+ :return:
+ The column width that will be used for displaying
+ the given column by Excel, in units of 1/256th of the width of a
+ standard character (the digit zero in the first font).
+
+ .. versionadded:: 0.6.1
+ """
self.req_fmt_info()
if self.biff_version >= 80:
colinfo = self.colinfo_map.get(colx, None)
@@ -1719,10 +1745,10 @@ def get_nul_terminated_unicode(buf, ofs):
if options & 0x14: # has a description
h.desc, offset = get_nul_terminated_unicode(data, offset)
-
+
if options & 0x80: # has a target
h.target, offset = get_nul_terminated_unicode(data, offset)
-
+
if (options & 1) and not (options & 0x100): # HasMoniker and not MonikerSavedAsString
# an OLEMoniker structure
clsid, = unpack('<16s', data[offset:offset + 16])
@@ -1744,12 +1770,12 @@ def get_nul_terminated_unicode(buf, ofs):
extra_nbytes = nbytes - true_nbytes
extra_data = data[offset:offset + extra_nbytes]
offset += extra_nbytes
- if DEBUG:
+ if DEBUG:
fprintf(
self.logfile,
"url=%r\nextra=%r\nnbytes=%d true_nbytes=%d extra_nbytes=%d\n",
h.url_or_path, extra_data, nbytes, true_nbytes, extra_nbytes,
- )
+ )
assert extra_nbytes in (24, 0)
elif clsid == b"\x03\x03\x00\x00\x00\x00\x00\x00\xC0\x00\x00\x00\x00\x00\x00\x46":
# file moniker
@@ -1784,33 +1810,33 @@ def get_nul_terminated_unicode(buf, ofs):
h.type = UNICODE_LITERAL('workbook')
else:
h.type = UNICODE_LITERAL('unknown')
-
+
if options & 0x8: # has textmark
h.textmark, offset = get_nul_terminated_unicode(data, offset)
if DEBUG:
- h.dump(header="... object dump ...")
+ h.dump(header="... object dump ...")
print("offset=%d record_size=%d" % (offset, record_size))
-
+
extra_nbytes = record_size - offset
if extra_nbytes > 0:
fprintf(
self.logfile,
- "*** WARNING: hyperlink at r=%d c=%d has %d extra data bytes: %s\n",
- h.frowx,
- h.fcolx,
+ "*** WARNING: hyperlink at R%dC%d has %d extra data bytes: %s\n",
+ h.frowx + 1,
+ h.fcolx + 1,
extra_nbytes,
- REPR(data[-extra_nbytes:])
- )
+ REPR(data[-extra_nbytes:]),
+ )
# Seen: b"\x00\x00" also b"A\x00", b"V\x00"
- elif extra_nbytes < 0:
+ elif extra_nbytes < 0:
raise XLRDError("Bug or corrupt file, send copy of input file for debugging")
self.hyperlink_list.append(h)
for rowx in xrange(h.frowx, h.lrowx+1):
for colx in xrange(h.fcolx, h.lcolx+1):
self.hyperlink_map[rowx, colx] = h
-
+
def handle_quicktip(self, data):
rcx, frowx, lrowx, fcolx, lcolx = unpack('<5H', data[:10])
assert rcx == XL_QUICKTIP
@@ -1887,7 +1913,7 @@ def handle_obj(self, data):
( 9, 0x0200, 'scrollbar_flag'), # not documented in Excel 97 dev kit
(13, 0x2000, 'autofill'),
(14, 0x4000, 'autoline'),
- ))
+ ))
elif ft == 0x00:
if data[pos:data_len] == b'\0' * (data_len - pos):
# ignore "optional reserved" data at end of record
@@ -1945,7 +1971,7 @@ def handle_note(self, data, txos):
o.col_hidden = 0
o.author = UNICODE_LITERAL('')
o._object_id = None
- self.cell_note_map[o.rowx, o.colx] = o
+ self.cell_note_map[o.rowx, o.colx] = o
return
# Excel 8.0+
o.rowx, o.colx, option_flags, o._object_id = unpack('<4H', data[:8])
@@ -1965,13 +1991,12 @@ def handle_note(self, data, txos):
if txo:
o.text = txo.text
o.rich_text_runlist = txo.rich_text_runlist
- self.cell_note_map[o.rowx, o.colx] = o
+ self.cell_note_map[o.rowx, o.colx] = o
def handle_txo(self, data):
if self.biff_version < 80:
return
o = MSTxo()
- data_len = len(data)
fmt = ' Represents a user "comment" or "note".
-# Note objects are accessible through Sheet.{@link #Sheet.cell_note_map}.
-#
-- New in version 0.7.2
-#
+
class Note(BaseObject):
- ##
- # Author of note
+ """
+ Represents a user "comment" or "note".
+ Note objects are accessible through :attr:`Sheet.cell_note_map`.
+
+ .. versionadded:: 0.7.2
+ """
+
+ #: Author of note
author = UNICODE_LITERAL('')
- ##
- # True if the containing column is hidden
- col_hidden = 0
- ##
- # Column index
+
+ #: ``True`` if the containing column is hidden
+ col_hidden = 0
+
+ #: Column index
colx = 0
- ##
- # List of (offset_in_string, font_index) tuples.
- # Unlike Sheet.{@link #Sheet.rich_text_runlist_map}, the first offset should always be 0.
+
+ #: List of ``(offset_in_string, font_index)`` tuples.
+ #: Unlike :attr:`Sheet.rich_text_runlist_map`, the first offset should
+ #: always be 0.
rich_text_runlist = None
- ##
- # True if the containing row is hidden
+
+ #: True if the containing row is hidden
row_hidden = 0
- ##
- # Row index
+
+ #: Row index
rowx = 0
- ##
- # True if note is always shown
+
+ #: True if note is always shown
show = 0
- ##
- # Text of the note
+
+ #: Text of the note
text = UNICODE_LITERAL('')
-##
-# Contains the attributes of a hyperlink.
-# Hyperlink objects are accessible through Sheet.{@link #Sheet.hyperlink_list}
-# and Sheet.{@link #Sheet.hyperlink_map}.
-#
-- New in version 0.7.2
-#
+
class Hyperlink(BaseObject):
- ##
- # Index of first row
+ """
+ Contains the attributes of a hyperlink.
+ Hyperlink objects are accessible through :attr:`Sheet.hyperlink_list`
+ and :attr:`Sheet.hyperlink_map`.
+
+ .. versionadded:: 0.7.2
+ """
+
+ #: Index of first row
frowx = None
- ##
- # Index of last row
+
+ #: Index of last row
lrowx = None
- ##
- # Index of first column
+
+ #: Index of first column
fcolx = None
- ##
- # Index of last column
+
+ #: Index of last column
lcolx = None
- ##
- # Type of hyperlink. Unicode string, one of 'url', 'unc',
- # 'local file', 'workbook', 'unknown'
+
+ #: Type of hyperlink. Unicode string, one of 'url', 'unc',
+ #: 'local file', 'workbook', 'unknown'
type = None
- ##
- # The URL or file-path, depending in the type. Unicode string, except
- # in the rare case of a local but non-existent file with non-ASCII
- # characters in the name, in which case only the "8.3" filename is available,
- # as a bytes (3.x) or str (2.x) string, with unknown encoding.
+
+ #: The URL or file-path, depending in the type. Unicode string, except
+ #: in the rare case of a local but non-existent file with non-ASCII
+ #: characters in the name, in which case only the "8.3" filename is
+ #: available, as a :class:`bytes` (3.x) or :class:`str` (2.x) string,
+ #: *with unknown encoding.*
url_or_path = None
- ##
- # Description ... this is displayed in the cell,
- # and should be identical to the cell value. Unicode string, or None. It seems
- # impossible NOT to have a description created by the Excel UI.
+
+ #: Description.
+ #: This is displayed in the cell,
+ #: and should be identical to the cell value. Unicode string, or ``None``.
+ #: It seems impossible NOT to have a description created by the Excel UI.
desc = None
- ##
- # Target frame. Unicode string. Note: I have not seen a case of this.
- # It seems impossible to create one in the Excel UI.
+
+ #: Target frame. Unicode string.
+ #:
+ #: .. note::
+ #: No cases of this have been seen in the wild.
+ #: It seems impossible to create one in the Excel UI.
target = None
- ##
- # "Textmark": the piece after the "#" in
- # "http://docs.python.org/library#struct_module", or the Sheet1!A1:Z99
- # part when type is "workbook".
+
+ #: The piece after the "#" in
+ #: "http://docs.python.org/library#struct_module", or the ``Sheet1!A1:Z99``
+ #: part when type is "workbook".
textmark = None
- ##
- # The text of the "quick tip" displayed when the cursor
- # hovers over the hyperlink.
+
+ #: The text of the "quick tip" displayed when the cursor
+ #: hovers over the hyperlink.
quicktip = None
# === helpers ===
@@ -2181,7 +2219,7 @@ def unpack_RK(rk_str):
FGE: XL_CELL_NUMBER,
FDT: XL_CELL_DATE,
FTX: XL_CELL_NUMBER, # Yes, a number can be formatted as text.
- }
+}
ctype_text = {
XL_CELL_EMPTY: 'empty',
@@ -2191,67 +2229,74 @@ def unpack_RK(rk_str):
XL_CELL_BOOLEAN: 'bool',
XL_CELL_ERROR: 'error',
XL_CELL_BLANK: 'blank',
- }
-
-##
-# Contains the data for one cell.
-#
-# WARNING: You don't call this class yourself. You access Cell objects
-# via methods of the {@link #Sheet} object(s) that you found in the {@link #Book} object that
-# was returned when you called xlrd.open_workbook("myfile.xls").
-# Cell objects have three attributes: ctype is an int, value
-# (which depends on ctype) and xf_index.
-# If "formatting_info" is not enabled when the workbook is opened, xf_index will be None.
-# The following table describes the types of cells and how their values
-# are represented in Python.
-#
-#
-#
-# | Type symbol |
-# Type number |
-# Python value |
-#
-#
-# | XL_CELL_EMPTY |
-# 0 |
-# empty string u'' |
-#
-#
-# | XL_CELL_TEXT |
-# 1 |
-# a Unicode string |
-#
-#
-# | XL_CELL_NUMBER |
-# 2 |
-# float |
-#
-#
-# | XL_CELL_DATE |
-# 3 |
-# float |
-#
-#
-# | XL_CELL_BOOLEAN |
-# 4 |
-# int; 1 means TRUE, 0 means FALSE |
-#
-#
-# | XL_CELL_ERROR |
-# 5 |
-# int representing internal Excel codes; for a text representation,
-# refer to the supplied dictionary error_text_from_code |
-#
-#
-# | XL_CELL_BLANK |
-# 6 |
-# empty string u''. Note: this type will appear only when
-# open_workbook(..., formatting_info=True) is used. |
-#
-#
-#
+}
+
class Cell(BaseObject):
+ """
+ Contains the data for one cell.
+
+ .. warning::
+ You don't call this class yourself. You access :class:`Cell` objects
+ via methods of the :class:`Sheet` object(s) that you found in the
+ :class:`~xlrd.book.Book` object that was returned when you called
+ :func:`~xlrd.open_workbook`
+
+ Cell objects have three attributes: ``ctype`` is an int, ``value``
+ (which depends on ``ctype``) and ``xf_index``.
+ If ``formatting_info`` is not enabled when the workbook is opened,
+ ``xf_index`` will be ``None``.
+
+ The following table describes the types of cells and how their values
+ are represented in Python.
+
+ .. raw:: html
+
+
+
+ | Type symbol |
+ Type number |
+ Python value |
+
+
+ | XL_CELL_EMPTY |
+ 0 |
+ empty string '' |
+
+
+ | XL_CELL_TEXT |
+ 1 |
+ a Unicode string |
+
+
+ | XL_CELL_NUMBER |
+ 2 |
+ float |
+
+
+ | XL_CELL_DATE |
+ 3 |
+ float |
+
+
+ | XL_CELL_BOOLEAN |
+ 4 |
+ int; 1 means TRUE, 0 means FALSE |
+
+
+ | XL_CELL_ERROR |
+ 5 |
+ int representing internal Excel codes; for a text representation,
+ refer to the supplied dictionary error_text_from_code |
+
+
+ | XL_CELL_BLANK |
+ 6 |
+ empty string ''. Note: this type will appear only when
+ open_workbook(..., formatting_info=True) is used. |
+
+
+ """
__slots__ = ['ctype', 'value', 'xf_index']
@@ -2266,108 +2311,80 @@ def __repr__(self):
else:
return "%s:%r (XF:%r)" % (ctype_text[self.ctype], self.value, self.xf_index)
-##
-# There is one and only one instance of an empty cell -- it's a singleton. This is it.
-# You may use a test like "acell is empty_cell".
-empty_cell = Cell(XL_CELL_EMPTY, '')
+empty_cell = Cell(XL_CELL_EMPTY, UNICODE_LITERAL(''))
##### =============== Colinfo and Rowinfo ============================== #####
-##
-# Width and default formatting information that applies to one or
-# more columns in a sheet. Derived from COLINFO records.
-#
-# Here is the default hierarchy for width, according to the OOo docs:
-#
-#
"""In BIFF3, if a COLINFO record is missing for a column,
-# the width specified in the record DEFCOLWIDTH is used instead.
-#
-#
In BIFF4-BIFF7, the width set in this [COLINFO] record is only used,
-# if the corresponding bit for this column is cleared in the GCW
-# record, otherwise the column width set in the DEFCOLWIDTH record
-# is used (the STANDARDWIDTH record is always ignored in this case [see footnote!]).
-#
-#
In BIFF8, if a COLINFO record is missing for a column,
-# the width specified in the record STANDARDWIDTH is used.
-# If this [STANDARDWIDTH] record is also missing,
-# the column width of the record DEFCOLWIDTH is used instead."""
-#
-#
-# Footnote: The docs on the GCW record say this:
-# """
-# If a bit is set, the corresponding column uses the width set in the STANDARDWIDTH
-# record. If a bit is cleared, the corresponding column uses the width set in the
-# COLINFO record for this column.
-#
If a bit is set, and the worksheet does not contain the STANDARDWIDTH record, or if
-# the bit is cleared, and the worksheet does not contain the COLINFO record, the DEFCOLWIDTH
-# record of the worksheet will be used instead.
-#
"""
-# At the moment (2007-01-17) xlrd is going with the GCW version of the story.
-# Reference to the source may be useful: see the computed_column_width(colx) method
-# of the Sheet class.
-#
-- New in version 0.6.1
-#
class Colinfo(BaseObject):
- ##
- # Width of the column in 1/256 of the width of the zero character,
- # using default font (first FONT record in the file).
+ """
+ Width and default formatting information that applies to one or
+ more columns in a sheet. Derived from ``COLINFO`` records.
+
+ Here is the default hierarchy for width, according to the OOo docs:
+
+ In BIFF3, if a ``COLINFO`` record is missing for a column,
+ the width specified in the record ``DEFCOLWIDTH`` is used instead.
+
+ In BIFF4-BIFF7, the width set in this ``COLINFO`` record is only used,
+ if the corresponding bit for this column is cleared in the ``GCW``
+ record, otherwise the column width set in the ``DEFCOLWIDTH`` record
+ is used (the ``STANDARDWIDTH`` record is always ignored in this case [#f1]_).
+
+ In BIFF8, if a ``COLINFO`` record is missing for a column,
+ the width specified in the record ``STANDARDWIDTH`` is used.
+ If this ``STANDARDWIDTH`` record is also missing,
+ the column width of the record ``DEFCOLWIDTH`` is used instead.
+
+ .. [#f1] The docs on the ``GCW`` record say this:
+
+ If a bit is set, the corresponding column uses the width set in the
+ ``STANDARDWIDTH`` record. If a bit is cleared, the corresponding column
+ uses the width set in the ``COLINFO`` record for this column.
+
+ If a bit is set, and the worksheet does not contain the ``STANDARDWIDTH``
+ record, or if the bit is cleared, and the worksheet does not contain the
+ ``COLINFO`` record, the ``DEFCOLWIDTH`` record of the worksheet will be
+ used instead.
+
+ xlrd goes with the GCW version of the story.
+ Reference to the source may be useful: see
+ :meth:`Sheet.computed_column_width`.
+
+ .. versionadded:: 0.6.1
+ """
+
+ #: Width of the column in 1/256 of the width of the zero character,
+ #: using default font (first ``FONT`` record in the file).
width = 0
- ##
- # XF index to be used for formatting empty cells.
+
+ #: XF index to be used for formatting empty cells.
xf_index = -1
- ##
- # 1 = column is hidden
+
+ #: 1 = column is hidden
hidden = 0
- ##
- # Value of a 1-bit flag whose purpose is unknown
- # but is often seen set to 1
+
+ #: Value of a 1-bit flag whose purpose is unknown
+ #: but is often seen set to 1
bit1_flag = 0
- ##
- # Outline level of the column, in range(7).
- # (0 = no outline)
+
+ #: Outline level of the column, in ``range(7)``.
+ #: (0 = no outline)
outline_level = 0
- ##
- # 1 = column is collapsed
+
+ #: 1 = column is collapsed
collapsed = 0
_USE_SLOTS = 1
-##
-# Height and default formatting information that applies to a row in a sheet.
-# Derived from ROW records.
-#
-- New in version 0.6.1
-#
-# height: Height of the row, in twips. One twip == 1/20 of a point.
-#
-# has_default_height: 0 = Row has custom height; 1 = Row has default height.
-#
-# outline_level: Outline level of the row (0 to 7)
-#
-# outline_group_starts_ends: 1 = Outline group starts or ends here (depending on where the
-# outline buttons are located, see WSBOOL record [TODO ??]),
-# and is collapsed
-#
-# hidden: 1 = Row is hidden (manually, or by a filter or outline group)
-#
-# height_mismatch: 1 = Row height and default font height do not match
-#
-# has_default_xf_index: 1 = the xf_index attribute is usable; 0 = ignore it
-#
-# xf_index: Index to default XF record for empty cells in this row.
-# Don't use this if has_default_xf_index == 0.
-#
-# additional_space_above: This flag is set, if the upper border of at least one cell in this row
-# or if the lower border of at least one cell in the row above is
-# formatted with a thick line style. Thin and medium line styles are not
-# taken into account.
-#
-# additional_space_below: This flag is set, if the lower border of at least one cell in this row
-# or if the upper border of at least one cell in the row below is
-# formatted with a medium or thick line style. Thin line styles are not
-# taken into account.
class Rowinfo(BaseObject):
+ """
+ Height and default formatting information that applies to a row in a sheet.
+ Derived from ``ROW`` records.
+
+ .. versionadded:: 0.6.1
+ """
if _USE_SLOTS:
__slots__ = (
@@ -2381,18 +2398,46 @@ class Rowinfo(BaseObject):
"xf_index",
"additional_space_above",
"additional_space_below",
- )
+ )
def __init__(self):
+ #: Height of the row, in twips. One twip == 1/20 of a point.
self.height = None
+
+ #: 0 = Row has custom height; 1 = Row has default height.
self.has_default_height = None
+
+ #: Outline level of the row (0 to 7)
self.outline_level = None
+
+ #: 1 = Outline group starts or ends here (depending on where the
+ #: outline buttons are located, see ``WSBOOL`` record, which is not
+ #: parsed by xlrd), *and* is collapsed.
self.outline_group_starts_ends = None
+
+ #: 1 = Row is hidden (manually, or by a filter or outline group)
self.hidden = None
+
+ #: 1 = Row height and default font height do not match.
self.height_mismatch = None
+
+ #: 1 = the xf_index attribute is usable; 0 = ignore it.
self.has_default_xf_index = None
+
+ #: Index to default :class:`~xlrd.formatting.XF` record for empty cells
+ #: in this row. Don't use this if ``has_default_xf_index == 0``.
self.xf_index = None
+
+ #: This flag is set if the upper border of at least one cell in this
+ #: row or if the lower border of at least one cell in the row above is
+ #: formatted with a thick line style. Thin and medium line styles are
+ #: not taken into account.
self.additional_space_above = None
+
+ #: This flag is set if the lower border of at least one cell in this row
+ #: or if the upper border of at least one cell in the row below is
+ #: formatted with a medium or thick line style. Thin line styles are not
+ #: taken into account.
self.additional_space_below = None
def __getstate__(self):
@@ -2407,7 +2452,7 @@ def __getstate__(self):
self.xf_index,
self.additional_space_above,
self.additional_space_below,
- )
+ )
def __setstate__(self, state):
(
@@ -2421,4 +2466,4 @@ def __setstate__(self, state):
self.xf_index,
self.additional_space_above,
self.additional_space_below,
- ) = state
+ ) = state
diff --git a/SUEWSPrepare/Modules/xlrd/timemachine.py b/SUEWSPrepare/Modules/xlrd/timemachine.py
index a068db3..a519299 100644
--- a/SUEWSPrepare/Modules/xlrd/timemachine.py
+++ b/SUEWSPrepare/Modules/xlrd/timemachine.py
@@ -8,6 +8,7 @@
# usage: from timemachine import *
from __future__ import print_function
+
import sys
python_version = sys.version_info[:2] # e.g. version 2.6 -> (2, 6)
@@ -23,7 +24,7 @@ def fprintf(f, fmt, *vargs):
if fmt.endswith('\n'):
print(fmt[:-1] % vargs, file=f)
else:
- print(fmt % vargs, end=' ', file=f)
+ print(fmt % vargs, end=' ', file=f)
EXCEL_TEXT_TYPES = (str, bytes, bytearray) # xlwt: isinstance(obj, EXCEL_TEXT_TYPES)
REPR = ascii
xrange = range
@@ -40,7 +41,7 @@ def fprintf(f, fmt, *vargs):
if fmt.endswith('\n'):
print(fmt[:-1] % vargs, file=f)
else:
- print(fmt % vargs, end=' ', file=f)
+ print(fmt % vargs, end=' ', file=f)
try:
EXCEL_TEXT_TYPES = basestring # xlwt: isinstance(obj, EXCEL_TEXT_TYPES)
except NameError:
@@ -49,4 +50,4 @@ def fprintf(f, fmt, *vargs):
xrange = xrange
# following used only to overcome 2.x ElementTree gimmick which
# returns text as `str` if it's ascii, otherwise `unicode`
- ensure_unicode = unicode # used only in xlsx.py
+ ensure_unicode = unicode # used only in xlsx.py
diff --git a/SUEWSPrepare/Modules/xlrd/xldate.py b/SUEWSPrepare/Modules/xlrd/xldate.py
index dc7b9c8..d84c650 100644
--- a/SUEWSPrepare/Modules/xlrd/xldate.py
+++ b/SUEWSPrepare/Modules/xlrd/xldate.py
@@ -1,22 +1,23 @@
-# -*- coding: cp1252 -*-
-
+# -*- coding: utf-8 -*-
+# Copyright (c) 2005-2008 Stephen John Machin, Lingfo Pty Ltd
+# This module is part of the xlrd package, which is released under a
+# BSD-style licence.
# No part of the content of this file was derived from the works of David Giffin.
+"""
+Tools for working with dates and times in Excel files.
+
+The conversion from ``days`` to ``(year, month, day)`` starts with
+an integral "julian day number" aka JDN.
+FWIW:
+
+- JDN 0 corresponds to noon on Monday November 24 in Gregorian year -4713.
+
+More importantly:
-##
-# Copyright 2005-2008 Stephen John Machin, Lingfo Pty Ltd
-# This module is part of the xlrd package, which is released under a BSD-style licence.
-#
-# Provides function(s) for dealing with Microsoft Excel dates.
-##
-
-# 2008-10-18 SJM Fix bug in xldate_from_date_tuple (affected some years after 2099)
-
-# The conversion from days to (year, month, day) starts with
-# an integral "julian day number" aka JDN.
-# FWIW, JDN 0 corresponds to noon on Monday November 24 in Gregorian year -4713.
-# More importantly:
-# Noon on Gregorian 1900-03-01 (day 61 in the 1900-based system) is JDN 2415080.0
-# Noon on Gregorian 1904-01-02 (day 1 in the 1904-based system) is JDN 2416482.0
+- Noon on Gregorian 1900-03-01 (day 61 in the 1900-based system) is JDN 2415080.0
+- Noon on Gregorian 1904-01-02 (day 1 in the 1904-based system) is JDN 2416482.0
+
+"""
import datetime
_JDN_delta = (2415080 - 61, 2416482 - 1)
@@ -27,37 +28,66 @@
epoch_1900 = datetime.datetime(1899, 12, 31)
epoch_1900_minus_1 = datetime.datetime(1899, 12, 30)
-class XLDateError(ValueError): pass
-
-class XLDateNegative(XLDateError): pass
-class XLDateAmbiguous(XLDateError): pass
-class XLDateTooLarge(XLDateError): pass
-class XLDateBadDatemode(XLDateError): pass
-class XLDateBadTuple(XLDateError): pass
-
-_XLDAYS_TOO_LARGE = (2958466, 2958466 - 1462) # This is equivalent to 10000-01-01
-
-##
-# Convert an Excel number (presumed to represent a date, a datetime or a time) into
-# a tuple suitable for feeding to datetime or mx.DateTime constructors.
-# @param xldate The Excel number
-# @param datemode 0: 1900-based, 1: 1904-based.
-#
WARNING: when using this function to
-# interpret the contents of a workbook, you should pass in the Book.datemode
-# attribute of that workbook. Whether
-# the workbook has ever been anywhere near a Macintosh is irrelevant.
-# @return Gregorian (year, month, day, hour, minute, nearest_second).
-#
Special case: if 0.0 <= xldate < 1.0, it is assumed to represent a time;
-# (0, 0, 0, hour, minute, second) will be returned.
-#
Note: 1904-01-01 is not regarded as a valid date in the datemode 1 system; its "serial number"
-# is zero.
-# @throws XLDateNegative xldate < 0.00
-# @throws XLDateAmbiguous The 1900 leap-year problem (datemode == 0 and 1.0 <= xldate < 61.0)
-# @throws XLDateTooLarge Gregorian year 10000 or later
-# @throws XLDateBadDatemode datemode arg is neither 0 nor 1
-# @throws XLDateError Covers the 4 specific errors
+# This is equivalent to 10000-01-01:
+_XLDAYS_TOO_LARGE = (2958466, 2958466 - 1462)
+
+
+class XLDateError(ValueError):
+ "A base class for all datetime-related errors."
+
+
+class XLDateNegative(XLDateError):
+ "``xldate < 0.00``"
+
+
+class XLDateAmbiguous(XLDateError):
+ "The 1900 leap-year problem ``(datemode == 0 and 1.0 <= xldate < 61.0)``"
+
+
+class XLDateTooLarge(XLDateError):
+ "Gregorian year 10000 or later"
+
+
+class XLDateBadDatemode(XLDateError):
+ "``datemode`` arg is neither 0 nor 1"
+
+
+class XLDateBadTuple(XLDateError):
+ pass
+
def xldate_as_tuple(xldate, datemode):
+ """
+ Convert an Excel number (presumed to represent a date, a datetime or a time) into
+ a tuple suitable for feeding to datetime or mx.DateTime constructors.
+
+ :param xldate: The Excel number
+ :param datemode: 0: 1900-based, 1: 1904-based.
+ :raises xlrd.xldate.XLDateNegative:
+ :raises xlrd.xldate.XLDateAmbiguous:
+
+ :raises xlrd.xldate.XLDateTooLarge:
+ :raises xlrd.xldate.XLDateBadDatemode:
+ :raises xlrd.xldate.XLDateError:
+ :returns: Gregorian ``(year, month, day, hour, minute, nearest_second)``.
+
+ .. warning::
+
+ When using this function to interpret the contents of a workbook, you
+ should pass in the :attr:`~xlrd.book.Book.datemode`
+ attribute of that workbook. Whether the workbook has ever been anywhere
+ near a Macintosh is irrelevant.
+
+ .. admonition:: Special case
+
+ If ``0.0 <= xldate < 1.0``, it is assumed to represent a time;
+ ``(0, 0, 0, hour, minute, second)`` will be returned.
+
+ .. note::
+
+ ``1904-01-01`` is not regarded as a valid date in the ``datemode==1``
+ system; its "serial number" is zero.
+ """
if datemode not in (0, 1):
raise XLDateBadDatemode(datemode)
if xldate == 0.00:
@@ -97,16 +127,15 @@ def xldate_as_tuple(xldate, datemode):
return ((yreg // 1461) - 4716, mp + 3, d, hour, minute, second)
-##
-# Convert an Excel date/time number into a datetime.datetime object.
-#
-# @param xldate The Excel number
-# @param datemode 0: 1900-based, 1: 1904-based.
-#
-# @return a datetime.datetime() object.
-#
def xldate_as_datetime(xldate, datemode):
- """Convert an Excel date/time number into a datetime.datetime object."""
+ """
+ Convert an Excel date/time number into a :class:`datetime.datetime` object.
+
+ :param xldate: The Excel number
+ :param datemode: 0: 1900-based, 1: 1904-based.
+
+ :returns: A :class:`datetime.datetime` object.
+ """
# Set the epoch based on the 1900/1904 datemode.
if datemode:
@@ -140,19 +169,21 @@ def _leap(y):
_days_in_month = (None, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)
-##
-# Convert a date tuple (year, month, day) to an Excel date.
-# @param year Gregorian year.
-# @param month 1 <= month <= 12
-# @param day 1 <= day <= last day of that (year, month)
-# @param datemode 0: 1900-based, 1: 1904-based.
-# @throws XLDateAmbiguous The 1900 leap-year problem (datemode == 0 and 1.0 <= xldate < 61.0)
-# @throws XLDateBadDatemode datemode arg is neither 0 nor 1
-# @throws XLDateBadTuple (year, month, day) is too early/late or has invalid component(s)
-# @throws XLDateError Covers the specific errors
def xldate_from_date_tuple(date_tuple, datemode):
- """Create an excel date from a tuple of (year, month, day)"""
+ """
+ Convert a date tuple (year, month, day) to an Excel date.
+
+ :param year: Gregorian year.
+ :param month: ``1 <= month <= 12``
+ :param day: ``1 <= day <= last day of that (year, month)``
+ :param datemode: 0: 1900-based, 1: 1904-based.
+ :raises xlrd.xldate.XLDateAmbiguous:
+ :raises xlrd.xldate.XLDateBadDatemode:
+ :raises xlrd.xldate.XLDateBadTuple:
+ ``(year, month, day)`` is too early/late or has invalid component(s)
+ :raises xlrd.xldate.XLDateError:
+ """
year, month, day = date_tuple
if datemode not in (0, 1):
@@ -165,8 +196,8 @@ def xldate_from_date_tuple(date_tuple, datemode):
raise XLDateBadTuple("Invalid year: %r" % ((year, month, day),))
if not (1 <= month <= 12):
raise XLDateBadTuple("Invalid month: %r" % ((year, month, day),))
- if day < 1 \
- or (day > _days_in_month[month] and not(day == 29 and month == 2 and _leap(year))):
+ if (day < 1 or
+ (day > _days_in_month[month] and not(day == 29 and month == 2 and _leap(year)))):
raise XLDateBadTuple("Invalid day: %r" % ((year, month, day),))
Yp = year + 4716
@@ -185,29 +216,33 @@ def xldate_from_date_tuple(date_tuple, datemode):
raise XLDateAmbiguous("Before 1900-03-01: %r" % ((year, month, day),))
return float(xldays)
-##
-# Convert a time tuple (hour, minute, second) to an Excel "date" value (fraction of a day).
-# @param hour 0 <= hour < 24
-# @param minute 0 <= minute < 60
-# @param second 0 <= second < 60
-# @throws XLDateBadTuple Out-of-range hour, minute, or second
def xldate_from_time_tuple(time_tuple):
- """Create an excel date from a tuple of (hour, minute, second)"""
+ """
+ Convert a time tuple ``(hour, minute, second)`` to an Excel "date" value
+ (fraction of a day).
+
+ :param hour: ``0 <= hour < 24``
+ :param minute: ``0 <= minute < 60``
+ :param second: ``0 <= second < 60``
+ :raises xlrd.xldate.XLDateBadTuple: Out-of-range hour, minute, or second
+ """
hour, minute, second = time_tuple
if 0 <= hour < 24 and 0 <= minute < 60 and 0 <= second < 60:
return ((second / 60.0 + minute) / 60.0 + hour) / 24.0
raise XLDateBadTuple("Invalid (hour, minute, second): %r" % ((hour, minute, second),))
-##
-# Convert a datetime tuple (year, month, day, hour, minute, second) to an Excel date value.
-# For more details, refer to other xldate_from_*_tuple functions.
-# @param datetime_tuple (year, month, day, hour, minute, second)
-# @param datemode 0: 1900-based, 1: 1904-based.
def xldate_from_datetime_tuple(datetime_tuple, datemode):
+ """
+ Convert a datetime tuple ``(year, month, day, hour, minute, second)`` to an
+ Excel date value.
+ For more details, refer to other xldate_from_*_tuple functions.
+
+ :param datetime_tuple: ``(year, month, day, hour, minute, second)``
+ :param datemode: 0: 1900-based, 1: 1904-based.
+ """
return (
- xldate_from_date_tuple(datetime_tuple[:3], datemode)
- +
+ xldate_from_date_tuple(datetime_tuple[:3], datemode) +
xldate_from_time_tuple(datetime_tuple[3:])
- )
+ )
diff --git a/SUEWSPrepare/Modules/xlrd/xlsx.py b/SUEWSPrepare/Modules/xlrd/xlsx.py
index 3c036de..fa1547b 100644
--- a/SUEWSPrepare/Modules/xlrd/xlsx.py
+++ b/SUEWSPrepare/Modules/xlrd/xlsx.py
@@ -5,15 +5,21 @@
from __future__ import print_function, unicode_literals
-DEBUG = 0
-
-import sys
import re
-from .timemachine import *
+import sys
+from os.path import join, normpath
+
+from .biffh import (
+ XL_CELL_BLANK, XL_CELL_BOOLEAN, XL_CELL_ERROR, XL_CELL_TEXT, XLRDError,
+ error_text_from_code,
+)
from .book import Book, Name
-from .biffh import error_text_from_code, XLRDError, XL_CELL_BLANK, XL_CELL_TEXT, XL_CELL_BOOLEAN, XL_CELL_ERROR
-from .formatting import is_date_format_string, Format, XF
+from .formatting import XF, Format, is_date_format_string
from .sheet import Sheet
+from .timemachine import *
+
+DEBUG = 0
+
DLF = sys.stdout # Default Log File
@@ -27,20 +33,22 @@ def ensure_elementtree_imported(verbosity, logfile):
return
if "IronPython" in sys.version:
import xml.etree.ElementTree as ET
- #### 2.7.2.1: fails later with
+ #### 2.7.2.1: fails later with
#### NotImplementedError: iterparse is not supported on IronPython. (CP #31923)
else:
- try: import xml.etree.cElementTree as ET
+ try: import defusedxml.cElementTree as ET
except ImportError:
- try: import cElementTree as ET
+ try: import xml.etree.cElementTree as ET
except ImportError:
- try: import lxml.etree as ET
+ try: import cElementTree as ET
except ImportError:
- try: import xml.etree.ElementTree as ET
+ try: import lxml.etree as ET
except ImportError:
- try: import elementtree.ElementTree as ET
+ try: import xml.etree.ElementTree as ET
except ImportError:
- raise Exception("Failed to import an ElementTree implementation")
+ try: import elementtree.ElementTree as ET
+ except ImportError:
+ raise Exception("Failed to import an ElementTree implementation")
if hasattr(ET, 'iterparse'):
_dummy_stream = BYTES_IO(b'')
try:
@@ -48,15 +56,15 @@ def ensure_elementtree_imported(verbosity, logfile):
ET_has_iterparse = True
except NotImplementedError:
pass
- Element_has_iter = hasattr(ET.ElementTree, 'iter')
+ Element_has_iter = hasattr(ET, 'ElementTree') and hasattr(ET.ElementTree, 'iter')
if verbosity:
etree_version = repr([
(item, getattr(ET, item))
for item in ET.__dict__.keys()
if item.lower().replace('_', '') == 'version'
- ])
+ ])
print(ET.__file__, ET.__name__, etree_version, ET_has_iterparse, file=logfile)
-
+
def split_tag(tag):
pos = tag.rfind('}') + 1
if pos >= 2:
@@ -75,7 +83,8 @@ def augment_keys(adict, uri):
_UPPERCASE_1_REL_INDEX[_x] = 0
del _x
-def cell_name_to_rowx_colx(cell_name, letter_value=_UPPERCASE_1_REL_INDEX):
+def cell_name_to_rowx_colx(cell_name, letter_value=_UPPERCASE_1_REL_INDEX,
+ allow_no_col=False):
# Extract column index from cell name
# A => 0, Z =>25, AA => 26, XFD => 16383
colx = 0
@@ -87,9 +96,18 @@ def cell_name_to_rowx_colx(cell_name, letter_value=_UPPERCASE_1_REL_INDEX):
if lv:
colx = colx * 26 + lv
else: # start of row number; can't be '0'
- colx = colx - 1
- assert 0 <= colx < X12_MAX_COLS
- break
+ if charx == 0:
+ # there was no col marker
+ if allow_no_col:
+ colx = None
+ break
+ else:
+ raise Exception(
+ 'Missing col in cell name %r', cell_name)
+ else:
+ colx = colx - 1
+ assert 0 <= colx < X12_MAX_COLS
+ break
except KeyError:
raise Exception('Unexpected character %r in cell name %r' % (c, cell_name))
rowx = int(cell_name[charx:]) - 1
@@ -116,9 +134,8 @@ def cell_name_to_rowx_colx(cell_name, letter_value=_UPPERCASE_1_REL_INDEX):
IS_TAG = U_SSML12 + 'is' # cell child: inline string
def unescape(s,
- subber=re.compile(r'_x[0-9A-Fa-f]{4,4}_', re.UNICODE).sub,
- repl=lambda mobj: unichr(int(mobj.group(0)[2:6], 16)),
- ):
+ subber=re.compile(r'_x[0-9A-Fa-f]{4,4}_', re.UNICODE).sub,
+ repl=lambda mobj: unichr(int(mobj.group(0)[2:6], 16))):
if "_" in s:
return subber(repl, s)
return s
@@ -209,7 +226,7 @@ def cnv_xsd_boolean(s):
("", "option_flags", 0, ),
("", "result", None, ),
("", "stack", None, ),
- )
+)
def make_name_access_maps(bk):
name_and_scope_map = {} # (name.lower(), scope): Name_object
@@ -284,7 +301,7 @@ def __init__(self, bk, logfile=DLF, verbosity=False):
U_DC+"creator": ("creator", cnv_ST_Xstring),
U_DCTERMS+"modified": ("modified", cnv_ST_Xstring),
U_DCTERMS+"created": ("created", cnv_ST_Xstring),
- }
+ }
def process_coreprops(self, stream):
if self.verbosity >= 2:
@@ -306,6 +323,10 @@ def process_coreprops(self, stream):
fprintf(self.logfile, "props: %r\n", props)
self.finish_off()
+ @staticmethod
+ def convert_filename(name):
+ return name.replace('\\', '/').lower()
+
def process_rels(self, stream):
if self.verbosity >= 2:
fprintf(self.logfile, "\n=== Relationships ===\n")
@@ -313,7 +334,7 @@ def process_rels(self, stream):
r_tag = U_PKGREL + 'Relationship'
for elem in tree.findall(r_tag):
rid = elem.get('Id')
- target = elem.get('Target')
+ target = X12Book.convert_filename(elem.get('Target'))
reltype = elem.get('Type').split('/')[-1]
if self.verbosity >= 2:
self.dumpout('Id=%r Type=%r Target=%r', rid, reltype, target)
@@ -371,8 +392,8 @@ def do_sheet(self, elem):
None: 0,
'visible': 0,
'hidden': 1,
- 'veryHidden': 2
- }
+ 'veryHidden': 2,
+ }
bk._sheet_visibility.append(visibility_map[state])
sheet = Sheet(bk, position=None, name=name, number=sheetx)
sheet.utter_max_rows = X12_MAX_ROWS
@@ -394,7 +415,7 @@ def do_workbookpr(self, elem):
'definedNames': do_defined_names,
'workbookPr': do_workbookpr,
'sheet': do_sheet,
- }
+ }
augment_keys(tag2meth, U_SSML12)
class X12SST(X12General):
@@ -407,7 +428,7 @@ def __init__(self, bk, logfile=DLF, verbosity=0):
self.process_stream = self.process_stream_iterparse
else:
self.process_stream = self.process_stream_findall
-
+
def process_stream_iterparse(self, stream, heading=None):
if self.verbosity >= 2 and heading is not None:
fprintf(self.logfile, "\n=== %s ===\n", heading)
@@ -421,7 +442,7 @@ def process_stream_iterparse(self, stream, heading=None):
fprintf(self.logfile, "element #%d\n", elemno)
self.dump_elem(elem)
result = get_text_from_si_or_is(self, elem)
- sst.append(result)
+ sst.append(result)
elem.clear() # destroy all child elements
if self.verbosity >= 2:
self.dumpout('Entries in SST: %d', len(sst))
@@ -491,10 +512,7 @@ def do_xf(self, elem):
is_date = self.fmt_is_date.get(numFmtId, 0)
self.bk._xf_index_to_xl_type_map[xfx] = is_date + 2
if self.verbosity >= 3:
- self.dumpout(
- 'xfx=%d numFmtId=%d',
- xfx, numFmtId,
- )
+ self.dumpout('xfx=%d numFmtId=%d', xfx, numFmtId)
self.dumpout(repr(self.bk._xf_index_to_xl_type_map))
tag2meth = {
@@ -502,7 +520,7 @@ def do_xf(self, elem):
'cellXfs': do_cellxfs,
'numFmt': do_numfmt,
'xf': do_xf,
- }
+ }
augment_keys(tag2meth, U_SSML12)
class X12Sheet(X12General):
@@ -514,6 +532,8 @@ def __init__(self, sheet, logfile=DLF, verbosity=0):
self.rowx = -1 # We may need to count them.
self.bk = sheet.book
self.sst = self.bk._sharedstrings
+ self.relid2path = {}
+ self.relid2reltype = {}
self.merged_cells = sheet.merged_cells
self.warned_no_cell_name = 0
self.warned_no_row_num = 0
@@ -523,7 +543,6 @@ def __init__(self, sheet, logfile=DLF, verbosity=0):
def own_process_stream(self, stream, heading=None):
if self.verbosity >= 2 and heading is not None:
fprintf(self.logfile, "\n=== %s ===\n", heading)
- getmethod = self.tag2meth.get
row_tag = U_SSML12 + "row"
self_do_row = self.do_row
for event, elem in ET.iterparse(stream):
@@ -536,6 +555,20 @@ def own_process_stream(self, stream, heading=None):
self.do_merge_cell(elem)
self.finish_off()
+ def process_rels(self, stream):
+ if self.verbosity >= 2:
+ fprintf(self.logfile, "\n=== Sheet Relationships ===\n")
+ tree = ET.parse(stream)
+ r_tag = U_PKGREL + 'Relationship'
+ for elem in tree.findall(r_tag):
+ rid = elem.get('Id')
+ target = elem.get('Target')
+ reltype = elem.get('Type').split('/')[-1]
+ if self.verbosity >= 2:
+ self.dumpout('Id=%r Type=%r Target=%r', rid, reltype, target)
+ self.relid2reltype[rid] = reltype
+ self.relid2path[rid] = normpath(join('xl/worksheets', target))
+
def process_comments_stream(self, stream):
root = ET.parse(stream).getroot()
author_list = root[0]
@@ -565,25 +598,32 @@ def do_dimension(self, elem):
if ref:
# print >> self.logfile, "dimension: ref=%r" % ref
last_cell_ref = ref.split(':')[-1] # example: "Z99"
- rowx, colx = cell_name_to_rowx_colx(last_cell_ref)
+ rowx, colx = cell_name_to_rowx_colx(
+ last_cell_ref, allow_no_col=True)
self.sheet._dimnrows = rowx + 1
- self.sheet._dimncols = colx + 1
+ if colx is not None:
+ self.sheet._dimncols = colx + 1
def do_merge_cell(self, elem):
# The ref attribute should be a cell range like "B1:D5".
ref = elem.get('ref')
if ref:
- first_cell_ref, last_cell_ref = ref.split(':')
+ try:
+ first_cell_ref, last_cell_ref = ref.split(':')
+ except ValueError:
+ # encountered a single cell merge, e.g. "B3"
+ first_cell_ref = ref
+ last_cell_ref = ref
first_rowx, first_colx = cell_name_to_rowx_colx(first_cell_ref)
last_rowx, last_colx = cell_name_to_rowx_colx(last_cell_ref)
self.merged_cells.append((first_rowx, last_rowx + 1,
first_colx, last_colx + 1))
def do_row(self, row_elem):
-
+
def bad_child_tag(child_tag):
- raise Exception('cell type %s has unexpected child <%s> at rowx=%r colx=%r' % (cell_type, child_tag, rowx, colx))
-
+ raise Exception('cell type %s has unexpected child <%s> at rowx=%r colx=%r' % (cell_type, child_tag, rowx, colx))
+
row_number = row_elem.get('r')
if row_number is None: # Yes, it's optional.
self.rowx += 1
@@ -632,7 +672,6 @@ def bad_child_tag(child_tag):
xf_index = int(cell_elem.get('s', '0'))
cell_type = cell_elem.get('t', 'n')
tvalue = None
- formula = None
if cell_type == 'n':
# n = number. Most frequent type.
# child contains plain text which can go straight into float()
@@ -642,7 +681,8 @@ def bad_child_tag(child_tag):
if child_tag == V_TAG:
tvalue = child.text
elif child_tag == F_TAG:
- formula = cooked_text(self, child)
+ # formula
+ pass
else:
raise Exception('unexpected tag %r' % child_tag)
if not tvalue:
@@ -659,7 +699,7 @@ def bad_child_tag(child_tag):
tvalue = child.text
elif child_tag == F_TAG:
# formula not expected here, but gnumeric does it.
- formula = child.text
+ pass
else:
bad_child_tag(child_tag)
if not tvalue:
@@ -678,7 +718,8 @@ def bad_child_tag(child_tag):
if child_tag == V_TAG:
tvalue = cooked_text(self, child)
elif child_tag == F_TAG:
- formula = cooked_text(self, child)
+ # formula
+ pass
else:
bad_child_tag(child_tag)
# assert tvalue is not None and formula is not None
@@ -687,61 +728,67 @@ def bad_child_tag(child_tag):
elif cell_type == "b":
# b = boolean
# child contains "0" or "1"
- # Maybe the data should be converted with cnv_xsd_boolean;
- # ECMA standard is silent; Excel 2007 writes 0 or 1
for child in cell_elem:
child_tag = child.tag
if child_tag == V_TAG:
tvalue = child.text
elif child_tag == F_TAG:
- formula = cooked_text(self, child)
+ # formula
+ pass
else:
bad_child_tag(child_tag)
- self.sheet.put_cell(rowx, colx, XL_CELL_BOOLEAN, int(tvalue), xf_index)
+ self.sheet.put_cell(rowx, colx, XL_CELL_BOOLEAN, cnv_xsd_boolean(tvalue), xf_index)
elif cell_type == "e":
# e = error
# child contains e.g. "#REF!"
+ tvalue = '#N/A'
for child in cell_elem:
child_tag = child.tag
if child_tag == V_TAG:
tvalue = child.text
elif child_tag == F_TAG:
- formula = cooked_text(self, child)
+ # formula
+ pass
else:
bad_child_tag(child_tag)
value = error_code_from_text[tvalue]
self.sheet.put_cell(rowx, colx, XL_CELL_ERROR, value, xf_index)
elif cell_type == "inlineStr":
# Not expected in files produced by Excel.
- # Only possible child is .
# It's a way of allowing 3rd party s/w to write text (including rich text) cells
# without having to build a shared string table
for child in cell_elem:
child_tag = child.tag
if child_tag == IS_TAG:
tvalue = get_text_from_si_or_is(self, child)
+ elif child_tag == V_TAG:
+ tvalue = child.text
+ elif child_tag == F_TAG:
+ # formula
+ pass
else:
bad_child_tag(child_tag)
- assert tvalue is not None
- self.sheet.put_cell(rowx, colx, XL_CELL_TEXT, tvalue, xf_index)
+ if not tvalue:
+ if self.bk.formatting_info:
+ self.sheet.put_cell(rowx, colx, XL_CELL_BLANK, '', xf_index)
+ else:
+ self.sheet.put_cell(rowx, colx, XL_CELL_TEXT, tvalue, xf_index)
else:
raise Exception("Unknown cell type %r in rowx=%d colx=%d" % (cell_type, rowx, colx))
tag2meth = {
'row': do_row,
- }
+ }
augment_keys(tag2meth, U_SSML12)
-def open_workbook_2007_xml(
- zf,
- component_names,
- logfile=sys.stdout,
- verbosity=0,
- use_mmap=0,
- formatting_info=0,
- on_demand=0,
- ragged_rows=0,
- ):
+def open_workbook_2007_xml(zf,
+ component_names,
+ logfile=sys.stdout,
+ verbosity=0,
+ use_mmap=0,
+ formatting_info=0,
+ on_demand=0,
+ ragged_rows=0):
ensure_elementtree_imported(verbosity, logfile)
bk = Book()
bk.logfile = logfile
@@ -793,11 +840,20 @@ def open_workbook_2007_xml(
heading = "Sheet %r (sheetx=%d) from %r" % (sheet.name, sheetx, fname)
x12sheet.process_stream(zflo, heading)
del zflo
- comments_fname = 'xl/comments%d.xml' % (sheetx + 1)
- if comments_fname in component_names:
- comments_stream = zf.open(component_names[comments_fname])
- x12sheet.process_comments_stream(comments_stream)
- del comments_stream
+
+ rels_fname = 'xl/worksheets/_rels/%s.rels' % fname.rsplit('/', 1)[-1]
+ if rels_fname in component_names:
+ zfrels = zf.open(rels_fname)
+ x12sheet.process_rels(zfrels)
+ del zfrels
+
+ for relid, reltype in x12sheet.relid2reltype.items():
+ if reltype == 'comments':
+ comments_fname = x12sheet.relid2path.get(relid)
+ if comments_fname and comments_fname in component_names:
+ comments_stream = zf.open(comments_fname)
+ x12sheet.process_comments_stream(comments_stream)
+ del comments_stream
sheet.tidy_dimensions()
diff --git a/SUEWSPrepare/Modules/xlutils/compat.py b/SUEWSPrepare/Modules/xlutils/compat.py
new file mode 100644
index 0000000..9de9869
--- /dev/null
+++ b/SUEWSPrepare/Modules/xlutils/compat.py
@@ -0,0 +1,16 @@
+import sys
+
+PY3 = sys.version_info[0] >= 3
+
+if PY3:
+ unicode = str
+ basestring = str
+ xrange = range
+ from io import StringIO
+ from io import BytesIO
+else:
+ unicode = unicode
+ basestring = basestring
+ xrange = xrange
+ from StringIO import StringIO
+ from StringIO import StringIO as BytesIO
diff --git a/SUEWSPrepare/Modules/xlutils/filter.py b/SUEWSPrepare/Modules/xlutils/filter.py
index 56843c4..fd7047c 100644
--- a/SUEWSPrepare/Modules/xlutils/filter.py
+++ b/SUEWSPrepare/Modules/xlutils/filter.py
@@ -3,6 +3,7 @@
# This Software is released under the MIT License:
# http://www.opensource.org/licenses/mit-license.html
# See license.txt for more details.
+from __future__ import print_function
import logging
import os
@@ -15,6 +16,9 @@
from xlutils.display import quoted_sheet_name,cell_display
from xlutils.margins import cells_all_junk
from xlwt.Style import default_style
+from .compat import xrange
+
+
logger = logging.getLogger('xlutils.filter')
class BaseReader:
@@ -622,7 +626,7 @@ def get_stream(self,filename):
Returns a stream for the file in the configured directory
with the specified name.
"""
- return file(os.path.join(self.dir_path,filename),'wb')
+ return open(os.path.join(self.dir_path, filename), 'wb')
class StreamWriter(BaseWriter):
"A writer for writing exactly one workbook to the supplied stream"
@@ -696,8 +700,8 @@ def __init__(self,name=None,methods=True):
def method(self,name,*args):
if self.name:
- print repr(self.name),
- print "%s:%r"%(name,args)
+ print(repr(self.name), end=' ')
+ print("%s:%r" % (name, args))
try:
from guppy import hpy
diff --git a/SUEWSPrepare/Modules/xlutils/margins.py b/SUEWSPrepare/Modules/xlutils/margins.py
index b875bc6..305439a 100644
--- a/SUEWSPrepare/Modules/xlutils/margins.py
+++ b/SUEWSPrepare/Modules/xlutils/margins.py
@@ -1,7 +1,10 @@
# -*- coding: ascii -*-
+from __future__ import print_function
import sys, glob, string
+from .compat import xrange, unicode
+
try:
from xlrd import open_workbook, XL_CELL_EMPTY, XL_CELL_BLANK, XL_CELL_TEXT, XL_CELL_NUMBER, cellname
null_cell_types = (XL_CELL_EMPTY, XL_CELL_BLANK)
@@ -66,8 +69,8 @@ def safe_encode(ustr, encoding):
return repr(ustr)
def check_file(fname, verbose, do_punc=False, fmt_info=0, encoding='ascii', onesheet=''):
- print
- print fname
+ print()
+ print(fname)
if do_punc:
checker = ispunc
else:
@@ -114,28 +117,32 @@ def check_file(fname, verbose, do_punc=False, fmt_info=0, encoding='ascii', ones
for rowx in xrange(sheet.nrows):
cell = sheet.cell(rowx, lastcolx)
if cell.ctype != XL_CELL_EMPTY:
- print "%s (%d, %d): type %d, value %r" % (
- cellname(rowx, lastcolx), rowx, lastcolx, cell.ctype, cell.value)
+ print("%s (%d, %d): type %d, value %r" % (
+ cellname(rowx, lastcolx),
+ rowx, lastcolx, cell.ctype, cell.value
+ ))
if (verbose
or ngoodrows != sheet.nrows
or ngoodcols != sheet.ncols
- or (verbose >= 2 and ngoodcells and sheet_density_pct < 90.0)
+ or (verbose >= 2 and sheet_density_pct < 90.0)
):
if oldncells:
pctwaste = (1.0 - float(newncells) / oldncells) * 100.0
else:
pctwaste = 0.0
shname_enc = safe_encode(sheet.name, encoding)
- print "sheet #%2d: RxC %5d x %3d => %5d x %3d; %4.1f%% waste%s (%s)" \
+ print(
+ "sheet #%2d: RxC %5d x %3d => %5d x %3d; %4.1f%% waste%s (%s)"
% (shx, sheet.nrows, sheet.ncols,
- ngoodrows, ngoodcols, pctwaste, sheet_density_pct_s, shname_enc)
+ ngoodrows, ngoodcols, pctwaste,
+ sheet_density_pct_s, shname_enc))
if hasattr(book, 'unload_sheet'):
book.unload_sheet(shx)
if totold:
pctwaste = (1.0 - float(totnew) / totold) * 100.0
else:
pctwaste = 0.0
- print "%d cells => %d cells; %4.1f%% waste" % (totold, totnew, pctwaste)
+ print("%d cells => %d cells; %4.1f%% waste" % (totold, totnew, pctwaste))
def main():
import optparse
@@ -177,7 +184,7 @@ def main():
options.formatting, encoding, options.onesheet)
except:
e1, e2 = sys.exc_info()[:2]
- print "*** File %s => %s:%s" % (fname, e1.__name__, e2)
+ print("*** File %s => %s:%s" % (fname, e1.__name__, e2))
if __name__ == "__main__":
main()
diff --git a/SUEWSPrepare/Modules/xlutils/save.py b/SUEWSPrepare/Modules/xlutils/save.py
index ed85f12..ed10f4a 100644
--- a/SUEWSPrepare/Modules/xlutils/save.py
+++ b/SUEWSPrepare/Modules/xlutils/save.py
@@ -6,6 +6,8 @@
import os
from xlutils.filter import process,XLRDReader,StreamWriter
+from .compat import basestring
+
def save(wb, filename_or_stream):
"Save the supplied :class:`xlrd.Book` to the supplied stream or filename."
diff --git a/SUEWSPrepare/Modules/xlutils/styles.py b/SUEWSPrepare/Modules/xlutils/styles.py
index 59a0222..87080dd 100644
--- a/SUEWSPrepare/Modules/xlutils/styles.py
+++ b/SUEWSPrepare/Modules/xlutils/styles.py
@@ -4,6 +4,8 @@
# http://www.opensource.org/licenses/mit-license.html
# See license.txt for more details.
+from .compat import xrange
+
class NamedStyle:
"""
An object with ``name`` and ``xf`` attributes representing
diff --git a/SUEWSPrepare/Modules/xlutils/tests/compat.py b/SUEWSPrepare/Modules/xlutils/tests/compat.py
new file mode 100644
index 0000000..19dcff9
--- /dev/null
+++ b/SUEWSPrepare/Modules/xlutils/tests/compat.py
@@ -0,0 +1,54 @@
+# Copyright (c) 2011-2013 Simplistix Ltd, 2015 Chris Withers
+# See license.txt for license details.
+
+# This module contains bits and pieces to achieve compatibility across all the
+# versions of python supported.
+
+import doctest
+import re
+import textwrap
+
+import manuel
+from manuel.codeblock import (
+ CODEBLOCK_START,
+ CODEBLOCK_END,
+ CodeBlock,
+ execute_code_block,
+ )
+
+from ..compat import PY3
+
+BYTE_LITERALS = re.compile("b((:?'.*?')|(:?\".*?\"))", re.MULTILINE)
+UNICODE_LITERALS = re.compile("u((:?'.*?')|(:?\".*?\"))", re.MULTILINE)
+
+
+def version_agnostic(text):
+ if PY3:
+ regex = UNICODE_LITERALS
+ else:
+ regex = BYTE_LITERALS
+ return regex.sub('\\1', text)
+
+
+def find_code_blocks(document):
+ for region in document.find_regions(CODEBLOCK_START, CODEBLOCK_END):
+ start_end = CODEBLOCK_START.search(region.source).end()
+ source = version_agnostic(textwrap.dedent(region.source[start_end:]))
+ source = 'from __future__ import print_function\n' + source
+ source_location = '%s:%d' % (document.location, region.lineno)
+ code = compile(source, source_location, 'exec', 0, True)
+ document.claim_region(region)
+ region.parsed = CodeBlock(code, source)
+
+
+class Manuel(manuel.Manuel):
+ def __init__(self):
+ manuel.Manuel.__init__(self, [find_code_blocks], [execute_code_block])
+
+
+class DocTestChecker(doctest.OutputChecker):
+ def check_output(self, want, got, optionflags):
+ want = version_agnostic(want)
+ return doctest.OutputChecker.check_output(
+ self, want, got, optionflags
+ )
diff --git a/SUEWSPrepare/Modules/xlutils/tests/test_docs.py b/SUEWSPrepare/Modules/xlutils/tests/test_docs.py
index c696f42..8d6b27a 100644
--- a/SUEWSPrepare/Modules/xlutils/tests/test_docs.py
+++ b/SUEWSPrepare/Modules/xlutils/tests/test_docs.py
@@ -5,17 +5,16 @@
# See license.txt for more details.
from doctest import REPORT_NDIFF, ELLIPSIS
-from fixtures import test_files
from glob import glob
from manuel import doctest
from manuel.testing import TestSuite
from testfixtures import LogCapture,TempDirectory
from os.path import dirname, join, pardir
-import os
+from . import compat
+from .fixtures import test_files
-workspace = os.environ.get('WORKSPACE', join(dirname(__file__), pardir, pardir))
-tests = glob(join(workspace, 'docs', '*.txt'))
+tests = glob(join(join(dirname(__file__), pardir, pardir), 'docs', '*.rst'))
options = REPORT_NDIFF|ELLIPSIS
@@ -29,7 +28,8 @@ def tearDown(test):
LogCapture.uninstall_all()
def test_suite():
- m = doctest.Manuel(optionflags=REPORT_NDIFF|ELLIPSIS)
+ m = doctest.Manuel(optionflags=REPORT_NDIFF | ELLIPSIS,
+ checker=compat.DocTestChecker())
return TestSuite(m, *tests,
setUp=setUp,
tearDown=tearDown)
diff --git a/SUEWSPrepare/Modules/xlutils/tests/test_filter.py b/SUEWSPrepare/Modules/xlutils/tests/test_filter.py
index c0dfa08..bbd73d8 100644
--- a/SUEWSPrepare/Modules/xlutils/tests/test_filter.py
+++ b/SUEWSPrepare/Modules/xlutils/tests/test_filter.py
@@ -7,7 +7,6 @@
# See license.txt for more details.
from mock import Mock
-from StringIO import StringIO
from tempfile import TemporaryFile
from testfixtures import compare, Comparison as C, replace, log_capture, ShouldRaise, tempdir
from unittest import TestSuite,TestCase,makeSuite
@@ -15,6 +14,8 @@
from xlrd.formatting import XF
from xlutils.filter import BaseReader,GlobReader,MethodFilter,BaseWriter,process,XLRDReader,XLWTWriter, BaseFilter
from xlutils.tests.fixtures import test_files,test_xls_path,make_book,make_sheet,DummyBook
+from ..compat import StringIO, PY3
+from .compat import version_agnostic as va
import os
@@ -248,7 +249,10 @@ def setUp(self):
self.called = []
def test_cmp(self):
- cmp(MethodFilter(),OurMethodFilter([]))
+ if PY3:
+ MethodFilter() == OurMethodFilter([])
+ else:
+ cmp(MethodFilter(), OurMethodFilter([]))
def do_calls_and_test(self,filter):
filter.next = tf = Mock()
@@ -391,6 +395,7 @@ def setUp(self):
@replace('xlutils.filter.guppy',True)
@replace('xlutils.filter.hpy',Mock(),strict=False)
def test_method(self,hpy):
+ # XXX what are we logging?
self.filter.method('name','foo',1)
# hpy().heap().stat.dump('somepath')
compare(hpy.call_args_list,[((),{})])
@@ -449,8 +454,12 @@ def test_set_rdsheet_1(self,h):
f.finish()
compare(c.method_calls,[])
h.check(
- ('xlutils.filter','ERROR',"Cell A1 of sheet 'Sheet2' contains a bad value: error (#NULL!)"),
- ('xlutils.filter','ERROR','No output as errors have occurred.'),
+ ('xlutils.filter',
+ 'ERROR',
+ va("Cell A1 of sheet b'Sheet2' contains a bad value: error (#NULL!)")),
+ ('xlutils.filter',
+ 'ERROR',
+ 'No output as errors have occurred.'),
)
@log_capture()
@@ -540,7 +549,7 @@ def test_start(self,d):
f.temp_path = d.path
f.prefix = 'junk'
j = open(os.path.join(d.path,'junk.xls'),'wb')
- j.write('junk')
+ j.write(b'junk')
j.close()
f.start()
@@ -698,8 +707,8 @@ def test_use_write_sheet_name_in_logging(self,h):
h.check((
'xlutils.filter',
'DEBUG',
- "Number of columns trimmed from 2 to 1 for sheet 'new'"
- ))
+ va("Number of columns trimmed from 2 to 1 for sheet b'new'")
+ ))
@log_capture()
def test_multiple_books(self,h):
@@ -1049,7 +1058,7 @@ def test_single_workbook_with_all_features(self):
w = TestWriter()
r(w)
# check stuff on the writer
- self.assertEqual(w.files.keys(),['testall.xls'])
+ compare(w.files.keys(), expected=['testall.xls'])
self.failUnless('testall.xls' in w.closed)
self.check_file(w,test_xls_path)
@@ -1083,7 +1092,7 @@ def test_single_workbook_no_formatting(self):
w = TestWriter()
r(w)
# check stuff on the writer
- self.assertEqual(w.files.keys(),['testnoformatting.xls'])
+ compare(w.files.keys(), expected=['testnoformatting.xls'])
self.failUnless('testnoformatting.xls' in w.closed)
self.check_file(w,test_xls_path,
l_a_xf_list=17,
@@ -1099,7 +1108,10 @@ def test_multiple_workbooks(self):
w = TestWriter()
r(w)
# check stuff on the writer
- self.assertEqual(w.files.keys(),['test.xls','testnoformatting.xls','testall.xls'])
+ compare(
+ sorted(w.files.keys()),
+ expected=['test.xls', 'testall.xls', 'testnoformatting.xls']
+ )
self.failUnless('test.xls' in w.closed)
self.failUnless('testall.xls' in w.closed)
self.failUnless('testnoformatting.xls' in w.closed)
@@ -1160,7 +1172,7 @@ def test_set_rd_sheet(self):
w.cell(1,0,3,0)
w.finish()
# check everything got written and closed
- self.assertEqual(w.files.keys(),['new.xls'])
+ compare(w.files.keys(), expected=['new.xls'])
self.failUnless('new.xls' in w.closed)
# now check the cells written
f = w.files['new.xls'].file
@@ -1202,7 +1214,7 @@ def test_max_length_sheet_name(self):
)
w = TestWriter()
r(w)
- self.assertEqual(w.files.keys(),['test.xls'])
+ compare(w.files.keys(), expected=['test.xls'])
f = w.files['test.xls'].file
a = open_workbook(file_contents=f.read(), formatting_info=1)
self.assertEqual(a.sheet_names(),[name])
@@ -1226,7 +1238,7 @@ def test_panes(self):
w = TestWriter()
r(w)
- self.assertEqual(w.files.keys(),['test.xls'])
+ compare(w.files.keys(), expected=['test.xls'])
f = w.files['test.xls'].file
a = open_workbook(file_contents=f.read(),formatting_info=1)
sheet = a.sheet_by_index(0)
@@ -1259,7 +1271,7 @@ def test_splits(self):
w = TestWriter()
r(w)
- self.assertEqual(w.files.keys(),['test.xls'])
+ compare(w.files.keys(), expected=['test.xls'])
f = w.files['test.xls'].file
a = open_workbook(file_contents=f.read(),formatting_info=1)
sheet = a.sheet_by_index(0)
@@ -1286,7 +1298,7 @@ def test_zoom_factors(self):
w = TestWriter()
r(w)
- self.assertEqual(w.files.keys(),['test.xls'])
+ compare(w.files.keys(), expected=['test.xls'])
f = w.files['test.xls'].file
a = open_workbook(file_contents=f.read(),formatting_info=1)
sheet = a.sheet_by_index(0)
@@ -1311,7 +1323,7 @@ def test_copy_error_cells(self):
)
w = TestWriter()
r(w)
- self.assertEqual(w.files.keys(),['test.xls'])
+ compare(w.files.keys(), expected=['test.xls'])
a = open_workbook(file_contents=w.files['test.xls'].file.read())
cell = a.sheet_by_index(0).cell(0,0)
self.assertEqual(cell.ctype,XL_CELL_ERROR)
@@ -1323,7 +1335,7 @@ def test_copy_boolean_cells(self):
)
w = TestWriter()
r(w)
- self.assertEqual(w.files.keys(),['test.xls'])
+ compare(w.files.keys(), expected=['test.xls'])
a = open_workbook(file_contents=w.files['test.xls'].file.read())
cell = a.sheet_by_index(0).cell(0,0)
self.assertEqual(cell.ctype,XL_CELL_BOOLEAN)
diff --git a/SUEWSPrepare/Modules/xlutils/tests/test_save.py b/SUEWSPrepare/Modules/xlutils/tests/test_save.py
index eac8847..bd730c5 100644
--- a/SUEWSPrepare/Modules/xlutils/tests/test_save.py
+++ b/SUEWSPrepare/Modules/xlutils/tests/test_save.py
@@ -6,9 +6,8 @@
import os
from mock import Mock
-from shutil import rmtree
-from StringIO import StringIO
-from tempfile import mkdtemp,TemporaryFile
+from ..compat import StringIO
+from tempfile import TemporaryFile
from testfixtures import replace,tempdir
from unittest import TestSuite,TestCase,makeSuite
from xlutils.save import save
@@ -34,10 +33,9 @@ def test_save_path(self,c,d):
w = args[1]
self.failUnless(isinstance(w,StreamWriter))
f = w.stream
- self.failUnless(isinstance(f,file))
- self.assertEqual(f.name,path)
- self.assertEqual(f.mode,'wb')
- self.assertEqual(f.closed,True)
+ self.assertEqual(f.name, path)
+ self.assertEqual(f.mode, 'wb')
+ self.assertEqual(f.closed, True)
@replace('xlutils.save.process',Mock())
def test_save_stringio(self,c):
diff --git a/SUEWSPrepare/Modules/xlutils/tests/test_styles.py b/SUEWSPrepare/Modules/xlutils/tests/test_styles.py
index 0eae042..fdb0b04 100644
--- a/SUEWSPrepare/Modules/xlutils/tests/test_styles.py
+++ b/SUEWSPrepare/Modules/xlutils/tests/test_styles.py
@@ -3,9 +3,8 @@
# This Software is released under the MIT License:
# http://www.opensource.org/licenses/mit-license.html
# See license.txt for more details.
-
from mock import Mock
-from testfixtures import should_raise
+from testfixtures import ShouldRaise
from unittest import TestSuite,TestCase,makeSuite
from xlutils.styles import Styles
@@ -45,17 +44,9 @@ def test_multiple_names_for_xfi_bad_1(self):
'A':(0,0),
'B':(0,0),
}
- styles = should_raise(Styles,AssertionError)
- styles(self.wb)
-
- def test_multiple_names_for_xfi_bad_2(self):
- self.wb.style_name_map = {
- 'A':(0,0),
- '':(0,0),
- }
- styles = should_raise(Styles,AssertionError)
- styles(self.wb)
-
+ with ShouldRaise(AssertionError()):
+ Styles(self.wb)
+
def test_suite():
return TestSuite((
makeSuite(TestStyles),
diff --git a/SUEWSPrepare/Modules/xlutils/tests/test_view.py b/SUEWSPrepare/Modules/xlutils/tests/test_view.py
index f76cc8e..5dc7da7 100644
--- a/SUEWSPrepare/Modules/xlutils/tests/test_view.py
+++ b/SUEWSPrepare/Modules/xlutils/tests/test_view.py
@@ -11,6 +11,8 @@
from xlutils.view import View, Row, Col, CheckerView
from xlutils.tests.fixtures import test_files
+from .compat import PY3
+
class Check(object):
@@ -156,8 +158,44 @@ def test_matches(self):
def test_does_not_match(self):
- with ShouldRaise(AssertionError('''\
-Sequence not as expected:
+ with ShouldRaise(AssertionError) as s:
+ CheckerView(path.join(test_files,'testall.xls'))['Sheet1'].compare(
+ (u'R0C0', u'R0C1'),
+ (u'R1C0', u'R1C1'),
+ (u'A merged cell', ''),
+ ('', ''),
+ ('', ''),
+ (u'More merged cells', 'XX')
+ )
+
+ if PY3:
+ expected="""\
+sequence not as expected:
+
+same:
+(('R0C0', 'R0C1'), ('R1C0', 'R1C1'), ('A merged cell', ''), ('', ''), ('', ''))
+
+expected:
+(('More merged cells', 'XX'),)
+
+actual:
+(('More merged cells', ''),)
+
+While comparing [5]: sequence not as expected:
+
+same:
+('More merged cells',)
+
+expected:
+('XX',)
+
+actual:
+('',)
+
+While comparing [5][1]: 'XX' (expected) != '' (actual)"""
+ else:
+ expected='''\
+sequence not as expected:
same:
((u'R0C0', u'R0C1'),
@@ -166,16 +204,23 @@ def test_does_not_match(self):
('', ''),
('', ''))
-first:
+expected:
((u'More merged cells', 'XX'),)
-second:
-((u'More merged cells', ''),)''')):
- CheckerView(path.join(test_files,'testall.xls'))['Sheet1'].compare(
- (u'R0C0', u'R0C1'),
- (u'R1C0', u'R1C1'),
- (u'A merged cell', ''),
- ('', ''),
- ('', ''),
- (u'More merged cells', 'XX')
- )
+actual:
+((u'More merged cells', u''),)
+
+While comparing [5]: sequence not as expected:
+
+same:
+(u'More merged cells',)
+
+expected:
+('XX',)
+
+actual:
+(u'',)
+
+While comparing [5][1]: 'XX' (expected) != u'' (actual)'''
+
+ compare(expected, actual=str(s.raised))
diff --git a/SUEWSPrepare/Modules/xlutils/version.txt b/SUEWSPrepare/Modules/xlutils/version.txt
index 943f9cb..227cea2 100644
--- a/SUEWSPrepare/Modules/xlutils/version.txt
+++ b/SUEWSPrepare/Modules/xlutils/version.txt
@@ -1 +1 @@
-1.7.1
+2.0.0
diff --git a/SUEWSPrepare/Modules/xlutils/view.py b/SUEWSPrepare/Modules/xlutils/view.py
index a09638f..277dd81 100644
--- a/SUEWSPrepare/Modules/xlutils/view.py
+++ b/SUEWSPrepare/Modules/xlutils/view.py
@@ -8,6 +8,8 @@
from xlrd import open_workbook, XL_CELL_DATE, xldate_as_tuple
from xlwt.Utils import col_by_name
+from .compat import xrange
+
class Index(object):
def __init__(self, name):
self.name = name
@@ -139,7 +141,7 @@ def compare(self, *expected):
# late import in case testfixtures isn't around!
from testfixtures import compare as _compare
- _compare(expected, tuple(actual))
+ _compare(expected, actual=tuple(actual))
class CheckerView(View):
"""
diff --git a/SUEWSPrepare/Modules/xlwt/Autofit.py b/SUEWSPrepare/Modules/xlwt/Autofit.py
deleted file mode 100644
index 910f0c4..0000000
--- a/SUEWSPrepare/Modules/xlwt/Autofit.py
+++ /dev/null
@@ -1,484 +0,0 @@
-# -*- coding: windows-1252 -*-
-
-#-------------------------------------------------------------------------------
-# Name: Autofit
-# Purpose: Emulates the render-time function to 'Autofit Selection' the column width to the data it contains
-#
-# Author: Warwick Prince warwickp@mushroomsys.com
-#
-# Created: 30/01/12 9:15 AM
-# Copyright: (c) 2012 Mushroom Systems International Pty. Ltd.
-# Licence: You are free to use this code in any way you see fit - but you must retain this license message
-#-------------------------------------------------------------------------------
-#!/usr/bin/env python
-
-import xlwt.Formatting as Formatting
-from xlwt.Worksheet import Worksheet
-
-class TempWorkbook(object):
- """
- Used as a holder for some copies of critical dicts that we need to reverse key for our needs
- """
-
- def locateAFFont(self, font):
- """
- Using the Formatting.Font supplied, look up an appropriate AFFont (AutoFit Font) handler
- """
-
- fontName = 'AFFont%s' % font.name.replace(' ', '_')
-
- # Look in font cache
- if fontName not in self.fontCache:
- # Do we support this font? If not, use the base handler
- cachedFont = globals().get(fontName, AFFont)
-
- # Add to cache
- self.fontCache[fontName] = cachedFont()
-
- return self.fontCache[fontName]
-
-class AFFont(object):
- """
- Base Autofit Font class (Arial). Extend this for each specific Font supported
- """
-
- # Gutter width to add on the end of the content - treat as "right hand padding'
- AUTOFIT_GUTTER = 255
- # Adjust this to factor the width against Arial. i.e. 50 means that this font is half the width of Arial at the same font size
- # This is only used when the new font is a direct relationship to Arial. For others, a new AUTOFIT_CHAR_MAP is required - this can
- # be generated using CreateLearningSheet and GenerateAFFont.
- AUTOFIT_FONT_FACTOR = 100.00
-
- # Paste in the character mapping created by 'GenerateAFFont' here
- AUTOFIT_CHAR_MAP = {' ': [(134.6, 0.2724), (134.6, 0.2724)],
- '!': [(134.6, 0.2724), (155.9, 0.2292)],
- '"': [(164.4, 0.2114), (215.6, 0.2114)],
- '#': [(249.8, 0.1872), (249.8, 0.1872)],
- '$': [(249.8, 0.1872), (249.8, 0.1872)],
- '%': [(394.8, 0.22), (394.8, 0.2284)],
- '&': [(301.0, 0.2554), (322.3, 0.212)],
- "'": [(96.2, 0.2554), (113.2, 0.1944)],
- '(': [(155.9, 0.2292), (155.9, 0.2292)],
- ')': [(155.9, 0.2292), (155.9, 0.2292)],
- '*': [(181.5, 0.2548), (181.5, 0.2548)],
- '+': [(266.8, 0.2882), (266.8, 0.2882)],
- ',': [(134.6, 0.2724), (134.6, 0.2724)],
- '-': [(155.9, 0.2292), (155.9, 0.2292)],
- '.': [(134.6, 0.2724), (134.6, 0.2724)],
- '/': [(134.6, 0.2724), (134.6, 0.2724)],
- '0': [(249.8, 0.1872), (249.8, 0.1872)],
- '1': [(224.2, 0.3066), (228.4, 0.2284)],
- '2': [(249.8, 0.1872), (249.8, 0.1872)],
- '3': [(249.8, 0.1872), (249.8, 0.1872)],
- '4': [(249.8, 0.1872), (249.8, 0.1872)],
- '5': [(249.8, 0.1872), (249.8, 0.1872)],
- '6': [(249.8, 0.1872), (249.8, 0.1872)],
- '7': [(249.8, 0.1872), (249.8, 0.1872)],
- '8': [(249.8, 0.1872), (249.8, 0.1872)],
- '9': [(249.8, 0.1872), (249.8, 0.1872)],
- ':': [(134.6, 0.2724), (155.9, 0.2292)],
- ';': [(134.6, 0.2724), (155.9, 0.2292)],
- '<': [(266.8, 0.2882), (266.8, 0.2882)],
- '=': [(266.8, 0.2882), (266.8, 0.2882)],
- '>': [(266.8, 0.2882), (266.8, 0.2882)],
- '?': [(249.8, 0.1872), (275.4, 0.2298)],
- '@': [(450.3, 0.2462), (433.2, 0.254)],
- 'A': [(301.0, 0.2554), (322.3, 0.212)],
- 'B': [(301.0, 0.2554), (322.3, 0.212)],
- 'C': [(322.3, 0.212), (322.3, 0.212)],
- 'D': [(322.3, 0.212), (322.3, 0.212)],
- 'E': [(301.0, 0.2554), (301.0, 0.2554)],
- 'F': [(275.4, 0.2298), (275.4, 0.2298)],
- 'G': [(347.9, 0.2376), (347.9, 0.2376)],
- 'H': [(322.3, 0.212), (322.3, 0.212)],
- 'I': [(134.6, 0.2724), (134.6, 0.2724)],
- 'J': [(228.4, 0.2456), (249.8, 0.1872)],
- 'K': [(301.0, 0.2554), (322.3, 0.212)],
- 'L': [(249.8, 0.1872), (275.4, 0.2298)],
- 'M': [(369.2, 0.1944), (369.2, 0.1944)],
- 'N': [(322.3, 0.212), (322.3, 0.212)],
- 'O': [(347.9, 0.2376), (347.9, 0.2376)],
- 'P': [(301.0, 0.2554), (301.0, 0.2554)],
- 'Q': [(347.9, 0.2376), (347.9, 0.2376)],
- 'R': [(322.3, 0.212), (322.3, 0.212)],
- 'S': [(301.0, 0.2554), (301.0, 0.2554)],
- 'T': [(275.4, 0.2298), (275.4, 0.2212)],
- 'U': [(322.3, 0.212), (322.3, 0.212)],
- 'V': [(301.0, 0.2554), (301.0, 0.2554)],
- 'W': [(420.4, 0.254), (420.4, 0.2626)],
- 'X': [(296.7, 0.178), (301.0, 0.2554)],
- 'Y': [(301.0, 0.2554), (301.0, 0.2554)],
- 'Z': [(275.4, 0.2298), (275.4, 0.2298)],
- 'a': [(249.8, 0.1872), (249.8, 0.1872)],
- 'b': [(249.8, 0.1872), (275.4, 0.2298)],
- 'c': [(228.4, 0.2456), (249.8, 0.1872)],
- 'd': [(249.8, 0.1872), (275.4, 0.2298)],
- 'e': [(249.8, 0.1872), (249.8, 0.1872)],
- 'f': [(126.0, 0.254), (155.9, 0.2292)],
- 'g': [(249.8, 0.1872), (275.4, 0.2298)],
- 'h': [(249.8, 0.1872), (275.4, 0.2298)],
- 'i': [(109.0, 0.2384), (134.6, 0.2724)],
- 'j': [(109.0, 0.2384), (134.6, 0.2724)],
- 'k': [(228.4, 0.2456), (249.8, 0.1872)],
- 'l': [(109.0, 0.2384), (134.6, 0.2724)],
- 'm': [(373.5, 0.2804), (394.8, 0.22)],
- 'n': [(249.8, 0.1872), (275.4, 0.2298)],
- 'o': [(249.8, 0.1872), (275.4, 0.2298)],
- 'p': [(249.8, 0.1872), (275.4, 0.2298)],
- 'q': [(249.8, 0.1872), (275.4, 0.2298)],
- 'r': [(155.9, 0.2292), (181.5, 0.2548)],
- 's': [(228.4, 0.2456), (249.8, 0.1872)],
- 't': [(134.6, 0.2724), (155.9, 0.2292)],
- 'u': [(249.8, 0.1872), (275.4, 0.2298)],
- 'v': [(228.4, 0.237), (249.8, 0.1872)],
- 'w': [(322.3, 0.212), (347.9, 0.2376)],
- 'x': [(228.4, 0.237), (249.8, 0.1872)],
- 'y': [(228.4, 0.2456), (249.8, 0.1872)],
- 'z': [(228.4, 0.2456), (228.4, 0.2456)]}
-
- def measureText(self, text, xlwtFont):
- """
- Returns the best estimate at the actual width of the text supplied, given the font and size etc.
- """
-
- # How does it work?
- # Using the sample sheet of every supported char, measurements were taken of 10 chars and 100 char samples
- # in both normal and bolded text. Then, various factors were calculated and stored in a character map for the
- # given font. Excel has some strange rendering behaviour.. The width is not directly proportional to the number
- # of letters in a given string. e.g. The width of 100 'A's is not equal to 10 x the width of 10 'A's. This makes things a
- # little more complicated. I calculated a general "creep factor' which is the amount the apparent letter size
- # changes given the number of them there are in a string. This is calculated by comparisons of 10 and 100 of the same
- # letter. The creep factor is then included in the calc for each letter in the text being measured. Not perfect, but
- # pretty damn close! :-)
-
- width = 0
-
- # Map to use the 0th or 1st element of the widths list, based on bold True or False bold attribute of font
- useWidth = {False:0, True:1}.get(xlwtFont.bold, 0)
-
- # Iterate over the text, looking up it's width and adjusting for it's position in the overall length (creep)
- for count, letter in enumerate(text):
- width10, creepFactor = self.AUTOFIT_CHAR_MAP.get(letter, self.AUTOFIT_CHAR_MAP['W'])[useWidth]
- widthThisLetter = width10 - (count * creepFactor)
- width += widthThisLetter
-
- # Factoring for "Arial" -> "MyFont" transforms
- width *= (self.AUTOFIT_FONT_FACTOR / 100.00)
-
- # Height adjustment factor is the base font size of 10 (stored as 200) So if it's 20 (400) its 400/200 times the size i.e. 2
- width *= (xlwtFont.height / 200.00)
-
- # Finally, add the gutter width on the end
- width += self.AUTOFIT_GUTTER
-
- return round(width, 0)
-
-class AFFontArial(AFFont):
- """
- Specific support for Arial Font
- """
-
- # Note - All the values in the base font are set for Arial, so I don't need to do anything here. Simply overload the values
- # that you need to change here
- pass
-
-def Autofit(sheet, fromRowx=0, toRowx=-1, fromColx=0, toColx=-1, emptyCellsAreZero=True):
-
- """
- Performs a best-efforts auto fit on the column(s) and row(s) provided.
-
- emptyCellsAreZero tells the autofit logic to treat empty as 0 width. Set to false to treat empty as default to standard column width
-
- Row and column ranges can be supplied, however, leaving them all as default will autofit the entire sheet.
-
- """
-
- assert isinstance(sheet, Worksheet), 'Sheet must be a Workbook.Worksheet instance!'
-
- # Set some defaults if open ranges supplied
- if toRowx == -1:
- toRowx = sheet.last_used_row
- if toColx == -1:
- toColx = sheet.last_used_col
-
- assert 0 <= fromColx <= sheet.last_used_col, 'FromColX out of bounds. 0 - %d' % sheet.last_used_col
- assert 0 <= toColx <= sheet.last_used_col, 'ToColX out of bounds. 0 - %d' % sheet.last_used_col
- assert 0 <= fromRowx <= sheet.last_used_row, 'FromRowX out of bounds. 0 - %d' % sheet.last_used_row
- assert 0 <= toRowx <= sheet.last_used_row, 'ToRowX out of bounds. 0 - %d' % sheet.last_used_row
- assert fromColx <= toColx, 'ToColx must be <= FromColx'
- assert fromRowx <= toRowx, 'ToRowx must be <= FromRowx'
-
- workBook = sheet._Worksheet__parent
- styles = workBook._Workbook__styles
-
- # As we need to search a number of dicts that are keyed in the *wrong way* for our needs, we will create copies here temporarily to
- # speed things up. They are stored 'A':1 when I need to locate key 1 - so they are transformed to 1:'A'
- # Note: If this causes memory issues on very large sheets, then it could be changed to search on the original dicts - it would
- # just be a LOT slower.
-
- tempWB = TempWorkbook()
-
- tempWB.styles = styles
- tempWB.style_xfByID = {value:key for key, value in styles._xf_id2x.items()}
- tempWB.style_fontsByID = {value:key for key, value in styles._font_id2x.items()}
- tempWB.str_indexesByID = {value:key for key, value in workBook._Workbook__sst._str_indexes.items()}
- tempWB.style_numberFormats = {value:key for key, value in styles._num_formats.items()}
- tempWB.sheet = sheet
- tempWB.fontCache = {'Arial':AFFontArial()}
- tempWB.emptyCellsAreZero = emptyCellsAreZero
-
- # For performance, I'm moving all the row objects in range into a specific selected rows list to iterate over,
- # as it's possibly done a number of times.
- rowRange = [sheet.rows[idx] for idx in xrange(fromRowx, toRowx+1)]
-
- for colx in xrange(fromColx, toColx+1):
- autofitWidth = 0
- # Loop over all the rows
- for row in rowRange:
- # Get the width of the cell
- cellWidth = GetCellWidth(tempWB, row, colx)
-
- if cellWidth > autofitWidth:
- autofitWidth = cellWidth
-
- # Set the column to the calculated width
- sheet.col(colx).width = autofitWidth
-
-def GetCellWidth(workBook, row, colx):
- """
- By looking into the cell class type, we can determine how to get the original value of the cell back. In the case of numbers, times
- and dates, we are forced to then format them as per the formatting settings.. We then pass that value to the font specific
- handler for estimating the width of the string value
- """
-
- try:
- # The cell may be out of bounds on this row
- cell = row._Row__cells[colx]
- except KeyError:
- # Return the default width of the column or zero
- if workBook.emptyCellsAreZero:
- return 0
- return workBook.sheet.col(colx).width
-
- cellClass = 'Handle%s' % cell.__class__.__name__
-
- Handler = globals().get(cellClass, HandleDefaultCell)
-
- return Handler(workBook, row, cell)
-
-def HandleDefaultCell(workBook, row, cell):
- """
- Process general or string type cells, extracting the value from the central repository of all string values in the workbook.
-
- If the cell class does not support shared string array logic, then no processing can occur and a default width will be returned.
- """
-
- # Get the sheet main column record
- sheetCol = workBook.sheet.col(cell.colx)
-
- # Set the default answer to be the current column width
- width = sheetCol.width
-
- if not hasattr(cell, 'sst_idx'):
- # We can not work out what the width of this is - just return the columns width
- return width
-
- # Get the cell contents
- cellValue = workBook.str_indexesByID[cell.sst_idx]
-
- if cellValue:
- # Get the xf formatting index from either this cell this row, or the sheet column default
- if cell.xf_idx > 15:
- xf_idx = cell.xf_idx
- elif row._Row__xf_index > 15:
- xf_idx = row._Row__xf_index
- else:
- xf_idx = sheetCol._xf_idx
-
- # Look up the xf formatting record by index
- xf_rec = workBook.style_xfByID.get(xf_idx, None)
- # If we found our style, then get the font index from it
- if xf_rec:
- fontID = xf_rec[0]
- font = workBook.style_fontsByID.get(fontID, None)
-
- if font:
- # Get an Autofit Font manager from the cache
- fontManager = workBook.locateAFFont(font)
- # We have a font, so now use its details to process the text
- width = fontManager.measureText(cellValue, font)
-
- return width
-
-def HandleStrCell(workBook, row, cell):
- """
- Will handle string like cell data using the default handler
- """
-
- return HandleDefaultCell(workBook, row, cell)
-
-def HandleBlankCell(workBook, row, cell):
- """
- Will handle blank cells using the default handler
- """
-
- if workBook.emptyCellsAreZero:
- return 0
-
- return HandleDefaultCell(workBook, row, cell)
-
-def HandleMulBlankCell(workBook, row, cell):
- """
- Will handle multi blank cells using the default handler
- """
-
- if workBook.emptyCellsAreZero:
- return 0
-
- return HandleDefaultCell(workBook, row, cell)
-
-def HandleNumberCell(workBook, row, cell):
- """
- Will handle number like cells. This is actually one of the hardest (date is the other) because of the various format options
- """
-
- # Get the sheet main column record
- sheetCol = workBook.sheet.col(cell.colx)
-
- # Default to the columns width
- width = sheetCol.width
-
- # Get the xf formatting index from either this cell this row, or the sheet column default
-
- if cell.xf_idx > 15:
- xf_idx = cell.xf_idx
- elif row._Row__xf_index > 15:
- xf_idx = row._Row__xf_index
- else:
- xf_idx = sheetCol._xf_index
-
- # Look up the xf formatting record by index
- xf_rec = workBook.style_xfByID.get(xf_idx, None)
- # If we found our style, then get the number format index from it
-
- if xf_rec:
- formatID = xf_rec[1]
- format = workBook.style_numberFormats.get(formatID, None)
-
- if format:
- # We have a format string, work out if possible the final format of our number as if rendered in Excel..
- if format == '0':
- cellValue = str(int(cell.number))
- elif format == '0.00':
- cellValue = '%0.2f' % cell.number
- elif format == '#,##0':
- cellValue = '{:,}'.format(int(cell.number))
- elif format == '#,##0.00':
- # I feel quite sure this can be done better than this..
- cellValue = '{,f}'.format(cell.number)
- cellValue = cellValue.split('.')
- cellValue[1] = cellValue[1][:2]
- cellValue = '.'.join(cellValue)
- elif format == '"$"#,##0_);("$"#,##' or format == '"$"#,##0_);[Red]("$"#,##':
- cellValue = '${:,}'.format(int(cell.number))
- elif format == '"$"#,##0.00_);("$"#,##' or format == '"$"#,##0.00_);[Red]("$"#,##':
- # I feel quite sure this can be done better than this..
- cellValue = '${,f}'.format(cell.number)
- cellValue = cellValue.split('.')
- cellValue[1] = cellValue[1][:2]
- cellValue = '.'.join(cellValue)
- elif format == '0%':
- cellValue = '%d%%' % int(cell.number)
- elif format == '0.00%':
- cellValue = '%0.2f%%' % cell.number
- elif format == '0.00E+00':
- cellValue = '%0.02E' % cell.number
- elif format == '# ?/?':
- cellValue = '9 9/9'
- elif format == '# ??/??':
- cellValue = '9 99/99'
- elif format == 'M/D/YY':
- cellValue = '99/99/99'
- elif format == 'D-MMM-YY':
- cellValue = '99-WWW-99'
- elif format == 'MMM-YY':
- cellValue = 'WWW-99'
- elif format == 'h:mm AM/PM':
- cellValue = '99:99 pm'
- elif format == 'h:mm:ss AM/PM':
- cellValue = '99:99:99 pm'
- elif format.lower() == 'h:mm':
- cellValue = '99:99'
- elif format.lower() == 'h:mm:ss':
- cellValue = '99:99:99'
- elif format == 'M/D/YY h:mm':
- cellValue = '99/99/99 99:99'
- elif format == '_(#,##0_);(#,##0)' or format == '_(#,##0_);[Red](#,##0)':
- if cell.number < 0.00:
- cellValue = '({:,})'.format(-cell.number)
- else:
- cellValue = '{:,}'.format(cell.number)
- elif format == '_(#,##0.00_);(#,##0.00)' or format == '_(#,##0.00_);[Red](#,##0.00)':
- if cell.number < 0.00:
- cellValue = '${,f}'.format(-cell.number)
- cellValue = cellValue.split('.')
- cellValue[1] = cellValue[1][:2]
- cellValue = '.'.join(cellValue)
- cellValue = '(%s)' % cellValue
- else:
- cellValue = '${,f}'.format(cell.number)
- cellValue = cellValue.split('.')
- cellValue[1] = cellValue[1][:2]
- cellValue = '.'.join(cellValue)
- elif format == '_("$"* #,##0_);_("$"* (#,##0);_("$"* "-"_);_(@_)' or format == '_(* #,##0_);_(* (#,##0);_(* "-"_);_(@_)':
- if cell.number < 0.00:
- cellValue = '(${:,})'.format(-cell.number)
- else:
- cellValue = '${:,}'.format(cell.number)
- elif format == '_("$"* #,##0.00_);_("$"* (#,##0.00);_("$"* "-"??_);_(@_)' or format == '_(* #,##0.00_);_(* (#,##0.00);_(* "-"??_);_(@_)':
- if cell.number < 0.00:
- cellValue = '${,f}'.format(-cell.number)
- cellValue = cellValue.split('.')
- cellValue[1] = cellValue[1][:2]
- cellValue = '.'.join(cellValue)
- cellValue = '(%s)' % cellValue
- else:
- cellValue = '${,f}'.format(cell.number)
- cellValue = cellValue.split('.')
- cellValue[1] = cellValue[1][:2]
- cellValue = '.'.join(cellValue)
- elif format == 'mm:ss':
- cellValue = '99:99'
- elif format == '[h]:mm:ss':
- cellValue = '99:99:99'
- elif format == 'mm:ss.0':
- cellValue = '99:99.9999999'
- elif format == '##0.0E+0':
- cellValue = '%03.1E' % cell.number
- elif format.lower() == 'general':
- # General/general
- cellValue = '%s' % cell.number
- elif format == 'DD/MM/YYYY' or format == 'MM/DD/YYYY' or format == 'DD-MM-YYYY' or format == 'MM-DD-YYYY':
- # Non standard yet common format
- cellValue = '99/99/9999'
- elif format == 'DD/MM/YY' or format == 'MM/DD/YY' or format == 'DD-MM-YY' or format == 'MM-DD-YY':
- # Non standard yet common format
- cellValue = '99/99/99'
- else:
- # Hmm, not a standard format, so just use the length of the format string itself. Ideas anyone?
- cellValue = format
-
- # Minor adjustment just to make sure.
- cellValue += " "
-
- # See if we can locate the xlwt font now
- fontID = xf_rec[0]
- font = workBook.style_fontsByID.get(fontID, None)
-
- if font:
- # Get an Autofit Font manager from the cache
- fontManager = workBook.locateAFFont(font)
- # We have a font, so now use its details to process the text
- width = fontManager.measureText(cellValue, font)
-
- return width
diff --git a/SUEWSPrepare/Modules/xlwt/BIFFRecords.py b/SUEWSPrepare/Modules/xlwt/BIFFRecords.py
index 265ccfe..9b8b8e9 100644
--- a/SUEWSPrepare/Modules/xlwt/BIFFRecords.py
+++ b/SUEWSPrepare/Modules/xlwt/BIFFRecords.py
@@ -1,7 +1,12 @@
-# -*- coding: cp1252 -*-
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
from struct import pack
+
+import six
+
from .UnicodeUtils import upack1, upack2, upack2rt
-from .compat import basestring, unicode, unicode_type, xrange, iteritems
+
class SharedStringTable(object):
_SST_ID = 0x00FC
@@ -21,8 +26,8 @@ def __init__(self, encoding):
self._current_piece = None
def add_str(self, s):
- if self.encoding != 'ascii' and not isinstance(s, unicode_type):
- s = unicode(s, self.encoding)
+ if self.encoding != 'ascii' and not isinstance(s, six.text_type):
+ s = s.decode(self.encoding)
self._add_calls += 1
if s not in self._str_indexes:
idx = len(self._str_indexes) + len(self._rt_indexes)
@@ -32,12 +37,12 @@ def add_str(self, s):
idx = self._str_indexes[s]
self._tally[idx] += 1
return idx
-
+
def add_rt(self, rt):
rtList = []
for s, xf in rt:
- if self.encoding != 'ascii' and not isinstance(s, unicode_type):
- s = unicode(s, self.encoding)
+ if self.encoding != 'ascii' and not isinstance(s, six.text_type):
+ s = s.decode(self.encoding)
rtList.append((s, xf))
rt = tuple(rtList)
self._add_calls += 1
@@ -67,13 +72,13 @@ def get_biff_record(self):
self._sst_record = b''
self._continues = [None, None]
self._current_piece = pack(' 0),int(px>0)) -> allowed values
@@ -1374,7 +1384,7 @@ class PanesRecord(BiffRecord):
(1,0):(1,3),
(1,1):(0,1,2,3),
}
-
+
def __init__(self, px, py, first_row_bottom, first_col_right, active_pane):
allowed = self.valid_active_pane.get(
(int(px > 0),int(py > 0))
@@ -1728,10 +1738,10 @@ class RefModeRecord(BiffRecord):
"""
This record is part of the Calculation Settings Block.
It stores which method is used to show cell addresses in formulas.
- The RC mode uses numeric indexes for rows and columns,
- i.e. R(1)C(-1), or R1C1:R2C2.
- The A1 mode uses characters for columns and numbers for rows,
- i.e. B1, or $A$1:$B$2.
+ The “RC” mode uses numeric indexes for rows and columns,
+ i.e. “R(1)C(-1)”, or “R1C1:R2C2”.
+ The “A1” mode uses characters for columns and numbers for rows,
+ i.e. “B1”, or “$A$1:$B$2”.
Record REFMODE, BIFF2-BIFF8:
@@ -1779,7 +1789,7 @@ def __init__(self, delta):
class SaveRecalcRecord(BiffRecord):
"""
This record is part of the Calculation Settings Block.
- It contains the Recalculate before save option in
+ It contains the “Recalculate before save” option in
Excel's calculation settings dialogue.
Record SAVERECALC, BIFF3-BIFF8:
@@ -2374,7 +2384,7 @@ def __init__(self, refs):
def get(self):
res = []
nrefs = len(self.refs)
- for idx in xrange(0, nrefs, _maxRefPerRecord):
+ for idx in range(0, nrefs, _maxRefPerRecord):
chunk = self.refs[idx:idx+_maxRefPerRecord]
krefs = len(chunk)
if idx: # CONTINUE record
@@ -2382,8 +2392,8 @@ def get(self):
else: # ExternSheetRecord
header = pack("
# Portions are Copyright (c) 2002-2004 John McNamara (Perl Spreadsheet::WriteExcel)
-from .BIFFRecords import BiffRecord
from struct import pack, unpack
+from .BIFFRecords import BiffRecord
+
def _size_col(sheet, col):
return sheet.col_width(col)
@@ -91,8 +92,8 @@ def _position_image(sheet, row_start, col_start, x1, y1, width, height):
row_end += 1
# Bitmap isn't allowed to start or finish in a hidden cell, i.e. a cell
# with zero height or width.
- if ((_size_col(sheet, col_start) == 0) or (_size_col(sheet, col_end) == 0)
- or (_size_row(sheet, row_start) == 0) or (_size_row(sheet, row_end) == 0)):
+ if ((_size_col(sheet, col_start) == 0) or (_size_col(sheet, col_end) == 0) or
+ (_size_row(sheet, row_start) == 0) or (_size_row(sheet, row_end) == 0)):
return
# Convert the pixel values to the percentage value expected by Excel
x1 = int(float(x1) / _size_col(sheet, col_start) * 1024)
@@ -195,7 +196,9 @@ def _process_bitmap(bitmap):
with open(bitmap, "rb") as fh:
# Slurp the file into a string.
data = fh.read()
+ return _process_bitmap_data(data)
+def _process_bitmap_data(data):
# Check that the file is big enough to be a bitmap.
if len(data) <= 0x36:
raise Exception("bitmap doesn't contain enough data.")
@@ -240,21 +243,33 @@ def _process_bitmap(bitmap):
return (width, height, size, data)
-class ImDataBmpRecord(BiffRecord):
+class ImRawDataBmpRecord(BiffRecord):
_REC_ID = 0x007F
- def __init__(self, filename):
+ def __init__(self, data):
"""Insert a 24bit bitmap image in a worksheet. The main record required is
IMDATA but it must be proceeded by a OBJ record to define its position.
"""
BiffRecord.__init__(self)
- self.width, self.height, self.size, data = _process_bitmap(filename)
+ self.width, self.height, self.size, data = _process_bitmap_data(data)
+ self._write_imdata(data)
+
+ def _write_imdata(self, data):
# Write the IMDATA record to store the bitmap data
cf = 0x09
env = 0x01
lcb = self.size
self._rec_data = pack("> 9
dir_sect_count = len(self.dir_stream) >> 9
-
+
total_sect_count = book_sect_count + dir_sect_count
SAT_sect_count = 0
MSAT_sect_count = 0
@@ -155,7 +155,7 @@ def _build_sat(self):
sect += 1
while sect < book_sect_count + MSAT_sect_count + SAT_sect_count:
- self.SAT_sect.append(sect)
+ self.SAT_sect.append(sect)
SAT[sect] = self.SID_USED_BY_SAT
sect += 1
@@ -245,7 +245,7 @@ def _build_header(self):
msat_start_sid,
total_msat_sectors
])
-
+
def save(self, file_name_or_filelike_obj, stream):
# 1. Align stream on 0x1000 boundary (and therefore on sector boundary)
@@ -255,7 +255,7 @@ def save(self, file_name_or_filelike_obj, stream):
self._build_directory()
self._build_sat()
self._build_header()
-
+
f = file_name_or_filelike_obj
we_own_it = not hasattr(f, 'write')
if we_own_it:
@@ -273,7 +273,7 @@ def save(self, file_name_or_filelike_obj, stream):
if e.errno != 22: # "Invalid argument" i.e. 'stream' is too big
raise # some other problem
chunk_size = 4 * 1024 * 1024
- for offset in xrange(0, len(stream), chunk_size):
+ for offset in range(0, len(stream), chunk_size):
f.write(buffer(stream, offset, chunk_size))
f.write(padding)
f.write(self.packed_MSAT_2nd)
diff --git a/SUEWSPrepare/Modules/xlwt/CreateLearningSheet.py b/SUEWSPrepare/Modules/xlwt/CreateLearningSheet.py
deleted file mode 100644
index 98b4bdc..0000000
--- a/SUEWSPrepare/Modules/xlwt/CreateLearningSheet.py
+++ /dev/null
@@ -1,103 +0,0 @@
-#-------------------------------------------------------------------------------
-# Name: CreateLearningSheet
-# Purpose: Creates an Excel sheet of sample data. This is then "Autofitted" using the real Excel function
-# and then read back in and processed to work out the character mappings to be used later.
-#
-# Author: Warwick Prince Mushroom Systems International Pty. Ltd.
-#
-# Created: 3/02/12 11:56 AM
-#-------------------------------------------------------------------------------
-#!/usr/bin/env python
-
-import xlwt
-import sys
-
-def ExportSampleSheet():
- """
- Create a sample sheet format and save it to the file supplied. The user then must select all the sheets and using Excel,
- Autofit them and save the workbook. Then, use GenerateAFFont to read the Excel formatted sheet back in and learn from it.
- """
-
- if len(sys.argv) != 2:
- print 'Usage: CreateLearningSheet [SampleSheet.xls]'
- sys.exit()
-
- # Get the workbook file name from the command line
- fileName = sys.argv[1]
-
- if not fileName.lower().endswith('.xls'):
- fileName = '%s.xls' % fileName
-
- xlWorkbook = xlwt.Workbook()
-
- s1 = xlWorkbook.add_sheet('Normal Sample UPPER')
- s2 = xlWorkbook.add_sheet('Normal Sample Lower')
- s3 = xlWorkbook.add_sheet('Normal Sample Other')
- s4 = xlWorkbook.add_sheet('Bold Sample UPPER')
- s5 = xlWorkbook.add_sheet('Bold Sample Lower')
- s6 = xlWorkbook.add_sheet('Bold Sample Other')
-
- # Normal UPPER
- for row in xrange(0, 2):
- letterValue = 65
- for col in range(0, 51, 2):
- letter = chr(letterValue)
- s1.write(row, col, letter*10)
- s1.write(row, col+1, letter*100)
- letterValue += 1
-
- # Normal lower
- for row in xrange(0, 2):
- letterValue = 97
- for col in range(0, 51, 2):
- letter = chr(letterValue)
- s2.write(row, col, letter*10)
- s2.write(row, col+1, letter*100)
- letterValue += 1
-
- # Normal Other
- for row in xrange(0, 2):
- letterValue = 32
- for col in range(0, 66, 2):
- letter = chr(letterValue)
- s3.write(row, col, letter*10)
- s3.write(row, col+1, letter*100)
- letterValue += 1
-
- style = xlwt.Style.XFStyle()
- style.font.bold = True
-
- # Bold UPPER
- for row in xrange(0, 2):
- letterValue = 65
- for col in range(0, 51, 2):
- letter = chr(letterValue)
- s4.write(row, col, letter*10, style)
- s4.write(row, col+1, letter*100, style)
- letterValue += 1
-
- # Bold lower
- for row in xrange(0, 2):
- letterValue = 97
- for col in range(0, 51, 2):
- letter = chr(letterValue)
- s5.write(row, col, letter*10, style)
- s5.write(row, col+1, letter*100, style)
- letterValue += 1
-
- # Bold Other
- for row in xrange(0, 2):
- letterValue = 32
- for col in range(0, 66, 2):
- letter = chr(letterValue)
- s6.write(row, col, letter*10, style)
- s6.write(row, col+1, letter*100, style)
- letterValue += 1
-
- try:
- xlWorkbook.save(fileName)
- except IOError:
- print 'Failed to save filename "%s"' % fileName
-
-if __name__ == '__main__':
- ExportSampleSheet()
diff --git a/SUEWSPrepare/Modules/xlwt/ExcelFormula.py b/SUEWSPrepare/Modules/xlwt/ExcelFormula.py
index ac70147..6461832 100644
--- a/SUEWSPrepare/Modules/xlwt/ExcelFormula.py
+++ b/SUEWSPrepare/Modules/xlwt/ExcelFormula.py
@@ -1,7 +1,8 @@
-# -*- coding: windows-1252 -*-
+# -*- coding: utf-8 -*-
-from . import ExcelFormulaParser, ExcelFormulaLexer
import struct
+
+from . import ExcelFormulaLexer, ExcelFormulaParser
from .antlr import ANTLRException
@@ -40,4 +41,3 @@ def rpn(self):
'''
return struct.pack(" "ExcelFormulaParser.py"$
### import antlr and other modules ..
-from . import antlr
-
### header action >>>
import struct
-from . import Utils
-from .UnicodeUtils import upack1
+
+from . import Utils, antlr
from .ExcelMagic import *
+from .UnicodeUtils import upack1
_RVAdelta = {"R": 0, "V": 0x20, "A": 0x40}
_RVAdeltaRef = {"R": 0, "V": 0x20, "A": 0x40, "D": 0x20}
@@ -14,9 +13,9 @@
class FormulaParseException(Exception):
- """
- An exception indicating that a Formula could not be successfully parsed.
- """
+ """
+ An exception indicating that a Formula could not be successfully parsed.
+ """
### header action <<<
### preamble action>>>
@@ -168,7 +167,6 @@ def prec1_expr(self,
self.prec2_expr(arg_type)
self.rpn += op;
- # print "**prec1_expr4 %s" % arg_type
else:
break
@@ -382,23 +380,23 @@ def primary(self,
chunklens = [len(chunk) for chunk in rpn_chunks]
skiplens = [0] * nc
skiplens[-1] = 3
- for ic in xrange(nc-1, 0, -1):
- skiplens[ic-1] = skiplens[ic] + chunklens[ic] + 4
+ for ic in range(nc-1, 0, -1):
+ skiplens[ic-1] = skiplens[ic] + chunklens[ic] + 4
jump_pos = [2 * nc + 2]
- for ic in xrange(nc):
- jump_pos.append(jump_pos[-1] + chunklens[ic] + 4)
+ for ic in range(nc):
+ jump_pos.append(jump_pos[-1] + chunklens[ic] + 4)
chunk_shift = 2 * nc + 6 # size of tAttrChoose
- for ic in xrange(nc):
- for refx in xrange(ref_markers[ic], ref_markers[ic+1]):
- ref = self.sheet_references[refx]
- self.sheet_references[refx] = (ref[0], ref[1], ref[2] + chunk_shift)
- chunk_shift += 4 # size of tAttrSkip
+ for ic in range(nc):
+ for refx in range(ref_markers[ic], ref_markers[ic+1]):
+ ref = self.sheet_references[refx]
+ self.sheet_references[refx] = (ref[0], ref[1], ref[2] + chunk_shift)
+ chunk_shift += 4 # size of tAttrSkip
choose_rpn = []
choose_rpn.append(struct.pack(" max_argc or arg_count < min_argc:
- raise Exception("%d parameters for function: %s" % (arg_count, func_tok.text))
+ raise Exception("%d parameters for function: %s" % (arg_count, func_tok.text))
if xcall:
- func_ptg = ptgFuncVarR + _RVAdelta[func_type]
- self.rpn += struct.pack("<2BH", func_ptg, arg_count + 1, 255) # 255 is magic XCALL function
+ func_ptg = ptgFuncVarR + _RVAdelta[func_type]
+ self.rpn += struct.pack("<2BH", func_ptg, arg_count + 1, 255) # 255 is magic XCALL function
elif min_argc == max_argc:
- func_ptg = ptgFuncR + _RVAdelta[func_type]
- self.rpn += struct.pack(" sheet.last_used_col:
sheet.last_used_col = iarg
- def __excel_date_dt(self, date):
+ def __excel_date_dt(self, date):
adj = False
if isinstance(date, dt.date):
if self.__parent_wb.dates_1904:
@@ -103,11 +99,11 @@ def __excel_date_dt(self, date):
date = dt.datetime.combine(dt.datetime(1900, 1, 1), date)
epoch = dt.datetime(1900, 1, 1)
delta = date - epoch
- xldate = delta.days + delta.seconds / 86400.0
+ xldate = delta.days + delta.seconds / 86400.0
# Add a day for Excel's missing leap day in 1900
if adj and xldate > 59:
xldate += 1
- return xldate
+ return xldate
def get_height_in_pixels(self):
return self.__height_in_pixels
@@ -166,11 +162,11 @@ def insert_cell(self, col_index, cell_obj):
def insert_mulcells(self, colx1, colx2, cell_obj):
self.insert_cell(colx1, cell_obj)
- for col_index in xrange(colx1+1, colx2+1):
+ for col_index in range(colx1+1, colx2+1):
self.insert_cell(col_index, None)
def get_cells_biff_data(self):
- cell_items = [item for item in iteritems(self.__cells) if item[1] is not None]
+ cell_items = [item for item in self.__cells.items() if item[1] is not None]
cell_items.sort() # in column order
return _get_cells_biff_data_mul(self.__idx, cell_items)
# previously:
@@ -235,7 +231,7 @@ def write(self, col, label, style=Style.default_style):
self.__adjust_height(style)
self.__adjust_bound_col_idx(col)
style_index = self.__parent_wb.add_style(style)
- if isinstance(label, basestring):
+ if isinstance(label, six.string_types):
if len(label) > 0:
self.insert_cell(col,
StrCell(self.__idx, col, style_index, self.__parent_wb.add_str(label))
@@ -244,7 +240,7 @@ def write(self, col, label, style=Style.default_style):
self.insert_cell(col, BlankCell(self.__idx, col, style_index))
elif isinstance(label, bool): # bool is subclass of int; test bool first
self.insert_cell(col, BooleanCell(self.__idx, col, style_index, label))
- elif isinstance(label, int_types+(float, Decimal)):
+ elif isinstance(label, six.integer_types+(float, Decimal)):
self.insert_cell(col, NumberCell(self.__idx, col, style_index, label))
elif isinstance(label, (dt.datetime, dt.date, dt.time)):
date_number = self.__excel_date_dt(label)
@@ -269,14 +265,14 @@ def set_cell_rich_text(self, col, rich_text_list, style=Style.default_style):
def __rich_text_helper(self, col, rich_text_list, style, style_index=None):
if style_index is None:
style_index = self.__parent_wb.add_style(style)
- default_font = None
+ default_font = None
rt = []
for data in rich_text_list:
- if isinstance(data, basestring):
+ if isinstance(data, six.string_types):
s = data
font = default_font
elif isinstance(data, (list, tuple)):
- if not isinstance(data[0], basestring) or not isinstance(data[1], Font):
+ if not isinstance(data[0], six.string_types) or not isinstance(data[1], Font):
raise Exception ("Unexpected data type %r, %r" % (type(data[0]), type(data[1])))
s = data[0]
font = self.__parent_wb.add_font(data[1])
@@ -293,7 +289,3 @@ def __rich_text_helper(self, col, rich_text_list, style, style_index=None):
write_blanks = set_cell_mulblanks
write_rich_text = set_cell_rich_text
-
-
-
-
diff --git a/SUEWSPrepare/Modules/xlwt/Style.py b/SUEWSPrepare/Modules/xlwt/Style.py
index 9b97694..b8e2abc 100644
--- a/SUEWSPrepare/Modules/xlwt/Style.py
+++ b/SUEWSPrepare/Modules/xlwt/Style.py
@@ -1,9 +1,10 @@
+# -*- coding: utf-8 -*-
from __future__ import print_function
-# -*- coding: windows-1252 -*-
+
+import six
from . import Formatting
-from .BIFFRecords import NumberFormatRecord, XFRecord, StyleRecord
-from .compat import basestring, xrange
+from .BIFFRecords import NumberFormatRecord, StyleRecord, XFRecord
FIRST_USER_DEFINED_NUM_FORMAT_IDX = 164
@@ -97,10 +98,10 @@ def _add_style(self, style):
num_format_idx = self._num_formats[num_format_str]
else:
num_format_idx = (
- FIRST_USER_DEFINED_NUM_FORMAT_IDX
- + len(self._num_formats)
- - len(StyleCollection._std_num_fmt_list)
- )
+ FIRST_USER_DEFINED_NUM_FORMAT_IDX +
+ len(self._num_formats) -
+ len(StyleCollection._std_num_fmt_list)
+ )
self._num_formats[num_format_str] = num_format_idx
font = style.font
@@ -130,7 +131,7 @@ def _add_style(self, style):
xf_index = self._xf_id2x[xf]
self.stats[3] += 1
elif self.style_compression == 2:
- xf_key = (font_idx, num_format_idx) + tuple([obj._search_key() for obj in gof])
+ xf_key = (font_idx, num_format_idx) + tuple(obj._search_key() for obj in gof)
xf_index = self._xf_val2x.get(xf_key)
if xf_index is not None:
self._xf_id2x[xf] = xf_index
@@ -151,10 +152,10 @@ def _add_style(self, style):
raise ValueError("More than 4094 XFs (styles)")
return xf, xf_index
-
+
def add_font(self, font):
return self._add_font(font)
-
+
def _add_font(self, font):
if font in self._font_id2x:
font_idx = self._font_id2x[font]
@@ -175,7 +176,7 @@ def _add_font(self, font):
font_idx = len(self._font_id2x) + 1
self._font_id2x[font] = font_idx
self.stats[2] += 1
-
+
return font_idx
@@ -190,11 +191,10 @@ def get_biff_data(self):
def _all_fonts(self):
result = b''
if self.style_compression:
- alist = self._font_x2id.items()
+ fonts = self._font_x2id.items()
else:
- alist = [(x, o) for o, x in self._font_id2x.items()]
- alist.sort()
- for font_idx, font in alist:
+ fonts = [(x, o) for o, x in self._font_id2x.items()]
+ for font_idx, font in sorted(fonts):
result += font.get_biff_record().get()
return result
@@ -215,11 +215,10 @@ def _all_cell_styles(self):
for i in range(0, 16):
result += XFRecord(self._default_xf, 'style').get()
if self.style_compression == 2:
- alist = self._xf_x2id.items()
+ styles = self._xf_x2id.items()
else:
- alist = [(x, o) for o, x in self._xf_id2x.items()]
- alist.sort()
- for xf_idx, xf in alist:
+ styles = [(x, o) for o, x in self._xf_id2x.items()]
+ for xf_idx, xf in sorted(styles):
result += XFRecord(xf).get()
return result
@@ -375,7 +374,7 @@ def __call__(self, astring):
def add_palette_colour(colour_str, colour_index):
if not (8 <= colour_index <= 63):
- raise Exception("add_palette_colour: colour_index (%d) not in range(8, 64)" %
+ raise Exception("add_palette_colour: colour_index (%d) not in range(8, 64)" %
(colour_index))
colour_map[colour_str] = colour_index
@@ -397,65 +396,65 @@ def add_palette_colour(colour_str, colour_index):
# (153, 51, 0), (153, 51,102), ( 51, 51,153), ( 51, 51, 51),
# ]
-# Default colour table for BIFF8 copied from
+# Default colour table for BIFF8 copied from
# OpenOffice.org's Documentation of the Microsoft Excel File Format, Excel Version 2003
# Note palette has LSB padded with 2 bytes 0x00
-excel_default_palette_b8 = (
-0x00000000,
-0xFFFFFF00,
-0xFF000000,
-0x00FF0000,
-0x0000FF00,
-0xFFFF0000,
-0xFF00FF00,
+excel_default_palette_b8 = (
+0x00000000,
+0xFFFFFF00,
+0xFF000000,
+0x00FF0000,
+0x0000FF00,
+0xFFFF0000,
+0xFF00FF00,
+0x00FFFF00,
+0x80000000,
+0x00800000,
+0x00008000,
+0x80800000,
+0x80008000,
+0x00808000,
+0xC0C0C000,
+0x80808000,
+0x9999FF00,
+0x99336600,
+0xFFFFCC00,
+0xCCFFFF00,
+0x66006600,
+0xFF808000,
+0x0066CC00,
+0xCCCCFF00,
+0x00008000,
+0xFF00FF00,
+0xFFFF0000,
0x00FFFF00,
-0x80000000,
-0x00800000,
-0x00008000,
-0x80800000,
-0x80008000,
-0x00808000,
-0xC0C0C000,
-0x80808000,
-0x9999FF00,
-0x99336600,
-0xFFFFCC00,
-0xCCFFFF00,
-0x66006600,
-0xFF808000,
-0x0066CC00,
-0xCCCCFF00,
-0x00008000,
-0xFF00FF00,
-0xFFFF0000,
-0x00FFFF00,
-0x80008000,
-0x80000000,
-0x00808000,
-0x0000FF00,
-0x00CCFF00,
-0xCCFFFF00,
-0xCCFFCC00,
-0xFFFF9900,
-0x99CCFF00,
-0xFF99CC00,
-0xCC99FF00,
-0xFFCC9900,
-0x3366FF00,
-0x33CCCC00,
-0x99CC0000,
-0xFFCC0000,
-0xFF990000,
-0xFF660000,
-0x66669900,
-0x96969600,
-0x00336600,
-0x33996600,
-0x00330000,
-0x33330000,
-0x99330000,
-0x99336600,
-0x33339900,
+0x80008000,
+0x80000000,
+0x00808000,
+0x0000FF00,
+0x00CCFF00,
+0xCCFFFF00,
+0xCCFFCC00,
+0xFFFF9900,
+0x99CCFF00,
+0xFF99CC00,
+0xCC99FF00,
+0xFFCC9900,
+0x3366FF00,
+0x33CCCC00,
+0x99CC0000,
+0xFFCC0000,
+0xFF990000,
+0xFF660000,
+0x66669900,
+0x96969600,
+0x00336600,
+0x33996600,
+0x00330000,
+0x33330000,
+0x99330000,
+0x99336600,
+0x33339900,
0x33333300)
assert len(excel_default_palette_b8) == 56
@@ -660,11 +659,11 @@ def _parse_strg_to_obj(strg, obj, parse_dict,
v = ' '.join(guff[1:])
if not v:
raise EasyXFCallerError("no value supplied for %s.%s" % (section, k))
- for counter in xrange(2):
+ for counter in range(2):
result = section_dict.get(k)
if result is None:
raise EasyXFCallerError('%s.%s is not a known attribute' % (section, k))
- if not isinstance(result, basestring):
+ if not isinstance(result, six.string_types):
break
# synonym
old_k = k
diff --git a/SUEWSPrepare/Modules/xlwt/UnicodeUtils.py b/SUEWSPrepare/Modules/xlwt/UnicodeUtils.py
index 24255de..31af731 100644
--- a/SUEWSPrepare/Modules/xlwt/UnicodeUtils.py
+++ b/SUEWSPrepare/Modules/xlwt/UnicodeUtils.py
@@ -1,4 +1,4 @@
-# -*- coding: windows-1252 -*-
+# -*- coding: utf-8 -*-
'''
From BIFF8 on, strings are always stored using UTF-16LE text encoding. The
@@ -33,21 +33,25 @@
1 = Contains Rich-Text settings
[2 or 3] 2 (optional, only if richtext=1) Number of Rich-Text formatting runs (rt)
[var.] 4 (optional, only if phonetic=1) Size of Asian phonetic settings block (in bytes, sz)
-var. ln or
- 2ln Character array (8-bit characters or 16-bit characters, dependent on ccompr)
-[var.] 4rt (optional, only if richtext=1) List of rt formatting runs
-[var.] sz (optional, only if phonetic=1) Asian Phonetic Settings Block
+var. ln or
+ 2·ln Character array (8-bit characters or 16-bit characters, dependent on ccompr)
+[var.] 4·rt (optional, only if richtext=1) List of rt formatting runs
+[var.] sz (optional, only if phonetic=1) Asian Phonetic Settings Block
'''
-from .compat import unicode, unicode_type
+from __future__ import unicode_literals
+
from struct import pack
+import six
+
+
def upack2(s, encoding='ascii'):
# If not unicode, make it so.
- if isinstance(s, unicode_type):
+ if isinstance(s, six.text_type):
us = s
else:
- us = unicode(s, encoding)
+ us = s.decode(encoding)
# Limit is based on number of content characters
# (not on number of bytes in packed result)
len_us = len(us)
@@ -65,27 +69,27 @@ def upack2(s, encoding='ascii'):
n_items = len(encs) // 2
# n_items is the number of "double byte characters" i.e. MS C wchars
# Can't use len(us).
- # len(u"\U0001D400") -> 1 on a wide-unicode build
+ # len("\U0001D400") -> 1 on a wide-unicode build
# and 2 on a narrow-unicode build.
# We need n_items == 2 in this case.
return pack(' 32767:
@@ -104,10 +108,10 @@ def upack2rt(rt, encoding='ascii'):
def upack1(s, encoding='ascii'):
# Same as upack2(), but with a one-byte length field.
- if isinstance(s, unicode_type):
+ if isinstance(s, six.text_type):
us = s
else:
- us = unicode(s, encoding)
+ us = s.decode(encoding)
len_us = len(us)
if len_us > 255:
raise Exception('String longer than 255 characters')
@@ -118,5 +122,5 @@ def upack1(s, encoding='ascii'):
except UnicodeEncodeError:
encs = us.encode('utf_16_le')
flag = 1
- n_items = len(encs) // 2
+ n_items = len(encs) // 2
return pack(' 31:
+ if sheet_name == "" or sheet_name[0] == "'" or len(sheet_name) > 31:
return False
for c in sheet_name:
- if c in u"[]:\\?/*\x00":
+ if c in "[]:\\?/*\x00":
return False
return True
@@ -164,4 +165,4 @@ def quote_sheet_name(unquoted_sheet_name):
if not valid_sheet_name(unquoted_sheet_name):
raise Exception(
'attempt to quote an invalid worksheet name %r' % unquoted_sheet_name)
- return u"'" + unquoted_sheet_name.replace(u"'", u"''") + u"'"
+ return "'" + unquoted_sheet_name.replace("'", "''") + "'"
diff --git a/SUEWSPrepare/Modules/xlwt/Workbook.py b/SUEWSPrepare/Modules/xlwt/Workbook.py
index 13b043e..ee57780 100644
--- a/SUEWSPrepare/Modules/xlwt/Workbook.py
+++ b/SUEWSPrepare/Modules/xlwt/Workbook.py
@@ -1,4 +1,4 @@
-# -*- coding: windows-1252 -*-
+# -*- coding: utf-8 -*-
# Record Order in BIFF8
# Workbook Globals Substream
# BOF Type = workbook globals
@@ -38,9 +38,10 @@
# ExtSST
# EOF
-from . import BIFFRecords
-from . import Style
-from .compat import unicode_type
+import six
+
+from . import BIFFRecords, Style
+
class Workbook(object):
"""
@@ -304,12 +305,12 @@ def get_default_style(self):
def set_colour_RGB(self, colour_index, red, green, blue):
if not(8 <= colour_index <= 63):
- raise Exception("set_colour_RGB: colour_index (%d) not in range(8, 64)" %
+ raise Exception("set_colour_RGB: colour_index (%d) not in range(8, 64)" %
colour_index)
if min(red, green, blue) < 0 or max(red, green, blue) > 255:
- raise Exception("set_colour_RGB: colour values (%d,%d,%d) must be in range(0, 256)"
+ raise Exception("set_colour_RGB: colour values (%d,%d,%d) must be in range(0, 256)"
% (red, green, blue))
- if self.__custom_palette_b8 is None:
+ if self.__custom_palette_b8 is None:
self.__custom_palette_b8 = list(Style.excel_default_palette_b8)
# User-defined Palette starts at colour index 8,
# so subtract 8 from colour_index when placing in palette
@@ -322,7 +323,7 @@ def set_colour_RGB(self, colour_index, red, green, blue):
def add_style(self, style):
return self.__styles.add(style)
-
+
def add_font(self, font):
return self.__styles.add_font(font)
@@ -334,10 +335,10 @@ def del_str(self, sst_idx):
def str_index(self, s):
return self.__sst.str_index(s)
-
+
def add_rt(self, rt):
return self.__sst.add_rt(rt)
-
+
def rt_index(self, rt):
return self.__sst.rt_index(rt)
@@ -362,7 +363,7 @@ def add_sheet(self, sheetname, cell_overwrite_ok=False):
"""
from . import Utils
from .Worksheet import Worksheet
- if not isinstance(sheetname, unicode_type):
+ if not isinstance(sheetname, six.text_type):
sheetname = sheetname.decode(self.encoding)
if not Utils.valid_sheet_name(sheetname):
raise Exception("invalid worksheet name %r" % sheetname)
@@ -373,8 +374,22 @@ def add_sheet(self, sheetname, cell_overwrite_ok=False):
self.__worksheets.append(Worksheet(sheetname, self, cell_overwrite_ok))
return self.__worksheets[-1]
- def get_sheet(self, sheetnum):
- return self.__worksheets[sheetnum]
+ def get_sheet(self, sheet):
+ if isinstance(sheet, six.integer_types):
+ return self.__worksheets[sheet]
+ elif isinstance(sheet, six.string_types):
+ sheetnum = self.sheet_index(sheet)
+ return self.__worksheets[sheetnum]
+ else:
+ raise Exception("sheet must be integer or string")
+
+ def sheet_index(self, sheetname):
+ try:
+ sheetnum = self.__worksheet_idx_from_name[sheetname.lower()]
+ except KeyError:
+ self.raise_bad_sheetname(sheetname)
+
+ return sheetnum
def raise_bad_sheetname(self, sheetname):
raise Exception("Formula: unknown sheet name %s" % sheetname)
@@ -453,7 +468,7 @@ def add_sheet_reference(self, formula):
self.setup_xcall()
# print funcname, self._supbook_xref
patches.append((offset, self._xcall_supbook_ref))
- if not isinstance(funcname, unicode_type):
+ if not isinstance(funcname, six.text_type):
funcname = funcname.decode(self.encoding)
if funcname in self._xcall_xref:
idx = self._xcall_xref[funcname]
@@ -556,7 +571,7 @@ def __all_fonts_num_formats_xf_styles_rec(self):
return self.__styles.get_biff_data()
def __palette_rec(self):
- if self.__custom_palette_b8 is None:
+ if self.__custom_palette_b8 is None:
return b''
info = BIFFRecords.PaletteRecord(self.__custom_palette_b8).get()
return info
@@ -694,5 +709,3 @@ def save(self, filename_or_stream):
doc = CompoundDoc.XlsDoc()
doc.save(filename_or_stream, self.get_biff_data())
-
-
diff --git a/SUEWSPrepare/Modules/xlwt/Worksheet.py b/SUEWSPrepare/Modules/xlwt/Worksheet.py
index 08c7f0b..a0e4cbb 100644
--- a/SUEWSPrepare/Modules/xlwt/Worksheet.py
+++ b/SUEWSPrepare/Modules/xlwt/Worksheet.py
@@ -1,4 +1,4 @@
-# -*- coding: windows-1252 -*-
+# -*- coding: utf-8 -*-
# BOF
# UNCALCED
# INDEX
@@ -32,14 +32,15 @@
# RANGEPROTECTION (BIFF8X only)
# EOF
-from . import BIFFRecords
-from . import Bitmap
-from . import Style
-from .Row import Row
-from .Column import Column
-from .compat import unicode, itervalues
import tempfile
+import six
+
+from . import BIFFRecords, Bitmap, Style
+from .Column import Column
+from .Row import Row
+
+
class Worksheet(object):
"""
This is a class
@@ -52,7 +53,7 @@ class Worksheet(object):
"""
# a safe default value, 3 is always valid!
active_pane = 3
-
+
#################################################################
## Constructor
#################################################################
@@ -127,7 +128,7 @@ def __init__(self, sheetname, parent_book, cell_overwrite_ok=False):
# xlwt_worksheet.split_position_units_are_twips = True
# because that's what's actually in the file.
- # There are 20 twips to a point. There are 72 points to an inch.
+ # There are 20 twips to a point. There are 72 points to an inch.
self.__row_gut_width = 0
self.__col_gut_height = 0
@@ -724,8 +725,8 @@ def get_horz_page_breaks(self):
#################################################################
def set_header_str(self, value):
- if isinstance(value, str):
- value = unicode(value, self.__parent.encoding)
+ if isinstance(value, bytes):
+ value = value.decode(self.__parent.encoding)
self.__header_str = value
def get_header_str(self):
@@ -736,8 +737,8 @@ def get_header_str(self):
#################################################################
def set_footer_str(self, value):
- if isinstance(value, str):
- value = unicode(value, self.__parent.encoding)
+ if isinstance(value, bytes):
+ value = value.decode(self.__parent.encoding)
self.__footer_str = value
def get_footer_str(self):
@@ -1124,6 +1125,12 @@ def insert_bitmap(self, filename, row, col, x = 0, y = 0, scale_x = 1, scale_y =
self.__bmp_rec += obj.get() + bmp.get()
+ def insert_bitmap_data(self, data, row, col, x = 0, y = 0, scale_x = 1, scale_y = 1):
+ bmp = Bitmap.ImRawDataBmpRecord(data)
+ obj = Bitmap.ObjBmpRecord(row, col, self, bmp, x, y, scale_x, scale_y)
+
+ self.__bmp_rec += obj.get() + bmp.get()
+
def col(self, indx):
if indx not in self.__cols:
self.__cols[indx] = self.Column(indx, self)
@@ -1162,14 +1169,14 @@ def __bof_rec(self):
def __update_row_visible_levels(self):
if self.__rows:
- temp = max([self.__rows[r].level for r in self.__rows]) + 1
+ temp = max(self.__rows[r].level for r in self.__rows) + 1
self.__row_visible_levels = max(temp, self.__row_visible_levels)
def __guts_rec(self):
self.__update_row_visible_levels()
col_visible_levels = 0
if len(self.__cols) != 0:
- col_visible_levels = max([self.__cols[c].level for c in self.__cols]) + 1
+ col_visible_levels = max(self.__cols[c].level for c in self.__cols) + 1
return BIFFRecords.GutsRecord(
self.__row_gut_width, self.__col_gut_height, self.__row_visible_levels, col_visible_levels).get()
@@ -1301,7 +1308,7 @@ def __panes_rec(self):
def __row_blocks_rec(self):
result = []
- for row in itervalues(self.__rows):
+ for row in self.__rows.values():
result.append(row.get_row_biff_data())
result.append(row.get_cells_biff_data())
return b''.join(result)
@@ -1391,7 +1398,7 @@ def get_biff_data(self):
# Above seek() is necessary to avoid a spurious IOError
# with Errno 0 if the caller continues on writing rows
# and flushing row data after the save().
- # See http://bugs.python.org/issue3207
+ # See https://bugs.python.org/issue3207
result.extend([
self.__row_blocks_rec(),
self.__merged_rec(),
@@ -1410,5 +1417,3 @@ def flush_row_data(self):
self.__flushed_rows[rowx] = 1
self.__update_row_visible_levels()
self.__rows = {}
-
-
diff --git a/SUEWSPrepare/Modules/xlwt/__init__.py b/SUEWSPrepare/Modules/xlwt/__init__.py
index 6200a39..de78187 100644
--- a/SUEWSPrepare/Modules/xlwt/__init__.py
+++ b/SUEWSPrepare/Modules/xlwt/__init__.py
@@ -1,9 +1,9 @@
-__VERSION__ = '1.0.0'
+__VERSION__ = '1.3.0'
-from .Workbook import Workbook
-from .Worksheet import Worksheet
-from .Row import Row
from .Column import Column
-from .Formatting import Font, Alignment, Borders, Pattern, Protection
-from .Style import XFStyle, easyxf, easyfont, add_palette_colour
from .ExcelFormula import *
+from .Formatting import Alignment, Borders, Font, Pattern, Protection
+from .Row import Row
+from .Style import XFStyle, add_palette_colour, easyfont, easyxf
+from .Workbook import Workbook
+from .Worksheet import Worksheet
diff --git a/SUEWSPrepare/Modules/xlwt/antlr.py b/SUEWSPrepare/Modules/xlwt/antlr.py
index b9d93f0..be07e13 100644
--- a/SUEWSPrepare/Modules/xlwt/antlr.py
+++ b/SUEWSPrepare/Modules/xlwt/antlr.py
@@ -1,4 +1,12 @@
from __future__ import print_function
+
+## get sys module
+import sys
+
+import six
+
+from .compat import long
+
## This file is part of PyANTLR. See LICENSE.txt for license
## details..........Copyright (C) Wolfgang Haefelinger, 2004.
@@ -41,10 +49,7 @@
## End of contents of the ANTLR 2.7.7 LICENSE.txt ########################
-## get sys module
-import sys
-from .compat import long, basestring, int_types, xrange
###xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx###
### global symbols ###
@@ -93,7 +98,7 @@ def ifelse(cond,_then,_else):
def is_string_type(x):
# return (isinstance(x,str) or isinstance(x,unicode))
# Simplify; xlwt doesn't support Python < 2.3
- return isinstance(basestring)
+ return isinstance(six.string_types)
def assert_string_type(x):
assert is_string_type(x)
@@ -1594,7 +1599,7 @@ def __init__(self,data=None):
raise TypeError("BitSet requires integer, long, or " +
"list argument")
for x in data:
- if not isinstance(x, int_types):
+ if not isinstance(x, six.integer_types):
raise TypeError(self,"List argument item is " +
"not a long: %s" % (x))
self.data = data
@@ -1602,7 +1607,7 @@ def __init__(self,data=None):
def __str__(self):
bits = len(self.data) * BitSet.BITS
s = ""
- for i in xrange(0,bits):
+ for i in range(0,bits):
if self.at(i):
s += "1"
else:
@@ -1649,7 +1654,7 @@ def set(self,bit,on=True):
mask = self.bitMask(bit)
if i>=len(self.data):
d = i - len(self.data) + 1
- for x in xrange(0,d):
+ for x in range(0,d):
self.data.append(0)
assert len(self.data) == i+1
if on:
@@ -2074,7 +2079,7 @@ def trace(self,ee,rname):
if self.inputState.guessing > 0:
guess = " [guessing]"
print((ee + rname + guess))
- for i in xrange(1,self.k+1):
+ for i in range(1,self.k+1):
if i != 1:
print(", ")
if self.LT(i) :
@@ -2801,7 +2806,7 @@ def make(*nodes):
if not nodes:
return None
- for i in xrange(0,len(nodes)):
+ for i in range(0,len(nodes)):
node = nodes[i]
if node:
assert isinstance(node,AST)
@@ -2811,7 +2816,7 @@ def make(*nodes):
if root:
root.setFirstChild(None)
- for i in xrange(1,len(nodes)):
+ for i in range(1,len(nodes)):
if not nodes[i]:
continue
if not root:
diff --git a/SUEWSPrepare/Modules/xlwt/compat.py b/SUEWSPrepare/Modules/xlwt/compat.py
index 4f77a57..e72adf8 100644
--- a/SUEWSPrepare/Modules/xlwt/compat.py
+++ b/SUEWSPrepare/Modules/xlwt/compat.py
@@ -1,28 +1,6 @@
-import sys
+import six
-PY3 = sys.version_info[0] >= 3
-
-if PY3:
- unicode = bytes.decode
- unicode_type = str
- basestring = str
- xrange = range
- int_types = (int,)
+if six.PY3:
long = int
-
- def iteritems(d):
- return iter(d.items())
- def itervalues(d):
- return iter(d.values())
else:
- # Python 2
- unicode = unicode_type = unicode
- basestring = basestring
- xrange = xrange
- int_types = (int, long)
long = long
-
- def iteritems(d):
- return d.iteritems()
- def itervalues(d):
- return d.itervalues()
diff --git a/SUEWSPrepare/Modules/xlwt/doc/pattern_examples.xls b/SUEWSPrepare/Modules/xlwt/doc/pattern_examples.xls
deleted file mode 100644
index 1b61d89..0000000
Binary files a/SUEWSPrepare/Modules/xlwt/doc/pattern_examples.xls and /dev/null differ
diff --git a/SUEWSPrepare/Modules/xlwt/doc/xlwt.html b/SUEWSPrepare/Modules/xlwt/doc/xlwt.html
deleted file mode 100644
index 6efb698..0000000
--- a/SUEWSPrepare/Modules/xlwt/doc/xlwt.html
+++ /dev/null
@@ -1,199 +0,0 @@
-
-
-
-
-The xlwt Module
-
-
-The xlwt Module
-A Python package for generating Microsoft Excel ™ spreadsheet files.
-
-
-General information
-
-State of Documentation
-
-
-This documentation is currently incomplete. There may be methods and
-classes not included and any item marked with a [NC] is not complete and may have further
-parameters, methods, attributes and functionality that are not
-documented. In these cases, you'll have to refer to the source if the
-documentation provided is insufficient.
-
-
-
-
-Module Contents [NC]
-
- - easyxf (function)
- -
-
- This function is used to create and configure XFStyle objects
- for use with (for example) the Worksheet.write method.
-
-
- - strg_to_parse
- -
-
- A string to be parsed to obtain attribute values for Alignment, Borders, Font,
- Pattern and Protection objects. Refer to the examples
- in the file .../examples/xlwt_easyxf_simple_demo.py and to the xf_dict
- dictionary in Style.py. Various synonyms including color/colour, center/centre and gray/grey
- are allowed. Case is irrelevant (except maybe in font names). '-' may be used instead
- of '_'.
- Example: "font: bold on; align: wrap on, vert centre, horiz center"
-
-
- - num_format_str
- -
-
- To get the "number format string" of an existing cell whose format you want to reproduce,
- select the cell and click on Format/Cells/Number/Custom. Otherwise, refer to Excel help.
- Examples: "#,##0.00", "dd/mm/yyyy"
-
-
- - Returns:
- -
- An object of the XFstyle class
-
-
-
-
-
-
- - Workbook (class) [#]
- -
-
The class to instantiate to create a workbook
- For more information about this class, see The Workbook Class.
-
- - Worksheet (class) [#]
- -
-
A class to represent the contents of a sheet in a workbook.
- For more information about this class, see The Worksheet Class.
-
-
-
-
-
-- Workbook(encoding='ascii',style_compression=0) (class) [#]
--
-
- This is a class representing a workbook and all its contents.
- When creating Excel files with xlwt, you will normally start by
- instantiating an object of this class.
-
-
- - encoding
- -
- [NC]
-
- - style_compression
- -
- [NC]
-
- - Returns:
- -
- An object of the Workbook class
-
-
-
-
-- add_sheet(sheetname) [#]
--
-
- This method is used to create Worksheets in a Workbook.
-
-
- - sheetname
- -
- The name to use for this sheet, as it will appear in the tabs at
- the bottom of the Excel application.
-
- - Returns:
- -
- An object of the Worksheet class
-
-
-
-
-- save(filename_or_stream) [#]
--
-
- This method is used to save Workbook to a file in native Excel format.
-
-
- - filename_or_stream
- -
-
- This can be a string containing a filename of the file, in which case
- the excel file is saved to disk using the name provided.
-
-
- It can also be a stream object with a write method, such as a
- StringIO, in which case the data for the excel file is written
- to the stream.
-
-
-
-
-
-
-
-
-
-- Worksheet(sheetname, parent_book) (class) [#]
--
-
- This is a class representing the contents of a sheet in a workbook.
-
-
- WARNING: You don't normally create instances of this class
- yourself. They are returned from calls to Workbook.add_sheet
-
-
-- write(r, c, label="", style=Style.default_style) [#]
--
-
- This method is used to write a cell to a Worksheet..
-
-
- - r
- -
- The zero-relative number of the row in the worksheet to which the cell should be written.
-
- - c
- -
- The zero-relative number of the column in the worksheet to which the cell should be written.
-
- - label
- -
- The data value to be written.
- An int, long, or decimal.Decimal instance is converted to float.
- A unicode instance is written as is.
- A str instance is converted to unicode using the encoding (default: 'ascii') specified
- when the Workbook instance was created.
- A datetime.datetime, datetime.date, or datetime.time instance is converted into Excel date format
- (a float representing the number of days since (typically) 1899-12-31T00:00:00,
- under the pretence that 1900 was a leap year).
- A bool instance will show up as TRUE or FALSE in Excel.
- None causes the cell to be blank -- no data, only formatting.
- An xlwt.Formula instance causes an Excel formula to be written.
- [NC]
-
- - style
- -
- A style -- also known as an XF (extended format) -- is an XFStyle object, which encapsulates
- the formatting applied to the cell and its contents. XFStyle objects are best set up using the
- easyxf function. They may also be set up by setting attributes in
- Alignment, Borders, Pattern, Font and Protection objects
- then setting those objects and a format string as attributes of an XFStyle object.
- [NC]
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/Modules/xlwt/examples/big-16Mb.py b/SUEWSPrepare/Modules/xlwt/examples/big-16Mb.py
deleted file mode 100644
index 91db123..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/big-16Mb.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env python
-# tries stress SST, SAT and MSAT
-
-from time import *
-from xlwt.Workbook import *
-from xlwt.Style import *
-
-style = XFStyle()
-
-wb = Workbook()
-ws0 = wb.add_sheet('0')
-
-colcount = 200 + 1
-rowcount = 6000 + 1
-
-t0 = time()
-print "\nstart: %s" % ctime(t0)
-
-print "Filling..."
-for col in xrange(colcount):
- print "[%d]" % col,
- for row in xrange(rowcount):
- #ws0.write(row, col, "BIG(%d, %d)" % (row, col))
- ws0.write(row, col, "BIG")
-
-t1 = time() - t0
-print "\nsince starting elapsed %.2f s" % (t1)
-
-print "Storing..."
-wb.save('big-16Mb.xls')
-
-t2 = time() - t0
-print "since starting elapsed %.2f s" % (t2)
-
-
diff --git a/SUEWSPrepare/Modules/xlwt/examples/big-35Mb.py b/SUEWSPrepare/Modules/xlwt/examples/big-35Mb.py
deleted file mode 100644
index 837a6df..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/big-35Mb.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-# tries stress SST, SAT and MSAT
-
-from time import *
-from xlwt import *
-
-style = XFStyle()
-
-wb = Workbook()
-ws0 = wb.add_sheet('0')
-
-colcount = 200 + 1
-rowcount = 6000 + 1
-
-t0 = time()
-
-for col in xrange(colcount):
- for row in xrange(rowcount):
- ws0.write(row, col, "BIG(%d, %d)" % (row, col))
-
-t1 = time() - t0
-print "\nsince starting elapsed %.2f s" % (t1)
-
-print "Storing..."
-wb.save('big-35Mb.xls')
-
-t2 = time() - t0
-print "since starting elapsed %.2f s" % (t2)
-
-
diff --git a/SUEWSPrepare/Modules/xlwt/examples/blanks.py b/SUEWSPrepare/Modules/xlwt/examples/blanks.py
deleted file mode 100644
index 056a3ec..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/blanks.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-font0 = Font()
-font0.name = 'Times New Roman'
-font0.struck_out = True
-font0.bold = True
-
-style0 = XFStyle()
-style0.font = font0
-
-
-wb = Workbook()
-ws0 = wb.add_sheet('0')
-
-ws0.write(1, 1, 'Test', style0)
-
-for i in range(0, 0x53):
- borders = Borders()
- borders.left = i
- borders.right = i
- borders.top = i
- borders.bottom = i
-
- style = XFStyle()
- style.borders = borders
-
- ws0.write(i, 2, '', style)
- ws0.write(i, 3, hex(i), style0)
-
-ws0.write_merge(5, 8, 6, 10, "")
-
-wb.save('blanks.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/col_width.py b/SUEWSPrepare/Modules/xlwt/examples/col_width.py
deleted file mode 100644
index db0419c..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/col_width.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-__rev_id__ = """$Id$"""
-
-
-from xlwt import *
-
-w = Workbook()
-ws = w.add_sheet('Hey, Dude')
-
-for i in range(6, 80):
- fnt = Font()
- fnt.height = i*20
- style = XFStyle()
- style.font = fnt
- ws.write(1, i, 'Test')
- ws.col(i).width = 0x0d00 + i
-w.save('col_width.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/country.py b/SUEWSPrepare/Modules/xlwt/examples/country.py
deleted file mode 100644
index cb26e29..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/country.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1252 -*-
-# Copyright (C) 2007 John Machin
-
-from xlwt import *
-
-w = Workbook()
-w.country_code = 61
-ws = w.add_sheet('AU')
-w.save('country.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/dates.py b/SUEWSPrepare/Modules/xlwt/examples/dates.py
deleted file mode 100644
index 389b93b..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/dates.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-from datetime import datetime
-
-w = Workbook()
-ws = w.add_sheet('Hey, Dude')
-
-fmts = [
- 'M/D/YY',
- 'D-MMM-YY',
- 'D-MMM',
- 'MMM-YY',
- 'h:mm AM/PM',
- 'h:mm:ss AM/PM',
- 'h:mm',
- 'h:mm:ss',
- 'M/D/YY h:mm',
- 'mm:ss',
- '[h]:mm:ss',
- 'mm:ss.0',
-]
-
-i = 0
-for fmt in fmts:
- ws.write(i, 0, fmt)
-
- style = XFStyle()
- style.num_format_str = fmt
-
- ws.write(i, 4, datetime.now(), style)
-
- i += 1
-
-w.save('dates.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/format.py b/SUEWSPrepare/Modules/xlwt/examples/format.py
deleted file mode 100644
index bcd4075..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/format.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-font0 = Font()
-font0.name = 'Times New Roman'
-font0.struck_out = True
-font0.bold = True
-
-style0 = XFStyle()
-style0.font = font0
-
-
-wb = Workbook()
-ws0 = wb.add_sheet('0')
-
-ws0.write(1, 1, 'Test', style0)
-
-for i in range(0, 0x53):
- fnt = Font()
- fnt.name = 'Arial'
- fnt.colour_index = i
- fnt.outline = True
-
- borders = Borders()
- borders.left = i
-
- style = XFStyle()
- style.font = fnt
- style.borders = borders
-
- ws0.write(i, 2, 'colour', style)
- ws0.write(i, 3, hex(i), style0)
-
-wb.save('format.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/formula_names.py b/SUEWSPrepare/Modules/xlwt/examples/formula_names.py
deleted file mode 100644
index f0354bc..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/formula_names.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-from xlwt.ExcelFormulaParser import FormulaParseException
-
-w = Workbook()
-ws = w.add_sheet('F')
-
-## This example is a little silly since the formula building is
-## so simplistic that it often fails because the generated text
-## has the wrong number of parameters for the function being
-## tested.
-
-i = 0
-succeed_count = 0
-fail_count = 0
-for n in sorted(ExcelMagic.std_func_by_name):
- ws.write(i, 0, n)
- text = n + "($A$1)"
- try:
- formula = Formula(text)
- except FormulaParseException,e:
- print "Could not parse %r: %s" % (text,e.args[0])
- fail_count += 1
- else:
- ws.write(i, 3, formula)
- succeed_count += 1
- i += 1
-
-w.save('formula_names.xls')
-
-print "succeeded with %i functions, failed with %i" % (succeed_count,fail_count)
diff --git a/SUEWSPrepare/Modules/xlwt/examples/formulas.py b/SUEWSPrepare/Modules/xlwt/examples/formulas.py
deleted file mode 100644
index b89f5f5..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/formulas.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-w = Workbook()
-ws = w.add_sheet('F')
-
-ws.write(0, 0, Formula("-(1+1)"))
-ws.write(1, 0, Formula("-(1+1)/(-2-2)"))
-ws.write(2, 0, Formula("-(134.8780789+1)"))
-ws.write(3, 0, Formula("-(134.8780789e-10+1)"))
-ws.write(4, 0, Formula("-1/(1+1)+9344"))
-
-ws.write(0, 1, Formula("-(1+1)"))
-ws.write(1, 1, Formula("-(1+1)/(-2-2)"))
-ws.write(2, 1, Formula("-(134.8780789+1)"))
-ws.write(3, 1, Formula("-(134.8780789e-10+1)"))
-ws.write(4, 1, Formula("-1/(1+1)+9344"))
-
-ws.write(0, 2, Formula("A1*B1"))
-ws.write(1, 2, Formula("A2*B2"))
-ws.write(2, 2, Formula("A3*B3"))
-ws.write(3, 2, Formula("A4*B4*sin(pi()/4)"))
-ws.write(4, 2, Formula("A5%*B5*pi()/1000"))
-
-##############
-## NOTE: parameters are separated by semicolon!!!
-##############
-
-
-ws.write(5, 2, Formula("C1+C2+C3+C4+C5/(C1+C2+C3+C4/(C1+C2+C3+C4/(C1+C2+C3+C4)+C5)+C5)-20.3e-2"))
-ws.write(5, 3, Formula("C1^2"))
-ws.write(6, 2, Formula("SUM(C1;C2;;;;;C3;;;C4)"))
-ws.write(6, 3, Formula("SUM($A$1:$C$5)"))
-
-ws.write(7, 0, Formula('"lkjljllkllkl"'))
-ws.write(7, 1, Formula('"yuyiyiyiyi"'))
-ws.write(7, 2, Formula('A8 & B8 & A8'))
-ws.write(8, 2, Formula('now()'))
-
-ws.write(10, 2, Formula('TRUE'))
-ws.write(11, 2, Formula('FALSE'))
-ws.write(12, 3, Formula('IF(A1>A2;3;"hkjhjkhk")'))
-
-w.save('formulas.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/hyperlinks.py b/SUEWSPrepare/Modules/xlwt/examples/hyperlinks.py
deleted file mode 100644
index 8de611b..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/hyperlinks.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-f = Font()
-f.height = 20*72
-f.name = 'Verdana'
-f.bold = True
-f.underline = Font.UNDERLINE_DOUBLE
-f.colour_index = 4
-
-h_style = XFStyle()
-h_style.font = f
-
-w = Workbook()
-ws = w.add_sheet('F')
-
-##############
-## NOTE: parameters are separated by semicolon!!!
-##############
-
-n = "HYPERLINK"
-ws.write_merge(1, 1, 1, 10, Formula(n + '("http://www.irs.gov/pub/irs-pdf/f1000.pdf";"f1000.pdf")'), h_style)
-ws.write_merge(2, 2, 2, 25, Formula(n + '("mailto:roman.kiseliov@gmail.com?subject=pyExcelerator-feedback&Body=Hello,%20Roman!";"pyExcelerator-feedback")'), h_style)
-
-w.save("hyperlinks.xls")
diff --git a/SUEWSPrepare/Modules/xlwt/examples/image.py b/SUEWSPrepare/Modules/xlwt/examples/image.py
deleted file mode 100644
index f926b8d..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/image.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-w = Workbook()
-ws = w.add_sheet('Image')
-ws.insert_bitmap('python.bmp', 2, 2)
-ws.insert_bitmap('python.bmp', 10, 2)
-
-w.save('image.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/image_chg_col_wid.py b/SUEWSPrepare/Modules/xlwt/examples/image_chg_col_wid.py
deleted file mode 100644
index bfa8ca4..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/image_chg_col_wid.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# This demonstrates the effect of changing the column width
-# when inserting a picture/image.
-
-import xlwt
-w = xlwt.Workbook()
-ws = w.add_sheet('Image')
-
-ws.write(0, 2, "chg wid: none")
-ws.insert_bitmap('python.bmp', 2, 2)
-
-ws.write(0, 4, "chg wid: after")
-ws.insert_bitmap('python.bmp', 2, 4)
-ws.col(4).width = 20 * 256
-
-ws.write(0, 6, "chg wid: before")
-ws.col(6).width = 20 * 256
-ws.insert_bitmap('python.bmp', 2, 6)
-
-ws.write(0, 8, "chg wid: after")
-ws.insert_bitmap('python.bmp', 2, 8)
-ws.col(5).width = 8 * 256
-
-ws.write(0, 10, "chg wid: before")
-ws.col(10).width = 8 * 256
-ws.insert_bitmap('python.bmp', 2, 10)
-
-w.save('image_chg_col_wid.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/merged.py b/SUEWSPrepare/Modules/xlwt/examples/merged.py
deleted file mode 100644
index 352e947..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/merged.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-fnt = Font()
-fnt.name = 'Arial'
-fnt.colour_index = 4
-fnt.bold = True
-
-borders = Borders()
-borders.left = 6
-borders.right = 6
-borders.top = 6
-borders.bottom = 6
-
-al = Alignment()
-al.horz = Alignment.HORZ_CENTER
-al.vert = Alignment.VERT_CENTER
-
-style = XFStyle()
-style.font = fnt
-style.borders = borders
-style.alignment = al
-
-
-wb = Workbook()
-ws0 = wb.add_sheet('sheet0')
-ws1 = wb.add_sheet('sheet1')
-ws2 = wb.add_sheet('sheet2')
-
-for i in range(0, 0x200, 2):
- ws0.write_merge(i, i+1, 1, 5, 'test %d' % i, style)
- ws1.write_merge(i, i, 1, 7, 'test %d' % i, style)
- ws2.write_merge(i, i+1, 1, 7 + (i%10), 'test %d' % i, style)
-
-wb.save('merged.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/merged0.py b/SUEWSPrepare/Modules/xlwt/examples/merged0.py
deleted file mode 100644
index 93496c6..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/merged0.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-wb = Workbook()
-ws0 = wb.add_sheet('sheet0')
-
-
-fnt = Font()
-fnt.name = 'Arial'
-fnt.colour_index = 4
-fnt.bold = True
-
-borders = Borders()
-borders.left = 6
-borders.right = 6
-borders.top = 6
-borders.bottom = 6
-
-style = XFStyle()
-style.font = fnt
-style.borders = borders
-
-ws0.write_merge(3, 3, 1, 5, 'test1', style)
-ws0.write_merge(4, 10, 1, 5, 'test2', style)
-ws0.col(1).width = 0x0d00
-
-wb.save('merged0.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/merged1.py b/SUEWSPrepare/Modules/xlwt/examples/merged1.py
deleted file mode 100644
index af415f5..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/merged1.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-wb = Workbook()
-ws0 = wb.add_sheet('sheet0')
-
-fnt1 = Font()
-fnt1.name = 'Verdana'
-fnt1.bold = True
-fnt1.height = 18*0x14
-
-pat1 = Pattern()
-pat1.pattern = Pattern.SOLID_PATTERN
-pat1.pattern_fore_colour = 0x16
-
-brd1 = Borders()
-brd1.left = 0x06
-brd1.right = 0x06
-brd1.top = 0x06
-brd1.bottom = 0x06
-
-fnt2 = Font()
-fnt2.name = 'Verdana'
-fnt2.bold = True
-fnt2.height = 14*0x14
-
-brd2 = Borders()
-brd2.left = 0x01
-brd2.right = 0x01
-brd2.top = 0x01
-brd2.bottom = 0x01
-
-pat2 = Pattern()
-pat2.pattern = Pattern.SOLID_PATTERN
-pat2.pattern_fore_colour = 0x01F
-
-fnt3 = Font()
-fnt3.name = 'Verdana'
-fnt3.bold = True
-fnt3.italic = True
-fnt3.height = 12*0x14
-
-brd3 = Borders()
-brd3.left = 0x07
-brd3.right = 0x07
-brd3.top = 0x07
-brd3.bottom = 0x07
-
-fnt4 = Font()
-
-al1 = Alignment()
-al1.horz = Alignment.HORZ_CENTER
-al1.vert = Alignment.VERT_CENTER
-
-al2 = Alignment()
-al2.horz = Alignment.HORZ_RIGHT
-al2.vert = Alignment.VERT_CENTER
-
-al3 = Alignment()
-al3.horz = Alignment.HORZ_LEFT
-al3.vert = Alignment.VERT_CENTER
-
-style1 = XFStyle()
-style1.font = fnt1
-style1.alignment = al1
-style1.pattern = pat1
-style1.borders = brd1
-
-style2 = XFStyle()
-style2.font = fnt2
-style2.alignment = al1
-style2.pattern = pat2
-style2.borders = brd2
-
-style3 = XFStyle()
-style3.font = fnt3
-style3.alignment = al1
-style3.pattern = pat2
-style3.borders = brd3
-
-price_style = XFStyle()
-price_style.font = fnt4
-price_style.alignment = al2
-price_style.borders = brd3
-price_style.num_format_str = '_(#,##0.00_) "money"'
-
-ware_style = XFStyle()
-ware_style.font = fnt4
-ware_style.alignment = al3
-ware_style.borders = brd3
-
-
-ws0.merge(3, 3, 1, 5, style1)
-ws0.merge(4, 10, 1, 6, style2)
-ws0.merge(14, 16, 1, 7, style3)
-ws0.col(1).width = 0x0d00
-
-wb.save('merged1.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/mini.py b/SUEWSPrepare/Modules/xlwt/examples/mini.py
deleted file mode 100644
index 61bb30c..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/mini.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-w = Workbook()
-ws = w.add_sheet('xlwt was here')
-w.save('mini.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/num_formats.py b/SUEWSPrepare/Modules/xlwt/examples/num_formats.py
deleted file mode 100644
index 3a56f6c..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/num_formats.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-w = Workbook()
-ws = w.add_sheet('Hey, Dude')
-
-fmts = [
- 'general',
- '0',
- '0.00',
- '#,##0',
- '#,##0.00',
- '"$"#,##0_);("$"#,##',
- '"$"#,##0_);[Red]("$"#,##',
- '"$"#,##0.00_);("$"#,##',
- '"$"#,##0.00_);[Red]("$"#,##',
- '0%',
- '0.00%',
- '0.00E+00',
- '# ?/?',
- '# ??/??',
- 'M/D/YY',
- 'D-MMM-YY',
- 'D-MMM',
- 'MMM-YY',
- 'h:mm AM/PM',
- 'h:mm:ss AM/PM',
- 'h:mm',
- 'h:mm:ss',
- 'M/D/YY h:mm',
- '_(#,##0_);(#,##0)',
- '_(#,##0_);[Red](#,##0)',
- '_(#,##0.00_);(#,##0.00)',
- '_(#,##0.00_);[Red](#,##0.00)',
- '_("$"* #,##0_);_("$"* (#,##0);_("$"* "-"_);_(@_)',
- '_(* #,##0_);_(* (#,##0);_(* "-"_);_(@_)',
- '_("$"* #,##0.00_);_("$"* (#,##0.00);_("$"* "-"??_);_(@_)',
- '_(* #,##0.00_);_(* (#,##0.00);_(* "-"??_);_(@_)',
- 'mm:ss',
- '[h]:mm:ss',
- 'mm:ss.0',
- '##0.0E+0',
- '@'
-]
-
-i = 0
-for fmt in fmts:
- ws.write(i, 0, fmt)
-
- style = XFStyle()
- style.num_format_str = fmt
-
- ws.write(i, 4, -1278.9078, style)
-
- i += 1
-
-w.save('num_formats.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/numbers_demo.py b/SUEWSPrepare/Modules/xlwt/examples/numbers_demo.py
deleted file mode 100644
index 524d9fc..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/numbers_demo.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-w = Workbook()
-ws = w.add_sheet('Hey, Dude')
-
-ws.write(0, 0, 1)
-ws.write(1, 0, 1.23)
-ws.write(2, 0, 12345678)
-ws.write(3, 0, 123456.78)
-
-ws.write(0, 1, -1)
-ws.write(1, 1, -1.23)
-ws.write(2, 1, -12345678)
-ws.write(3, 1, -123456.78)
-
-ws.write(0, 2, -17867868678687.0)
-ws.write(1, 2, -1.23e-5)
-ws.write(2, 2, -12345678.90780980)
-ws.write(3, 2, -123456.78)
-
-w.save('numbers.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/outline.py b/SUEWSPrepare/Modules/xlwt/examples/outline.py
deleted file mode 100644
index 65f2bc9..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/outline.py
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-fnt = Font()
-fnt.name = 'Arial'
-fnt.colour_index = 4
-fnt.bold = True
-
-borders = Borders()
-borders.left = 6
-borders.right = 6
-borders.top = 6
-borders.bottom = 6
-
-style = XFStyle()
-style.font = fnt
-style.borders = borders
-
-wb = Workbook()
-
-ws0 = wb.add_sheet('Rows Outline')
-
-ws0.write_merge(1, 1, 1, 5, 'test 1', style)
-ws0.write_merge(2, 2, 1, 4, 'test 1', style)
-ws0.write_merge(3, 3, 1, 3, 'test 2', style)
-ws0.write_merge(4, 4, 1, 4, 'test 1', style)
-ws0.write_merge(5, 5, 1, 4, 'test 3', style)
-ws0.write_merge(6, 6, 1, 5, 'test 1', style)
-ws0.write_merge(7, 7, 1, 5, 'test 4', style)
-ws0.write_merge(8, 8, 1, 4, 'test 1', style)
-ws0.write_merge(9, 9, 1, 3, 'test 5', style)
-
-ws0.row(1).level = 1
-ws0.row(2).level = 1
-ws0.row(3).level = 2
-ws0.row(4).level = 2
-ws0.row(5).level = 2
-ws0.row(6).level = 2
-ws0.row(7).level = 2
-ws0.row(8).level = 1
-ws0.row(9).level = 1
-
-
-ws1 = wb.add_sheet('Columns Outline')
-
-ws1.write_merge(1, 1, 1, 5, 'test 1', style)
-ws1.write_merge(2, 2, 1, 4, 'test 1', style)
-ws1.write_merge(3, 3, 1, 3, 'test 2', style)
-ws1.write_merge(4, 4, 1, 4, 'test 1', style)
-ws1.write_merge(5, 5, 1, 4, 'test 3', style)
-ws1.write_merge(6, 6, 1, 5, 'test 1', style)
-ws1.write_merge(7, 7, 1, 5, 'test 4', style)
-ws1.write_merge(8, 8, 1, 4, 'test 1', style)
-ws1.write_merge(9, 9, 1, 3, 'test 5', style)
-
-ws1.col(1).level = 1
-ws1.col(2).level = 1
-ws1.col(3).level = 2
-ws1.col(4).level = 2
-ws1.col(5).level = 2
-ws1.col(6).level = 2
-ws1.col(7).level = 2
-ws1.col(8).level = 1
-ws1.col(9).level = 1
-
-
-ws2 = wb.add_sheet('Rows and Columns Outline')
-
-ws2.write_merge(1, 1, 1, 5, 'test 1', style)
-ws2.write_merge(2, 2, 1, 4, 'test 1', style)
-ws2.write_merge(3, 3, 1, 3, 'test 2', style)
-ws2.write_merge(4, 4, 1, 4, 'test 1', style)
-ws2.write_merge(5, 5, 1, 4, 'test 3', style)
-ws2.write_merge(6, 6, 1, 5, 'test 1', style)
-ws2.write_merge(7, 7, 1, 5, 'test 4', style)
-ws2.write_merge(8, 8, 1, 4, 'test 1', style)
-ws2.write_merge(9, 9, 1, 3, 'test 5', style)
-
-ws2.row(1).level = 1
-ws2.row(2).level = 1
-ws2.row(3).level = 2
-ws2.row(4).level = 2
-ws2.row(5).level = 2
-ws2.row(6).level = 2
-ws2.row(7).level = 2
-ws2.row(8).level = 1
-ws2.row(9).level = 1
-
-ws2.write_merge(1, 1, 1, 5, 'test 1', style)
-ws2.write_merge(2, 2, 1, 4, 'test 1', style)
-ws2.write_merge(3, 3, 1, 3, 'test 2', style)
-ws2.write_merge(4, 4, 1, 4, 'test 1', style)
-ws2.write_merge(5, 5, 1, 4, 'test 3', style)
-ws2.write_merge(6, 6, 1, 5, 'test 1', style)
-ws2.write_merge(7, 7, 1, 5, 'test 4', style)
-ws2.write_merge(8, 8, 1, 4, 'test 1', style)
-ws2.write_merge(9, 9, 1, 3, 'test 5', style)
-
-ws2.col(1).level = 1
-ws2.col(2).level = 1
-ws2.col(3).level = 2
-ws2.col(4).level = 2
-ws2.col(5).level = 2
-ws2.col(6).level = 2
-ws2.col(7).level = 2
-ws2.col(8).level = 1
-ws2.col(9).level = 1
-
-wb.save('outline.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/panes.py b/SUEWSPrepare/Modules/xlwt/examples/panes.py
deleted file mode 100644
index 9fd83b0..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/panes.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-w = Workbook()
-ws1 = w.add_sheet('sheet 1')
-ws2 = w.add_sheet('sheet 2')
-ws3 = w.add_sheet('sheet 3')
-ws4 = w.add_sheet('sheet 4')
-ws5 = w.add_sheet('sheet 5')
-ws6 = w.add_sheet('sheet 6')
-
-for i in range(0x100):
- ws1.write(i/0x10, i%0x10, i)
-
-for i in range(0x100):
- ws2.write(i/0x10, i%0x10, i)
-
-for i in range(0x100):
- ws3.write(i/0x10, i%0x10, i)
-
-for i in range(0x100):
- ws4.write(i/0x10, i%0x10, i)
-
-for i in range(0x100):
- ws5.write(i/0x10, i%0x10, i)
-
-for i in range(0x100):
- ws6.write(i/0x10, i%0x10, i)
-
-ws1.panes_frozen = True
-ws1.horz_split_pos = 2
-
-ws2.panes_frozen = True
-ws2.vert_split_pos = 2
-
-ws3.panes_frozen = True
-ws3.horz_split_pos = 1
-ws3.vert_split_pos = 1
-
-ws4.panes_frozen = False
-ws4.horz_split_pos = 12
-ws4.horz_split_first_visible = 2
-
-ws5.panes_frozen = False
-ws5.vert_split_pos = 40
-ws4.vert_split_first_visible = 2
-
-ws6.panes_frozen = False
-ws6.horz_split_pos = 12
-ws4.horz_split_first_visible = 2
-ws6.vert_split_pos = 40
-ws4.vert_split_first_visible = 2
-
-w.save('panes.xls')
-
diff --git a/SUEWSPrepare/Modules/xlwt/examples/panes2.py b/SUEWSPrepare/Modules/xlwt/examples/panes2.py
deleted file mode 100644
index f6fe6b7..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/panes2.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: ascii -*-
-# portions Copyright (C) 2005 Kiseliov Roman
-
-import xlwt
-
-w = xlwt.Workbook()
-sheets = [w.add_sheet('sheet ' + str(sheetx+1)) for sheetx in xrange(7)]
-ws1, ws2, ws3, ws4, ws5, ws6, ws7 = sheets
-for sheet in sheets:
- for i in range(0x100):
- sheet.write(i // 0x10, i % 0x10, i)
-
-H = 1
-V = 2
-HF = H + 2
-VF = V + 2
-
-ws1.panes_frozen = True
-ws1.horz_split_pos = H
-ws1.horz_split_first_visible = HF
-
-ws2.panes_frozen = True
-ws2.vert_split_pos = V
-ws2.vert_split_first_visible = VF
-
-ws3.panes_frozen = True
-ws3.horz_split_pos = H
-ws3.vert_split_pos = V
-ws3.horz_split_first_visible = HF
-ws3.vert_split_first_visible = VF
-
-H = 10
-V = 12
-HF = H + 2
-VF = V + 2
-
-ws4.panes_frozen = False
-ws4.horz_split_pos = H * 12.75 # rows
-ws4.horz_split_first_visible = HF
-
-ws5.panes_frozen = False
-ws5.vert_split_pos = V * 8.43 # rows
-ws5.vert_split_first_visible = VF
-
-ws6.panes_frozen = False
-ws6.horz_split_pos = H * 12.75 # rows
-ws6.horz_split_first_visible = HF
-ws6.vert_split_pos = V * 8.43 # cols
-ws6.vert_split_first_visible = VF
-
-ws7.split_position_units_are_twips = True
-ws7.panes_frozen = False
-ws7.horz_split_pos = H * 250 + 240 # twips
-ws7.horz_split_first_visible = HF
-ws7.vert_split_pos = V * 955 + 410 # twips
-ws7.vert_split_first_visible = VF
-
-w.save('panes2.xls')
-
diff --git a/SUEWSPrepare/Modules/xlwt/examples/panes3.py b/SUEWSPrepare/Modules/xlwt/examples/panes3.py
deleted file mode 100644
index 83f8970..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/panes3.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from xlwt import Workbook
-from xlwt.BIFFRecords import PanesRecord
-w = Workbook()
-
-# do each of the 4 scenarios with each of the 4 possible
-# active pane settings
-
-for px,py in (
- (0,0), # no split
- (0,10), # horizontal split
- (10,0), # vertical split
- (10,10), # both split
- ):
-
- for active in range(4):
-
- # 0 - logical bottom-right pane
- # 1 - logical top-right pane
- # 2 - logical bottom-left pane
- # 3 - logical top-left pane
-
- # only set valid values:
- if active not in PanesRecord.valid_active_pane.get(
- (int(px > 0),int(py > 0))
- ):
- continue
-
- sheet = w.add_sheet('px-%i py-%i active-%i' %(
- px,py,active
- ))
-
- for rx in range(20):
- for cx in range(20):
- sheet.write(rx,cx,'R%iC%i'%(rx,cx))
-
- sheet.panes_frozen = False
- sheet.vert_split_pos = px * 8.43
- sheet.horz_split_pos = py * 12.75
- sheet.active_pane = active
-
-w.save('panes3.xls')
-
diff --git a/SUEWSPrepare/Modules/xlwt/examples/parse-fmla.py b/SUEWSPrepare/Modules/xlwt/examples/parse-fmla.py
deleted file mode 100644
index 06f68eb..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/parse-fmla.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from xlwt import ExcelFormulaParser, ExcelFormula
-import sys
-
-f = ExcelFormula.Formula(
-""" -((1.80 + 2.898 * 1)/(1.80 + 2.898))*
-AVERAGE((1.80 + 2.898 * 1)/(1.80 + 2.898);
- (1.80 + 2.898 * 1)/(1.80 + 2.898);
- (1.80 + 2.898 * 1)/(1.80 + 2.898)) +
-SIN(PI()/4)""")
-
-#for t in f.rpn():
-# print "%15s %15s" % (ExcelFormulaParser.PtgNames[t[0]], t[1])
diff --git a/SUEWSPrepare/Modules/xlwt/examples/protection.py b/SUEWSPrepare/Modules/xlwt/examples/protection.py
deleted file mode 100644
index db54cb0..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/protection.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-fnt = Font()
-fnt.name = 'Arial'
-fnt.colour_index = 4
-fnt.bold = True
-
-borders = Borders()
-borders.left = 6
-borders.right = 6
-borders.top = 6
-borders.bottom = 6
-
-style = XFStyle()
-style.font = fnt
-style.borders = borders
-
-wb = Workbook()
-
-ws0 = wb.add_sheet('Rows Outline')
-
-ws0.write_merge(1, 1, 1, 5, 'test 1', style)
-ws0.write_merge(2, 2, 1, 4, 'test 1', style)
-ws0.write_merge(3, 3, 1, 3, 'test 2', style)
-ws0.write_merge(4, 4, 1, 4, 'test 1', style)
-ws0.write_merge(5, 5, 1, 4, 'test 3', style)
-ws0.write_merge(6, 6, 1, 5, 'test 1', style)
-ws0.write_merge(7, 7, 1, 5, 'test 4', style)
-ws0.write_merge(8, 8, 1, 4, 'test 1', style)
-ws0.write_merge(9, 9, 1, 3, 'test 5', style)
-
-ws0.row(1).level = 1
-ws0.row(2).level = 1
-ws0.row(3).level = 2
-ws0.row(4).level = 2
-ws0.row(5).level = 2
-ws0.row(6).level = 2
-ws0.row(7).level = 2
-ws0.row(8).level = 1
-ws0.row(9).level = 1
-
-
-ws1 = wb.add_sheet('Columns Outline')
-
-ws1.write_merge(1, 1, 1, 5, 'test 1', style)
-ws1.write_merge(2, 2, 1, 4, 'test 1', style)
-ws1.write_merge(3, 3, 1, 3, 'test 2', style)
-ws1.write_merge(4, 4, 1, 4, 'test 1', style)
-ws1.write_merge(5, 5, 1, 4, 'test 3', style)
-ws1.write_merge(6, 6, 1, 5, 'test 1', style)
-ws1.write_merge(7, 7, 1, 5, 'test 4', style)
-ws1.write_merge(8, 8, 1, 4, 'test 1', style)
-ws1.write_merge(9, 9, 1, 3, 'test 5', style)
-
-ws1.col(1).level = 1
-ws1.col(2).level = 1
-ws1.col(3).level = 2
-ws1.col(4).level = 2
-ws1.col(5).level = 2
-ws1.col(6).level = 2
-ws1.col(7).level = 2
-ws1.col(8).level = 1
-ws1.col(9).level = 1
-
-
-ws2 = wb.add_sheet('Rows and Columns Outline')
-
-ws2.write_merge(1, 1, 1, 5, 'test 1', style)
-ws2.write_merge(2, 2, 1, 4, 'test 1', style)
-ws2.write_merge(3, 3, 1, 3, 'test 2', style)
-ws2.write_merge(4, 4, 1, 4, 'test 1', style)
-ws2.write_merge(5, 5, 1, 4, 'test 3', style)
-ws2.write_merge(6, 6, 1, 5, 'test 1', style)
-ws2.write_merge(7, 7, 1, 5, 'test 4', style)
-ws2.write_merge(8, 8, 1, 4, 'test 1', style)
-ws2.write_merge(9, 9, 1, 3, 'test 5', style)
-
-ws2.row(1).level = 1
-ws2.row(2).level = 1
-ws2.row(3).level = 2
-ws2.row(4).level = 2
-ws2.row(5).level = 2
-ws2.row(6).level = 2
-ws2.row(7).level = 2
-ws2.row(8).level = 1
-ws2.row(9).level = 1
-
-ws2.col(1).level = 1
-ws2.col(2).level = 1
-ws2.col(3).level = 2
-ws2.col(4).level = 2
-ws2.col(5).level = 2
-ws2.col(6).level = 2
-ws2.col(7).level = 2
-ws2.col(8).level = 1
-ws2.col(9).level = 1
-
-
-ws0.protect = True
-ws0.wnd_protect = True
-ws0.obj_protect = True
-ws0.scen_protect = True
-ws0.password = "123456"
-
-ws1.protect = True
-ws1.wnd_protect = True
-ws1.obj_protect = True
-ws1.scen_protect = True
-ws1.password = "abcdefghij"
-
-ws2.protect = True
-ws2.wnd_protect = True
-ws2.obj_protect = True
-ws2.scen_protect = True
-ws2.password = "ok"
-
-wb.protect = True
-wb.wnd_protect = True
-wb.obj_protect = True
-wb.save('protection.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/python.bmp b/SUEWSPrepare/Modules/xlwt/examples/python.bmp
deleted file mode 100644
index bd1ba3f..0000000
Binary files a/SUEWSPrepare/Modules/xlwt/examples/python.bmp and /dev/null differ
diff --git a/SUEWSPrepare/Modules/xlwt/examples/row_styles.py b/SUEWSPrepare/Modules/xlwt/examples/row_styles.py
deleted file mode 100644
index dd6d494..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/row_styles.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-w = Workbook()
-ws = w.add_sheet('Hey, Dude')
-
-for i in range(6, 80):
- fnt = Font()
- fnt.height = i*20
- style = XFStyle()
- style.font = fnt
- ws.write(i, 1, 'Test')
- ws.row(i).set_style(style)
-w.save('row_styles.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/row_styles_empty.py b/SUEWSPrepare/Modules/xlwt/examples/row_styles_empty.py
deleted file mode 100644
index a519350..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/row_styles_empty.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-__rev_id__ = """$Id$"""
-
-
-from pyExcelerator import *
-
-w = Workbook()
-ws = w.add_sheet('Hey, Dude')
-
-for i in range(6, 80):
- fnt = Font()
- fnt.height = i*20
- style = XFStyle()
- style.font = fnt
- ws.row(i).set_style(style)
-w.save('row_styles_empty.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/simple.py b/SUEWSPrepare/Modules/xlwt/examples/simple.py
deleted file mode 100644
index 44f7622..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/simple.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import xlwt
-from datetime import datetime
-
-font0 = xlwt.Font()
-font0.name = 'Times New Roman'
-font0.colour_index = 2
-font0.bold = True
-
-style0 = xlwt.XFStyle()
-style0.font = font0
-
-style1 = xlwt.XFStyle()
-style1.num_format_str = 'D-MMM-YY'
-
-wb = xlwt.Workbook()
-ws = wb.add_sheet('A Test Sheet')
-
-ws.write(0, 0, 'Test', style0)
-ws.write(1, 0, datetime.now(), style1)
-ws.write(2, 0, 1)
-ws.write(2, 1, 1)
-ws.write(2, 2, xlwt.Formula("A3+B3"))
-
-wb.save('example.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/sst.py b/SUEWSPrepare/Modules/xlwt/examples/sst.py
deleted file mode 100644
index fd826d2..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/sst.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-font0 = Formatting.Font()
-font0.name = 'Arial'
-font1 = Formatting.Font()
-font1.name = 'Arial Cyr'
-font2 = Formatting.Font()
-font2.name = 'Times New Roman'
-font3 = Formatting.Font()
-font3.name = 'Courier New Cyr'
-
-num_format0 = '0.00000'
-num_format1 = '0.000000'
-num_format2 = '0.0000000'
-num_format3 = '0.00000000'
-
-st0 = XFStyle()
-st1 = XFStyle()
-st2 = XFStyle()
-st3 = XFStyle()
-st4 = XFStyle()
-
-st0.font = font0
-st0.num_format = num_format0
-
-st1.font = font1
-st1.num_format = num_format1
-
-st2.font = font2
-st2.num_format = num_format2
-
-st3.font = font3
-st3.num_format = num_format3
-
-wb = Workbook()
-
-wb.add_style(st0)
-wb.add_style(st1)
-wb.add_style(st2)
-wb.add_style(st3)
-
-ws0 = wb.add_sheet('0')
-ws0.write(0, 0, 'Olya'*0x4000, st0)
-
-#for i in range(0, 0x10):
-# ws0.write(i, 2, ('%d'%i)*0x4000, st1)
-
-wb.save('sst.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/unicode0.py b/SUEWSPrepare/Modules/xlwt/examples/unicode0.py
deleted file mode 100644
index 3651ec9..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/unicode0.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-import xlwt
-
-# Strings passed to (for example) Worksheet.write can be unicode objects,
-# or str (8-bit) objects, which are then decoded into unicode.
-# The encoding to be used defaults to 'ascii'. This can be overridden
-# when the Workbook instance is created:
-
-book = xlwt.Workbook(encoding='cp1251')
-sheet = book.add_sheet('cp1251-demo')
-sheet.write(0, 0, '\xce\xeb\xff')
-book.save('unicode0.xls')
diff --git a/SUEWSPrepare/Modules/xlwt/examples/unicode1.py b/SUEWSPrepare/Modules/xlwt/examples/unicode1.py
deleted file mode 100644
index 90e99cc..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/unicode1.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-w = Workbook()
-ws1 = w.add_sheet(u'\N{GREEK SMALL LETTER ALPHA}\N{GREEK SMALL LETTER BETA}\N{GREEK SMALL LETTER GAMMA}')
-
-ws1.write(0, 0, u'\N{GREEK SMALL LETTER ALPHA}\N{GREEK SMALL LETTER BETA}\N{GREEK SMALL LETTER GAMMA}')
-ws1.write(1, 1, u'\N{GREEK SMALL LETTER DELTA}x = 1 + \N{GREEK SMALL LETTER DELTA}')
-
-ws1.write(2,0, u'A\u2262\u0391.') # RFC2152 example
-ws1.write(3,0, u'Hi Mom -\u263a-!') # RFC2152 example
-ws1.write(4,0, u'\u65E5\u672C\u8A9E') # RFC2152 example
-ws1.write(5,0, u'Item 3 is \u00a31.') # RFC2152 example
-ws1.write(8,0, u'\N{INTEGRAL}') # RFC2152 example
-
-w.add_sheet(u'A\u2262\u0391.') # RFC2152 example
-w.add_sheet(u'Hi Mom -\u263a-!') # RFC2152 example
-one_more_ws = w.add_sheet(u'\u65E5\u672C\u8A9E') # RFC2152 example
-w.add_sheet(u'Item 3 is \u00a31.') # RFC2152 example
-
-one_more_ws.write(0, 0, u'\u2665\u2665')
-
-w.add_sheet(u'\N{GREEK SMALL LETTER ETA WITH TONOS}')
-w.save('unicode1.xls')
-
diff --git a/SUEWSPrepare/Modules/xlwt/examples/unicode2.py b/SUEWSPrepare/Modules/xlwt/examples/unicode2.py
deleted file mode 100644
index 18904b0..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/unicode2.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: windows-1251 -*-
-# Copyright (C) 2005 Kiseliov Roman
-
-from xlwt import *
-
-w = Workbook()
-ws1 = w.add_sheet(u'\N{GREEK SMALL LETTER ALPHA}\N{GREEK SMALL LETTER BETA}\N{GREEK SMALL LETTER GAMMA}\u2665\u041e\u041b\u042f\u2665')
-
-fnt = Font()
-fnt.height = 26*20
-style = XFStyle()
-style.font = fnt
-
-for i in range(0x10000):
- ws1.write(i/0x10, i%0x10, unichr(i), style)
-
-w.save('unicode2.xls')
-
diff --git a/SUEWSPrepare/Modules/xlwt/examples/wsprops.py b/SUEWSPrepare/Modules/xlwt/examples/wsprops.py
deleted file mode 100644
index adc5a04..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/wsprops.py
+++ /dev/null
@@ -1,155 +0,0 @@
-props = \
-[
- 'name',
- 'parent',
- 'rows',
- 'cols',
- 'merged_ranges',
- 'bmp_rec',
- 'show_formulas',
- 'show_grid',
- 'show_headers',
- 'panes_frozen',
- 'show_empty_as_zero',
- 'auto_colour_grid',
- 'cols_right_to_left',
- 'show_outline',
- 'remove_splits',
- 'selected',
- 'hidden',
- 'page_preview',
- 'first_visible_row',
- 'first_visible_col',
- 'grid_colour',
- 'preview_magn',
- 'normal_magn',
- 'row_gut_width',
- 'col_gut_height',
- 'show_auto_page_breaks',
- 'dialogue_sheet',
- 'auto_style_outline',
- 'outline_below',
- 'outline_right',
- 'fit_num_pages',
- 'show_row_outline',
- 'show_col_outline',
- 'alt_expr_eval',
- 'alt_formula_entries',
- 'row_default_height',
- 'col_default_width',
- 'calc_mode',
- 'calc_count',
- 'RC_ref_mode',
- 'iterations_on',
- 'delta',
- 'save_recalc',
- 'print_headers',
- 'print_grid',
- 'grid_set',
- 'vert_page_breaks',
- 'horz_page_breaks',
- 'header_str',
- 'footer_str',
- 'print_centered_vert',
- 'print_centered_horz',
- 'left_margin',
- 'right_margin',
- 'top_margin',
- 'bottom_margin',
- 'paper_size_code',
- 'print_scaling',
- 'start_page_number',
- 'fit_width_to_pages',
- 'fit_height_to_pages',
- 'print_in_rows',
- 'portrait',
- 'print_not_colour',
- 'print_draft',
- 'print_notes',
- 'print_notes_at_end',
- 'print_omit_errors',
- 'print_hres',
- 'print_vres',
- 'header_margin',
- 'footer_margin',
- 'copies_num',
-]
-
-from xlwt import *
-
-wb = Workbook()
-ws = wb.add_sheet('sheet')
-
-print ws.name
-print ws.parent
-print ws.rows
-print ws.cols
-print ws.merged_ranges
-print ws.bmp_rec
-print ws.show_formulas
-print ws.show_grid
-print ws.show_headers
-print ws.panes_frozen
-print ws.show_empty_as_zero
-print ws.auto_colour_grid
-print ws.cols_right_to_left
-print ws.show_outline
-print ws.remove_splits
-print ws.selected
-# print ws.hidden
-print ws.page_preview
-print ws.first_visible_row
-print ws.first_visible_col
-print ws.grid_colour
-print ws.preview_magn
-print ws.normal_magn
-#print ws.row_gut_width
-#print ws.col_gut_height
-print ws.show_auto_page_breaks
-print ws.dialogue_sheet
-print ws.auto_style_outline
-print ws.outline_below
-print ws.outline_right
-print ws.fit_num_pages
-print ws.show_row_outline
-print ws.show_col_outline
-print ws.alt_expr_eval
-print ws.alt_formula_entries
-print ws.row_default_height
-print ws.col_default_width
-print ws.calc_mode
-print ws.calc_count
-print ws.RC_ref_mode
-print ws.iterations_on
-print ws.delta
-print ws.save_recalc
-print ws.print_headers
-print ws.print_grid
-#print ws.grid_set
-print ws.vert_page_breaks
-print ws.horz_page_breaks
-print ws.header_str
-print ws.footer_str
-print ws.print_centered_vert
-print ws.print_centered_horz
-print ws.left_margin
-print ws.right_margin
-print ws.top_margin
-print ws.bottom_margin
-print ws.paper_size_code
-print ws.print_scaling
-print ws.start_page_number
-print ws.fit_width_to_pages
-print ws.fit_height_to_pages
-print ws.print_in_rows
-print ws.portrait
-print ws.print_colour
-print ws.print_draft
-print ws.print_notes
-print ws.print_notes_at_end
-print ws.print_omit_errors
-print ws.print_hres
-print ws.print_vres
-print ws.header_margin
-print ws.footer_margin
-print ws.copies_num
diff --git a/SUEWSPrepare/Modules/xlwt/examples/xlwt_easyxf_simple_demo.py b/SUEWSPrepare/Modules/xlwt/examples/xlwt_easyxf_simple_demo.py
deleted file mode 100644
index 2afa69f..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/xlwt_easyxf_simple_demo.py
+++ /dev/null
@@ -1,46 +0,0 @@
-
-# Write an XLS file with a single worksheet, containing
-# a heading row and some rows of data.
-
-import xlwt
-import datetime
-ezxf = xlwt.easyxf
-
-def write_xls(file_name, sheet_name, headings, data, heading_xf, data_xfs):
- book = xlwt.Workbook()
- sheet = book.add_sheet(sheet_name)
- rowx = 0
- for colx, value in enumerate(headings):
- sheet.write(rowx, colx, value, heading_xf)
- sheet.set_panes_frozen(True) # frozen headings instead of split panes
- sheet.set_horz_split_pos(rowx+1) # in general, freeze after last heading row
- sheet.set_remove_splits(True) # if user does unfreeze, don't leave a split there
- for row in data:
- rowx += 1
- for colx, value in enumerate(row):
- sheet.write(rowx, colx, value, data_xfs[colx])
- book.save(file_name)
-
-if __name__ == '__main__':
- import sys
- mkd = datetime.date
- hdngs = ['Date', 'Stock Code', 'Quantity', 'Unit Price', 'Value', 'Message']
- kinds = 'date text int price money text'.split()
- data = [
- [mkd(2007, 7, 1), 'ABC', 1000, 1.234567, 1234.57, ''],
- [mkd(2007, 12, 31), 'XYZ', -100, 4.654321, -465.43, 'Goods returned'],
- ] + [
- [mkd(2008, 6, 30), 'PQRCD', 100, 2.345678, 234.57, ''],
- ] * 100
-
- heading_xf = ezxf('font: bold on; align: wrap on, vert centre, horiz center')
- kind_to_xf_map = {
- 'date': ezxf(num_format_str='yyyy-mm-dd'),
- 'int': ezxf(num_format_str='#,##0'),
- 'money': ezxf('font: italic on; pattern: pattern solid, fore-colour grey25',
- num_format_str='$#,##0.00'),
- 'price': ezxf(num_format_str='#0.000000'),
- 'text': ezxf(),
- }
- data_xfs = [kind_to_xf_map[k] for k in kinds]
- write_xls('xlwt_easyxf_simple_demo.xls', 'Demo', hdngs, data, heading_xf, data_xfs)
diff --git a/SUEWSPrepare/Modules/xlwt/examples/zoom_magnification.py b/SUEWSPrepare/Modules/xlwt/examples/zoom_magnification.py
deleted file mode 100644
index 6bdbdee..0000000
--- a/SUEWSPrepare/Modules/xlwt/examples/zoom_magnification.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import xlwt
-book = xlwt.Workbook()
-for magn in (0, 60, 100, 75, 150):
- for preview in (False, True):
- sheet = book.add_sheet('magn%d%s' % (magn, "np"[preview]))
- if preview:
- sheet.preview_magn = magn
- else:
- sheet.normal_magn = magn
- sheet.page_preview = preview
- for rowx in range(100):
- sheet.write(rowx, 0, "Some text")
-book.save("zoom_magnification.xls")
-
diff --git a/SUEWSPrepare/Modules/xlwt/excel-formula.g b/SUEWSPrepare/Modules/xlwt/excel-formula.g
index d98d9b9..de927ec 100644
--- a/SUEWSPrepare/Modules/xlwt/excel-formula.g
+++ b/SUEWSPrepare/Modules/xlwt/excel-formula.g
@@ -8,7 +8,7 @@ header {
_RVAdeltaRef = {"R": 0, "V": 0x20, "A": 0x40, "D": 0x20}
_RVAdeltaArea = {"R": 0, "V": 0x20, "A": 0x40, "D": 0}
-
+
class FormulaParseException(Exception):
"""
An exception indicating that a Formula could not be successfully parsed.
@@ -196,7 +196,7 @@ primary[arg_type]
self.rpn += struct.pack(", and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/anthropogenic.ui b/SUEWSPrepare/tabs/anthropogenic.ui
deleted file mode 100644
index 06ae6cf..0000000
--- a/SUEWSPrepare/tabs/anthropogenic.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 964
- 609
-
-
-
- Form
-
-
- -
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/baresoil.py b/SUEWSPrepare/tabs/baresoil.py
deleted file mode 100644
index c5e2118..0000000
--- a/SUEWSPrepare/tabs/baresoil.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'baresoil.ui'))
-
-
-class BareSoilTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(BareSoilTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/baresoil.ui b/SUEWSPrepare/tabs/baresoil.ui
deleted file mode 100644
index 06ae6cf..0000000
--- a/SUEWSPrepare/tabs/baresoil.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 964
- 609
-
-
-
- Form
-
-
- -
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/buildings.py b/SUEWSPrepare/tabs/buildings.py
deleted file mode 100644
index 869f827..0000000
--- a/SUEWSPrepare/tabs/buildings.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'buildings.ui'))
-
-
-class BuildingsTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(BuildingsTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/buildings.ui b/SUEWSPrepare/tabs/buildings.ui
deleted file mode 100644
index 06ae6cf..0000000
--- a/SUEWSPrepare/tabs/buildings.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 964
- 609
-
-
-
- Form
-
-
- -
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/changeDialog.py b/SUEWSPrepare/tabs/changeDialog.py
index dff115b..14c89a3 100644
--- a/SUEWSPrepare/tabs/changeDialog.py
+++ b/SUEWSPrepare/tabs/changeDialog.py
@@ -23,13 +23,14 @@
import os
-from PyQt4 import QtGui, uic
+from qgis.PyQt import uic
+from qgis.PyQt.QtWidgets import QDialog
FORM_CLASS, _ = uic.loadUiType(os.path.join(
os.path.dirname(__file__), 'changeDialog.ui'))
-class ChangeDialog(QtGui.QDialog, FORM_CLASS):
+class ChangeDialog(QDialog, FORM_CLASS):
def __init__(self, parent=None):
"""Constructor."""
super(ChangeDialog, self).__init__(parent)
diff --git a/SUEWSPrepare/tabs/cond_tab.py b/SUEWSPrepare/tabs/cond_tab.py
deleted file mode 100644
index 7c34286..0000000
--- a/SUEWSPrepare/tabs/cond_tab.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'cond_tab.ui'))
-
-
-class CondTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(CondTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/cond_tab.ui b/SUEWSPrepare/tabs/cond_tab.ui
deleted file mode 100644
index 54e5bb5..0000000
--- a/SUEWSPrepare/tabs/cond_tab.ui
+++ /dev/null
@@ -1,378 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 916
- 546
-
-
-
- Form
-
-
-
- 0
-
- -
-
-
-
- 161
- 0
-
-
-
-
- 161
- 16777215
-
-
-
- Selections
-
-
- false
-
-
-
-
-
-
- Code:
-
-
-
- -
-
-
- -
-
-
- true
-
-
- QFrame::Box
-
-
-
- -
-
-
- QFrame::Raised
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Edit Values
-
-
-
- -
-
-
- false
-
-
- Make Changes
-
-
-
- -
-
-
- false
-
-
- Cancel
-
-
-
-
-
-
- -
-
-
- Values
-
-
- false
-
-
- false
-
-
-
-
-
-
-
-
-
- Soil moisture dependence 2
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Upper air temperature limit
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Max surface conductance
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
-
-
- Temperature dependence
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- VPD dependence 2
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Soil moisture dependence 1
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Lower air temperature limit
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Soil moisture dependence
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Kdown dependence
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- VPD dependence 1
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Max incoming shortwave radiation
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
- 10
- 75
- true
-
-
-
- TextLabel
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/conductance.py b/SUEWSPrepare/tabs/conductance.py
deleted file mode 100644
index 7e0108d..0000000
--- a/SUEWSPrepare/tabs/conductance.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'conductance.ui'))
-
-
-class ConductanceTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(ConductanceTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/conductance.ui b/SUEWSPrepare/tabs/conductance.ui
deleted file mode 100644
index 06ae6cf..0000000
--- a/SUEWSPrepare/tabs/conductance.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 964
- 609
-
-
-
- Form
-
-
- -
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/decidious.py b/SUEWSPrepare/tabs/decidious.py
deleted file mode 100644
index 561ad55..0000000
--- a/SUEWSPrepare/tabs/decidious.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'decidious.ui'))
-
-
-class DecidiousTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(DecidiousTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/decidious.ui b/SUEWSPrepare/tabs/decidious.ui
deleted file mode 100644
index 06ae6cf..0000000
--- a/SUEWSPrepare/tabs/decidious.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 964
- 609
-
-
-
- Form
-
-
- -
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/energy.py b/SUEWSPrepare/tabs/energy.py
deleted file mode 100644
index 3dd6ae0..0000000
--- a/SUEWSPrepare/tabs/energy.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'energy.ui'))
-
-
-class EnergyTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(EnergyTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/energy.ui b/SUEWSPrepare/tabs/energy.ui
deleted file mode 100644
index 06ae6cf..0000000
--- a/SUEWSPrepare/tabs/energy.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 964
- 609
-
-
-
- Form
-
-
- -
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/evergreen.py b/SUEWSPrepare/tabs/evergreen.py
deleted file mode 100644
index 9fe7235..0000000
--- a/SUEWSPrepare/tabs/evergreen.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'evergreen.ui'))
-
-
-class EvergreenTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(EvergreenTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/evergreen.ui b/SUEWSPrepare/tabs/evergreen.ui
deleted file mode 100644
index 06ae6cf..0000000
--- a/SUEWSPrepare/tabs/evergreen.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 964
- 609
-
-
-
- Form
-
-
- -
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/grass.py b/SUEWSPrepare/tabs/grass.py
deleted file mode 100644
index 6065b54..0000000
--- a/SUEWSPrepare/tabs/grass.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'grass.ui'))
-
-
-class GrassTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(GrassTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/grass.ui b/SUEWSPrepare/tabs/grass.ui
deleted file mode 100644
index 06ae6cf..0000000
--- a/SUEWSPrepare/tabs/grass.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 964
- 609
-
-
-
- Form
-
-
- -
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/heat_tab.py b/SUEWSPrepare/tabs/heat_tab.py
deleted file mode 100644
index d3e6d1e..0000000
--- a/SUEWSPrepare/tabs/heat_tab.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'heat_tab.ui'))
-
-
-class HeatTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(HeatTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/heat_tab.ui b/SUEWSPrepare/tabs/heat_tab.ui
deleted file mode 100644
index 92cb048..0000000
--- a/SUEWSPrepare/tabs/heat_tab.ui
+++ /dev/null
@@ -1,360 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 905
- 546
-
-
-
- Form
-
-
-
- 0
-
- -
-
-
-
- 161
- 0
-
-
-
-
- 161
- 16777215
-
-
-
- Selections
-
-
- false
-
-
-
-
-
-
- Code:
-
-
-
- -
-
-
- -
-
-
- true
-
-
- QFrame::Box
-
-
-
- -
-
-
- QFrame::Raised
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Edit Values
-
-
-
- -
-
-
- false
-
-
- Make Changes
-
-
-
- -
-
-
- false
-
-
- Cancel
-
-
-
-
-
-
- -
-
-
- Values
-
-
- false
-
-
- false
-
-
-
-
-
-
-
-
-
- QF B Weekend
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- QF C Weekend
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Minimum QF
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Critical temperature
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
-
-
- QF A Weekday
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- QF B Weekday
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Base temperature HDD
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- QF A Weekend
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- QF C Weekday
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Slope of QF versus Tair
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
- 10
- 75
- true
-
-
-
- TextLabel
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/imp_tab.py b/SUEWSPrepare/tabs/imp_tab.py
deleted file mode 100644
index b57dfd7..0000000
--- a/SUEWSPrepare/tabs/imp_tab.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'imp_tab.ui'))
-
-
-class ImpTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(ImpTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/imp_tab.ui b/SUEWSPrepare/tabs/imp_tab.ui
deleted file mode 100644
index 93e95f5..0000000
--- a/SUEWSPrepare/tabs/imp_tab.ui
+++ /dev/null
@@ -1,755 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 905
- 546
-
-
-
- Form
-
-
-
- 0
-
- -
-
-
-
- 161
- 0
-
-
-
-
- 161
- 16777215
-
-
-
- Selections
-
-
- false
-
-
-
-
-
-
- Code:
-
-
-
- -
-
-
- -
-
-
- true
-
-
-
- 0
- 0
-
-
-
- false
-
-
- QFrame::Box
-
-
-
- -
-
-
- QFrame::Raised
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Edit Values
-
-
-
- -
-
-
- false
-
-
- Make Changes
-
-
-
- -
-
-
- false
-
-
- Cancel
-
-
-
-
-
-
- -
-
-
- Values
-
-
- false
-
-
- false
-
-
-
-
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- Maximum albedo
-
-
- Qt::AutoText
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- Wet threshold
-
-
- Qt::AutoText
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- Emissivity
-
-
- Qt::AutoText
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- Maximum storage
-
-
- Qt::AutoText
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- Minimum storage
-
-
- Qt::AutoText
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- Minimum albedo
-
-
- Qt::AutoText
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- State limit
-
-
- Qt::AutoText
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- OHM code winter dry
-
-
- Qt::AutoText
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- OHM code winter wet
-
-
- Qt::AutoText
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- OHM code summer dry
-
-
- Qt::AutoText
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- Drainage coefficient 2
-
-
- Qt::AutoText
-
-
- false
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- Drainage equation
-
-
- Qt::AutoText
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- Drainage coefficient 1
-
-
- Qt::AutoText
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- OHM code summer wet
-
-
- Qt::AutoText
-
-
- false
-
-
- false
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- Snow limit remove
-
-
- Qt::AutoText
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- Snow limit patch
-
-
- Qt::AutoText
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 8
-
-
-
- Soil type code
-
-
- Qt::AutoText
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
- 10
- 75
- true
-
-
-
- TextLabel
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/irr_tab.py b/SUEWSPrepare/tabs/irr_tab.py
deleted file mode 100644
index 092a158..0000000
--- a/SUEWSPrepare/tabs/irr_tab.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'irr_tab.ui'))
-
-
-class IrrTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(IrrTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/irr_tab.ui b/SUEWSPrepare/tabs/irr_tab.ui
deleted file mode 100644
index a805ec4..0000000
--- a/SUEWSPrepare/tabs/irr_tab.ui
+++ /dev/null
@@ -1,638 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 905
- 546
-
-
-
- Form
-
-
-
- 0
-
- -
-
-
-
- 161
- 0
-
-
-
-
- 161
- 16777215
-
-
-
- Selections
-
-
- false
-
-
-
-
-
-
- Code:
-
-
-
- -
-
-
- -
-
-
- true
-
-
- QFrame::Box
-
-
-
- -
-
-
- QFrame::Raised
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Edit Values
-
-
-
- -
-
-
- false
-
-
- Make Changes
-
-
-
- -
-
-
- false
-
-
- Cancel
-
-
-
-
-
-
- -
-
-
- Values
-
-
- false
-
-
- false
-
-
-
-
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
-
-
- MIM coefficient 1
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- AIM coefficient 3
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- MIM coefficient 3
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
-
-
- Irrigation start day
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Internal water use
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- AIM coefficient 1
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- AIM coefficient 2
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Faut
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Irrigation end day
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- DayWat 1
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- DayWat 2
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- DayWat 3
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- DayWat 4
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- DayWat 5
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- DayWat 6
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- DayWat 7
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- DayWatPer 1
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- DayWatPer 2
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- DayWatPer 3
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- DayWatPer 4
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- DayWatPer 5
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- DayWatPer 6
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- DayWatPer 7
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- MIM coefficient 2
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
- 10
- 75
- true
-
-
-
- TextLabel
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/irrigation.py b/SUEWSPrepare/tabs/irrigation.py
deleted file mode 100644
index 6b61cf5..0000000
--- a/SUEWSPrepare/tabs/irrigation.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'irrigation.ui'))
-
-
-class IrrigationTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(IrrigationTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/irrigation.ui b/SUEWSPrepare/tabs/irrigation.ui
deleted file mode 100644
index 06ae6cf..0000000
--- a/SUEWSPrepare/tabs/irrigation.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 964
- 609
-
-
-
- Form
-
-
- -
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/main_tab.py b/SUEWSPrepare/tabs/main_tab.py
index 17c9af1..3f44179 100644
--- a/SUEWSPrepare/tabs/main_tab.py
+++ b/SUEWSPrepare/tabs/main_tab.py
@@ -23,13 +23,14 @@
import os
-from PyQt4 import QtGui, uic
+from qgis.PyQt import uic
+from qgis.PyQt.QtWidgets import QWidget
FORM_CLASS, _ = uic.loadUiType(os.path.join(
os.path.dirname(__file__), 'main_tab.ui'))
-class MainTab(QtGui.QWidget, FORM_CLASS):
+class MainTab(QWidget, FORM_CLASS):
def __init__(self, parent=None):
"""Constructor."""
super(MainTab, self).__init__(parent)
diff --git a/SUEWSPrepare/tabs/paved.py b/SUEWSPrepare/tabs/paved.py
deleted file mode 100644
index 42ea9a5..0000000
--- a/SUEWSPrepare/tabs/paved.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'paved.ui'))
-
-
-class PavedTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(PavedTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/paved.ui b/SUEWSPrepare/tabs/paved.ui
deleted file mode 100644
index 06ae6cf..0000000
--- a/SUEWSPrepare/tabs/paved.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 964
- 609
-
-
-
- Form
-
-
- -
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/photodialog.py b/SUEWSPrepare/tabs/photodialog.py
index 87917be..57a4718 100644
--- a/SUEWSPrepare/tabs/photodialog.py
+++ b/SUEWSPrepare/tabs/photodialog.py
@@ -23,13 +23,14 @@
import os
-from PyQt4 import QtGui, uic
+from qgis.PyQt import QtGui, uic
+from qgis.PyQt.QtWidgets import QDialog
FORM_CLASS, _ = uic.loadUiType(os.path.join(
os.path.dirname(__file__), 'photodialog.ui'))
-class PhotoDialog(QtGui.QDialog, FORM_CLASS):
+class PhotoDialog(QDialog, FORM_CLASS):
def __init__(self, parent=None):
"""Constructor."""
super(PhotoDialog, self).__init__(parent)
diff --git a/SUEWSPrepare/tabs/prof_tab.py b/SUEWSPrepare/tabs/prof_tab.py
deleted file mode 100644
index c60644d..0000000
--- a/SUEWSPrepare/tabs/prof_tab.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'prof_tab.ui'))
-
-
-class ProfTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(ProfTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/prof_tab.ui b/SUEWSPrepare/tabs/prof_tab.ui
deleted file mode 100644
index f1d6a91..0000000
--- a/SUEWSPrepare/tabs/prof_tab.ui
+++ /dev/null
@@ -1,942 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 818
- 518
-
-
-
- Form
-
-
-
- 0
-
- -
-
-
-
- 161
- 0
-
-
-
-
- 161
- 16777215
-
-
-
- Selections
-
-
- false
-
-
-
-
-
-
- Code:
-
-
-
- -
-
-
- -
-
-
- true
-
-
- QFrame::Box
-
-
-
- -
-
-
- QFrame::Raised
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Edit Values
-
-
-
- -
-
-
- false
-
-
- Make Changes
-
-
-
- -
-
-
- false
-
-
- Cancel
-
-
-
-
-
-
- -
-
-
-
-
-
- Values
-
-
- false
-
-
- false
-
-
-
- 5
-
-
- 0
-
-
-
-
-
- 3
-
-
- 0
-
-
-
-
-
- 11:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 15:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 17:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 16:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 19:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 14:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 01:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 21:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 09:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 20:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 06:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 05:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 00:00
-
-
-
- -
-
-
- false
-
-
-
- 0
- 0
-
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 03:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 02:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 18:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 07:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 12:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 10:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 13:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 22:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 04:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 08:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
- -
-
-
- 3
-
-
- 0
-
-
-
-
-
- 23:00
-
-
-
- -
-
-
- false
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
-
-
-
- -
-
-
-
- 10
- 75
- true
-
-
-
- TextLabel
-
-
-
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/snow.py b/SUEWSPrepare/tabs/snow.py
deleted file mode 100644
index db8fccd..0000000
--- a/SUEWSPrepare/tabs/snow.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'snow.ui'))
-
-
-class SnowTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(SnowTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/snow.ui b/SUEWSPrepare/tabs/snow.ui
deleted file mode 100644
index 2c96706..0000000
--- a/SUEWSPrepare/tabs/snow.ui
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 964
- 609
-
-
-
- Form
-
-
- -
-
-
- -
-
-
- 6
-
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/snow_tab.py b/SUEWSPrepare/tabs/snow_tab.py
deleted file mode 100644
index 72a8f83..0000000
--- a/SUEWSPrepare/tabs/snow_tab.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'snow_tab.ui'))
-
-
-class Snow(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(Snow, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/snow_tab.ui b/SUEWSPrepare/tabs/snow_tab.ui
deleted file mode 100644
index a9e51d7..0000000
--- a/SUEWSPrepare/tabs/snow_tab.ui
+++ /dev/null
@@ -1,517 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 936
- 547
-
-
-
- Form
-
-
-
- 0
-
- -
-
-
-
- 161
- 0
-
-
-
-
- 161
- 16777215
-
-
-
- Selections
-
-
- false
-
-
-
-
-
-
- Code:
-
-
-
- -
-
-
- -
-
-
- true
-
-
- QFrame::Box
-
-
-
- -
-
-
- QFrame::Raised
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Edit Values
-
-
-
- -
-
-
- false
-
-
- Make Changes
-
-
-
- -
-
-
- false
-
-
- Cancel
-
-
-
-
-
-
- -
-
-
- Values
-
-
- false
-
-
- false
-
-
-
-
-
-
-
-
-
- OHM code summer dry
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- OHM code winter wet
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- OHM code winter dry
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Time constant snow density
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Fresh snow density
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Maximum snow density
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Radiaton melt factor
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Time constant melting snow
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Temperature melt factor
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Maximum albedo
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Minimum albedo
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Emissivity
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Time constant cold snow
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
-
-
- Precipitation hourly limit
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Min water holding cap
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Max water holding cap
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Temp limit precipitation
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- OHM code summer wet
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
- 10
- 75
- true
-
-
-
- TextLabel
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/soil_tab.py b/SUEWSPrepare/tabs/soil_tab.py
deleted file mode 100644
index 67b8993..0000000
--- a/SUEWSPrepare/tabs/soil_tab.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'soil_tab.ui'))
-
-
-class SoilTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(SoilTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/soil_tab.ui b/SUEWSPrepare/tabs/soil_tab.ui
deleted file mode 100644
index 958ea4f..0000000
--- a/SUEWSPrepare/tabs/soil_tab.ui
+++ /dev/null
@@ -1,368 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 905
- 546
-
-
-
- Form
-
-
-
-
- 160
- 10
- 741
- 531
-
-
-
- Values
-
-
- false
-
-
- false
-
-
-
-
- 590
- 30
- 75
- 13
-
-
-
- Infilitration rate
-
-
-
-
-
- 30
- 30
- 81
- 16
-
-
-
- Soil depth
-
-
-
-
-
- 310
- 120
- 137
- 13
-
-
-
- Fraction of soil without rocks
-
-
-
-
-
- 170
- 120
- 106
- 13
-
-
-
- Maximum soil moisture
-
-
-
-
-
- 30
- 120
- 104
- 13
-
-
-
- Depth of soil moisture
-
-
-
-
- false
-
-
-
- 170
- 140
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 30
- 140
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 170
- 50
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 310
- 140
- 61
- 20
-
-
-
-
-
-
- 310
- 30
- 105
- 13
-
-
-
- Hydraulic conductivity
-
-
-
-
-
- 170
- 30
- 87
- 13
-
-
-
- Soil store capacity
-
-
-
-
- false
-
-
-
- 310
- 50
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 450
- 50
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 30
- 50
- 61
- 20
-
-
-
-
-
-
- 450
- 30
- 80
- 13
-
-
-
- Soil density
-
-
-
-
- false
-
-
-
- 590
- 50
- 61
- 20
-
-
-
-
-
-
-
- 0
- 10
- 161
- 531
-
-
-
- Selections
-
-
- false
-
-
-
-
- 20
- 20
- 46
- 13
-
-
-
- Code:
-
-
-
-
-
- 20
- 40
- 111
- 21
-
-
-
-
-
-
- 20
- 160
- 111
- 31
-
-
-
- Edit Values
-
-
- false
-
-
- false
-
-
-
-
- false
-
-
-
- 20
- 200
- 111
- 31
-
-
-
- Make Changes
-
-
-
-
- false
-
-
-
- 20
- 240
- 111
- 31
-
-
-
- Cancel
-
-
-
-
-
- 0
- 120
- 161
- 16
-
-
-
- QFrame::Raised
-
-
- Qt::Horizontal
-
-
-
-
- true
-
-
-
- 10
- 60
- 141
- 61
-
-
-
- QFrame::Box
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/template.ui b/SUEWSPrepare/tabs/template.ui
deleted file mode 100644
index 275daf9..0000000
--- a/SUEWSPrepare/tabs/template.ui
+++ /dev/null
@@ -1,945 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 918
- 550
-
-
-
- Form
-
-
-
- 0
-
-
- QLayout::SetDefaultConstraint
-
-
- 5
-
- -
-
-
-
- 161
- 16777215
-
-
-
- Selections
-
-
- false
-
-
-
-
- 20
- 20
- 46
- 13
-
-
-
- Code:
-
-
-
-
-
- 20
- 40
- 111
- 21
-
-
-
-
-
-
- 20
- 400
- 111
- 31
-
-
-
- Edit Values
-
-
- false
-
-
- false
-
-
-
-
- false
-
-
-
- 20
- 440
- 111
- 31
-
-
-
- Make Changes
-
-
-
-
- false
-
-
-
- 20
- 480
- 111
- 31
-
-
-
- Cancel
-
-
-
-
-
- 0
- 120
- 161
- 16
-
-
-
- QFrame::Raised
-
-
- Qt::Horizontal
-
-
-
-
- true
-
-
-
- 10
- 60
- 141
- 61
-
-
-
- QFrame::Box
-
-
-
-
- -
-
-
- Values
-
-
- false
-
-
- false
-
-
-
-
- 590
- 30
- 84
- 13
-
-
-
- Maximum storage
-
-
-
-
-
- 30
- 30
- 81
- 16
-
-
-
- Minimum albedo
-
-
-
-
- false
-
-
-
- 450
- 230
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 170
- 230
- 61
- 20
-
-
-
-
-
-
- 310
- 210
- 86
- 13
-
-
-
- Snow limit remove
-
-
-
-
-
- 310
- 120
- 88
- 13
-
-
-
- Drainage equation
-
-
-
-
-
- 170
- 120
- 47
- 13
-
-
-
- State limit
-
-
-
-
-
- 170
- 210
- 77
- 13
-
-
-
- Snow limit patch
-
-
-
-
-
- 30
- 120
- 62
- 13
-
-
-
- Wet treshold
-
-
-
-
- false
-
-
-
- 170
- 140
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 30
- 140
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 310
- 230
- 61
- 20
-
-
-
-
-
-
- 450
- 210
- 110
- 13
-
-
-
- OHM code summer wet
-
-
-
-
- false
-
-
-
- 450
- 140
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 170
- 50
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 310
- 140
- 61
- 20
-
-
-
-
-
-
- 310
- 30
- 46
- 13
-
-
-
- Emissivity
-
-
-
-
-
- 170
- 30
- 80
- 13
-
-
-
- Maximum albedo
-
-
-
-
-
- 450
- 120
- 105
- 13
-
-
-
- Drainage coefficient 1
-
-
-
-
-
- 590
- 210
- 108
- 13
-
-
-
- OHM code summer dry
-
-
-
-
- false
-
-
-
- 310
- 50
- 61
- 20
-
-
-
-
-
-
- 590
- 120
- 105
- 13
-
-
-
- Drainage coefficient 2
-
-
-
-
-
- 30
- 210
- 67
- 13
-
-
-
- Soil type code
-
-
-
-
- false
-
-
-
- 590
- 230
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 450
- 50
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 30
- 50
- 61
- 20
-
-
-
-
-
-
- 450
- 30
- 80
- 13
-
-
-
- Minimum storage
-
-
-
-
- false
-
-
-
- 590
- 140
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 30
- 230
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 590
- 50
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 30
- 320
- 61
- 20
-
-
-
-
-
-
- 170
- 300
- 77
- 13
-
-
-
- Snow limit patch
-
-
-
-
- false
-
-
-
- 170
- 320
- 61
- 20
-
-
-
-
-
-
- 310
- 300
- 86
- 13
-
-
-
- Snow limit remove
-
-
-
-
- false
-
-
-
- 310
- 320
- 61
- 20
-
-
-
-
-
-
- 30
- 300
- 67
- 13
-
-
-
- Soil type code
-
-
-
-
-
- 450
- 300
- 110
- 13
-
-
-
- OHM code summer wet
-
-
-
-
- false
-
-
-
- 450
- 320
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 590
- 320
- 61
- 20
-
-
-
-
-
-
- 590
- 300
- 108
- 13
-
-
-
- OHM code summer dry
-
-
-
-
-
- 170
- 390
- 77
- 13
-
-
-
- Snow limit patch
-
-
-
-
-
- 590
- 390
- 108
- 13
-
-
-
- OHM code summer dry
-
-
-
-
-
- 30
- 390
- 67
- 13
-
-
-
- Soil type code
-
-
-
-
- false
-
-
-
- 30
- 410
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 170
- 410
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 310
- 410
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 450
- 410
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 590
- 410
- 61
- 20
-
-
-
-
-
-
- 310
- 390
- 86
- 13
-
-
-
- Snow limit remove
-
-
-
-
-
- 450
- 390
- 110
- 13
-
-
-
- OHM code summer wet
-
-
-
-
- false
-
-
-
- 30
- 500
- 61
- 20
-
-
-
-
-
-
- 30
- 480
- 67
- 13
-
-
-
- Soil type code
-
-
-
-
-
- 170
- 480
- 77
- 13
-
-
-
- Snow limit patch
-
-
-
-
-
- 590
- 480
- 108
- 13
-
-
-
- OHM code summer dry
-
-
-
-
- false
-
-
-
- 170
- 500
- 61
- 20
-
-
-
-
-
-
- 310
- 480
- 86
- 13
-
-
-
- Snow limit remove
-
-
-
-
- false
-
-
-
- 310
- 500
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 450
- 500
- 61
- 20
-
-
-
-
-
- false
-
-
-
- 590
- 500
- 61
- 20
-
-
-
-
-
-
- 450
- 480
- 110
- 13
-
-
-
- OHM code summer wet
-
-
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/template_tab.py b/SUEWSPrepare/tabs/template_tab.py
index 40e0470..e1f973d 100644
--- a/SUEWSPrepare/tabs/template_tab.py
+++ b/SUEWSPrepare/tabs/template_tab.py
@@ -23,13 +23,14 @@
import os
-from PyQt4 import QtGui, uic
+from qgis.PyQt import QtGui, uic
+from qgis.PyQt.QtWidgets import QWidget
FORM_CLASS, _ = uic.loadUiType(os.path.join(
os.path.dirname(__file__), 'template_tab.ui'))
-class TemplateTab(QtGui.QWidget, FORM_CLASS):
+class TemplateTab(QWidget, FORM_CLASS):
def __init__(self, parent=None):
"""Constructor."""
super(TemplateTab, self).__init__(parent)
diff --git a/SUEWSPrepare/tabs/template_widget.py b/SUEWSPrepare/tabs/template_widget.py
index c17bed9..7be69f5 100644
--- a/SUEWSPrepare/tabs/template_widget.py
+++ b/SUEWSPrepare/tabs/template_widget.py
@@ -20,18 +20,24 @@
* *
***************************************************************************/
"""
-from PyQt4.QtCore import pyqtSignal
-from PyQt4.QtGui import QImage, QLabel, QPixmap, QLineEdit, QGridLayout, QVBoxLayout, QSpacerItem, QSizePolicy, QFont
+from future import standard_library
+standard_library.install_aliases()
+from builtins import str
+from builtins import range
+from qgis.PyQt.QtCore import pyqtSignal
+from qgis.PyQt.QtGui import QImage, QPixmap, QFont
+from qgis.PyQt.QtWidgets import QLabel, QLineEdit, QGridLayout, QVBoxLayout, QSpacerItem, QSizePolicy
from qgis.utils import *
import os
-import urllib2
-from PyQt4 import QtGui, uic
+import urllib.request, urllib.error, urllib.parse
+from qgis.PyQt import QtGui, uic
+from qgis.PyQt.QtWidgets import QWidget
FORM_CLASS, _ = uic.loadUiType(os.path.join(
os.path.dirname(__file__), 'template_widget.ui'))
-class TemplateWidget(QtGui.QWidget, FORM_CLASS):
+class TemplateWidget(QWidget, FORM_CLASS):
edit_mode_signal = pyqtSignal()
cancel_edits_signal = pyqtSignal()
@@ -113,7 +119,7 @@ def setup_values(self):
lineEdit.setText(str(values[x]))
break
except ValueError as e:
- QgsMessageLog.logMessage("SUEWSPrepare encountered a problem: " + str(e), level=QgsMessageLog.CRITICAL)
+ QgsMessageLog.logMessage("SUEWSPrepare encountered a problem: " + str(e), level=Qgis.Critical)
pass
def setup_signals(self):
@@ -203,18 +209,18 @@ def setup_image(self, row):
if url == '':
self.Image.clear()
else:
- req = urllib2.Request(str(url))
+ req = urllib.request.Request(str(url))
try:
- resp = urllib2.urlopen(req)
- except urllib2.HTTPError as e:
+ resp = urllib.request.urlopen(req)
+ except urllib.error.HTTPError as e:
if e.code == 404:
- QgsMessageLog.logMessage("Image URL encountered a 404 problem", level=QgsMessageLog.CRITICAL)
+ QgsMessageLog.logMessage("Image URL encountered a 404 problem", level=Qgis.Critical)
self.Image.clear()
else:
- QgsMessageLog.logMessage("SUEWSPrepare encountered a problem: " + str(e), level=QgsMessageLog.CRITICAL)
+ QgsMessageLog.logMessage("SUEWSPrepare encountered a problem: " + str(e), level=Qgis.Critical)
self.Image.clear()
- except urllib2.URLError as e:
- QgsMessageLog.logMessage("SUEWSPrepare encountered a problem: " + str(e), level=QgsMessageLog.CRITICAL)
+ except urllib.error.URLError as e:
+ QgsMessageLog.logMessage("SUEWSPrepare encountered a problem: " + str(e), level=Qgis.Critical)
self.Image.clear()
else:
data = resp.read()
diff --git a/SUEWSPrepare/tabs/template_widget3.py b/SUEWSPrepare/tabs/template_widget3.py
deleted file mode 100644
index 34c5b5a..0000000
--- a/SUEWSPrepare/tabs/template_widget3.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'template_widget.ui'))
-
-
-class TemplateWidget(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(TemplateWidget, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/test.py b/SUEWSPrepare/tabs/test.py
deleted file mode 100644
index 0d31d42..0000000
--- a/SUEWSPrepare/tabs/test.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'test.ui'))
-
-
-class Test(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(Test, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/test.ui b/SUEWSPrepare/tabs/test.ui
deleted file mode 100644
index 03614b9..0000000
--- a/SUEWSPrepare/tabs/test.ui
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 924
- 651
-
-
-
- Form
-
-
- -
-
-
- -
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/testwidget.py b/SUEWSPrepare/tabs/testwidget.py
deleted file mode 100644
index 17c314b..0000000
--- a/SUEWSPrepare/tabs/testwidget.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'testwidget.ui'))
-
-
-class TestTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(TestTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/testwidget.ui b/SUEWSPrepare/tabs/testwidget.ui
deleted file mode 100644
index 0d3271b..0000000
--- a/SUEWSPrepare/tabs/testwidget.ui
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 330
- 61
-
-
-
- Form
-
-
-
- 0
-
- -
-
-
- PushButton
-
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/veg_tab.py b/SUEWSPrepare/tabs/veg_tab.py
deleted file mode 100644
index 39c1d2e..0000000
--- a/SUEWSPrepare/tabs/veg_tab.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'veg_tab.ui'))
-
-
-class VegTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(VegTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/veg_tab.ui b/SUEWSPrepare/tabs/veg_tab.ui
deleted file mode 100644
index 9f7bde2..0000000
--- a/SUEWSPrepare/tabs/veg_tab.ui
+++ /dev/null
@@ -1,723 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 905
- 552
-
-
-
- Form
-
-
-
- 0
-
- -
-
-
-
- 161
- 0
-
-
-
-
- 161
- 16777215
-
-
-
- Selections
-
-
- false
-
-
-
-
-
-
- Code:
-
-
-
- -
-
-
- -
-
-
- true
-
-
- QFrame::Box
-
-
-
- -
-
-
- QFrame::Raised
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Edit Values
-
-
-
- -
-
-
- false
-
-
- Make Changes
-
-
-
- -
-
-
- false
-
-
- Cancel
-
-
-
-
-
-
- -
-
-
- Values
-
-
- false
-
-
- false
-
-
-
-
-
-
-
-
-
- Maximum leaf area index
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Leaf area index equation
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Snow limit patch
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
-
-
- Leaf growth temperature
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Senescence temperature
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- SDD full
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- GDD full
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Minimum leaf area index
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Max Conductance
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Wet treshold
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Maximum storage
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Minimum storage
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Minimum albedo
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Maximum albedo
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Emissivity
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Soil type code
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Drainage coefficient 2
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Drainage coefficient 1
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Leaf growth power 1
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Leaf growth power 2
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Leaf off power 1
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Leaf off power 2
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- OHM code summer wet
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- OHM code summer dry
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- OHM code winter wet
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- OHM code winter dry
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- State limit
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Drainage equation
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
- 10
- 75
- true
-
-
-
- TextLabel
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/water.py b/SUEWSPrepare/tabs/water.py
deleted file mode 100644
index 6a19f70..0000000
--- a/SUEWSPrepare/tabs/water.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'water.ui'))
-
-
-class WaterTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(WaterTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/water.ui b/SUEWSPrepare/tabs/water.ui
deleted file mode 100644
index 06ae6cf..0000000
--- a/SUEWSPrepare/tabs/water.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 964
- 609
-
-
-
- Form
-
-
- -
-
-
-
-
-
-
-
diff --git a/SUEWSPrepare/tabs/wateruse.py b/SUEWSPrepare/tabs/wateruse.py
deleted file mode 100644
index d3b4779..0000000
--- a/SUEWSPrepare/tabs/wateruse.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SUEWSPrepareDialog
- A QGIS plugin
- This pluin prepares input data to SUEWS v2015a
- -------------------
- begin : 2015-10-25
- git sha : $Format:%H$
- copyright : (C) 2015 by Fredrik Lindberg
- email : fredrikl@gvc.gu.se
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-"""
-
-import os
-
-from PyQt4 import QtGui, uic
-
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
- os.path.dirname(__file__), 'wateruse.ui'))
-
-
-class WaterUseTab(QtGui.QWidget, FORM_CLASS):
- def __init__(self, parent=None):
- """Constructor."""
- super(WaterUseTab, self).__init__(parent)
- # Set up the user interface from Designer.
- # After setupUI you can access any designer object by doing
- # self., and you can use autoconnect slots - see
- # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
- # #widgets-and-dialogs-with-auto-connect
- self.setupUi(self)
-
diff --git a/SUEWSPrepare/tabs/wateruse.ui b/SUEWSPrepare/tabs/wateruse.ui
deleted file mode 100644
index 2c96706..0000000
--- a/SUEWSPrepare/tabs/wateruse.ui
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 964
- 609
-
-
-
- Form
-
-
- -
-
-
- -
-
-
- 6
-
-
-
-
-
-
-
-
diff --git a/ShadowGenerator/ShadowIcon.png b/ShadowGenerator/ShadowIcon.png
new file mode 100644
index 0000000..f696c00
Binary files /dev/null and b/ShadowGenerator/ShadowIcon.png differ
diff --git a/ShadowGenerator/dailyshading.py b/ShadowGenerator/dailyshading.py
index 291a922..57e5fbc 100644
--- a/ShadowGenerator/dailyshading.py
+++ b/ShadowGenerator/dailyshading.py
@@ -1,9 +1,8 @@
+from builtins import range
from ..Utilities import shadowingfunctions as shadow
-# from ..Utilities import Pysolarn as pys
from ..Utilities.SEBESOLWEIGCommonFiles import sun_position as sp
import datetime as dt
from ..Utilities.misc import *
-# from PyQt4.QtGui import QMessageBox
from ..Utilities.SEBESOLWEIGCommonFiles.shadowingfunction_wallheight_23 import shadowingfunction_wallheight_23
diff --git a/ShadowGenerator/pb_tool.cfg b/ShadowGenerator/pb_tool.cfg
new file mode 100644
index 0000000..6caf60e
--- /dev/null
+++ b/ShadowGenerator/pb_tool.cfg
@@ -0,0 +1,74 @@
+#/***************************************************************************
+# ShadowGenerator
+#
+# Configuration file for plugin builder tool (pb_tool)
+# -------------------
+# begin : 2015-04-10
+# copyright : (C) 2015 by Fredrik Lindberg
+# email : fredrikl@gvc.gu.se
+# ***************************************************************************/
+#
+#/***************************************************************************
+# * *
+# * This program is free software; you can redistribute it and/or modify *
+# * it under the terms of the GNU General Public License as published by *
+# * the Free Software Foundation; either version 2 of the License, or *
+# * (at your option) any later version. *
+# * *
+# ***************************************************************************/
+#
+#
+# You can install pb_tool using:
+# pip install http://geoapt.net/files/pb_tool.zip
+#
+# Consider doing your development (and install of pb_tool) in a virtualenv.
+#
+# For details on setting up and using pb_tool, see:
+# http://spatialgalaxy.net/qgis-plugin-development-with-pb_tool
+#
+# Issues and pull requests here:
+# https://github.com/g-sherman/plugin_build_tool:
+#
+# Sane defaults for your plugin generated by the Plugin Builder are
+# already set below.
+#
+# As you add Python source files and UI files to your plugin, add
+# them to the appropriate [files] section below.
+
+[plugin]
+# Name of the plugin. This is the name of the directory that will
+# be created in .qgis2/python/plugins
+name: ShadowGenerator
+
+[files]
+# Python files that should be deployed with the plugin
+python_files: __init__.py shadow_generator.py shadow_generator_dialog.py dailyshading.py
+
+# The main dialog file that is loaded (not compiled)
+main_dialog: shadow_generator_dialog_base.ui
+
+# Other ui files for dialogs you create (these will be compiled)
+compiled_ui_files:
+
+# Resource file(s) that will be compiled
+resource_files: resources.qrc
+
+# Other files required for the plugin
+extras: ShadowIcon.png metadata.txt
+
+# Other directories to be deployed with the plugin.
+# These must be subdirectories under the plugin directory
+extra_dirs:
+
+# ISO code(s) for any locales (translations), separated by spaces.
+# Corresponding .ts files must exist in the i18n directory
+locales:
+
+[help]
+# the built help directory that should be deployed with the plugin
+dir: help/build/html
+# the name of the directory to target in the deployed plugin
+target: help
+
+
+
diff --git a/ShadowGenerator/resources.py b/ShadowGenerator/resources.py
new file mode 100644
index 0000000..816fdcc
--- /dev/null
+++ b/ShadowGenerator/resources.py
@@ -0,0 +1,128 @@
+# -*- coding: utf-8 -*-
+
+# Resource object code
+#
+# Created by: The Resource Compiler for PyQt5 (Qt v5.9.2)
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore
+
+qt_resource_data = b"\
+\x00\x00\x04\x0a\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x17\x00\x00\x00\x18\x08\x06\x00\x00\x00\x11\x7c\x66\x75\
+\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\
+\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\xa7\x93\x00\
+\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\x01\
+\x00\x9a\x9c\x18\x00\x00\x00\x07\x74\x49\x4d\x45\x07\xd9\x02\x15\
+\x16\x11\x2c\x9d\x48\x83\xbb\x00\x00\x03\x8a\x49\x44\x41\x54\x48\
+\xc7\xad\x95\x4b\x68\x5c\x55\x18\xc7\x7f\xe7\xdc\x7b\x67\xe6\xce\
+\x4c\x66\x26\x49\xd3\x24\x26\xa6\xc6\xf8\x40\x21\xa5\x04\xb3\x28\
+\xda\x98\x20\xa5\x0b\xad\x55\xa8\x2b\xc5\x50\x1f\xa0\x6e\x34\x2b\
+\x45\x30\x14\x02\xba\x52\x69\x15\x17\x66\x63\x45\x97\x95\xa0\xad\
+\x0b\xfb\xc0\x06\x25\xb6\x71\x61\x12\x41\x50\xdb\x2a\x21\xd1\xe2\
+\x24\xf3\x9e\xc9\xcc\xbd\xe7\x1c\x17\x35\x43\x1e\x33\x21\xb6\xfd\
+\x56\x87\xf3\x9d\xfb\xfb\x1e\xf7\xff\x9d\x23\x8c\x31\x43\x95\xf4\
+\x85\x1e\x3f\x3b\x35\xac\xfd\xcc\x43\xdc\xa4\x49\x3b\xfe\x9d\x1d\
+\xdb\x7b\x22\x90\x78\xf8\xb2\x28\xa7\xbe\x7d\xc1\x4b\x9d\x79\xdf\
+\x18\x15\xe5\x16\x99\x10\x56\xde\x69\xdc\x3f\x22\xfd\xec\xd4\xf0\
+\xad\x04\x03\x18\xa3\xa2\x7e\x76\x6a\x58\xde\x68\x2b\xb4\x36\xf8\
+\xbe\xc6\x18\x53\xdb\xef\xe7\xfa\xec\xed\x67\x63\x10\x42\x00\xf0\
+\xfb\xd5\x65\x2a\x15\x45\xc7\x6d\x0d\x00\xc4\xa2\xc1\xaa\x6f\x0d\
+\x3e\x6c\xab\xc2\x1c\x56\xa4\x77\x4b\xb0\xf2\x35\x15\x5f\x21\x85\
+\xe0\xc8\x6b\x5f\x92\x2d\x37\x33\x39\xf9\x03\x27\x8e\x1f\xa2\xf7\
+\xbe\x9d\x04\x1c\x0b\x37\xe4\xac\xff\xa6\x30\x87\xbd\xba\x00\x6a\
+\x06\x79\xe5\xf5\xaf\x89\xd9\x92\xc5\xcc\x0a\xd9\x7c\x19\xcf\xe9\
+\xe2\xe4\xa9\x2f\x78\x7c\xff\x01\x72\x85\x0a\x2b\x65\x1f\xa5\x4c\
+\xb5\xb2\x55\x16\x80\xbd\x31\xda\xda\x20\x1f\x7d\x3e\xcd\xc2\xfd\
+\x59\xa6\x93\x39\x92\xd1\x22\xea\x9b\x16\xce\x9d\x3f\xce\xe0\x83\
+\x03\x24\x82\x59\x3a\xdb\x7b\x88\xc7\x82\x68\x63\x58\xc9\xcc\x62\
+\x8c\x21\x18\xb0\x6a\xc3\x37\x06\x49\x16\xff\x24\x6b\xa5\x49\xbb\
+\x25\xbc\xa2\xa6\x21\xbb\x40\x7f\xdf\x00\x83\xbd\x01\x8e\x3c\xd5\
+\x45\xd7\x8e\x6b\x9c\x9c\x98\x25\x1a\xb6\xe8\xbe\x3d\xc2\xdd\x77\
+\x44\x48\xc4\x1c\x22\xe1\xeb\x58\x59\xaf\xcf\xd3\x33\x29\x2e\x34\
+\x2d\x91\x93\x3e\xbe\x34\x78\x01\xc5\xe2\x61\xc5\xae\x72\x8e\x70\
+\xc8\xc2\x0d\x5a\xbc\xf5\xee\x2f\x9c\xfa\x3e\x86\x69\x7a\x8e\xcf\
+\x26\xe6\xf9\x63\xa1\x44\xa1\xa4\xd0\xda\x6c\x0d\x2f\x15\x7c\xb4\
+\x67\x28\x59\x0a\xcf\xd6\x54\xe2\x06\x13\x87\x2b\x6f\x68\xa6\x27\
+\xaf\x31\x32\x36\xc7\xb2\x7f\x17\xef\x7d\x7c\x8c\x33\x67\xcf\x12\
+\x70\x24\x4a\x69\xd6\x6a\x46\xd6\xd3\x70\x72\xa9\x82\x67\x34\x45\
+\xad\x28\xdb\x1a\x15\x34\x98\xff\x46\xed\xef\x37\x0d\x99\xbf\x4a\
+\x3c\x30\x38\xc0\xc8\x4b\xaf\x92\x5a\x9c\xe2\xe0\x23\x6d\x74\xb4\
+\xba\x84\x5d\x0b\x29\x45\x7d\xb8\x94\x82\x96\xb6\x10\xf3\xc5\x12\
+\x2a\xef\x53\x11\x1a\x63\xad\x3f\x93\x19\x85\xf1\xb1\x77\x58\x5a\
+\xf8\x99\x97\x9f\xe9\xa6\x75\x47\x90\xc6\xb8\x43\xd8\xb5\xb6\xce\
+\xfc\xfa\xfd\x00\xfb\x3e\xf4\xc8\x05\x35\xba\x5e\xeb\x46\x21\xf9\
+\xcf\x0a\xa9\x8c\x87\xe3\x48\xdc\x90\xb5\x6e\x98\x6a\xaa\x65\xf2\
+\x52\x92\x43\x2f\x5e\xc2\x8c\x02\x1a\x10\xf5\x07\xac\xc3\x75\x70\
+\x83\x92\x80\xb3\xf9\xd0\x26\xf8\x8f\xb3\x29\xc6\x3e\xb8\x8c\x19\
+\x35\x75\x6b\x7b\x7e\x3c\xca\x45\x0c\x7e\x49\x31\xf4\x58\x3b\xf7\
+\xf6\x34\x90\x88\x39\x04\x1c\x59\x1f\xfe\xdb\xd5\x3c\x5f\x9d\x4b\
+\x32\xfd\x44\xb2\xba\xd7\xfa\xb6\x60\xcf\xde\x16\xdc\x90\x45\x4c\
+\x4a\x2a\x9e\x62\xfe\x4e\xc5\xc8\xc1\x4e\xda\x76\x86\xe8\xe9\x0a\
+\xe3\xd8\x92\x58\xd4\xc6\xb2\x44\x6d\x78\x2a\x53\xe1\xca\x7c\x99\
+\x63\x5d\xbf\x56\x9d\xbd\x9f\x44\x18\x7a\xba\x95\x27\x0f\xb4\xd3\
+\xdc\x18\xc0\xf3\x0d\x52\x40\xd8\xb5\xb0\xa4\x20\x14\xb2\x70\x6c\
+\x81\x63\xcb\xaa\x42\xd6\xfd\xb7\xf4\xec\xa3\x06\xa0\x50\x52\xd8\
+\x4e\x1b\x7e\x4a\xd3\x31\xf9\x29\xcf\xfe\xd4\x49\x7f\x5f\x13\xfb\
+\xfa\x9b\x71\x43\x92\x58\xd4\x21\x18\x90\xac\xde\xb0\x42\x50\x13\
+\x58\x33\xf3\x88\x6b\xa1\xfd\x65\x96\xf2\x79\xc6\x43\x7b\xd8\x75\
+\x38\xcc\x3d\xdd\xd1\xaa\xcf\x71\xe4\xff\x7f\x91\x56\x33\xaf\xea\
+\x37\xe7\xa1\x94\x21\x16\xb5\xd1\x06\x2c\x29\x36\xf5\x72\x9b\x96\
+\x95\xc0\xc4\xda\x9d\x78\x83\x43\x53\x22\x80\x65\x09\x1c\xfb\x86\
+\xc1\x00\xe7\x25\x70\x14\x48\x6f\x1e\x22\x51\xe3\x75\xd9\xb6\xa5\
+\x81\xa3\x32\xb1\xfb\xf4\x0c\x30\xb8\xb1\x82\x9b\xb0\x09\x60\x30\
+\xb1\xfb\xf4\xcc\xbf\xa0\xe9\x6e\xae\x5a\xdf\x4b\x81\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+"
+
+qt_resource_name = b"\
+\x00\x07\
+\x07\x3b\xe0\xb3\
+\x00\x70\
+\x00\x6c\x00\x75\x00\x67\x00\x69\x00\x6e\x00\x73\
+\x00\x0f\
+\x0b\xa4\x96\x62\
+\x00\x53\
+\x00\x68\x00\x61\x00\x64\x00\x6f\x00\x77\x00\x47\x00\x65\x00\x6e\x00\x65\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x0e\
+\x06\xd7\x96\xc7\
+\x00\x53\
+\x00\x68\x00\x61\x00\x64\x00\x6f\x00\x77\x00\x49\x00\x63\x00\x6f\x00\x6e\x00\x2e\x00\x70\x00\x6e\x00\x67\
+"
+
+qt_resource_struct_v1 = b"\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
+\x00\x00\x00\x14\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
+\x00\x00\x00\x38\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
+"
+
+qt_resource_struct_v2 = b"\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
+\x00\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
+\x00\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x14\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
+\x00\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x38\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
+\x00\x00\x01\x53\x13\xbb\x0f\x3c\
+"
+
+qt_version = QtCore.qVersion().split('.')
+if qt_version < ['5', '8', '0']:
+ rcc_version = 1
+ qt_resource_struct = qt_resource_struct_v1
+else:
+ rcc_version = 2
+ qt_resource_struct = qt_resource_struct_v2
+
+def qInitResources():
+ QtCore.qRegisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)
+
+def qCleanupResources():
+ QtCore.qUnregisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)
+
+qInitResources()
diff --git a/ShadowGenerator/resources_rc.py b/ShadowGenerator/resources_rc.py
index 7b7c450..816fdcc 100644
--- a/ShadowGenerator/resources_rc.py
+++ b/ShadowGenerator/resources_rc.py
@@ -2,14 +2,13 @@
# Resource object code
#
-# Created: ti 13. okt 07:50:05 2015
-# by: The Resource Compiler for PyQt (Qt v4.8.5)
+# Created by: The Resource Compiler for PyQt5 (Qt v5.9.2)
#
# WARNING! All changes made in this file will be lost!
-from PyQt4 import QtCore
+from PyQt5 import QtCore
-qt_resource_data = "\
+qt_resource_data = b"\
\x00\x00\x04\x0a\
\x89\
\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
@@ -79,7 +78,7 @@
\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
"
-qt_resource_name = "\
+qt_resource_name = b"\
\x00\x07\
\x07\x3b\xe0\xb3\
\x00\x70\
@@ -94,17 +93,36 @@
\x00\x68\x00\x61\x00\x64\x00\x6f\x00\x77\x00\x49\x00\x63\x00\x6f\x00\x6e\x00\x2e\x00\x70\x00\x6e\x00\x67\
"
-qt_resource_struct = "\
+qt_resource_struct_v1 = b"\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
\x00\x00\x00\x14\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
\x00\x00\x00\x38\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
"
+qt_resource_struct_v2 = b"\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
+\x00\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
+\x00\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x14\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
+\x00\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x38\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
+\x00\x00\x01\x53\x13\xbb\x0f\x3c\
+"
+
+qt_version = QtCore.qVersion().split('.')
+if qt_version < ['5', '8', '0']:
+ rcc_version = 1
+ qt_resource_struct = qt_resource_struct_v1
+else:
+ rcc_version = 2
+ qt_resource_struct = qt_resource_struct_v2
+
def qInitResources():
- QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
+ QtCore.qRegisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)
def qCleanupResources():
- QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
+ QtCore.qUnregisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)
qInitResources()
diff --git a/ShadowGenerator/shadow_generator.py b/ShadowGenerator/shadow_generator.py
index 1815751..cd8e994 100644
--- a/ShadowGenerator/shadow_generator.py
+++ b/ShadowGenerator/shadow_generator.py
@@ -20,22 +20,27 @@
* *
***************************************************************************/
"""
-from PyQt4.QtCore import QSettings, QTranslator, qVersion, QCoreApplication
-from PyQt4.QtGui import QAction, QIcon, QFileDialog, QMessageBox
+from __future__ import absolute_import
+from builtins import str
+from builtins import object
+from qgis.PyQt.QtCore import QSettings, QTranslator, qVersion, QCoreApplication
+from qgis.PyQt.QtWidgets import QAction, QFileDialog, QMessageBox
+from qgis.PyQt.QtGui import QIcon
from qgis.gui import *
+from qgis.core import QgsMapLayerProxyModel
# Initialize Qt resources from file resources.py
-import resources_rc
+# from . import resources_rc
# Import the code for the dialog
-from shadow_generator_dialog import ShadowGeneratorDialog
+from .shadow_generator_dialog import ShadowGeneratorDialog
from osgeo import gdal, osr
#import gdal from gdalconst import *
import os.path
-import dailyshading as dsh
+from . import dailyshading as dsh
import numpy as np
import webbrowser
-class ShadowGenerator:
+class ShadowGenerator(object):
"""QGIS Plugin Implementation."""
def __init__(self, iface):
@@ -71,8 +76,10 @@ def __init__(self, iface):
self.dlg.pushButtonHelp.clicked.connect(self.help)
self.dlg.pushButtonSave.clicked.connect(self.folder_path)
self.fileDialog = QFileDialog()
- self.fileDialog.setFileMode(4)
- self.fileDialog.setAcceptMode(1)
+ # self.fileDialog.setFileMode(4)
+ # self.fileDialog.setAcceptMode(1)
+ self.fileDialog.setFileMode(QFileDialog.Directory)
+ self.fileDialog.setOption(QFileDialog.ShowDirsOnly, True)
# Declare instance attributes
self.actions = []
@@ -391,10 +398,14 @@ def start_progress(self):
rlayer.triggerRepaint()
def run(self):
+ """Run method that performs all the real work"""
+ # show the dialog
self.dlg.show()
+ # Run the dialog event loop
self.dlg.exec_()
def help(self):
- url = "http://umep-docs.readthedocs.io/en/latest/processor/Solar%20Radiation%20Daily%20Shadow%20Pattern.html"
+ # url = "file://" + self.plugin_dir + "/help/Index.html"
+ url = "http://www.urban-climate.net/umep/UMEP_Manual#Solar_Radiation:_Daily_Shadow_Pattern"
webbrowser.open_new_tab(url)
diff --git a/ShadowGenerator/shadow_generator_dialog.py b/ShadowGenerator/shadow_generator_dialog.py
index d7f9e0a..91d0a95 100644
--- a/ShadowGenerator/shadow_generator_dialog.py
+++ b/ShadowGenerator/shadow_generator_dialog.py
@@ -22,14 +22,15 @@
"""
import os
-from PyQt4 import QtGui, uic
+from qgis.PyQt import uic
+from qgis.PyQt.QtWidgets import QDialog
FORM_CLASS, _ = uic.loadUiType(os.path.join(
os.path.dirname(__file__), 'shadow_generator_dialog_base.ui'))
-class ShadowGeneratorDialog(QtGui.QDialog, FORM_CLASS):
+class ShadowGeneratorDialog(QDialog, FORM_CLASS):
def __init__(self, parent=None):
"""Constructor."""
super(ShadowGeneratorDialog, self).__init__(parent)
diff --git a/SkyViewFactorCalculator/icon_svf.png b/SkyViewFactorCalculator/icon_svf.png
new file mode 100644
index 0000000..f2bec0c
Binary files /dev/null and b/SkyViewFactorCalculator/icon_svf.png differ
diff --git a/SkyViewFactorCalculator/pb_tool.cfg b/SkyViewFactorCalculator/pb_tool.cfg
new file mode 100644
index 0000000..33f64c2
--- /dev/null
+++ b/SkyViewFactorCalculator/pb_tool.cfg
@@ -0,0 +1,74 @@
+#/***************************************************************************
+# SkyViewFactorCalculator
+#
+# Configuration file for plugin builder tool (pb_tool)
+# -------------------
+# begin : 2015-02-04
+# copyright : (C) 2015 by Fredrik Lindberg
+# email : fredrikl@gvc.gu.se
+# ***************************************************************************/
+#
+#/***************************************************************************
+# * *
+# * This program is free software; you can redistribute it and/or modify *
+# * it under the terms of the GNU General Public License as published by *
+# * the Free Software Foundation; either version 2 of the License, or *
+# * (at your option) any later version. *
+# * *
+# ***************************************************************************/
+#
+#
+# You can install pb_tool using:
+# pip install http://geoapt.net/files/pb_tool.zip
+#
+# Consider doing your development (and install of pb_tool) in a virtualenv.
+#
+# For details on setting up and using pb_tool, see:
+# http://spatialgalaxy.net/qgis-plugin-development-with-pb_tool
+#
+# Issues and pull requests here:
+# https://github.com/g-sherman/plugin_build_tool:
+#
+# Sane defaults for your plugin generated by the Plugin Builder are
+# already set below.
+#
+# As you add Python source files and UI files to your plugin, add
+# them to the appropriate [files] section below.
+
+[plugin]
+# Name of the plugin. This is the name of the directory that will
+# be created in .qgis2/python/plugins
+name: SkyViewFactorCalculator
+
+[files]
+# Python files that should be deployed with the plugin
+python_files: __init__.py svf_calculator.py svf_calculator_dialog.py shadowingfunctions.py Skyviewfactor4d.py GdalTools_utils.py
+
+# The main dialog file that is loaded (not compiled)
+main_dialog: svf_calculator_dialog_base.ui
+
+# Other ui files for dialogs you create (these will be compiled)
+compiled_ui_files:
+
+# Resource file(s) that will be compiled
+resource_files: resources.qrc
+
+# Other files required for the plugin
+extras: icon_svf.png metadata.txt
+
+# Other directories to be deployed with the plugin.
+# These must be subdirectories under the plugin directory
+extra_dirs: qgiscombomanager
+
+# ISO code(s) for any locales (translations), separated by spaces.
+# Corresponding .ts files must exist in the i18n directory
+locales:
+
+[help]
+# the built help directory that should be deployed with the plugin
+dir: help/build/html
+# the name of the directory to target in the deployed plugin
+target: help
+
+
+
diff --git a/SkyViewFactorCalculator/resources.py b/SkyViewFactorCalculator/resources.py
new file mode 100644
index 0000000..f6bd433
--- /dev/null
+++ b/SkyViewFactorCalculator/resources.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+
+# Resource object code
+#
+# Created by: The Resource Compiler for PyQt5 (Qt v5.9.2)
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore
+
+qt_resource_data = b"\
+\x00\x00\x01\x01\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x17\x00\x00\x00\x18\x08\x02\x00\x00\x00\x9e\x1e\xf1\x22\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\
+\x01\x00\x9a\x9c\x18\x00\x00\x00\xb3\x49\x44\x41\x54\x78\x9c\xb5\
+\x94\x4b\x12\x84\x20\x0c\x44\xbb\x39\x19\xde\x2c\x37\x33\x37\x9b\
+\x59\xa4\xc4\x80\x66\x86\x8f\xa6\x58\x20\x25\xcf\x17\x6d\x21\x72\
+\x06\x00\xe0\xb3\xef\x98\xad\x54\x66\xdc\xb6\x07\x28\x2b\x55\x51\
+\xe6\x74\x48\xbe\xe0\x82\x71\x1d\x92\x00\x12\x54\x9f\x77\x19\xd2\
+\x31\x91\x83\xb2\xac\xc3\x73\x7a\xc4\xcf\xea\x6f\x08\x8b\x08\xaa\
+\x8e\x66\x8d\x44\x84\x22\xe2\xaf\xbd\xd1\x0f\x9d\x22\x62\xdb\x97\
+\xf2\x52\x0c\x52\xbb\xea\xfa\x8a\x3e\x96\x89\xf8\x26\x2e\x14\x74\
+\xbd\x20\x8f\x08\x28\x00\xb2\xda\xb8\xea\x90\x6c\x10\x01\xc5\xdf\
+\x93\x6f\xbc\xfa\x28\xcd\xc3\x9d\x8e\xcf\xc8\x88\x8b\xe6\xdb\x6d\
+\x7d\x2e\x02\xd1\x1a\x17\x8b\xc4\x94\xd3\x45\xd1\xf1\x7f\x76\xa4\
+\xce\x40\xb1\x08\x00\xea\x4b\xe7\xcb\x44\x7d\x01\x93\x21\x3b\xda\
+\xfe\x67\x46\x8e\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\
+"
+
+qt_resource_name = b"\
+\x00\x07\
+\x07\x3b\xe0\xb3\
+\x00\x70\
+\x00\x6c\x00\x75\x00\x67\x00\x69\x00\x6e\x00\x73\
+\x00\x17\
+\x01\xb1\xc3\xe2\
+\x00\x53\
+\x00\x6b\x00\x79\x00\x56\x00\x69\x00\x65\x00\x77\x00\x46\x00\x61\x00\x63\x00\x74\x00\x6f\x00\x72\x00\x43\x00\x61\x00\x6c\x00\x63\
+\x00\x75\x00\x6c\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x0c\
+\x07\x3d\x9f\x87\
+\x00\x69\
+\x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x73\x00\x76\x00\x66\x00\x2e\x00\x70\x00\x6e\x00\x67\
+"
+
+qt_resource_struct_v1 = b"\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
+\x00\x00\x00\x14\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
+\x00\x00\x00\x48\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
+"
+
+qt_resource_struct_v2 = b"\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
+\x00\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
+\x00\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x14\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
+\x00\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x48\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
+\x00\x00\x01\x4b\xa7\x08\xe7\x56\
+"
+
+qt_version = QtCore.qVersion().split('.')
+if qt_version < ['5', '8', '0']:
+ rcc_version = 1
+ qt_resource_struct = qt_resource_struct_v1
+else:
+ rcc_version = 2
+ qt_resource_struct = qt_resource_struct_v2
+
+def qInitResources():
+ QtCore.qRegisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)
+
+def qCleanupResources():
+ QtCore.qUnregisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)
+
+qInitResources()
diff --git a/SkyViewFactorCalculator/resources_rc.py b/SkyViewFactorCalculator/resources_rc.py
index 86b5def..c5a7d52 100644
--- a/SkyViewFactorCalculator/resources_rc.py
+++ b/SkyViewFactorCalculator/resources_rc.py
@@ -7,7 +7,7 @@
#
# WARNING! All changes made in this file will be lost!
-from PyQt4 import QtCore
+from qgis.PyQt import QtCore
qt_resource_data = "\
\x00\x00\x01\x01\
diff --git a/SkyViewFactorCalculator/svf_calculator.py b/SkyViewFactorCalculator/svf_calculator.py
index 904ef4d..3f40e57 100644
--- a/SkyViewFactorCalculator/svf_calculator.py
+++ b/SkyViewFactorCalculator/svf_calculator.py
@@ -20,27 +20,33 @@
* *
***************************************************************************/
"""
-from PyQt4.QtCore import QSettings, QTranslator, qVersion, QThread
-from PyQt4.QtGui import QIcon, QAction, QFileDialog, QMessageBox
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import str
+from builtins import object
+from qgis.PyQt.QtCore import QSettings, QTranslator, qVersion, QThread
+from qgis.PyQt.QtGui import QIcon
+from qgis.PyQt.QtWidgets import QAction, QFileDialog, QMessageBox
from qgis.core import *
from qgis.gui import *
# Initialize Qt resources from file resources.py
-import resources_rc
+# from . import resources_rc
# Import the code for the dialog
-from svf_calculator_dialog import SkyViewFactorCalculatorDialog
+from .svf_calculator_dialog import SkyViewFactorCalculatorDialog
import os.path
import numpy as np
from osgeo import gdal
-import Skyviewfactor4d as svf
-from svfworker import Worker
-from svfvegworker import VegWorker
-from osgeo.gdalconst import *
+from . import Skyviewfactor4d as svf
+from .svfworker import Worker
+from .svfvegworker import VegWorker
+# from osgeo.gdalconst import *
import webbrowser
import zipfile
import sys
-class SkyViewFactorCalculator:
+class SkyViewFactorCalculator(object):
"""QGIS Plugin Implementation."""
def __init__(self, iface):
@@ -77,8 +83,10 @@ def __init__(self, iface):
self.dlg.checkBoxUseVeg.toggled.connect(self.text_enable)
self.dlg.checkBoxTrunkExist.toggled.connect(self.text_enable2)
self.fileDialog = QFileDialog()
- self.fileDialog.setFileMode(4)
- self.fileDialog.setAcceptMode(1)
+ # self.fileDialog.setFileMode(4)
+ # self.fileDialog.setAcceptMode(1)
+ self.fileDialog.setFileMode(QFileDialog.Directory)
+ self.fileDialog.setOption(QFileDialog.ShowDirsOnly, True)
# Declare instance attributes
self.actions = []
@@ -311,7 +319,7 @@ def workerFinished(self, ret):
svfbuW = ret["svfW"]
svfbuN = ret["svfN"]
- svfbuname = ret.keys()
+ svfbuname = list(ret.keys())
# svf.saveraster(self.gdal_dsm, self.folderPath[0] + '/' + svfbuname[0] + '.tif', self.svfbu)
# svf.saveraster(self.gdal_dsm, self.folderPath[0] + '/' + svfbuname[1] + '.tif', svfbuE)
@@ -406,7 +414,7 @@ def vegWorkerFinished(self, ret):
svfWaveg = ret["svfWaveg"]
svfNaveg = ret["svfNaveg"]
- svfvegname = ret.keys()
+ svfvegname = list(ret.keys())
svf.saveraster(self.gdal_dsm, self.folderPath[0] + '/' + 'svfveg.tif', svfveg)
svf.saveraster(self.gdal_dsm, self.folderPath[0] + '/' + 'svfEveg.tif', svfEveg)
@@ -646,12 +654,14 @@ def start_progress(self):
# load result into canvas
def run(self):
+ """Run method that performs all the real work"""
self.dlg.show()
self.dlg.exec_()
def help(self):
- url = 'http://umep-docs.readthedocs.io/en/latest/pre-processor/Urban%20Geometry%20Sky%20View%20Factor%20' \
- 'Calculator.html'
+ # url = "file://" + self.plugin_dir + "/help/Index.html"
+ url = 'http://www.urban-climate.net/umep/UMEP_Manual#Urban_Geometry:_Sky_View_Factor_Calculator'
+ # QDesktopServices.openUrl(QUrl(url))
webbrowser.open_new_tab(url)
diff --git a/SkyViewFactorCalculator/svf_calculator_dialog.py b/SkyViewFactorCalculator/svf_calculator_dialog.py
index c51c795..266e877 100644
--- a/SkyViewFactorCalculator/svf_calculator_dialog.py
+++ b/SkyViewFactorCalculator/svf_calculator_dialog.py
@@ -23,13 +23,14 @@
import os
-from PyQt4 import QtGui, uic
+from qgis.PyQt import uic
+from qgis.PyQt.QtWidgets import QDialog
FORM_CLASS, _ = uic.loadUiType(os.path.join(
os.path.dirname(__file__), 'svf_calculator_dialog_base.ui'))
-class SkyViewFactorCalculatorDialog(QtGui.QDialog, FORM_CLASS):
+class SkyViewFactorCalculatorDialog(QDialog, FORM_CLASS):
def __init__(self, parent=None):
"""Constructor."""
super(SkyViewFactorCalculatorDialog, self).__init__(parent)
diff --git a/SkyViewFactorCalculator/svfvegworker.py b/SkyViewFactorCalculator/svfvegworker.py
index ffb219f..76cc938 100644
--- a/SkyViewFactorCalculator/svfvegworker.py
+++ b/SkyViewFactorCalculator/svfvegworker.py
@@ -1,5 +1,5 @@
-from PyQt4 import QtCore, QtGui
+from qgis.PyQt import QtCore, QtGui
import traceback
import numpy as np
from ..Utilities import shadowingfunctions as shadow
diff --git a/SkyViewFactorCalculator/svfworker.py b/SkyViewFactorCalculator/svfworker.py
index 6f86685..f00ad18 100644
--- a/SkyViewFactorCalculator/svfworker.py
+++ b/SkyViewFactorCalculator/svfworker.py
@@ -1,4 +1,4 @@
-from PyQt4 import QtCore, QtGui
+from qgis.PyQt import QtCore, QtGui
import traceback
import numpy as np
from ..Utilities import shadowingfunctions as shadow
diff --git a/SolweigAnalyzer/resources_rc.py b/SolweigAnalyzer/resources_rc.py
index ad66e1f..1bac682 100644
--- a/SolweigAnalyzer/resources_rc.py
+++ b/SolweigAnalyzer/resources_rc.py
@@ -7,7 +7,7 @@
#
# WARNING! All changes made in this file will be lost!
-from PyQt4 import QtCore
+from qgis.PyQt import QtCore
qt_resource_data = "\
\x00\x00\x04\x0a\
diff --git a/SolweigAnalyzer/solweig_analyzer.py b/SolweigAnalyzer/solweig_analyzer.py
index bc41670..9d7af9a 100644
--- a/SolweigAnalyzer/solweig_analyzer.py
+++ b/SolweigAnalyzer/solweig_analyzer.py
@@ -20,11 +20,17 @@
* *
***************************************************************************/
"""
-from PyQt4.QtCore import QSettings, QTranslator, qVersion, QCoreApplication
-from PyQt4.QtGui import QIcon, QAction, QFileDialog, QMessageBox
+from __future__ import print_function
+from __future__ import absolute_import
+from builtins import str
+from builtins import range
+from builtins import object
+from qgis.PyQt.QtCore import QSettings, QTranslator, qVersion, QCoreApplication
+from qgis.PyQt.QtGui import QIcon
+from qgis.PyQt.QtWidgets import QAction, QFileDialog, QMessageBox
from qgis.core import *
from qgis.gui import *
-from solweig_analyzer_dialog import SolweigAnalyzerDialog
+from .solweig_analyzer_dialog import SolweigAnalyzerDialog
import os
import webbrowser
from osgeo import gdal
@@ -40,7 +46,7 @@
pass
-class SolweigAnalyzer:
+class SolweigAnalyzer(object):
"""QGIS Plugin Implementation."""
def __init__(self, iface):
@@ -169,7 +175,7 @@ def unload(self):
del self.toolbar
def folder_path_model(self):
- self.fileDialog.setFileMode(4) # only folders
+ # self.fileDialog.setFileMode(4) # only folders
self.fileDialog.open()
result = self.fileDialog.exec_()
if result == 1:
@@ -259,8 +265,10 @@ def moviescale(self):
self.dlg.spinBoxMovieMax.setValue(1)
def folder_path_save(self):
- self.fileDialog.setFileMode(4)
- self.fileDialog.setAcceptMode(1)
+ # self.fileDialog.setFileMode(4)
+ # self.fileDialog.setAcceptMode(1)
+ self.fileDialog.setFileMode(QFileDialog.Directory)
+ self.fileDialog.setOption(QFileDialog.ShowDirsOnly, True)
self.fileDialog.open()
result = self.fileDialog.exec_()
if result == 1:
@@ -451,7 +459,8 @@ def start_progress_spatial(self):
# Diurnal mean
if self.dlg.checkboxMean.isChecked():
index = 0
- print self.posAll
+ # fix_print_with_import
+ print(self.posAll)
for i in self.posAll:
gdal_dsm = gdal.Open(self.folderPath[0] + '/' + self.l[i])
grid = gdal_dsm.ReadAsArray().astype(np.float)
@@ -694,8 +703,7 @@ def start_progress_poi(self):
self.steps = 0
def help(self):
- url = 'http://umep-docs.readthedocs.io/en/latest/post_processor/Outdoor%20Thermal%20Comfort%20' \
- 'SOLWEIG%20Analyzer.html'
+ url = 'http://www.urban-climate.net/umep/UMEP_Manual#Outdoor_Thermal_Comfort:_SOLWEIG_Analyzer'
webbrowser.open_new_tab(url)
def saveraster(self, gdal_data, filename, raster):
diff --git a/SolweigAnalyzer/solweig_analyzer_dialog.py b/SolweigAnalyzer/solweig_analyzer_dialog.py
index 3cee3aa..022b54e 100644
--- a/SolweigAnalyzer/solweig_analyzer_dialog.py
+++ b/SolweigAnalyzer/solweig_analyzer_dialog.py
@@ -23,13 +23,14 @@
import os
-from PyQt4 import QtGui, uic
+from qgis.PyQt import uic
+from qgis.PyQt.QtWidgets import QDialog
FORM_CLASS, _ = uic.loadUiType(os.path.join(
os.path.dirname(__file__), 'solweig_analyzer_dialog_base.ui'))
-class SolweigAnalyzerDialog(QtGui.QDialog, FORM_CLASS):
+class SolweigAnalyzerDialog(QDialog, FORM_CLASS):
def __init__(self, parent=None):
"""Constructor."""
super(SolweigAnalyzerDialog, self).__init__(parent)
diff --git a/SuewsSimple/resources_rc.py b/SuewsSimple/resources_rc.py
index 18419aa..899b417 100644
--- a/SuewsSimple/resources_rc.py
+++ b/SuewsSimple/resources_rc.py
@@ -7,7 +7,7 @@
#
# WARNING! All changes made in this file will be lost!
-from PyQt4 import QtCore
+from qgis.PyQt import QtCore
qt_resource_data = "\
\x00\x00\x00\x00\
diff --git a/SuewsSimple/suews_simple.py b/SuewsSimple/suews_simple.py
index f3e1aa0..09c9663 100644
--- a/SuewsSimple/suews_simple.py
+++ b/SuewsSimple/suews_simple.py
@@ -20,17 +20,25 @@
* *
***************************************************************************/
"""
-
-from PyQt4.QtCore import QSettings, QTranslator, qVersion
-from PyQt4.QtGui import QAction, QIcon, QFileDialog, QMessageBox
+from __future__ import print_function
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import str
+from builtins import range
+from builtins import object
+
+from qgis.PyQt.QtCore import QSettings, QTranslator, qVersion
+from qgis.PyQt.QtWidgets import QAction, QFileDialog, QMessageBox
+from qgis.PyQt.QtGui import QIcon
from qgis.core import *
from qgis.gui import *
-from suews_simple_dialog import SuewsSimpleDialog
+from .suews_simple_dialog import SuewsSimpleDialog
from ..suewsmodel import Suews_wrapper_v2018a
from ..ImageMorphParmsPoint.imagemorphparmspoint_v1 import ImageMorphParmsPoint
from ..LandCoverFractionPoint.landcover_fraction_point import LandCoverFractionPoint
from ..Utilities import f90nml
-import urllib
+import urllib.request, urllib.parse, urllib.error
import numpy as np
import shutil
import sys
@@ -40,7 +48,7 @@
# from suewssimpleworker import Worker
-class SuewsSimple:
+class SuewsSimple(object):
"""QGIS Plugin Implementation."""
def __init__(self, iface):
@@ -95,8 +103,10 @@ def __init__(self, iface):
self.fileDialogMet.setNameFilter("(*.txt)")
self.fileDialogOut = QFileDialog()
- self.fileDialogOut.setFileMode(4)
- self.fileDialogOut.setAcceptMode(1)
+ # self.fileDialogOut.setFileMode(4)
+ # self.fileDialogOut.setAcceptMode(1)
+ self.fileDialogOut.setFileMode(QFileDialog.Directory)
+ self.fileDialogOut.setOption(QFileDialog.ShowDirsOnly, True)
self.folderPathOut = None
self.folderPath = None
@@ -182,7 +192,11 @@ def unload(self):
del self.toolbar
def run(self):
+ # fix_print_with_import
+ # print(self.model_dir)
+
if not (os.path.isfile(self.model_dir + os.sep + 'SUEWS_V2018a') or os.path.isfile(self.model_dir + os.sep + 'SUEWS_V2018a.exe')):
+ # QMessageBox.information(self.iface.mainWindow(),
if QMessageBox.question(self.iface.mainWindow(), "OS specific binaries missing",
"Before you start to use this plugin for the very first time, the OS specific suews\r\n"
"program (4Mb) must be be download from the UMEP repository and stored\r\n"
@@ -197,13 +211,24 @@ def run(self):
"\r\n"
"\r\n"
"Do you want to contiune with the download?", QMessageBox.Ok | QMessageBox.Cancel) == QMessageBox.Ok:
+ # testfile = urllib.URLopener()
if sys.platform == 'win32':
- urllib.urlretrieve('https://gvc.gu.se/digitalAssets/1695/1695894_suews_v2018a.exe',
- self.model_dir + os.sep + 'SUEWS_V2018a.exe')
+ # print self.model_dir + os.sep + 'SUEWS_V2017b.exe'
+ # testfile.retrieve('http://www.urban-climate.net/umep/repo/nib/win/SUEWS_V2017b.exe', self.model_dir + os.sep + 'SUEWS_V2017b.exe')
+ urllib.request.urlretrieve('https://gvc.gu.se/digitalAssets/1695/1695894_suews_v2018a.exe',
+ self.model_dir + os.sep + 'SUEWS_V2018a.exe')
+ # testfile2 = urllib.URLopener()
+ # testfile2.retrieve('http://www.urban-climate.net/umep/repo/nib/win/cyggcc_s-seh-1.dll', self.model_dir + os.sep + 'cyggcc_s-seh-1.dll')
+ # testfile3 = urllib.URLopener()
+ # testfile3.retrieve('http://www.urban-climate.net/umep/repo/nib/win/cyggfortran-3.dll', self.model_dir + os.sep + 'cyggfortran-3.dll')
+ # testfile4 = urllib.URLopener()
+ # testfile4.retrieve('http://www.urban-climate.net/umep/repo/nib/win/cygquadmath-0.dll', self.model_dir + os.sep + 'cygquadmath-0.dll')
+ # testfile5 = urllib.URLopener()
+ # testfile5.retrieve('http://www.urban-climate.net/umep/repo/nib/win/cygwin1.dll', self.model_dir + os.sep + 'cygwin1.dll')
if sys.platform == 'linux2':
- urllib.urlretrieve('https://gvc.gu.se/digitalAssets/1695/1695887_suews_v2018a', self.model_dir + os.sep + 'SUEWS_V2018a')
+ urllib.request.urlretrieve('https://gvc.gu.se/digitalAssets/1695/1695887_suews_v2018a', self.model_dir + os.sep + 'SUEWS_V2018a')
if sys.platform == 'darwin':
- urllib.urlretrieve('https://gvc.gu.se/digitalAssets/1695/1695886_suews_v2018a', self.model_dir + os.sep + 'SUEWS_V2018a')
+ urllib.request.urlretrieve('https://gvc.gu.se/digitalAssets/1695/1695886_suews_v2018a', self.model_dir + os.sep + 'SUEWS_V2018a')
else:
QMessageBox.critical(self.iface.mainWindow(), "Binaries not downloaded", "This plugin will not be able to start before binaries are downloaded")
return
@@ -331,72 +356,6 @@ def export_initial(self):
self.folderPathInit = outputfile
self.write_to_init(self.model_dir + '/BaseFiles/InitialConditionsKc_2012.nml', self.folderPathInit)
- # # DaysSinceRain = self.dlg.DaysSinceRain.text()
- # # DailyMeanT = self.dlg.DailyMeanT.text()
- # LeafCycle = self.dlg.comboBoxLeafCycle.currentIndex() - 1.
- # SoilMoisture = self.dlg.spinBoxSoilMoisture.value()
- # moist = int(SoilMoisture * 1.5)
- #
- # nml = f90nml.read(self.model_dir + '/BaseFiles/InitialConditionsKc_2012.nml')
- # # nml['initialconditions']['dayssincerain'] = int(DaysSinceRain)
- # # nml['initialconditions']['temp_c0'] = float(DailyMeanT)
- # nml['initialconditions']['soilstorepavedstate'] = moist
- # nml['initialconditions']['soilstorebldgsstate'] = moist
- # nml['initialconditions']['soilstoreevetrstate'] = moist
- # nml['initialconditions']['soilstoredectrstate'] = moist
- # nml['initialconditions']['soilstoregrassstate'] = moist
- # nml['initialconditions']['soilstorebsoilstate'] = moist
- #
- # if LeafCycle == 0: # Winter
- # nml['initialconditions']['gdd_1_0'] = 0
- # nml['initialconditions']['gdd_2_0'] = -450
- # nml['initialconditions']['laiinitialevetr'] = 4
- # nml['initialconditions']['laiinitialdectr'] = 1
- # nml['initialconditions']['laiinitialgrass'] = 1.6
- # elif LeafCycle == 1:
- # nml['initialconditions']['gdd_1_0'] = 50
- # nml['initialconditions']['gdd_2_0'] = -400
- # nml['initialconditions']['laiinitialevetr'] = 4.2
- # nml['initialconditions']['laiinitialdectr'] = 2.0
- # nml['initialconditions']['laiinitialgrass'] = 2.6
- # elif LeafCycle == 2:
- # nml['initialconditions']['gdd_1_0'] = 150
- # nml['initialconditions']['gdd_2_0'] = -300
- # nml['initialconditions']['laiinitialevetr'] = 4.6
- # nml['initialconditions']['laiinitialdectr'] = 3.0
- # nml['initialconditions']['laiinitialgrass'] = 3.6
- # elif LeafCycle == 3:
- # nml['initialconditions']['gdd_1_0'] = 225
- # nml['initialconditions']['gdd_2_0'] = -150
- # nml['initialconditions']['laiinitialevetr'] = 4.9
- # nml['initialconditions']['laiinitialdectr'] = 4.5
- # nml['initialconditions']['laiinitialgrass'] = 4.6
- # elif LeafCycle == 4: # Summer
- # nml['initialconditions']['gdd_1_0'] = 300
- # nml['initialconditions']['gdd_2_0'] = 0
- # nml['initialconditions']['laiinitialevetr'] = 5.1
- # nml['initialconditions']['laiinitialdectr'] = 5.5
- # nml['initialconditions']['laiinitialgrass'] = 5.9
- # elif LeafCycle == 5:
- # nml['initialconditions']['gdd_1_0'] = 225
- # nml['initialconditions']['gdd_2_0'] = -150
- # nml['initialconditions']['laiinitialevetr'] = 4.9
- # nml['initialconditions']['laiinitialdectr'] = 4,5
- # nml['initialconditions']['laiinitialgrass'] = 4.6
- # elif LeafCycle == 6:
- # nml['initialconditions']['gdd_1_0'] = 150
- # nml['initialconditions']['gdd_2_0'] = -300
- # nml['initialconditions']['laiinitialevetr'] = 4.6
- # nml['initialconditions']['laiinitialdectr'] = 3.0
- # nml['initialconditions']['laiinitialgrass'] = 3.6
- # elif LeafCycle == 7:
- # nml['initialconditions']['gdd_1_0'] = 50
- # nml['initialconditions']['gdd_2_0'] = -400
- # nml['initialconditions']['laiinitialevetr'] = 4.2
- # nml['initialconditions']['laiinitialdectr'] = 2.0
- # nml['initialconditions']['laiinitialgrass'] = 2.6
- # nml.write(self.folderPathInit, force=True)
-
def set_default_settings(self):
f = open(self.model_dir + '/BaseFiles/SUEWS_SiteSelect.txt')
lin = f.readlines()
@@ -580,7 +539,7 @@ def start_progress(self):
Suews_wrapper_v2018a.wrapper(self.model_dir)
time.sleep(1)
self.iface.messageBar().pushMessage("Model run finished", "Check problems.txt in " + self.model_dir + " for "
- "additional information about the run", level=QgsMessageBar.INFO)
+ "additional information about the run", level=Qgis.Success)
except Exception as e:
time.sleep(1)
QMessageBox.critical(self.dlg, "An error occurred", str(e) + "\r\n\r\n"
diff --git a/SuewsSimple/suews_simple_dialog.py b/SuewsSimple/suews_simple_dialog.py
index ffb0557..05aea72 100644
--- a/SuewsSimple/suews_simple_dialog.py
+++ b/SuewsSimple/suews_simple_dialog.py
@@ -23,13 +23,14 @@
import os
-from PyQt4 import QtGui, uic
+from qgis.PyQt import uic
+from qgis.PyQt.QtWidgets import QDialog
FORM_CLASS, _ = uic.loadUiType(os.path.join(
os.path.dirname(__file__), 'suews_simple_dialog_base.ui'))
-class SuewsSimpleDialog(QtGui.QDialog, FORM_CLASS):
+class SuewsSimpleDialog(QDialog, FORM_CLASS):
def __init__(self, parent=None):
"""Constructor."""
super(SuewsSimpleDialog, self).__init__(parent)
diff --git a/SuewsSimple/suews_simple_dialog_base.ui b/SuewsSimple/suews_simple_dialog_base.ui
index b594340..220f516 100644
--- a/SuewsSimple/suews_simple_dialog_base.ui
+++ b/SuewsSimple/suews_simple_dialog_base.ui
@@ -79,7 +79,7 @@ p, li { white-space: pre-wrap; }
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">- For more advanced usage of the model, SUEWS can also be executed as a stand alone application as well as through the </span><span style=" font-size:10pt; font-style:italic;">SUEWS (Advanced)</span><span style=" font-size:10pt;"> plugin in UMEP.</span></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">- The full manual of the SUWES-model is available from: </span><a href="http://suews-docs.readthedocs.io"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://suews-docs.readthedocs.io</span></a><span style=" font-size:10pt;"> </span></p></body></html>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">- The full manual of the SUWES-model is available from: </span><a href="http://suews-docs.readthedocs.io"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://suews-docs.readthedocs.io</span></a></p></body></html>