CINXE.COM
Diff - be8a5d4495e787e1628bf053be5e3e56e0ea9565^! - core - Gitiles
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><title>Diff - be8a5d4495e787e1628bf053be5e3e56e0ea9565^! - core - Gitiles</title><link rel="stylesheet" type="text/css" href="/plugins/gitiles/+static/base.css"><!-- default customHeadTagPart --></head><body class="Site"><header class="Site-header"><div class="Header"><!-- default customHeader --><div class="Header-title"><a class="Header-image" href="https://libreoffice.org"><img src="/plugins/gitiles/+static/logo.png" height="50" alt="TDF Git"></a></div><div class="Header-menu"> <a class="Header-menuItem" href="https://gerrit.libreoffice.org/">Code Review</a> </div></div></header><div class="Site-content"><div class="Container "><div class="Breadcrumbs"><a class="Breadcrumbs-crumb" href="/?format=HTML">gerrit.libreoffice.org</a> / <a class="Breadcrumbs-crumb" href="/core/">core</a> / <a class="Breadcrumbs-crumb" href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565%5E%21/">be8a5d4495e787e1628bf053be5e3e56e0ea9565^!</a> / <span class="Breadcrumbs-crumb">.</span></div><div class="u-monospace Metadata"><table><tr><th class="Metadata-title">commit</th><td>be8a5d4495e787e1628bf053be5e3e56e0ea9565</td><td><span>[<a href="/core/+log/be8a5d4495e787e1628bf053be5e3e56e0ea9565/">log</a>]</span><!-- <span>[<a href="/core/+archive/be8a5d4495e787e1628bf053be5e3e56e0ea9565/.tar.gz">tgz</a>]</span>--></td></tr><tr><th class="Metadata-title">author</th><td><a class="u-author" href="/core/+log/be8a5d4495e787e1628bf053be5e3e56e0ea9565/?author=tomaz.vajngerl%40collabora.com">Toma啪 Vajngerl <tomaz.vajngerl@collabora.com></a></td><td>Sun Nov 08 18:50:08 2015 +0100</td></tr><tr><th class="Metadata-title">committer</th><td><a class="u-committer" href="/core/+log/be8a5d4495e787e1628bf053be5e3e56e0ea9565/?committer=tomaz.vajngerl%40collabora.com">Toma啪 Vajngerl <tomaz.vajngerl@collabora.com></a></td><td>Sun Nov 08 19:39:15 2015 +0100</td></tr><tr><th class="Metadata-title">tree</th><td><a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/">b4f2f74355706875e24eaa0e38dae6c563e519d3</a></td></tr><tr><th class="Metadata-title">parent</th><td><a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565%5E">1e81e82a3f49bf2482bd28948154724c2ee5124f</a> <span>[<a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565%5E%21/">diff</a>]</span></td></tr></table></div><pre class="u-pre u-monospace MetadataMessage"><a href="https://bugs.documentfoundation.org/show_bug.cgi?id=74667">tdf#74667</a> Regression dialog: linear, logarithmic, power Add a new statistics dialog for calculating regression. First supported regression models are linear, logarithmic and power. Change-Id: <a href="https://gerrit.libreoffice.org/#/q/I6fa18136455d4bc4d69edbaa7d19ee6b5b6e5703">I6fa18136455d4bc4d69edbaa7d19ee6b5b6e5703</a> </pre><pre class="u-pre u-monospace Diff"><a name="F0" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu">a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu">b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu</a></span> index c18bd3c..fb15369 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu#744">-744,6</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu#744">+744,14</a> @@ </span><span class="Diff-change"> <value>1</value></span> <span class="Diff-change"> </prop></span> <span class="Diff-change"> </node></span> <span class="Diff-insert"> <node oor:name=".uno:RegressionDialog" oor:op="replace"></span> <span class="Diff-insert"> <prop oor:name="Label" oor:type="xs:string"></span> <span class="Diff-insert"> <value xml:lang="en-US">~Regression...</value></span> <span class="Diff-insert"> </prop></span> <span class="Diff-insert"> <prop oor:name="Properties" oor:type="xs:int"></span> <span class="Diff-insert"> <value>1</value></span> <span class="Diff-insert"> </prop></span> <span class="Diff-insert"> </node></span> <span class="Diff-change"> <node oor:name=".uno:TTestDialog" oor:op="replace"></span> <span class="Diff-change"> <prop oor:name="Label" oor:type="xs:string"></span> <span class="Diff-change"> <value xml:lang="en-US">~t-test...</value></span> </pre><pre class="u-pre u-monospace Diff"><a name="F1" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/Library_sc.mk">a/sc/Library_sc.mk</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/Library_sc.mk">b/sc/Library_sc.mk</a></span> index 4923a714..8304a9a 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/Library_sc.mk#508">-508,6</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/Library_sc.mk#508">+508,7</a> @@ $(eval $(call gb_Library_add_exception_objects,sc,\ </span><span class="Diff-change"> sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator \</span> <span class="Diff-change"> sc/source/ui/StatisticsDialogs/MovingAverageDialog \</span> <span class="Diff-change"> sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog \</span> <span class="Diff-insert"> sc/source/ui/StatisticsDialogs/RegressionDialog \</span> <span class="Diff-change"> sc/source/ui/StatisticsDialogs/SamplingDialog \</span> <span class="Diff-change"> sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog \</span> <span class="Diff-change"> sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog \</span> </pre><pre class="u-pre u-monospace Diff"><a name="F2" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/UIConfig_scalc.mk">a/sc/UIConfig_scalc.mk</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/UIConfig_scalc.mk">b/sc/UIConfig_scalc.mk</a></span> index 5e4be53..051e2bf 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/UIConfig_scalc.mk#138">-138,6</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/UIConfig_scalc.mk#138">+138,7</a> @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ </span><span class="Diff-change"> sc/uiconfig/scalc/ui/protectsheetdlg \</span> <span class="Diff-change"> sc/uiconfig/scalc/ui/queryrunstreamscriptdialog \</span> <span class="Diff-change"> sc/uiconfig/scalc/ui/randomnumbergenerator \</span> <span class="Diff-insert"> sc/uiconfig/scalc/ui/regressiondialog \</span> <span class="Diff-change"> sc/uiconfig/scalc/ui/retypepassdialog \</span> <span class="Diff-change"> sc/uiconfig/scalc/ui/retypepassworddialog \</span> <span class="Diff-change"> sc/uiconfig/scalc/ui/rightfooterdialog \</span> </pre><pre class="u-pre u-monospace Diff"><a name="F3" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/inc/sc.hrc">a/sc/inc/sc.hrc</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/inc/sc.hrc">b/sc/inc/sc.hrc</a></span> index c332cd2..f49b3fd 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/inc/sc.hrc#269">-269,11</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/inc/sc.hrc#269">+269,12</a> @@ </span><span class="Diff-change">#define SID_COVARIANCE_DIALOG (SC_MESSAGE_START + 75)</span> <span class="Diff-change">#define SID_EXPONENTIAL_SMOOTHING_DIALOG (SC_MESSAGE_START + 76)</span> <span class="Diff-change">#define SID_MOVING_AVERAGE_DIALOG (SC_MESSAGE_START + 77)</span> <span class="Diff-delete">#define SID_TTEST_DIALOG (SC_MESSAGE_START + 7<span class="Diff-mark">8</span>)</span> <span class="Diff-delete">#define SID_FTEST_DIALOG (SC_MESSAGE_START + <span class="Diff-mark">79</span>)</span> <span class="Diff-delete">#define SID_ZTEST_DIALOG (SC_MESSAGE_START + 8<span class="Diff-mark">0</span>)</span> <span class="Diff-delete">#define SID_CHI_SQUARE_TEST_DIALOG (SC_MESSAGE_START + 8<span class="Diff-mark">1</span>)</span> <span class="Diff-delete">#define SID_SEARCH_RESULTS_DIALOG (SC_MESSAGE_START + 8<span class="Diff-mark">2</span>)</span> <span class="Diff-insert">#define SID_REGRESSION_DIALOG (SC_MESSAGE_START + 78)</span> <span class="Diff-insert">#define SID_TTEST_DIALOG (SC_MESSAGE_START + 7<span class="Diff-mark">9</span>)</span> <span class="Diff-insert">#define SID_FTEST_DIALOG (SC_MESSAGE_START + <span class="Diff-mark">80</span>)</span> <span class="Diff-insert">#define SID_ZTEST_DIALOG (SC_MESSAGE_START + 8<span class="Diff-mark">1</span>)</span> <span class="Diff-insert">#define SID_CHI_SQUARE_TEST_DIALOG (SC_MESSAGE_START + 8<span class="Diff-mark">2</span>)</span> <span class="Diff-insert">#define SID_SEARCH_RESULTS_DIALOG (SC_MESSAGE_START + 8<span class="Diff-mark">3</span>)</span> <span class="Diff-change"></span> <span class="Diff-change">// functions</span> <span class="Diff-change"></span> </pre><pre class="u-pre u-monospace Diff"><a name="F4" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/sdi/cellsh.sdi">a/sc/sdi/cellsh.sdi</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/sdi/cellsh.sdi">b/sc/sdi/cellsh.sdi</a></span> index f043ebd..346baa6 100644 --- a/sc/sdi/cellsh.sdi +++ b/sc/sdi/cellsh.sdi </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/sdi/cellsh.sdi#162">-162,6</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/sdi/cellsh.sdi#162">+162,7</a> @@ interface CellSelection </span><span class="Diff-change"> SID_CORRELATION_DIALOG [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]</span> <span class="Diff-change"> SID_COVARIANCE_DIALOG [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]</span> <span class="Diff-change"> SID_EXPONENTIAL_SMOOTHING_DIALOG [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]</span> <span class="Diff-insert"> SID_REGRESSION_DIALOG [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]</span> <span class="Diff-change"> SID_MOVING_AVERAGE_DIALOG [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]</span> <span class="Diff-change"> SID_TTEST_DIALOG [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]</span> <span class="Diff-change"> SID_FTEST_DIALOG [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]</span> </pre><pre class="u-pre u-monospace Diff"><a name="F5" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/sdi/scalc.sdi">a/sc/sdi/scalc.sdi</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/sdi/scalc.sdi">b/sc/sdi/scalc.sdi</a></span> index a33801b..dd91da2 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/sdi/scalc.sdi#3159">-3159,6</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/sdi/scalc.sdi#3159">+3159,30</a> @@ SfxVoidItem MovingAverageDialog SID_MOVING_AVERAGE_DIALOG </span><span class="Diff-change"> GroupId = GID_OPTIONS;</span> <span class="Diff-change">]</span> <span class="Diff-change"></span> <span class="Diff-insert">SfxVoidItem RegressionDialog SID_REGRESSION_DIALOG</span> <span class="Diff-insert">()</span> <span class="Diff-insert">[</span> <span class="Diff-insert"> /* flags: */</span> <span class="Diff-insert"> AutoUpdate = FALSE,</span> <span class="Diff-insert"> Cachable = Cachable,</span> <span class="Diff-insert"> FastCall = FALSE,</span> <span class="Diff-insert"> HasCoreId = FALSE,</span> <span class="Diff-insert"> HasDialog = TRUE,</span> <span class="Diff-insert"> ReadOnlyDoc = TRUE,</span> <span class="Diff-insert"> Toggle = FALSE,</span> <span class="Diff-insert"> Container = FALSE,</span> <span class="Diff-insert"> RecordAbsolute = FALSE,</span> <span class="Diff-insert"> RecordPerSet;</span> <span class="Diff-insert"> Synchron;</span> <span class="Diff-insert"></span> <span class="Diff-insert"> /* config: */</span> <span class="Diff-insert"> AccelConfig = TRUE,</span> <span class="Diff-insert"> MenuConfig = TRUE,</span> <span class="Diff-insert"> StatusBarConfig = FALSE,</span> <span class="Diff-insert"> ToolBoxConfig = TRUE,</span> <span class="Diff-insert"> GroupId = GID_OPTIONS;</span> <span class="Diff-insert">]</span> <span class="Diff-insert"></span> <span class="Diff-change">SfxVoidItem TTestDialog SID_TTEST_DIALOG</span> <span class="Diff-change">()</span> <span class="Diff-change">[</span> </pre><pre class="u-pre u-monospace Diff"><a name="F6" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx">b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx</a></span> new file mode 100644 index 0000000..b6a5b6d --- /dev/null +++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ -0,0 +1,232 @@ </span><span class="Diff-insert">/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */</span> <span class="Diff-insert">/*</span> <span class="Diff-insert"> * This file is part of the LibreOffice project.</span> <span class="Diff-insert"> *</span> <span class="Diff-insert"> * This Source Code Form is subject to the terms of the Mozilla Public</span> <span class="Diff-insert"> * License, v. 2.0. If a copy of the MPL was not distributed with this</span> <span class="Diff-insert"> * file, You can obtain one at http://mozilla.org/MPL/2.0/.</span> <span class="Diff-insert"> *</span> <span class="Diff-insert"> */</span> <span class="Diff-insert"></span> <span class="Diff-insert">#include <sfx2/dispatch.hxx></span> <span class="Diff-insert">#include <svl/zforlist.hxx></span> <span class="Diff-insert">#include <svl/undo.hxx></span> <span class="Diff-insert"></span> <span class="Diff-insert">#include "formulacell.hxx"</span> <span class="Diff-insert">#include "rangelst.hxx"</span> <span class="Diff-insert">#include "scitems.hxx"</span> <span class="Diff-insert">#include "docsh.hxx"</span> <span class="Diff-insert">#include "document.hxx"</span> <span class="Diff-insert">#include "uiitems.hxx"</span> <span class="Diff-insert">#include "reffact.hxx"</span> <span class="Diff-insert">#include "strload.hxx"</span> <span class="Diff-insert">#include "docfunc.hxx"</span> <span class="Diff-insert">#include "StatisticsDialogs.hrc"</span> <span class="Diff-insert">#include "TableFillingAndNavigationTools.hxx"</span> <span class="Diff-insert"></span> <span class="Diff-insert">#include "RegressionDialog.hxx"</span> <span class="Diff-insert"></span> <span class="Diff-insert">namespace</span> <span class="Diff-insert">{</span> <span class="Diff-insert"> sal_Int16 constRegressionModel[] =</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> STR_LABEL_LINEAR,</span> <span class="Diff-insert"> STR_LABEL_LOGARITHMIC,</span> <span class="Diff-insert"> STR_LABEL_POWER</span> <span class="Diff-insert"> };</span> <span class="Diff-insert"></span> <span class="Diff-insert"> OUString constTemplateRSQUARED[] =</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> "=RSQ(%VARIABLE2_RANGE% ; %VARIABLE1_RANGE%)",</span> <span class="Diff-insert"> "=RSQ(%VARIABLE2_RANGE% ; LN(%VARIABLE1_RANGE%))",</span> <span class="Diff-insert"> "=RSQ(LN(%VARIABLE2_RANGE%) ; LN(%VARIABLE1_RANGE%))"</span> <span class="Diff-insert"> };</span> <span class="Diff-insert"></span> <span class="Diff-insert"> OUString constTemplatesSTDERR[] =</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> "=STEYX(%VARIABLE2_RANGE% ; %VARIABLE1_RANGE%)",</span> <span class="Diff-insert"> "=STEYX(%VARIABLE2_RANGE% ; LN(%VARIABLE1_RANGE%))",</span> <span class="Diff-insert"> "=STEYX(LN(%VARIABLE2_RANGE%) ; LN(%VARIABLE1_RANGE%))"</span> <span class="Diff-insert"> };</span> <span class="Diff-insert"></span> <span class="Diff-insert"> OUString constTemplatesSLOPE[] =</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> "=SLOPE(%VARIABLE2_RANGE% ; %VARIABLE1_RANGE%)",</span> <span class="Diff-insert"> "=SLOPE(%VARIABLE2_RANGE% ; LN(%VARIABLE1_RANGE%))",</span> <span class="Diff-insert"> "=EXP(INTERCEPT(LN(%VARIABLE2_RANGE%) ; LN(%VARIABLE1_RANGE%)))"</span> <span class="Diff-insert"> };</span> <span class="Diff-insert"></span> <span class="Diff-insert"> OUString constTemplatesINTERCEPT[] =</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> "=INTERCEPT(%VARIABLE2_RANGE% ; %VARIABLE1_RANGE%)",</span> <span class="Diff-insert"> "=INTERCEPT(%VARIABLE2_RANGE% ; LN(%VARIABLE1_RANGE%))",</span> <span class="Diff-insert"> "=SLOPE(LN(%VARIABLE2_RANGE%) ; LN(%VARIABLE1_RANGE%))"</span> <span class="Diff-insert"> };</span> <span class="Diff-insert"></span> <span class="Diff-insert"> OUString constRegressionFormula[] =</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> "=%A% * %ADDRESS% + %B%",</span> <span class="Diff-insert"> "=%A% * LN(%ADDRESS%) + %B%",</span> <span class="Diff-insert"> "=%A% * %ADDRESS% ^ %B%"</span> <span class="Diff-insert"> };</span> <span class="Diff-insert"></span> <span class="Diff-insert">} // end anonymous namespace</span> <span class="Diff-insert"></span> <span class="Diff-insert">ScRegressionDialog::ScRegressionDialog(</span> <span class="Diff-insert"> SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,</span> <span class="Diff-insert"> vcl::Window* pParent, ScViewData* pViewData ) :</span> <span class="Diff-insert"> ScStatisticsTwoVariableDialog(</span> <span class="Diff-insert"> pSfxBindings, pChildWindow, pParent, pViewData,</span> <span class="Diff-insert"> "RegressionDialog", "modules/scalc/ui/regressiondialog.ui" )</span> <span class="Diff-insert">{</span> <span class="Diff-insert"> get(mpLinearCheckBox, "linear-check");</span> <span class="Diff-insert"> get(mpLogarithmicCheckBox, "logarithmic-check");</span> <span class="Diff-insert"> get(mpPowerCheckBox, "power-check");</span> <span class="Diff-insert">}</span> <span class="Diff-insert"></span> <span class="Diff-insert">ScRegressionDialog::~ScRegressionDialog()</span> <span class="Diff-insert">{}</span> <span class="Diff-insert"></span> <span class="Diff-insert">bool ScRegressionDialog::Close()</span> <span class="Diff-insert">{</span> <span class="Diff-insert"> return DoClose(ScRegressionDialogWrapper::GetChildWindowId());</span> <span class="Diff-insert">}</span> <span class="Diff-insert"></span> <span class="Diff-insert">sal_Int16 ScRegressionDialog::GetUndoNameId()</span> <span class="Diff-insert">{</span> <span class="Diff-insert"> return STR_REGRESSION_UNDO_NAME;</span> <span class="Diff-insert">}</span> <span class="Diff-insert"></span> <span class="Diff-insert">ScRange ScRegressionDialog::ApplyOutput(ScDocShell* pDocShell)</span> <span class="Diff-insert">{</span> <span class="Diff-insert"> AddressWalkerWriter aOutput(mOutputAddress, pDocShell, mDocument,</span> <span class="Diff-insert"> formula::FormulaGrammar::mergeToGrammar( formula::FormulaGrammar::GRAM_ENGLISH, mAddressDetails.eConv));</span> <span class="Diff-insert"> FormulaTemplate aTemplate(mDocument);</span> <span class="Diff-insert"> aTemplate.autoReplaceUses3D(false);</span> <span class="Diff-insert"></span> <span class="Diff-insert"> std::unique_ptr<DataRangeIterator> pVariable1Iterator;</span> <span class="Diff-insert"> if (mGroupedBy == BY_COLUMN)</span> <span class="Diff-insert"> pVariable1Iterator.reset(new DataRangeByColumnIterator(mVariable1Range));</span> <span class="Diff-insert"> else</span> <span class="Diff-insert"> pVariable1Iterator.reset(new DataRangeByRowIterator(mVariable1Range));</span> <span class="Diff-insert"></span> <span class="Diff-insert"> std::unique_ptr<DataRangeIterator> pVariable2Iterator;</span> <span class="Diff-insert"> if (mGroupedBy == BY_COLUMN)</span> <span class="Diff-insert"> pVariable2Iterator.reset(new DataRangeByColumnIterator(mVariable2Range));</span> <span class="Diff-insert"> else</span> <span class="Diff-insert"> pVariable2Iterator.reset(new DataRangeByRowIterator(mVariable2Range));</span> <span class="Diff-insert"></span> <span class="Diff-insert"> aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get());</span> <span class="Diff-insert"> aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get());</span> <span class="Diff-insert"></span> <span class="Diff-insert"> aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_REGRESSION));</span> <span class="Diff-insert"> aOutput.newLine();</span> <span class="Diff-insert"> aOutput.newLine();</span> <span class="Diff-insert"> aOutput.push();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> // REGRESSION MODEL</span> <span class="Diff-insert"> aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_REGRESSION_MODEL));</span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> // RSQUARED</span> <span class="Diff-insert"> aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_RSQUARED));</span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> // Standard Error</span> <span class="Diff-insert"> aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STRID_CALC_STD_ERROR));</span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> // Slope</span> <span class="Diff-insert"> aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_SLOPE));</span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> // Intercept</span> <span class="Diff-insert"> aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_INTERCEPT));</span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> size_t nVariable1Size = pVariable1Iterator->size();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> OUString sFormula;</span> <span class="Diff-insert"> if (mGroupedBy == BY_COLUMN)</span> <span class="Diff-insert"> sFormula = "=INDEX(%VARIABLE1_RANGE%; %VAR1_CELL_INDEX%; 1)";</span> <span class="Diff-insert"> else</span> <span class="Diff-insert"> sFormula = "=INDEX(%VARIABLE1_RANGE%; 1; %VAR1_CELL_INDEX%)";</span> <span class="Diff-insert"></span> <span class="Diff-insert"> for (size_t i = 0; i < nVariable1Size; i++)</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> aTemplate.setTemplate(sFormula);</span> <span class="Diff-insert"> aTemplate.applyNumber("%VAR1_CELL_INDEX%", i + 1);</span> <span class="Diff-insert"> aOutput.writeFormula(aTemplate.getTemplate());</span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"> }</span> <span class="Diff-insert"></span> <span class="Diff-insert"> aOutput.reset();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> bool aEnabledRegressionTypes[3];</span> <span class="Diff-insert"></span> <span class="Diff-insert"> aEnabledRegressionTypes[0] = mpLinearCheckBox->IsChecked();</span> <span class="Diff-insert"> aEnabledRegressionTypes[1] = mpLogarithmicCheckBox->IsChecked();</span> <span class="Diff-insert"> aEnabledRegressionTypes[2] = mpPowerCheckBox->IsChecked();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> sal_Int16 nColumn = 0;</span> <span class="Diff-insert"></span> <span class="Diff-insert"> for (size_t nRegressionIndex = 0; nRegressionIndex < SAL_N_ELEMENTS(aEnabledRegressionTypes); ++nRegressionIndex)</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> if (!aEnabledRegressionTypes[nRegressionIndex])</span> <span class="Diff-insert"> continue;</span> <span class="Diff-insert"></span> <span class="Diff-insert"> aOutput.nextColumn();</span> <span class="Diff-insert"> nColumn += 1;</span> <span class="Diff-insert"></span> <span class="Diff-insert"> // REGRESSION MODEL</span> <span class="Diff-insert"> aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, constRegressionModel[nRegressionIndex]));</span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> // RSQUARED</span> <span class="Diff-insert"> aTemplate.setTemplate(constTemplateRSQUARED[nRegressionIndex]);</span> <span class="Diff-insert"> aOutput.writeMatrixFormula(aTemplate.getTemplate());</span> <span class="Diff-insert"> aTemplate.autoReplaceAddress("%RSQUARED%", aOutput.current());</span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> // Standard Error</span> <span class="Diff-insert"> aTemplate.setTemplate(constTemplatesSTDERR[nRegressionIndex]);</span> <span class="Diff-insert"> aOutput.writeMatrixFormula(aTemplate.getTemplate());</span> <span class="Diff-insert"> aTemplate.autoReplaceAddress("%STD_ERROR%", aOutput.current());</span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> // Slope</span> <span class="Diff-insert"> aTemplate.setTemplate(constTemplatesSLOPE[nRegressionIndex]);</span> <span class="Diff-insert"> aOutput.writeMatrixFormula(aTemplate.getTemplate());</span> <span class="Diff-insert"> aTemplate.autoReplaceAddress("%A%", aOutput.current());</span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> // Intercept</span> <span class="Diff-insert"> aTemplate.setTemplate(constTemplatesINTERCEPT[nRegressionIndex]);</span> <span class="Diff-insert"> aOutput.writeMatrixFormula(aTemplate.getTemplate());</span> <span class="Diff-insert"> aTemplate.autoReplaceAddress("%B%", aOutput.current());</span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> for (size_t i = 0; i < nVariable1Size; i++)</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> aTemplate.setTemplate(constRegressionFormula[nRegressionIndex]);</span> <span class="Diff-insert"> aTemplate.applyAddress("%ADDRESS%", aOutput.current(-nColumn), false);</span> <span class="Diff-insert"> aOutput.writeFormula(aTemplate.getTemplate());</span> <span class="Diff-insert"></span> <span class="Diff-insert"> aOutput.nextRow();</span> <span class="Diff-insert"> }</span> <span class="Diff-insert"></span> <span class="Diff-insert"> aOutput.resetRow();</span> <span class="Diff-insert"> }</span> <span class="Diff-insert"></span> <span class="Diff-insert"> return ScRange(aOutput.mMinimumAddress, aOutput.mMaximumAddress);</span> <span class="Diff-insert">}</span> <span class="Diff-insert"></span> <span class="Diff-insert">/* vim:set shiftwidth=4 softtabstop=4 expandtab: */</span> </pre><pre class="u-pre u-monospace Diff"><a name="F7" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc">a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc">b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc</a></span> index 662dc6d..f8cbcbb 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc +++ b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc#55">-55,13</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc#55">+55,15</a> @@ </span><span class="Diff-change">#define STR_COVARIANCE_UNDO_NAME 63</span> <span class="Diff-change">#define STR_EXPONENTIAL_SMOOTHING_UNDO_NAME 64</span> <span class="Diff-change">#define STR_MOVING_AVERAGE_UNDO_NAME 65</span> <span class="Diff-delete">#define STR_TTEST 6<span class="Diff-mark">6</span></span> <span class="Diff-delete">#define STR_TTEST_UNDO_NAME 6<span class="Diff-mark">7</span></span> <span class="Diff-delete">#define STR_FTEST <span class="Diff-mark">68</span></span> <span class="Diff-delete">#define STR_FTEST_UNDO_NAME <span class="Diff-mark">69</span></span> <span class="Diff-delete">#define STR_ZTEST 7<span class="Diff-mark">0</span></span> <span class="Diff-delete">#define STR_ZTEST_UNDO_NAME 7<span class="Diff-mark">1</span></span> <span class="Diff-delete">#define STR_CHI_SQUARE_TEST 7<span class="Diff-mark">2</span></span> <span class="Diff-insert">#define STR_REGRESSION 66</span> <span class="Diff-insert">#define STR_REGRESSION_UNDO_NAME 67</span> <span class="Diff-insert">#define STR_TTEST 6<span class="Diff-mark">8</span></span> <span class="Diff-insert">#define STR_TTEST_UNDO_NAME 6<span class="Diff-mark">9</span></span> <span class="Diff-insert">#define STR_FTEST <span class="Diff-mark">70</span></span> <span class="Diff-insert">#define STR_FTEST_UNDO_NAME <span class="Diff-mark">71</span></span> <span class="Diff-insert">#define STR_ZTEST 7<span class="Diff-mark">2</span></span> <span class="Diff-insert">#define STR_ZTEST_UNDO_NAME 7<span class="Diff-mark">3</span></span> <span class="Diff-insert">#define STR_CHI_SQUARE_TEST 7<span class="Diff-mark">4</span></span> <span class="Diff-change"></span> <span class="Diff-change">#define STR_COLUMN_LABEL_TEMPLATE 100</span> <span class="Diff-change">#define STR_ROW_LABEL_TEMPLATE 101</span> <span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc#93">-93,6</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc#95">+95,15</a> @@ </span><span class="Diff-change">#define STR_CRITICAL_VALUE_LABEL 150</span> <span class="Diff-change">#define STR_TEST_STATISTIC_LABEL 151</span> <span class="Diff-change"></span> <span class="Diff-insert">#define STR_LABEL_LINEAR 160</span> <span class="Diff-insert">#define STR_LABEL_LOGARITHMIC 161</span> <span class="Diff-insert">#define STR_LABEL_POWER 162</span> <span class="Diff-insert"></span> <span class="Diff-insert">#define STR_LABEL_REGRESSION_MODEL 170</span> <span class="Diff-insert">#define STR_LABEL_RSQUARED 171</span> <span class="Diff-insert">#define STR_LABEL_SLOPE 172</span> <span class="Diff-insert">#define STR_LABEL_INTERCEPT 173</span> <span class="Diff-insert"></span> <span class="Diff-change">#define STR_FTEST_P_RIGHT_TAIL 200</span> <span class="Diff-change">#define STR_FTEST_F_CRITICAL_RIGHT_TAIL 201</span> <span class="Diff-change">#define STR_FTEST_P_LEFT_TAIL 202</span> </pre><pre class="u-pre u-monospace Diff"><a name="F8" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src">a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src">b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src</a></span> index 501e443..d807e4d 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src +++ b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src#305">-305,6</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src#305">+305,14</a> @@ Resource RID_STATISTICS_DLGS </span><span class="Diff-change"> {</span> <span class="Diff-change"> Text [ en-US ] = "Test of Independence (Chi-Square)";</span> <span class="Diff-change"> };</span> <span class="Diff-insert"> String STR_REGRESSION_UNDO_NAME</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> Text [ en-US ] = "Regression";</span> <span class="Diff-insert"> };</span> <span class="Diff-insert"> String STR_REGRESSION</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> Text [ en-US ] = "Regression";</span> <span class="Diff-insert"> };</span> <span class="Diff-change"></span> <span class="Diff-change"> /* Common */</span> <span class="Diff-change"> String STR_COLUMN_LABEL_TEMPLATE</span> <span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src#356">-356,6</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src#364">+364,38</a> @@ Resource RID_STATISTICS_DLGS </span><span class="Diff-change"> Text [ en-US ] = "Test Statistic";</span> <span class="Diff-change"> };</span> <span class="Diff-change"></span> <span class="Diff-insert"> /* RegressionDialog */</span> <span class="Diff-insert"></span> <span class="Diff-insert"> String STR_LABEL_LINEAR</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> Text [ en-US ] = "Linear";</span> <span class="Diff-insert"> };</span> <span class="Diff-insert"> String STR_LABEL_LOGARITHMIC</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> Text [ en-US ] = "Logarithmic";</span> <span class="Diff-insert"> };</span> <span class="Diff-insert"> String STR_LABEL_POWER</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> Text [ en-US ] = "Power";</span> <span class="Diff-insert"> };</span> <span class="Diff-insert"></span> <span class="Diff-insert"> String STR_LABEL_REGRESSION_MODEL</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> Text [ en-US ] = "Regression Model";</span> <span class="Diff-insert"> };</span> <span class="Diff-insert"> String STR_LABEL_RSQUARED</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> Text [ en-US ] = "R^2";</span> <span class="Diff-insert"> };</span> <span class="Diff-insert"> String STR_LABEL_SLOPE</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> Text [ en-US ] = "Slope";</span> <span class="Diff-insert"> };</span> <span class="Diff-insert"> String STR_LABEL_INTERCEPT</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> Text [ en-US ] = "Intercept";</span> <span class="Diff-insert"> };</span> <span class="Diff-insert"></span> <span class="Diff-change"> /*F Test */</span> <span class="Diff-change"> String STR_FTEST_P_RIGHT_TAIL</span> <span class="Diff-change"> {</span> </pre><pre class="u-pre u-monospace Diff"><a name="F9" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/app/scdll.cxx">a/sc/source/ui/app/scdll.cxx</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/app/scdll.cxx">b/sc/source/ui/app/scdll.cxx</a></span> index c9761f5..56cfc45 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/app/scdll.cxx#243">-243,6</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/app/scdll.cxx#243">+243,7</a> @@ void ScDLL::Init() </span><span class="Diff-change"> ScCovarianceDialogWrapper ::RegisterChildWindow(false, pMod);</span> <span class="Diff-change"> ScExponentialSmoothingDialogWrapper ::RegisterChildWindow(false, pMod);</span> <span class="Diff-change"> ScMovingAverageDialogWrapper ::RegisterChildWindow(false, pMod);</span> <span class="Diff-insert"> ScRegressionDialogWrapper ::RegisterChildWindow(false, pMod);</span> <span class="Diff-change"> ScTTestDialogWrapper ::RegisterChildWindow(false, pMod);</span> <span class="Diff-change"> ScFTestDialogWrapper ::RegisterChildWindow(false, pMod);</span> <span class="Diff-change"> ScZTestDialogWrapper ::RegisterChildWindow(false, pMod);</span> </pre><pre class="u-pre u-monospace Diff"><a name="F10" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git a/sc/source/ui/inc/RegressionDialog.hxx <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/inc/RegressionDialog.hxx">b/sc/source/ui/inc/RegressionDialog.hxx</a></span> new file mode 100644 index 0000000..a4c7089 --- /dev/null +++ b/sc/source/ui/inc/RegressionDialog.hxx </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ -0,0 +1,39 @@ </span><span class="Diff-insert">/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */</span> <span class="Diff-insert">/*</span> <span class="Diff-insert"> * This file is part of the LibreOffice project.</span> <span class="Diff-insert"> *</span> <span class="Diff-insert"> * This Source Code Form is subject to the terms of the Mozilla Public</span> <span class="Diff-insert"> * License, v. 2.0. If a copy of the MPL was not distributed with this</span> <span class="Diff-insert"> * file, You can obtain one at http://mozilla.org/MPL/2.0/.</span> <span class="Diff-insert"> *</span> <span class="Diff-insert"> */</span> <span class="Diff-insert"></span> <span class="Diff-insert">#ifndef INCLUDED_SC_SOURCE_UI_INC_REGRESSIONDIALOG_HXX</span> <span class="Diff-insert">#define INCLUDED_SC_SOURCE_UI_INC_REGRESSIONDIALOG_HXX</span> <span class="Diff-insert"></span> <span class="Diff-insert">#include "StatisticsTwoVariableDialog.hxx"</span> <span class="Diff-insert"></span> <span class="Diff-insert">class ScRegressionDialog : public ScStatisticsTwoVariableDialog</span> <span class="Diff-insert">{</span> <span class="Diff-insert"> VclPtr<CheckBox> mpLinearCheckBox;</span> <span class="Diff-insert"> VclPtr<CheckBox> mpLogarithmicCheckBox;</span> <span class="Diff-insert"> VclPtr<CheckBox> mpPowerCheckBox;</span> <span class="Diff-insert"></span> <span class="Diff-insert">public:</span> <span class="Diff-insert"> ScRegressionDialog(</span> <span class="Diff-insert"> SfxBindings* pB, SfxChildWindow* pCW,</span> <span class="Diff-insert"> vcl::Window* pParent, ScViewData* pViewData );</span> <span class="Diff-insert"></span> <span class="Diff-insert"> virtual ~ScRegressionDialog();</span> <span class="Diff-insert"></span> <span class="Diff-insert"> virtual bool Close() override;</span> <span class="Diff-insert"></span> <span class="Diff-insert">protected:</span> <span class="Diff-insert"> virtual sal_Int16 GetUndoNameId() override;</span> <span class="Diff-insert"> virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;</span> <span class="Diff-insert">};</span> <span class="Diff-insert"></span> <span class="Diff-insert"></span> <span class="Diff-insert">#endif</span> <span class="Diff-insert"></span> <span class="Diff-insert">/* vim:set shiftwidth=4 softtabstop=4 expandtab: */</span> </pre><pre class="u-pre u-monospace Diff"><a name="F11" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/inc/reffact.hxx">a/sc/source/ui/inc/reffact.hxx</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/inc/reffact.hxx">b/sc/source/ui/inc/reffact.hxx</a></span> index 4c6e733..142decf 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/inc/reffact.hxx#108">-108,6</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/inc/reffact.hxx#108">+108,13</a> @@ private: </span><span class="Diff-change"> ScMovingAverageDialogWrapper() = delete;</span> <span class="Diff-change">};</span> <span class="Diff-change"></span> <span class="Diff-insert">class ScRegressionDialogWrapper :</span> <span class="Diff-insert"> public ChildWindowWrapper<SID_REGRESSION_DIALOG></span> <span class="Diff-insert">{</span> <span class="Diff-insert">private:</span> <span class="Diff-insert"> ScRegressionDialogWrapper() = delete;</span> <span class="Diff-insert">};</span> <span class="Diff-insert"></span> <span class="Diff-change">class ScTTestDialogWrapper :</span> <span class="Diff-change"> public ChildWindowWrapper<SID_TTEST_DIALOG></span> <span class="Diff-change">{</span> </pre><pre class="u-pre u-monospace Diff"><a name="F12" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/view/cellsh1.cxx">a/sc/source/ui/view/cellsh1.cxx</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/view/cellsh1.cxx">b/sc/source/ui/view/cellsh1.cxx</a></span> index 4d5d912..27eb614 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/view/cellsh1.cxx#985">-985,6</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/view/cellsh1.cxx#985">+985,15</a> @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) </span><span class="Diff-change"> pScMod->SetRefDialog( nId, pWnd == nullptr );</span> <span class="Diff-change"> }</span> <span class="Diff-change"> break;</span> <span class="Diff-insert"> case SID_REGRESSION_DIALOG:</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> sal_uInt16 nId = ScRegressionDialogWrapper::GetChildWindowId();</span> <span class="Diff-insert"> SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();</span> <span class="Diff-insert"> SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );</span> <span class="Diff-insert"></span> <span class="Diff-insert"> pScMod->SetRefDialog( nId, pWnd == nullptr );</span> <span class="Diff-insert"> }</span> <span class="Diff-insert"> break;</span> <span class="Diff-change"> case SID_TTEST_DIALOG:</span> <span class="Diff-change"> {</span> <span class="Diff-change"> sal_uInt16 nId = ScTTestDialogWrapper::GetChildWindowId();</span> </pre><pre class="u-pre u-monospace Diff"><a name="F13" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/view/tabvwsh.cxx">a/sc/source/ui/view/tabvwsh.cxx</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/view/tabvwsh.cxx">b/sc/source/ui/view/tabvwsh.cxx</a></span> index a765612..f9c6f20 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/view/tabvwsh.cxx#96">-96,6</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/view/tabvwsh.cxx#96">+96,7</a> @@ void ScTabViewShell::InitInterface_Impl() </span><span class="Diff-change"> GetStaticInterface()->RegisterChildWindow(ScCovarianceDialogWrapper::GetChildWindowId());</span> <span class="Diff-change"> GetStaticInterface()->RegisterChildWindow(ScExponentialSmoothingDialogWrapper::GetChildWindowId());</span> <span class="Diff-change"> GetStaticInterface()->RegisterChildWindow(ScMovingAverageDialogWrapper::GetChildWindowId());</span> <span class="Diff-insert"> GetStaticInterface()->RegisterChildWindow(ScRegressionDialogWrapper::GetChildWindowId());</span> <span class="Diff-change"> GetStaticInterface()->RegisterChildWindow(ScTTestDialogWrapper::GetChildWindowId());</span> <span class="Diff-change"> GetStaticInterface()->RegisterChildWindow(ScFTestDialogWrapper::GetChildWindowId());</span> <span class="Diff-change"> GetStaticInterface()->RegisterChildWindow(ScZTestDialogWrapper::GetChildWindowId());</span> </pre><pre class="u-pre u-monospace Diff"><a name="F14" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/view/tabvwshc.cxx">a/sc/source/ui/view/tabvwshc.cxx</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/view/tabvwshc.cxx">b/sc/source/ui/view/tabvwshc.cxx</a></span> index de6eddc..67a73b9 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/view/tabvwshc.cxx#66">-66,6</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/view/tabvwshc.cxx#66">+66,7</a> @@ </span><span class="Diff-change">#include "CovarianceDialog.hxx"</span> <span class="Diff-change">#include "ExponentialSmoothingDialog.hxx"</span> <span class="Diff-change">#include "MovingAverageDialog.hxx"</span> <span class="Diff-insert">#include "RegressionDialog.hxx"</span> <span class="Diff-change">#include "TTestDialog.hxx"</span> <span class="Diff-change">#include "FTestDialog.hxx"</span> <span class="Diff-change">#include "ZTestDialog.hxx"</span> <span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/source/ui/view/tabvwshc.cxx#371">-371,6</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/source/ui/view/tabvwshc.cxx#372">+372,12</a> @@ VclPtr<SfxModelessDialog> ScTabViewShell::CreateRefDialog( </span><span class="Diff-change"> }</span> <span class="Diff-change"> break;</span> <span class="Diff-change"></span> <span class="Diff-insert"> case SID_REGRESSION_DIALOG:</span> <span class="Diff-insert"> {</span> <span class="Diff-insert"> pResult = VclPtr<ScRegressionDialog>::Create( pB, pCW, pParent, &GetViewData() );</span> <span class="Diff-insert"> }</span> <span class="Diff-insert"> break;</span> <span class="Diff-insert"></span> <span class="Diff-change"> case SID_TTEST_DIALOG:</span> <span class="Diff-change"> {</span> <span class="Diff-change"> pResult = VclPtr<ScTTestDialog>::Create( pB, pCW, pParent, &GetViewData() );</span> </pre><pre class="u-pre u-monospace Diff"><a name="F15" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/uiconfig/scalc/menubar/menubar.xml">a/sc/uiconfig/scalc/menubar/menubar.xml</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/uiconfig/scalc/menubar/menubar.xml">b/sc/uiconfig/scalc/menubar/menubar.xml</a></span> index fe9260f..d1113e4 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ <a href="/core/+/1e81e82a3f49bf2482bd28948154724c2ee5124f/sc/uiconfig/scalc/menubar/menubar.xml#545">-545,6</a> <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/uiconfig/scalc/menubar/menubar.xml#545">+545,7</a> @@ </span><span class="Diff-change"> <menu:menuitem menu:id=".uno:CovarianceDialog"/></span> <span class="Diff-change"> <menu:menuitem menu:id=".uno:ExponentialSmoothingDialog"/></span> <span class="Diff-change"> <menu:menuitem menu:id=".uno:MovingAverageDialog"/></span> <span class="Diff-insert"> <menu:menuitem menu:id=".uno:RegressionDialog"/></span> <span class="Diff-change"> <menu:menuitem menu:id=".uno:TTestDialog"/></span> <span class="Diff-change"> <menu:menuitem menu:id=".uno:FTestDialog"/></span> <span class="Diff-change"> <menu:menuitem menu:id=".uno:ZTestDialog"/></span> </pre><pre class="u-pre u-monospace Diff"><a name="F16" class="Diff-fileIndex"></a><span class="Diff-fileIndex">diff --git a/sc/uiconfig/scalc/ui/regressiondialog.ui <a href="/core/+/be8a5d4495e787e1628bf053be5e3e56e0ea9565/sc/uiconfig/scalc/ui/regressiondialog.ui">b/sc/uiconfig/scalc/ui/regressiondialog.ui</a></span> new file mode 100644 index 0000000..eee5af8 --- /dev/null +++ b/sc/uiconfig/scalc/ui/regressiondialog.ui </pre><pre class="u-pre u-monospace Diff-unified"><span class="Diff-hunk">@@ -0,0 +1,404 @@ </span><span class="Diff-insert"><?xml version="1.0" encoding="UTF-8"?></span> <span class="Diff-insert"><!-- Generated with glade 3.18.3 --></span> <span class="Diff-insert"><interface></span> <span class="Diff-insert"> <requires lib="gtk+" version="3.0"/></span> <span class="Diff-insert"> <requires lib="LibreOffice" version="1.0"/></span> <span class="Diff-insert"> <object class="GtkDialog" id="RegressionDialog"></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="border_width">6</property></span> <span class="Diff-insert"> <property name="title" translatable="yes">Regression</property></span> <span class="Diff-insert"> <property name="type_hint">dialog</property></span> <span class="Diff-insert"> <child internal-child="vbox"></span> <span class="Diff-insert"> <object class="GtkBox" id="dialog-vbox1"></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="orientation">vertical</property></span> <span class="Diff-insert"> <property name="spacing">12</property></span> <span class="Diff-insert"> <child internal-child="action_area"></span> <span class="Diff-insert"> <object class="GtkButtonBox" id="dialog-action_area1"></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="layout_style">end</property></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkButton" id="ok"></span> <span class="Diff-insert"> <property name="label">gtk-ok</property></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">True</property></span> <span class="Diff-insert"> <property name="can_default">True</property></span> <span class="Diff-insert"> <property name="has_default">True</property></span> <span class="Diff-insert"> <property name="receives_default">True</property></span> <span class="Diff-insert"> <property name="use_stock">True</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="expand">False</property></span> <span class="Diff-insert"> <property name="fill">True</property></span> <span class="Diff-insert"> <property name="position">0</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkButton" id="cancel"></span> <span class="Diff-insert"> <property name="label">gtk-cancel</property></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">True</property></span> <span class="Diff-insert"> <property name="can_default">True</property></span> <span class="Diff-insert"> <property name="has_default">True</property></span> <span class="Diff-insert"> <property name="receives_default">True</property></span> <span class="Diff-insert"> <property name="use_stock">True</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="expand">False</property></span> <span class="Diff-insert"> <property name="fill">True</property></span> <span class="Diff-insert"> <property name="position">1</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkButton" id="help"></span> <span class="Diff-insert"> <property name="label">gtk-help</property></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">True</property></span> <span class="Diff-insert"> <property name="receives_default">True</property></span> <span class="Diff-insert"> <property name="use_stock">True</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="expand">False</property></span> <span class="Diff-insert"> <property name="fill">True</property></span> <span class="Diff-insert"> <property name="position">2</property></span> <span class="Diff-insert"> <property name="secondary">True</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="expand">False</property></span> <span class="Diff-insert"> <property name="fill">True</property></span> <span class="Diff-insert"> <property name="pack_type">end</property></span> <span class="Diff-insert"> <property name="position">0</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkFrame" id="frame-data"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="label_xalign">0</property></span> <span class="Diff-insert"> <property name="shadow_type">none</property></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkAlignment" id="alignment1"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="top_padding">6</property></span> <span class="Diff-insert"> <property name="bottom_padding">6</property></span> <span class="Diff-insert"> <property name="left_padding">12</property></span> <span class="Diff-insert"> <property name="right_padding">12</property></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkGrid" id="grid1"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="row_spacing">6</property></span> <span class="Diff-insert"> <property name="column_spacing">12</property></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkLabel" id="variable1-range-label"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="label" translatable="yes">Variable 1 range:</property></span> <span class="Diff-insert"> <property name="use_underline">True</property></span> <span class="Diff-insert"> <property name="mnemonic_widget">variable1-range-edit</property></span> <span class="Diff-insert"> <property name="xalign">0</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="left_attach">0</property></span> <span class="Diff-insert"> <property name="top_attach">0</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="foruilo-RefEdit" id="variable1-range-edit"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">True</property></span> <span class="Diff-insert"> <property name="valign">center</property></span> <span class="Diff-insert"> <property name="hexpand">True</property></span> <span class="Diff-insert"> <property name="invisible_char">•</property></span> <span class="Diff-insert"> <property name="width_chars">30</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="left_attach">1</property></span> <span class="Diff-insert"> <property name="top_attach">0</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="foruilo-RefButton" id="variable1-range-button"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">True</property></span> <span class="Diff-insert"> <property name="receives_default">True</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="left_attach">2</property></span> <span class="Diff-insert"> <property name="top_attach">0</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkLabel" id="variable2-range-label"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="label" translatable="yes">Variable 2 range:</property></span> <span class="Diff-insert"> <property name="use_underline">True</property></span> <span class="Diff-insert"> <property name="mnemonic_widget">variable2-range-edit</property></span> <span class="Diff-insert"> <property name="xalign">0</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="left_attach">0</property></span> <span class="Diff-insert"> <property name="top_attach">1</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="foruilo-RefEdit" id="variable2-range-edit"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">True</property></span> <span class="Diff-insert"> <property name="valign">center</property></span> <span class="Diff-insert"> <property name="hexpand">True</property></span> <span class="Diff-insert"> <property name="invisible_char">•</property></span> <span class="Diff-insert"> <property name="width_chars">30</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="left_attach">1</property></span> <span class="Diff-insert"> <property name="top_attach">1</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="foruilo-RefButton" id="variable2-range-button"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">True</property></span> <span class="Diff-insert"> <property name="receives_default">True</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="left_attach">2</property></span> <span class="Diff-insert"> <property name="top_attach">1</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkLabel" id="output-range-label"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="label" translatable="yes">Results to:</property></span> <span class="Diff-insert"> <property name="use_underline">True</property></span> <span class="Diff-insert"> <property name="mnemonic_widget">variable2-range-edit</property></span> <span class="Diff-insert"> <property name="xalign">0</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="left_attach">0</property></span> <span class="Diff-insert"> <property name="top_attach">2</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="foruilo-RefEdit" id="output-range-edit"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">True</property></span> <span class="Diff-insert"> <property name="valign">center</property></span> <span class="Diff-insert"> <property name="hexpand">True</property></span> <span class="Diff-insert"> <property name="invisible_char">•</property></span> <span class="Diff-insert"> <property name="width_chars">30</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="left_attach">1</property></span> <span class="Diff-insert"> <property name="top_attach">2</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="foruilo-RefButton" id="output-range-button"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">True</property></span> <span class="Diff-insert"> <property name="receives_default">True</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="left_attach">2</property></span> <span class="Diff-insert"> <property name="top_attach">2</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child type="label"></span> <span class="Diff-insert"> <object class="GtkLabel" id="label1"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="label" translatable="yes">Data</property></span> <span class="Diff-insert"> <attributes></span> <span class="Diff-insert"> <attribute name="weight" value="bold"/></span> <span class="Diff-insert"> </attributes></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="expand">False</property></span> <span class="Diff-insert"> <property name="fill">True</property></span> <span class="Diff-insert"> <property name="position">0</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkFrame" id="frame-group"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="label_xalign">0</property></span> <span class="Diff-insert"> <property name="shadow_type">none</property></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkAlignment" id="alignment2"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="top_padding">6</property></span> <span class="Diff-insert"> <property name="bottom_padding">6</property></span> <span class="Diff-insert"> <property name="left_padding">12</property></span> <span class="Diff-insert"> <property name="right_padding">12</property></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkGrid" id="grid2"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="row_spacing">6</property></span> <span class="Diff-insert"> <property name="column_spacing">12</property></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkRadioButton" id="groupedby-columns-radio"></span> <span class="Diff-insert"> <property name="label" translatable="yes">Columns</property></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">True</property></span> <span class="Diff-insert"> <property name="receives_default">False</property></span> <span class="Diff-insert"> <property name="use_underline">True</property></span> <span class="Diff-insert"> <property name="xalign">0</property></span> <span class="Diff-insert"> <property name="active">True</property></span> <span class="Diff-insert"> <property name="draw_indicator">True</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="left_attach">0</property></span> <span class="Diff-insert"> <property name="top_attach">0</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkRadioButton" id="groupedby-rows-radio"></span> <span class="Diff-insert"> <property name="label" translatable="yes">Rows</property></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">True</property></span> <span class="Diff-insert"> <property name="receives_default">False</property></span> <span class="Diff-insert"> <property name="use_underline">True</property></span> <span class="Diff-insert"> <property name="xalign">0</property></span> <span class="Diff-insert"> <property name="draw_indicator">True</property></span> <span class="Diff-insert"> <property name="group">groupedby-columns-radio</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="left_attach">1</property></span> <span class="Diff-insert"> <property name="top_attach">0</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child type="label"></span> <span class="Diff-insert"> <object class="GtkLabel" id="label2"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="label" translatable="yes">Grouped by</property></span> <span class="Diff-insert"> <attributes></span> <span class="Diff-insert"> <attribute name="weight" value="bold"/></span> <span class="Diff-insert"> </attributes></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="expand">False</property></span> <span class="Diff-insert"> <property name="fill">True</property></span> <span class="Diff-insert"> <property name="position">1</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkFrame" id="frame-param"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="label_xalign">0</property></span> <span class="Diff-insert"> <property name="shadow_type">none</property></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkAlignment" id="alignment5"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="top_padding">6</property></span> <span class="Diff-insert"> <property name="bottom_padding">6</property></span> <span class="Diff-insert"> <property name="left_padding">12</property></span> <span class="Diff-insert"> <property name="right_padding">12</property></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkGrid" id="grid4"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="row_spacing">6</property></span> <span class="Diff-insert"> <property name="column_spacing">12</property></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkCheckButton" id="linear-check"></span> <span class="Diff-insert"> <property name="label" translatable="yes">Linear Regression</property></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">True</property></span> <span class="Diff-insert"> <property name="receives_default">False</property></span> <span class="Diff-insert"> <property name="xalign">0</property></span> <span class="Diff-insert"> <property name="active">True</property></span> <span class="Diff-insert"> <property name="draw_indicator">True</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="left_attach">0</property></span> <span class="Diff-insert"> <property name="top_attach">0</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkCheckButton" id="logarithmic-check"></span> <span class="Diff-insert"> <property name="label" translatable="yes">Logarithmic Regression</property></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">True</property></span> <span class="Diff-insert"> <property name="receives_default">False</property></span> <span class="Diff-insert"> <property name="xalign">0</property></span> <span class="Diff-insert"> <property name="draw_indicator">True</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="left_attach">0</property></span> <span class="Diff-insert"> <property name="top_attach">1</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child></span> <span class="Diff-insert"> <object class="GtkCheckButton" id="power-check"></span> <span class="Diff-insert"> <property name="label" translatable="yes">Power Regression</property></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">True</property></span> <span class="Diff-insert"> <property name="receives_default">False</property></span> <span class="Diff-insert"> <property name="xalign">0</property></span> <span class="Diff-insert"> <property name="draw_indicator">True</property></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="left_attach">0</property></span> <span class="Diff-insert"> <property name="top_attach">2</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <child type="label"></span> <span class="Diff-insert"> <object class="GtkLabel" id="label3"></span> <span class="Diff-insert"> <property name="visible">True</property></span> <span class="Diff-insert"> <property name="can_focus">False</property></span> <span class="Diff-insert"> <property name="label" translatable="yes">Output Regression Types</property></span> <span class="Diff-insert"> <attributes></span> <span class="Diff-insert"> <attribute name="weight" value="bold"/></span> <span class="Diff-insert"> </attributes></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <packing></span> <span class="Diff-insert"> <property name="expand">False</property></span> <span class="Diff-insert"> <property name="fill">True</property></span> <span class="Diff-insert"> <property name="position">2</property></span> <span class="Diff-insert"> </packing></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> </child></span> <span class="Diff-insert"> <action-widgets></span> <span class="Diff-insert"> <action-widget response="0">ok</action-widget></span> <span class="Diff-insert"> </action-widgets></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"> <object class="GtkSizeGroup" id="sizegroup1"></span> <span class="Diff-insert"> <widgets></span> <span class="Diff-insert"> <widget name="variable1-range-label"/></span> <span class="Diff-insert"> <widget name="variable2-range-label"/></span> <span class="Diff-insert"> <widget name="output-range-label"/></span> <span class="Diff-insert"> <widget name="groupedby-columns-radio"/></span> <span class="Diff-insert"> </widgets></span> <span class="Diff-insert"> </object></span> <span class="Diff-insert"></interface></span> </pre></div> <!-- Container --></div> <!-- Site-content --><!-- default customFooter --><footer class="Site-footer"><div class="Footer"><span class="Footer-poweredBy">Powered by <a href="https://gerrit.googlesource.com/gitiles/">Gitiles</a></span><span class="Footer-legal"><a class="Footer-legalItem" href="https://www.documentfoundation.org/imprint">Impressum (Legal Info)</a> <a class="Footer-legalItem" href="https://www.documentfoundation.org/privacy">Privacy policy</a></span></div></footer></body></html>