diff -Nru veusz-1.23/ChangeLog veusz-1.23.1/ChangeLog --- veusz-1.23/ChangeLog 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/ChangeLog 2015-06-14 10:28:08.000000000 +0000 @@ -1,3 +1,20 @@ +Changes in 1.23.1: + * Enable compression in exported files (Benjamin K. Stuhl) + * Fix saving histogram datasets + * Add option to "thin" error bars plotted + * Fix label colour in contour labelling + * Remove use of deprecated Qt functions + * Fix clone widget tools plugin + * Fix EPS/PDF crash with broken axis widget + * Do not crash filter plugin if using date datatype + * Avoid crashes in normalise, subtract minimum and divide maximum plugins + * Avoid crash in image widget + * Avoid issue in identifying spacing in 1D->2D conversion + * Add Gnuplot 2D data import plugin (Joerg Meyer) + * When loading data from import plugins, provide default values + * Remove some deprecated Qt uses + * Fix issue when plotting non-plain datasets with nan values + Changes in 1.23: * Add new export dialog box which can export multiple pages and modify the export options diff -Nru veusz-1.23/debian/changelog veusz-1.23.1/debian/changelog --- veusz-1.23/debian/changelog 2015-04-18 10:27:14.000000000 +0000 +++ veusz-1.23.1/debian/changelog 2015-06-18 17:35:56.000000000 +0000 @@ -1,3 +1,9 @@ +veusz (1.23.1-0~ppa1~utopic1) utopic; urgency=low + + * Update to Veusz 1.23.1 + + -- Jeremy Sanders Sat, 18 Jun 2015 19:32:00 +0200 + veusz (1.23-0~ppa1~utopic1) utopic; urgency=low * Update to Veusz 1.23 diff -Nru veusz-1.23/Documents/manual.html veusz-1.23.1/Documents/manual.html --- veusz-1.23/Documents/manual.html 2015-04-17 18:14:17.000000000 +0000 +++ veusz-1.23.1/Documents/manual.html 2015-06-13 09:04:38.000000000 +0000 @@ -1,7 +1,7 @@ -Veusz - a scientific plotting package

Veusz - a scientific plotting package

Jeremy Sanders

+Veusz - a scientific plotting package

Veusz - a scientific plotting package

Jeremy Sanders

This document is licensed under the GNU General Public License, version 2 or greater. Please see the file COPYING for - details, or see http://www.gnu.org/licenses/gpl-2.0.html.


Table of Contents

1. Introduction
1. Veusz
2. Terminology
2.1. Widget
2.2. Settings: properties and formatting
2.3. Text
2.4. Measurements
2.5. Axis numeric scales
3. Installation
4. The main window
5. My first plot
2. Reading data
1. Standard text import
1.1. Data types in text import
1.2. Descriptors
2. CSV files
3. HDF5 files
3.1. Error bars
3.2. Slices
3.3. 2D data ranges
3.4. Dates
4. 2D text or CSV format
5. FITS files
6. Reading other data formats
7. Manipulating datasets
7.1. Using dataset plugins
7.2. Using expressions to create new datasets
7.3. Linking datasets to expressions
7.4. Splitting data
7.5. Defining new constants or functions
7.6. Dataset plugins
8. Capturing data
3. Command line interface
1. Introduction
2. Commands
2.1. Action
2.2. Add
2.3. AddCustom
2.4. AddImportPath
2.5. CloneWidget
2.6. Close
2.7. CreateHistogram
2.8. DatasetPlugin
2.9. EnableToolbar
2.10. Export
2.11. FilterDatasets
2.12. ForceUpdate
2.13. Get
2.14. GetChildren
2.15. GetClick
2.16. GetData
2.17. GetDataType
2.18. GetDatasets
2.19. GPL
2.20. ImportFile
2.21. ImportFile2D
2.22. ImportFileCSV
2.23. ImportFileHDF5
2.24. ImportFilePlugin
2.25. ImportFITSFile
2.26. ImportString
2.27. ImportString2D
2.28. IsClosed
2.29. List
2.30. Load
2.31. MoveToPage
2.32. ReloadData
2.33. Rename
2.34. Remove
2.35. ResizeWindow
2.36. Save
2.37. Set
2.38. SetAntiAliasing
2.39. SetData
2.40. SetDataExpression
2.41. SetDataRange
2.42. SetData2D
2.43. SetData2DExpression
2.44. SetData2DExpressionXYZ
2.45. SetData2DXYFunc
2.46. SetDataDateTime
2.47. SetDataText
2.48. SetToReference
2.49. SetUpdateInterval
2.50. SetVerbose
2.51. StartSecondView
2.52. TagDatasets
2.53. To
2.54. Quit
2.55. WaitForClose
2.56. Zoom
3. Security
4. Using Veusz from other programs
1. Non-Qt Python programs
1.1. Older path-based interface
1.2. New-style object interface
1.3. Translating old to new style
2. PyQt4 programs
3. Non Python programs
4. C, C++ and Fortran

Table of Contents

1. Introduction
1. Veusz
2. Terminology
2.1. Widget
2.2. Settings: properties and formatting
2.3. Text
2.4. Measurements
2.5. Axis numeric scales
3. Installation
4. The main window
5. My first plot
2. Reading data
1. Standard text import
1.1. Data types in text import
1.2. Descriptors
2. CSV files
3. HDF5 files
3.1. Error bars
3.2. Slices
3.3. 2D data ranges
3.4. Dates
4. 2D text or CSV format
5. FITS files
6. Reading other data formats
7. Manipulating datasets
7.1. Using dataset plugins
7.2. Using expressions to create new datasets
7.3. Linking datasets to expressions
7.4. Splitting data
7.5. Defining new constants or functions
7.6. Dataset plugins
8. Capturing data
3. Command line interface
1. Introduction
2. Commands
2.1. Action
2.2. Add
2.3. AddCustom
2.4. AddImportPath
2.5. CloneWidget
2.6. Close
2.7. CreateHistogram
2.8. DatasetPlugin
2.9. EnableToolbar
2.10. Export
2.11. FilterDatasets
2.12. ForceUpdate
2.13. Get
2.14. GetChildren
2.15. GetClick
2.16. GetData
2.17. GetDataType
2.18. GetDatasets
2.19. GPL
2.20. ImportFile
2.21. ImportFile2D
2.22. ImportFileCSV
2.23. ImportFileHDF5
2.24. ImportFilePlugin
2.25. ImportFITSFile
2.26. ImportString
2.27. ImportString2D
2.28. IsClosed
2.29. List
2.30. Load
2.31. MoveToPage
2.32. ReloadData
2.33. Rename
2.34. Remove
2.35. ResizeWindow
2.36. Save
2.37. Set
2.38. SetAntiAliasing
2.39. SetData
2.40. SetDataExpression
2.41. SetDataRange
2.42. SetData2D
2.43. SetData2DExpression
2.44. SetData2DExpressionXYZ
2.45. SetData2DXYFunc
2.46. SetDataDateTime
2.47. SetDataText
2.48. SetToReference
2.49. SetUpdateInterval
2.50. SetVerbose
2.51. StartSecondView
2.52. TagDatasets
2.53. To
2.54. Quit
2.55. WaitForClose
2.56. Zoom
3. Security
4. Using Veusz from other programs
1. Non-Qt Python programs
1.1. Older path-based interface
1.2. New-style object interface
1.3. Translating old to new style
2. PyQt4 programs
3. Non Python programs
4. C, C++ and Fortran

Chapter 1. Introduction

1. Veusz

Veusz is a scientific plotting package. It was designed to be easy to use, easily extensible, but powerful. The program features a graphical user interface, which works under Unix/Linux, Windows or Mac OS X. It can also be easily scripted @@ -20,7 +20,7 @@ different data file types can be added with import plugins. Dataset plugins automate the manipulation of datasets. Tools plugins automate the manipulation of the - document.

2. Terminology

Here we define some terminology for future use.

2.1. Widget

A document and its graphs are built up from widgets. + document.

2. Terminology

Here we define some terminology for future use.

2.1. Widget

