P26:标签按"标签列"1:1 落到记录、窗口、元素、文本四处(规范 §35)

- XChartColumnMath 补标签半边(LabelCount / LabelSlotOf / DefinitionOfLabelSlot / SizedLabels),
  记录的标签长度只由这一处定;TryAddRecord 在 labels 长度≠标签列数时整条拒收
- 导入按标签字段个数校验并点名行号;记录行少到连时间戳都没有时点名拒绝(不再抛异常)
- 数据窗口:一个显示序两个读者(标签列在前),格子身份 CellRef{IsLabel,Slot},
  标签格走 TrySetLabel 的字符串分支,「+标签」走 SetDimensions 这唯一定长路径
- 新标签元素 ChartToolLabels + XChartLabelConfig:13 旋钮全自动置脏、位置/折法同散点、
  文本走池且多余槽位必须擦、锚点与对齐出自同一张表(anchorMin/Max 不写)
- 面板把"要几个标签列、表里有几个"与数值维、记录数一起印(§25.1 第三半 RequiredLabelColumns)
- 探针先红的两个真缺陷:SizedLabels(null,n) 补 null 不是空串;锚点表漏 MiddleRight 与 Center 重合
- 雷达 AddSeries 带系列名,两个 SetDimensions 重载都声明 series 标签列(否则新门口整条拒收)
- 判据:探针 492/0、label_gate 15 claim/15 臂全红、dirty_gate 149/149、slot_reset PASS、
  编译门三臂+3 对照绿(source present 点名四个新文件)、p4_control 78 支各红在点名断言
  (同一棵树指纹 478727e6748c67cddda40995874b20968e9eae3706f2a21c24726d3412059747)
