summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx66
-rw-r--r--sc/source/ui/inc/AnalysisOfVarianceDialog.hxx19
-rw-r--r--sc/source/ui/inc/reffact.hxx2
-rw-r--r--sc/source/ui/view/tabvwshc.cxx11
4 files changed, 43 insertions, 55 deletions
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index b8284c6f885d..0dc391a17e2f 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -67,10 +67,10 @@ OUString lclCreateMultiParameterFormula(
return aResult.makeStringAndClear();
}
-void lclMakeSubRangesList(ScRangeList& rRangeList, const ScRange& rInputRange, ScStatisticsInputOutputDialog::GroupedBy aGroupedBy)
+void lclMakeSubRangesList(ScRangeList& rRangeList, const ScRange& rInputRange, ScStatisticsInputOutputDialogController::GroupedBy aGroupedBy)
{
std::unique_ptr<DataRangeIterator> pIterator;
- if (aGroupedBy == ScStatisticsInputOutputDialog::BY_COLUMN)
+ if (aGroupedBy == ScStatisticsInputOutputDialogController::BY_COLUMN)
pIterator.reset(new DataRangeByColumnIterator(rInputRange));
else
pIterator.reset(new DataRangeByRowIterator(rInputRange));
@@ -86,43 +86,33 @@ void lclMakeSubRangesList(ScRangeList& rRangeList, const ScRange& rInputRange, S
ScAnalysisOfVarianceDialog::ScAnalysisOfVarianceDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- vcl::Window* pParent, ScViewData* pViewData ) :
- ScStatisticsInputOutputDialog(
+ weld::Window* pParent, ScViewData* pViewData )
+ : ScStatisticsInputOutputDialogController(
pSfxBindings, pChildWindow, pParent, pViewData,
- "AnalysisOfVarianceDialog", "modules/scalc/ui/analysisofvariancedialog.ui" ),
- meFactor(SINGLE_FACTOR)
+ "modules/scalc/ui/analysisofvariancedialog.ui",
+ "AnalysisOfVarianceDialog")
+ , meFactor(SINGLE_FACTOR)
+ , mxAlphaField(m_xBuilder->weld_spin_button("alpha-spin"))
+ , mxSingleFactorRadio(m_xBuilder->weld_radio_button("radio-single-factor"))
+ , mxTwoFactorRadio(m_xBuilder->weld_radio_button("radio-two-factor"))
+ , mxRowsPerSampleField(m_xBuilder->weld_spin_button("rows-per-sample-spin"))
{
- get(mpAlphaField, "alpha-spin");
- get(mpSingleFactorRadio, "radio-single-factor");
- get(mpTwoFactorRadio, "radio-two-factor");
- get(mpRowsPerSampleField, "rows-per-sample-spin");
+ mxSingleFactorRadio->connect_toggled( LINK( this, ScAnalysisOfVarianceDialog, FactorChanged ) );
+ mxTwoFactorRadio->connect_toggled( LINK( this, ScAnalysisOfVarianceDialog, FactorChanged ) );
- mpSingleFactorRadio->SetToggleHdl( LINK( this, ScAnalysisOfVarianceDialog, FactorChanged ) );
- mpTwoFactorRadio->SetToggleHdl( LINK( this, ScAnalysisOfVarianceDialog, FactorChanged ) );
-
- mpSingleFactorRadio->Check();
- mpTwoFactorRadio->Check(false);
+ mxSingleFactorRadio->set_active(true);
+ mxTwoFactorRadio->set_active(false);
FactorChanged();
}
ScAnalysisOfVarianceDialog::~ScAnalysisOfVarianceDialog()
{
- disposeOnce();
-}
-
-void ScAnalysisOfVarianceDialog::dispose()
-{
- mpAlphaField.clear();
- mpSingleFactorRadio.clear();
- mpTwoFactorRadio.clear();
- mpRowsPerSampleField.clear();
- ScStatisticsInputOutputDialog::dispose();
}
-bool ScAnalysisOfVarianceDialog::Close()
+void ScAnalysisOfVarianceDialog::Close()
{
- return DoClose( ScAnalysisOfVarianceDialogWrapper::GetChildWindowId() );
+ DoClose( ScAnalysisOfVarianceDialogWrapper::GetChildWindowId() );
}
const char* ScAnalysisOfVarianceDialog::GetUndoNameId()
@@ -130,25 +120,25 @@ const char* ScAnalysisOfVarianceDialog::GetUndoNameId()
return STR_ANALYSIS_OF_VARIANCE_UNDO_NAME;
}
-IMPL_LINK_NOARG( ScAnalysisOfVarianceDialog, FactorChanged, RadioButton&, void )
+IMPL_LINK_NOARG( ScAnalysisOfVarianceDialog, FactorChanged, weld::ToggleButton&, void )
{
FactorChanged();
}
void ScAnalysisOfVarianceDialog::FactorChanged()
{
- if (mpSingleFactorRadio->IsChecked())
+ if (mxSingleFactorRadio->get_active())
{
- mpGroupByRowsRadio->Enable();
- mpGroupByColumnsRadio->Enable();
- mpRowsPerSampleField->Enable(false);
+ mxGroupByRowsRadio->set_sensitive(true);
+ mxGroupByColumnsRadio->set_sensitive(true);
+ mxRowsPerSampleField->set_sensitive(false);
meFactor = SINGLE_FACTOR;
}
- else if (mpTwoFactorRadio->IsChecked())
+ else if (mxTwoFactorRadio->get_active())
{
- mpGroupByRowsRadio->Enable(false);
- mpGroupByColumnsRadio->Enable(false);
- mpRowsPerSampleField->Enable(false); // Rows per sample not yet implemented
+ mxGroupByRowsRadio->set_sensitive(false);
+ mxGroupByColumnsRadio->set_sensitive(false);
+ mxRowsPerSampleField->set_sensitive(false); // Rows per sample not yet implemented
meFactor = TWO_FACTOR;
}
}
@@ -193,7 +183,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
output.writeBoldString(ScResId(STR_ANOVA_SINGLE_FACTOR_LABEL));
output.newLine();
- double aAlphaValue = mpAlphaField->GetValue() / 100.0;
+ double aAlphaValue = mxAlphaField->get_value() / 100.0;
output.writeString(ScResId(STR_LABEL_ALPHA));
output.nextColumn();
output.writeValue(aAlphaValue);
@@ -340,7 +330,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For
output.writeBoldString(ScResId(STR_ANOVA_TWO_FACTOR_LABEL));
output.newLine();
- double aAlphaValue = mpAlphaField->GetValue() / 100.0;
+ double aAlphaValue = mxAlphaField->get_value() / 100.0;
output.writeString("Alpha");
output.nextColumn();
output.writeValue(aAlphaValue);
diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
index 0af68255b4b5..317f7d2e11fc 100644
--- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
+++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
@@ -19,7 +19,7 @@
class FormulaTemplate;
class AddressWalkerWriter;
-class ScAnalysisOfVarianceDialog : public ScStatisticsInputOutputDialog
+class ScAnalysisOfVarianceDialog : public ScStatisticsInputOutputDialogController
{
private:
enum AnovaFactor
@@ -28,16 +28,16 @@ private:
TWO_FACTOR
};
- VclPtr<NumericField> mpAlphaField;
- VclPtr<RadioButton> mpSingleFactorRadio;
- VclPtr<RadioButton> mpTwoFactorRadio;
- VclPtr<NumericField> mpRowsPerSampleField;
-
- DECL_LINK(FactorChanged, RadioButton&, void);
+ DECL_LINK(FactorChanged, weld::ToggleButton&, void);
void FactorChanged();
AnovaFactor meFactor;
+ std::unique_ptr<weld::SpinButton> mxAlphaField;
+ std::unique_ptr<weld::RadioButton> mxSingleFactorRadio;
+ std::unique_ptr<weld::RadioButton> mxTwoFactorRadio;
+ std::unique_ptr<weld::SpinButton> mxRowsPerSampleField;
+
static void RowColumn(ScRangeList& rRangeList, AddressWalkerWriter& aOutput,
FormulaTemplate& aTemplate, const OUString& sFormula,
GroupedBy aGroupedBy, ScRange* pResultRange);
@@ -48,12 +48,11 @@ private:
public:
ScAnalysisOfVarianceDialog(
SfxBindings* pB, SfxChildWindow* pCW,
- vcl::Window* pParent, ScViewData* pViewData );
+ weld::Window* pParent, ScViewData* pViewData );
virtual ~ScAnalysisOfVarianceDialog() override;
- virtual void dispose() override;
- virtual bool Close() override;
+ virtual void Close() override;
protected:
virtual const char* GetUndoNameId() override;
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index c8ce5507bc08..b1dda37d1249 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -72,7 +72,7 @@ private:
};
class ScAnalysisOfVarianceDialogWrapper :
- public ChildWindowWrapper<SID_ANALYSIS_OF_VARIANCE_DIALOG>
+ public ChildControllerWrapper<SID_ANALYSIS_OF_VARIANCE_DIALOG>
{
private:
ScAnalysisOfVarianceDialogWrapper() = delete;
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 545a9dc4974f..379bf2ad3f1f 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -330,12 +330,6 @@ VclPtr<SfxModelessDialog> ScTabViewShell::CreateRefDialog(
}
break;
- case SID_ANALYSIS_OF_VARIANCE_DIALOG:
- {
- pResult = VclPtr<ScAnalysisOfVarianceDialog>::Create( pB, pCW, pParent, &GetViewData() );
- }
- break;
-
case SID_COVARIANCE_DIALOG:
{
pResult = VclPtr<ScCovarianceDialog>::Create( pB, pCW, pParent, &GetViewData() );
@@ -536,6 +530,11 @@ std::unique_ptr<SfxModelessDialogController> ScTabViewShell::CreateRefDialogCont
xResult.reset(new ScDescriptiveStatisticsDialog(pB, pCW, pParent, &GetViewData()));
}
break;
+ case SID_ANALYSIS_OF_VARIANCE_DIALOG:
+ {
+ xResult.reset(new ScAnalysisOfVarianceDialog(pB, pCW, pParent, &GetViewData()));
+ }
+ break;
}
if (xResult)
generated by cgit (git 2.34.1) at 2024-08-20 23:42:37 +0000