A document and its graphs are built up from widgets. These widgets can often by placed within each other, depending on the type of the widget. A widget has children (those widgets placed within it) and its parent. The widgets have a @@ -185,7 +185,7 @@ directly on the page rather than in a graph.

  • ternary - plot data of three variables which add up to 100 per cent.This is a non-orthogonal plot and is placed directly on the page - rather than in a graph.

  • 2.2. Settings: properties and formatting

    The various settings of the widgets come in a number of + rather than in a graph.

    2.2. Settings: properties and formatting

    The various settings of the widgets come in a number of types, including integers (e.g. 10), floats (e.g. 3.14), dataset names ("mydata"), expressions ("x+y"), text ("hi there!"), distances (see above), options ("horizontal" or @@ -202,7 +202,7 @@ menu. Default settings are set on a per-document basis, but can be saved into a separate file and loaded. A default default settings file can be given to use for new documents - (set in the preferences dialog).

    2.3. Text

    Veusz understands a limited set of LaTeX-like formatting + (set in the preferences dialog).

    2.3. Text

    Veusz understands a limited set of LaTeX-like formatting for text. There are some differences (for example, "10^23" puts the 2 and 3 into superscript), but it is fairly similar. You should also leave out the dollar signs. Veusz @@ -240,12 +240,12 @@ can also include special characters directly, by copying and pasting from a character map application. If your current font does not contain these symbols then you may get a box - character.

    2.4. Measurements

    Distances, widths and lengths in Veusz can be specified + character.

    2.4. Measurements

    Distances, widths and lengths in Veusz can be specified in a number of different ways. These include absolute distances specified in physical units, e.g. 1cm, 0.05m, 10mm, 5in and 10pt, and relative units, which are relative to the largest dimension of the page, including 5%, 1/20, - 0.05.

    2.5. Axis numeric scales

    The way in which numbers are formatted in axis scales is + 0.05.

    2.5. Axis numeric scales

    The way in which numbers are formatted in axis scales is chosen automatically. For standard numerical axes, values are shown with the "%Vg" formatting (see below). For date axes, an appropriate date formatting is used so that the interval shown @@ -277,8 +277,8 @@ (Monday as first day of week), "x" date representation, "X" time representation, "y" year without century 00..99 and "Y" year. "%VDVS" is a special Veusz addon format which shows - seconds and fractions of seconds (e.g. 12.2).

    3. Installation

    Please look at the Installation notes (INSTALL) for - details on installing Veusz.

    4. The main window

    You should see the main window when you run Veusz (you can + seconds and fractions of seconds (e.g. 12.2).

    3. Installation

    Please look at the Installation notes (INSTALL) for + details on installing Veusz.

    4. The main window

    You should see the main window when you run Veusz (you can just type the veusz command in Unix).

    The Veusz window is split into several sections. At the top is the menu bar and tool bar. These work in the usual way to other applications. Sometimes options are disabled (greyed out) @@ -318,7 +318,7 @@ the right of the screen. This window allows you to view the datasets currently loaded, their dimensions and type. Hovering a mouse over the size of the dataset will give you a preview of - the data.

    5. My first plot

    After opening Veusz, on the left of the main window, you + the data.

    5. My first plot

    After opening Veusz, on the left of the main window, you will see a Document, containing a Page, which contains a Graph with its axes. The Graph is selected in the selection window. The toolbar above adds a new widget to the selected @@ -372,7 +372,7 @@ subsetting, and clicking on the "hide" option. You can change the colour of the marker by going to the "Marker Fill" subsetting, and entering a new colour (e.g. red), into the - colour property.

    Chapter 2. Reading data

    + colour property.

    Chapter 2. Reading data

    Currently Veusz supports reading data from files with text, CSV, HDF5, FITS, 2D text or CSV, QDP, binary and NPY/NPZ formats. Use the @@ -397,7 +397,7 @@ suffix can be given when importing. These are added to the front or back of each dataset name imported. They are convenient for grouping data together. -

    We list the various types of import below.

    1. Standard text import

    +

    We list the various types of import below.

    1. Standard text import

    The default text import operates on simple text files. The data are assumed to be in columns separated by whitespace. Each column corresponds to dataset (or its error @@ -426,7 +426,7 @@ datasets are created for each block, using a numeric suffix giving the block number, e.g. _1, _2. -

    1.1. Data types in text import

    +

    1.1. Data types in text import

    Veusz supports reading in several types of data. The type of data can be added in round brackets after the name in the descriptor. Veusz will try to guess the type of data based @@ -461,7 +461,7 @@ supports dates and times in the local format, though take note that the same file and data may not work on a system in a different location. -

    1.2. Descriptors

    +

    1.2. Descriptors

    A list of datasets, or a "Descriptor", is given in the Import dialog to describe how the data are formatted in the import file. The descriptor at its simplest is a space or @@ -507,7 +507,7 @@ 7 8 9 # etc... -

    1.2.1. Descriptor examples

    1. +

    1.2.1. Descriptor examples

    1. x y two columns are present in the file, they will be read in as datasets "x" and "y".

    2. @@ -541,7 +541,7 @@ foo,,+- read the first column as the foo dataset, skip a column, and read the third column as its symmetric error. -

    2. CSV files

    +

    2. CSV files

    CVS (comma separated variable) files are often written from other programs, such as spreadsheets, including Excel and Gnumeric. Veusz supports reading from these files. @@ -569,7 +569,7 @@ import dialog box - see the examples given. In addition CSV files support numbers in European format (e.g. 2,34 rather than 2.34), depending on the setting in the dialog box. -

    3. HDF5 files

    +

    3. HDF5 files

    HDF5 is a flexible data format. Datasets and tables can be stored in a hierarchical arrangements of groups within a file. Veusz supports reading 1D numeric, text, date-time or 2D @@ -590,7 +590,7 @@ vsz_ attributes for columns are given by appending the suffix _columnname to the attribute. -

    3.1. Error bars

    +

    3.1. Error bars

    Error bars are supported in two ways. The first way is to combine 1D datasets. For the datasets which are error bars, use a name which is the same as the main dataset but with @@ -602,7 +602,7 @@ dataset. This second method can also be enabled by adding an HDF5 attribute vsz_twod_as_oned set to a non-zero value for the dataset. -

    3.2. Slices

    +

    3.2. Slices

    As Veusz only supports 1D and 2D datasets, you may wish to reduce the dimensions of a dataset before importing by slicing. You can also give a slice to import a subset of a @@ -617,7 +617,7 @@ stopping index and optionally c is the step size. A slice can also be specified by providing an HDF5 attribute vsz_slice for the dataset. -

    3.3. 2D data ranges

    +

    3.3. 2D data ranges

    2D data have an associated X and Y range. By default the number of pixels of the image are used to give this range. A range can be specified by clicking on the dataset and @@ -626,7 +626,7 @@ the dataset vsz_range, which should be set to an array of four values (minimum x, minimum y, maximum x, maximum y). -

    3.4. Dates

    +

    3.4. Dates

    Date/time datasets can be made from a 1D numeric dataset or from a text dataset. For the 1D dataset, use the number of seconds relative to the start of the year 2009 (this is @@ -648,7 +648,7 @@ this, set the attribute vsz_convert_datetime to the format expression or iso to specify ISO format. -

    4. 2D text or CSV format

    +

    4. 2D text or CSV format

    Veusz can import 2D data from standard text or CSV files. In this case the data should consist of a matrix of data values, with the columns separated by one or more spaces or tabs and @@ -698,7 +698,7 @@ after importing data.

  • gridatedge - the first row and leftmost column give the positions of the centres of the pixels. This is also an option in the import dialog. The - values should be increasing or decreasing.

  • 5. FITS files

    + values should be increasing or decreasing.

    5. FITS files

    1D or 2D data can be read from FITS files. 1D data, with optional errors bars, can be read from table extensions, and 2D data from image or primary extensions. Note that pyfits or @@ -721,7 +721,7 @@ coordinates are multiplied by the respective CDELT1/2 values and added to the CRVAL1/2 values. -

    6. Reading other data formats

    As mentioned above, a user may write some Python code to +

    6. Reading other data formats

    As mentioned above, a user may write some Python code to read a data file or set of data files. To write a plugin which is incorportated into Veusz, see http://barmag.net/veusz-wiki/ImportPlugins

    You can also include Python code in an input file to read @@ -745,19 +745,19 @@ SetData('x', x, symerr=0.1) SetData('y', y) -

    7. Manipulating datasets

    Imported datasets can easily be modified in the Data +

    7. Manipulating datasets

    Imported datasets can easily be modified in the Data Editor dialog box. This dialog box can also be used to create new datasets from scratch by typing them in. The Data Create dialog box is used to new datasets as a numerical sequence, parametrically or based on other datasets given expressions. If you want to plot a function of a dataset, you often do not have to create a new dataset. Veusz allows to enter expressions - directly in many places.

    7.1. Using dataset plugins

    Dataset plugins can be used to perform arbitrary + directly in many places.

    7.1. Using dataset plugins

    Dataset plugins can be used to perform arbitrary manipulation of datasets. Veusz includes several plugins for mathematical operation of data and other dataset manipulations, such as concatenation or splitting. If you wish to write your own plugins look at - http://barmag.net/veusz-wiki/DatasetPlugins.

    7.2. Using expressions to create new datasets

    For instance, if the user has already imported dataset d, + http://barmag.net/veusz-wiki/DatasetPlugins.

    7.2. Using expressions to create new datasets

    For instance, if the user has already imported dataset d, then they can create d2 which consists of d**2. Expressions are in Python numpy syntax and can include the usual mathematical functions.

    Expressions for error bars can also be given. By appending @@ -781,27 +781,27 @@ surrounding them by brackets. For example (a,0.1) plots dataset a as the data, with symmetric errors bars of 0.1. Asymmetric bars are given as - (a,a*0.1,-a*0.1).

    7.3. Linking datasets to expressions

    A particularly useful feature is to be able to link a + (a,a*0.1,-a*0.1).

    7.3. Linking datasets to expressions

    A particularly useful feature is to be able to link a dataset to an expression, so if the expression changes the - dataset changes with it, like in a spreadsheet.

    7.4. Splitting data

    Data can also be chopped in this method, for example + dataset changes with it, like in a spreadsheet.

    7.4. Splitting data

    Data can also be chopped in this method, for example using the expression x[10:20], which makes a dataset based on the 11th to 20th item in the x dataset (the ranges are Python syntax, and are zero-based). Negative indices count backwards from the end of the dataset. Data can be skipped using expressions such as - data[::2], which skips every other element

    7.5. Defining new constants or functions

    User defined constants or functions can be defined in + data[::2], which skips every other element

    7.5. Defining new constants or functions

    User defined constants or functions can be defined in the "Custom definitions" dialog box under the edit menu. Functions can also be imported from external python modules.

    Custom definitions are defined on a per-document basis, but can be saved or loaded into a file. A default custom definitions file can be set in the preferences dialog - box.

    7.6. Dataset plugins

    In addition to creating datasets based on expressions, a + box.

    7.6. Dataset plugins

    In addition to creating datasets based on expressions, a variety of dataset plugins exist, which make certain operations on datasets much more convenient. See the Data, Operations menu for a list of the default plugins. The user can easily create new plugins. See http://barmag.net/veusz-wiki/DatasetPlugins for details. -

    8. Capturing data

    +

    8. Capturing data

    In addition to the standard data import, data can be captured as it is created from an external program, a network socket or a file or named pipe. When capturing from a file, the @@ -829,7 +829,7 @@ capture. Click Finish or Cancel to stop. Cancelling destroys captured data. -

    Chapter 3. Command line interface

    1. Introduction

    An alternative way to control Veusz is via its command +

    Chapter 3. Command line interface

    1. Introduction

    An alternative way to control Veusz is via its command line interface. As Veusz is a a Python application it uses Python as its scripting language. Therefore you can freely mix Veusz and Python commands on the command line. Veusz can also @@ -846,11 +846,11 @@ or using veusz_listen. Commands specific to particular modes are documented as such.

    Veusz also includes a new object-oriented version of the interface, which is documented at - http://barmag.net/veusz-wiki/EmbeddingPython.

    2. Commands

    We list the allowed set of commands below

    2.1. Action

    Action('actionname', + http://barmag.net/veusz-wiki/EmbeddingPython.

    2. Commands

    We list the allowed set of commands below

    2.1. Action

    Action('actionname', componentpath='.')

    Initiates the specified action on the widget (component) given the action name. Actions perform certain automated routines. These include "fit" on a fit widget, and - "zeroMargins" on grids.

    2.2. Add

    Add('widgettype', name='nameforwidget', + "zeroMargins" on grids.

    2.2. Add

    Add('widgettype', name='nameforwidget', autoadd=True, optionalargs)

    The Add command adds a graph into the current widget (See the To command to change the current position).

    The first argument is the type of widget to add. These @@ -863,7 +863,7 @@ given, for example Add('axis', name='y', direction='vertical').

    Subsettings may be set by using double underscores, for example Add('xy', - MarkerFill__color='red', ErrorBarLine__hide=True).

    Returns: Name of widget added.

    2.3. AddCustom

    AddCustom(type, name, value)

    Add a custom definition for evaluation of + MarkerFill__color='red', ErrorBarLine__hide=True).

    Returns: Name of widget added.

    2.3. AddCustom

    AddCustom(type, name, value)

    Add a custom definition for evaluation of expressions. This can define a constant (can be in terms of other constants), a function of 1 or more variables, or a function imported from an external python module.

    ctype is "constant", "function" or "import".

    name is name of constant, or "function(x, y, ...)" or @@ -874,12 +874,12 @@ name. If mode is 'replace', it replaces any existing definition in the same place in the list or is appended otherwise. If mode is 'append', then an existing definition is - deleted, and the new one appended to the end.

    2.4. AddImportPath

    AddImportPath(directory)

    Add a directory to the list of directories to try to - import data from.

    2.5. CloneWidget

    CloneWidget(widget, newparent, + deleted, and the new one appended to the end.

    2.4. AddImportPath

    AddImportPath(directory)

    Add a directory to the list of directories to try to + import data from.

    2.5. CloneWidget

    CloneWidget(widget, newparent, newname=None)

    Clone the widget given, placing the copy in newparent and the name given. newname is an optional new name to give - it Returns new widget path.

    2.6. Close

    Close()

    Closes the plotwindow. This is only supported in - embedded mode.

    2.7. CreateHistogram

    CreateHistogram(inexpr, outbinsds, + it Returns new widget path.

    2.6. Close

    Close()

    Closes the plotwindow. This is only supported in + embedded mode.

    2.7. CreateHistogram

    CreateHistogram(inexpr, outbinsds, outvalsds, binparams=None, binmanual=None, method='counts', cumulative = 'none', errors=False)

    @@ -892,15 +892,15 @@ calculate cumulative distributions which is 'none', 'smalltolarge' or 'largetosmall'. errors is to calculate Poisson error bars. -

    2.8. DatasetPlugin

    DatasetPlugin(pluginname, fields, +

    2.8. DatasetPlugin

    DatasetPlugin(pluginname, fields, datasetnames={})>

    Use a dataset plugin. pluginname: name of plugin to use fields: dict of input values to plugin datasetnames: dict mapping old names to new names of datasets if they are renamed. The new name None means dataset is deleted -

    2.9. EnableToolbar

    EnableToolbar(enable=True)

    Enable/disable the zooming toolbar in the +

    2.9. EnableToolbar

    EnableToolbar(enable=True)

    Enable/disable the zooming toolbar in the plotwindow. This command is only supported in embedded mode or - from veusz_listen.

    2.10. Export

    Export(filename, color=True, + from veusz_listen.

    2.10. Export

    Export(filename, color=True, page=0 dpi=100, antialias=True, quality=85, backcolor='#ffffff00', pdfdpi=150, svgtextastext=False)

    Export the page given to the filename given. The @@ -922,25 +922,25 @@ dpi to use when exporting EPS or PDF files. svgtextastext says whether to export SVG text as text, rather than curves. -

    2.11. FilterDatasets

    FilterDatasets(filterexpr, datasets, prefix="", +

    2.11. FilterDatasets

    FilterDatasets(filterexpr, datasets, prefix="", suffix="", invert=False, replaceblanks=False)

    Filter a list of datasets given. Creates new datasets for each with prefix and suffix added to input dataset names. filterexpr is an input numpy eexpression for filtering the datasets. If invert is set, the filter condition is inverted. If replaceblanks is set, filtered values are not removed, but replaced with a blank or NaN value. This command - only works on 1D numeric, date or text datasets.

    2.12. ForceUpdate

    ForceUpdate()

    Force the window to be updated to reflect the current + only works on 1D numeric, date or text datasets.

    2.12. ForceUpdate

    ForceUpdate()

    Force the window to be updated to reflect the current state of the document. Often used when periodic updates have been disabled (see SetUpdateInterval). This command is only - supported in embedded mode or from veusz_listen.

    2.13. Get

    Get('settingpath')

    Returns: The value of the setting given by the path.

    +	supported in embedded mode or from veusz_listen.

    2.13. Get

    Get('settingpath')

    Returns: The value of the setting given by the path.

     >>> Get('/page1/graph1/x/min')
     'Auto'
    -

    2.14. GetChildren

    GetChildren(where='.')

    Returns: The names of the widgets which are children of - the path given

    2.15. GetClick

    GetClick()

    Waits for the user to click on a graph and returns the +

    2.14. GetChildren

    GetChildren(where='.')

    Returns: The names of the widgets which are children of + the path given

    2.15. GetClick

    GetClick()

    Waits for the user to click on a graph and returns the position of the click on appropriate axes. Command only works in embedded mode.

    Returns: A list containing tuples of the form (axispath, val) for each axis for which the click was in range. The value - is the value on the axis for the click.

    2.16. GetData

    GetData(name)

    Returns: For a 1D dataset, a tuple containing the + is the value on the axis for the click.

    2.16. GetData

    GetData(name)

    Returns: For a 1D dataset, a tuple containing the dataset with the name given. The value is (data, symerr, negerr, poserr), with each a numpy array of the same size or None. data are the values of the dataset, symerr are the @@ -954,11 +954,11 @@ data.

     data = GetData('x')
     SetData('x', data[0]*0.1, *data[1:])
    -

    2.17. GetDataType

    GetDataType(name)

    Get type of dataset with name given. Returns '1d' for a +

    2.17. GetDataType

    GetDataType(name)

    Get type of dataset with name given. Returns '1d' for a 1d dataset, '2d' for a 2d dataset, 'text' for a text dataset - and 'datetime' for a datetime dataset.

    2.18. GetDatasets

    GetDatasets()

    Returns: The names of the datasets in the current - document.

    2.19. GPL

    GPL()

    Print out the GNU Public Licence, which Veusz is licenced - under.

    2.20. ImportFile

    ImportFile('filename', 'descriptor', + and 'datetime' for a datetime dataset.

    2.18. GetDatasets

    GetDatasets()

    Returns: The names of the datasets in the current + document.

    2.19. GPL

    GPL()

    Print out the GNU Public Licence, which Veusz is licenced + under.

    2.20. ImportFile

    ImportFile('filename', 'descriptor', linked=False, prefix='', suffix='', encoding='utf_8', renames={})

    Imports data from a file. The arguments are the filename @@ -974,7 +974,7 @@ import.

    Returns: A tuple containing a list of the imported datasets and the number of conversions which failed for a dataset.

    Changed in version 0.5: A tuple is returned rather than - just the number of imported variables.

    2.21. ImportFile2D

    ImportFile2D('filename', datasets, + just the number of imported variables.

    2.21. ImportFile2D

    ImportFile2D('filename', datasets, xrange=(a,b), yrange=(c,d), invertrows=True/False, invertcols=True/False, transpose=True/False, prefix='', suffix='', linked=False, @@ -1002,7 +1002,7 @@ deliminated by using blank lines.

    In addition to the matrix of numbers, the various optional parameters this command takes can also be specified in the data file. These commands should be given on separate - lines before the matrix of numbers. They are:

    1. xrange A B

    2. yrange C D

    3. invertrows

    4. invertcols

    5. transpose

    2.22. ImportFileCSV

    ImportFileCSV('filename', readrows=False, + lines before the matrix of numbers. They are:

    1. xrange A B

    2. yrange C D

    3. invertrows

    4. invertcols

    5. transpose

    2.22. ImportFileCSV

    ImportFileCSV('filename', readrows=False, dsprefix='', dssuffix='', linked=False, encoding='utf_8', renames={})

    This command imports data from a CSV format file. Data @@ -1014,7 +1014,7 @@ the dataset name). linked specifies whether the data will be linked to the file. renames, if set, provides new names for datasets after import. -

    2.23. ImportFileHDF5

    +

    2.23. ImportFileHDF5

    ImportFileHDF5(filename, items, namemap={}, slices={}, twodranges={}, twod_as_oned=set([]), convert_datetime={}, prefix='', suffix='', renames={}, @@ -1067,7 +1067,7 @@ vsz_attributename_columnname.

    Returns: list of imported datasets -

    2.24. ImportFilePlugin

    ImportFilePlugin('pluginname', 'filename', +

    2.24. ImportFilePlugin

    ImportFilePlugin('pluginname', 'filename', **pluginargs, linked=False, encoding='utf_8', prefix='', suffix='', renames={})

    Import data from file using import plugin 'pluginname'. The @@ -1075,7 +1075,7 @@ encoding, and prefix and suffix to prepend or append to dataset names. renames, if set, provides new names for datasets after import. -

    2.25. ImportFITSFile

    ImportFITSFile(datasetname, filename, hdu, +

    2.25. ImportFITSFile

    ImportFITSFile(datasetname, filename, hdu, datacol='A', symerrcol='B', poserrcol='C', negerrcol='D', linked=True/False, renames={})

    This command does a simple import from a FITS file. The FITS format is used within the astronomical community to transport @@ -1094,7 +1094,7 @@ columns.

    If linked is True, then the dataset is not saved with a saved document, but is reread from the data file each time the document is loaded. renames, if set, provides new names for - datasets after import.

    2.26. ImportString

    ImportString('descriptor', + datasets after import.

    2.26. ImportString

    ImportString('descriptor', 'data')

    Like, ImportFile, but loads the data from the specfied string rather than a file. This allows data to be easily embedded within a document. The data string is @@ -1107,58 +1107,58 @@ 2 5 3 10 ''') -

    2.27. ImportString2D

    ImportString2D(datasets, string)

    Imports a two-dimensional dataset from the string +

    2.27. ImportString2D

    ImportString2D(datasets, string)

    Imports a two-dimensional dataset from the string given. This is similar to the ImportFile2D command, with the same dataset format within the string. This command, however, does not currently take any optional parameters. The various controlling parameters can be set within the string. See the ImportFile2D section for - details.

    2.28. IsClosed

    IsClosed()

    Returns a boolean value telling the caller whether the + details.

    2.28. IsClosed

    IsClosed()

    Returns a boolean value telling the caller whether the plotting window has been closed.

    Note: this command is only supported in the embedding - interface.

    2.29. List

    List(where='.')

    List the widgets which are contained within the widget + interface.

    2.29. List

    List(where='.')

    List the widgets which are contained within the widget with the path given, the type of widgets, and a brief - description.

    2.30. Load

    Load('filename.vsz')

    Loads the veusz script file given. The script file can + description.

    2.30. Load

    Load('filename.vsz')

    Loads the veusz script file given. The script file can be any Python code. The code is executed using the Veusz interpreter.

    Note: this command is only supported at the command line and not in a script. Scripts may use the python - execfile function instead.

    2.31. MoveToPage

    MoveToPage(pagenum)

    Updates window to show the page number given of the + execfile function instead.

    2.31. MoveToPage

    MoveToPage(pagenum)

    Updates window to show the page number given of the document.

    Note: this command is only supported in the embedding - interface or veusz_listen.

    2.32. ReloadData

    ReloadData()

    Reload any datasets which have been linked to + interface or veusz_listen.

    2.32. ReloadData

    ReloadData()

    Reload any datasets which have been linked to files.

    Returns: A tuple containing a list of the imported datasets and the number of conversions which failed for a - dataset.

    2.33. Rename

    Remove('widgetpath', 'newname')

    Rename the widget at the path given to a new name. This + dataset.

    2.33. Rename

    Remove('widgetpath', 'newname')

    Rename the widget at the path given to a new name. This command does not move widgets. See To for a description of the path - syntax. '.' can be used to select the current widget.

    2.34. Remove

    Remove('widgetpath')

    Remove the widget selected using the path. See To for a description of the path - syntax.

    2.35. ResizeWindow

    ResizeWindow(width, height)

    Resizes window to be width by height pixels.

    Note: this command is only supported in the embedding - interface or veusz_listen.

    2.36. Save

    Save('filename.vsz')

    Save the current document under the filename - given.

    2.37. Set

    Set('settingpath', val)

    Set the setting given by the path to the value given. If + syntax. '.' can be used to select the current widget.

    2.34. Remove

    Remove('widgetpath')

    Remove the widget selected using the path. See To for a description of the path + syntax.

    2.35. ResizeWindow

    ResizeWindow(width, height)

    Resizes window to be width by height pixels.

    Note: this command is only supported in the embedding + interface or veusz_listen.

    2.36. Save

    Save('filename.vsz')

    Save the current document under the filename + given.

    2.37. Set

    Set('settingpath', val)

    Set the setting given by the path to the value given. If the type of val is incorrect, an InvalidType exception is thrown. The path to the setting is the optional path to the widget the setting is contained within, an optional subsetting specifier, and the setting itself.

     Set('page1/graph1/x/min', -10.)
    -

    2.38. SetAntiAliasing

    SetAntiAliasing(on)

    Enable or disable anti aliasing in the plot - window, replotting the image.

    2.39. SetData

    SetData(name, val, symerr=None, negerr=None, +

    2.38. SetAntiAliasing

    SetAntiAliasing(on)

    Enable or disable anti aliasing in the plot + window, replotting the image.

    2.39. SetData

    SetData(name, val, symerr=None, negerr=None, poserr=None)

    Set the dataset name with the values given. If None is given for an item, it will be left blank. val is the actual data, symerr are the symmetric errors, negerr and poserr and the getative and positive asymmetric errors. The data can be given - as lists or numpys.

    2.40. SetDataExpression

    SetDataExpression(name, val, symerr=None, negerr=None, + as lists or numpys.

    2.40. SetDataExpression

    SetDataExpression(name, val, symerr=None, negerr=None, poserr=None, linked=False, parametric=None)

    Create a new dataset based on the expressions given. The expressions are Python syntax expressions based on existing datasets.

    If linked is True, the dataset will change as the datasets in the expressions change.

    Parametric can be set to a tuple of (minval, maxval, numitems). t in the expression will iterate - from minval to maxval in numitems values.

    2.41. SetDataRange

    SetDataRange(name, numsteps, val, symerr=None, + from minval to maxval in numitems values.

    2.41. SetDataRange

    SetDataRange(name, numsteps, val, symerr=None, negerr=None, poserr=None, linked=False)

    Set dataset to be a range of values with numsteps steps. val is tuple made up of (minimum value, maximum value). symerr, negerr and poserr are optional tuples for the error bars.

    If linked is True, the dataset can be saved in a document as a SetDataRange, otherwise it is expanded to the - values which would make it up.

    2.42. SetData2D

    SetData2D('name', val, xrange=(A,B), + values which would make it up.

    2.42. SetData2D

    SetData2D('name', val, xrange=(A,B), yrange=(C,D), xgrid=[1,2,3...], ygrid=[4,5,6...])

    Creates a two-dimensional dataset with the name given. val is either a two-dimensional numpy array, or is a @@ -1168,54 +1168,54 @@ inclusive range of the X and Y coordinates of the data. xgrid and ygrid are optional lists, tuples or arrays which give the coordinates of the edges of the pixels. There should be one - more item in each array than pixels.

    2.43. SetData2DExpression

    SetData2DExpression('name', expr, linked=False)

    Create a 2D dataset based on expressions. name is the + more item in each array than pixels.

    2.43. SetData2DExpression

    SetData2DExpression('name', expr, linked=False)

    Create a 2D dataset based on expressions. name is the new dataset name expr is an expression which should return a 2D array linked specifies whether to permanently link the - dataset to the expressions.

    2.44. SetData2DExpressionXYZ

    SetData2DExpressionXYZ('name', 'xexpr', + dataset to the expressions.

    2.44. SetData2DExpressionXYZ

    SetData2DExpressionXYZ('name', 'xexpr', 'yexpr', 'zexpr', linked=False)

    Create a 2D dataset based on three 1D expressions. The x, y expressions need to evaluate to a grid of x, y points, with the z expression as the 2D value at that point. Currently only linear fixed grids are supported. This function is intended to convert calculations or measurements at fixed points into a 2D dataset easily. Missing values are filled - with NaN.

    2.45. SetData2DXYFunc

    SetData2DXYFunc('name', xstep, ystep, 'expr', + with NaN.

    2.45. SetData2DXYFunc

    SetData2DXYFunc('name', xstep, ystep, 'expr', linked=False)

    Construct a 2D dataset using a mathematical expression of "x" and "y". The x values are specified as (min, max, step) in xstep as a tuple, the y values similarly. If linked remains as False, then a real 2D dataset is created, where values can - be modified and the data are stored in the saved file.

    2.46. SetDataDateTime

    SetDataDateTime('name', vals)

    Creates a datetime dataset of name given. vals is a list - of Python datetime objects.

    2.47. SetDataText

    SetDataText(name, val)

    Set the text dataset name with the values given. + be modified and the data are stored in the saved file.

    2.46. SetDataDateTime

    SetDataDateTime('name', vals)

    Creates a datetime dataset of name given. vals is a list + of Python datetime objects.

    2.47. SetDataText

    SetDataText(name, val)

    Set the text dataset name with the values given. val must be a type that can be converted into a Python list.

     SetDataText('mylabel', ['oranges', 'apples', 'pears', 'spam'])
    -

    2.48. SetToReference

    SetToReference(setting, refval)

    Set setting to match other setting refval - always..

    2.49. SetUpdateInterval

    SetUpdateInterval(interval)

    Tells window to update every interval milliseconds at +

    2.48. SetToReference

    SetToReference(setting, refval)

    Set setting to match other setting refval + always..

    2.49. SetUpdateInterval

    SetUpdateInterval(interval)

    Tells window to update every interval milliseconds at most. The value 0 disables updates until this function is called with a non-zero. The value -1 tells Veusz to update the window every time the document has changed. This will make things slow if repeated changes are made to the document. Disabling updates and using the ForceUpdate command will allow the user to control updates directly.

    Note: this command is only supported in the embedding - interface or veusz_listen.

    2.50. SetVerbose

    SetVerbose(v=True)

    If v is True, then extra - information is printed out by commands.

    2.51. StartSecondView

    StartSecondView(name = 'window + interface or veusz_listen.

    2.50. SetVerbose

    SetVerbose(v=True)

    If v is True, then extra + information is printed out by commands.

    2.51. StartSecondView

    StartSecondView(name = 'window title')

    In the embedding interface, this method will open a new Embedding interface onto the same document, returning the object. This new window provides a second view onto the document. It can, for instance, show a different page to the primary view. name is a window title for the new window.

    Note: this command is only supported in the embedding - interface.

    2.52. TagDatasets

    TagDatasets('tag', ['ds1', 'ds2'...])

    Adds the tag to the list of datasets given..

    2.53. To

    To('widgetpath')

    The To command takes a path to a widget and moves to + interface.

    2.52. TagDatasets

    TagDatasets('tag', ['ds1', 'ds2'...])

    Adds the tag to the list of datasets given..

    2.53. To

    To('widgetpath')

    The To command takes a path to a widget and moves to that widget. For example, this may be "/", the root widget, "graph1", "/page1/graph1/x", "../x". The syntax is designed to mimic Unix paths for files. "/" represents the base widget (where the pages reside), and ".." represents the widget next - up the tree.

    2.54. Quit

    Quit()

    Quits Veusz. This is only supported in - veusz_listen.

    2.55. WaitForClose

    WaitForClose()

    Wait until the plotting window has been closed. + up the tree.

    2.54. Quit

    Quit()

    Quits Veusz. This is only supported in + veusz_listen.

    2.55. WaitForClose

    WaitForClose()

    Wait until the plotting window has been closed.

    Note: this command is only supported in the embedding - interface.

    2.56. Zoom

    Zoom(factor)

    Sets the plot zoom factor, relative to a 1:1 + interface.

    2.56. Zoom

    Zoom(factor)

    Sets the plot zoom factor, relative to a 1:1 scaling. factor can also be "width", "height" or "page", to zoom to the page width, height or page, respectively.

    This is only supported in embedded mode or - veusz_listen.

    3. Security

    With the 1.0 release of Veusz, input scripts and + veusz_listen.

    3. Security

    With the 1.0 release of Veusz, input scripts and expressions are checked for possible security risks. Only a limited subset of Python functionality is allowed, or a dialog box is opened allowing the user to cancel the @@ -1227,7 +1227,7 @@ a system are also warned against, specifically Print(), Save() and Export().

    If you are running your own scripts and do not want to be bothered by these dialogs, you can run veusz with the - --unsafe-mode option.

    Chapter 4. Using Veusz from other programs

    1. Non-Qt Python programs

    + --unsafe-mode option.

    Chapter 4. Using Veusz from other programs

    1. Non-Qt Python programs

    Veusz can be used as a Python module for plotting data. There are two ways to use the module: (1) with an older path-based Veusz commands, used in Veusz saved document files or (2) @@ -1238,7 +1238,7 @@ Root object to access Nodes. The new interface is likely to be easier to use unless you are directly translating saved files. -

    1.1. Older path-based interface

    +      

    1.1. Older path-based interface

     """An example embedding program. Veusz needs to be installed into
     the Python path for this to work (use setup.py)
     
    @@ -1307,7 +1307,7 @@
     	    enable plot toolbar

  • StartSecondView(name='Veusz') - start a second view onto the document of the current Embedded object. Returns a new - Embedded object.

  • 1.2. New-style object interface

    + Embedded object.

    1.2. New-style object interface

    In versions of Veusz >1.8 is a new style of object interface, which makes it easier to construct the widget tree. Each widget, group of settings or setting is stored as @@ -1458,7 +1458,7 @@

     for n in Root.WalkWidgets(widgettype='function'):
       n.function.val = 'x**2'
    -	

    1.3. Translating old to new style

    +

    1.3. Translating old to new style

    Here is an example how you might translate the old to new style interface (this is taken from the sin.vsz example). @@ -1505,8 +1505,8 @@ func = graph.Add('function') func.function.val = 'sin(x)' func.Line.color.val = 'red' -

    2. PyQt4 programs

    There is no direct PyQt4 interface. The standard - embedding interface should work, however.

    3. Non Python programs

    Support for non Python programs is available in a limited +

    2. PyQt4 programs

    There is no direct PyQt4 interface. The standard + embedding interface should work, however.

    3. Non Python programs

    Support for non Python programs is available in a limited form. External programs may execute the veusz_listen executable or veusz_listen.py Python module. Veusz will @@ -1532,6 +1532,6 @@ popen C Unix function, which allows a program to be started having control of its standard input and output. Veusz can then be controlled by writing commands to an - input pipe.

    4. C, C++ and Fortran

    A callable library interface to Veusz is on my todo list + input pipe.

    4. C, C++ and Fortran

    A callable library interface to Veusz is on my todo list for C, C++ and Fortran. Please tell me if you would be interested in this option.

    Binary files /tmp/vNr9JRkKq4/veusz-1.23/Documents/manual.pdf and /tmp/pCdmgrZRsX/veusz-1.23.1/Documents/manual.pdf differ diff -Nru veusz-1.23/Documents/veusz.1 veusz-1.23.1/Documents/veusz.1 --- veusz-1.23/Documents/veusz.1 2015-04-17 18:14:26.000000000 +0000 +++ veusz-1.23.1/Documents/veusz.1 2015-06-13 09:04:45.000000000 +0000 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "VEUSZ 1" -.TH VEUSZ 1 "2015-04-17" "1.23" "Veusz" +.TH VEUSZ 1 "2015-04-22" "1.23.1" "Veusz" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -Nru veusz-1.23/Documents/veusz_listen.1 veusz-1.23.1/Documents/veusz_listen.1 --- veusz-1.23/Documents/veusz_listen.1 2015-04-17 18:14:26.000000000 +0000 +++ veusz-1.23.1/Documents/veusz_listen.1 2015-06-13 09:04:45.000000000 +0000 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "VEUSZ_LISTEN 1" -.TH VEUSZ_LISTEN 1 "2015-04-17" "1.23" "Veusz" +.TH VEUSZ_LISTEN 1 "2015-04-22" "1.23.1" "Veusz" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -Nru veusz-1.23/INSTALL veusz-1.23.1/INSTALL --- veusz-1.23/INSTALL 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/INSTALL 2015-06-13 08:22:03.000000000 +0000 @@ -36,7 +36,7 @@ To install on linux to the standard location on the hard disk -# cd veusz-1.22 +# cd veusz-1.23.1 # python setup.py build # su [enter root password] @@ -94,8 +94,8 @@ If you don't want to install veusz fully or are doing development, it can currently be run from its own directory. Do -# tar xzf veusz-1.22.tar.gz [change version here] -# cd veusz-1.22 +# tar xzf veusz-1.23.1.tar.gz [change version here] +# cd veusz-1.23.1 # ./run_veusz_inplace Certain features will be disabled if you do this. You will not be able @@ -117,8 +117,8 @@ incompatibilities. Simply unpack the tar file and run the main executable: -# tar xzf veusz-linux-i386-1.22.tar.gz [change version here] -# cd veusz-linux-i386-1.22 +# tar xzf veusz-linux-i386-1.23.1.tar.gz [change version here] +# cd veusz-linux-i386-1.23.1 # ./veusz 2.2 Installing in Windows diff -Nru veusz-1.23/PKG-INFO veusz-1.23.1/PKG-INFO --- veusz-1.23/PKG-INFO 2015-04-17 18:14:36.000000000 +0000 +++ veusz-1.23.1/PKG-INFO 2015-06-14 10:37:53.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: veusz -Version: 1.23 +Version: 1.23.1 Summary: A scientific plotting package Home-page: http://home.gna.org/veusz/ Author: Jeremy Sanders diff -Nru veusz-1.23/README veusz-1.23.1/README --- veusz-1.23/README 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/README 2015-06-14 10:28:11.000000000 +0000 @@ -1,5 +1,5 @@ -Veusz 1.23 ----------- +Veusz 1.23.1 +------------ http://home.gna.org/veusz/ Veusz is a scientific plotting package. It is designed to produce @@ -12,6 +12,23 @@ manipulation and editing of datasets. Data can be captured from external sources such as Internet sockets or other programs. +Changes in 1.23.1: + * Enable compression in exported files (Benjamin K. Stuhl) + * Fix saving histogram datasets + * Add option to "thin" error bars plotted + * Fix label colour in contour labelling + * Remove use of deprecated Qt functions + * Fix clone widget tools plugin + * Fix EPS/PDF crash with broken axis widget + * Do not crash filter plugin if using date datatype + * Avoid crashes in normalise, subtract minimum and divide maximum plugins + * Avoid crash in image widget + * Avoid issue in identifying spacing in 1D->2D conversion + * Add Gnuplot 2D data import plugin (Joerg Meyer) + * When loading data from import plugins, provide default values + * Remove some deprecated Qt uses + * Fix issue when plotting non-plain datasets with nan values + Changes in 1.23: * Add new export dialog box which can export multiple pages and modify the export options diff -Nru veusz-1.23/tests/comparison/gnuplot_2d.vsz.selftest veusz-1.23.1/tests/comparison/gnuplot_2d.vsz.selftest --- veusz-1.23/tests/comparison/gnuplot_2d.vsz.selftest 1970-01-01 00:00:00.000000000 +0000 +++ veusz-1.23.1/tests/comparison/gnuplot_2d.vsz.selftest 2015-06-13 09:36:54.000000000 +0000 @@ -0,0 +1,66 @@ + + + +Veusz output document + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +0 +1 +2 +3 +4 +5 + + + + + + + +0.5 +1 +1.5 +2 +2.5 + + + + + + + + + + + + diff -Nru veusz-1.23/tests/selftests/gnuplot_2d.dat veusz-1.23.1/tests/selftests/gnuplot_2d.dat --- veusz-1.23/tests/selftests/gnuplot_2d.dat 1970-01-01 00:00:00.000000000 +0000 +++ veusz-1.23.1/tests/selftests/gnuplot_2d.dat 2015-06-13 09:35:02.000000000 +0000 @@ -0,0 +1,2652 @@ +0.4000 0.2500 226.2408 +0.4000 0.3450 162.4517 +0.4000 0.4400 116.6186 +0.4000 0.5350 83.6955 +0.4000 0.6300 60.0478 +0.4000 0.7250 43.0592 +0.4000 0.8200 30.8519 +0.4000 0.9150 22.0733 +0.4000 1.0100 15.7508 +0.4000 1.1050 11.1868 +0.4000 1.2000 7.8816 +0.4000 1.2950 5.4779 +0.4000 1.3900 3.7218 +0.4000 1.4850 2.4349 +0.4000 1.5800 1.4878 +0.4000 1.6750 0.7879 +0.4000 1.7700 0.2699 +0.4000 1.8650 -0.0659 +0.4000 1.9600 -0.1769 +0.4000 2.0550 -0.2296 +0.4000 2.1500 -0.3208 +0.4000 2.2450 -0.3607 +0.4000 2.3400 -0.1850 +0.4000 2.4350 0.0203 +0.4000 2.5300 0.0748 +0.4000 2.6250 0.0770 +0.4000 2.7200 0.0781 +0.4000 2.8150 0.0780 +0.4000 2.9100 0.0782 +0.4000 3.0050 0.0784 +0.4000 3.1000 0.0780 +0.4000 3.1950 0.0767 +0.4000 3.2900 0.0761 +0.4000 3.3850 0.0764 +0.4000 3.4800 0.0773 +0.4000 3.5750 0.0785 +0.4000 3.6700 0.0798 +0.4000 3.7650 0.0811 +0.4000 3.8600 0.0824 +0.4000 3.9550 0.0837 +0.4000 4.0500 0.0849 +0.4000 4.1450 0.0860 +0.4000 4.2400 0.0870 +0.4000 4.3350 0.0880 +0.4000 4.4300 0.0888 +0.4000 4.5250 0.0896 +0.4000 4.6200 0.0904 +0.4000 4.7150 0.0910 +0.4000 4.8100 0.0916 +0.4000 4.9050 0.0922 +0.4000 5.0000 0.0927 + +0.4380 0.2500 233.7782 +0.4380 0.3450 167.3656 +0.4380 0.4400 119.6578 +0.4380 0.5350 85.3995 +0.4380 0.6300 60.8053 +0.4380 0.7250 43.1497 +0.4380 0.8200 30.4754 +0.4380 0.9150 21.3739 +0.4380 1.0100 14.8314 +0.4380 1.1050 10.1203 +0.4380 1.2000 6.7192 +0.4380 1.2950 4.2549 +0.4380 1.3900 2.4633 +0.4380 1.4850 1.1570 +0.4380 1.5800 0.2007 +0.4380 1.6750 -0.5021 +0.4380 1.7700 -1.0198 +0.4380 1.8650 -1.3234 +0.4380 1.9600 -1.4210 +0.4380 2.0550 -1.4896 +0.4380 2.1500 -1.5928 +0.4380 2.2450 -1.6554 +0.4380 2.3400 -1.5078 +0.4380 2.4350 -1.2843 +0.4380 2.5300 -1.1973 +0.4380 2.6250 -1.1953 +0.4380 2.7200 -1.1944 +0.4380 2.8150 -1.1944 +0.4380 2.9100 -1.1939 +0.4380 3.0050 -1.1934 +0.4380 3.1000 -1.1934 +0.4380 3.1950 -1.1945 +0.4380 3.2900 -1.1954 +0.4380 3.3850 -1.1952 +0.4380 3.4800 -1.1944 +0.4380 3.5750 -1.1933 +0.4380 3.6700 -1.1920 +0.4380 3.7650 -1.1907 +0.4380 3.8600 -1.1894 +0.4380 3.9550 -1.1881 +0.4380 4.0500 -1.1869 +0.4380 4.1450 -1.1858 +0.4380 4.2400 -1.1848 +0.4380 4.3350 -1.1839 +0.4380 4.4300 -1.1830 +0.4380 4.5250 -1.1822 +0.4380 4.6200 -1.1815 +0.4380 4.7150 -1.1808 +0.4380 4.8100 -1.1802 +0.4380 4.9050 -1.1796 +0.4380 5.0000 -1.1791 + +0.4760 0.2500 242.6544 +0.4760 0.3450 173.3256 +0.4760 0.4400 123.5310 +0.4760 0.5350 87.7836 +0.4760 0.6300 62.1311 +0.4760 0.7250 43.7273 +0.4760 0.8200 30.5266 +0.4760 0.9150 21.0590 +0.4760 1.0100 14.2649 +0.4760 1.1050 9.3837 +0.4760 1.2000 5.8700 +0.4760 1.2950 3.3333 +0.4760 1.3900 1.4978 +0.4760 1.4850 0.1662 +0.4760 1.5800 -0.8032 +0.4760 1.6750 -1.5114 +0.4760 1.7700 -2.0295 +0.4760 1.8650 -2.2958 +0.4760 1.9600 -2.3886 +0.4760 2.0550 -2.4779 +0.4760 2.1500 -2.5882 +0.4760 2.2450 -2.6627 +0.4760 2.3400 -2.5533 +0.4760 2.4350 -2.3177 +0.4760 2.5300 -2.1921 +0.4760 2.6250 -2.1896 +0.4760 2.7200 -2.1889 +0.4760 2.8150 -2.1888 +0.4760 2.9100 -2.1880 +0.4760 3.0050 -2.1872 +0.4760 3.1000 -2.1870 +0.4760 3.1950 -2.1877 +0.4760 3.2900 -2.1888 +0.4760 3.3850 -2.1888 +0.4760 3.4800 -2.1881 +0.4760 3.5750 -2.1870 +0.4760 3.6700 -2.1858 +0.4760 3.7650 -2.1845 +0.4760 3.8600 -2.1832 +0.4760 3.9550 -2.1819 +0.4760 4.0500 -2.1808 +0.4760 4.1450 -2.1796 +0.4760 4.2400 -2.1786 +0.4760 4.3350 -2.1777 +0.4760 4.4300 -2.1768 +0.4760 4.5250 -2.1760 +0.4760 4.6200 -2.1753 +0.4760 4.7150 -2.1746 +0.4760 4.8100 -2.1740 +0.4760 4.9050 -2.1734 +0.4760 5.0000 -2.1729 + +0.5140 0.2500 242.5944 +0.5140 0.3450 180.3165 +0.5140 0.4400 128.2140 +0.5140 0.5350 90.8173 +0.5140 0.6300 63.9901 +0.5140 0.7250 44.7536 +0.5140 0.8200 30.9651 +0.5140 0.9150 21.0863 +0.5140 1.0100 14.0077 +0.5140 1.1050 8.9324 +0.5140 1.2000 5.2887 +0.5140 1.2950 2.6673 +0.5140 1.3900 0.7789 +0.5140 1.4850 -0.5842 +0.5140 1.5800 -1.5709 +0.5140 1.6750 -2.2874 +0.5140 1.7700 -2.7998 +0.5140 1.8650 -3.0325 +0.5140 1.9600 -3.1289 +0.5140 2.0550 -3.2418 +0.5140 2.1500 -3.3545 +0.5140 2.2450 -3.4312 +0.5140 2.3400 -3.3673 +0.5140 2.4350 -3.1271 +0.5140 2.5300 -2.9645 +0.5140 2.6250 -2.9535 +0.5140 2.7200 -2.9531 +0.5140 2.8150 -2.9527 +0.5140 2.9100 -2.9516 +0.5140 3.0050 -2.9506 +0.5140 3.1000 -2.9501 +0.5140 3.1950 -2.9506 +0.5140 3.2900 -2.9517 +0.5140 3.3850 -2.9519 +0.5140 3.4800 -2.9513 +0.5140 3.5750 -2.9503 +0.5140 3.6700 -2.9491 +0.5140 3.7650 -2.9478 +0.5140 3.8600 -2.9466 +0.5140 3.9550 -2.9453 +0.5140 4.0500 -2.9441 +0.5140 4.1450 -2.9430 +0.5140 4.2400 -2.9420 +0.5140 4.3350 -2.9410 +0.5140 4.4300 -2.9402 +0.5140 4.5250 -2.9394 +0.5140 4.6200 -2.9386 +0.5140 4.7150 -2.9380 +0.5140 4.8100 -2.9374 +0.5140 4.9050 -2.9368 +0.5140 5.0000 -2.9363 + +0.5520 0.2500 225.5812 +0.5520 0.3450 188.3340 +0.5520 0.4400 133.6927 +0.5520 0.5350 94.4794 +0.5520 0.6300 66.3561 +0.5520 0.7250 46.1985 +0.5520 0.8200 31.7582 +0.5520 0.9150 21.4213 +0.5520 1.0100 14.0241 +0.5520 1.1050 8.7297 +0.5520 1.2000 4.9378 +0.5520 1.2950 2.2186 +0.5520 1.3900 0.2680 +0.5520 1.4850 -1.1333 +0.5520 1.5800 -2.1420 +0.5520 1.6750 -2.8699 +0.5520 1.7700 -3.3685 +0.5520 1.8650 -3.5755 +0.5520 1.9600 -3.6832 +0.5520 2.0550 -3.8175 +0.5520 2.1500 -3.9320 +0.5520 2.2450 -4.0098 +0.5520 2.3400 -3.9877 +0.5520 2.4350 -3.7520 +0.5520 2.5300 -3.5556 +0.5520 2.6250 -3.5271 +0.5520 2.7200 -3.5269 +0.5520 2.8150 -3.5262 +0.5520 2.9100 -3.5248 +0.5520 3.0050 -3.5236 +0.5520 3.1000 -3.5228 +0.5520 3.1950 -3.5231 +0.5520 3.2900 -3.5243 +0.5520 3.3850 -3.5246 +0.5520 3.4800 -3.5241 +0.5520 3.5750 -3.5232 +0.5520 3.6700 -3.5221 +0.5520 3.7650 -3.5208 +0.5520 3.8600 -3.5195 +0.5520 3.9550 -3.5183 +0.5520 4.0500 -3.5171 +0.5520 4.1450 -3.5160 +0.5520 4.2400 -3.5150 +0.5520 4.3350 -3.5140 +0.5520 4.4300 -3.5132 +0.5520 4.5250 -3.5124 +0.5520 4.6200 -3.5116 +0.5520 4.7150 -3.5110 +0.5520 4.8100 -3.5103 +0.5520 4.9050 -3.5098 +0.5520 5.0000 -3.5093 + +0.5900 0.2500 209.7791 +0.5900 0.3450 197.3835 +0.5900 0.4400 139.9615 +0.5900 0.5350 98.7565 +0.5900 0.6300 69.2103 +0.5900 0.7250 48.0395 +0.5900 0.8200 32.8805 +0.5900 0.9150 22.0366 +0.5900 1.0100 14.2849 +0.5900 1.1050 8.7454 +0.5900 1.2000 4.7862 +0.5900 1.2950 1.9556 +0.5900 1.3900 -0.0672 +0.5900 1.4850 -1.5138 +0.5900 1.5800 -2.5495 +0.5900 1.6750 -3.2920 +0.5900 1.7700 -3.7693 +0.5900 1.8650 -3.9603 +0.5900 1.9600 -4.0861 +0.5900 2.0550 -4.2382 +0.5900 2.1500 -4.3546 +0.5900 2.2450 -4.4332 +0.5900 2.3400 -4.4459 +0.5900 2.4350 -4.2253 +0.5900 2.5300 -3.9988 +0.5900 2.6250 -3.9440 +0.5900 2.7200 -3.9439 +0.5900 2.8150 -3.9430 +0.5900 2.9100 -3.9414 +0.5900 3.0050 -3.9399 +0.5900 3.1000 -3.9390 +0.5900 3.1950 -3.9389 +0.5900 3.2900 -3.9400 +0.5900 3.3850 -3.9406 +0.5900 3.4800 -3.9403 +0.5900 3.5750 -3.9394 +0.5900 3.6700 -3.9383 +0.5900 3.7650 -3.9371 +0.5900 3.8600 -3.9359 +0.5900 3.9550 -3.9346 +0.5900 4.0500 -3.9335 +0.5900 4.1450 -3.9324 +0.5900 4.2400 -3.9313 +0.5900 4.3350 -3.9304 +0.5900 4.4300 -3.9295 +0.5900 4.5250 -3.9287 +0.5900 4.6200 -3.9279 +0.5900 4.7150 -3.9273 +0.5900 4.8100 -3.9266 +0.5900 4.9050 -3.9261 +0.5900 5.0000 -3.9256 + +0.6280 0.2500 195.0929 +0.6280 0.3450 207.4792 +0.6280 0.4400 147.0230 +0.6280 0.5350 103.6428 +0.6280 0.6300 72.5406 +0.6280 0.7250 50.2600 +0.6280 0.8200 34.3125 +0.6280 0.9150 22.9103 +0.6280 1.0100 14.7668 +0.6280 1.1050 8.9548 +0.6280 1.2000 4.8084 +0.6280 1.2950 1.8521 +0.6280 1.3900 -0.2534 +0.6280 1.4850 -1.7529 +0.6280 1.5800 -2.8208 +0.6280 1.6750 -3.5817 +0.6280 1.7700 -4.0310 +0.6280 1.8650 -4.2173 +0.6280 1.9600 -4.3667 +0.6280 2.0550 -4.5325 +0.6280 2.1500 -4.6505 +0.6280 2.2450 -4.7299 +0.6280 2.3400 -4.7675 +0.6280 2.4350 -4.5742 +0.6280 2.5300 -4.3221 +0.6280 2.6250 -4.2326 +0.6280 2.7200 -4.2326 +0.6280 2.8150 -4.2314 +0.6280 2.9100 -4.2297 +0.6280 3.0050 -4.2280 +0.6280 3.1000 -4.2268 +0.6280 3.1950 -4.2265 +0.6280 3.2900 -4.2274 +0.6280 3.3850 -4.2282 +0.6280 3.4800 -4.2280 +0.6280 3.5750 -4.2273 +0.6280 3.6700 -4.2263 +0.6280 3.7650 -4.2251 +0.6280 3.8600 -4.2238 +0.6280 3.9550 -4.2226 +0.6280 4.0500 -4.2215 +0.6280 4.1450 -4.2203 +0.6280 4.2400 -4.2193 +0.6280 4.3350 -4.2184 +0.6280 4.4300 -4.2175 +0.6280 4.5250 -4.2167 +0.6280 4.6200 -4.2159 +0.6280 4.7150 -4.2152 +0.6280 4.8100 -4.2146 +0.6280 4.9050 -4.2141 +0.6280 5.0000 -4.2135 + +0.6660 0.2500 181.4361 +0.6660 0.3450 218.6440 +0.6660 0.4400 154.8870 +0.6660 0.5350 109.1388 +0.6660 0.6300 76.3409 +0.6660 0.7250 52.8493 +0.6660 0.8200 36.0397 +0.6660 0.9150 24.0258 +0.6660 1.0100 15.4513 +0.6660 1.1050 9.3383 +0.6660 1.2000 4.9838 +0.6660 1.2950 1.8867 +0.6660 1.3900 -0.3127 +0.6660 1.4850 -1.8730 +0.6660 1.5800 -2.9788 +0.6660 1.6750 -3.7610 +0.6660 1.7700 -4.1787 +0.6660 1.8650 -4.3717 +0.6660 1.9600 -4.5494 +0.6660 2.0550 -4.7239 +0.6660 2.1500 -4.8437 +0.6660 2.2450 -4.9237 +0.6660 2.3400 -4.9738 +0.6660 2.4350 -4.8209 +0.6660 2.5300 -4.5491 +0.6660 2.6250 -4.4176 +0.6660 2.7200 -4.4166 +0.6660 2.8150 -4.4152 +0.6660 2.9100 -4.4133 +0.6660 3.0050 -4.4115 +0.6660 3.1000 -4.4101 +0.6660 3.1950 -4.4096 +0.6660 3.2900 -4.4102 +0.6660 3.3850 -4.4112 +0.6660 3.4800 -4.4112 +0.6660 3.5750 -4.4106 +0.6660 3.6700 -4.4096 +0.6660 3.7650 -4.4084 +0.6660 3.8600 -4.4072 +0.6660 3.9550 -4.4060 +0.6660 4.0500 -4.4049 +0.6660 4.1450 -4.4038 +0.6660 4.2400 -4.4027 +0.6660 4.3350 -4.4018 +0.6660 4.4300 -4.4009 +0.6660 4.5250 -4.4001 +0.6660 4.6200 -4.3993 +0.6660 4.7150 -4.3986 +0.6660 4.8100 -4.3980 +0.6660 4.9050 -4.3974 +0.6660 5.0000 -4.3969 + +0.7040 0.2500 168.7300 +0.7040 0.3450 220.6207 +0.7040 0.4400 163.5698 +0.7040 0.5350 115.2507 +0.7040 0.6300 80.6102 +0.7040 0.7250 55.8012 +0.7040 0.8200 38.0524 +0.7040 0.9150 25.3705 +0.7040 1.0100 16.3241 +0.7040 1.1050 9.8800 +0.7040 1.2000 5.2958 +0.7040 1.2950 2.0418 +0.7040 1.3900 -0.2630 +0.7040 1.4850 -1.8926 +0.7040 1.5800 -3.0424 +0.7040 1.6750 -3.8405 +0.7040 1.7700 -4.2340 +0.7040 1.8650 -4.4445 +0.7040 1.9600 -4.6532 +0.7040 2.0550 -4.8324 +0.7040 2.1500 -4.9541 +0.7040 2.2450 -5.0346 +0.7040 2.3400 -5.0856 +0.7040 2.4350 -4.9830 +0.7040 2.5300 -4.6995 +0.7040 2.6250 -4.5260 +0.7040 2.7200 -4.5158 +0.7040 2.8150 -4.5143 +0.7040 2.9100 -4.5123 +0.7040 3.0050 -4.5103 +0.7040 3.1000 -4.5087 +0.7040 3.1950 -4.5080 +0.7040 3.2900 -4.5083 +0.7040 3.3850 -4.5095 +0.7040 3.4800 -4.5097 +0.7040 3.5750 -4.5092 +0.7040 3.6700 -4.5082 +0.7040 3.7650 -4.5071 +0.7040 3.8600 -4.5060 +0.7040 3.9550 -4.5048 +0.7040 4.0500 -4.5036 +0.7040 4.1450 -4.5025 +0.7040 4.2400 -4.5015 +0.7040 4.3350 -4.5005 +0.7040 4.4300 -4.4996 +0.7040 4.5250 -4.4988 +0.7040 4.6200 -4.4980 +0.7040 4.7150 -4.4973 +0.7040 4.8100 -4.4967 +0.7040 4.9050 -4.4961 +0.7040 5.0000 -4.4956 + +0.7420 0.2500 156.9031 +0.7420 0.3450 205.4838 +0.7420 0.4400 173.0944 +0.7420 0.5350 121.9904 +0.7420 0.6300 85.3527 +0.7420 0.7250 59.1140 +0.7420 0.8200 40.3447 +0.7420 0.9150 26.9361 +0.7420 1.0100 17.3746 +0.7420 1.1050 10.5680 +0.7420 1.2000 5.7312 +0.7420 1.2950 2.3036 +0.7420 1.3900 -0.1191 +0.7420 1.4850 -1.8268 +0.7420 1.5800 -3.0271 +0.7420 1.6750 -3.8336 +0.7420 1.7700 -4.2153 +0.7420 1.8650 -4.4530 +0.7420 1.9600 -4.6906 +0.7420 2.0550 -4.8745 +0.7420 2.1500 -4.9982 +0.7420 2.2450 -5.0793 +0.7420 2.3400 -5.1301 +0.7420 2.4350 -5.0744 +0.7420 2.5300 -4.7899 +0.7420 2.6250 -4.5760 +0.7420 2.7200 -4.5470 +0.7420 2.8150 -4.5454 +0.7420 2.9100 -4.5433 +0.7420 3.0050 -4.5411 +0.7420 3.1000 -4.5394 +0.7420 3.1950 -4.5384 +0.7420 3.2900 -4.5385 +0.7420 3.3850 -4.5397 +0.7420 3.4800 -4.5401 +0.7420 3.5750 -4.5397 +0.7420 3.6700 -4.5389 +0.7420 3.7650 -4.5378 +0.7420 3.8600 -4.5366 +0.7420 3.9550 -4.5355 +0.7420 4.0500 -4.5343 +0.7420 4.1450 -4.5332 +0.7420 4.2400 -4.5322 +0.7420 4.3350 -4.5312 +0.7420 4.4300 -4.5303 +0.7420 4.5250 -4.5295 +0.7420 4.6200 -4.5287 +0.7420 4.7150 -4.5280 +0.7420 4.8100 -4.5274 +0.7420 4.9050 -4.5268 +0.7420 5.0000 -4.5263 + +0.7800 0.2500 145.8900 +0.7800 0.3450 191.3707 +0.7800 0.4400 183.4894 +0.7800 0.5350 129.3747 +0.7800 0.6300 90.5764 +0.7800 0.7250 62.7899 +0.7800 0.8200 42.9144 +0.7800 0.9150 28.7170 +0.7800 1.0100 18.5952 +0.7800 1.1050 11.3930 +0.7800 1.2000 6.2797 +0.7800 1.2950 2.6608 +0.7800 1.3900 0.1074 +0.7800 1.4850 -1.6880 +0.7800 1.5800 -2.9455 +0.7800 1.6750 -3.7537 +0.7800 1.7700 -4.1384 +0.7800 1.8650 -4.4116 +0.7800 1.9600 -4.6745 +0.7800 2.0550 -4.8639 +0.7800 2.1500 -4.9901 +0.7800 2.2450 -5.0718 +0.7800 2.3400 -5.1222 +0.7800 2.4350 -5.1057 +0.7800 2.5300 -4.8335 +0.7800 2.6250 -4.5813 +0.7800 2.7200 -4.5240 +0.7800 2.8150 -4.5223 +0.7800 2.9100 -4.5201 +0.7800 3.0050 -4.5178 +0.7800 3.1000 -4.5159 +0.7800 3.1950 -4.5147 +0.7800 3.2900 -4.5146 +0.7800 3.3850 -4.5157 +0.7800 3.4800 -4.5163 +0.7800 3.5750 -4.5161 +0.7800 3.6700 -4.5153 +0.7800 3.7650 -4.5143 +0.7800 3.8600 -4.5132 +0.7800 3.9550 -4.5120 +0.7800 4.0500 -4.5109 +0.7800 4.1450 -4.5098 +0.7800 4.2400 -4.5087 +0.7800 4.3350 -4.5077 +0.7800 4.4300 -4.5069 +0.7800 4.5250 -4.5060 +0.7800 4.6200 -4.5053 +0.7800 4.7150 -4.5046 +0.7800 4.8100 -4.5039 +0.7800 4.9050 -4.5034 +0.7800 5.0000 -4.5028 + +0.8180 0.2500 135.6308 +0.8180 0.3450 178.2083 +0.8180 0.4400 194.7894 +0.8180 0.5350 137.4253 +0.8180 0.6300 96.2939 +0.8180 0.7250 66.8348 +0.8180 0.8200 45.7625 +0.8180 0.9150 30.7111 +0.8180 1.0100 19.9811 +0.8180 1.1050 12.3486 +0.8180 1.2000 6.9335 +0.8180 1.2950 3.1047 +0.8180 1.3900 0.4071 +0.8180 1.4850 -1.4859 +0.8180 1.5800 -2.8078 +0.8180 1.6750 -3.6128 +0.8180 1.7700 -4.0164 +0.8180 1.8650 -4.3317 +0.8180 1.9600 -4.6163 +0.8180 2.0550 -4.8121 +0.8180 2.1500 -4.9411 +0.8180 2.2450 -5.0235 +0.8180 2.3400 -5.0735 +0.8180 2.4350 -5.0851 +0.8180 2.5300 -4.8404 +0.8180 2.6250 -4.5535 +0.8180 2.7200 -4.4584 +0.8180 2.8150 -4.4566 +0.8180 2.9100 -4.4543 +0.8180 3.0050 -4.4519 +0.8180 3.1000 -4.4498 +0.8180 3.1950 -4.4485 +0.8180 3.2900 -4.4481 +0.8180 3.3850 -4.4491 +0.8180 3.4800 -4.4499 +0.8180 3.5750 -4.4498 +0.8180 3.6700 -4.4492 +0.8180 3.7650 -4.4482 +0.8180 3.8600 -4.4471 +0.8180 3.9550 -4.4460 +0.8180 4.0500 -4.4448 +0.8180 4.1450 -4.4437 +0.8180 4.2400 -4.4427 +0.8180 4.3350 -4.4417 +0.8180 4.4300 -4.4408 +0.8180 4.5250 -4.4400 +0.8180 4.6200 -4.4392 +0.8180 4.7150 -4.4385 +0.8180 4.8100 -4.4379 +0.8180 4.9050 -4.4373 +0.8180 5.0000 -4.4368 + +0.8560 0.2500 126.0708 +0.8560 0.3450 165.9292 +0.8560 0.4400 207.0345 +0.8560 0.5350 146.1683 +0.8560 0.6300 102.5214 +0.8560 0.7250 71.2576 +0.8560 0.8200 48.8931 +0.8560 0.9150 32.9185 +0.8560 1.0100 21.5300 +0.8560 1.1050 13.4305 +0.8560 1.2000 7.6872 +0.8560 1.2950 3.6289 +0.8560 1.3900 0.7726 +0.8560 1.4850 -1.2283 +0.8560 1.5800 -2.6212 +0.8560 1.6750 -3.4216 +0.8560 1.7700 -3.8601 +0.8560 1.8650 -4.2227 +0.8560 1.9600 -4.5252 +0.8560 2.0550 -4.7282 +0.8560 2.1500 -4.8606 +0.8560 2.2450 -4.9441 +0.8560 2.3400 -4.9937 +0.8560 2.4350 -5.0189 +0.8560 2.5300 -4.8183 +0.8560 2.6250 -4.5026 +0.8560 2.7200 -4.3606 +0.8560 2.8150 -4.3579 +0.8560 2.9100 -4.3555 +0.8560 3.0050 -4.3530 +0.8560 3.1000 -4.3508 +0.8560 3.1950 -4.3493 +0.8560 3.2900 -4.3487 +0.8560 3.3850 -4.3494 +0.8560 3.4800 -4.3505 +0.8560 3.5750 -4.3506 +0.8560 3.6700 -4.3500 +0.8560 3.7650 -4.3491 +0.8560 3.8600 -4.3480 +0.8560 3.9550 -4.3469 +0.8560 4.0500 -4.3458 +0.8560 4.1450 -4.3447 +0.8560 4.2400 -4.3437 +0.8560 4.3350 -4.3427 +0.8560 4.4300 -4.3418 +0.8560 4.5250 -4.3410 +0.8560 4.6200 -4.3402 +0.8560 4.7150 -4.3395 +0.8560 4.8100 -4.3388 +0.8560 4.9050 -4.3382 +0.8560 5.0000 -4.3377 + +0.8940 0.2500 117.1596 +0.8940 0.3450 154.4715 +0.8940 0.4400 209.9760 +0.8940 0.5350 155.6344 +0.8940 0.6300 109.2785 +0.8940 0.7250 76.0704 +0.8940 0.8200 52.3125 +0.8940 0.9150 35.3416 +0.8940 1.0100 23.2417 +0.8940 1.1050 14.6367 +0.8940 1.2000 8.5369 +0.8940 1.2950 4.2286 +0.8940 1.3900 1.1986 +0.8940 1.4850 -0.9214 +0.8940 1.5800 -2.3814 +0.8940 1.6750 -3.1897 +0.8940 1.7700 -3.6779 +0.8940 1.8650 -4.0912 +0.8940 1.9600 -4.4085 +0.8940 2.0550 -4.6201 +0.8940 2.1500 -4.7566 +0.8940 2.2450 -4.8413 +0.8940 2.3400 -4.8907 +0.8940 2.4350 -4.9161 +0.8940 2.5300 -4.7721 +0.8940 2.6250 -4.4369 +0.8940 2.7200 -4.2462 +0.8940 2.8150 -4.2341 +0.8940 2.9100 -4.2316 +0.8940 3.0050 -4.2291 +0.8940 3.1000 -4.2268 +0.8940 3.1950 -4.2251 +0.8940 3.2900 -4.2243 +0.8940 3.3850 -4.2247 +0.8940 3.4800 -4.2260 +0.8940 3.5750 -4.2262 +0.8940 3.6700 -4.2258 +0.8940 3.7650 -4.2249 +0.8940 3.8600 -4.2239 +0.8940 3.9550 -4.2228 +0.8940 4.0500 -4.2217 +0.8940 4.1450 -4.2206 +0.8940 4.2400 -4.2196 +0.8940 4.3350 -4.2186 +0.8940 4.4300 -4.2177 +0.8940 4.5250 -4.2169 +0.8940 4.6200 -4.2161 +0.8940 4.7150 -4.2154 +0.8940 4.8100 -4.2147 +0.8940 4.9050 -4.2141 +0.8940 5.0000 -4.2136 + +0.9320 0.2500 108.8511 +0.9320 0.3450 143.7780 +0.9320 0.4400 195.7379 +0.9320 0.5350 165.8583 +0.9320 0.6300 116.5887 +0.9320 0.7250 81.2881 +0.9320 0.8200 56.0299 +0.9320 0.9150 37.9851 +0.9320 1.0100 25.1177 +0.9320 1.1050 15.9667 +0.9320 1.2000 9.4805 +0.9320 1.2950 4.9005 +0.9320 1.3900 1.6810 +0.9320 1.4850 -0.5697 +0.9320 1.5800 -2.0911 +0.9320 1.6750 -2.9253 +0.9320 1.7700 -3.4763 +0.9320 1.8650 -3.9388 +0.9320 1.9600 -4.2724 +0.9320 2.0550 -4.4937 +0.9320 2.1500 -4.6351 +0.9320 2.2450 -4.7217 +0.9320 2.3400 -4.7711 +0.9320 2.4350 -4.7953 +0.9320 2.5300 -4.7047 +0.9320 2.6250 -4.3629 +0.9320 2.7200 -4.1234 +0.9320 2.8150 -4.0917 +0.9320 2.9100 -4.0893 +0.9320 3.0050 -4.0866 +0.9320 3.1000 -4.0843 +0.9320 3.1950 -4.0824 +0.9320 3.2900 -4.0814 +0.9320 3.3850 -4.0816 +0.9320 3.4800 -4.0829 +0.9320 3.5750 -4.0833 +0.9320 3.6700 -4.0830 +0.9320 3.7650 -4.0823 +0.9320 3.8600 -4.0813 +0.9320 3.9550 -4.0802 +0.9320 4.0500 -4.0791 +0.9320 4.1450 -4.0780 +0.9320 4.2400 -4.0770 +0.9320 4.3350 -4.0760 +0.9320 4.4300 -4.0751 +0.9320 4.5250 -4.0743 +0.9320 4.6200 -4.0735 +0.9320 4.7150 -4.0728 +0.9320 4.8100 -4.0721 +0.9320 4.9050 -4.0715 +0.9320 5.0000 -4.0710 + +0.9700 0.2500 101.1026 +0.9700 0.3450 133.7960 +0.9700 0.4400 182.4362 +0.9700 0.5350 176.8794 +0.9700 0.6300 124.4786 +0.9700 0.7250 86.9286 +0.9700 0.8200 60.0564 +0.9700 0.9150 40.8557 +0.9700 1.0100 27.1616 +0.9700 1.1050 17.4214 +0.9700 1.2000 10.5176 +0.9700 1.2950 5.6429 +0.9700 1.3900 2.2172 +0.9700 1.4850 -0.1765 +0.9700 1.5800 -1.7550 +0.9700 1.6750 -2.6355 +0.9700 1.7700 -3.2602 +0.9700 1.8650 -3.7696 +0.9700 1.9600 -4.1218 +0.9700 2.0550 -4.3541 +0.9700 2.1500 -4.5015 +0.9700 2.2450 -4.5905 +0.9700 2.3400 -4.6400 +0.9700 2.4350 -4.6633 +0.9700 2.5300 -4.6171 +0.9700 2.6250 -4.2854 +0.9700 2.7200 -3.9979 +0.9700 2.8150 -3.9362 +0.9700 2.9100 -3.9337 +0.9700 3.0050 -3.9311 +0.9700 3.1000 -3.9286 +0.9700 3.1950 -3.9266 +0.9700 3.2900 -3.9255 +0.9700 3.3850 -3.9254 +0.9700 3.4800 -3.9266 +0.9700 3.5750 -3.9273 +0.9700 3.6700 -3.9271 +0.9700 3.7650 -3.9264 +0.9700 3.8600 -3.9255 +0.9700 3.9550 -3.9245 +0.9700 4.0500 -3.9234 +0.9700 4.1450 -3.9223 +0.9700 4.2400 -3.9213 +0.9700 4.3350 -3.9203 +0.9700 4.4300 -3.9194 +0.9700 4.5250 -3.9185 +0.9700 4.6200 -3.9177 +0.9700 4.7150 -3.9170 +0.9700 4.8100 -3.9164 +0.9700 4.9050 -3.9158 +0.9700 5.0000 -3.9152 + +1.0080 0.2500 93.8751 +1.0080 0.3450 124.4767 +1.0080 0.4400 170.0079 +1.0080 0.5350 188.7411 +1.0080 0.6300 132.9782 +1.0080 0.7250 93.0122 +1.0080 0.8200 64.4056 +1.0080 0.9150 43.9618 +1.0080 1.0100 29.3783 +1.0080 1.1050 19.0034 +1.0080 1.2000 11.6486 +1.0080 1.2950 6.4551 +1.0080 1.3900 2.8054 +1.0080 1.4850 0.2559 +1.0080 1.5800 -1.3776 +1.0080 1.6750 -2.3262 +1.0080 1.7700 -3.0331 +1.0080 1.8650 -3.5873 +1.0080 1.9600 -3.9604 +1.0080 2.0550 -4.2053 +1.0080 2.1500 -4.3597 +1.0080 2.2450 -4.4517 +1.0080 2.3400 -4.5018 +1.0080 2.4350 -4.5243 +1.0080 2.5300 -4.5098 +1.0080 2.6250 -4.2070 +1.0080 2.7200 -3.8747 +1.0080 2.8150 -3.7719 +1.0080 2.9100 -3.7695 +1.0080 3.0050 -3.7668 +1.0080 3.1000 -3.7642 +1.0080 3.1950 -3.7621 +1.0080 3.2900 -3.7608 +1.0080 3.3850 -3.7605 +1.0080 3.4800 -3.7615 +1.0080 3.5750 -3.7624 +1.0080 3.6700 -3.7624 +1.0080 3.7650 -3.7618 +1.0080 3.8600 -3.7610 +1.0080 3.9550 -3.7600 +1.0080 4.0500 -3.7589 +1.0080 4.1450 -3.7578 +1.0080 4.2400 -3.7568 +1.0080 4.3350 -3.7558 +1.0080 4.4300 -3.7549 +1.0080 4.5250 -3.7540 +1.0080 4.6200 -3.7533 +1.0080 4.7150 -3.7525 +1.0080 4.8100 -3.7519 +1.0080 4.9050 -3.7513 +1.0080 5.0000 -3.7507 + +1.0460 0.2500 87.1324 +1.0460 0.3450 115.7750 +1.0460 0.4400 158.3945 +1.0460 0.5350 201.4913 +1.0460 0.6300 142.1211 +1.0460 0.7250 99.5619 +1.0460 0.8200 69.0932 +1.0460 0.9150 47.3138 +1.0460 1.0100 31.7743 +1.0460 1.1050 20.7163 +1.0460 1.2000 12.8754 +1.0460 1.2950 7.3375 +1.0460 1.3900 3.4452 +1.0460 1.4850 0.7277 +1.0460 1.5800 -0.9635 +1.0460 1.6750 -2.0018 +1.0460 1.7700 -2.7975 +1.0460 1.8650 -3.3944 +1.0460 1.9600 -3.7912 +1.0460 2.0550 -4.0502 +1.0460 2.1500 -4.2129 +1.0460 2.2450 -4.3088 +1.0460 2.3400 -4.3600 +1.0460 2.4350 -4.3818 +1.0460 2.5300 -4.3823 +1.0460 2.6250 -4.1285 +1.0460 2.7200 -3.7583 +1.0460 2.8150 -3.6034 +1.0460 2.9100 -3.6000 +1.0460 3.0050 -3.5973 +1.0460 3.1000 -3.5947 +1.0460 3.1950 -3.5925 +1.0460 3.2900 -3.5910 +1.0460 3.3850 -3.5905 +1.0460 3.4800 -3.5912 +1.0460 3.5750 -3.5924 +1.0460 3.6700 -3.5925 +1.0460 3.7650 -3.5921 +1.0460 3.8600 -3.5913 +1.0460 3.9550 -3.5903 +1.0460 4.0500 -3.5892 +1.0460 4.1450 -3.5882 +1.0460 4.2400 -3.5871 +1.0460 4.3350 -3.5861 +1.0460 4.4300 -3.5852 +1.0460 4.5250 -3.5844 +1.0460 4.6200 -3.5836 +1.0460 4.7150 -3.5829 +1.0460 4.8100 -3.5822 +1.0460 4.9050 -3.5816 +1.0460 5.0000 -3.5810 + +1.0840 0.2500 80.8409 +1.0840 0.3450 107.6489 +1.0840 0.4400 147.5415 +1.0840 0.5350 204.8862 +1.0840 0.6300 151.9440 +1.0840 0.7250 106.6035 +1.0840 0.8200 74.1367 +1.0840 0.9150 50.9236 +1.0840 1.0100 34.3573 +1.0840 1.1050 22.5651 +1.0840 1.2000 14.2008 +1.0840 1.2950 8.2913 +1.0840 1.3900 4.1367 +1.0840 1.4850 1.2506 +1.0840 1.5800 -0.5171 +1.0840 1.6750 -1.6654 +1.0840 1.7700 -2.5543 +1.0840 1.8650 -3.1931 +1.0840 1.9600 -3.6164 +1.0840 2.0550 -3.8913 +1.0840 2.1500 -4.0637 +1.0840 2.2450 -4.1644 +1.0840 2.3400 -4.2172 +1.0840 2.4350 -4.2386 +1.0840 2.5300 -4.2386 +1.0840 2.6250 -4.0489 +1.0840 2.7200 -3.6524 +1.0840 2.8150 -3.4413 +1.0840 2.9100 -3.4282 +1.0840 3.0050 -3.4255 +1.0840 3.1000 -3.4229 +1.0840 3.1950 -3.4205 +1.0840 3.2900 -3.4189 +1.0840 3.3850 -3.4182 +1.0840 3.4800 -3.4187 +1.0840 3.5750 -3.4200 +1.0840 3.6700 -3.4203 +1.0840 3.7650 -3.4200 +1.0840 3.8600 -3.4192 +1.0840 3.9550 -3.4183 +1.0840 4.0500 -3.4172 +1.0840 4.1450 -3.4162 +1.0840 4.2400 -3.4152 +1.0840 4.3350 -3.4142 +1.0840 4.4300 -3.4133 +1.0840 4.5250 -3.4124 +1.0840 4.6200 -3.4116 +1.0840 4.7150 -3.4109 +1.0840 4.8100 -3.4102 +1.0840 4.9050 -3.4096 +1.0840 5.0000 -3.4090 + +1.1220 0.2500 74.9572 +1.1220 0.3450 100.0469 +1.1220 0.4400 137.3854 +1.1220 0.5350 191.0633 +1.1220 0.6300 162.4750 +1.1220 0.7250 114.1550 +1.1220 0.8200 79.5475 +1.1220 0.9150 54.7983 +1.1220 1.0100 37.1317 +1.1220 1.1050 24.5527 +1.1220 1.2000 15.6272 +1.1220 1.2950 9.3191 +1.1220 1.3900 4.8829 +1.1220 1.4850 1.8310 +1.1220 1.5800 -0.0353 +1.1220 1.6750 -1.3082 +1.1220 1.7700 -2.2884 +1.1220 1.8650 -2.9720 +1.1220 1.9600 -3.4239 +1.1220 2.0550 -3.7162 +1.1220 2.1500 -3.8988 +1.1220 2.2450 -4.0046 +1.1220 2.3400 -4.0590 +1.1220 2.4350 -4.0796 +1.1220 2.5300 -4.0771 +1.1220 2.6250 -3.9468 +1.1220 2.7200 -3.5380 +1.1220 2.8150 -3.2663 +1.1220 2.9100 -3.2324 +1.1220 3.0050 -3.2297 +1.1220 3.1000 -3.2270 +1.1220 3.1950 -3.2246 +1.1220 3.2900 -3.2228 +1.1220 3.3850 -3.2219 +1.1220 3.4800 -3.2221 +1.1220 3.5750 -3.2235 +1.1220 3.6700 -3.2240 +1.1220 3.7650 -3.2238 +1.1220 3.8600 -3.2231 +1.1220 3.9550 -3.2222 +1.1220 4.0500 -3.2212 +1.1220 4.1450 -3.2202 +1.1220 4.2400 -3.2192 +1.1220 4.3350 -3.2182 +1.1220 4.4300 -3.2173 +1.1220 4.5250 -3.2164 +1.1220 4.6200 -3.2156 +1.1220 4.7150 -3.2149 +1.1220 4.8100 -3.2142 +1.1220 4.9050 -3.2135 +1.1220 5.0000 -3.2130 + +1.1600 0.2500 69.3968 +1.1600 0.3450 92.8777 +1.1600 0.4400 127.8226 +1.1600 0.5350 178.0645 +1.1600 0.6300 173.7019 +1.1600 0.7250 122.1997 +1.1600 0.8200 85.3078 +1.1600 0.9150 58.9210 +1.1600 1.0100 40.0834 +1.1600 1.1050 26.6689 +1.1600 1.2000 17.1487 +1.1600 1.2950 10.4200 +1.1600 1.3900 5.6882 +1.1600 1.4850 2.4801 +1.1600 1.5800 0.5047 +1.1600 1.6750 -0.8913 +1.1600 1.7700 -1.9567 +1.1600 1.8650 -2.6853 +1.1600 1.9600 -3.1651 +1.1600 2.0550 -3.4731 +1.1600 2.1500 -3.6635 +1.1600 2.2450 -3.7717 +1.1600 2.3400 -3.8247 +1.1600 2.4350 -3.8413 +1.1600 2.5300 -3.8331 +1.1600 2.6250 -3.7484 +1.1600 2.7200 -3.3367 +1.1600 2.8150 -2.9903 +1.1600 2.9100 -2.9197 +1.1600 3.0050 -2.9171 +1.1600 3.1000 -2.9143 +1.1600 3.1950 -2.9118 +1.1600 3.2900 -2.9099 +1.1600 3.3850 -2.9088 +1.1600 3.4800 -2.9088 +1.1600 3.5750 -2.9101 +1.1600 3.6700 -2.9109 +1.1600 3.7650 -2.9108 +1.1600 3.8600 -2.9102 +1.1600 3.9550 -2.9094 +1.1600 4.0500 -2.9084 +1.1600 4.1450 -2.9074 +1.1600 4.2400 -2.9064 +1.1600 4.3350 -2.9054 +1.1600 4.4300 -2.9044 +1.1600 4.5250 -2.9036 +1.1600 4.6200 -2.9028 +1.1600 4.7150 -2.9020 +1.1600 4.8100 -2.9013 +1.1600 4.9050 -2.9007 +1.1600 5.0000 -2.9001 + +1.1980 0.2500 64.1101 +1.1980 0.3450 86.1010 +1.1980 0.4400 118.8024 +1.1980 0.5350 165.8239 +1.1980 0.6300 185.6575 +1.1980 0.7250 130.7565 +1.1980 0.8200 91.4264 +1.1980 0.9150 63.2934 +1.1980 1.0100 43.2090 +1.1980 1.1050 28.9063 +1.1980 1.2000 18.7554 +1.1980 1.2950 11.5818 +1.1980 1.3900 6.5387 +1.1980 1.4850 3.1843 +1.1980 1.5800 1.0898 +1.1980 1.6750 -0.4303 +1.1980 1.7700 -1.5790 +1.1980 1.8650 -2.3534 +1.1980 1.9600 -2.8605 +1.1980 2.0550 -3.1829 +1.1980 2.1500 -3.3792 +1.1980 2.2450 -3.4875 +1.1980 2.3400 -3.5365 +1.1980 2.4350 -3.5463 +1.1980 2.5300 -3.5294 +1.1980 2.6250 -3.4738 +1.1980 2.7200 -3.0758 +1.1980 2.8150 -2.6435 +1.1980 2.9100 -2.5121 +1.1980 3.0050 -2.5094 +1.1980 3.1000 -2.5067 +1.1980 3.1950 -2.5041 +1.1980 3.2900 -2.5021 +1.1980 3.3850 -2.5008 +1.1980 3.4800 -2.5006 +1.1980 3.5750 -2.5017 +1.1980 3.6700 -2.5027 +1.1980 3.7650 -2.5028 +1.1980 3.8600 -2.5023 +1.1980 3.9550 -2.5015 +1.1980 4.0500 -2.5006 +1.1980 4.1450 -2.4996 +1.1980 4.2400 -2.4986 +1.1980 4.3350 -2.4976 +1.1980 4.4300 -2.4966 +1.1980 4.5250 -2.4958 +1.1980 4.6200 -2.4950 +1.1980 4.7150 -2.4942 +1.1980 4.8100 -2.4935 +1.1980 4.9050 -2.4929 +1.1980 5.0000 -2.4923 + +1.2360 0.2500 59.0666 +1.2360 0.3450 79.6776 +1.2360 0.4400 110.2758 +1.2360 0.5350 154.2790 +1.2360 0.6300 198.3780 +1.2360 0.7250 139.8459 +1.2360 0.8200 97.9121 +1.2360 0.9150 67.9157 +1.2360 1.0100 46.5018 +1.2360 1.1050 31.2536 +1.2360 1.2000 20.4319 +1.2360 1.2950 12.7862 +1.2360 1.3900 7.4156 +1.2360 1.4850 3.9233 +1.2360 1.5800 1.6973 +1.2360 1.6750 0.0439 +1.2360 1.7700 -1.1867 +1.2360 1.8650 -2.0083 +1.2360 1.9600 -2.5432 +1.2360 2.0550 -2.8795 +1.2360 2.1500 -3.0802 +1.2360 2.2450 -3.1871 +1.2360 2.3400 -3.2302 +1.2360 2.4350 -3.2309 +1.2360 2.5300 -3.2031 +1.2360 2.6250 -3.1563 +1.2360 2.7200 -2.7954 +1.2360 2.8150 -2.2758 +1.2360 2.9100 -2.0513 +1.2360 3.0050 -2.0474 +1.2360 3.1000 -2.0446 +1.2360 3.1950 -2.0420 +1.2360 3.2900 -2.0399 +1.2360 3.3850 -2.0385 +1.2360 3.4800 -2.0380 +1.2360 3.5750 -2.0388 +1.2360 3.6700 -2.0401 +1.2360 3.7650 -2.0404 +1.2360 3.8600 -2.0400 +1.2360 3.9550 -2.0392 +1.2360 4.0500 -2.0383 +1.2360 4.1450 -2.0373 +1.2360 4.2400 -2.0363 +1.2360 4.3350 -2.0353 +1.2360 4.4300 -2.0344 +1.2360 4.5250 -2.0335 +1.2360 4.6200 -2.0327 +1.2360 4.7150 -2.0320 +1.2360 4.8100 -2.0313 +1.2360 4.9050 -2.0306 +1.2360 5.0000 -2.0300 + +1.2740 0.2500 54.2427 +1.2740 0.3450 73.5629 +1.2740 0.4400 102.1899 +1.2740 0.5350 143.3643 +1.2740 0.6300 201.6035 +1.2740 0.7250 149.4867 +1.2740 0.8200 104.7711 +1.2740 0.9150 72.7849 +1.2740 1.0100 49.9520 +1.2740 1.1050 33.6951 +1.2740 1.2000 22.1589 +1.2740 1.2950 14.0109 +1.2740 1.3900 8.3115 +1.2740 1.4850 4.6725 +1.2740 1.5800 2.2989 +1.2740 1.6750 0.4958 +1.2740 1.7700 -0.8139 +1.2740 1.8650 -1.6847 +1.2740 1.9600 -2.2481 +1.2740 2.0550 -2.5983 +1.2740 2.1500 -2.8026 +1.2740 2.2450 -2.9070 +1.2740 2.3400 -2.9430 +1.2740 2.4350 -2.9328 +1.2740 2.5300 -2.8925 +1.2740 2.6250 -2.8339 +1.2740 2.7200 -2.5325 +1.2740 2.8150 -1.9364 +1.2740 2.9100 -1.5924 +1.2740 3.0050 -1.5722 +1.2740 3.1000 -1.5694 +1.2740 3.1950 -1.5668 +1.2740 3.2900 -1.5646 +1.2740 3.3850 -1.5630 +1.2740 3.4800 -1.5624 +1.2740 3.5750 -1.5629 +1.2740 3.6700 -1.5643 +1.2740 3.7650 -1.5648 +1.2740 3.8600 -1.5645 +1.2740 3.9550 -1.5638 +1.2740 4.0500 -1.5629 +1.2740 4.1450 -1.5620 +1.2740 4.2400 -1.5610 +1.2740 4.3350 -1.5600 +1.2740 4.4300 -1.5591 +1.2740 4.5250 -1.5582 +1.2740 4.6200 -1.5574 +1.2740 4.7150 -1.5566 +1.2740 4.8100 -1.5559 +1.2740 4.9050 -1.5552 +1.2740 5.0000 -1.5547 + +1.3120 0.2500 49.6210 +1.3120 0.3450 67.7094 +1.3120 0.4400 94.4898 +1.3120 0.5350 133.0144 +1.3120 0.6300 187.5144 +1.3120 0.7250 159.7013 +1.3120 0.8200 112.0115 +1.3120 0.9150 77.8983 +1.3120 1.0100 53.5488 +1.3120 1.1050 36.2143 +1.3120 1.2000 23.9155 +1.3120 1.2950 15.2314 +1.3120 1.3900 9.2072 +1.3120 1.4850 5.4050 +1.3120 1.5800 2.8625 +1.3120 1.6750 0.8972 +1.3120 1.7700 -0.4952 +1.3120 1.8650 -1.4177 +1.3120 1.9600 -2.0107 +1.3120 2.0550 -2.3749 +1.3120 2.1500 -2.5825 +1.3120 2.2450 -2.6834 +1.3120 2.3400 -2.7109 +1.3120 2.4350 -2.6886 +1.3120 2.5300 -2.6343 +1.3120 2.6250 -2.5606 +1.3120 2.7200 -2.3196 +1.3120 2.8150 -1.6676 +1.3120 2.9100 -1.1844 +1.3120 3.0050 -1.1219 +1.3120 3.1000 -1.1192 +1.3120 3.1950 -1.1165 +1.3120 3.2900 -1.1142 +1.3120 3.3850 -1.1125 +1.3120 3.4800 -1.1116 +1.3120 3.5750 -1.1120 +1.3120 3.6700 -1.1134 +1.3120 3.7650 -1.1140 +1.3120 3.8600 -1.1139 +1.3120 3.9550 -1.1133 +1.3120 4.0500 -1.1124 +1.3120 4.1450 -1.1115 +1.3120 4.2400 -1.1105 +1.3120 4.3350 -1.1095 +1.3120 4.4300 -1.1086 +1.3120 4.5250 -1.1077 +1.3120 4.6200 -1.1069 +1.3120 4.7150 -1.1061 +1.3120 4.8100 -1.1054 +1.3120 4.9050 -1.1048 +1.3120 5.0000 -1.1042 + +1.3500 0.2500 45.1973 +1.3500 0.3450 62.0743 +1.3500 0.4400 87.1265 +1.3500 0.5350 123.1714 +1.3500 0.6300 174.1717 +1.3500 0.7250 170.5248 +1.3500 0.8200 119.6515 +1.3500 0.9150 83.2614 +1.3500 1.0100 57.2879 +1.3500 1.1050 38.7992 +1.3500 1.2000 25.6836 +1.3500 1.2950 16.4252 +1.3500 1.3900 10.0819 +1.3500 1.4850 6.0957 +1.3500 1.5800 3.3559 +1.3500 1.6750 1.2179 +1.3500 1.7700 -0.2629 +1.3500 1.8650 -1.2404 +1.3500 1.9600 -1.8648 +1.3500 2.0550 -2.2438 +1.3500 2.1500 -2.4544 +1.3500 2.2450 -2.5510 +1.3500 2.3400 -2.5690 +1.3500 2.4350 -2.5333 +1.3500 2.5300 -2.4634 +1.3500 2.6250 -2.3733 +1.3500 2.7200 -2.1843 +1.3500 2.8150 -1.5040 +1.3500 2.9100 -0.8697 +1.3500 3.0050 -0.7280 +1.3500 3.1000 -0.7253 +1.3500 3.1950 -0.7226 +1.3500 3.2900 -0.7202 +1.3500 3.3850 -0.7184 +1.3500 3.4800 -0.7174 +1.3500 3.5750 -0.7175 +1.3500 3.6700 -0.7188 +1.3500 3.7650 -0.7197 +1.3500 3.8600 -0.7197 +1.3500 3.9550 -0.7191 +1.3500 4.0500 -0.7184 +1.3500 4.1450 -0.7174 +1.3500 4.2400 -0.7165 +1.3500 4.3350 -0.7155 +1.3500 4.4300 -0.7146 +1.3500 4.5250 -0.7137 +1.3500 4.6200 -0.7128 +1.3500 4.7150 -0.7121 +1.3500 4.8100 -0.7114 +1.3500 4.9050 -0.7107 +1.3500 5.0000 -0.7101 + +1.3880 0.2500 40.9864 +1.3880 0.3450 56.6569 +1.3880 0.4400 80.0750 +1.3880 0.5350 113.8029 +1.3880 0.6300 161.5316 +1.3880 0.7250 182.0234 +1.3880 0.8200 127.7375 +1.3880 0.9150 88.9048 +1.3880 1.0100 61.1872 +1.3880 1.1050 41.4574 +1.3880 1.2000 27.4625 +1.3880 1.2950 17.5844 +1.3880 1.3900 10.9295 +1.3880 1.4850 6.7338 +1.3880 1.5800 3.7583 +1.3880 1.6750 1.4395 +1.3880 1.7700 -0.1383 +1.3880 1.8650 -1.1768 +1.3880 1.9600 -1.8366 +1.3880 2.0550 -2.2327 +1.3880 2.1500 -2.4477 +1.3880 2.2450 -2.5403 +1.3880 2.3400 -2.5484 +1.3880 2.4350 -2.4987 +1.3880 2.5300 -2.4123 +1.3880 2.6250 -2.3043 +1.3880 2.7200 -2.1515 +1.3880 2.8150 -1.4738 +1.3880 2.9100 -0.6833 +1.3880 3.0050 -0.4132 +1.3880 3.1000 -0.4106 +1.3880 3.1950 -0.4079 +1.3880 3.2900 -0.4055 +1.3880 3.3850 -0.4035 +1.3880 3.4800 -0.4023 +1.3880 3.5750 -0.4022 +1.3880 3.6700 -0.4034 +1.3880 3.7650 -0.4045 +1.3880 3.8600 -0.4046 +1.3880 3.9550 -0.4042 +1.3880 4.0500 -0.4035 +1.3880 4.1450 -0.4026 +1.3880 4.2400 -0.4016 +1.3880 4.3350 -0.4007 +1.3880 4.4300 -0.3997 +1.3880 4.5250 -0.3988 +1.3880 4.6200 -0.3980 +1.3880 4.7150 -0.3972 +1.3880 4.8100 -0.3965 +1.3880 4.9050 -0.3958 +1.3880 5.0000 -0.3952 + +1.4260 0.2500 37.0316 +1.4260 0.3450 51.5575 +1.4260 0.4400 73.3783 +1.4260 0.5350 104.9422 +1.4260 0.6300 149.6139 +1.4260 0.7250 194.3262 +1.4260 0.8200 136.3756 +1.4260 0.9150 94.9158 +1.4260 1.0100 65.3183 +1.4260 1.1050 44.2470 +1.4260 1.2000 29.2986 +1.4260 1.2950 18.7484 +1.4260 1.3900 11.7900 +1.4260 1.4850 7.3514 +1.4260 1.5800 4.0882 +1.4260 1.6750 1.5827 +1.4260 1.7700 -0.1072 +1.4260 1.8650 -1.2186 +1.4260 1.9600 -1.9232 +1.4260 2.0550 -2.3439 +1.4260 2.1500 -2.5692 +1.4260 2.2450 -2.6621 +1.4260 2.3400 -2.6638 +1.4260 2.4350 -2.6026 +1.4260 2.5300 -2.5016 +1.4260 2.6250 -2.3768 +1.4260 2.7200 -2.2366 +1.4260 2.8150 -1.5996 +1.4260 2.9100 -0.6525 +1.4260 3.0050 -0.1936 +1.4260 3.1000 -0.1882 +1.4260 3.1950 -0.1855 +1.4260 3.2900 -0.1830 +1.4260 3.3850 -0.1809 +1.4260 3.4800 -0.1796 +1.4260 3.5750 -0.1793 +1.4260 3.6700 -0.1802 +1.4260 3.7650 -0.1815 +1.4260 3.8600 -0.1818 +1.4260 3.9550 -0.1815 +1.4260 4.0500 -0.1808 +1.4260 4.1450 -0.1800 +1.4260 4.2400 -0.1790 +1.4260 4.3350 -0.1781 +1.4260 4.4300 -0.1771 +1.4260 4.5250 -0.1762 +1.4260 4.6200 -0.1754 +1.4260 4.7150 -0.1746 +1.4260 4.8100 -0.1739 +1.4260 4.9050 -0.1732 +1.4260 5.0000 -0.1726 + +1.4640 0.2500 33.4282 +1.4640 0.3450 46.9834 +1.4640 0.4400 67.2137 +1.4640 0.5350 96.7515 +1.4640 0.6300 138.5609 +1.4640 0.7250 197.2372 +1.4640 0.8200 145.7823 +1.4640 0.9150 101.4919 +1.4640 1.0100 69.8626 +1.4640 1.1050 47.3353 +1.4640 1.2000 31.3459 +1.4640 1.2950 20.0904 +1.4640 1.3900 12.8020 +1.4640 1.4850 8.0641 +1.4640 1.5800 4.4478 +1.4640 1.6750 1.7490 +1.4640 1.7700 -0.0740 +1.4640 1.8650 -1.2766 +1.4640 1.9600 -2.0419 +1.4640 2.0550 -2.5018 +1.4640 2.1500 -2.7504 +1.4640 2.2450 -2.8554 +1.4640 2.3400 -2.8614 +1.4640 2.4350 -2.7988 +1.4640 2.5300 -2.6922 +1.4640 2.6250 -2.5589 +1.4640 2.7200 -2.4110 +1.4640 2.8150 -1.8676 +1.4640 2.9100 -0.7878 +1.4640 3.0050 -0.1011 +1.4640 3.1000 -0.0613 +1.4640 3.1950 -0.0587 +1.4640 3.2900 -0.0561 +1.4640 3.3850 -0.0539 +1.4640 3.4800 -0.0525 +1.4640 3.5750 -0.0519 +1.4640 3.6700 -0.0526 +1.4640 3.7650 -0.0540 +1.4640 3.8600 -0.0545 +1.4640 3.9550 -0.0543 +1.4640 4.0500 -0.0537 +1.4640 4.1450 -0.0529 +1.4640 4.2400 -0.0520 +1.4640 4.3350 -0.0510 +1.4640 4.4300 -0.0501 +1.4640 4.5250 -0.0492 +1.4640 4.6200 -0.0484 +1.4640 4.7150 -0.0476 +1.4640 4.8100 -0.0468 +1.4640 4.9050 -0.0462 +1.4640 5.0000 -0.0455 + +1.5020 0.2500 30.3154 +1.5020 0.3450 43.1416 +1.5020 0.4400 61.8717 +1.5020 0.5350 89.5086 +1.5020 0.6300 128.6334 +1.5020 0.7250 183.5498 +1.5020 0.8200 156.2969 +1.5020 0.9150 108.9646 +1.5020 1.0100 75.1465 +1.5020 1.1050 51.0451 +1.5020 1.2000 33.9247 +1.5020 1.2950 21.9383 +1.5020 1.3900 14.2167 +1.5020 1.4850 9.0420 +1.5020 1.5800 5.0160 +1.5020 1.6750 2.1043 +1.5020 1.7700 0.1303 +1.5020 1.8650 -1.1787 +1.5020 1.9600 -2.0186 +1.5020 2.0550 -2.5300 +1.5020 2.1500 -2.8138 +1.5020 2.2450 -2.9421 +1.5020 2.3400 -2.9634 +1.5020 2.4350 -2.9103 +1.5020 2.5300 -2.8090 +1.5020 2.6250 -2.6780 +1.5020 2.7200 -2.5303 +1.5020 2.8150 -2.1209 +1.5020 2.9100 -1.0196 +1.5020 3.0050 -0.1424 +1.5020 3.1000 -0.0243 +1.5020 3.1950 -0.0217 +1.5020 3.2900 -0.0191 +1.5020 3.3850 -0.0168 +1.5020 3.4800 -0.0152 +1.5020 3.5750 -0.0145 +1.5020 3.6700 -0.0149 +1.5020 3.7650 -0.0164 +1.5020 3.8600 -0.0171 +1.5020 3.9550 -0.0170 +1.5020 4.0500 -0.0165 +1.5020 4.1450 -0.0157 +1.5020 4.2400 -0.0148 +1.5020 4.3350 -0.0139 +1.5020 4.4300 -0.0129 +1.5020 4.5250 -0.0121 +1.5020 4.6200 -0.0112 +1.5020 4.7150 -0.0104 +1.5020 4.8100 -0.0097 +1.5020 4.9050 -0.0090 +1.5020 5.0000 -0.0084 + +1.5400 0.2500 27.5333 +1.5400 0.3450 39.7632 +1.5400 0.4400 57.1484 +1.5400 0.5350 82.9994 +1.5400 0.6300 119.6093 +1.5400 0.7250 171.0037 +1.5400 0.8200 167.8156 +1.5400 0.9150 117.2301 +1.5400 1.0100 81.0700 +1.5400 1.1050 55.2834 +1.5400 1.2000 36.9511 +1.5400 1.2950 24.2070 +1.5400 1.3900 15.9272 +1.5400 1.4850 10.1918 +1.5400 1.5800 5.7427 +1.5400 1.6750 2.6021 +1.5400 1.7700 0.4653 +1.5400 1.8650 -0.9591 +1.5400 1.9600 -1.8803 +1.5400 2.0550 -2.4487 +1.5400 2.1500 -2.7719 +1.5400 2.2450 -2.9270 +1.5400 2.3400 -2.9663 +1.5400 2.4350 -2.9255 +1.5400 2.5300 -2.8320 +1.5400 2.6250 -2.7056 +1.5400 2.7200 -2.5603 +1.5400 2.8150 -2.2762 +1.5400 2.9100 -1.2541 +1.5400 3.0050 -0.2568 +1.5400 3.1000 -0.0245 +1.5400 3.1950 -0.0219 +1.5400 3.2900 -0.0193 +1.5400 3.3850 -0.0170 +1.5400 3.4800 -0.0152 +1.5400 3.5750 -0.0143 +1.5400 3.6700 -0.0145 +1.5400 3.7650 -0.0159 +1.5400 3.8600 -0.0169 +1.5400 3.9550 -0.0169 +1.5400 4.0500 -0.0165 +1.5400 4.1450 -0.0157 +1.5400 4.2400 -0.0149 +1.5400 4.3350 -0.0139 +1.5400 4.4300 -0.0130 +1.5400 4.5250 -0.0121 +1.5400 4.6200 -0.0112 +1.5400 4.7150 -0.0104 +1.5400 4.8100 -0.0097 +1.5400 4.9050 -0.0090 +1.5400 5.0000 -0.0084 + +1.5780 0.2500 24.9012 +1.5780 0.3450 36.5734 +1.5780 0.4400 52.7949 +1.5780 0.5350 76.9168 +1.5780 0.6300 111.1717 +1.5780 0.7250 159.2680 +1.5780 0.8200 180.1293 +1.5780 0.9150 126.0676 +1.5780 1.0100 87.4049 +1.5780 1.1050 59.8173 +1.5780 1.2000 40.1897 +1.5780 1.2950 26.6565 +1.5780 1.3900 17.7365 +1.5780 1.4850 11.3847 +1.5780 1.5800 6.5254 +1.5780 1.6750 3.1398 +1.5780 1.7700 0.8286 +1.5780 1.8650 -0.7195 +1.5780 1.9600 -1.7280 +1.5780 2.0550 -2.3575 +1.5780 2.1500 -2.7232 +1.5780 2.2450 -2.9071 +1.5780 2.3400 -2.9660 +1.5780 2.4350 -2.9385 +1.5780 2.5300 -2.8535 +1.5780 2.6250 -2.7324 +1.5780 2.7200 -2.5900 +1.5780 2.8150 -2.3923 +1.5780 2.9100 -1.4901 +1.5780 3.0050 -0.4066 +1.5780 3.1000 -0.0246 +1.5780 3.1950 -0.0221 +1.5780 3.2900 -0.0195 +1.5780 3.3850 -0.0171 +1.5780 3.4800 -0.0152 +1.5780 3.5750 -0.0141 +1.5780 3.6700 -0.0141 +1.5780 3.7650 -0.0153 +1.5780 3.8600 -0.0165 +1.5780 3.9550 -0.0167 +1.5780 4.0500 -0.0163 +1.5780 4.1450 -0.0157 +1.5780 4.2400 -0.0148 +1.5780 4.3350 -0.0139 +1.5780 4.4300 -0.0130 +1.5780 4.5250 -0.0121 +1.5780 4.6200 -0.0112 +1.5780 4.7150 -0.0104 +1.5780 4.8100 -0.0097 +1.5780 4.9050 -0.0090 +1.5780 5.0000 -0.0083 + +1.6160 0.2500 22.4162 +1.6160 0.3450 33.5503 +1.6160 0.4400 48.7901 +1.6160 0.5350 71.2335 +1.6160 0.6300 103.2831 +1.6160 0.7250 148.2908 +1.6160 0.8200 193.2916 +1.6160 0.9150 135.5157 +1.6160 1.0100 94.1789 +1.6160 1.1050 64.6669 +1.6160 1.2000 43.6587 +1.6160 1.2950 29.2902 +1.6160 1.3900 19.6451 +1.6160 1.4850 12.6252 +1.6160 1.5800 7.3679 +1.6160 1.6750 3.7202 +1.6160 1.7700 1.2222 +1.6160 1.8650 -0.4584 +1.6160 1.9600 -1.5606 +1.6160 2.0550 -2.2559 +1.6160 2.1500 -2.6674 +1.6160 2.2450 -2.8823 +1.6160 2.3400 -2.9621 +1.6160 2.4350 -2.9491 +1.6160 2.5300 -2.8736 +1.6160 2.6250 -2.7583 +1.6160 2.7200 -2.6192 +1.6160 2.8150 -2.4641 +1.6160 2.9100 -1.7187 +1.6160 3.0050 -0.5873 +1.6160 3.1000 -0.0281 +1.6160 3.1950 -0.0221 +1.6160 3.2900 -0.0195 +1.6160 3.3850 -0.0171 +1.6160 3.4800 -0.0151 +1.6160 3.5750 -0.0139 +1.6160 3.6700 -0.0136 +1.6160 3.7650 -0.0146 +1.6160 3.8600 -0.0160 +1.6160 3.9550 -0.0164 +1.6160 4.0500 -0.0161 +1.6160 4.1450 -0.0155 +1.6160 4.2400 -0.0147 +1.6160 4.3350 -0.0138 +1.6160 4.4300 -0.0129 +1.6160 4.5250 -0.0120 +1.6160 4.6200 -0.0111 +1.6160 4.7150 -0.0103 +1.6160 4.8100 -0.0096 +1.6160 4.9050 -0.0089 +1.6160 5.0000 -0.0082 + +1.6540 0.2500 20.0760 +1.6540 0.3450 30.6803 +1.6540 0.4400 45.0868 +1.6540 0.5350 65.9240 +1.6540 0.6300 95.9086 +1.6540 0.7250 138.0242 +1.6540 0.8200 196.9099 +1.6540 0.9150 145.6157 +1.6540 1.0100 101.4219 +1.6540 1.1050 69.8535 +1.6540 1.2000 47.4051 +1.6540 1.2950 32.1111 +1.6540 1.3900 21.6548 +1.6540 1.4850 13.9265 +1.6540 1.5800 8.2743 +1.6540 1.6750 4.3461 +1.6540 1.7700 1.6483 +1.6540 1.8650 -0.1744 +1.6540 1.9600 -1.3770 +1.6540 2.0550 -2.1429 +1.6540 2.1500 -2.6037 +1.6540 2.2450 -2.8520 +1.6540 2.3400 -2.9545 +1.6540 2.4350 -2.9573 +1.6540 2.5300 -2.8921 +1.6540 2.6250 -2.7832 +1.6540 2.7200 -2.6478 +1.6540 2.8150 -2.4978 +1.6540 2.9100 -1.9310 +1.6540 3.0050 -0.7932 +1.6540 3.1000 -0.0643 +1.6540 3.1950 -0.0222 +1.6540 3.2900 -0.0196 +1.6540 3.3850 -0.0171 +1.6540 3.4800 -0.0150 +1.6540 3.5750 -0.0136 +1.6540 3.6700 -0.0132 +1.6540 3.7650 -0.0139 +1.6540 3.8600 -0.0154 +1.6540 3.9550 -0.0160 +1.6540 4.0500 -0.0159 +1.6540 4.1450 -0.0153 +1.6540 4.2400 -0.0145 +1.6540 4.3350 -0.0136 +1.6540 4.4300 -0.0127 +1.6540 4.5250 -0.0118 +1.6540 4.6200 -0.0110 +1.6540 4.7150 -0.0102 +1.6540 4.8100 -0.0094 +1.6540 4.9050 -0.0087 +1.6540 5.0000 -0.0080 + +1.6920 0.2500 17.8785 +1.6920 0.3450 27.9549 +1.6920 0.4400 41.6361 +1.6920 0.5350 60.9643 +1.6920 0.6300 89.0152 +1.6920 0.7250 128.4228 +1.6920 0.8200 183.5323 +1.6920 0.9150 156.4117 +1.6920 1.0100 109.1655 +1.6920 1.1050 75.4000 +1.6920 1.2000 51.4491 +1.6920 1.2950 35.1230 +1.6920 1.3900 23.7690 +1.6920 1.4850 15.3211 +1.6920 1.5800 9.2492 +1.6920 1.6750 5.0209 +1.6920 1.7700 2.1091 +1.6920 1.8650 0.1343 +1.6920 1.9600 -1.1761 +1.6920 2.0550 -2.0178 +1.6920 2.1500 -2.5315 +1.6920 2.2450 -2.8160 +1.6920 2.3400 -2.9428 +1.6920 2.4350 -2.9626 +1.6920 2.5300 -2.9087 +1.6920 2.6250 -2.8070 +1.6920 2.7200 -2.6757 +1.6920 2.8150 -2.5279 +1.6920 2.9100 -2.1185 +1.6920 3.0050 -1.0172 +1.6920 3.1000 -0.1401 +1.6920 3.1950 -0.0221 +1.6920 3.2900 -0.0196 +1.6920 3.3850 -0.0171 +1.6920 3.4800 -0.0149 +1.6920 3.5750 -0.0134 +1.6920 3.6700 -0.0127 +1.6920 3.7650 -0.0132 +1.6920 3.8600 -0.0148 +1.6920 3.9550 -0.0155 +1.6920 4.0500 -0.0155 +1.6920 4.1450 -0.0150 +1.6920 4.2400 -0.0143 +1.6920 4.3350 -0.0134 +1.6920 4.4300 -0.0125 +1.6920 4.5250 -0.0116 +1.6920 4.6200 -0.0108 +1.6920 4.7150 -0.0099 +1.6920 4.8100 -0.0092 +1.6920 4.9050 -0.0085 +1.6920 5.0000 -0.0078 + +1.7300 0.2500 15.8213 +1.7300 0.3450 25.3693 +1.7300 0.4400 38.3958 +1.7300 0.5350 56.3373 +1.7300 0.6300 82.5723 +1.7300 0.7250 119.4442 +1.7300 0.8200 171.0175 +1.7300 0.9150 167.9506 +1.7300 1.0100 117.4436 +1.7300 1.1050 81.3309 +1.7300 1.2000 55.8036 +1.7300 1.2950 38.3306 +1.7300 1.3900 25.9934 +1.7300 1.4850 16.8179 +1.7300 1.5800 10.2972 +1.7300 1.6750 5.7480 +1.7300 1.7700 2.6071 +1.7300 1.8650 0.4693 +1.7300 1.9600 -0.9565 +1.7300 2.0550 -1.8797 +1.7300 2.1500 -2.4502 +1.7300 2.2450 -2.7736 +1.7300 2.3400 -2.9270 +1.7300 2.4350 -2.9651 +1.7300 2.5300 -2.9235 +1.7300 2.6250 -2.8295 +1.7300 2.7200 -2.7030 +1.7300 2.8150 -2.5577 +1.7300 2.9100 -2.2735 +1.7300 3.0050 -1.2514 +1.7300 3.1000 -0.2542 +1.7300 3.1950 -0.0220 +1.7300 3.2900 -0.0195 +1.7300 3.3850 -0.0170 +1.7300 3.4800 -0.0148 +1.7300 3.5750 -0.0131 +1.7300 3.6700 -0.0123 +1.7300 3.7650 -0.0125 +1.7300 3.8600 -0.0140 +1.7300 3.9550 -0.0150 +1.7300 4.0500 -0.0151 +1.7300 4.1450 -0.0147 +1.7300 4.2400 -0.0140 +1.7300 4.3350 -0.0132 +1.7300 4.4300 -0.0123 +1.7300 4.5250 -0.0114 +1.7300 4.6200 -0.0105 +1.7300 4.7150 -0.0097 +1.7300 4.8100 -0.0089 +1.7300 4.9050 -0.0082 +1.7300 5.0000 -0.0075 + +1.7680 0.2500 13.9020 +1.7680 0.3450 22.9204 +1.7680 0.4400 35.3345 +1.7680 0.5350 52.0732 +1.7680 0.6300 76.5510 +1.7680 0.7250 111.0488 +1.7680 0.8200 159.3107 +1.7680 0.9150 180.2829 +1.7680 1.0100 126.2925 +1.7680 1.1050 87.6723 +1.7680 1.2000 60.4811 +1.7680 1.2950 41.7396 +1.7680 1.3900 28.3352 +1.7680 1.4850 18.4239 +1.7680 1.5800 11.4234 +1.7680 1.6750 6.5309 +1.7680 1.7700 3.1449 +1.7680 1.8650 0.8326 +1.7680 1.9600 -0.7170 +1.7680 2.0550 -1.7275 +1.7680 2.1500 -2.3590 +1.7680 2.2450 -2.7245 +1.7680 2.3400 -2.9066 +1.7680 2.4350 -2.9643 +1.7680 2.5300 -2.9361 +1.7680 2.6250 -2.8508 +1.7680 2.7200 -2.7295 +1.7680 2.8150 -2.5870 +1.7680 2.9100 -2.3893 +1.7680 3.0050 -1.4872 +1.7680 3.1000 -0.4037 +1.7680 3.1950 -0.0219 +1.7680 3.2900 -0.0194 +1.7680 3.3850 -0.0169 +1.7680 3.4800 -0.0146 +1.7680 3.5750 -0.0128 +1.7680 3.6700 -0.0118 +1.7680 3.7650 -0.0118 +1.7680 3.8600 -0.0131 +1.7680 3.9550 -0.0144 +1.7680 4.0500 -0.0146 +1.7680 4.1450 -0.0143 +1.7680 4.2400 -0.0137 +1.7680 4.3350 -0.0129 +1.7680 4.4300 -0.0120 +1.7680 4.5250 -0.0111 +1.7680 4.6200 -0.0102 +1.7680 4.7150 -0.0094 +1.7680 4.8100 -0.0086 +1.7680 4.9050 -0.0079 +1.7680 5.0000 -0.0072 + +1.8060 0.2500 12.1181 +1.8060 0.3450 20.6061 +1.8060 0.4400 32.4310 +1.8060 0.5350 48.1513 +1.8060 0.6300 70.9245 +1.8060 0.7250 103.1993 +1.8060 0.8200 148.3603 +1.8060 0.9150 193.4620 +1.8060 1.0100 135.7509 +1.8060 1.1050 94.4557 +1.8060 1.2000 65.4946 +1.8060 1.2950 45.3575 +1.8060 1.3900 30.8041 +1.8060 1.4850 20.1466 +1.8060 1.5800 12.6332 +1.8060 1.6750 7.3736 +1.8060 1.7700 3.7253 +1.8060 1.8650 1.2262 +1.8060 1.9600 -0.4561 +1.8060 2.0550 -1.5604 +1.8060 2.1500 -2.2572 +1.8060 2.2450 -2.6681 +1.8060 2.3400 -2.8812 +1.8060 2.4350 -2.9600 +1.8060 2.5300 -2.9464 +1.8060 2.6250 -2.8706 +1.8060 2.7200 -2.7552 +1.8060 2.8150 -2.6160 +1.8060 2.9100 -2.4609 +1.8060 3.0050 -1.7156 +1.8060 3.1000 -0.5843 +1.8060 3.1950 -0.0251 +1.8060 3.2900 -0.0193 +1.8060 3.3850 -0.0168 +1.8060 3.4800 -0.0144 +1.8060 3.5750 -0.0125 +1.8060 3.6700 -0.0114 +1.8060 3.7650 -0.0112 +1.8060 3.8600 -0.0122 +1.8060 3.9550 -0.0137 +1.8060 4.0500 -0.0141 +1.8060 4.1450 -0.0139 +1.8060 4.2400 -0.0133 +1.8060 4.3350 -0.0125 +1.8060 4.4300 -0.0117 +1.8060 4.5250 -0.0108 +1.8060 4.6200 -0.0099 +1.8060 4.7150 -0.0091 +1.8060 4.8100 -0.0083 +1.8060 4.9050 -0.0076 +1.8060 5.0000 -0.0069 + +1.8440 0.2500 10.4664 +1.8440 0.3450 18.4249 +1.8440 0.4400 29.6721 +1.8440 0.5350 44.5249 +1.8440 0.6300 65.6677 +1.8440 0.7250 95.8610 +1.8440 0.8200 138.1182 +1.8440 0.9150 197.0958 +1.8440 1.0100 145.8601 +1.8440 1.1050 101.7421 +1.8440 1.2000 70.8580 +1.8440 1.2950 49.1937 +1.8440 1.3900 33.4185 +1.8440 1.4850 21.9942 +1.8440 1.5800 13.9324 +1.8440 1.6750 8.2801 +1.8440 1.7700 4.3513 +1.8440 1.8650 1.6522 +1.8440 1.9600 -0.1722 +1.8440 2.0550 -1.3771 +1.8440 2.1500 -2.1441 +1.8440 2.2450 -2.6038 +1.8440 2.3400 -2.8505 +1.8440 2.4350 -2.9520 +1.8440 2.5300 -2.9543 +1.8440 2.6250 -2.8888 +1.8440 2.7200 -2.7798 +1.8440 2.8150 -2.6444 +1.8440 2.9100 -2.4944 +1.8440 3.0050 -1.9277 +1.8440 3.1000 -0.7900 +1.8440 3.1950 -0.0612 +1.8440 3.2900 -0.0192 +1.8440 3.3850 -0.0167 +1.8440 3.4800 -0.0143 +1.8440 3.5750 -0.0123 +1.8440 3.6700 -0.0109 +1.8440 3.7650 -0.0105 +1.8440 3.8600 -0.0113 +1.8440 3.9550 -0.0129 +1.8440 4.0500 -0.0135 +1.8440 4.1450 -0.0134 +1.8440 4.2400 -0.0129 +1.8440 4.3350 -0.0122 +1.8440 4.4300 -0.0113 +1.8440 4.5250 -0.0105 +1.8440 4.6200 -0.0096 +1.8440 4.7150 -0.0088 +1.8440 4.8100 -0.0080 +1.8440 4.9050 -0.0072 +1.8440 5.0000 -0.0065 + +1.8820 0.2500 8.9434 +1.8820 0.3450 16.3754 +1.8820 0.4400 27.0502 +1.8820 0.5350 41.1455 +1.8820 0.6300 60.7568 +1.8820 0.7250 89.0011 +1.8820 0.8200 128.5393 +1.8820 0.9150 183.7325 +1.8820 1.0100 156.6641 +1.8820 1.1050 109.5670 +1.8820 1.2000 76.5860 +1.8820 1.2950 53.2599 +1.8820 1.3900 36.2160 +1.8820 1.4850 23.9751 +1.8820 1.5800 15.3271 +1.8820 1.6750 9.2550 +1.8820 1.7700 5.0260 +1.8820 1.8650 2.1128 +1.8820 1.9600 0.1362 +1.8820 2.0550 -1.1764 +1.8820 2.1500 -2.0188 +1.8820 2.2450 -2.5311 +1.8820 2.3400 -2.8141 +1.8820 2.4350 -2.9401 +1.8820 2.5300 -2.9595 +1.8820 2.6250 -2.9053 +1.8820 2.7200 -2.8035 +1.8820 2.8150 -2.6722 +1.8820 2.9100 -2.5244 +1.8820 3.0050 -2.1151 +1.8820 3.1000 -1.0139 +1.8820 3.1950 -0.1369 +1.8820 3.2900 -0.0190 +1.8820 3.3850 -0.0165 +1.8820 3.4800 -0.0141 +1.8820 3.5750 -0.0120 +1.8820 3.6700 -0.0105 +1.8820 3.7650 -0.0100 +1.8820 3.8600 -0.0105 +1.8820 3.9550 -0.0121 +1.8820 4.0500 -0.0129 +1.8820 4.1450 -0.0130 +1.8820 4.2400 -0.0125 +1.8820 4.3350 -0.0118 +1.8820 4.4300 -0.0110 +1.8820 4.5250 -0.0101 +1.8820 4.6200 -0.0093 +1.8820 4.7150 -0.0084 +1.8820 4.8100 -0.0076 +1.8820 4.9050 -0.0069 +1.8820 5.0000 -0.0062 + +1.9200 0.2500 7.5454 +1.9200 0.3450 14.4561 +1.9200 0.4400 24.5605 +1.9200 0.5350 37.9713 +1.9200 0.6300 56.1751 +1.9200 0.7250 82.5892 +1.9200 0.8200 119.5814 +1.9200 0.9150 171.2308 +1.9200 1.0100 168.2102 +1.9200 1.1050 117.9595 +1.9200 1.2000 82.6953 +1.9200 1.2950 57.5699 +1.9200 1.3900 39.2119 +1.9200 1.4850 26.0985 +1.9200 1.5800 16.8240 +1.9200 1.6750 10.3030 +1.9200 1.7700 5.7530 +1.9200 1.8650 2.6106 +1.9200 1.9600 0.4709 +1.9200 2.0550 -0.9571 +1.9200 2.1500 -1.8805 +1.9200 2.2450 -2.4493 +1.9200 2.3400 -2.7714 +1.9200 2.4350 -2.9241 +1.9200 2.5300 -2.9617 +1.9200 2.6250 -2.9199 +1.9200 2.7200 -2.8259 +1.9200 2.8150 -2.6994 +1.9200 2.9100 -2.5541 +1.9200 3.0050 -2.2700 +1.9200 3.1000 -1.2480 +1.9200 3.1950 -0.2509 +1.9200 3.2900 -0.0188 +1.9200 3.3850 -0.0164 +1.9200 3.4800 -0.0139 +1.9200 3.5750 -0.0118 +1.9200 3.6700 -0.0102 +1.9200 3.7650 -0.0094 +1.9200 3.8600 -0.0097 +1.9200 3.9550 -0.0112 +1.9200 4.0500 -0.0123 +1.9200 4.1450 -0.0124 +1.9200 4.2400 -0.0121 +1.9200 4.3350 -0.0114 +1.9200 4.4300 -0.0106 +1.9200 4.5250 -0.0098 +1.9200 4.6200 -0.0089 +1.9200 4.7150 -0.0081 +1.9200 4.8100 -0.0073 +1.9200 4.9050 -0.0065 +1.9200 5.0000 -0.0058 + +1.9580 0.2500 6.2679 +1.9580 0.3450 12.6651 +1.9580 0.4400 22.2007 +1.9580 0.5350 34.9711 +1.9580 0.6300 51.9529 +1.9580 0.7250 76.5967 +1.9580 0.8200 111.2047 +1.9580 0.9150 159.5356 +1.9580 1.0100 180.5486 +1.9580 1.1050 126.9498 +1.9580 1.2000 89.2044 +1.9580 1.2950 62.1403 +1.9580 1.3900 42.4196 +1.9580 1.4850 28.3742 +1.9580 1.5800 18.4301 +1.9580 1.6750 11.4292 +1.9580 1.7700 6.5357 +1.9580 1.8650 3.1481 +1.9580 1.9600 0.8338 +1.9580 2.0550 -0.7177 +1.9580 2.1500 -1.7280 +1.9580 2.2450 -2.3577 +1.9580 2.3400 -2.7220 +1.9580 2.4350 -2.9035 +1.9580 2.5300 -2.9608 +1.9580 2.6250 -2.9325 +1.9580 2.7200 -2.8471 +1.9580 2.8150 -2.7258 +1.9580 2.9100 -2.5834 +1.9580 3.0050 -2.3858 +1.9580 3.1000 -1.4837 +1.9580 3.1950 -0.4004 +1.9580 3.2900 -0.0186 +1.9580 3.3850 -0.0162 +1.9580 3.4800 -0.0138 +1.9580 3.5750 -0.0116 +1.9580 3.6700 -0.0098 +1.9580 3.7650 -0.0089 +1.9580 3.8600 -0.0090 +1.9580 3.9550 -0.0103 +1.9580 4.0500 -0.0116 +1.9580 4.1450 -0.0119 +1.9580 4.2400 -0.0116 +1.9580 4.3350 -0.0110 +1.9580 4.4300 -0.0103 +1.9580 4.5250 -0.0094 +1.9580 4.6200 -0.0086 +1.9580 4.7150 -0.0077 +1.9580 4.8100 -0.0069 +1.9580 4.9050 -0.0061 +1.9580 5.0000 -0.0054 + +1.9960 0.2500 5.1014 +1.9960 0.3450 11.0006 +1.9960 0.4400 19.9692 +1.9960 0.5350 32.1241 +1.9960 0.6300 48.0699 +1.9960 0.7250 70.9967 +1.9960 0.8200 103.3724 +1.9960 0.9150 148.5958 +1.9960 1.0100 193.7368 +1.9960 1.1050 136.5696 +1.9960 1.2000 96.1342 +1.9960 1.2950 66.9906 +1.9960 1.3900 45.8536 +1.9960 1.4850 30.8126 +1.9960 1.5800 20.1529 +1.9960 1.6750 12.6389 +1.9960 1.7700 7.3781 +1.9960 1.8650 3.7282 +1.9960 1.9600 1.2270 +1.9960 2.0550 -0.4569 +1.9960 2.1500 -1.5605 +1.9960 2.2450 -2.2556 +1.9960 2.3400 -2.6654 +1.9960 2.4350 -2.8780 +1.9960 2.5300 -2.9565 +1.9960 2.6250 -2.9427 +1.9960 2.7200 -2.8669 +1.9960 2.8150 -2.7514 +1.9960 2.9100 -2.6123 +1.9960 3.0050 -2.4573 +1.9960 3.1000 -1.7121 +1.9960 3.1950 -0.5809 +1.9960 3.2900 -0.0218 +1.9960 3.3850 -0.0161 +1.9960 3.4800 -0.0136 +1.9960 3.5750 -0.0114 +1.9960 3.6700 -0.0095 +1.9960 3.7650 -0.0084 +1.9960 3.8600 -0.0083 +1.9960 3.9550 -0.0094 +1.9960 4.0500 -0.0109 +1.9960 4.1450 -0.0114 +1.9960 4.2400 -0.0112 +1.9960 4.3350 -0.0106 +1.9960 4.4300 -0.0099 +1.9960 4.5250 -0.0091 +1.9960 4.6200 -0.0082 +1.9960 4.7150 -0.0074 +1.9960 4.8100 -0.0066 +1.9960 4.9050 -0.0058 +1.9960 5.0000 -0.0051 + +2.0340 0.2500 4.0191 +2.0340 0.3450 9.4598 +2.0340 0.4400 17.8647 +2.0340 0.5350 29.4177 +2.0340 0.6300 44.4795 +2.0340 0.7250 65.7642 +2.0340 0.8200 96.0496 +2.0340 0.9150 138.3631 +2.0340 1.0100 197.4135 +2.0340 1.1050 146.8527 +2.0340 1.2000 103.5086 +2.0340 1.2950 72.1494 +2.0340 1.3900 49.5294 +2.0340 1.4850 33.4247 +2.0340 1.5800 22.0004 +2.0340 1.6750 13.9379 +2.0340 1.7700 8.2844 +2.0340 1.8650 4.3538 +2.0340 1.9600 1.6524 +2.0340 2.0550 -0.1731 +2.0340 2.1500 -1.3768 +2.0340 2.2450 -2.1423 +2.0340 2.3400 -2.6010 +2.0340 2.4350 -2.8472 +2.0340 2.5300 -2.9484 +2.0340 2.6250 -2.9506 +2.0340 2.7200 -2.8851 +2.0340 2.8150 -2.7761 +2.0340 2.9100 -2.6408 +2.0340 3.0050 -2.4909 +2.0340 3.1000 -1.9243 +2.0340 3.1950 -0.7866 +2.0340 3.2900 -0.0579 +2.0340 3.3850 -0.0159 +2.0340 3.4800 -0.0135 +2.0340 3.5750 -0.0112 +2.0340 3.6700 -0.0093 +2.0340 3.7650 -0.0080 +2.0340 3.8600 -0.0077 +2.0340 3.9550 -0.0085 +2.0340 4.0500 -0.0102 +2.0340 4.1450 -0.0108 +2.0340 4.2400 -0.0107 +2.0340 4.3350 -0.0103 +2.0340 4.4300 -0.0096 +2.0340 4.5250 -0.0087 +2.0340 4.6200 -0.0079 +2.0340 4.7150 -0.0070 +2.0340 4.8100 -0.0062 +2.0340 4.9050 -0.0055 +2.0340 5.0000 -0.0047 + +2.0720 0.2500 3.0130 +2.0720 0.3450 8.0400 +2.0720 0.4400 15.8863 +2.0720 0.5350 26.8444 +2.0720 0.6300 41.1334 +2.0720 0.7250 60.8756 +2.0720 0.8200 89.2039 +2.0720 0.9150 128.7926 +2.0720 1.0100 184.1311 +2.0720 1.1050 157.8353 +2.0720 1.2000 111.3546 +2.0720 1.2950 77.6654 +2.0720 1.3900 53.4636 +2.0720 1.4850 36.2223 +2.0720 1.5800 23.9811 +2.0720 1.6750 15.3324 +2.0720 1.7700 9.2590 +2.0720 1.8650 5.0281 +2.0720 1.9600 2.1126 +2.0720 2.0550 0.1353 +2.0720 2.1500 -1.1758 +2.0720 2.2450 -2.0168 +2.0720 2.3400 -2.5282 +2.0720 2.4350 -2.8107 +2.0720 2.5300 -2.9366 +2.0720 2.6250 -2.9558 +2.0720 2.7200 -2.9016 +2.0720 2.8150 -2.7998 +2.0720 2.9100 -2.6686 +2.0720 3.0050 -2.5209 +2.0720 3.1000 -2.1117 +2.0720 3.1950 -1.0106 +2.0720 3.2900 -0.1337 +2.0720 3.3850 -0.0158 +2.0720 3.4800 -0.0134 +2.0720 3.5750 -0.0111 +2.0720 3.6700 -0.0091 +2.0720 3.7650 -0.0077 +2.0720 3.8600 -0.0071 +2.0720 3.9550 -0.0077 +2.0720 4.0500 -0.0094 +2.0720 4.1450 -0.0103 +2.0720 4.2400 -0.0103 +2.0720 4.3350 -0.0099 +2.0720 4.4300 -0.0092 +2.0720 4.5250 -0.0084 +2.0720 4.6200 -0.0076 +2.0720 4.7150 -0.0068 +2.0720 4.8100 -0.0059 +2.0720 4.9050 -0.0052 +2.0720 5.0000 -0.0044 + +2.1100 0.2500 2.0782 +2.1100 0.3450 6.7378 +2.1100 0.4400 14.0328 +2.1100 0.5350 24.3998 +2.1100 0.6300 37.9899 +2.1100 0.7250 56.3142 +2.1100 0.8200 82.8047 +2.1100 0.9150 119.8420 +2.1100 1.0100 171.7435 +2.1100 1.1050 169.5568 +2.1100 1.2000 119.7026 +2.1100 1.2950 83.5653 +2.1100 1.3900 57.6738 +2.1100 1.4850 39.2180 +2.1100 1.5800 26.1044 +2.1100 1.6750 16.8290 +2.1100 1.7700 10.3066 +2.1100 1.8650 5.7545 +2.1100 1.9600 2.6100 +2.1100 2.0550 0.4701 +2.1100 2.1500 -0.9562 +2.1100 2.2450 -1.8783 +2.1100 2.3400 -2.4464 +2.1100 2.4350 -2.7681 +2.1100 2.5300 -2.9205 +2.1100 2.6250 -2.9581 +2.1100 2.7200 -2.9163 +2.1100 2.8150 -2.8224 +2.1100 2.9100 -2.6959 +2.1100 3.0050 -2.5507 +2.1100 3.1000 -2.2667 +2.1100 3.1950 -1.2448 +2.1100 3.2900 -0.2478 +2.1100 3.3850 -0.0157 +2.1100 3.4800 -0.0134 +2.1100 3.5750 -0.0110 +2.1100 3.6700 -0.0089 +2.1100 3.7650 -0.0074 +2.1100 3.8600 -0.0067 +2.1100 3.9550 -0.0070 +2.1100 4.0500 -0.0086 +2.1100 4.1450 -0.0097 +2.1100 4.2400 -0.0099 +2.1100 4.3350 -0.0096 +2.1100 4.4300 -0.0089 +2.1100 4.5250 -0.0082 +2.1100 4.6200 -0.0073 +2.1100 4.7150 -0.0065 +2.1100 4.8100 -0.0057 +2.1100 4.9050 -0.0049 +2.1100 5.0000 -0.0041 + +2.1480 0.2500 1.2101 +2.1480 0.3450 5.5492 +2.1480 0.4400 12.3028 +2.1480 0.5350 22.0817 +2.1480 0.6300 35.0182 +2.1480 0.7250 52.1106 +2.1480 0.8200 76.8237 +2.1480 0.9150 111.4719 +2.1480 1.0100 160.1901 +2.1480 1.1050 182.0600 +2.1480 1.2000 128.5867 +2.1480 1.2950 89.8753 +2.1480 1.3900 62.1787 +2.1480 1.4850 42.4256 +2.1480 1.5800 28.3798 +2.1480 1.6750 18.4347 +2.1480 1.7700 11.4322 +2.1480 1.8650 6.5367 +2.1480 1.9600 3.1472 +2.1480 2.0550 0.8332 +2.1480 2.1500 -0.7166 +2.1480 2.2450 -1.7258 +2.1480 2.3400 -2.3548 +2.1480 2.4350 -2.7188 +2.1480 2.5300 -2.9001 +2.1480 2.6250 -2.9573 +2.1480 2.7200 -2.9290 +2.1480 2.8150 -2.8437 +2.1480 2.9100 -2.7225 +2.1480 3.0050 -2.5802 +2.1480 3.1000 -2.3826 +2.1480 3.1950 -1.4807 +2.1480 3.2900 -0.3974 +2.1480 3.3850 -0.0157 +2.1480 3.4800 -0.0134 +2.1480 3.5750 -0.0110 +2.1480 3.6700 -0.0088 +2.1480 3.7650 -0.0072 +2.1480 3.8600 -0.0063 +2.1480 3.9550 -0.0064 +2.1480 4.0500 -0.0078 +2.1480 4.1450 -0.0091 +2.1480 4.2400 -0.0095 +2.1480 4.3350 -0.0092 +2.1480 4.4300 -0.0087 +2.1480 4.5250 -0.0079 +2.1480 4.6200 -0.0071 +2.1480 4.7150 -0.0063 +2.1480 4.8100 -0.0054 +2.1480 4.9050 -0.0046 +2.1480 5.0000 -0.0039 + +2.1860 0.2500 0.4045 +2.1860 0.3450 4.4652 +2.1860 0.4400 10.6946 +2.1860 0.5350 19.8888 +2.1860 0.6300 32.1976 +2.1860 0.7250 48.2445 +2.1860 0.8200 71.2340 +2.1860 0.9150 103.6491 +2.1860 1.0100 149.4128 +2.1860 1.1050 195.3919 +2.1860 1.2000 138.0448 +2.1860 1.2950 96.6233 +2.1860 1.3900 66.9987 +2.1860 1.4850 45.8594 +2.1860 1.5800 30.8179 +2.1860 1.6750 20.1570 +2.1860 1.7700 12.6414 +2.1860 1.8650 7.3785 +2.1860 1.9600 3.7270 +2.1860 2.0550 1.2264 +2.1860 2.1500 -0.4557 +2.1860 2.2450 -1.5583 +2.1860 2.3400 -2.2528 +2.1860 2.4350 -2.6623 +2.1860 2.5300 -2.8747 +2.1860 2.6250 -2.9531 +2.1860 2.7200 -2.9394 +2.1860 2.8150 -2.8636 +2.1860 2.9100 -2.7483 +2.1860 3.0050 -2.6092 +2.1860 3.1000 -2.4543 +2.1860 3.1950 -1.7092 +2.1860 3.2900 -0.5780 +2.1860 3.3850 -0.0191 +2.1860 3.4800 -0.0134 +2.1860 3.5750 -0.0110 +2.1860 3.6700 -0.0088 +2.1860 3.7650 -0.0070 +2.1860 3.8600 -0.0060 +2.1860 3.9550 -0.0059 +2.1860 4.0500 -0.0070 +2.1860 4.1450 -0.0086 +2.1860 4.2400 -0.0091 +2.1860 4.3350 -0.0089 +2.1860 4.4300 -0.0084 +2.1860 4.5250 -0.0077 +2.1860 4.6200 -0.0069 +2.1860 4.7150 -0.0061 +2.1860 4.8100 -0.0053 +2.1860 4.9050 -0.0045 +2.1860 5.0000 -0.0037 + +2.2240 0.2500 -0.3427 +2.2240 0.3450 3.4594 +2.2240 0.4400 9.2061 +2.2240 0.5350 17.8201 +2.2240 0.6300 29.5153 +2.2240 0.7250 44.6695 +2.2240 0.8200 66.0106 +2.2240 0.9150 96.3698 +2.2240 1.0100 139.3561 +2.2240 1.1050 199.1566 +2.2240 1.2000 148.1257 +2.2240 1.2950 103.8392 +2.2240 1.3900 72.1551 +2.2240 1.4850 49.5350 +2.2240 1.5800 33.4296 +2.2240 1.6750 22.0040 +2.2240 1.7700 13.9398 +2.2240 1.8650 8.2841 +2.2240 1.9600 4.3524 +2.2240 2.0550 1.6521 +2.2240 2.1500 -0.1718 +2.2240 2.2450 -1.3746 +2.2240 2.3400 -2.1396 +2.2240 2.4350 -2.5980 +2.2240 2.5300 -2.8441 +2.2240 2.6250 -2.9453 +2.2240 2.7200 -2.9475 +2.2240 2.8150 -2.8821 +2.2240 2.9100 -2.7732 +2.2240 3.0050 -2.6379 +2.2240 3.1000 -2.4881 +2.2240 3.1950 -1.9216 +2.2240 3.2900 -0.7840 +2.2240 3.3850 -0.0554 +2.2240 3.4800 -0.0135 +2.2240 3.5750 -0.0111 +2.2240 3.6700 -0.0089 +2.2240 3.7650 -0.0070 +2.2240 3.8600 -0.0058 +2.2240 3.9550 -0.0055 +2.2240 4.0500 -0.0064 +2.2240 4.1450 -0.0081 +2.2240 4.2400 -0.0087 +2.2240 4.3350 -0.0087 +2.2240 4.4300 -0.0083 +2.2240 4.5250 -0.0076 +2.2240 4.6200 -0.0068 +2.2240 4.7150 -0.0060 +2.2240 4.8100 -0.0051 +2.2240 4.9050 -0.0043 +2.2240 5.0000 -0.0036 + +2.2620 0.2500 -1.0354 +2.2620 0.3450 2.5242 +2.2620 0.4400 7.8347 +2.2620 0.5350 15.8748 +2.2620 0.6300 26.9640 +2.2620 0.7250 41.3373 +2.2620 0.8200 61.1302 +2.2620 0.9150 89.6058 +2.2620 1.0100 129.9673 +2.2620 1.1050 185.8997 +2.2620 1.2000 158.8988 +2.2620 1.2950 111.5548 +2.2620 1.3900 77.6708 +2.2620 1.4850 53.4689 +2.2620 1.5800 36.2267 +2.2620 1.6750 23.9843 +2.2620 1.7700 15.3337 +2.2620 1.8650 9.2580 +2.2620 1.9600 5.0265 +2.2620 2.0550 2.1125 +2.2620 2.1500 0.1366 +2.2620 2.2450 -1.1737 +2.2620 2.3400 -2.0142 +2.2620 2.4350 -2.5254 +2.2620 2.5300 -2.8079 +2.2620 2.6250 -2.9337 +2.2620 2.7200 -2.9529 +2.2620 2.8150 -2.8988 +2.2620 2.9100 -2.7971 +2.2620 3.0050 -2.6660 +2.2620 3.1000 -2.5184 +2.2620 3.1950 -2.1092 +2.2620 3.2900 -1.0082 +2.2620 3.3850 -0.1314 +2.2620 3.4800 -0.0136 +2.2620 3.5750 -0.0113 +2.2620 3.6700 -0.0090 +2.2620 3.7650 -0.0070 +2.2620 3.8600 -0.0057 +2.2620 3.9550 -0.0052 +2.2620 4.0500 -0.0058 +2.2620 4.1450 -0.0075 +2.2620 4.2400 -0.0084 +2.2620 4.3350 -0.0085 +2.2620 4.4300 -0.0081 +2.2620 4.5250 -0.0075 +2.2620 4.6200 -0.0067 +2.2620 4.7150 -0.0059 +2.2620 4.8100 -0.0051 +2.2620 4.9050 -0.0043 +2.2620 5.0000 -0.0035 + +2.3000 0.2500 -1.6769 +2.3000 0.3450 1.6550 +2.3000 0.4400 6.5773 +2.3000 0.5350 14.0519 +2.3000 0.6300 24.5396 +2.3000 0.7250 38.2063 +2.3000 0.8200 56.5761 +2.3000 0.9150 83.3222 +2.3000 1.0100 121.1963 +2.3000 1.1050 173.4726 +2.3000 1.2000 170.4134 +2.3000 1.2950 119.8041 +2.3000 1.3900 83.5705 +2.3000 1.4850 57.6786 +2.3000 1.5800 39.2220 +2.3000 1.6750 26.1069 +2.3000 1.7700 16.8296 +2.3000 1.8650 10.3050 +2.3000 1.9600 5.7528 +2.3000 2.0550 2.6099 +2.3000 2.1500 0.4713 +2.3000 2.2450 -0.9542 +2.3000 2.3400 -1.8759 +2.3000 2.4350 -2.4438 +2.3000 2.5300 -2.7655 +2.3000 2.6250 -2.9179 +2.3000 2.7200 -2.9555 +2.3000 2.8150 -2.9138 +2.3000 2.9100 -2.8199 +2.3000 3.0050 -2.6936 +2.3000 3.1000 -2.5484 +2.3000 3.1950 -2.2645 +2.3000 3.2900 -1.2427 +2.3000 3.3850 -0.2458 +2.3000 3.4800 -0.0138 +2.3000 3.5750 -0.0115 +2.3000 3.6700 -0.0092 +2.3000 3.7650 -0.0072 +2.3000 3.8600 -0.0057 +2.3000 3.9550 -0.0050 +2.3000 4.0500 -0.0054 +2.3000 4.1450 -0.0070 +2.3000 4.2400 -0.0081 +2.3000 4.3350 -0.0084 +2.3000 4.4300 -0.0081 +2.3000 4.5250 -0.0075 +2.3000 4.6200 -0.0067 +2.3000 4.7150 -0.0059 +2.3000 4.8100 -0.0051 +2.3000 4.9050 -0.0043 +2.3000 5.0000 -0.0035 + diff -Nru veusz-1.23/tests/selftests/gnuplot_2d.vsz veusz-1.23.1/tests/selftests/gnuplot_2d.vsz --- veusz-1.23/tests/selftests/gnuplot_2d.vsz 1970-01-01 00:00:00.000000000 +0000 +++ veusz-1.23.1/tests/selftests/gnuplot_2d.vsz 2015-06-13 09:31:43.000000000 +0000 @@ -0,0 +1,21 @@ +# Veusz saved document (version 1.23) +# Saved at 2015-06-12T19:04:07.152029 + +ImportFilePlugin(u'Gnuplot 2D data import plugin', u'gnuplot_2d.dat', linked=True, name=u'name') +Add('page', name='page1', autoadd=False) +To('page1') +Add('graph', name='graph1', autoadd=False) +To('graph1') +Add('axis', name='x', autoadd=False) +Add('axis', name='y', autoadd=False) +To('y') +Set('direction', 'vertical') +To('..') +Add('contour', name='contour1', autoadd=False) +To('contour1') +Set('data', u'name') +Set('numLevels', 4) +Set('scaling', u'sqrt') +To('..') +To('..') +To('..') diff -Nru veusz-1.23/VERSION veusz-1.23.1/VERSION --- veusz-1.23/VERSION 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/VERSION 2015-06-13 08:20:39.000000000 +0000 @@ -1 +1 @@ -1.23 +1.23.1 diff -Nru veusz-1.23/veusz/dataimport/defn_plugin.py veusz-1.23.1/veusz/dataimport/defn_plugin.py --- veusz-1.23/veusz/dataimport/defn_plugin.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/dataimport/defn_plugin.py 2015-06-12 19:16:58.000000000 +0000 @@ -92,9 +92,15 @@ # strip out parameters for plugin itself p = self.params + # set defaults for import plugins + pparams = dict(p.pluginpars) + for field in plugin.fields: + if field.name not in pparams: + pparams[field.name] = field.default + # stick back together the plugin parameter object plugparams = plugins.ImportPluginParams( - p.filename, p.encoding, p.pluginpars) + p.filename, p.encoding, pparams) results = plugin.doImport(plugparams) # make link for file diff -Nru veusz-1.23/veusz/document/dataset_histo.py veusz-1.23.1/veusz/document/dataset_histo.py --- veusz-1.23/veusz/document/dataset_histo.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/document/dataset_histo.py 2015-05-30 13:20:15.000000000 +0000 @@ -20,6 +20,7 @@ import numpy as N from .datasets import Dataset1DBase, evalDatasetExpression, _ from .. import qtall as qt4 +from ..compat import citems class DatasetHistoGenerator(object): def __init__(self, document, inexpr, @@ -174,19 +175,19 @@ def saveToFile(self, fileobj): """Save two datasets to file.""" - try: - binname = self.bindataset.name() - except (ValueError, AttributeError): - binname = '' - try: - valname = self.valuedataset.name() - except (ValueError, AttributeError): - valname = '' + + # lookup names of datasets in document + bindsname = valuedsname = '' + for name, ds in citems(self.document.data): + if ds is self.bindataset: + bindsname = name + elif ds is self.valuedataset: + valuedsname = name fileobj.write( ("CreateHistogram(%s, %s, %s, binparams=%s, " "binmanual=%s, method=%s, " "cumulative=%s, errors=%s)\n") % - (repr(self.inexpr), repr(binname), repr(valname), + (repr(self.inexpr), repr(bindsname), repr(valuedsname), repr(self.binparams), repr(self.binmanual), repr(self.method), repr(self.cumulative), repr(self.errors)) ) diff -Nru veusz-1.23/veusz/document/datasets.py veusz-1.23.1/veusz/document/datasets.py --- veusz-1.23/veusz/document/datasets.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/document/datasets.py 2015-06-14 10:15:17.000000000 +0000 @@ -243,7 +243,7 @@ e.g. dataset[5:100] - make a dataset based on items 5 to 99 inclusive """ - return type(self)(**self._getItemHelper(key)) + return self.returnCopyWithNewData(**self._getItemHelper(key)) def __len__(self): """Return length of dataset.""" @@ -1470,6 +1470,10 @@ raise DatasetExpressionException( 'Variable spacings not yet supported ' 'in constructing 2D datasets') + + if mindelta is None or mindelta == 0: + raise DatasetExpressionException('Could not identify delta') + return (uniquesorted[0], uniquesorted[-1], mindelta, int((uniquesorted[-1]-uniquesorted[0])/mindelta)+1) diff -Nru veusz-1.23/veusz/document/doc.py veusz-1.23.1/veusz/document/doc.py --- veusz-1.23/veusz/document/doc.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/document/doc.py 2015-06-08 17:39:31.000000000 +0000 @@ -433,22 +433,23 @@ painter.setRenderHint(qt4.QPainter.TextAntialiasing, True) sizes = [] - with painter: - # This all assumes that only pages can go into the root widget - for count, page in enumerate(pages): - painter.save() - size = self.pageSize(page, dpi=dpi) - sizes.append(size) - painter.setClipRect(qt4.QRectF( - qt4.QPointF(0,0), qt4.QPointF(*size))) - helper = painthelper.PaintHelper( - size, dpi=dpi, directpaint=painter) - self.paintTo(helper, page) - painter.restore() - # start new pages between each page - if count < len(pages)-1: - printer.newPage() + # This all assumes that only pages can go into the root widget + for count, page in enumerate(pages): + painter.save() + size = self.pageSize(page, dpi=dpi) + sizes.append(size) + painter.setClipRect(qt4.QRectF( + qt4.QPointF(0,0), qt4.QPointF(*size))) + helper = painthelper.PaintHelper( + size, dpi=dpi, directpaint=painter) + self.paintTo(helper, page) + painter.restore() + + # start new pages between each page + if count < len(pages)-1: + printer.newPage() + painter.end() return sizes diff -Nru veusz-1.23/veusz/document/emf_export.py veusz-1.23.1/veusz/document/emf_export.py --- veusz-1.23/veusz/document/emf_export.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/document/emf_export.py 2015-04-22 17:41:20.000000000 +0000 @@ -373,7 +373,7 @@ path.addRegion(state.clipRegion()) self._updateClipPath(path, state.clipOperation()) if ss & qt4.QPaintEngine.DirtyTransform: - self._updateTransform(state.matrix()) + self._updateTransform(state.transform()) def type(self): return qt4.QPaintEngine.PostScript diff -Nru veusz-1.23/veusz/document/export.py veusz-1.23.1/veusz/document/export.py --- veusz-1.23/veusz/document/export.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/document/export.py 2015-06-08 17:41:36.000000000 +0000 @@ -226,9 +226,13 @@ except TypeError: return self.pagenumber - def exportBitmap(self, format): + def exportBitmap(self, ext): """Export to a bitmap format.""" + format = ext[1:] # setFormat() doesn't want the leading '.' + if format == 'jpeg': + format = 'jpg' + page = self.getSinglePage() # get size for bitmap's dpi @@ -237,7 +241,7 @@ # create real output image backqcolor = utils.extendedColorToQColor(self.backcolor) - if format == '.png': + if format == 'png': # transparent output image = qt4.QImage(size[0], size[1], qt4.QImage.Format_ARGB32_Premultiplied) @@ -262,10 +266,20 @@ # write image to disk writer = qt4.QImageWriter() - # format below takes extension without dot - writer.setFormat(qt4.QByteArray(format[1:])) + writer.setFormat(qt4.QByteArray(format)) writer.setFileName(self.filename) + # enable LZW compression for TIFFs + writer.setCompression(1) + + try: + # try to enable optimal JPEG compression using new + # options added in Qt 5.5 + writer.setOptimizedWrite(True) + writer.setProgressiveScanWrite(True) + except AttributeError: + pass + if format == 'png': # min quality for png as it makes no difference to output # and makes file size smaller @@ -319,10 +333,10 @@ # change pdf bounding box and correct pdf index with open(self.filename, 'rb') as fin: text = fin.read() - text = scalePDFMediaBox(text, printer.width(), sizes) - text = fixupPDFIndices(text) - with open(tmpfile, 'wb') as fout: - fout.write(text) + text = scalePDFMediaBox(text, printer.width(), sizes) + text = fixupPDFIndices(text) + with open(tmpfile, 'wb') as fout: + fout.write(text) else: raise RuntimeError('Invalid file type') diff -Nru veusz-1.23/veusz/document/svg_export.py veusz-1.23.1/veusz/document/svg_export.py --- veusz-1.23/veusz/document/svg_export.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/document/svg_export.py 2015-04-22 17:41:20.000000000 +0000 @@ -170,7 +170,7 @@ self.clippath = None self.clipnum = 0 self.existingclips = {} - self.matrix = qt4.QMatrix() + self.transform = qt4.QTransform() # svg root element for qt defaults self.rootelement = SVGElement( @@ -244,7 +244,7 @@ def _updateClipPath(self, clippath, clipoperation): """Update clip path given state change.""" - clippath = self.matrix.map(clippath) + clippath = self.transform.map(clippath) if clipoperation == qt4.Qt.NoClip: self.clippath = None @@ -264,7 +264,7 @@ # state is a list of transform, stroke/fill and clip states statevec = list(self.oldstate) if ss & qt4.QPaintEngine.DirtyTransform: - self.matrix = state.matrix() + self.transform = state.transform() statevec[0] = self.transformState() if ss & qt4.QPaintEngine.DirtyPen: self.pen = state.pen() @@ -376,8 +376,8 @@ return tuple(items) def transformState(self): - if not self.matrix.isIdentity(): - m = self.matrix + if not self.transform.isIdentity(): + m = self.transform dx, dy = m.dx(), m.dy() if (m.m11(), m.m12(), m.m21(), m.m22()) == (1., 0., 0., 1): out = ('transform="translate(%s,%s)"' % ( diff -Nru veusz-1.23/veusz/helpers/src/qtmml/qtmmlwidget.cpp veusz-1.23.1/veusz/helpers/src/qtmml/qtmmlwidget.cpp --- veusz-1.23/veusz/helpers/src/qtmml/qtmmlwidget.cpp 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/helpers/src/qtmml/qtmmlwidget.cpp 2015-04-22 17:41:20.000000000 +0000 @@ -3392,7 +3392,7 @@ QDomNamedNodeMap dom_attr = dom_node.attributes(); MmlAttributeMap mml_attr; - for (unsigned i = 0; i < dom_attr.length(); ++i) { + for (int i = 0; i < int(dom_attr.length()); ++i) { QDomNode attr_node = dom_attr.item(i); Q_ASSERT(!attr_node.nodeName().isNull()); Q_ASSERT(!attr_node.nodeValue().isNull()); @@ -5457,7 +5457,7 @@ QFrame::paintEvent(e); QPainter p(this); if (e->rect().intersects(contentsRect())) - p.setClipRegion(e->region().intersect(contentsRect())); + p.setClipRegion(e->region().intersected(contentsRect())); QSize s = m_doc->size(); int x = (width() - s.width())/2; diff -Nru veusz-1.23/veusz/plugins/datasetplugin.py veusz-1.23.1/veusz/plugins/datasetplugin.py --- veusz-1.23/veusz/plugins/datasetplugin.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/plugins/datasetplugin.py 2015-06-12 18:18:17.000000000 +0000 @@ -1043,17 +1043,17 @@ ] def updateDatasets(self, fields, helper): - """Do scaling of dataset.""" + """Do subtraction of dataset.""" dsin = helper.getDataset(fields['ds_in']) - vals = dsin.data - if len(vals) > 0: - minval = vals[N.isfinite(vals)].min() - vals = vals - minval + data = dsin.data + filtered = data[N.isfinite(data)] + if len(filtered) != 0: + data = data - filtered.min() self.dsout.update( - data=vals, serr=dsin.serr, perr=dsin.perr, nerr=dsin.nerr) + data=data, serr=dsin.serr, perr=dsin.perr, nerr=dsin.nerr) class MultiplyDatasetsPlugin(_OneOutputDatasetPlugin): """Dataset plugin to multiply two or more datasets.""" @@ -1150,10 +1150,16 @@ def updateDatasets(self, fields, helper): inds = helper.getDataset( fields['ds_in'] ) - maxval = N.nanmax( inds.data ) + + data = inds.data + filtered = data[N.isfinite(data)] + if len(filtered) == 0: + maxval = N.nan + else: + maxval = filtered.max() # divide data - data = inds.data / maxval + data = data / maxval # divide error bars serr = perr = nerr = None if inds.serr: serr = inds.serr / maxval @@ -1180,10 +1186,16 @@ def updateDatasets(self, fields, helper): inds = helper.getDataset( fields['ds_in'] ) - tot = N.nansum( inds.data ) + + data = inds.data + filtered = data[N.isfinite(data)] + if len(filtered) == 0: + tot = 0 + else: + tot = N.sum(filtered) # divide data - data = inds.data / tot + data = data / tot # divide error bars serr = perr = nerr = None if inds.serr: serr = inds.serr / tot @@ -1432,7 +1444,10 @@ ds_in = helper.getDataset(fields['ds_in']) filt = helper.evaluateExpression(fields['filter']) - data, serr, perr, nerr = ds_in.data, ds_in.serr, ds_in.perr, ds_in.nerr + data = ds_in.data + serr = getattr(ds_in, 'serr', None) + perr = getattr(ds_in, 'perr', None) + nerr = getattr(ds_in, 'nerr', None) if filt is None: # select nothing diff -Nru veusz-1.23/veusz/plugins/importplugin.py veusz-1.23.1/veusz/plugins/importplugin.py --- veusz-1.23/veusz/plugins/importplugin.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/plugins/importplugin.py 2015-06-12 18:58:19.000000000 +0000 @@ -674,10 +674,74 @@ data = data.astype(N.float64) return [ datasetplugin.Dataset1D(name, data) ] +class ImportPluginGnuplot2D(ImportPlugin): + """A Veusz plugin for reading data in Gnuplot 2D data format from a file.""" + + name = "Gnuplot 2D data import plugin" + author = "Joerg Meyer, j.meyer@chem.leidenuniv.nl" + description = "Reads data in Gnuplot 2D format from a text file." + + file_extensions = set(['.data','.elbow']) + + def __init__(self): + ImportPlugin.__init__(self) + self.fields = [ + field.FieldText( + "name", descr="Dataset name", default="name"), + field.FieldFloat( + "subtract", descr="Offset to subtract", default=0.0), + field.FieldFloat( + "mult", descr="Multiplication factor", default=1), + ] + + def doImport(self, params): + """Actually import data + params is a ImportPluginParams object. + Return a list of ImportDataset1D, ImportDataset2D objects + """ + + sub = float(params.field_results["subtract"]) + mult = params.field_results["mult"] + f = params.openFileWithEncoding() + data_gp = [] + data_gp_block = [] + for line in f: + fields = line.split() + if not fields: + if data_gp_block: + data_gp.append( data_gp_block ) + data_gp_block = [] + else: # ignore initial blank lines + continue + elif '#' in fields[0]: # ignore comment lines + continue + else: + x,y,z = map(float, fields[0:3]) + data_gp_block.append( [x,y,(z-sub)*mult] ) + + if data_gp_block: # append last block if necessary + data_gp.append( data_gp_block ) + data_gp_block = [] + + data = N.array(data_gp) + S = data.shape + data_for_sorting = data.reshape((S[0]*S[1],S[2])) + ind = N.lexsort( [data_for_sorting[:,0], data_for_sorting[:,1]] ) + data_veusz = data_for_sorting[ind].reshape(S)[:,:,2] + rangex = (data[:,:,0].min(),data[:,:,0].max()) + rangey = (data[:,:,1].min(),data[:,:,1].max()) + + return [ + datasetplugin.Dataset2D( + params.field_results["name"], + data=data_veusz, rangex=rangex, rangey=rangey) + ] + importpluginregistry += [ ImportPluginNpy, ImportPluginNpz, ImportPluginQdp, ImportPluginBinary, ImportPluginExample, + ImportPluginGnuplot2D, ] diff -Nru veusz-1.23/veusz/plugins/toolsplugin.py veusz-1.23.1/veusz/plugins/toolsplugin.py --- veusz-1.23/veusz/plugins/toolsplugin.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/plugins/toolsplugin.py 2015-06-08 16:53:27.000000000 +0000 @@ -404,7 +404,8 @@ """Walk nodes, changing datasets.""" if node.type == 'setting': if node.settingtype in ( - 'dataset', 'dataset-or-floatlist', 'dataset-or-str'): + 'dataset', 'dataset-extended', + 'dataset-or-floatlist', 'dataset-or-str'): # handle single datasets if node.val == dsname: node.val = dsrepl diff -Nru veusz-1.23/veusz/qtwidgets/datasetbrowser.py veusz-1.23.1/veusz/qtwidgets/datasetbrowser.py --- veusz-1.23/veusz/qtwidgets/datasetbrowser.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/qtwidgets/datasetbrowser.py 2015-04-22 17:41:20.000000000 +0000 @@ -840,7 +840,7 @@ if not frame.contains(event.pos()): self.close() return True - return qt4.QTextEdit.eventFilter(self, node, event) + return DatasetBrowser.eventFilter(self, node, event) def sizeHint(self): """A reasonable size for the text editor.""" diff -Nru veusz-1.23/veusz/qtwidgets/historycombo.py veusz-1.23.1/veusz/qtwidgets/historycombo.py --- veusz-1.23/veusz/qtwidgets/historycombo.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/qtwidgets/historycombo.py 2015-04-22 17:41:20.000000000 +0000 @@ -38,7 +38,6 @@ # sane defaults self.setEditable(True) - self.setAutoCompletion(True) self.setMaxCount(50) self.setInsertPolicy(qt4.QComboBox.InsertAtTop) self.setDuplicatesEnabled(False) diff -Nru veusz-1.23/veusz/setting/controls.py veusz-1.23.1/veusz/setting/controls.py --- veusz-1.23/veusz/setting/controls.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/setting/controls.py 2015-05-30 13:18:36.000000000 +0000 @@ -169,7 +169,7 @@ layout = qt4.QHBoxLayout() layout.setSpacing(0) - layout.setMargin(0) + layout.setContentsMargins(0,0,0,0) self.setLayout(layout) self.edit = qt4.QLineEdit() @@ -638,7 +638,7 @@ layout = qt4.QHBoxLayout() layout.setSpacing(0) - layout.setMargin(0) + layout.setContentsMargins(0,0,0,0) layout.addWidget(self.choice) layout.addWidget(b) self.setLayout(layout) @@ -919,7 +919,7 @@ layout = qt4.QHBoxLayout() layout.setSpacing(0) - layout.setMargin(0) + layout.setContentsMargins(0,0,0,0) layout.addWidget(c) layout.addWidget(b) @@ -1088,7 +1088,8 @@ self.setting = setting self.controls = [] self.layout = qt4.QGridLayout(self) - self.layout.setMargin( self.layout.margin()//2 ) + s = self.layout.contentsMargins().left()//2 + self.layout.setContentsMargins(s,s,s,s) self.layout.setSpacing( self.layout.spacing()//4 ) self.doneinit = False @@ -1136,7 +1137,7 @@ # buttons at end bbox = qt4.QWidget() h = qt4.QHBoxLayout(bbox) - h.setMargin(0) + h.setContentsMargins(0,0,0,0) bbox.setLayout(h) self.layout.addWidget(bbox, row+1, 0, 1, -1) @@ -1493,7 +1494,7 @@ self.grid = layout = qt4.QGridLayout() layout.setHorizontalSpacing(0) - layout.setContentsMargins(0, 0, 0, 0) + layout.setContentsMargins(0,0,0,0) self.setLayout(layout) self.last = () @@ -1703,7 +1704,7 @@ layout = qt4.QHBoxLayout() layout.setSpacing(0) - layout.setMargin(0) + layout.setContentsMargins(0,0,0,0) self.setLayout(layout) # the actual edit control diff -Nru veusz-1.23/veusz/utils/action.py veusz-1.23.1/veusz/utils/action.py --- veusz-1.23/veusz/utils/action.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/utils/action.py 2015-06-13 20:09:41.000000000 +0000 @@ -58,7 +58,7 @@ a.setStatusTip(descr) a.setToolTip(textwrap.fill(descr, 25)) if slot: - a.triggered[()].connect(slot) + a.triggered.connect(slot) if icon: a.setIcon(getIcon(icon)) if key: @@ -117,13 +117,13 @@ actions = {} parent = toolbar.parent() - for i in items: - if len(i) == 1: + for item in items: + if len(item) == 1: if menus is not None: - menus[i[0]].addSeparator() + menus[item[0]].addSeparator() continue - - menuid, descr, menutext, menu, slot, icon, addtool, key = i + + menuid, descr, menutext, menu, slot, icon, addtool, key = item # create action action = qt4.QAction(parent) @@ -141,15 +141,14 @@ if callable(slot): # connect the action to the slot - if slot is not None: - action.triggered[()].connect(slot) - # add to menu + action.triggered.connect(slot) + # add to menu if menus is not None: menus[menu].addAction(action) elif slot is not None: if menus is not None: submenu = menus[menu].addMenu(menutext) - menus["%s.%s"%(menu ,menuid)] = submenu + menus["%s.%s" % (menu ,menuid)] = submenu populateMenuToolbars(slot, toolbar, menus) else: if menus is not None: diff -Nru veusz-1.23/veusz/utils/points.py veusz-1.23.1/veusz/utils/points.py --- veusz-1.23/veusz/utils/points.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/utils/points.py 2015-05-30 13:18:36.000000000 +0000 @@ -304,7 +304,9 @@ def squareRoundedPath(painter, path, size): """A square with rounded corners.""" - path.addRoundRect( qt4.QRectF(-size, -size, size*2, size*2), 50, 50 ) + path.addRoundedRect( + qt4.QRectF(-size, -size, size*2, size*2), + 50, 50, qt4.Qt.RelativeSize) def dotPath(painter, path, size): """Draw a dot.""" diff -Nru veusz-1.23/veusz/veusz_main.py veusz-1.23.1/veusz/veusz_main.py --- veusz-1.23/veusz/veusz_main.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/veusz_main.py 2015-04-22 17:41:20.000000000 +0000 @@ -163,7 +163,7 @@ 'the session') parser.add_option('--translation', metavar='FILE', help='load the translation .qm file given') - options, args = parser.parse_args(self.argv()) + options, args = parser.parse_args(self.arguments()) # export files to make images if options.export and len(options.export) != len(args)-1: diff -Nru veusz-1.23/veusz/widgets/contour.py veusz-1.23.1/veusz/widgets/contour.py --- veusz-1.23/veusz/widgets/contour.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/widgets/contour.py 2015-04-22 17:41:20.000000000 +0000 @@ -522,6 +522,7 @@ cl = s.get('ContourLabels') font = cl.makeQFont(painter) + labelpen = cl.makeQPen() descent = qt4.QFontMetricsF(font).descent() # linelabeller does clipping and labelling of contours @@ -559,6 +560,7 @@ levels.append(num) painter.save() + painter.setPen(labelpen) linelabeller.process() painter.setClipPath(linelabeller.clippath) diff -Nru veusz-1.23/veusz/widgets/controlgraph.py veusz-1.23.1/veusz/widgets/controlgraph.py --- veusz-1.23/veusz/widgets/controlgraph.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/widgets/controlgraph.py 2015-04-22 17:41:20.000000000 +0000 @@ -114,8 +114,8 @@ self.scaling = painthelper.scaling self.dpi = painthelper.dpi - def createGraphicsItem(self): - return _GraphMarginBox(self) + def createGraphicsItem(self, parent): + return _GraphMarginBox(parent, self) def setWidgetMargins(self): """A helpful routine for setting widget margins after @@ -187,10 +187,10 @@ # posn coords of each corner mapcornertoposn = ( (0, 1), (2, 1), (0, 3), (2, 3) ) - def __init__(self, params): + def __init__(self, parent, params): """Create control box item.""" - qt4.QGraphicsItem.__init__(self) + qt4.QGraphicsItem.__init__(self, parent) self.params = params self.setZValue(2.) @@ -330,20 +330,20 @@ self.angle = angle self.allowrotate = allowrotate - def createGraphicsItem(self): - return _GraphResizableBox(self) + def createGraphicsItem(self, parent): + return _GraphResizableBox(parent, self) class _GraphResizableBox(qt4.QGraphicsItem): """Control a resizable box. Item resizes centred around a position """ - def __init__(self, params): + def __init__(self, parent, params): """Initialise with widget and boxbounds shape. Rotation is allowed if allowrotate is set """ - qt4.QGraphicsItem.__init__(self) + qt4.QGraphicsItem.__init__(self, parent) self.params = params # create child graphicsitem for each corner @@ -485,12 +485,12 @@ self.deltacrosspos = (crosspos[0] - self.posn[0], crosspos[1] - self.posn[1]) - def createGraphicsItem(self): - return _GraphMovableBox(self) + def createGraphicsItem(self, parent): + return _GraphMovableBox(parent, self) class _GraphMovableBox(_GraphMarginBox): - def __init__(self, params): - _GraphMarginBox.__init__(self, params) + def __init__(self, parent, params): + _GraphMarginBox.__init__(self, parent, params) self.cross = _ShapeCorner(self) self.cross.setCursor(qt4.Qt.SizeAllCursor) self.updateCornerPosns() @@ -527,13 +527,14 @@ def __init__(self, widget, x1, y1, x2, y2): self.widget = widget self.line = x1, y1, x2, y2 - def createGraphicsItem(self): - return _GraphLine(self) + def createGraphicsItem(self, parent): + return _GraphLine(parent, self) class _GraphLine(qt4.QGraphicsLineItem): """Represents the line as a graphics item.""" - def __init__(self, params): - qt4.QGraphicsLineItem.__init__(self, *params.line) + def __init__(self, parent, params): + l = params.line + qt4.QGraphicsLineItem.__init__(self, l[0], l[1], l[2], l[3], parent) self.params = params self.setCursor(qt4.Qt.SizeAllCursor) @@ -612,8 +613,8 @@ return ( self.minpos != self.minorig or self.maxpos != self.maxorig or self.axisorigpos != self.axispos ) - def createGraphicsItem(self): - return _GraphAxisLine(self) + def createGraphicsItem(self, parent): + return _GraphAxisLine(parent, self) class _GraphAxisLine(qt4.QGraphicsItem): @@ -622,9 +623,9 @@ curs_zoom = {True: qt4.Qt.SplitVCursor, False: qt4.Qt.SplitHCursor} - def __init__(self, params): + def __init__(self, parent, params): """Line is about to be shown.""" - qt4.QGraphicsItem.__init__(self) + qt4.QGraphicsItem.__init__(self, parent) self.params = params self.pts = [ _ShapeCorner(self), _ShapeCorner(self), _ShapeCorner(self), _ShapeCorner(self) ] diff -Nru veusz-1.23/veusz/widgets/image.py veusz-1.23.1/veusz/widgets/image.py --- veusz-1.23/veusz/widgets/image.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/widgets/image.py 2015-06-12 18:27:47.000000000 +0000 @@ -300,6 +300,11 @@ pltrangex = axes[0].dataToPlotterCoords(posn, N.array(rangex)) pltrangey = axes[1].dataToPlotterCoords(posn, N.array(rangey)) + # abort if coordinate range is too small + if(abs(pltrangex[0]-pltrangex[1])<1e-2 or + abs(pltrangey[0]-pltrangey[1])<1e-2): + return + # make QImage from data cmap = d.getColormap(s.colorMap, s.colorInvert) datavaluerange = self.getDataValueRange(data) diff -Nru veusz-1.23/veusz/widgets/key.py veusz-1.23.1/veusz/widgets/key.py --- veusz-1.23/veusz/widgets/key.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/widgets/key.py 2015-04-22 17:41:20.000000000 +0000 @@ -55,17 +55,19 @@ self.dims = tuple(boxdims) self.textheight = textheight - def createGraphicsItem(self): - return _GraphControlKey(self) + def createGraphicsItem(self, parent): + return _GraphControlKey(parent, self) class _GraphControlKey(qt4.QGraphicsRectItem): """The graphical rectangle which is dragged around to reposition the key.""" - def __init__(self, params): - qt4.QGraphicsRectItem.__init__(self, - params.posn[0], params.posn[1], - params.dims[0], params.dims[1]) + def __init__(self, parent, params): + qt4.QGraphicsRectItem.__init__( + self, + params.posn[0], params.posn[1], + params.dims[0], params.dims[1], + parent) self.params = params self.setCursor(qt4.Qt.SizeAllCursor) diff -Nru veusz-1.23/veusz/widgets/point.py veusz-1.23.1/veusz/widgets/point.py --- veusz-1.23/veusz/widgets/point.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/widgets/point.py 2015-04-22 17:41:20.000000000 +0000 @@ -331,6 +331,11 @@ usertext=_('Scale markers')), 6 ) # formatting + s.add( setting.Int('errorthin', 1, + minval=1, + descr=_('Thin number of error bars plotted by this factor'), + usertext=_('Thin errors'), + formatting=True), 0 ) s.add( setting.Int('thinfactor', 1, minval=1, descr=_('Thin number of markers plotted' @@ -409,12 +414,17 @@ if style == 'none': return + # optional thinning of error bars plotted + thin = s.errorthin + # default is no error bars xmin = xmax = ymin = ymax = None # draw horizontal error bars if xdata.hasErrors(): xmin, xmax = xdata.getPointRanges() + if thin>1: + xmin, xmax = xmin[::thin], xmax[::thin] # convert xmin and xmax to graph coordinates xmin = axes[0].dataToPlotterCoords(posn, xmin) @@ -423,6 +433,8 @@ # draw vertical error bars if ydata.hasErrors(): ymin, ymax = ydata.getPointRanges() + if thin>1: + ymin, ymax = ymin[::thin], ymax[::thin] # convert ymin and ymax to graph coordinates ymin = axes[1].dataToPlotterCoords(posn, ymin) @@ -432,6 +444,9 @@ if ymin is None and ymax is None and xmin is None and xmax is None: return + if thin>1: + xplotter, yplotter = xplotter[::thin], yplotter[::thin] + # iterate to call the error bars functions required to draw style pen = s.ErrorBarLine.makeQPenWHide(painter) pen.setCapStyle(qt4.Qt.FlatCap) diff -Nru veusz-1.23/veusz/windows/consolewindow.py veusz-1.23.1/veusz/windows/consolewindow.py --- veusz-1.23/veusz/windows/consolewindow.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/windows/consolewindow.py 2015-04-22 17:41:20.000000000 +0000 @@ -159,8 +159,9 @@ self.vbox = qt4.QWidget() self.setWidget(self.vbox) vlayout = qt4.QVBoxLayout(self.vbox) - vlayout.setMargin( vlayout.margin()//4 ) - vlayout.setSpacing( vlayout.spacing()//4 ) + s = vlayout.contentsMargins().left()//4 + vlayout.setContentsMargins(s,s,s,s) + vlayout.setSpacing(s) # start an interpreter instance to the document self.interpreter = document.CommandInterpreter(thedocument) @@ -187,7 +188,7 @@ self._hbox = qt4.QWidget() hlayout = qt4.QHBoxLayout(self._hbox) - hlayout.setMargin(0) + hlayout.setContentsMargins(0,0,0,0) vlayout.addWidget(self._hbox) self._prompt = qt4.QLabel(">>>") diff -Nru veusz-1.23/veusz/windows/mainwindow.py veusz-1.23.1/veusz/windows/mainwindow.py --- veusz-1.23/veusz/windows/mainwindow.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/windows/mainwindow.py 2015-06-14 10:01:16.000000000 +0000 @@ -45,8 +45,6 @@ from . import treeeditwindow from .datanavigator import DataNavigatorWindow -from ..dialogs.plugin import handlePlugin - def _(text, disambiguation=None, context='MainWindow'): """Translate text.""" return qt4.QCoreApplication.translate(context, text, disambiguation) @@ -365,12 +363,14 @@ menuname: string giving prefix for new menu entries (inside actions) """ - menu = [] - for pluginkls in pluginlist: - def loaddialog(pluginkls=pluginkls): - """Load plugin dialog""" + def getLoadDialog(pluginkls): + def _loadPlugin(): + from ..dialogs.plugin import handlePlugin handlePlugin(self, self.document, pluginkls) + return _loadPlugin + menu = [] + for pluginkls in pluginlist: actname = menuname + '.' + '.'.join(pluginkls.menu) text = pluginkls.menu[-1] if pluginkls.has_parameters: @@ -379,7 +379,7 @@ self, pluginkls.description_short, text, - loaddialog) + getLoadDialog(pluginkls)) # build up menu from tuple of names menulook = menu @@ -500,7 +500,7 @@ self.slotDataImport, icon='kde-vzdata-import'), 'data.edit': a(self, _('Edit and enter new datasets'), _('&Editor...'), - self.slotDataEdit, icon='kde-edit-veuszedit'), + lambda: self.slotDataEdit(), icon='kde-edit-veuszedit'), 'data.create': a(self, _('Create new datasets using ranges, parametrically or as functions of existing datasets'), _('&Create...'), self.slotDataCreate, icon='kde-dataset-new-veuszedit'), @@ -1141,30 +1141,30 @@ """Populate the recently opened files menu with a list of recently opened files""" + def opener(path): + def _fileOpener(): + self.openFile(path) + return _fileOpener + menu = self.menus["file.filerecent"] menu.clear() - newMenuItems = [] if setdb['main_recentfiles']: files = [f for f in setdb['main_recentfiles'] if os.path.isfile(f)] - self._openRecentFunctions = [] # add each recent file to menu + newmenuitems = [] for i, path in enumerate(files): - - def fileOpener(filename=path): - self.openFile(filename) - - self._openRecentFunctions.append(fileOpener) - newMenuItems.append(('filerecent%i' % i, _('Open File %s') % path, - os.path.basename(path), - 'file.filerecent', fileOpener, - '', False, '')) + newmenuitems.append( + ('filerecent%i' % i,_('Open File %s') % path, + os.path.basename(path), + 'file.filerecent', opener(path), + '', False, '')) menu.setEnabled(True) self.recentFileActions = utils.populateMenuToolbars( - newMenuItems, self.maintoolbar, self.menus) + newmenuitems, self.maintoolbar, self.menus) else: menu.setEnabled(False) diff -Nru veusz-1.23/veusz/windows/plotwindow.py veusz-1.23.1/veusz/windows/plotwindow.py --- veusz-1.23/veusz/windows/plotwindow.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/windows/plotwindow.py 2015-04-22 17:41:20.000000000 +0000 @@ -194,6 +194,16 @@ sys.stderr.write(_("Error in rendering thread\n")) traceback.print_exc(file=sys.stderr) +class ControlGraphRoot(qt4.QGraphicsItem): + """Control graph items are connected to this root item. + We don't use a group here as it would swallow parent events.""" + def __init__(self): + qt4.QGraphicsItem.__init__(self) + def paint(self, painter, option, widget=None): + pass + def boundingRect(self): + return qt4.QRectF() + class PlotWindow( qt4.QGraphicsView ): """Class to show the plot(s) in a scrollable window.""" @@ -246,9 +256,8 @@ self.vzactions = None # for controlling plot elements - g = self.controlgraphgroup = qt4.QGraphicsItemGroup() - g.setHandlesChildEvents(False) - self.scene.addItem(g) + self.controlgraphroot = ControlGraphRoot() + self.scene.addItem(self.controlgraphroot) # zoom rectangle for zooming into graph (not shown normally) self.zoomrect = self.scene.addRect( 0, 0, 100, 100, @@ -652,12 +661,7 @@ qt4.QGraphicsView.mousePressEvent(self, event) # work out whether user is clicking on a control point - # we have to ignore the item group which seems to be above - # its constituents items = self.items(event.pos()) - if len(items) > 0 and isinstance(items[0], qt4.QGraphicsItemGroup): - del items[0] - self.ignoreclick = ( len(items)==0 or items[0] is not self.pixmapitem or self.painthelper is None ) @@ -1210,21 +1214,17 @@ def updateControlGraphs(self, widgets): """Add control graphs for the widgets given.""" - cgg = self.controlgraphgroup - - # delete old items - for c in cgg.childItems(): - cgg.removeFromGroup(c) + # delete old items from root + for c in list(self.controlgraphroot.childItems()): self.scene.removeItem(c) - # add each item to the group + # add each item to the root if self.painthelper: for widget in widgets: cgis = self.painthelper.getControlGraph(widget) if cgis: for control in cgis: - graphitem = control.createGraphicsItem() - cgg.addToGroup(graphitem) + control.createGraphicsItem(self.controlgraphroot) class FullScreenPlotWindow(qt4.QScrollArea): """Window for showing plot in full-screen mode.""" diff -Nru veusz-1.23/veusz/windows/treeeditwindow.py veusz-1.23.1/veusz/windows/treeeditwindow.py --- veusz-1.23/veusz/windows/treeeditwindow.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/windows/treeeditwindow.py 2015-06-13 20:09:41.000000000 +0000 @@ -306,7 +306,7 @@ self.layout = qt4.QGridLayout(self) self.layout.setSpacing( self.layout.spacing()//2 ) - self.layout.setMargin(4) + self.layout.setContentsMargins(4,4,4,4) self.childlist = [] self.setncntrls = {} # map setting name to controls @@ -331,8 +331,9 @@ button = qt4.QPushButton(text) button.setToolTip(action.descr) - button.clicked[()].connect( - lambda a=action: setnsproxy.onAction(a, self.getConsole())) + button.clicked.connect( + lambda checked=True, a=action: + setnsproxy.onAction(a, self.getConsole())) self.layout.addWidget(button, row, 1) self.childlist.append(button) @@ -580,7 +581,7 @@ # layout for tab widget layout = qt4.QVBoxLayout() - layout.setMargin(2) + layout.setContentsMargins(2,2,2,2) layout.addWidget(scroll) # finally use layout containing items for tab @@ -831,6 +832,9 @@ def _constructToolbarMenu(self): """Add items to edit/add graph toolbar and menu.""" + def slotklass(klass): + return lambda: self.slotMakeWidgetButton(klass) + iconsize = setting.settingdb['toolbar_size'] self.addtoolbar.setIconSize( qt4.QSize(iconsize, iconsize) ) self.edittoolbar.setIconSize( qt4.QSize(iconsize, iconsize) ) @@ -847,9 +851,7 @@ 'nonorthpoint', 'nonorthfunc'): wc = document.thefactory.getWidgetClass(widgettype) - def slotfn(klass=wc): - return lambda: self.slotMakeWidgetButton(klass) - slot = slotfn(wc) + slot = slotklass(wc) self.addslots[wc] = slot actionname = 'add.' + widgettype @@ -1230,7 +1232,7 @@ self.setnsproxy = setnsproxy self.layout = qt4.QHBoxLayout(self) - self.layout.setMargin(2) + self.layout.setContentsMargins(2,2,2,2) if setting.usertext: text = setting.usertext diff -Nru veusz-1.23/veusz/windows/tutorial.py veusz-1.23.1/veusz/windows/tutorial.py --- veusz-1.23/veusz/windows/tutorial.py 2015-04-17 18:14:09.000000000 +0000 +++ veusz-1.23.1/veusz/windows/tutorial.py 2015-04-22 17:41:20.000000000 +0000 @@ -20,6 +20,7 @@ from __future__ import division import os.path +import sip from .. import qtall as qt4 from .. import utils from .. import setting @@ -350,6 +351,7 @@ from ..dialogs.importdialog import ImportDialog if isinstance(dialog, ImportDialog): # make life easy by sticking in filename + dialog.slotReset() dialog.filenameedit.setText( os.path.join(utils.exampleDirectory, 'tutorialdata.csv')) # and choosing tab @@ -834,15 +836,15 @@ # because we're flashing random UI components, the C++ object # might be deleted, so we have to check before doing things to - # it: hence the qt4.isdeleted + # it: hence the sip.isdeleted if ( self.flash is not self.oldflash and self.oldflash is not None - and not qt4.isdeleted(self.oldflash) ): + and not sip.isdeleted(self.oldflash) ): # clear any flashing on previous widget self.oldflash.setStyleSheet('') self.oldflash = None - if self.flash is not None and not qt4.isdeleted(self.flash): + if self.flash is not None and not sip.isdeleted(self.flash): # set flash state and toggle variable if self.flashon: self.flash.setStyleSheet('background: yellow;')