Git commit 2ccf324f19af38e3aceaac6f65d397e80d8a1349 by Stefan Gerlach. Committed on 01/05/2016 at 15:33. Pushed by sgerlach into branch 'analysis_interpolation'.
documentation and clean up M +9 -5 doc/index.docbook M +7 -4 src/commonfrontend/worksheet/WorksheetView.cpp M +2 -1 src/commonfrontend/worksheet/WorksheetView.h M +1 -1 src/kdefrontend/dockwidgets/XYFourierFilterCurveDock.cpp M +1 -1 src/kdefrontend/dockwidgets/XYInterpolationCurveDock.cpp http://commits.kde.org/labplot/2ccf324f19af38e3aceaac6f65d397e80d8a1349 diff --git a/doc/index.docbook b/doc/index.docbook index 7c04a3f..11d81a8 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -51,7 +51,7 @@ </copyright> <legalnotice>&FDLNotice;</legalnotice> -<date>2016-04-09</date> +<date>2016-05-01</date> <releaseinfo>3.1</releaseinfo> <abstract> @@ -788,16 +788,20 @@ The menu is only available when a datapicker object is selected on the <guilabel Interpolation of data can be done with several algorithm: </para> <itemizedlist> - <listitem><para>Linear</para></listitem> - <listitem><para>Polynomial</para></listitem> + <listitem><para>linear</para></listitem> + <listitem><para>polynomial (if number of data points < 100)</para></listitem> <listitem><para>cubic spline</para></listitem> <listitem><para>cubic spline (periodic)</para></listitem> <listitem><para>Akima spline</para></listitem> <listitem><para>Akima spline (periodic)</para></listitem> - <listitem><para>Steffen spline (needs GSL >= 2.0)</para></listitem> + <listitem><para>Steffen spline (needs GSL ≥ 2.0)</para></listitem> + <listitem><para>cosine</para></listitem> + <listitem><para>exponential</para></listitem> + <listitem><para>piecewise cubic Hermite (finite differences, Catmull-Rom, cardinal, Kochanek-Bartels)</para></listitem> + <listitem><para>rational functions</para></listitem> </itemizedlist> <para> - The interpolating function is calculated with the given number of data points and evaluated as: + The interpolating function is calculated with the given number n of data points and evaluated as: </para> <itemizedlist> <listitem><para>function</para></listitem> diff --git a/src/commonfrontend/worksheet/WorksheetView.cpp b/src/commonfrontend/worksheet/WorksheetView.cpp index 3c815dc..88713b3 100644 --- a/src/commonfrontend/worksheet/WorksheetView.cpp +++ b/src/commonfrontend/worksheet/WorksheetView.cpp @@ -431,10 +431,11 @@ void WorksheetView::initMenus() { m_cartesianPlotMenu->addSeparator(); m_cartesianPlotMenu->addMenu(m_cartesianPlotActionModeMenu); - m_filterMenu = new QMenu(i18n("Filter")); + // Filter menu? + //m_filterMenu = new QMenu(i18n("Filter")); //TODO: filter icon - m_filterMenu->setIcon(KIcon("zoom-draw")); - m_filterMenu->addAction(addFourierFilterAction); + //m_filterMenu->setIcon(KIcon("zoom-draw")); + //m_filterMenu->addAction(addFourierFilterAction); } /*! @@ -471,7 +472,9 @@ void WorksheetView::createAnalysisMenu(QMenu* menu) const { menu->addAction(addInterpolationAction); menu->addAction(addFitAction); - menu->insertMenu(0,m_filterMenu); + menu->addAction(addFourierFilterAction); + // Filter menu? + //menu->insertMenu(0,m_filterMenu); //TODO: more to come } diff --git a/src/commonfrontend/worksheet/WorksheetView.h b/src/commonfrontend/worksheet/WorksheetView.h index cc9aef5..34ec0ad 100644 --- a/src/commonfrontend/worksheet/WorksheetView.h +++ b/src/commonfrontend/worksheet/WorksheetView.h @@ -113,7 +113,8 @@ private: QMenu* m_cartesianPlotAddNewMenu; QMenu* m_cartesianPlotZoomMenu; QMenu* m_cartesianPlotActionModeMenu; - QMenu* m_filterMenu; + // Filter menu + //QMenu* m_filterMenu; QToolButton* tbNewCartesianPlot; QToolButton* tbZoom; diff --git a/src/kdefrontend/dockwidgets/XYFourierFilterCurveDock.cpp b/src/kdefrontend/dockwidgets/XYFourierFilterCurveDock.cpp index 6b8a778..4160209 100644 --- a/src/kdefrontend/dockwidgets/XYFourierFilterCurveDock.cpp +++ b/src/kdefrontend/dockwidgets/XYFourierFilterCurveDock.cpp @@ -79,7 +79,7 @@ void XYFourierFilterCurveDock::setupGeneral() { uiGeneralTab.cbType->addItem(i18n("High pass")); uiGeneralTab.cbType->addItem(i18n("Band pass")); uiGeneralTab.cbType->addItem(i18n("Band reject")); - uiGeneralTab.cbType->addItem(i18n("Threshold")); +//TODO uiGeneralTab.cbType->addItem(i18n("Threshold")); uiGeneralTab.cbForm->addItem(i18n("Ideal")); uiGeneralTab.cbForm->addItem(i18n("Butterworth")); diff --git a/src/kdefrontend/dockwidgets/XYInterpolationCurveDock.cpp b/src/kdefrontend/dockwidgets/XYInterpolationCurveDock.cpp index 90344d7..fec6ad7 100644 --- a/src/kdefrontend/dockwidgets/XYInterpolationCurveDock.cpp +++ b/src/kdefrontend/dockwidgets/XYInterpolationCurveDock.cpp @@ -312,7 +312,7 @@ void XYInterpolationCurveDock::xDataColumnChanged(const QModelIndex& index) { else item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled); #endif - //TODO: minimum/maximum for own types + // own types work with 2 or more points } } _______________________________________________ kde-doc-english mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-doc-english