This commit is contained in:
2026-11-09 06:58:39 +08:00
parent 4a40b317be
commit 084591d104
18 changed files with 968 additions and 84 deletions
+56 -17
View File
@@ -222,17 +222,26 @@ namespace XericUI.XChart
/// </summary>
public int NumericDimensionCount => XChartColumnMath.ValueCount(m_Dimensions);
/// <summary>
/// 标签列个数=每条记录标签数组的长度(<see cref="XChartColumnMath.LabelCount"/>,唯一那一条规则)。
/// <b>1:1 是形状而不是一句承诺</b>:记录身上可以写出比标签列更多的字符串,那些字符串没有一个列
/// 叫得出名字,屏幕上就凭空多出一个标签,而报表里看不出是谁写的。
/// </summary>
public int LabelDimensionCount => XChartColumnMath.LabelCount(m_Dimensions);
public void SetDimensions(IList<XChartDimensionDefinition> dimensions)
{
m_Dimensions.Clear();
if (dimensions != null) for (int i = 0; i < dimensions.Count; i++) m_Dimensions.Add(dimensions[i]);
int numericCount = NumericDimensionCount;
int labelCount = LabelDimensionCount;
for (int i = 0; i < m_Records.Count; i++)
{
var values = new float[numericCount];
int copyCount = Math.Min(values.Length, m_Records[i].Values.Count);
for (int j = 0; j < copyCount; j++) values[j] = m_Records[i].Values[j];
m_Records[i] = new XChartRecord(m_Records[i].RecordId, m_Records[i].Timestamp, values, CopyLabels(m_Records[i].Labels));
m_Records[i] = new XChartRecord(m_Records[i].RecordId, m_Records[i].Timestamp, values,
XChartColumnMath.SizedLabels(m_Records[i].Labels, labelCount));
}
Publish();
}
@@ -293,19 +302,26 @@ namespace XericUI.XChart
// 值数组按"数值维中的序号"排,不是按维度表下标排:中间夹一个非数值维时两者会错开
// 值下标由那一条规则给(非数值列返回 -1:本来就没有格要摘)
int column = XChartColumnMath.ValueSlot(m_Dimensions, index);
int labelSlot = XChartColumnMath.LabelSlotOf(m_Dimensions, index);
m_Dimensions.RemoveAt(index);
if (column >= 0)
if (column >= 0 || labelSlot >= 0)
{
for (int i = 0; i < m_Records.Count; i++)
{
var record = m_Records[i];
if (column >= record.Values.Count) continue; // 这一行短了一截:本就没有这一格
var values = new float[record.Values.Count - 1];
// 标签列同理:摘掉的是"这一列在标签数组里那一格",不是"第 index 个字符串"
var values = new float[column >= 0 ? record.Values.Count - 1 : record.Values.Count];
for (int j = 0, k = 0; j < record.Values.Count; j++)
if (j != column) values[k++] = record.Values[j];
m_Records[i] = new XChartRecord(record.RecordId, record.Timestamp, values, CopyLabels(record.Labels));
if (column < 0 || j != column) values[k++] = record.Values[j];
var labels = new string[labelSlot >= 0 ? record.Labels.Count - 1 : record.Labels.Count];
for (int j = 0, k = 0; j < record.Labels.Count; j++)
if (labelSlot < 0 || j != labelSlot) labels[k++] = record.Labels[j];
m_Records[i] = new XChartRecord(record.RecordId, record.Timestamp, values, CopyLabels(labels));
}
}
@@ -313,10 +329,17 @@ namespace XericUI.XChart
return true;
}
/// <summary>
/// 加一条记录。两个数组都必须<b>对得上当前的列</b>:值数组长度=数值列个数,
/// 标签数组长度=标签列个数(或 <c>null</c>=这一条还没有标签)。
/// 长度不对就整条拒收、不改一半——"多出来的那个字符串"没有列叫得出它的名字,
/// 落进表里就是屏幕上一个没主的标签(1:1 靠门口这一关守住,不靠调用方自觉)。
/// </summary>
public bool TryAddRecord(double timestamp, float[] values, string[] labels = null)
{
if (double.IsNaN(timestamp) || double.IsInfinity(timestamp) || values == null || values.Length != NumericDimensionCount) return false;
for (int i = 0; i < values.Length; i++) if (float.IsNaN(values[i]) || float.IsInfinity(values[i])) return false;
if (labels != null && labels.Length != LabelDimensionCount) return false;
if (m_Records.Count > 0 && timestamp < m_Records[m_Records.Count - 1].Timestamp) return false;
if (m_Records.Count == Capacity)
{
@@ -325,7 +348,7 @@ namespace XericUI.XChart
}
var copy = new float[values.Length];
Array.Copy(values, copy, values.Length);
m_Records.Add(new XChartRecord(m_NextRecordId++, timestamp, copy, labels ?? Array.Empty<string>()));
m_Records.Add(new XChartRecord(m_NextRecordId++, timestamp, copy, CopyLabels(labels)));
Publish();
return true;
}
@@ -377,15 +400,19 @@ namespace XericUI.XChart
return true;
}
/// <summary>改某条记录的某个标签(下标越界或空串一律拒绝)</summary>
public bool TrySetLabel(int recordIndex, int labelIndex, string text)
/// <summary>
/// 改某条记录在某一标签列上的字符串。<b>下标是标签下标</b>(第几个标签列,不是表里的行号),
/// 由 <see cref="XChartColumnMath.LabelSlotOf"/> 换算。行号或下标越界拒绝;<b>空串是合法值</b>
/// (把标签清空),所以清空与"这一列本来没有格"分得开——后者压根进不到这里。
/// </summary>
public bool TrySetLabel(int recordIndex, int labelSlot, string text)
{
if (recordIndex < 0 || recordIndex >= m_Records.Count) return false;
var record = m_Records[recordIndex];
if (labelIndex < 0 || labelIndex >= record.Labels.Count) return false;
if (labelSlot < 0 || labelSlot >= LabelDimensionCount) return false;
var labels = CopyLabels(record.Labels);
labels[labelIndex] = text ?? string.Empty;
labels[labelSlot] = text ?? string.Empty;
m_Records[recordIndex] = new XChartRecord(record.RecordId, record.Timestamp, CopyValues(record.Values), labels);
Publish();
return true;
@@ -484,6 +511,20 @@ namespace XericUI.XChart
return definition != null;
}
/// <summary>
/// 取某条记录在某一标签列上的字符串(<b>标签下标</b>,第几个标签列)。
/// 行号或下标越界返回 false;列存在但那一格是空串时返回 true + 空串——
/// "这一列没这一格"和"这一格是空的"是两件事,画不画由调用方决定。
/// </summary>
public bool TryGetLabelAt(int recordIndex, int labelSlot, out string text)
{
text = null;
if (recordIndex < 0 || recordIndex >= m_Records.Count) return false;
if (labelSlot < 0 || labelSlot >= LabelDimensionCount) return false;
text = m_Records[recordIndex].Labels[labelSlot] ?? string.Empty;
return true;
}
/// <summary>
/// 一次扫描算 Count/First/Last/Min/Max/Sum/Mean/Rms;中位数单独排序一次。
/// 结果按(版本, 维度)缓存,请求的是缓存子集时直接复用。
@@ -620,12 +661,10 @@ namespace XericUI.XChart
return low;
}
private static string[] CopyLabels(IReadOnlyList<string> labels)
{
var copy = new string[labels.Count];
for (int i = 0; i < labels.Count; i++) copy[i] = labels[i];
return copy;
}
/// <summary>标签数组的拷贝<b>并且按那一条规则定长</b>——长度只由标签列个数决定,
/// 所以任何一次写入之后,"这一行的标签个数"都还等于表里的标签列数。</summary>
private string[] CopyLabels(IReadOnlyList<string> labels)
=> XChartColumnMath.SizedLabels(labels, LabelDimensionCount);
}
public class XChartDataModel3D