dualfroz/ClosedXML-ClosedXML
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upstream ClosedXML/ClosedXML state of the touched files before 9e7a0a3c79

Browse Source
This commit is contained in:
upstream committed 2026-09-02 11:15:38 +02:00
1 parent 9508e12dc7
commit c8aec98c23
5 files changed
+22 -91
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ClosedXML/Excel/ConditionalFormats/Save/XLCFDataBarConverterExtension.cs
+22 -48
View File
@@ -2,6 +2,7 @@ using ClosedXML.Extensions;
using DocumentFormat.OpenXml.Office.Excel;
using DocumentFormat.OpenXml.Office2010.Excel;
using System.Collections.Generic;
using System.Linq;
namespace ClosedXML.Excel
{
@@ -10,8 +11,8 @@ namespace ClosedXML.Excel
private static readonly IReadOnlyDictionary<DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObjectValues, ConditionalFormattingValueObjectTypeValues> CFValueToTypeMap =
new Dictionary<DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObjectValues, ConditionalFormattingValueObjectTypeValues>
{
{ DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObjectValues.Max, ConditionalFormattingValueObjectTypeValues.Max },
{ DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObjectValues.Min, ConditionalFormattingValueObjectTypeValues.Min },
{ DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObjectValues.Max, ConditionalFormattingValueObjectTypeValues.AutoMax },
{ DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObjectValues.Min, ConditionalFormattingValueObjectTypeValues.AutoMin },
{ DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObjectValues.Number, ConditionalFormattingValueObjectTypeValues.Numeric },
{ DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObjectValues.Percent, ConditionalFormattingValueObjectTypeValues.Percent },
{ DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObjectValues.Percentile, ConditionalFormattingValueObjectTypeValues.Percentile },
@@ -34,8 +35,25 @@ namespace ClosedXML.Excel
ShowValue = !cf.ShowBarOnly
};
var cfMin = BuildValueObject(cf, 1, ConditionalFormattingValueObjectTypeValues.AutoMin);
var cfMax = BuildValueObject(cf, 2, ConditionalFormattingValueObjectTypeValues.AutoMax);
var cfMinType = cf.ContentTypes.TryGetValue(1, out var contentType1)
? GetCFType(contentType1.ToOpenXml())
: ConditionalFormattingValueObjectTypeValues.AutoMin;
var cfMin = new ConditionalFormattingValueObject { Type = cfMinType };
if (cf.Values.Any() && cf.Values[1]?.Value != null)
{
cfMin.Type = ConditionalFormattingValueObjectTypeValues.Numeric;
cfMin.Append(new Formula() { Text = cf.Values[1].Value });
}
var cfMaxType = cf.ContentTypes.TryGetValue(2, out var contentType2)
? GetCFType(contentType2.ToOpenXml())
: ConditionalFormattingValueObjectTypeValues.AutoMax;
var cfMax = new ConditionalFormattingValueObject { Type = cfMaxType };
if (cf.Values.Count >= 2 && cf.Values[2]?.Value != null)
{
cfMax.Type = ConditionalFormattingValueObjectTypeValues.Numeric;
cfMax.Append(new Formula() { Text = cf.Values[2].Value });
}
var barAxisColor = new BarAxisColor { Rgb = XLColor.Black.Color.ToHex() };
@@ -56,50 +74,6 @@ namespace ClosedXML.Excel
return conditionalFormattingRule;
}
/// <summary>
/// Builds a single x14 conditional formatting value object (cfvo) for a data bar threshold.
/// </summary>
/// <param name="cf">The conditional format the data bar belongs to.</param>
/// <param name="index">1-based threshold index (1 = minimum, 2 = maximum).</param>
/// <param name="automaticType">
/// Type emitted for an automatic bound: autoMin for the minimum, autoMax for the maximum.
/// </param>
/// <remarks>
/// Automatic and min/max bounds are self-describing and carry no formula; only
/// value based thresholds (num/percent/percentile/formula) emit an xm:f formula.
/// </remarks>
private static ConditionalFormattingValueObject BuildValueObject(IXLConditionalFormat cf, int index, ConditionalFormattingValueObjectTypeValues automaticType)
{
cf.Values.TryGetValue(index, out var value);
var formulaText = value?.Value;
if (!cf.ContentTypes.TryGetValue(index, out var contentType))
{
return new ConditionalFormattingValueObject { Type = automaticType };
}
var type = GetCFType(contentType.ToOpenXml());
var valueObject = new ConditionalFormattingValueObject { Type = type };
if (type == ConditionalFormattingValueObjectTypeValues.Min ||
type == ConditionalFormattingValueObjectTypeValues.Max)
{
if (formulaText == null)
{
valueObject.Type = automaticType;
}
return valueObject;
}
if (formulaText != null)
{
valueObject.Append(new Formula { Text = formulaText });
}
return valueObject;
}
private static ConditionalFormattingValueObjectTypeValues GetCFType(DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObjectValues value)
{
return CFValueToTypeMap[value];