[kde-doc-english] [labplot/analysis_smooth] /: 1. fixed bug ih the dock widget
Stefan Gerlach
stefan.gerlach at uni-konstanz.de
Thu Jun 2 21:14:48 UTC 2016
Git commit be667fa9facc53a7751b1c1c0781217dfb392492 by Stefan Gerlach.
Committed on 02/06/2016 at 21:14.
Pushed by sgerlach into branch 'analysis_smooth'.
1. fixed bug ih the dock widget
2. added documentation for new smooth functions
M +35 -6 doc/index.docbook
M +4 -2 src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp
http://commits.kde.org/labplot/be667fa9facc53a7751b1c1c0781217dfb392492
diff --git a/doc/index.docbook b/doc/index.docbook
index 11d81a8..084c795 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -51,8 +51,8 @@
</copyright>
<legalnotice>&FDLNotice;</legalnotice>
-<date>2016-05-01</date>
-<releaseinfo>3.1</releaseinfo>
+<date>2016-06-02</date>
+<releaseinfo>3.2</releaseinfo>
<abstract>
<para>
@@ -89,6 +89,7 @@ Features:
<listitem><para>Cartesian plots, created either from imported or manually created data sets or via mathematical equation</para></listitem>
<listitem><para>Definition of mathematical formulas is supported by syntax-highlighting and completion and by the list of thematicaly grouped mathematical and physical constants and functions</para></listitem>
<listitem><para>Analysis of plotted data is supported by many zooming and navigation features</para></listitem>
+<listitem><para>Several interpolation, smoothing and Fourier filter methods for filtering data</para></listitem>
<listitem><para>Linear and non-linear fits to data, several fit-models are predefined and custom models with arbitrary number of parameters can be provided</para></listitem>
<listitem><para>Datapicker for manual or (semi-)automatic data extraction from imported images containing plots and curves.</para></listitem>
</itemizedlist>
@@ -778,10 +779,19 @@ The menu is only available when a datapicker object is selected on the <guilabel
<chapter id="analysis">
<title>Analysis functions</title>
- <para>&LabPlot; supports the data analysis functions interpolation, nonlinear curve fitting and Fourier filter.
- Both can be applied to any data consisting of x- and y-columns.
- The analysis functions can be accessed using the Analysis menu or the context menu of a worksheet.</para>
- <para>The newly created curves can be customized (line style, symbol style, &etc;) like any x-y-curve.</para>
+ <para>&LabPlot; supports a wide variety of data analysis functions:
+ </para>
+ <itemizedlist>
+ <listitem><para>Interpolation</para></listitem>
+ <listitem><para>Smoothing</para></listitem>
+ <listitem><para>Nonlinear curve fitting</para></listitem>
+ <listitem><para>Fourier filter</para></listitem>
+ </itemizedlist>
+ <para>
+ All of them can be applied to any data consisting of x- and y-columns.
+ The analysis functions can be accessed using the Analysis menu or the context menu of a worksheet.
+ The newly created curves can be customized (line style, symbol style, &etc;) like any other x-y-curve.</para>
+
<sect1 id="interpolation">
<title>Interpolation</title>
<para>
@@ -811,6 +821,25 @@ The menu is only available when a datapicker object is selected on the <guilabel
</itemizedlist>
</sect1>
+ <sect1 id="smoothing">
+ <title>Smoothing</title>
+ <para>
+ A number of different smoothing methods are supported:
+ </para>
+ <itemizedlist>
+ <listitem><para>Moving average (central)</para></listitem>
+ <listitem><para>Moving average (lagged)</para></listitem>
+ <listitem><para>Percentile filter</para></listitem>
+ <listitem><para>Savitzky-Golay</para></listitem>
+ </itemizedlist>
+ <para>
+ All smoothing methods support several padding modes (constant, periodic, mirror, nearest, etc.) for the beginning and end
+ of the data set. The moving averages support several weight functions (uniform, triangular, binomial, parabolic, tricubic, etc.)
+ which can be selected to weight the selected data points depending on their distance.
+ </para>
+ </sect1>
+
+
<sect1 id="fitting">
<title>Curve fitting</title>
<para>
diff --git a/src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp b/src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp
index c0d6b73..1afbcd6 100644
--- a/src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp
+++ b/src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp
@@ -308,8 +308,10 @@ void XYSmoothCurveDock::typeChanged() {
} else {
uiGeneralTab.sbPoints->setSingleStep(2);
uiGeneralTab.sbPoints->setMinimum(3);
- uiGeneralTab.lRightValue->show();
- uiGeneralTab.sbRightValue->show();
+ if(m_smoothData.mode == nsl_smooth_pad_constant) {
+ uiGeneralTab.lRightValue->show();
+ uiGeneralTab.sbRightValue->show();
+ }
}
if(type == XYSmoothCurve::Percentile) {
More information about the kde-doc-english
mailing list