diff options
| author | Karl Berry <karl@freefriends.org> | 2011-07-26 23:26:28 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2011-07-26 23:26:28 +0000 |
| commit | 792ab47701eef9ed7c77ca44fb642b53189aba33 (patch) | |
| tree | 168b086ed1ee1a8d519040863defe2a6ab4bd8d5 /Master | |
| parent | e2d56f5c45ad8c6d04d5b28277819d0d35ee1f1a (diff) | |
numericplots (14jul11)
git-svn-id: svn://tug.org/texlive/trunk@23241 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
16 files changed, 2677 insertions, 347 deletions
diff --git a/Master/texmf-dist/doc/latex/numericplots/BasicFunctionality.tex b/Master/texmf-dist/doc/latex/numericplots/BasicFunctionality.tex index b738a0e4789..3a9298b5f55 100644 --- a/Master/texmf-dist/doc/latex/numericplots/BasicFunctionality.tex +++ b/Master/texmf-dist/doc/latex/numericplots/BasicFunctionality.tex @@ -1,4 +1,4 @@ -% Copyright 2010 Thomas König, Alexander Michel +% Copyright 2010 Thomas Koenig, Alexander Michel % % This file is part of NumericPlots. % @@ -153,7 +153,7 @@ To plot multiple data in one plot call \newline {\IdentI} \listplot[style=StdLineStyB] {\IdentII} - + \putSE{\LegendDefinition{ \LegLine{style=StdLineStyA} & IdentI \\ \LegLine{style=StdLineStyB} & IdentII @@ -188,9 +188,9 @@ The commands \texttt{plotxAxis} and \texttt{plotyAxis} take the options \texttt{LabelOption} and \texttt{TickLabelOption} which may be used to eliminate or change the look of the labels. -Standard values for \texttt{LabelOption} and \texttt{TickLabelOption} may be set -by \verb|\newcommand{\StdLabelOption}{\color{blue}| and -\verb|\newcommand{\StdTickLabelOption}{\small}|. +Standard values for \texttt{LabelOption} and \texttt{TickLabelOption} may be set\\ +by \verb|\newcommand{\StdLabelOption}{\color{blue}|\\ +and \verb|\newcommand{\StdTickLabelOption}{\small}|. The option \texttt{xLabelSep} for \verb|\plotxAxis| (and \texttt{yLabelSep} for \verb|\plotyAxis|) may be used to set the seperation between the axis and the label. Standard value @@ -260,7 +260,7 @@ command NDPput, see the following example. \listplot[style=StdLineStyA] {\IdentI} - + % put some stuff somewhere \NDPput[x=1.2, y=75, RefPoint=br]{text} \NDPput[x=1.2, y=100]{$a^2$} @@ -269,8 +269,8 @@ command NDPput, see the following example. \NDPput[x=1.6, y=100]{\pnode{A}} \NDPput[x=1.8, y=150]{\pnode{B}} % ...and draw a line between them - \ncline{A}{B} - + \ncline{A}{B} + % or put the legend at a specific position \NDPput[x=1.8, y=75]{\LegendDefinition{ \LegLine{style=StdLineStyA} & IdentI @@ -292,7 +292,7 @@ command NDPput, see the following example. \listplot[style=StdLineStyA] {\IdentI} - + % put some stuff somewhere \NDPput[x=1.2, y=75, RefPoint=br]{text} \NDPput[x=1.2, y=100]{$a^2$} @@ -301,8 +301,8 @@ command NDPput, see the following example. \NDPput[x=1.6, y=100]{\pnode{A}} \NDPput[x=1.8, y=150]{\pnode{B}} % ...and draw a line between them - \ncline{A}{B} - + \ncline{A}{B} + % or put the legend at a specific position \NDPput[x=1.8, y=75]{\LegendDefinition{ \LegLine{style=StdLineStyA} & IdentI @@ -310,11 +310,33 @@ command NDPput, see the following example. \end{NumericDataPlot} \end{minipage} -Alternatively, stuff can be placed within the plot with \verb|\rput|. +For convenience the commands \verb|\putXX{object}| where +$XX\in\left(N,S,E,W,NW,NE,SW,SE\right)$ are defined to place something in the +North, South,\ldots, SouthEast corner of the plot. Also, the command +\verb|\putExpY{xx}| and \verb|\putExpX{xx}| may be used to place exponents at +the axes. \begin{minipage}[T]{0.5\linewidth} \begin{verbatim} \begin{NumericDataPlot} + ... + \putExpY{$\times 10^{-3}$} + \putExpX{$\times 10^{-6}$} + + \putN{N} + \putS{S} + \putW{W} + \putE{E} + \putNW{NW} + \putNE{NE} + \putSW{SW} + \putSE{SE} + \end{NumericDataPlot} + \end{verbatim} +\end{minipage} +\begin{minipage}[T]{0.5\linewidth} + \vspace{10pt} + \begin{NumericDataPlot} {\textwidth}{5cm} \setxAxis {xMin=1, xMax=1.6, Dx=0.2} @@ -326,7 +348,30 @@ Alternatively, stuff can be placed within the plot with \verb|\rput|. \listplot[style=StdLineStyA] {\IdentI} - + + \putExpY{$\times 10^{-3}$} + \putExpX{$\times 10^{-6}$} + + \putN{N} + \putS{S} + \putW{W} + \putE{E} + \putNW{NW} + \putNE{NE} + \putSW{SW} + \putSE{SE} + \end{NumericDataPlot} +\end{minipage} + + +Alternatively, stuff can be placed +within the plot with \verb|\rput|. + +\begin{minipage}[T]{0.5\linewidth} + \begin{verbatim} + \begin{NumericDataPlot} + ... + % put text in the middle of the plot \rput{45}(500,500){text} % put a formula in the lower left corner @@ -336,8 +381,8 @@ Alternatively, stuff can be placed within the plot with \verb|\rput|. \NDPput[x=1.2, y=125]{\pnode{A}} \rput(750,900){\Rnode{B}{peak}} % ...and draw a line between them - \ncline{<-}{A}{B} - + \ncline{<-}{A}{B} + % or put the legend at a specific position \rput{-45}(750,250){\LegendDefinition{ \LegLine{style=StdLineStyA} & IdentI @@ -359,7 +404,7 @@ Alternatively, stuff can be placed within the plot with \verb|\rput|. \listplot[style=StdLineStyA] {\IdentI} - + % put text in the middle of the plot \rput{45}(500,500){text} % put a formula in the lower left corner @@ -369,8 +414,8 @@ Alternatively, stuff can be placed within the plot with \verb|\rput|. \NDPput[x=1.2, y=125]{\pnode{A}} \rput(750,900){\Rnode{B}{peak}} % ...and draw a line between them - \ncline{<-}{A}{B} - + \ncline{<-}{A}{B} + % or put the legend at a specific position \rput{-45}(750,250){\LegendDefinition{ \LegLine{style=StdLineStyA} & IdentI @@ -380,7 +425,184 @@ Alternatively, stuff can be placed within the plot with \verb|\rput|. -\subsection{Line Styles} +% ================================= +% | | +% | Linestyles and colors | +% | | +% ================================= + +\subsection{Linestyles and colors} + +While using the package, there are predefined linestyles which may be used: + +\begin{minipage}{0.6\linewidth} + \centering + \small + + \input{DataTestRealData} + + \begin{NumericDataPlot}[]{\linewidth}{0.7\linewidth} + \setxAxis{xMin=2, xMax=17, xO=5, Dx=4} + \setyAxis{yMin=20, yMax=70, yO=20, Dy=20} + + \plotxAxis[NoLabel, AxisStyle=Boxed]{} + \plotyAxis[NoLabel, AxisStyle=Boxed]{} + + \listplot[style=StdLineStyA]{\DataA} + \listplot[style=StdLineStyB]{\DataB} + \listplot[style=StdLineStyC]{\DataC} + \listplot[style=StdLineStyD]{\DataD} + \listplot[style=StdLineStyE]{\DataE} + \listplot[style=StdLineStyF]{\DataF} + \listplot[style=StdLineStyG]{\DataG} + \end{NumericDataPlot} +\end{minipage} +\begin{minipage}{0.4\linewidth} + \centering + \LegendDefinition{ + \LegLine{style=StdLineStyA} & StdLineStyA \\ + \LegLine{style=StdLineStyB} & StdLineStyB \\ + \LegLine{style=StdLineStyC} & StdLineStyC \\ + \LegLine{style=StdLineStyD} & StdLineStyD \\ + \LegLine{style=StdLineStyE} & StdLineStyE \\ + \LegLine{style=StdLineStyF} & StdLineStyF \\ + \LegLine{style=StdLineStyG} & StdLineStyG \\ + } +\end{minipage} + +When using the package option \texttt{BW} the standard line styles will be +replaced by their black and white counterparts: + +\begin{minipage}{0.6\linewidth} + \centering + \small + + \input{DataTestRealData} + + \begin{NumericDataPlot}[]{\linewidth}{0.7\linewidth} + \setxAxis{xMin=2, xMax=17, xO=5, Dx=4} + \setyAxis{yMin=20, yMax=70, yO=20, Dy=20} + + \plotxAxis[NoLabel, AxisStyle=Boxed]{} + \plotyAxis[NoLabel, AxisStyle=Boxed]{} + + \listplot[style=BWStdLineStyA]{\DataA} + \listplot[style=BWStdLineStyB]{\DataB} + \listplot[style=BWStdLineStyC]{\DataC} + \listplot[style=BWStdLineStyD]{\DataD} + \listplot[style=BWStdLineStyE]{\DataE} + \listplot[style=BWStdLineStyF]{\DataF} + \listplot[style=BWStdLineStyG]{\DataG} + \end{NumericDataPlot} +\end{minipage} +\begin{minipage}{0.4\linewidth} + \centering + \LegendDefinition{ + \LegLine{style=BWStdLineStyA} & BWStdLineStyA \\ + \LegLine{style=BWStdLineStyB} & BWStdLineStyB \\ + \LegLine{style=BWStdLineStyC} & BWStdLineStyC \\ + \LegLine{style=BWStdLineStyD} & BWStdLineStyD \\ + \LegLine{style=BWStdLineStyE} & BWStdLineStyE \\ + \LegLine{style=BWStdLineStyF} & BWStdLineStyF \\ + \LegLine{style=BWStdLineStyG} & BWStdLineStyG \\ + } +\end{minipage} + +For values which are nearly the same (reference and measurement, e.g.) the +following line styles may be used: + +\begin{minipage}{0.6\linewidth} + \centering + \small + + \input{DataTestRealData} + + \begin{NumericDataPlot}[]{\linewidth}{0.7\linewidth} + \setxAxis{xMin=2, xMax=17, xO=5, Dx=4} + \setyAxis{yMin=20, yMax=70, yO=20, Dy=20} + + \plotxAxis[NoLabel, AxisStyle=Boxed]{} + \plotyAxis[NoLabel, AxisStyle=Boxed]{} + + \listplot[style=StdLineStyX]{\DataC} + \listplot[style=StdLineStyY]{\DataC} + + \listplot[style=BWStdLineStyX]{\DataD} + \listplot[style=BWStdLineStyY]{\DataD} + \end{NumericDataPlot} +\end{minipage} +\begin{minipage}{0.4\linewidth} + \centering + \LegendDefinition{ + \LegLine{style=StdLineStyX} & StdLineStyX \\ + \LegLine{style=StdLineStyY} & StdLineStyY \\ + \LegLine{style=BWStdLineStyX} & BWStdLineStyX \\ + \LegLine{style=BWStdLineStyY} & BWStdLineStyY \\ + } +\end{minipage} + +It is, of course, possible to redefine the available linestyles or to define new +linestyles. + +\begin{minipage}[T]{0.5\linewidth} + \begin{verbatim} + \definecolor{MyColor}{cmyk}{0.6 0.21 1.0 0.2} + \newpsstyle{MyLine} + {linecolor=MyColor, linewidth=2pt, + linestyle=dashed, + dash=1pt 1pt 4pt 1pt 1pt 3pt, + dotstyle=*, showpoints=true, + dotsize=5pt} + \newpsstyle{MyLineA} + {linecolor=blue, linestyle=dotted, + dotstyle=asterisk, showpoints=true} + + \listplot[style=MyLine] + {\IdentI} + \listplot[style=MyLineA] + {\IdentII} + + \putSE{\LegendDefinition{ + \LegLine{style=MyLine} & IdentI + \LegLine{style=MyLineA} & IdentII + }} + \end{verbatim} +\end{minipage} +\begin{minipage}[T]{0.5\linewidth} + \begin{NumericDataPlot} + {\textwidth}{5cm} + + \definecolor{MyColor}{cmyk}{0.6 0.21 1.0 0.2} + \newpsstyle{MyLine}{linecolor=MyColor, linewidth=2pt, linestyle=dashed, + dash=1pt 1pt 4pt 1pt 1pt 3pt, dotstyle=*, showpoints=true, dotsize=5pt} + \newpsstyle{MyLineA}{linecolor=blue, linestyle=dotted, + dotstyle=asterisk, showpoints=true} + + \setxAxis + {xMin=1, xMax=1.6, Dx=0.2} + \setyAxis + {yMin=50, yMax=150, Dy=25} + + \plotxAxis[NoLabel]{} + \plotyAxis[NoLabel]{} + + \listplot[style=MyLine] + {\IdentI} + \listplot[style=MyLineA] + {\IdentII} + + \putSE{\LegendDefinition{ + \LegLine{style=MyLine} & IdentI + }} + \end{NumericDataPlot} +\end{minipage} + + +% ================================= +% | | +% | Legend | +% | | +% ================================= \subsection{Legend} @@ -400,15 +622,23 @@ follwing examples. \LegLine{style=StdLineStyB, linewidth=3pt} & second legend } \begin{verbatim} + \newpsstyle{LegendBoxStyle}% + {framearc=0.2, fillstyle=solid, fillcolor=yellow, opacity=0.2} \LegendDefinition[nrCols=2]{ \LegLine{style=StdLineStyA} & IdentI & \LegLine{style=StdLineStyB, linewidth=3pt} & legend 2 + \newpsstyle{LegendBoxStyle}% + {fillstyle=solid, fillcolor=white} } \end{verbatim} + \newpsstyle{LegendBoxStyle}% + {framearc=0.2, fillstyle=solid, fillcolor=yellow, opacity=0.2} \LegendDefinition[nrCols=2]{ \LegLine{style=StdLineStyA} & IdentI & \LegLine{style=StdLineStyB, linewidth=3pt} & legend 2 } + \newpsstyle{LegendBoxStyle}% + {fillstyle=solid, fillcolor=white} \begin{verbatim} \LegendDefinition[LabelOrientation=c]{ \LegLine{style=StdLineStyA} & IdentI\\ @@ -427,7 +657,7 @@ follwing examples. \subsection{Add Lines to the Plot} Horizontal and vertical lines may be added to the plot with the commands -\verb|\NDPhline{coord}| and \verb|\NDPvline{coord}|. It is also possible to put +\verb|\NDPhline{coord}|, \verb|\NDPvline{coord}| and \verb|\NDPline{coord}|. It is also possible to put nodes and draw lines between them, see placing stuff\ldots \begin{minipage}[T]{0.5\linewidth} @@ -444,7 +674,7 @@ nodes and draw lines between them, see placing stuff\ldots \listplot[style=StdLineStyA] {\IdentI} - + \NDPhline[linecolor=LineColorD]{73} \NDPvline[linecolor=LineColorE, linestyle=dashed]{1.5} \NDPline[linecolor=red]{1.1}{75}{1.3}{125} @@ -465,14 +695,70 @@ nodes and draw lines between them, see placing stuff\ldots \listplot[style=StdLineStyA] {\IdentI} - + \NDPhline[linecolor=LineColorD]{73} \NDPvline[linecolor=LineColorE, linestyle=dashed]{1.5} \NDPline[linecolor=red]{1.1}{75}{1.3}{125} \end{NumericDataPlot} \end{minipage} +\subsection{Add Boxes to the Plot} +Horizontal and vertical boxes may be added to the plot with the commands +\verb|\NDPhbox{coord}|, \verb|\NDPvbox{coord}| and \verb|\NDPbox{coord}|. It is also possible to put +nodes and draw lines between them, see placing stuff\ldots + +\begin{minipage}[T]{0.5\linewidth} + \begin{verbatim} + \begin{NumericDataPlot} + {\textwidth}{5cm} + \setxAxis + {xMin=1, xMax=1.6, Dx=0.2} + \setyAxis + {yMin=50, yMax=150, Dy=25} + + \plotxAxis[NoLabel]{} + \plotyAxis[NoLabel]{} + + \NDPhbox[fillstyle=solid,fillcolor=green]% + {75.0}{100.0}% + + \listplot[style=StdLineStyA] {\IdentI} + + \NDPvbox[fillstyle=solid,fillcolor=red] + {1.4}{1.5} + + \NDPbox[fillstyle=solid,% + fillcolor=orange, opacity=0.2, linestyle=none]% + {1.1}{60}{1.15}{130} + \end{NumericDataPlot} + \end{verbatim} +\end{minipage} +\begin{minipage}[T]{0.5\linewidth} + \vspace{10pt} + \begin{NumericDataPlot} + {\textwidth}{5cm} + \setxAxis + {xMin=1, xMax=1.6, Dx=0.2} + \setyAxis + {yMin=50, yMax=150, Dy=25} + + \plotxAxis[NoLabel]{} + \plotyAxis[NoLabel]{} + + \NDPhbox[fillstyle=solid,fillcolor = green]% + {75.0}{100.0}% + + \listplot[style=StdLineStyA] {\IdentI} + + \NDPvbox[fillstyle=solid,fillcolor=red] + {1.4}{1.5} + + \NDPbox[fillstyle=solid,% + fillcolor=orange, opacity=0.2, linestyle=none]% + {1.1}{60}{1.15}{130} + \end{NumericDataPlot} +\end{minipage} \subsection{Grid} @@ -586,47 +872,3 @@ the axis. To avoid this, plot the grid first and then plot the axis as shown. -\subsection{export2latex.m} - -The function \texttt{export2latex(data, filename, [options])} may be used to -export data from Matlab to be used with NumericPlots.sty. The function takes the two parameters -data and filename, where filename is the name of the file where the data should -be stored with full path but without extension. Data is a structure with the -three entries x, y, and ident, where x are the x-data, y the y-data and ident is -an identifier to have access to the data in Latex. To access the data in Latex -the command \verb+\Data<ident>+ is used. - -The parameter data may be provided as an 1xK array if each entry of the array is -a structure with the entries x, y and ident. There may be an additional entry -descr. -\begin{itemize} - \item data(1,i).x = $X_i$ - \item data(1,i).y = $Y_i$ - \item data(1,i).ident = Identifier - \item (data(1,i).descr = Description) -\end{itemize} -Identifier must be a valid Latex command name, which basically means it must be -a string without numbers. - -For every entry of data, $X$ and $Y$ must be arrays of the same size -$M\text{x}N$. If $M>1$, each column of the array is exported to the file and the -identifier is expanded by the roman representation of the column number. - -It might be useful to do a \texttt{interp1} before exporting the data to get -smaller files and to use less of \TeX's memory. ($\rightarrow$ script -Patrick?!?) - -The optional parameter \texttt{options} might be used to control which -additional information is provided in the output file. -\begin{itemize} - \item \texttt{options.DataBoundaries} [true] If set to true, the output file - contains the commands \verb+\DataXmin+, \verb+\DataXmax+, \verb+\DataYmin+ and - \verb+\DataYmax+ which may be used to define the axis. - \item \texttt{options.AxisBoundaries} [false] If set to true, the output file - contains the commands \verb+\DataXminAxis+, \verb+\DataXmaxAxis+, - \verb+\DataYminAxis+ and \verb+\DataYmaxAxis+ which may be used to define the - axis. In contrary to the DataBoundaries the AxisBoundaries add an additional - gap of \texttt{options.AxisBoundariesGap} [10] percent of the full scale to - the data boundaries such that the plot doesn't touch the axis. -\end{itemize} - diff --git a/Master/texmf-dist/doc/latex/numericplots/DataTestRealData.tex b/Master/texmf-dist/doc/latex/numericplots/DataTestRealData.tex index 6941e99a213..985ee468f20 100644 --- a/Master/texmf-dist/doc/latex/numericplots/DataTestRealData.tex +++ b/Master/texmf-dist/doc/latex/numericplots/DataTestRealData.tex @@ -1,7 +1,7 @@ % data written by export2latex % date: 10-Mar-2010 -\def\DataDBforce{ +\def\DataA{ 2 58.828 3 56.353 4 58.817 @@ -20,37 +20,7 @@ 17 48.876 } -\def\DataDBforceC{ -2 50.828 -3 50.353 -4 56.817 -} - -\def\DataDBforceD{ -2 40.828 -3 40.353 -4 46.817 -} - -\def\DataDBforceE{ -2 30.828 -3 30.353 -4 36.817 -} - -\def\DataDBforceF{ -2 20.828 -3 20.353 -4 26.817 -} - -\def\DataDBforceG{ -2 60.828 -3 60.353 -4 66.817 -} - -\def\DataRESforce{ +\def\DataB{ 2 62.894 3 59.824 4 59.908 @@ -68,6 +38,101 @@ 16 30.646 17 28.224 } +\def\DataC{ + 2.0000 52.5244 + 3.0000 52.9925 + 4.0000 52.7279 + 5.0000 51.7954 + 6.0000 50.4234 + 7.0000 48.9477 + 8.0000 47.7296 + 9.0000 47.0674 + 10.0000 47.1232 + 11.0000 47.8834 + 12.0000 49.1618 + 13.0000 50.6454 + 14.0000 51.9710 + 15.0000 52.8140 + 16.0000 52.9681 + 17.0000 52.3955 +} + +\def\DataD{ +2.0000 48.9294 + 3.0000 47.7015 + 4.0000 46.1762 + 5.0000 44.5214 + 6.0000 42.9193 + 7.0000 41.5462 + 8.0000 40.5534 + 9.0000 40.0500 + 10.0000 40.0916 + 11.0000 40.6736 + 12.0000 41.7318 + 13.0000 43.1498 + 14.0000 44.7715 + 15.0000 46.4183 + 16.0000 47.9090 + 17.0000 49.0795 +} + +\def\DataE{ + 2.0000 55.0918 + 3.0000 57.2074 + 4.0000 58.8597 + 5.0000 59.9770 + 6.0000 60.5465 + 7.0000 60.6154 + 8.0000 60.2864 + 9.0000 59.7056 + 10.0000 59.0472 + 11.0000 58.4936 + 12.0000 58.2160 + 13.0000 58.3549 + 14.0000 59.0052 + 15.0000 60.2054 + 16.0000 61.9334 + 17.0000 64.1090 +} + +\def\DataF{ +2 20.828 +3 20.353 +4 26.817 +5 20.828 +6 20.353 +7 26.817 +8 22.828 +9 23.353 +10 24.817 +11 20.828 +12 28.353 +13 26.817 +14 22.828 +15 27.353 +16 26.817 +17 24.9 +} + +\def\DataG{ + 2.0000 34.2537 + 3.0000 33.1056 + 4.0000 32.5301 + 5.0000 32.3504 + 6.0000 32.4343 + 7.0000 32.6791 + 8.0000 33.0000 + 9.0000 33.3209 + 10.0000 33.5657 + 11.0000 33.6496 + 12.0000 33.4699 + 13.0000 32.8944 + 14.0000 31.7463 + 15.0000 29.7847 + 16.0000 26.6776 + 17.0000 21.9643 +} + \def\DataDBhex{ 2 93 diff --git a/Master/texmf-dist/doc/latex/numericplots/FurtherExamples.tex b/Master/texmf-dist/doc/latex/numericplots/FurtherExamples.tex index 458a1906899..f770c7ebc45 100644 --- a/Master/texmf-dist/doc/latex/numericplots/FurtherExamples.tex +++ b/Master/texmf-dist/doc/latex/numericplots/FurtherExamples.tex @@ -1,22 +1,3 @@ -% Copyright 2010 Thomas König, Alexander Michel -% -% This file is part of NumericPlots. -% -% NumericPlots is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% any later version. -% -% NumericPlots is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with NumericPlots. If not, see <http://www.gnu.org/licenses/>. - -\part{Examples} - \section{Further Examples} \def\MoreData{ diff --git a/Master/texmf-dist/doc/latex/numericplots/MatlabSupport.tex b/Master/texmf-dist/doc/latex/numericplots/MatlabSupport.tex new file mode 100644 index 00000000000..32802955b88 --- /dev/null +++ b/Master/texmf-dist/doc/latex/numericplots/MatlabSupport.tex @@ -0,0 +1,77 @@ +\subsection{export2latex.m} + +The function \texttt{export2latex(data, filename, [options])} may be used to +export data from Matlab to be used with NumericPlots.sty. The function takes the two parameters +data and filename, where filename is the name of the file where the data should +be stored with full path but without extension. Data is a structure with the +three entries x, y, and ident, where x are the x-data, y the y-data and ident is +an identifier to have access to the data in Latex. To access the data in Latex +the command \verb+\Data<ident>+ is used. + +The parameter data may be provided as an 1xK array if each entry of the array is +a structure with the entries x, y and ident. There may be an additional entry +descr. +\begin{itemize} + \item data(1,i).x = $X_i$ + \item data(1,i).y = $Y_i$ + \item data(1,i).ident = Identifier + \item (data(1,i).descr = Description) +\end{itemize} +Identifier must be a valid Latex command name, which basically means it must be +a string without numbers. + +For every entry of data, $X$ and $Y$ must be arrays of the same size +$M\text{x}N$. If $M>1$, each column of the array is exported to the file and the +identifier is expanded by the roman representation of the column number. + +It might be useful to do a \texttt{interp1} before exporting the data to get +smaller files and to use less of \TeX's memory. ($\rightarrow$ script +Patrick?!?) + +The optional parameter \texttt{options} might be used to control which +additional information is provided in the output file. +\begin{itemize} + \item \texttt{options.DataBoundaries} [true] If set to true, the output file + contains the commands \verb+\DataXmin+, \verb+\DataXmax+, \verb+\DataYmin+ and + \verb+\DataYmax+ which may be used to define the axis. + \item \texttt{options.AxisBoundaries} [false] If set to true, the output file + contains the commands \verb+\DataXminAxis+, \verb+\DataXmaxAxis+, + \verb+\DataYminAxis+ and \verb+\DataYmaxAxis+ which may be used to define the + axis. In contrary to the DataBoundaries the AxisBoundaries add an additional + gap of \texttt{options.AxisBoundariesGap} [10] percent of the full scale to + the data boundaries such that the plot doesn't touch the axis. +\end{itemize} + +\subsection{struct2latex.m} +The function \texttt{struct2latex(data,[xname],[downsample],[filename],[postfix],[options])} may be used to export a Matlab struct to be used with NumericPlots.sty. The function is based on export2latex and the \verb+options+ argument is given to export2latex. The optional argument \verb+xname+ specifies the fieldname of the x-data. If no \verb+xname+ is given, you have to chose one via popup. All other fields are treated like y-data. Furthermore, the identifier of the y-data are equal to the fieldnames and have to be valid Latex commands (fieldnames with numbers are not supported). The struct2latex command only supports 1 dimensional arrays (row vectors). Column vectors are mapped for propper export without warning. With the optional argument \verb+downsample+ (integer>0) it is possible to downsample the data for smaller files. A warning is given when data points exceed $5000$. Usually $1000$ data points are enough for a propper plot in latex. The optional argument \verb+filename+ specifies the outputname with path of the texfile. If no filename is given, it has to be chosen via popup. The optional argument \verb+postfix+ can be used to put a postfix after the fieldname in the identifier of the y-data. The \verb+options+ argument is also optional and equal to the options argument of the function export2latex. + +Matlab example. +\begin{verbatim} + % data for struct2latex should be row-vectors. anyway, column-vectors are + % mapped to row-vectors. matrices are not supported + + %% export row-vectors + t = [1:0.1:10]; + + data.time = t; + data.sin = sin(t); + data.cos = cos(t); + data.exp = exp(t); + data.tan = tan(t); + + %struct2latex(data,xname,downsample,filename,postfix,options) + %downsample,filename,postfix,options are optional arguments + struct2latex(data,'time',1,'texdataA','row'); +\end{verbatim} + +\subsection{dspace2struct} +The function \texttt{dspace2struct(dataname,version)} may be used to import \texttt{.mat} created by \textsc{dSpace} to \textsc{Matlab}. It returns a \textsc{Matlab} struct out of the provided variables \verb+dataname+ and \verb+version+. Thereby \verb+dataname+ is the name of the \textsc{dSpace} \verb+.mat+ file and the optional string argument \verb+version+ has to be equal \verb+version = 'NG'+ if \textsc{dSpace Control Desk Next Generation} is used. It is convenient to chose a unique signal name in \textsc{Matlab/Simulink} because they will be the same in \textsc{dSpace}. The function \texttt{dspace2struct(dataname,version)} just adopts the names provided by \textsc{dSpace} and use them as fieldnames. The time vector will always be called \verb+.time+. + +Matlab example. +\begin{verbatim} + dataOG = dspace2struct(measurements) %Old Control Desk + dataNG = dspace2struct(measurements,'NG') %Control Desk Next Generation +\end{verbatim} + +\subsection{dspace2latex} +The function \texttt{dspace2latex} is just a combination of \texttt{dspace2struct} and \texttt{struct2latex} with commonly used arguments. It is a simple and quick way to export measurements from \textsc{dSpace} to \LaTeX{} without any revision of the data.
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/numericplots/MultiplePlots.tex b/Master/texmf-dist/doc/latex/numericplots/MultiplePlots.tex index e286e1fa9cf..b2490bcf445 100644 --- a/Master/texmf-dist/doc/latex/numericplots/MultiplePlots.tex +++ b/Master/texmf-dist/doc/latex/numericplots/MultiplePlots.tex @@ -1,4 +1,4 @@ -% Copyright 2010 Thomas König, Alexander Michel +% Copyright 2010 Thomas Koenig, Alexander Michel % % This file is part of NumericPlots. % @@ -45,13 +45,13 @@ showpoints=true, dotsize=10pt} \plotxAxis{Stichnummer} \plotyAxis{$F_{roll}$ in $\mega\newton$} - \listplot[style=Database]{\DataDBforce} - \listplot[style=Result]{\DataRESforce} - \listplot[style=StdLineStyC]{\DataDBforceC} - \listplot[style=StdLineStyD]{\DataDBforceD} - \listplot[style=StdLineStyE]{\DataDBforceE} - \listplot[style=StdLineStyF]{\DataDBforceF} - \listplot[style=StdLineStyG]{\DataDBforceG} + \listplot[style=Database]{\DataA} + \listplot[style=Result]{\DataB} + \listplot[style=StdLineStyC]{\DataC} + \listplot[style=StdLineStyD]{\DataD} + \listplot[style=StdLineStyE]{\DataE} + \listplot[style=StdLineStyF]{\DataF} + \listplot[style=StdLineStyG]{\DataG} % set the y-axis for the plot in the middle of the left side % x-axis remains the same @@ -62,8 +62,8 @@ showpoints=true, dotsize=10pt} \rput[t]{0}(250,550){a) Ein plot} - \listplot[style=Database]{\DataDBforce} - \listplot[style=Result]{\DataRESforce} + \listplot[style=Database]{\DataA} + \listplot[style=Result]{\DataB} % set axis for the plot at the right side \setxAxis{xMin=2, xMax=17, Dx=4, xCoordMin=600, xCoordMax=1050} @@ -73,13 +73,13 @@ showpoints=true, dotsize=10pt} \plotxAxis{Stichnummer} \plotyAxis[NoLabel, TickSep=10]{$F_{roll}$ in $\mega\newton$} - \listplot[style=Database]{\DataDBforce} - \listplot[style=Result]{\DataRESforce} - \listplot[style=StdLineStyC]{\DataDBforceC} - \listplot[style=StdLineStyD]{\DataDBforceD} - \listplot[style=StdLineStyE]{\DataDBforceE} - \listplot[style=StdLineStyF]{\DataDBforceF} - \listplot[style=StdLineStyG]{\DataDBforceG} + \listplot[style=Database]{\DataA} + \listplot[style=Result]{\DataB} + \listplot[style=StdLineStyC]{\DataC} + \listplot[style=StdLineStyD]{\DataD} + \listplot[style=StdLineStyE]{\DataE} + \listplot[style=StdLineStyF]{\DataF} + \listplot[style=StdLineStyG]{\DataG} % set the axis for the plot at the top \setxAxis{xMin=8, xMax=17, Dx=1, xCoordMin=0, xCoordMax=1050} @@ -90,8 +90,8 @@ showpoints=true, dotsize=10pt} \plotyAxis[NoLabel]{$F_{roll}$ in $\mega\newton$} % plot only part of the data - \listplot[style=Database, xStart=11, xEnd=17]{\DataDBforce} - \listplot[style=Result, xStart=8, xEnd=13]{\DataRESforce} + \listplot[style=Database, xStart=11, xEnd=17]{\DataA} + \listplot[style=Result, xStart=8, xEnd=13]{\DataB} \end{NumericDataPlot} @@ -123,13 +123,13 @@ showpoints=true, dotsize=10pt} \plotxAxis{Stichnummer} \plotyAxis{$F_{roll}$ in $\mega\newton$} - \listplot[style=Database]{\DataDBforce} - \listplot[style=Result]{\DataRESforce} - \listplot[style=StdLineStyC]{\DataDBforceC} - \listplot[style=StdLineStyD]{\DataDBforceD} - \listplot[style=StdLineStyE]{\DataDBforceE} - \listplot[style=StdLineStyF]{\DataDBforceF} - \listplot[style=StdLineStyG]{\DataDBforceG} + \listplot[style=Database]{\DataA} + \listplot[style=Result]{\DataB} + \listplot[style=StdLineStyC]{\DataC} + \listplot[style=StdLineStyD]{\DataD} + \listplot[style=StdLineStyE]{\DataE} + \listplot[style=StdLineStyF]{\DataF} + \listplot[style=StdLineStyG]{\DataG} % set the y-axis for the plot in the middle of the left side % x-axis remains the same @@ -140,8 +140,8 @@ showpoints=true, dotsize=10pt} \rput[t]{0}(250,550){a) Ein plot} - \listplot[style=Database]{\DataDBforce} - \listplot[style=Result]{\DataRESforce} + \listplot[style=Database]{\DataA} + \listplot[style=Result]{\DataB} % set axis for the plot at the right side \setxAxis{xMin=2, xMax=17, Dx=4, xCoordMin=600, xCoordMax=1050} @@ -151,13 +151,13 @@ showpoints=true, dotsize=10pt} \plotxAxis{Stichnummer} \plotyAxis[NoLabel, TickSep=10]{$F_{roll}$ in $\mega\newton$} - \listplot[style=Database]{\DataDBforce} - \listplot[style=Result]{\DataRESforce} - \listplot[style=StdLineStyC]{\DataDBforceC} - \listplot[style=StdLineStyD]{\DataDBforceD} - \listplot[style=StdLineStyE]{\DataDBforceE} - \listplot[style=StdLineStyF]{\DataDBforceF} - \listplot[style=StdLineStyG]{\DataDBforceG} + \listplot[style=Database]{\DataA} + \listplot[style=Result]{\DataB} + \listplot[style=StdLineStyC]{\DataC} + \listplot[style=StdLineStyD]{\DataD} + \listplot[style=StdLineStyE]{\DataE} + \listplot[style=StdLineStyF]{\DataF} + \listplot[style=StdLineStyG]{\DataG} % set the axis for the plot at the top \setxAxis{xMin=8, xMax=17, Dx=1, xCoordMin=0, xCoordMax=1050} @@ -168,8 +168,8 @@ showpoints=true, dotsize=10pt} \plotyAxis[NoLabel]{$F_{roll}$ in $\mega\newton$} % plot only part of the data - \listplot[style=Database, xStart=11, xEnd=17]{\DataDBforce} - \listplot[style=Result, xStart=8, xEnd=13]{\DataRESforce} + \listplot[style=Database, xStart=11, xEnd=17]{\DataA} + \listplot[style=Result, xStart=8, xEnd=13]{\DataB} \end{NumericDataPlot} @@ -177,4 +177,4 @@ showpoints=true, dotsize=10pt} \LegendDefinition[nrCols=1, LabelOrientation=r]{ \LegLine{style=Database} & Werte aus der Datenbank \\ \LegLine{style=Result} & Modell} -\end{center}
\ No newline at end of file +\end{center}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/numericplots/NumericPlots.pdf b/Master/texmf-dist/doc/latex/numericplots/NumericPlots.pdf Binary files differindex c0816a9f8b0..35f89558c41 100644 --- a/Master/texmf-dist/doc/latex/numericplots/NumericPlots.pdf +++ b/Master/texmf-dist/doc/latex/numericplots/NumericPlots.pdf diff --git a/Master/texmf-dist/doc/latex/numericplots/NumericPlotsDoc.tex b/Master/texmf-dist/doc/latex/numericplots/NumericPlotsDoc.tex index 9d6cbdb98fe..53cabbab2f5 100644 --- a/Master/texmf-dist/doc/latex/numericplots/NumericPlotsDoc.tex +++ b/Master/texmf-dist/doc/latex/numericplots/NumericPlotsDoc.tex @@ -1,4 +1,4 @@ -% Copyright 2010 Thomas König, Alexander Michel, Michael Baumgart +% Copyright 2010 Thomas Koenig, Alexander Michel, Michael Baumgart % % This file is part of NumericPlots. % @@ -22,6 +22,7 @@ % \usepackage{floatbarrier} % \usepackage{showexpl} \usepackage{etex} % use e-TeX’s extended register set + % options for package: % BW: black and white % AxisStyle=<style>: set standard axis style ([Boxed], Frame, FrameI, None) @@ -103,6 +104,10 @@ Copyright 2010 Thomas K\"{o}nig, Alexander Michel, Michael Baumgart \include{MultiplePlots} +\section{Matlab Support} + +\input{MatlabSupport} + \section{package options} \section{list of commands and options} @@ -111,7 +116,6 @@ Copyright 2010 Thomas K\"{o}nig, Alexander Michel, Michael Baumgart \include{TechnicalDetails} - % \part{Examples} \include{FurtherExamples} @@ -124,32 +128,32 @@ Copyright 2010 Thomas K\"{o}nig, Alexander Michel, Michael Baumgart \include{history} % \section{Test Calculations} -% +% % Teste setkeys -% +% % Watch: -% +% % \setkeys*[NumericDataPlot]{Axis}{xO=34, xMin=10} % \setrmkeys[NumericDataPlot]{AxisWait} % \begin{tabular}{ll} % xMin & \NumDataPlotxMin\\ % \textbf{xO:} & \NumDataPlotxO \\ % \end{tabular} -% +% % \setkeys*[NumericDataPlot]{Axis}{xMin=10, xO=34} % \setrmkeys[NumericDataPlot]{AxisWait} % \begin{tabular}{ll} % xMin & \NumDataPlotxMin\\ % \textbf{xO:} & \NumDataPlotxO \\ % \end{tabular} -% +% % \setkeys*[NumericDataPlot]{Axis}{xMin=10} % \setrmkeys[NumericDataPlot]{AxisWait} % \begin{tabular}{ll} % xMin & \NumDataPlotxMin\\ % \textbf{xO:} & \NumDataPlotxO \\ % \end{tabular} -% +% % calculation example: % \setkeys*[NumericDataPlot]{Axis}{xO=34, xMax=20, xMin=10, Dx=2} diff --git a/Master/texmf-dist/doc/latex/numericplots/README.TEXLIVE b/Master/texmf-dist/doc/latex/numericplots/README.TEXLIVE index fc82eb8619a..9ea78720ba6 100644 --- a/Master/texmf-dist/doc/latex/numericplots/README.TEXLIVE +++ b/Master/texmf-dist/doc/latex/numericplots/README.TEXLIVE @@ -1,7 +1,7 @@ The following files have been removed in the TeX Live installation of the current package, typically due to duplication, lack of space, or missing source code. You can find these files on CTAN at - http://mirror.ctan.org/graphics/numericplots + http://mirror.ctan.org/graphics/pstricks/contrib/numericplots If questions or concerns, email tex-live@tug.org. struct2latex.m diff --git a/Master/texmf-dist/doc/latex/numericplots/README.doc b/Master/texmf-dist/doc/latex/numericplots/README.doc index df2bcb942a1..9642772a09e 100644 --- a/Master/texmf-dist/doc/latex/numericplots/README.doc +++ b/Master/texmf-dist/doc/latex/numericplots/README.doc @@ -1,12 +1,12 @@ --------------------------------------------------------------------------- The NumericPlots package --- LaTeX package to plot numeric data using pstricks -Maintained by Thomas König, Alexander Michel, Michael Baumgart +Maintained by Thomas Koenig, Alexander Michel, Michael Baumgart E-mail: NumericPlots@tikey.de Released under the GNU General Public License version 3 or later See <http://www.gnu.org/licenses/> ---------------------------------------------------------------------------- -Copyright 2010 Thomas König, Alexander Michel, Michael Baumgart +Copyright 2010 Thomas Koenig, Alexander Michel, Michael Baumgart Plotting numeric data is a task which often has to be done for scientific papers. In \LaTeX, however, it is only possible to include graphics created with diff --git a/Master/texmf-dist/doc/latex/numericplots/Roll406_Ref2288.tex b/Master/texmf-dist/doc/latex/numericplots/Roll406_Ref2288.tex new file mode 100644 index 00000000000..4a58064d7c0 --- /dev/null +++ b/Master/texmf-dist/doc/latex/numericplots/Roll406_Ref2288.tex @@ -0,0 +1,1759 @@ +% EPLdata written by export2latex +% date: 04-Apr-2011 + +\def\ExpDate{04-Apr-2011} +\def\DataRadiusNewXmin{-2.40} +\def\DataRadiusNewXmax{2.40} +\def\DataRadiusNewYmin{545.57} +\def\DataRadiusNewYmax{545.75} +\def\DataRadiusNewDxV{0.96} +\def\DataRadiusNewDyV{0.03} +\def\DataRadiusNew{ +-2.40000 545.74005 +-2.30000 545.72656 +-2.20000 545.71364 +-2.10000 545.70130 +-2.00000 545.68953 +-1.90000 545.67834 +-1.80000 545.66772 +-1.70000 545.65768 +-1.60000 545.64821 +-1.50000 545.63932 +-1.40000 545.63101 +-1.30000 545.62327 +-1.20000 545.61610 +-1.10000 545.60951 +-1.00000 545.60350 +-0.90000 545.59806 +-0.80000 545.59320 +-0.70000 545.58891 +-0.60000 545.58519 +-0.50000 545.58206 +-0.40000 545.57949 +-0.30000 545.57751 +-0.20000 545.57610 +-0.10000 545.57526 +0.00000 545.57500 +0.10000 545.57531 +0.20000 545.57620 +0.30000 545.57767 +0.40000 545.57971 +0.50000 545.58233 +0.60000 545.58552 +0.70000 545.58928 +0.80000 545.59363 +0.90000 545.59854 +1.00000 545.60404 +1.10000 545.61010 +1.20000 545.61675 +1.30000 545.62397 +1.40000 545.63176 +1.50000 545.64013 +1.60000 545.64907 +1.70000 545.65859 +1.80000 545.66869 +1.90000 545.67936 +2.00000 545.69061 +2.10000 545.70243 +2.20000 545.71482 +2.30000 545.72780 +2.40000 545.74134 +} + +\def\DataRMeasuredXmin{-1.0} +\def\DataRMeasuredXmax{1.0} +\def\DataRMeasuredYmin{-1.0} +\def\DataRMeasuredYmax{1.0} +\def\DataRMeasuredDxV{0.4} +\def\DataRMeasuredDyV{0.4} +\def\DataRMeasured{ +0.00000 545.57500 +0.00000 545.57500 +} + +\def\DataShapeMeasuredXmin{-1.76} +\def\DataShapeMeasuredXmax{1.76} +\def\DataShapeMeasuredYmin{-0.37} +\def\DataShapeMeasuredYmax{-0.26} +\def\DataShapeMeasuredDxV{0.70} +\def\DataShapeMeasuredDyV{0.02} +\def\DataShapeMeasured{ +-1.76000 -0.27350 +-1.75500 -0.27350 +-1.75000 -0.27300 +-1.74500 -0.27150 +-1.74000 -0.27300 +-1.73500 -0.27350 +-1.73000 -0.27400 +-1.72500 -0.27450 +-1.72000 -0.27550 +-1.71500 -0.27550 +-1.71000 -0.27600 +-1.70500 -0.27700 +-1.70000 -0.27800 +-1.69500 -0.27900 +-1.69000 -0.28000 +-1.68500 -0.28050 +-1.68000 -0.28000 +-1.67500 -0.28250 +-1.67000 -0.28200 +-1.66500 -0.28350 +-1.66000 -0.28350 +-1.65500 -0.28350 +-1.65000 -0.28250 +-1.64500 -0.28300 +-1.64000 -0.28350 +-1.63500 -0.28400 +-1.63000 -0.28550 +-1.62500 -0.28550 +-1.62000 -0.28500 +-1.61500 -0.28550 +-1.61000 -0.28750 +-1.60500 -0.28950 +-1.60000 -0.28950 +-1.59500 -0.28950 +-1.59000 -0.29150 +-1.58500 -0.29250 +-1.58000 -0.29250 +-1.57500 -0.29150 +-1.57000 -0.29250 +-1.56500 -0.29250 +-1.56000 -0.29250 +-1.55500 -0.29300 +-1.55000 -0.29250 +-1.54500 -0.29300 +-1.54000 -0.29350 +-1.53500 -0.29350 +-1.53000 -0.29350 +-1.52500 -0.29500 +-1.52000 -0.29650 +-1.51500 -0.29650 +-1.51000 -0.29750 +-1.50500 -0.29750 +-1.50000 -0.29850 +-1.49500 -0.29900 +-1.49000 -0.29950 +-1.48500 -0.29950 +-1.48000 -0.30000 +-1.47500 -0.30000 +-1.47000 -0.30000 +-1.46500 -0.30000 +-1.46000 -0.30050 +-1.45500 -0.30100 +-1.45000 -0.30150 +-1.44500 -0.30200 +-1.44000 -0.30250 +-1.43500 -0.30250 +-1.43000 -0.30500 +-1.42500 -0.30550 +-1.42000 -0.30450 +-1.41500 -0.30550 +-1.41000 -0.30650 +-1.40500 -0.30750 +-1.40000 -0.30750 +-1.39500 -0.30800 +-1.39000 -0.30800 +-1.38500 -0.30750 +-1.38000 -0.30800 +-1.37500 -0.30800 +-1.37000 -0.30750 +-1.36500 -0.30700 +-1.36000 -0.30750 +-1.35500 -0.30850 +-1.35000 -0.30950 +-1.34500 -0.31100 +-1.34000 -0.31250 +-1.33500 -0.31250 +-1.33000 -0.31250 +-1.32500 -0.31250 +-1.32000 -0.31200 +-1.31500 -0.31350 +-1.31000 -0.31350 +-1.30500 -0.31300 +-1.30000 -0.31450 +-1.29500 -0.31400 +-1.29000 -0.31400 +-1.28500 -0.31400 +-1.28000 -0.31500 +-1.27500 -0.31550 +-1.27000 -0.31450 +-1.26500 -0.31500 +-1.26000 -0.31650 +-1.25500 -0.31750 +-1.25000 -0.31800 +-1.24500 -0.31800 +-1.24000 -0.31750 +-1.23500 -0.31850 +-1.23000 -0.32000 +-1.22500 -0.31950 +-1.22000 -0.31850 +-1.21500 -0.31850 +-1.21000 -0.32050 +-1.20500 -0.31950 +-1.20000 -0.32050 +-1.19500 -0.32000 +-1.19000 -0.32050 +-1.18500 -0.32050 +-1.18000 -0.32100 +-1.17500 -0.32100 +-1.17000 -0.32200 +-1.16500 -0.32100 +-1.16000 -0.32100 +-1.15500 -0.32300 +-1.15000 -0.32300 +-1.14500 -0.32400 +-1.14000 -0.32450 +-1.13500 -0.32500 +-1.13000 -0.32500 +-1.12500 -0.32500 +-1.12000 -0.32600 +-1.11500 -0.32500 +-1.11000 -0.32600 +-1.10500 -0.32650 +-1.10000 -0.32700 +-1.09500 -0.32700 +-1.09000 -0.32700 +-1.08500 -0.32650 +-1.08000 -0.32850 +-1.07500 -0.32950 +-1.07000 -0.32750 +-1.06500 -0.32750 +-1.06000 -0.32900 +-1.05500 -0.33150 +-1.05000 -0.33050 +-1.04500 -0.33000 +-1.04000 -0.32850 +-1.03500 -0.32900 +-1.03000 -0.33000 +-1.02500 -0.32950 +-1.02000 -0.33050 +-1.01500 -0.33050 +-1.01000 -0.33100 +-1.00500 -0.33150 +-1.00000 -0.33200 +-0.99500 -0.33250 +-0.99000 -0.33450 +-0.98500 -0.33400 +-0.98000 -0.33350 +-0.97500 -0.33300 +-0.97000 -0.33450 +-0.96500 -0.33550 +-0.96000 -0.33450 +-0.95500 -0.33450 +-0.95000 -0.33400 +-0.94500 -0.33400 +-0.94000 -0.33350 +-0.93500 -0.33500 +-0.93000 -0.33450 +-0.92500 -0.33600 +-0.92000 -0.33650 +-0.91500 -0.33650 +-0.91000 -0.33650 +-0.90500 -0.33800 +-0.90000 -0.33900 +-0.89500 -0.33850 +-0.89000 -0.33750 +-0.88500 -0.33750 +-0.88000 -0.33950 +-0.87500 -0.33950 +-0.87000 -0.33800 +-0.86500 -0.33800 +-0.86000 -0.33850 +-0.85500 -0.33800 +-0.85000 -0.33800 +-0.84500 -0.33900 +-0.84000 -0.33950 +-0.83500 -0.34050 +-0.83000 -0.34000 +-0.82500 -0.34050 +-0.82000 -0.34100 +-0.81500 -0.34200 +-0.81000 -0.34300 +-0.80500 -0.34150 +-0.80000 -0.34100 +-0.79500 -0.34300 +-0.79000 -0.34250 +-0.78500 -0.34150 +-0.78000 -0.34200 +-0.77500 -0.34050 +-0.77000 -0.34100 +-0.76500 -0.34100 +-0.76000 -0.34150 +-0.75500 -0.34350 +-0.75000 -0.34100 +-0.74500 -0.34350 +-0.74000 -0.34450 +-0.73500 -0.34450 +-0.73000 -0.34550 +-0.72500 -0.34600 +-0.72000 -0.34600 +-0.71500 -0.34500 +-0.71000 -0.34550 +-0.70500 -0.34600 +-0.70000 -0.34650 +-0.69500 -0.34450 +-0.69000 -0.34500 +-0.68500 -0.34350 +-0.68000 -0.34500 +-0.67500 -0.34450 +-0.67000 -0.34550 +-0.66500 -0.34600 +-0.66000 -0.34500 +-0.65500 -0.34550 +-0.65000 -0.34650 +-0.64500 -0.34750 +-0.64000 -0.34900 +-0.63500 -0.34800 +-0.63000 -0.34800 +-0.62500 -0.34850 +-0.62000 -0.34800 +-0.61500 -0.35100 +-0.61000 -0.34850 +-0.60500 -0.34800 +-0.60000 -0.34850 +-0.59500 -0.34750 +-0.59000 -0.34800 +-0.58500 -0.34700 +-0.58000 -0.34850 +-0.57500 -0.34950 +-0.57000 -0.34800 +-0.56500 -0.34850 +-0.56000 -0.35000 +-0.55500 -0.35050 +-0.55000 -0.35150 +-0.54500 -0.35200 +-0.54000 -0.35050 +-0.53500 -0.35200 +-0.53000 -0.35200 +-0.52500 -0.35250 +-0.52000 -0.35150 +-0.51500 -0.35100 +-0.51000 -0.35100 +-0.50500 -0.35100 +-0.50000 -0.35200 +-0.49500 -0.35150 +-0.49000 -0.35150 +-0.48500 -0.35100 +-0.48000 -0.35300 +-0.47500 -0.35200 +-0.47000 -0.35350 +-0.46500 -0.35400 +-0.46000 -0.35500 +-0.45500 -0.35500 +-0.45000 -0.35400 +-0.44500 -0.35550 +-0.44000 -0.35600 +-0.43500 -0.35500 +-0.43000 -0.35400 +-0.42500 -0.35500 +-0.42000 -0.35550 +-0.41500 -0.35500 +-0.41000 -0.35400 +-0.40500 -0.35400 +-0.40000 -0.35500 +-0.39500 -0.35450 +-0.39000 -0.35600 +-0.38500 -0.35600 +-0.38000 -0.35700 +-0.37500 -0.35850 +-0.37000 -0.35650 +-0.36500 -0.35550 +-0.36000 -0.35700 +-0.35500 -0.35850 +-0.35000 -0.35800 +-0.34500 -0.35750 +-0.34000 -0.35650 +-0.33500 -0.35650 +-0.33000 -0.35600 +-0.32500 -0.35550 +-0.32000 -0.35600 +-0.31500 -0.35700 +-0.31000 -0.35650 +-0.30500 -0.35800 +-0.30000 -0.35750 +-0.29500 -0.35800 +-0.29000 -0.35900 +-0.28500 -0.36000 +-0.28000 -0.35850 +-0.27500 -0.35750 +-0.27000 -0.35950 +-0.26500 -0.36050 +-0.26000 -0.36000 +-0.25500 -0.35700 +-0.25000 -0.35850 +-0.24500 -0.35850 +-0.24000 -0.35900 +-0.23500 -0.35900 +-0.23000 -0.35950 +-0.22500 -0.35950 +-0.22000 -0.35850 +-0.21500 -0.35900 +-0.21000 -0.35900 +-0.20500 -0.36050 +-0.20000 -0.36100 +-0.19500 -0.36150 +-0.19000 -0.35950 +-0.18500 -0.35950 +-0.18000 -0.36150 +-0.17500 -0.36100 +-0.17000 -0.36200 +-0.16500 -0.35950 +-0.16000 -0.36050 +-0.15500 -0.36000 +-0.15000 -0.36050 +-0.14500 -0.36000 +-0.14000 -0.36050 +-0.13500 -0.36050 +-0.13000 -0.35950 +-0.12500 -0.36050 +-0.12000 -0.36100 +-0.11500 -0.36200 +-0.11000 -0.36100 +-0.10500 -0.36200 +-0.10000 -0.36250 +-0.09500 -0.36250 +-0.09000 -0.36300 +-0.08500 -0.36350 +-0.08000 -0.36200 +-0.07500 -0.36150 +-0.07000 -0.36200 +-0.06500 -0.36200 +-0.06000 -0.36200 +-0.05500 -0.36150 +-0.05000 -0.36200 +-0.04500 -0.36150 +-0.04000 -0.36150 +-0.03500 -0.36150 +-0.03000 -0.36100 +-0.02500 -0.36300 +-0.02000 -0.36250 +-0.01500 -0.36250 +-0.01000 -0.36150 +-0.00500 -0.36350 +0.00000 -0.36400 +0.00500 -0.36250 +0.01000 -0.36250 +0.01500 -0.36250 +0.02000 -0.36250 +0.02500 -0.36200 +0.03000 -0.36250 +0.03500 -0.36200 +0.04000 -0.36150 +0.04500 -0.36150 +0.05000 -0.36100 +0.05500 -0.36150 +0.06000 -0.36250 +0.06500 -0.36300 +0.07000 -0.36200 +0.07500 -0.36200 +0.08000 -0.36250 +0.08500 -0.36400 +0.09000 -0.36250 +0.09500 -0.36250 +0.10000 -0.36150 +0.10500 -0.36200 +0.11000 -0.36150 +0.11500 -0.36200 +0.12000 -0.36050 +0.12500 -0.36100 +0.13000 -0.36150 +0.13500 -0.36150 +0.14000 -0.36100 +0.14500 -0.36050 +0.15000 -0.36200 +0.15500 -0.36300 +0.16000 -0.36150 +0.16500 -0.36200 +0.17000 -0.36200 +0.17500 -0.36250 +0.18000 -0.36150 +0.18500 -0.36050 +0.19000 -0.36050 +0.19500 -0.36000 +0.20000 -0.36000 +0.20500 -0.35950 +0.21000 -0.36000 +0.21500 -0.36000 +0.22000 -0.36100 +0.22500 -0.36000 +0.23000 -0.36000 +0.23500 -0.36100 +0.24000 -0.36000 +0.24500 -0.36100 +0.25000 -0.36050 +0.25500 -0.36050 +0.26000 -0.36000 +0.26500 -0.36150 +0.27000 -0.36000 +0.27500 -0.36050 +0.28000 -0.35900 +0.28500 -0.35800 +0.29000 -0.35850 +0.29500 -0.35850 +0.30000 -0.35800 +0.30500 -0.35750 +0.31000 -0.35850 +0.31500 -0.35750 +0.32000 -0.35900 +0.32500 -0.35900 +0.33000 -0.35900 +0.33500 -0.35900 +0.34000 -0.35900 +0.34500 -0.35900 +0.35000 -0.35900 +0.35500 -0.35850 +0.36000 -0.35750 +0.36500 -0.35700 +0.37000 -0.35750 +0.37500 -0.35750 +0.38000 -0.35750 +0.38500 -0.35650 +0.39000 -0.35650 +0.39500 -0.35600 +0.40000 -0.35600 +0.40500 -0.35650 +0.41000 -0.35700 +0.41500 -0.35800 +0.42000 -0.35650 +0.42500 -0.35650 +0.43000 -0.35600 +0.43500 -0.35500 +0.44000 -0.35600 +0.44500 -0.35600 +0.45000 -0.35550 +0.45500 -0.35450 +0.46000 -0.35450 +0.46500 -0.35350 +0.47000 -0.35300 +0.47500 -0.35350 +0.48000 -0.35250 +0.48500 -0.35300 +0.49000 -0.35350 +0.49500 -0.35350 +0.50000 -0.35400 +0.50500 -0.35400 +0.51000 -0.35250 +0.51500 -0.35250 +0.52000 -0.35350 +0.52500 -0.35450 +0.53000 -0.35350 +0.53500 -0.35200 +0.54000 -0.35200 +0.54500 -0.35200 +0.55000 -0.35100 +0.55500 -0.35000 +0.56000 -0.34950 +0.56500 -0.35000 +0.57000 -0.35050 +0.57500 -0.34900 +0.58000 -0.35000 +0.58500 -0.35200 +0.59000 -0.35150 +0.59500 -0.35100 +0.60000 -0.35050 +0.60500 -0.35000 +0.61000 -0.34950 +0.61500 -0.35000 +0.62000 -0.35000 +0.62500 -0.34850 +0.63000 -0.34900 +0.63500 -0.34850 +0.64000 -0.34800 +0.64500 -0.34800 +0.65000 -0.34700 +0.65500 -0.34650 +0.66000 -0.34650 +0.66500 -0.34650 +0.67000 -0.34800 +0.67500 -0.34850 +0.68000 -0.34850 +0.68500 -0.34850 +0.69000 -0.34700 +0.69500 -0.34600 +0.70000 -0.34650 +0.70500 -0.34650 +0.71000 -0.34600 +0.71500 -0.34550 +0.72000 -0.34400 +0.72500 -0.34450 +0.73000 -0.34400 +0.73500 -0.34400 +0.74000 -0.34400 +0.74500 -0.34400 +0.75000 -0.34400 +0.75500 -0.34400 +0.76000 -0.34250 +0.76500 -0.34450 +0.77000 -0.34400 +0.77500 -0.34400 +0.78000 -0.34400 +0.78500 -0.34300 +0.79000 -0.34200 +0.79500 -0.34300 +0.80000 -0.34150 +0.80500 -0.34150 +0.81000 -0.34100 +0.81500 -0.33900 +0.82000 -0.34050 +0.82500 -0.34050 +0.83000 -0.34000 +0.83500 -0.34000 +0.84000 -0.34000 +0.84500 -0.33850 +0.85000 -0.34050 +0.85500 -0.34050 +0.86000 -0.34000 +0.86500 -0.34000 +0.87000 -0.34100 +0.87500 -0.33850 +0.88000 -0.33950 +0.88500 -0.33850 +0.89000 -0.33700 +0.89500 -0.33700 +0.90000 -0.33750 +0.90500 -0.33650 +0.91000 -0.33600 +0.91500 -0.33650 +0.92000 -0.33550 +0.92500 -0.33500 +0.93000 -0.33500 +0.93500 -0.33450 +0.94000 -0.33550 +0.94500 -0.33450 +0.95000 -0.33450 +0.95500 -0.33450 +0.96000 -0.33600 +0.96500 -0.33450 +0.97000 -0.33450 +0.97500 -0.33450 +0.98000 -0.33400 +0.98500 -0.33350 +0.99000 -0.33250 +0.99500 -0.33200 +1.00000 -0.33250 +1.00500 -0.33150 +1.01000 -0.33100 +1.01500 -0.33100 +1.02000 -0.33000 +1.02500 -0.33200 +1.03000 -0.33150 +1.03500 -0.33200 +1.04000 -0.33200 +1.04500 -0.33150 +1.05000 -0.33050 +1.05500 -0.33000 +1.06000 -0.33100 +1.06500 -0.33000 +1.07000 -0.32850 +1.07500 -0.32800 +1.08000 -0.32800 +1.08500 -0.32700 +1.09000 -0.32700 +1.09500 -0.32600 +1.10000 -0.32650 +1.10500 -0.32600 +1.11000 -0.32650 +1.11500 -0.32650 +1.12000 -0.32600 +1.12500 -0.32500 +1.13000 -0.32600 +1.13500 -0.32700 +1.14000 -0.32550 +1.14500 -0.32550 +1.15000 -0.32550 +1.15500 -0.32450 +1.16000 -0.32300 +1.16500 -0.32250 +1.17000 -0.32250 +1.17500 -0.32200 +1.18000 -0.32100 +1.18500 -0.32100 +1.19000 -0.32050 +1.19500 -0.32100 +1.20000 -0.32150 +1.20500 -0.32100 +1.21000 -0.32050 +1.21500 -0.32150 +1.22000 -0.32100 +1.22500 -0.32100 +1.23000 -0.31950 +1.23500 -0.32000 +1.24000 -0.31950 +1.24500 -0.31950 +1.25000 -0.31800 +1.25500 -0.31800 +1.26000 -0.31650 +1.26500 -0.31550 +1.27000 -0.31550 +1.27500 -0.31550 +1.28000 -0.31500 +1.28500 -0.31500 +1.29000 -0.31450 +1.29500 -0.31450 +1.30000 -0.31500 +1.30500 -0.31500 +1.31000 -0.31450 +1.31500 -0.31400 +1.32000 -0.31350 +1.32500 -0.31200 +1.33000 -0.31150 +1.33500 -0.31250 +1.34000 -0.31050 +1.34500 -0.31050 +1.35000 -0.31000 +1.35500 -0.30950 +1.36000 -0.30950 +1.36500 -0.30850 +1.37000 -0.30850 +1.37500 -0.30800 +1.38000 -0.30750 +1.38500 -0.30700 +1.39000 -0.30750 +1.39500 -0.30700 +1.40000 -0.30500 +1.40500 -0.30550 +1.41000 -0.30550 +1.41500 -0.30600 +1.42000 -0.30500 +1.42500 -0.30350 +1.43000 -0.30350 +1.43500 -0.30250 +1.44000 -0.30150 +1.44500 -0.30250 +1.45000 -0.30150 +1.45500 -0.30200 +1.46000 -0.30000 +1.46500 -0.29950 +1.47000 -0.30000 +1.47500 -0.29900 +1.48000 -0.30000 +1.48500 -0.29900 +1.49000 -0.29750 +1.49500 -0.29650 +1.50000 -0.29650 +1.50500 -0.29650 +1.51000 -0.29500 +1.51500 -0.29400 +1.52000 -0.29450 +1.52500 -0.29350 +1.53000 -0.29300 +1.53500 -0.29300 +1.54000 -0.29250 +1.54500 -0.29300 +1.55000 -0.29300 +1.55500 -0.29100 +1.56000 -0.28950 +1.56500 -0.29000 +1.57000 -0.29000 +1.57500 -0.28950 +1.58000 -0.28800 +1.58500 -0.28700 +1.59000 -0.28750 +1.59500 -0.28700 +1.60000 -0.28550 +1.60500 -0.28400 +1.61000 -0.28350 +1.61500 -0.28450 +1.62000 -0.28400 +1.62500 -0.28300 +1.63000 -0.28300 +1.63500 -0.28200 +1.64000 -0.28100 +1.64500 -0.28050 +1.65000 -0.28050 +1.65500 -0.28000 +1.66000 -0.27900 +1.66500 -0.27800 +1.67000 -0.27700 +1.67500 -0.27600 +1.68000 -0.27650 +1.68500 -0.27500 +1.69000 -0.27350 +1.69500 -0.27350 +1.70000 -0.27350 +1.70500 -0.27150 +1.71000 -0.27100 +1.71500 -0.27100 +1.72000 -0.27050 +1.72500 -0.27000 +1.73000 -0.27000 +1.73500 -0.26850 +1.74000 -0.26850 +1.74500 -0.26850 +1.75000 -0.26700 +1.75500 -0.26450 +1.76000 -0.26450 +} + +\def\DataShapeFittedXmin{-2.40} +\def\DataShapeFittedXmax{2.40} +\def\DataShapeFittedYmin{-0.37} +\def\DataShapeFittedYmax{-0.19} +\def\DataShapeFittedDxV{0.96} +\def\DataShapeFittedDyV{0.03} +\def\DataShapeFitted{ +-2.40000 -0.19595 +-2.30000 -0.20945 +-2.20000 -0.22237 +-2.10000 -0.23471 +-2.00000 -0.24648 +-1.90000 -0.25767 +-1.80000 -0.26828 +-1.70000 -0.27833 +-1.60000 -0.28779 +-1.50000 -0.29668 +-1.40000 -0.30500 +-1.30000 -0.31274 +-1.20000 -0.31990 +-1.10000 -0.32649 +-1.00000 -0.33251 +-0.90000 -0.33795 +-0.80000 -0.34281 +-0.70000 -0.34710 +-0.60000 -0.35081 +-0.50000 -0.35395 +-0.40000 -0.35651 +-0.30000 -0.35850 +-0.20000 -0.35991 +-0.10000 -0.36074 +0.00000 -0.36100 +0.10000 -0.36069 +0.20000 -0.35980 +0.30000 -0.35833 +0.40000 -0.35629 +0.50000 -0.35368 +0.60000 -0.35049 +0.70000 -0.34672 +0.80000 -0.34238 +0.90000 -0.33746 +1.00000 -0.33197 +1.10000 -0.32590 +1.20000 -0.31926 +1.30000 -0.31204 +1.40000 -0.30424 +1.50000 -0.29587 +1.60000 -0.28693 +1.70000 -0.27741 +1.80000 -0.26732 +1.90000 -0.25664 +2.00000 -0.24540 +2.10000 -0.23358 +2.20000 -0.22118 +2.30000 -0.20821 +2.40000 -0.19466 +} + +\def\DataRadiusXmin{-2.40} +\def\DataRadiusXmax{2.40} +\def\DataRadiusYmin{545.29} +\def\DataRadiusYmax{545.75} +\def\DataRadiusDxV{0.96} +\def\DataRadiusDyV{0.09} +\def\DataRadius{ +-2.40000 545.74005 +-2.30000 545.72656 +-2.20000 545.71364 +-2.10000 545.70130 +-2.00000 545.68953 +-1.90000 545.67834 +-1.80000 545.55480 +-1.70000 545.47646 +-1.60000 545.45875 +-1.50000 545.44509 +-1.40000 545.43527 +-1.30000 545.42238 +-1.20000 545.37810 +-1.10000 545.35977 +-1.00000 545.34183 +-0.90000 545.33194 +-0.80000 545.31895 +-0.70000 545.31302 +-0.60000 545.30891 +-0.50000 545.30577 +-0.40000 545.30321 +-0.30000 545.30123 +-0.20000 545.29981 +-0.10000 545.29898 +0.00000 545.29872 +0.10000 545.29903 +0.20000 545.29992 +0.30000 545.30139 +0.40000 545.30343 +0.50000 545.30604 +0.60000 545.30924 +0.70000 545.31340 +0.80000 545.31938 +0.90000 545.33243 +1.00000 545.34236 +1.10000 545.36036 +1.20000 545.37874 +1.30000 545.42308 +1.40000 545.43602 +1.50000 545.44589 +1.60000 545.45961 +1.70000 545.47737 +1.80000 545.55576 +1.90000 545.67936 +2.00000 545.69061 +2.10000 545.70243 +2.20000 545.71482 +2.30000 545.72780 +2.40000 545.74134 +} + +\def\DataWearXmin{-2.40} +\def\DataWearXmax{2.40} +\def\DataWearYmin{-0.28} +\def\DataWearYmax{0.00} +\def\DataWearDxV{0.96} +\def\DataWearDyV{0.06} +\def\DataWear{ +-2.40000 0.00000 +-2.30000 0.00000 +-2.20000 0.00000 +-2.10000 0.00000 +-2.00000 0.00000 +-1.90000 0.00000 +-1.80000 -0.11292 +-1.70000 -0.18122 +-1.60000 -0.18946 +-1.50000 -0.19423 +-1.40000 -0.19574 +-1.30000 -0.20088 +-1.20000 -0.23800 +-1.10000 -0.24974 +-1.00000 -0.26167 +-0.90000 -0.26612 +-0.80000 -0.27425 +-0.70000 -0.27589 +-0.60000 -0.27628 +-0.50000 -0.27628 +-0.40000 -0.27628 +-0.30000 -0.27628 +-0.20000 -0.27628 +-0.10000 -0.27628 +0.00000 -0.27628 +0.10000 -0.27628 +0.20000 -0.27628 +0.30000 -0.27628 +0.40000 -0.27628 +0.50000 -0.27628 +0.60000 -0.27628 +0.70000 -0.27589 +0.80000 -0.27425 +0.90000 -0.26612 +1.00000 -0.26167 +1.10000 -0.24974 +1.20000 -0.23800 +1.30000 -0.20088 +1.40000 -0.19574 +1.50000 -0.19423 +1.60000 -0.18946 +1.70000 -0.18122 +1.80000 -0.11292 +1.90000 0.00000 +2.00000 0.00000 +2.10000 0.00000 +2.20000 0.00000 +2.30000 0.00000 +2.40000 0.00000 +} + +\def\DataRadiusUsedXmin{-1.77} +\def\DataRadiusUsedXmax{1.77} +\def\DataRadiusUsedYmin{545.21} +\def\DataRadiusUsedYmax{545.50} +\def\DataRadiusUsedDxV{0.71} +\def\DataRadiusUsedDyV{0.06} +\def\DataRadiusUsed{ +-1.77000 545.48417 +-1.76500 545.48317 +-1.76000 545.48317 +-1.75500 545.48267 +-1.75000 545.48117 +-1.74500 545.47967 +-1.74000 545.47717 +-1.73500 545.47617 +-1.73000 545.47417 +-1.72500 545.47167 +-1.72000 545.47067 +-1.71500 545.46867 +-1.71000 545.46767 +-1.70500 545.46717 +-1.70000 545.46667 +-1.69500 545.46567 +-1.69000 545.46367 +-1.68500 545.46267 +-1.68000 545.46267 +-1.67500 545.46067 +-1.67000 545.45917 +-1.66500 545.45717 +-1.66000 545.45617 +-1.65500 545.45367 +-1.65000 545.45167 +-1.64500 545.44867 +-1.64000 545.44767 +-1.63500 545.44517 +-1.63000 545.44217 +-1.62500 545.43917 +-1.62000 545.43717 +-1.61500 545.43317 +-1.61000 545.42967 +-1.60500 545.42517 +-1.60000 545.42117 +-1.59500 545.41667 +-1.59000 545.41217 +-1.58500 545.40767 +-1.58000 545.40367 +-1.57500 545.40017 +-1.57000 545.39717 +-1.56500 545.39467 +-1.56000 545.39117 +-1.55500 545.38767 +-1.55000 545.38617 +-1.54500 545.38317 +-1.54000 545.38117 +-1.53500 545.38117 +-1.53000 545.37917 +-1.52500 545.37817 +-1.52000 545.37517 +-1.51500 545.37367 +-1.51000 545.37217 +-1.50500 545.36967 +-1.50000 545.36917 +-1.49500 545.36817 +-1.49000 545.36567 +-1.48500 545.36517 +-1.48000 545.36267 +-1.47500 545.36267 +-1.47000 545.36017 +-1.46500 545.35917 +-1.46000 545.35917 +-1.45500 545.35667 +-1.45000 545.35567 +-1.44500 545.35567 +-1.44000 545.35417 +-1.43500 545.35517 +-1.43000 545.35417 +-1.42500 545.35167 +-1.42000 545.35117 +-1.41500 545.34967 +-1.41000 545.34867 +-1.40500 545.34867 +-1.40000 545.34817 +-1.39500 545.34567 +-1.39000 545.34567 +-1.38500 545.34367 +-1.38000 545.34267 +-1.37500 545.34217 +-1.37000 545.34217 +-1.36500 545.34017 +-1.36000 545.33817 +-1.35500 545.33717 +-1.35000 545.33467 +-1.34500 545.33167 +-1.34000 545.32867 +-1.33500 545.32667 +-1.33000 545.32517 +-1.32500 545.32167 +-1.32000 545.31917 +-1.31500 545.31667 +-1.31000 545.31567 +-1.30500 545.31067 +-1.30000 545.30867 +-1.29500 545.30567 +-1.29000 545.30367 +-1.28500 545.30267 +-1.28000 545.29817 +-1.27500 545.29467 +-1.27000 545.29267 +-1.26500 545.29217 +-1.26000 545.29117 +-1.25500 545.29017 +-1.25000 545.28817 +-1.24500 545.28817 +-1.24000 545.28567 +-1.23500 545.28367 +-1.23000 545.28317 +-1.22500 545.28267 +-1.22000 545.28117 +-1.21500 545.27867 +-1.21000 545.27617 +-1.20500 545.27667 +-1.20000 545.27567 +-1.19500 545.27267 +-1.19000 545.27117 +-1.18500 545.27117 +-1.18000 545.27067 +-1.17500 545.27067 +-1.17000 545.27017 +-1.16500 545.26867 +-1.16000 545.26817 +-1.15500 545.26717 +-1.15000 545.26867 +-1.14500 545.26867 +-1.14000 545.26567 +-1.13500 545.26417 +-1.13000 545.26417 +-1.12500 545.26217 +-1.12000 545.26267 +-1.11500 545.26117 +-1.11000 545.26067 +-1.10500 545.26017 +-1.10000 545.25867 +-1.09500 545.25717 +-1.09000 545.25717 +-1.08500 545.25767 +-1.08000 545.25617 +-1.07500 545.25517 +-1.07000 545.25417 +-1.06500 545.25367 +-1.06000 545.25517 +-1.05500 545.25517 +-1.05000 545.25217 +-1.04500 545.25017 +-1.04000 545.24867 +-1.03500 545.24917 +-1.03000 545.24717 +-1.02500 545.24667 +-1.02000 545.24617 +-1.01500 545.24267 +-1.01000 545.24217 +-1.00500 545.24017 +-1.00000 545.23917 +-0.99500 545.23817 +-0.99000 545.23667 +-0.98500 545.23617 +-0.98000 545.23717 +-0.97500 545.23617 +-0.97000 545.23817 +-0.96500 545.23617 +-0.96000 545.23617 +-0.95500 545.23467 +-0.95000 545.23167 +-0.94500 545.23067 +-0.94000 545.23017 +-0.93500 545.23067 +-0.93000 545.23167 +-0.92500 545.23067 +-0.92000 545.23167 +-0.91500 545.23067 +-0.91000 545.23017 +-0.90500 545.22967 +-0.90000 545.22917 +-0.89500 545.22917 +-0.89000 545.23017 +-0.88500 545.22867 +-0.88000 545.22867 +-0.87500 545.22817 +-0.87000 545.22767 +-0.86500 545.22917 +-0.86000 545.22867 +-0.85500 545.22867 +-0.85000 545.22817 +-0.84500 545.22767 +-0.84000 545.22917 +-0.83500 545.22717 +-0.83000 545.22817 +-0.82500 545.22717 +-0.82000 545.22617 +-0.81500 545.22667 +-0.81000 545.22717 +-0.80500 545.22667 +-0.80000 545.22717 +-0.79500 545.22867 +-0.79000 545.22717 +-0.78500 545.22367 +-0.78000 545.22217 +-0.77500 545.22167 +-0.77000 545.22267 +-0.76500 545.22467 +-0.76000 545.22717 +-0.75500 545.22767 +-0.75000 545.22817 +-0.74500 545.22967 +-0.74000 545.22967 +-0.73500 545.22917 +-0.73000 545.23017 +-0.72500 545.22917 +-0.72000 545.22717 +-0.71500 545.22617 +-0.71000 545.22667 +-0.70500 545.22667 +-0.70000 545.22817 +-0.69500 545.22667 +-0.69000 545.22617 +-0.68500 545.22667 +-0.68000 545.22667 +-0.67500 545.22817 +-0.67000 545.22567 +-0.66500 545.22567 +-0.66000 545.22717 +-0.65500 545.22767 +-0.65000 545.22617 +-0.64500 545.22667 +-0.64000 545.22617 +-0.63500 545.22617 +-0.63000 545.22617 +-0.62500 545.22467 +-0.62000 545.22517 +-0.61500 545.22567 +-0.61000 545.22667 +-0.60500 545.22667 +-0.60000 545.22517 +-0.59500 545.22617 +-0.59000 545.22817 +-0.58500 545.22967 +-0.58000 545.23067 +-0.57500 545.22867 +-0.57000 545.22817 +-0.56500 545.22817 +-0.56000 545.22817 +-0.55500 545.22767 +-0.55000 545.22767 +-0.54500 545.22967 +-0.54000 545.22967 +-0.53500 545.22967 +-0.53000 545.22917 +-0.52500 545.23017 +-0.52000 545.23117 +-0.51500 545.23017 +-0.51000 545.23017 +-0.50500 545.22917 +-0.50000 545.22867 +-0.49500 545.22917 +-0.49000 545.22917 +-0.48500 545.22917 +-0.48000 545.22917 +-0.47500 545.23017 +-0.47000 545.22917 +-0.46500 545.22967 +-0.46000 545.22917 +-0.45500 545.22817 +-0.45000 545.22867 +-0.44500 545.22767 +-0.44000 545.22767 +-0.43500 545.22567 +-0.43000 545.22517 +-0.42500 545.22617 +-0.42000 545.22767 +-0.41500 545.23067 +-0.41000 545.23017 +-0.40500 545.22867 +-0.40000 545.22867 +-0.39500 545.22767 +-0.39000 545.22817 +-0.38500 545.22817 +-0.38000 545.22717 +-0.37500 545.22567 +-0.37000 545.22417 +-0.36500 545.22367 +-0.36000 545.22367 +-0.35500 545.22617 +-0.35000 545.22667 +-0.34500 545.22617 +-0.34000 545.22617 +-0.33500 545.22517 +-0.33000 545.22367 +-0.32500 545.22417 +-0.32000 545.22417 +-0.31500 545.22367 +-0.31000 545.22417 +-0.30500 545.22367 +-0.30000 545.22417 +-0.29500 545.22517 +-0.29000 545.22317 +-0.28500 545.22267 +-0.28000 545.22517 +-0.27500 545.22467 +-0.27000 545.22667 +-0.26500 545.22517 +-0.26000 545.22467 +-0.25500 545.22317 +-0.25000 545.22217 +-0.24500 545.22167 +-0.24000 545.22367 +-0.23500 545.22517 +-0.23000 545.22517 +-0.22500 545.22267 +-0.22000 545.22117 +-0.21500 545.22117 +-0.21000 545.22267 +-0.20500 545.22467 +-0.20000 545.22617 +-0.19500 545.22667 +-0.19000 545.22667 +-0.18500 545.22817 +-0.18000 545.22817 +-0.17500 545.22717 +-0.17000 545.22617 +-0.16500 545.22517 +-0.16000 545.22417 +-0.15500 545.22417 +-0.15000 545.22317 +-0.14500 545.22467 +-0.14000 545.22317 +-0.13500 545.22117 +-0.13000 545.22167 +-0.12500 545.22417 +-0.12000 545.22217 +-0.11500 545.22217 +-0.11000 545.22167 +-0.10500 545.22167 +-0.10000 545.21967 +-0.09500 545.21967 +-0.09000 545.21917 +-0.08500 545.21967 +-0.08000 545.21817 +-0.07500 545.21917 +-0.07000 545.21967 +-0.06500 545.22067 +-0.06000 545.22067 +-0.05500 545.22117 +-0.05000 545.22367 +-0.04500 545.22367 +-0.04000 545.22317 +-0.03500 545.22317 +-0.03000 545.22417 +-0.02500 545.22317 +-0.02000 545.22317 +-0.01500 545.22167 +-0.01000 545.22167 +-0.00500 545.22017 +0.00000 545.22017 +0.00500 545.21967 +0.01000 545.22067 +0.01500 545.21967 +0.02000 545.21967 +0.02500 545.22117 +0.03000 545.21917 +0.03500 545.21867 +0.04000 545.21867 +0.04500 545.22017 +0.05000 545.22017 +0.05500 545.22167 +0.06000 545.22067 +0.06500 545.22017 +0.07000 545.21967 +0.07500 545.21967 +0.08000 545.22067 +0.08500 545.22117 +0.09000 545.22067 +0.09500 545.22217 +0.10000 545.22067 +0.10500 545.21817 +0.11000 545.21917 +0.11500 545.21867 +0.12000 545.21867 +0.12500 545.21717 +0.13000 545.21867 +0.13500 545.21917 +0.14000 545.22067 +0.14500 545.22267 +0.15000 545.22367 +0.15500 545.22417 +0.16000 545.22267 +0.16500 545.22217 +0.17000 545.22367 +0.17500 545.22267 +0.18000 545.22517 +0.18500 545.22717 +0.19000 545.22617 +0.19500 545.22717 +0.20000 545.22667 +0.20500 545.22717 +0.21000 545.22667 +0.21500 545.22717 +0.22000 545.22767 +0.22500 545.22667 +0.23000 545.22617 +0.23500 545.22667 +0.24000 545.22467 +0.24500 545.22367 +0.25000 545.22417 +0.25500 545.22317 +0.26000 545.22417 +0.26500 545.22367 +0.27000 545.22467 +0.27500 545.22267 +0.28000 545.22317 +0.28500 545.22217 +0.29000 545.22467 +0.29500 545.22717 +0.30000 545.22717 +0.30500 545.22817 +0.31000 545.22717 +0.31500 545.22767 +0.32000 545.22767 +0.32500 545.22817 +0.33000 545.22817 +0.33500 545.22717 +0.34000 545.22717 +0.34500 545.22667 +0.35000 545.22817 +0.35500 545.22667 +0.36000 545.22617 +0.36500 545.22717 +0.37000 545.22617 +0.37500 545.22767 +0.38000 545.22867 +0.38500 545.22767 +0.39000 545.22817 +0.39500 545.22867 +0.40000 545.22867 +0.40500 545.22967 +0.41000 545.22817 +0.41500 545.22867 +0.42000 545.22867 +0.42500 545.22967 +0.43000 545.22867 +0.43500 545.22867 +0.44000 545.23017 +0.44500 545.22817 +0.45000 545.22667 +0.45500 545.22517 +0.46000 545.22667 +0.46500 545.22767 +0.47000 545.22817 +0.47500 545.22917 +0.48000 545.22967 +0.48500 545.22967 +0.49000 545.22917 +0.49500 545.22817 +0.50000 545.23017 +0.50500 545.23217 +0.51000 545.23067 +0.51500 545.23017 +0.52000 545.23067 +0.52500 545.22967 +0.53000 545.22867 +0.53500 545.22867 +0.54000 545.22867 +0.54500 545.22867 +0.55000 545.22617 +0.55500 545.22467 +0.56000 545.22367 +0.56500 545.22217 +0.57000 545.22217 +0.57500 545.22167 +0.58000 545.22317 +0.58500 545.22417 +0.59000 545.22567 +0.59500 545.22567 +0.60000 545.22517 +0.60500 545.22517 +0.61000 545.22467 +0.61500 545.22317 +0.62000 545.22367 +0.62500 545.22417 +0.63000 545.22417 +0.63500 545.22367 +0.64000 545.22117 +0.64500 545.22067 +0.65000 545.22067 +0.65500 545.22017 +0.66000 545.22067 +0.66500 545.21917 +0.67000 545.21867 +0.67500 545.21817 +0.68000 545.21667 +0.68500 545.21717 +0.69000 545.21617 +0.69500 545.21417 +0.70000 545.21267 +0.70500 545.21317 +0.71000 545.21267 +0.71500 545.21267 +0.72000 545.21517 +0.72500 545.21717 +0.73000 545.21767 +0.73500 545.21967 +0.74000 545.22317 +0.74500 545.22467 +0.75000 545.22717 +0.75500 545.22717 +0.76000 545.22767 +0.76500 545.22867 +0.77000 545.22967 +0.77500 545.23117 +0.78000 545.23467 +0.78500 545.23667 +0.79000 545.23917 +0.79500 545.24167 +0.80000 545.24267 +0.80500 545.24267 +0.81000 545.24267 +0.81500 545.24317 +0.82000 545.24317 +0.82500 545.24417 +0.83000 545.24567 +0.83500 545.24467 +0.84000 545.24567 +0.84500 545.24517 +0.85000 545.24517 +0.85500 545.24517 +0.86000 545.24667 +0.86500 545.24617 +0.87000 545.24617 +0.87500 545.24667 +0.88000 545.24667 +0.88500 545.24617 +0.89000 545.24567 +0.89500 545.24767 +0.90000 545.24717 +0.90500 545.24567 +0.91000 545.24617 +0.91500 545.24717 +0.92000 545.24717 +0.92500 545.24967 +0.93000 545.25117 +0.93500 545.25117 +0.94000 545.25117 +0.94500 545.25067 +0.95000 545.25167 +0.95500 545.25117 +0.96000 545.25317 +0.96500 545.25317 +0.97000 545.25517 +0.97500 545.25667 +0.98000 545.25517 +0.98500 545.25667 +0.99000 545.25667 +0.99500 545.25817 +1.00000 545.25917 +1.00500 545.25917 +1.01000 545.26017 +1.01500 545.26217 +1.02000 545.26367 +1.02500 545.26367 +1.03000 545.26417 +1.03500 545.26417 +1.04000 545.26467 +1.04500 545.26617 +1.05000 545.26667 +1.05500 545.26567 +1.06000 545.26667 +1.06500 545.26517 +1.07000 545.26217 +1.07500 545.26217 +1.08000 545.26067 +1.08500 545.26217 +1.09000 545.26317 +1.09500 545.26367 +1.10000 545.26317 +1.10500 545.26267 +1.11000 545.26267 +1.11500 545.26417 +1.12000 545.26517 +1.12500 545.26717 +1.13000 545.27017 +1.13500 545.27317 +1.14000 545.27467 +1.14500 545.27717 +1.15000 545.27717 +1.15500 545.27917 +1.16000 545.28017 +1.16500 545.27867 +1.17000 545.28067 +1.17500 545.28117 +1.18000 545.28317 +1.18500 545.28267 +1.19000 545.28117 +1.19500 545.27967 +1.20000 545.28017 +1.20500 545.27867 +1.21000 545.28017 +1.21500 545.28217 +1.22000 545.28517 +1.22500 545.28667 +1.23000 545.28617 +1.23500 545.28617 +1.24000 545.28717 +1.24500 545.28967 +1.25000 545.29317 +1.25500 545.29167 +1.26000 545.29317 +1.26500 545.29367 +1.27000 545.29617 +1.27500 545.29817 +1.28000 545.30117 +1.28500 545.30317 +1.29000 545.30617 +1.29500 545.30617 +1.30000 545.30867 +1.30500 545.31217 +1.31000 545.31617 +1.31500 545.31917 +1.32000 545.32217 +1.32500 545.32267 +1.33000 545.32617 +1.33500 545.32767 +1.34000 545.33117 +1.34500 545.33467 +1.35000 545.33617 +1.35500 545.33867 +1.36000 545.33917 +1.36500 545.34067 +1.37000 545.34267 +1.37500 545.34567 +1.38000 545.34717 +1.38500 545.34867 +1.39000 545.34967 +1.39500 545.35217 +1.40000 545.35317 +1.40500 545.35317 +1.41000 545.35367 +1.41500 545.35467 +1.42000 545.35667 +1.42500 545.35767 +1.43000 545.35917 +1.43500 545.35867 +1.44000 545.35917 +1.44500 545.35917 +1.45000 545.35967 +1.45500 545.36067 +1.46000 545.36167 +1.46500 545.36167 +1.47000 545.36417 +1.47500 545.36467 +1.48000 545.36317 +1.48500 545.36217 +1.49000 545.36067 +1.49500 545.36067 +1.50000 545.36217 +1.50500 545.36567 +1.51000 545.36817 +1.51500 545.37117 +1.52000 545.37217 +1.52500 545.37367 +1.53000 545.37217 +1.53500 545.37017 +1.54000 545.37117 +1.54500 545.37367 +1.55000 545.37867 +1.55500 545.38617 +1.56000 545.39317 +1.56500 545.39717 +1.57000 545.40017 +1.57500 545.40367 +1.58000 545.40867 +1.58500 545.41217 +1.59000 545.41517 +1.59500 545.41867 +1.60000 545.42167 +1.60500 545.42717 +1.61000 545.42867 +1.61500 545.43417 +1.62000 545.43767 +1.62500 545.44167 +1.63000 545.44367 +1.63500 545.44667 +1.64000 545.44917 +1.64500 545.45317 +1.65000 545.45567 +1.65500 545.45917 +1.66000 545.46017 +1.66500 545.46117 +1.67000 545.46367 +1.67500 545.46517 +1.68000 545.46717 +1.68500 545.46917 +1.69000 545.47067 +1.69500 545.47217 +1.70000 545.47367 +1.70500 545.47567 +1.71000 545.47817 +1.71500 545.48017 +1.72000 545.48167 +1.72500 545.48417 +1.73000 545.48567 +1.73500 545.48517 +1.74000 545.48767 +1.74500 545.48917 +1.75000 545.49167 +1.75500 545.49217 +1.76000 545.49267 +1.76500 545.49267 +1.77000 545.49367 +} + +\def\DataRMeasuredUsedXmin{-1.70} +\def\DataRMeasuredUsedXmax{1.70} +\def\DataRMeasuredUsedYmin{545.22} +\def\DataRMeasuredUsedYmax{545.48} +\def\DataRMeasuredUsedDxV{0.68} +\def\DataRMeasuredUsedDyV{0.05} +\def\DataRMeasuredUsed{ +-1.70000 545.47600 +0.00000 545.22250 +1.70000 545.46200 +} + +\def\DataMeasuredWearXmin{-1.70} +\def\DataMeasuredWearXmax{1.70} +\def\DataMeasuredWearYmin{-0.38} +\def\DataMeasuredWearYmax{-0.18} +\def\DataMeasuredWearDxV{0.68} +\def\DataMeasuredWearDyV{0.04} +\def\DataMeasuredWear{ +-1.70000 -0.19101 +-1.60000 -0.22705 +-1.50000 -0.27015 +-1.40000 -0.28284 +-1.30000 -0.31460 +-1.20000 -0.34043 +-1.10000 -0.35084 +-1.00000 -0.36433 +-0.90000 -0.36889 +-0.80000 -0.36603 +-0.70000 -0.36074 +-0.60000 -0.36003 +-0.50000 -0.35339 +-0.40000 -0.35083 +-0.30000 -0.35334 +-0.20000 -0.34993 +-0.10000 -0.35559 +0.00000 -0.35483 +0.10000 -0.35465 +0.20000 -0.34954 +0.30000 -0.35050 +0.40000 -0.35104 +0.50000 -0.35216 +0.60000 -0.36035 +0.70000 -0.37662 +0.80000 -0.35096 +0.90000 -0.35138 +1.00000 -0.34487 +1.10000 -0.34694 +1.20000 -0.33658 +1.30000 -0.31530 +1.40000 -0.27859 +1.50000 -0.27796 +1.60000 -0.22741 +1.70000 -0.18493 +} + +\def\DataGroupDummyXmin{} +\def\DataGroupDummyXmax{} +\def\DataGroupDummyYmin{} +\def\DataGroupDummyYmax{} +\def\DataGroupDummyDxV{1} +\def\DataGroupDummyDyV{} +\def\DataGroupIXmin{-2.4} +\def\DataGroupIXmax{2.4} +\def\DataGroupIYmin{545.2} +\def\DataGroupIYmax{545.8} +\def\DataGroupIDxV{0.7} +\def\DataGroupIDyV{0.1} +\def\DataGroupIIXmin{-2.40} +\def\DataGroupIIXmax{2.40} +\def\DataGroupIIYmin{-0.37} +\def\DataGroupIIYmax{-0.19} +\def\DataGroupIIDxV{0.68} +\def\DataGroupIIDyV{0.03} +\def\DataGroupIIIXmin{-2.40} +\def\DataGroupIIIXmax{2.40} +\def\DataGroupIIIYmin{-0.38} +\def\DataGroupIIIYmax{0.00} +\def\DataGroupIIIDxV{0.68} +\def\DataGroupIIIDyV{0.08} diff --git a/Master/texmf-dist/doc/latex/numericplots/TechnicalDetails.tex b/Master/texmf-dist/doc/latex/numericplots/TechnicalDetails.tex index bfbb7ac84ca..541755312dc 100644 --- a/Master/texmf-dist/doc/latex/numericplots/TechnicalDetails.tex +++ b/Master/texmf-dist/doc/latex/numericplots/TechnicalDetails.tex @@ -1,4 +1,4 @@ -% Copyright 2010 Thomas König, Alexander Michel +% Copyright 2010 Thomas Koenig, Alexander Michel % % This file is part of NumericPlots. % @@ -15,10 +15,14 @@ % You should have received a copy of the GNU General Public License % along with NumericPlots. If not, see <http://www.gnu.org/licenses/>. -\section{Technical Details} +\section{Details} + + + +\subsection{Coordinate Systems} This section should just give some hints how to use the different coordinate -system. +systems. A new plot is created with the environment \texttt{NumericDataPlot}. The options are illustrated in the following example. @@ -46,6 +50,7 @@ A new plot is created with the environment \end{minipage} \vspace{1cm} + \begin{center} \frame{ \begin{NumericDataPlot} diff --git a/Master/texmf-dist/doc/latex/numericplots/TestPlots.tex b/Master/texmf-dist/doc/latex/numericplots/TestPlots.tex index 16093086804..87548496b95 100644 --- a/Master/texmf-dist/doc/latex/numericplots/TestPlots.tex +++ b/Master/texmf-dist/doc/latex/numericplots/TestPlots.tex @@ -1,4 +1,4 @@ -% Copyright 2010 Thomas König, Alexander Michel +% Copyright 2010 Thomas Koenig, Alexander Michel % % This file is part of NumericPlots. % @@ -17,106 +17,84 @@ \section{Some test plots} - \begin{figure} - \centering - \small - - \input{DataTestRealData} - \newpsstyle{Database}{style=StdLineStyA, dotstyle=*, showpoints=true} - \newpsstyle{Result}{style=StdLineStyB, dotstyle=+, showpoints=true} - - % adjust llx, lly, urx and ury for borders - \begin{NumericDataPlot}[]{0.5 \linewidth}{0.35 \linewidth} - % --- definition of the axis and the grid --- - \setxAxis{xMin=2, xMax=17, xO=5, Dx=4} + + +\clearpage + +\input{Roll406_Ref2288.tex} + +\newpsstyle{PlotTitle}{fillstyle=solid, fillcolor=white, framearc=0.5, opacity=0.85, linestyle=none} + +\newpsstyle{Rnew}{style=StdLineStyC, linestyle=dashed} +\newpsstyle{R}{style=StdLineStyC} +\newpsstyle{Rused}{linestyle=dashed} +\newpsstyle{ShapeMeasured}{style=StdLineStyB} +\newpsstyle{ShapeFitted}{style=StdLineStyA} +\newpsstyle{Dia}{style=StdLineStyD, showpoints=true, dotstyle=asterisk, +linestyle=none, dotsize=5pt} +\newpsstyle{DiaUsed}{style=Dia, dotstyle=+} + +\begin{minipage}{0.7\linewidth} + \begin{NumericDataPlot}{\textwidth}{7cm} + + \setxAxis{xMin=-2.4, xMax=2.4, Dx=1.0, xO=0.0} + \setyAxis{yMin=-0.45, yMax=-0.05, Dy=0.1, yO=-0.2, + yCoordMin=750} + \plotxAxis[xLabelSep=0.4mm, NoLabel, NoTickLabel]{$z$ in m} + \plotyAxis[yLabelSep=0.8cm]{$\Delta r$ in mm} + \listplot[style=ShapeMeasured]{\DataShapeMeasured} + \listplot[style=ShapeFitted]{\DataShapeFitted} + \putN{\psframebox[style=PlotTitle]{Formmessung}} - \setyAxis{yMin=20, yMax=70, yO=20, Dy=20} - % AxisStyle: Boxed,LowerAxis,UpperAxis,NoTicks,NoTickLabel,NoGrid - \plotxAxis[AxisStyle = Boxed]{Stichnummer} - - % AxisStyle: Boxed,LeftAxis,RightAxis,NoTicks,NoTickLabel,NoGrid - \plotyAxis[AxisStyle = Boxed]{$F_{roll}$ in $\mega\newton$} + \setyAxis{yMin=545.15, yMax=545.85, yO=545.4, Dy=0.2, + yCoordMin=300, yCoordMax=700} + \plotxAxis[xLabelSep=0.4mm, NoLabel, NoTickLabel]{$z$ in m} + \plotyAxis[yLabelSep=0.8cm]{$r$ in mm} + \listplot[style=Rnew]{\DataRadiusNew} + \listplot[style=Dia]{\DataRMeasured} + \listplot[style=R]{\DataRadius} + \ifx \DataRadiusUsed \empty + \else + \listplot[style=Rused]{\DataRadiusUsed} + \listplot[style=DiaUsed]{\DataRMeasuredUsed} + \fi + + \putN{\psframebox[style=PlotTitle]{Walzenprofil}} + + \setyAxis{yMin=-0.45, yMax=0.05, yO=0.0, Dy=0.1, yCoordMax=250} + \plotxAxis[]{$z$ in m} + \plotyAxis[yLabelSep=0.8cm]{$w$ in mm} + + \listplot[style=StdLineStyX]{\DataWear} + \listplot[style=StdLineStyY]{\DataMeasuredWear} + + \putN{\psframebox[style=PlotTitle]{Verschleiß}} + + \end{NumericDataPlot} +\end{minipage} +\begin{minipage}{0.3\linewidth} + \renewcommand{\arraystretch}{1.5} + \newlength{\mylen}\settowidth{\mylen}{Approximation} + \begin{tabular}{|p{15pt}p{\mylen}|}% + \hline + \LegLine[LegLineWidth=15pt]{style=ShapeMeasured} & Formmessung\\ + \LegLine[LegLineWidth=15pt]{style=ShapeFitted} & Approximation\\ + \hline\hline + \LegLine[LegLineWidth=15pt]{style=Dia} & Durchmesser\-messung\\ + \LegLine[LegLineWidth=15pt]{style=Rnew} & $R_\text{new}$\\ + \hline + \LegLine[LegLineWidth=15pt]{style=R} & $R = R_\text{new} + w_\text{DB}$\\ + \LegLine[LegLineWidth=15pt]{style=Rused} & $R_\text{used}$\\ + \LegLine[LegLineWidth=15pt]{style=DiaUsed} & Durchmesser\-messung\\ + \hline\hline + \LegLine[LegLineWidth=15pt]{style=StdLineStyX} & $w_\text{DB}$\\ + \LegLine[LegLineWidth=15pt]{style=StdLineStyY} & + $w_\text{Messung}=R_\text{used}-R_\text{new}$\\ + \hline + \end{tabular}% + \renewcommand{\arraystretch}{1} +\end{minipage} - \listplot[style=Database]{\DataDBforce} - \listplot[style=Result]{\DataRESforce} - \listplot[style=StdLineStyC]{\DataDBforceC} - \listplot[style=StdLineStyD]{\DataDBforceD} - \listplot[style=StdLineStyE]{\DataDBforceE} - \listplot[style=StdLineStyF]{\DataDBforceF} - \listplot[style=StdLineStyG]{\DataDBforceG} - \end{NumericDataPlot} - \LegendDefinition[nrCols=1, LabelOrientation=r]{ - \LegLine{style=Database} & Werte aus der Datenbank \\ - \LegLine{style=Result} & Modell\\ } - \caption{Test.} - \label{fig:Test1} -\end{figure} - -\clearpage -% \section{Teste tkPlotData } -% -% -% -% { -% \centering -% \small -% -% \input{DataTestRealData} -% \newpsstyle{Database}{style=StdLineStyA, dotstyle=*, showpoints=true} -% \newpsstyle{Result}{style=StdLineStyB, dotstyle=+, showpoints=true} -% -% % adjust llx, lly, urx and ury for borders -% %\begin{tkDataPlot}[options]{width}{height} -% \begin{NumericDataPlot}[]{\linewidth}{10cm} -% % --- definition of the axis and the grid --- -% \setxAxis{xMin=2, xMax=17, xO=10, Dx=3} -% \setyAxis{yMin=20, yMax=70, Dy=10, yO=25} -% -% -% \plotxAxis[LabelPos=0.75, LabelOption={\color{red}}, -% TickLabelOption={\color{red}}]{Stichnummer} -% \plotyAxis[LabelOption={\LARGE}, TickLabelOption={\LARGE\color{green}}] -% {$F_{roll}$ in $\mega\newton$\\\LARGE{}Zeilenumbruch} -% -% \listplot[style=Database]{\DataDBforce} -% \listplot[style=Result]{\DataRESforce} -% \listplot[style=StdLineStyC]{\DataDBforceC} -% \listplot[style=StdLineStyD]{\DataDBforceD} -% \listplot[style=StdLineStyE]{\DataDBforceE} -% \listplot[style=StdLineStyF]{\DataDBforceF} -% \listplot[style=StdLineStyG]{\DataDBforceG} -% -% % put some stuff somewhere -% \NDPput[x=5, y=30]{xx} -% -% % or put nodes and draw lines between them -% \NDPput[x=7, y=25]{\pnode{A}} -% \NDPput[x=8, y=45]{\pnode{B}} -% \ncline{A}{B} -% -% % horizontal or vertical lines -% \NDPhline[style=StdLineStyF]{27} -% \NDPvline[style=StdLineStyG]{14} -% -% \NDPput[x=10, y=45]{\cnode{0.25}{Test}} -% -% \NDPput[x=13, y=48.3]{ -% \rnode{TestOval}{\psovalbox[framesep=4mm]{\hspace{8mm}}} -% } -% -% \end{NumericDataPlot} -% Vielleicht will ich genau \rnode{TestA}{hier} etwas zeigen. Oder genau -% \rnode{TestOvalA}{hier?} -% \ncline{->}{TestA}{Test} -% \ncline{->}{TestOvalA}{TestOval} -% -% \LegendDefinition[nrCols=2]{ -% \LegLine{style=Database} & Werte aus der Datenbank & -% \LegLine{style=Result} & Modell\\ -% } -% -% -% }
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/numericplots/history.tex b/Master/texmf-dist/doc/latex/numericplots/history.tex index 971496d74ea..f3c46405822 100644 --- a/Master/texmf-dist/doc/latex/numericplots/history.tex +++ b/Master/texmf-dist/doc/latex/numericplots/history.tex @@ -1,4 +1,4 @@ -% Copyright 2010 Thomas König, Alexander Michel +% Copyright 2010 Thomas Koenig, Alexander Michel % % This file is part of NumericPlots. % @@ -59,4 +59,41 @@ \item length of the ticks may now be given in mm, see \ref{sec:OptionsGeneral} \end{itemize} -\end{itemize}
\ No newline at end of file + \item 14.09.2010 + \begin{itemize} + \item added \texttt{struct2latex} to the package + \item added \texttt{dspace2struct} to the package + \item added \texttt{dspace2latex} to the package + \item changed \texttt{struct2latex}: mapping column vectors + \item changed \texttt{struct2latex}: downsampling option added + \end{itemize} + \item 15.11.2010 + \begin{itemize} + \item changed the lineends of the axis + \end{itemize} + \item 07.01.2011 + \begin{itemize} + \item adjusted linestyles + \item example with the available linestyles + \end{itemize} + \item 04.05.2011 + \begin{itemize} + \item added commands to place exponents at the axes + \item added documentation for put North, \ldots, SouthWest + \end{itemize} + \item 14.05.2011 + \begin{itemize} + \item added command to put a box in the graph + \end{itemize} + \item 17.05.2011 + \begin{itemize} + \item added ps-style LegendBoxStyle to adjust the style of the box + underlying the legend + \end{itemize} + \item 12.07.2011 + \begin{itemize} + \item changes in documentation + \item adopted \texttt{dspace2struct} for \textsc{dSpace Next Generation} + \item added \verb+\NDPvline, \NDPhline, \NDPvbox+ and \verb+\NDPhbox+ + \end{itemize} +\end{itemize}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/numericplots/keys_NumericDataPlot.tex b/Master/texmf-dist/doc/latex/numericplots/keys_NumericDataPlot.tex new file mode 100644 index 00000000000..8a84b574a52 --- /dev/null +++ b/Master/texmf-dist/doc/latex/numericplots/keys_NumericDataPlot.tex @@ -0,0 +1,54 @@ +xMax&NumericDataPlot&Axis&command&[none]\\ +xMin&NumericDataPlot&Axis&command&[none]\\ +Dx&NumericDataPlot&Axis&command&[none]\\ +dx&NumericDataPlot&Axis&command&[none]\\ +xCoordMax&NumericDataPlot&Axis&command&[none]\\ +xCoordMin&NumericDataPlot&Axis&command&[none]\\ +yMax&NumericDataPlot&Axis&command&[none]\\ +yMin&NumericDataPlot&Axis&command&[none]\\ +Dy&NumericDataPlot&Axis&command&[none]\\ +dy&NumericDataPlot&Axis&command&[none]\\ +yCoordMax&NumericDataPlot&Axis&command&[none]\\ +yCoordMin&NumericDataPlot&Axis&command&[none]\\ +LabelRotation&NumericDataPlot&xAxis&command&[none]\\ +LabelPos&NumericDataPlot&xAxis&command&[none]\\ +TickSep&NumericDataPlot&xAxis&command&[none]\\ +LabelOption&NumericDataPlot&xAxis&command&[none]\\ +TickLabelOption&NumericDataPlot&xAxis&command&[none]\\ +LabelRotation&NumericDataPlot&yAxis&command&[none]\\ +LabelPos&NumericDataPlot&yAxis&command&[none]\\ +TickSep&NumericDataPlot&yAxis&command&[none]\\ +LabelOption&NumericDataPlot&yAxis&command&[none]\\ +TickLabelOption&NumericDataPlot&yAxis&command&[none]\\ +xLog&NumericDataPlot&Axis&boolean&true\\ +yLog&NumericDataPlot&Axis&boolean&true\\ +yNearlyTight&NumericDataPlot&Axis&boolean&false\\ +xO&NumericDataPlot&AxisWait&command&[none]\\ +yO&NumericDataPlot&AxisWait&command&[none]\\ +NoGrid&NumericDataPlot&xAxis&boolean&true\\ +NoTicks&NumericDataPlot&xAxis&boolean&true\\ +NoLabel&NumericDataPlot&xAxis&boolean&true\\ +NoTickLabel&NumericDataPlot&xAxis&boolean&true\\ +NoGrid&NumericDataPlot&yAxis&boolean&true\\ +NoTicks&NumericDataPlot&yAxis&boolean&true\\ +NoLabel&NumericDataPlot&yAxis&boolean&true\\ +NoTickLabel&NumericDataPlot&yAxis&boolean&true\\ +yLabelSep&NumericDataPlot&yAxis&ordinary&\origXLabelSep \\ +xLabelSep&NumericDataPlot&xAxis&ordinary&\origYLabelSep \\ +AxisStyle&NumericDataPlot&xAxis&choice&[none]\\ +AxisStyle&NumericDataPlot&yAxis&choice&[none]\\ +xPicMin&NumericDataPlot&General&command&[none]\\ +yPicMin&NumericDataPlot&General&command&[none]\\ +xPicMax&NumericDataPlot&General&command&[none]\\ +yPicMax&NumericDataPlot&General&command&[none]\\ +TickLength&NumericDataPlot&General&command&[none]\\ +llx&NumericDataPlot&General&ordinary&\StdLLX \\ +urx&NumericDataPlot&General&ordinary&\StdURX \\ +lly&NumericDataPlot&General&ordinary&\StdLLY \\ +ury&NumericDataPlot&General&ordinary&\StdURY \\ +nrCols&NumericDataPlot&Legend&ordinary&1\\ +LegLineWidth&NumericDataPlot&Legend&ordinary&20pt\\ +LabelOrientation&NumericDataPlot&Legend&choice&[none]\\ +x&NumericDataPlot&put&ordinary&[none]\\ +y&NumericDataPlot&put&ordinary&[none]\\ +RefPoint&NumericDataPlot&put&ordinary&c\\ diff --git a/Master/texmf-dist/doc/latex/numericplots/options.tex b/Master/texmf-dist/doc/latex/numericplots/options.tex index a37da9848f9..cb7859ba69f 100644 --- a/Master/texmf-dist/doc/latex/numericplots/options.tex +++ b/Master/texmf-dist/doc/latex/numericplots/options.tex @@ -1,4 +1,4 @@ -% Copyright 2010 Thomas König, Alexander Michel +% Copyright 2010 Thomas Koenig, Alexander Michel % % This file is part of NumericPlots. % @@ -25,4 +25,15 @@ \item xPicMin [0], yPicMin[0], xPicMax[1000], yPicMax[1000] \item TickLength [2] defines the length of the ticks in mm \item llx[-1.5cm], lly[-1.25cm], urx[2pt], ury[2pt] - \end{itemize}
\ No newline at end of file + \end{itemize} + + +\subsection{Automatic list with xkvview} +The following list of keys defined by the package was created with xkvview. + +\xkvview{prefix=NumericDataPlot,file=keys_NumericDataPlot} + +% \xkvview{family=Axis,file=keys_Axis} +% \xkvview{family=xAxis,file=keys_xAxis} +% \xkvview{family=yAxis,file=keys_yAxis} + diff --git a/Master/texmf-dist/tex/latex/numericplots/NumericPlots.sty b/Master/texmf-dist/tex/latex/numericplots/NumericPlots.sty index aa0cb63d572..7eb6722b7df 100644 --- a/Master/texmf-dist/tex/latex/numericplots/NumericPlots.sty +++ b/Master/texmf-dist/tex/latex/numericplots/NumericPlots.sty @@ -1,4 +1,4 @@ -% Copyright 2010 Thomas König, Alexander Michel, Michael Baumgart +% Copyright 2010 Thomas Koenig, Alexander Michel, Michael Baumgart % % This file is part of NumericPlots. % @@ -17,7 +17,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{NumericPlots}[2010/08/09 LaTeX package to plot numeric data] +\ProvidesPackage{NumericPlots}[2011/01/07 LaTeX package to plot numeric data] % ========================================================== % || TODO @@ -41,6 +41,7 @@ \RequirePackage{xcolor} + % ======================================= % === Definition of keys and commands === % ======================================= @@ -50,6 +51,7 @@ % define all the new commands.. \RequirePackage{xkeyval} +\RequirePackage{xkvview} % keep track of all keys that are defined % globally needed values as newcommands \newcommand{\NumDataPlotxRange}{1} @@ -156,6 +158,8 @@ \fi } +\define@boolkey[NumericDataPlot]{Axis}{yNearlyTight}[false]{} + % xMin and yMin also set xO/yO. It will later be ensured that if the user % provides a value for xO/yO, these values will be used! (in order to do so, it % is always necessary to call the following two commands in the given order: @@ -266,6 +270,11 @@ \PackageWarning{NumericPlots}{LabelOrientation #1 not defined. Use r, l or c} } + +% ------------------------------------------------------------------------------ +% | keys for the put commands +% ------------------------------------------------------------------------------ + \define@key[NumericDataPlot]{put}{x}{ \FPsub{\NumDataPlotBuffer}{#1}{\NumDataPlotxMin} \FPmul{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotxDataCoordRatio} @@ -324,7 +333,7 @@ \newcommand{\LegendDefinition}[2][nrCols]{% \setkeys[NumericDataPlot]{Legend}{#1}% % - \psframebox[fillcolor=white, fillstyle=solid]{% + \psframebox[style=LegendBoxStyle]{% \ifLegendOrientationLeft \begin{tabular}{*{\nrLegendCols}{p{\LegLineWidth}l}}% #2% @@ -371,7 +380,7 @@ \NumDataPlotyCoordMin\space add){ \begin{tabular}{c} \NumDataPlotyLabelOption{}#1\\ - \vspace{\yLabelSep} + \vspace{\yLabelSep} \end{tabular}} \setlength{\yLabelSep}{\origYLabelSep} } @@ -529,7 +538,7 @@ \rput[#3]{0}(!\NumDataPlotdx \space \NumDataPlotDx \space div \n \space \NumDataPlotxO \space sub mul \xCoordOrig \space add \space #1 \space \NumDataPlotxTickSep \space #2) - {\NumDataPlotxTickLabelOption{}$\LogxAxisLabel{\n}$} + {\NumDataPlotxTickLabelOption{}$\LogxAxisLabel{\n}$} } % plot ticks on left side of the origin \mmultido{\n=\NumDataPlotxO+\NumDataPlotDx}{\NumDataPlotBuffer} @@ -583,7 +592,9 @@ % plot lower axis \ifthenelse{\boolean{PlotLowerAxis}} { - \psline(\NumDataPlotxCoordMin,\NumDataPlotyCoordMin)(\NumDataPlotxCoordMax, \NumDataPlotyCoordMin) + \psline{C-C}% + (\NumDataPlotxCoordMin, \NumDataPlotyCoordMin)% + (\NumDataPlotxCoordMax, \NumDataPlotyCoordMin) \ifNumericDataPlot@xAxis@NoTickLabel \else \plotxTickLabels{\NumDataPlotyCoordMin}{sub}{t} @@ -596,13 +607,17 @@ %plot upper axis (boxed) \ifthenelse{\boolean{PlotUpperAxis}}{ % plot upper axis - \psline(\NumDataPlotxCoordMin,\NumDataPlotyCoordMax)(\NumDataPlotxCoordMax, \NumDataPlotyCoordMax) + \psline{C-C}% + (\NumDataPlotxCoordMin,\NumDataPlotyCoordMax)% + (\NumDataPlotxCoordMax,\NumDataPlotyCoordMax) }{} - }{ + }{ % plot upper axis (only upper axis) \ifthenelse{\boolean{PlotUpperAxis}}{ % plot upper axis - \psline(\NumDataPlotxCoordMin,\NumDataPlotyCoordMax)(\NumDataPlotxCoordMax, \NumDataPlotyCoordMax) + \psline{C-C}% + (\NumDataPlotxCoordMin,\NumDataPlotyCoordMax)% + (\NumDataPlotxCoordMax, \NumDataPlotyCoordMax) % plot ticklabels \ifNumericDataPlot@xAxis@NoTickLabel \else @@ -654,6 +669,11 @@ [xO, xMin, xMax, xCoordMin, xCoordMax, Dx, dx, xLog]{#1} \setrmkeys[NumericDataPlot]{AxisWait}[xO] + %\ifNumericDataPlot@Axis@yNearlyTight +% \FPifpos{\NumDataPlotyMax} \FPmul{\NumDataPlotyMax}{\NumDataPlotyMax}{1.1} \else \FPmul{\NumDataPlotyMax}{\NumDataPlotyMax}{0.9}\fi +% \FPifpos{\NumDataPlotyMin} \FPmul{\NumDataPlotyMin}{\NumDataPlotyMin}{0.9} \else \FPmul{\NumDataPlotyMin}{\NumDataPlotyMin}{1.1}\fi +% \fi + % for logarithmic axes: calculate log(xMax), log(xMin), Dx=1, xO=ceil(xMin) \ifNumericDataPlot@Axis@yLog \FPln{\NumDataPlotBuffer}{\NumDataPlotyMax} @@ -773,6 +793,27 @@ % } } +\newcommand{\plotyGridBoxed}{ + % plot gridline on right side of the origin + \mmultido{\n=\yCoordOrig+\NumDataPlotdy}{\TicksYRight-1}{ + \plotyGridLine{\n} + \yLogSubGrid{\n} + } + % plot gridline on left side of the origin + \multido{\n=\yCoordOrig+\NumDataPlotdy}{\TicksYLeft-1}{ + \plotyGridLine{\n} + } + \FPsub{\NumDataPlotBuffer}{\TicksYLeft}{1} + \FPround{\NumDataPlotBuffer}{\NumDataPlotBuffer}{0} + \multido{\n=\yCoordOrig+\NumDataPlotdy}{\NumDataPlotBuffer}{ + \yLogSubGrid{\n} + } +% \putS{ +% TicksYLeft: \TicksYLeft +% } +} + + \newcommand{\plotyAxis}[2][]{ \setkeys[NumericDataPlot]{yAxis}{#1} @@ -782,7 +823,9 @@ % plot lower axis \ifthenelse{\boolean{PlotLeftAxis}} { - \psline(\NumDataPlotxCoordMin,\NumDataPlotyCoordMin)(\NumDataPlotxCoordMin, \NumDataPlotyCoordMax) + \psline{C-C}% + (\NumDataPlotxCoordMin,\NumDataPlotyCoordMin)% + (\NumDataPlotxCoordMin, \NumDataPlotyCoordMax) \ifNumericDataPlot@yAxis@NoTickLabel \else \plotyTickLabels{\NumDataPlotxCoordMin}{sub}{r} @@ -790,7 +833,9 @@ % plot upper axis \ifthenelse{\boolean{PlotRightAxis}} { - \psline(\NumDataPlotxCoordMax,\NumDataPlotyCoordMin)(\NumDataPlotxCoordMax, \NumDataPlotyCoordMax) + \psline{C-C}% + (\NumDataPlotxCoordMax,\NumDataPlotyCoordMin)% + (\NumDataPlotxCoordMax, \NumDataPlotyCoordMax) }{} % --- label --- \ifNumericDataPlot@yAxis@NoLabel @@ -800,7 +845,9 @@ }{ \ifthenelse{\boolean{PlotRightAxis}} { - \psline(\NumDataPlotxCoordMax,\NumDataPlotyCoordMin)(\NumDataPlotxCoordMax, \NumDataPlotyCoordMax) + \psline{C-C}% + (\NumDataPlotxCoordMax,\NumDataPlotyCoordMin)% + (\NumDataPlotxCoordMax, \NumDataPlotyCoordMax) \ifNumericDataPlot@yAxis@NoTickLabel \else \plotyTickLabels{\NumDataPlotxCoordMax}{add}{l} @@ -827,7 +874,7 @@ } \newcommand{\NDPhline}[2][]{ - +% \FPsub{\NumDataPlotBuffer}{#2}{\NumDataPlotyMin} \FPmul{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotyDataCoordRatio} \FPadd{\NDPputYcoord}{\NumDataPlotBuffer}{\NumDataPlotyCoordMin} @@ -837,17 +884,17 @@ } \newcommand{\NDPvline}[2][]{ - +% \FPsub{\NumDataPlotBuffer}{#2}{\NumDataPlotxMin} \FPmul{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotxDataCoordRatio} \FPadd{\NDPputXcoord}{\NumDataPlotBuffer}{\NumDataPlotxCoordMin} - +% \psline[#1](\NDPputXcoord, \NumDataPlotyCoordMin) (\NDPputXcoord, \NumDataPlotyCoordMax) } \newcommand{\NDPline}[5][]{ - +% \FPsub{\NumDataPlotBuffer}{#2}{\NumDataPlotxMin} \FPmul{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotxDataCoordRatio} \FPadd{\NDPputXcoordOne}{\NumDataPlotBuffer}{\NumDataPlotxCoordMin} @@ -858,13 +905,52 @@ \psline[#1] - (!#2 \NumDataPlotxMin\space sub \NumDataPlotxDataCoordRatio\space mul + (!#2 \NumDataPlotxMin\space sub \NumDataPlotxDataCoordRatio\space mul + \NumDataPlotxCoordMin\space add + #3 \NumDataPlotyMin\space sub \NumDataPlotyDataCoordRatio\space mul + \NumDataPlotyCoordMin\space add) + (!#4 \NumDataPlotxMin\space sub \NumDataPlotxDataCoordRatio\space mul + \NumDataPlotxCoordMin\space add + #5 \NumDataPlotyMin\space sub \NumDataPlotyDataCoordRatio\space mul + \NumDataPlotyCoordMin\space add) +} + +\newcommand{\NDPvbox}[3][]{ + + \psframe[#1] + (!#2 \NumDataPlotxMin\space sub \NumDataPlotxDataCoordRatio\space mul \NumDataPlotxCoordMin\space add + \NumDataPlotyCoordMin) + (!#3 \NumDataPlotxMin\space sub \NumDataPlotxDataCoordRatio\space mul \NumDataPlotxCoordMin\space add + \NumDataPlotyCoordMax) +} + +\newcommand{\NDPhbox}[3][]{ + + \psframe[#1] + (!\NumDataPlotxCoordMin \space + #2 \NumDataPlotyMin\space sub \NumDataPlotyDataCoordRatio\space mul \NumDataPlotyCoordMin\space add) + (!\NumDataPlotxCoordMax \space + #3 \NumDataPlotyMin\space sub \NumDataPlotyDataCoordRatio\space mul \NumDataPlotyCoordMin\space add) +} + +\newcommand{\NDPbox}[5][]{ +% \FPsub{\NumDataPlotBuffer}{#2}{\NumDataPlotxMin} +% \FPmul{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotxDataCoordRatio} +% \FPadd{\NDPputXcoordOne}{\NumDataPlotBuffer}{\NumDataPlotxCoordMin} +% +% \FPsub{\NumDataPlotBuffer}{#2}{\NumDataPlotxMin} +% \FPmul{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotxDataCoordRatio} +% \FPadd{\NDPputXcoordOne}{\NumDataPlotBuffer}{\NumDataPlotxCoordMin} +% +% + \psframe[#1] + (!#2 \NumDataPlotxMin\space sub \NumDataPlotxDataCoordRatio\space mul \NumDataPlotxCoordMin\space add - #3 \NumDataPlotyMin\space sub \NumDataPlotyDataCoordRatio\space mul + #3 \NumDataPlotyMin\space sub \NumDataPlotyDataCoordRatio\space mul \NumDataPlotyCoordMin\space add) - (!#4 \NumDataPlotxMin\space sub \NumDataPlotxDataCoordRatio\space mul + (!#4 \NumDataPlotxMin\space sub \NumDataPlotxDataCoordRatio\space mul \NumDataPlotxCoordMin\space add - #5 \NumDataPlotyMin\space sub \NumDataPlotyDataCoordRatio\space mul + #5 \NumDataPlotyMin\space sub \NumDataPlotyDataCoordRatio\space mul \NumDataPlotyCoordMin\space add) } @@ -930,13 +1016,15 @@ \newpsstyle{TickSt}{linecolor=black, linestyle=solid, linewidth=0.5pt} -\definecolor{LineColorA}{cmyk}{1 0.25 0 0} %blue -\definecolor{LineColorB}{cmyk}{1 0 1 0.2} %green +\definecolor{LineColorA}{cmyk}{0.6 0.21 0.0 0.2} %blue +\definecolor{LineColorB}{cmyk}{0.7 0.1 1 0.2} %green \definecolor{LineColorC}{cmyk}{0 1 1 0.2} %red -\definecolor{LineColorD}{cmyk}{0 0.7 1 0} % orange -\definecolor{LineColorE}{cmyk}{0.7 1 0 0} % purple -\definecolor{LineColorF}{cmyk}{1 0 0 0} % light blue -\definecolor{LineColorG}{cmyk}{0 0.25 1 0} % yellow +\definecolor{LineColorD}{cmyk}{0 0.7 1 0.1} % orange +\definecolor{LineColorE}{cmyk}{0.5 1 0 0.1} % purple +\definecolor{LineColorF}{cmyk}{0 1 0 0.2} % magenta +\definecolor{LineColorG}{cmyk}{0 0.25 1 0.1} % yellow +\definecolor{LineColorX}{cmyk}{0.3 0.2 0.0 0.1} %blue +\definecolor{LineColorY}{cmyk}{0 1 1 0.2} %red \newpsstyle{StdLineStyA}{linecolor=LineColorA} \newpsstyle{StdLineStyB}{linecolor=LineColorB} @@ -946,21 +1034,83 @@ \newpsstyle{StdLineStyF}{linecolor=LineColorF} \newpsstyle{StdLineStyG}{linecolor=LineColorG} +\newpsstyle{StdLineStyX}{linecolor=LineColorX,linestyle=solid,linewidth=2pt} +\newpsstyle{StdLineStyY}{linecolor=LineColorY,linestyle=dashed, dash=4pt 3pt 1pt +3pt} +\newpsstyle{BWStdLineStyX}{linecolor=lightgray,linestyle=solid,linewidth=2pt} +\newpsstyle{BWStdLineStyY}{linecolor=black,linestyle=dashed, dash=4pt 3pt 1pt +3pt} + +\newpsstyle{BWStdLineStyA} + {linecolor=lightgray,linestyle=solid,linewidth = 1.5pt} +\newpsstyle{BWStdLineStyB} + {linecolor=gray,linestyle=solid,linewidth = 1.0pt} +\newpsstyle{BWStdLineStyC} + {linecolor=black,linestyle=solid,linewidth = 0.75pt} +\newpsstyle{BWStdLineStyD} + {linecolor=black,linestyle=dashed, dash = 3pt 2pt,linewidth = 0.75pt} +\newpsstyle{BWStdLineStyE} + {linecolor=gray,linestyle=dashed,dash = 3pt 2pt,linewidth = 1.0pt} +\newpsstyle{BWStdLineStyF} + {linecolor=black,linestyle=dotted, dotsep =2pt,linewidth = 1.5pt} +\newpsstyle{BWStdLineStyG} + {linecolor=gray,linestyle=dotted, dotsep =2pt,linewidth = 1.5pt} + +\newpsstyle{LegendBoxStyle} + {fillcolor=white, fillstyle=solid} + +% =========================================================================== +% || +% || commands to put something at a location of the plot +% || +% =========================================================================== + +% put in the NorthWest corner of the plot +\newcommand{\putNW}[1]{ +\rput[lt]{0}(\NumDataPlotxCoordMin, \NumDataPlotyCoordMax){#1}} +% put in the SouthWest corner of the plot +\newcommand{\putSW}[1]{ +\rput[lb]{0}(\NumDataPlotxCoordMin, \NumDataPlotyCoordMin){#1}} +% put in the NorthEast corner of the plot +\newcommand{\putNE}[1]{ +\rput[rt]{0}(\NumDataPlotxCoordMax, \NumDataPlotyCoordMax){#1}} +% put in the SouthEast corner of the plot +\newcommand{\putSE}[1]{ +\rput[rb]{0}(\NumDataPlotxCoordMax, \NumDataPlotyCoordMin){#1}} +% put in the South of the plot +\newcommand{\putS}[1]{ +\rput[b]{0}(!\NumDataPlotxCoordMax\space\NumDataPlotxMin\space sub 2 div +\NumDataPlotxCoordMin\space add \NumDataPlotyCoordMin){#1}} +% put in the North of the plot +\newcommand{\putN}[1]{ +\rput[t]{0}(!\NumDataPlotxCoordMax\space\NumDataPlotxCoordMin\space sub 2 div +\NumDataPlotxCoordMin\space add \NumDataPlotyCoordMax){#1}} +% put in the West of the plot +\newcommand{\putW}[1]{ +\rput[l]{0}(!\NumDataPlotxCoordMin\space +\NumDataPlotyCoordMax\space\NumDataPlotyCoordMin\space sub 2 div \NumDataPlotyCoordMin\space add){#1}} +% put in the East of the plot +\newcommand{\putE}[1]{ +\rput[r]{0}(!\NumDataPlotxCoordMax\space +\NumDataPlotyCoordMax\space\NumDataPlotyCoordMin\space sub 2 div \NumDataPlotyCoordMin\space add){#1}} +% put exponent at y-axis +\newcommand{\putExpY}[1]{ +\rput[lb]{0}(\NumDataPlotxCoordMin, \NumDataPlotyCoordMax){#1} +} +% put exponent at x-axis +\newcommand{\putExpX}[1]{ +\rput[lb]{0}(\NumDataPlotxCoordMax, \NumDataPlotyCoordMin){#1} +} + + \DeclareOptionX{BW}{ - \newpsstyle{StdLineStyA} - {linecolor=lightgray,linestyle=solid,linewidth = 1.5pt} - \newpsstyle{StdLineStyB} - {linecolor=gray,linestyle=solid,linewidth = 1.0pt} - \newpsstyle{StdLineStyC} - {linecolor=black,linestyle=solid,linewidth = 0.75pt} - \newpsstyle{StdLineStyD} - {linecolor=black,linestyle=dashed, dash = 3pt 2pt,linewidth = 0.75pt} - \newpsstyle{StdLineStyE} - {linecolor=gray,linestyle=dashed,dash = 3pt 2pt,linewidth = 1.0pt} - \newpsstyle{StdLineStyF} - {linecolor=black,linestyle=dotted, dotsep =2pt,linewidth = 1.5pt} - \newpsstyle{StdLineStyG} - {linecolor=gray,linestyle=dotted, dotsep =2pt,linewidth = 1.5pt} + \newpsstyle{StdLineStyA}{BWStdLineStyA} + \newpsstyle{StdLineStyB}{BWStdLineStyb} + \newpsstyle{StdLineStyC}{BWStdLineStyC} + \newpsstyle{StdLineStyD}{BWStdLineStyD} + \newpsstyle{StdLineStyE}{BWStdLineStyE} + \newpsstyle{StdLineStyF}{BWStdLineStyF} + \newpsstyle{StdLineStyG}{BWStdLineStyG} } \DeclareOptionX{beamer}{ @@ -995,7 +1145,8 @@ xLog=false, yMax=100, yMin=0, Dy=10, yCoordMax=\NumDataPlotGyPicMax, yCoordMin=\NumDataPlotGyPicMin, - yLog=false, + yLog=false, + yNearlyTight=false, }{} \presetkeys[NumericDataPlot]{xAxis}{ NoGrid=false, NoTicks=false, NoLabel=false, NoTickLabel=false, @@ -1018,37 +1169,3 @@ LabelOrientation=l }{} -% =========================================================================== -% || -% || commands to put something at a location of the plot -% || -% =========================================================================== - -% put in the NorthWest corner of the plot -\newcommand{\putNW}[1]{ -\rput[lt]{0}(\NumDataPlotxCoordMin, \NumDataPlotyCoordMax){#1}} -% put in the SouthWest corner of the plot -\newcommand{\putSW}[1]{ -\rput[lb]{0}(\NumDataPlotxCoordMin, \NumDataPlotyCoordMin){#1}} -% put in the NorthEast corner of the plot -\newcommand{\putNE}[1]{ -\rput[rt]{0}(\NumDataPlotxCoordMax, \NumDataPlotyCoordMax){#1}} -% put in the SouthEast corner of the plot -\newcommand{\putSE}[1]{ -\rput[rb]{0}(\NumDataPlotxCoordMax, \NumDataPlotyCoordMin){#1}} -% put in the South of the plot -\newcommand{\putS}[1]{ -\rput[b]{0}(!\NumDataPlotxCoordMax\space\NumDataPlotxMin\space sub 2 div -\NumDataPlotxCoordMin\space add \NumDataPlotyCoordMin){#1}} -% put in the North of the plot -\newcommand{\putN}[1]{ -\rput[t]{0}(!\NumDataPlotxCoordMax\space\NumDataPlotxCoordMin\space sub 2 div -\NumDataPlotxCoordMin\space add \NumDataPlotyCoordMax){#1}} -% put in the West of the plot -\newcommand{\putW}[1]{ -\rput[l]{0}(!\NumDataPlotxCoordMin\space -\NumDataPlotyCoordMax\space\NumDataPlotyCoordMin\space sub 2 div \NumDataPlotyCoordMin\space add){#1}} -% put in the East of the plot -\newcommand{\putE}[1]{ -\rput[r]{0}(!\NumDataPlotxCoordMax\space -\NumDataPlotyCoordMax\space\NumDataPlotyCoordMin\space sub 2 div \NumDataPlotyCoordMin\space add){#1}} |