[labplot/analysis_playground] /: Merge branch 'master' into analysis_playground

[Stefan Gerlach]

Git commit 840e3e15be48d5d6fb0ead585b214d805748d434 by Stefan Gerlach.
Committed on 30/09/2016 at 16:00.
Pushed by sgerlach into branch 'analysis_playground'.

Merge branch 'master' into analysis_playground

M  +1    -1    doc/index.docbook
M  +6    -3    src/backend/worksheet/plots/cartesian/XYDifferentiationCurve.h
M  +1    -1    src/kdefrontend/dockwidgets/XYDifferentiationCurveDock.cpp

http://commits.kde.org/labplot/840e3e15be48d5d6fb0ead585b214d805748d434

diff --cc doc/index.docbook
index 352b2bd,ecff45e..ce2dda7
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@@ -844,27 -838,10 +844,27 @@@ The menu is only available when a datap
      </para>
        <itemizedlist>
  	<listitem><para>order of derivation (first to sixth order)</para></listitem>
- 	<listitem><para>order of accurary (up to 4th order, depending on derivation order)</para></listitem>
+ 	<listitem><para>order of accuracy (up to 4th order, depending on derivation order)</para></listitem>
        </itemizedlist>
    </sect1>
 -    
 +  
 +  <sect1 id="integration">
 +    <title>Integration</title>
 +    <para>
 +      Numerical integration of data can be done specifying one of the methods
 +    </para>
 +      <itemizedlist>
 +	<listitem><para>rectangle (1-point) rule</para></listitem>
 +	<listitem><para>trapezoid (2-point) rule</para></listitem>
 +	<listitem><para>Simpson-1/3 (3-point) rule</para></listitem>
 +	<listitem><para>Simpson-3/8 (4-point) rule</para></listitem>
 +      </itemizedlist>
 +   <para>
 +     The default method (trapezoid) should be suitable for most cases. 
 +     The number of resulting data points is reduced for both Simpson-rules due to the properties of these methods.
 +   </para>
 +  </sect1> 
 +
    <sect1 id="interpolation">
      <title>Interpolation</title>
      <para>
diff --cc src/backend/worksheet/plots/cartesian/XYDifferentiationCurve.h
index 120831a,d4d1add..ab98940
--- a/src/backend/worksheet/plots/cartesian/XYDifferentiationCurve.h
+++ b/src/backend/worksheet/plots/cartesian/XYDifferentiationCurve.h
@@@ -26,10 -26,13 +26,13 @@@
   *                                                                         *
   ***************************************************************************/
  
 -#ifndef XYDIFFERENTATIONCURVE_H
 -#define XYDIFFERENTATIONCURVE_H
 +#ifndef XYDIFFERENTIATIONCURVE_H
 +#define XYDIFFERENTIATIONCURVE_H
  
  #include "backend/worksheet/plots/cartesian/XYCurve.h"
+ extern "C" {
+ #include "backend/nsl/nsl_diff.h"
+ }
  
  class XYDifferentiationCurvePrivate;
  class XYDifferentiationCurve: public XYCurve {