ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

chart2: keep histogram axis labels in sync with bin settings

Browse Source 
Histogram bin-property changes regenerated the category sequence stored
on the data series, while the X axis continued referencing the previous
sequence. This left the chart bars updated but displayed stale bin
labels.

Keep the category sequence produced by HistogramDataInterpreter on both
the diagram axis and data series. Update its binning parameters in place
when histogram properties change, allowing existing listeners to
recalculate and redraw the axis labels.

Signed-off-by: Devansh Varshney <varshney.devansh614@gmail.com>
Change-Id: Ibd6679bddf29de5fa1fd903af9274259b2e9c243
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/9282
Reviewed-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.com>
Tested-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.com>
(cherry picked from commit 0103afa2a6a746ce54a0e3e4297e1fa60698ef03)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/209218
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Devansh Varshney
2026-09-01 14:00:42 +02:00
committed by Xisco Fauli
parent 13650bcefe
commit 22b73ccfdc
5 changed files with 117 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chart2/qa/extras/chart2import2.cxx
+43 -3
View File
@@ -1215,9 +1215,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testHistogramXLSXRoundtrip)
= getDataSequenceFromDocByRole(xChartDoc, u"calculated-y");
CPPUNIT_ASSERT(!xCalculatedY.is());
// The X axis must carry the bin range labels from the histogram template,
// not the generic "1", "2", ... labels that the OOXML axis converter
// produces by default.
// The X axis carries the bin range labels from the histogram template, not the generic
// "1", "2", ... labels that the OOXML axis converter produces by default. The axis and the
// series read the same sequence, so the labels match the ones asserted for the series.
Reference<chart2::XAxis> xXAxis = getAxisFromDoc(xChartDoc, 0, 0, 0);
CPPUNIT_ASSERT(xXAxis.is());
chart2::ScaleData aScaleData = xXAxis->getScaleData();
@@ -1257,6 +1257,46 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testHistogramXLSXRoundtrip)
CPPUNIT_ASSERT_EQUAL(2.5, fBinWidth);
}
CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testHistogramBinCountLiveUpdate)
{
loadFromFile(u"fods/tdf163727_histogram_roundtrip.fods");
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc.is());
Reference<chart2::XChartType> xChartType = getChartTypeFromDoc(xChartDoc, 0, 0);
CPPUNIT_ASSERT(xChartType.is());
// Keep the category sequence currently held by the X axis. Changing the
// bin count must update this same sequence instead of leaving it stale
Reference<chart2::XAxis> xXAxis = getAxisFromDoc(xChartDoc, 0, 0, 0);
CPPUNIT_ASSERT(xXAxis.is());
chart2::ScaleData aScaleData = xXAxis->getScaleData();
CPPUNIT_ASSERT(aScaleData.Categories.is());
Reference<chart2::data::XTextualDataSequence> xAxisCategories(
aScaleData.Categories->getValues(), uno::UNO_QUERY);
CPPUNIT_ASSERT(xAxisCategories.is());
const Sequence<OUString> aOriginalLabels = xAxisCategories->getTextualData();
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aOriginalLabels.getLength());
Reference<beans::XPropertySet> xProperties(xChartType, uno::UNO_QUERY_THROW);
// Switching to fixed-count mode initially uses the stored default of ten bins.
xProperties->setPropertyValue(u"FrequencyType"_ustr, uno::Any(sal_Int32(2)));
const Sequence<OUString> aFixedCountLabels = xAxisCategories->getTextualData();
CPPUNIT_ASSERT_EQUAL(sal_Int32(10), aFixedCountLabels.getLength());
// Changing the count must update the same sequence without save/reload.
xProperties->setPropertyValue(u"BinCount"_ustr, uno::Any(sal_Int32(3)));
const Sequence<OUString> aUpdatedLabels = xAxisCategories->getTextualData();
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aUpdatedLabels.getLength());
}
CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testHistogramBinCountRoundtrip_ODS)
{
// ODF: fixed number of bins survives export/reload at the model level.
chart2/source/inc/HistogramDataSequence.hxx
+4
View File
@@ -58,6 +58,10 @@ public:
bool bUseOverflowBin = false, double fOverflowBinValue = 0.0);
virtual ~HistogramDataSequence() override;
void setBinningParameters(sal_Int32 nFrequencyType, double fBinWidth, sal_Int32 nBinCount,
bool bUseUnderflowBin, double fUnderflowBinValue,
bool bUseOverflowBin, double fOverflowBinValue);
/// declare XServiceInfo methods
virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
chart2/source/model/template/HistogramChartType.cxx
+35 -21
View File
@@ -241,37 +241,51 @@ void HistogramChartType::createCalculatedDataSeries()
= new LabeledDataSequence(xCalcSeq);
xSeries->setCalculatedYSequence(xLabeledCalc);
// 3. Regenerate the categories (bins)
rtl::Reference<HistogramDataSequence> xCatSeq = new HistogramDataSequence(
xValuesY, true, nFrequencyType, fBinWidth, nBinCount, bUseUnderflowBin,
fUnderflowBinValue, bUseOverflowBin, fOverflowBinValue);
auto createCategorySequence = [&]() {
rtl::Reference<HistogramDataSequence> xCatSeq = new HistogramDataSequence(
xValuesY, true, nFrequencyType, fBinWidth, nBinCount, bUseUnderflowBin,
fUnderflowBinValue, bUseOverflowBin, fOverflowBinValue);
uno::Reference<chart2::data::XDataSequence> xCatDataSeq(xCatSeq);
uno::Reference<beans::XPropertySet> xCatProp(xCatDataSeq, uno::UNO_QUERY);
if (xCatProp.is())
{
xCatProp->setPropertyValue(u"Role"_ustr, uno::Any(u"categories"_ustr));
}
uno::Reference<chart2::data::XDataSequence> xCatDataSeq(xCatSeq);
uno::Reference<beans::XPropertySet> xCatProp(xCatDataSeq, uno::UNO_QUERY);
if (xCatProp.is())
{
xCatProp->setPropertyValue(u"Role"_ustr, uno::Any(u"categories"_ustr));
}
uno::Reference<chart2::data::XLabeledDataSequence> xLabeledCat
= new LabeledDataSequence(xCatSeq);
return uno::Reference<chart2::data::XLabeledDataSequence>(
new LabeledDataSequence(xCatSeq));
};
// 4. Attach the categories to the DataSeries so the View can find them
// 3. Update existing histogram categories in place. The X axis and the DataSeries hold
// the same sequence, so new bin parameters reach the axis labels through it.
bool bHasCategories = false;
for (auto& seq : aSeqs)
{
if (seq.is() && DataSeriesHelper::getRole(seq) == u"categories"_ustr)
if (!seq.is() || DataSeriesHelper::getRole(seq) != u"categories"_ustr)
continue;
rtl::Reference<HistogramDataSequence> xHistogramSequence
= dynamic_cast<HistogramDataSequence*>(seq->getValues().get());
if (xHistogramSequence.is())
{
seq = xLabeledCat;
bHasCategories = true;
break;
xHistogramSequence->setBinningParameters(nFrequencyType, fBinWidth, nBinCount,
bUseUnderflowBin, fUnderflowBinValue,
bUseOverflowBin, fOverflowBinValue);
}
else
{
seq = createCategorySequence();
}
bHasCategories = true;
break;
}
// 4. Attach generated categories when the series does not have them yet
if (!bHasCategories)
{
aSeqs.push_back(xLabeledCat);
}
aSeqs.push_back(createCategorySequence());
xSeries->setData(aSeqs);
}
@@ -375,4 +389,4 @@ com_sun_star_comp_chart_HistogramChartType_get_implementation(
return cppu::acquire(new ::chart::HistogramChartType());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
chart2/source/model/template/HistogramDataInterpreter.cxx
+4 -1
View File
@@ -90,7 +90,10 @@ InterpretedData HistogramDataInterpreter::interpretDataSource(
resultSeries = new DataSeries();
}
resultSeries->setData(DataSeries::tDataSequenceContainer{ valuesYSeqLabeled });
// The diagram axis and the DataSeries hold the same generated category sequence, so new
// bin settings reach the X axis labels through it.
resultSeries->setData(
DataSeries::tDataSequenceContainer{ valuesYSeqLabeled, xLabeledCategorySeq });
resultSeries->setCalculatedYSequence(xLabeledFreqSeq);
// Structure the result: one group, one series for a standard histogram
chart2/source/tools/HistogramDataSequence.cxx
+31
View File
@@ -82,6 +82,37 @@ HistogramDataSequence::~HistogramDataSequence()
}
}
void HistogramDataSequence::setBinningParameters(sal_Int32 nFrequencyType, double fBinWidth,
sal_Int32 nBinCount, bool bUseUnderflowBin,
double fUnderflowBinValue, bool bUseOverflowBin,
double fOverflowBinValue)
{
{
osl::MutexGuard aGuard(GetMutex());
// Recomputing the bins is expensive, so parameters that repeat the ones already held
// leave the cached bins and the modified state alone.
if (m_nFrequencyType == nFrequencyType && m_fBinWidth == fBinWidth
&& m_nBinCount == nBinCount && m_bUseUnderflowBin == bUseUnderflowBin
&& m_fUnderflowBinValue == fUnderflowBinValue && m_bUseOverflowBin == bUseOverflowBin
&& m_fOverflowBinValue == fOverflowBinValue)
{
return;
}
m_nFrequencyType = nFrequencyType;
m_fBinWidth = fBinWidth;
m_nBinCount = nBinCount;
m_bUseUnderflowBin = bUseUnderflowBin;
m_fUnderflowBinValue = fUnderflowBinValue;
m_bUseOverflowBin = bUseOverflowBin;
m_fOverflowBinValue = fOverflowBinValue;
m_bIsDirty = true;
}
m_xModifyEventForwarder->modified(lang::EventObject(static_cast<cppu::OWeakObject*>(this)));
}
IMPLEMENT_FORWARD_XINTERFACE2(HistogramDataSequence, HistogramDataSequence_Base,
::comphelper::OPropertyContainer)