命名审查与垃圾代码清理(纯重命名 / 死代码删除,无行为变更)
前提:加载完成后全部采样都已驻留内存,程序此后与源文件再无联系。 据此修正了一批会让人误以为"仍在读写文件"的命名: - SampleFileAt → SampleSignalAt(取的是内存信号在给定时刻的采样值)。 - DataSet::AddPreparedFile → AddDataFile。 - PlotView::InvalidatePolylineCache → InvalidateDerivedCaches (它同时清空折线、边沿统计、中心平均值曲线、静态场景缓存与悬停引用)。 - PlotView::CursorColor(int which) → CursorColor()(两条光标同色,参数从未使用)。 - UiEllipsize(g,…) → UiEllipsize(…):纯测量不绘制,删掉被忽略的绘图上下文参数; 同时删除与 UiMeasureTextWidth 完全重复的 UiTextWidth,调用点统一到 UiMeasureTextWidth。 清理残留参数((void)xxx;): - TabConfig 的可见性/网格族(SetVisible / ToggleVisible / SetFileVisible / SetAllVisible / SoloSignal / SetMode / SyncLanes / FileHasVisible / FileAllVisible)去掉从未使用的 const DataSet& 参数(仅 SyncToDataSet 真正需要数据层,保留)。 - PlotView::OnLButtonUp(int y)、OnMouseWheel(int delta, bool shift);PainterSignalHalo 去掉未用的 ref。 - BuildDataFile 中未使用的局部 rowCount。 删除无人调用的死函数: DataSet::Clear / AddFromTable;SignalColorCount;WideToUtf8 / StartsWith; PlotView::ViewMinTime / ViewMaxTime / EdgePanelRect / EdgePanelCloseRect / EdgeCenterPanelRect / ScaleLaneRange / BeginLaneValueEdit / LaneContentHeight; SignalPanel::NeedsScrollBar / IsFilterEditing / FilterText / ContentHeight; PopupMenu::EditingItemId;TabBar::IsDragging;TextEdit::PlaceCaret。 删除只写不读的死字段:CsvTable::sourceRowCount(与 rowCount 等义)与 skippedRowCount。 以 VERY_BIG_DATA.CSV 回归验证:加载与勾选、筛选框(含"无匹配的筛选信号")、 样式区线宽文案省略、选区放大(横向与纵向)、双光标读数与 Δt、右键菜单(Y 轴数值与 实验性功能子菜单)、合并/拆分网格、标签与信号重命名省略号,行为均与改动前一致; make clean && make all 无任何警告。
This commit is contained in:
1 parent
f5028b1e18
commit
350538c634
21 files changed
+118
-456
No files matched your search
@@ -419,11 +419,6 @@ namespace jdi
|
||||
ClampScroll();
|
||||
}
|
||||
|
||||
float SignalPanel::ContentHeight() const
|
||||
{
|
||||
return m_contentHeight;
|
||||
}
|
||||
|
||||
void SignalPanel::ClampScroll()
|
||||
{
|
||||
const float maxOffset = std::max(0.0f, m_contentHeight - m_listRect.Height);
|
||||
@@ -732,7 +727,7 @@ namespace jdi
|
||||
std::max(20.0f, m_headerRect.Width - kPadding * 2.0f * m_scale -
|
||||
m_toggleAllRect.Width - 8.0f * m_scale),
|
||||
m_headerRect.Height);
|
||||
UiText(g, UiEllipsize(g, title, m_fonts->uiBold, titleRect.Width), m_fonts->uiBold, titleRect,
|
||||
UiText(g, UiEllipsize(title, m_fonts->uiBold, titleRect.Width), m_fonts->uiBold, titleRect,
|
||||
m_theme->textStrong, TextAlign::LEFT);
|
||||
|
||||
const bool allVisible = AreAllSignalsVisible();
|
||||
@@ -775,7 +770,7 @@ namespace jdi
|
||||
}
|
||||
else
|
||||
{
|
||||
UiText(g, UiEllipsize(g, m_filterText, m_fonts->uiSmall, textWidth), m_fonts->uiSmall,
|
||||
UiText(g, UiEllipsize(m_filterText, m_fonts->uiSmall, textWidth), m_fonts->uiSmall,
|
||||
textRect, m_theme->text, TextAlign::LEFT);
|
||||
}
|
||||
|
||||
@@ -894,8 +889,8 @@ namespace jdi
|
||||
// 分组复选框(三态:全选 / 部分 / 未选)。
|
||||
const gd::RectF checkRect(baseX + kDisclosureWidth * m_scale, centerY - kCheckSize * m_scale * 0.5f,
|
||||
kCheckSize * m_scale, kCheckSize * m_scale);
|
||||
const bool allVisible = m_tab->FileAllVisible(*m_dataSet, item.fileIndex);
|
||||
const bool anyVisible = m_tab->FileHasVisible(*m_dataSet, item.fileIndex);
|
||||
const bool allVisible = m_tab->FileAllVisible(item.fileIndex);
|
||||
const bool anyVisible = m_tab->FileHasVisible(item.fileIndex);
|
||||
UiDrawCheckBox(g, checkRect, allVisible ? 1 : (anyVisible ? 2 : 0), 3.0f * m_scale);
|
||||
|
||||
const gd::RectF closeRect = FileCloseRect(row);
|
||||
@@ -928,7 +923,7 @@ namespace jdi
|
||||
}
|
||||
else
|
||||
{
|
||||
UiText(g, UiEllipsize(g, file->Title(), m_fonts->uiBold, nameWidth), m_fonts->uiBold,
|
||||
UiText(g, UiEllipsize(file->Title(), m_fonts->uiBold, nameWidth), m_fonts->uiBold,
|
||||
gd::RectF(nameAreaLeft, rect.Y, nameWidth, rect.Height), m_theme->textStrong,
|
||||
TextAlign::LEFT);
|
||||
}
|
||||
@@ -1013,7 +1008,7 @@ namespace jdi
|
||||
{
|
||||
const float nameWidth = std::max(16.0f, nameRightLimit - nameLeft);
|
||||
const std::uint32_t nameColor = visible ? m_theme->text : m_theme->textMuted;
|
||||
UiText(g, UiEllipsize(g, signal->Title(), m_fonts->ui, nameWidth), m_fonts->ui,
|
||||
UiText(g, UiEllipsize(signal->Title(), m_fonts->ui, nameWidth), m_fonts->ui,
|
||||
gd::RectF(nameLeft, rect.Y, nameWidth, rect.Height), nameColor, TextAlign::LEFT);
|
||||
}
|
||||
|
||||
@@ -1201,7 +1196,8 @@ namespace jdi
|
||||
const std::wstring fullText = numberText + L" px";
|
||||
// 空间不足时省略单位,保证数值本身完整可读。
|
||||
const std::wstring shown =
|
||||
(UiTextWidth(g, fullText, m_fonts->monoSmall) > m_widthValueRect.Width - 6.0f * m_scale)
|
||||
(UiMeasureTextWidth(m_fonts->monoSmall, fullText) >
|
||||
m_widthValueRect.Width - 6.0f * m_scale)
|
||||
? numberText
|
||||
: fullText;
|
||||
UiText(g, shown, m_fonts->monoSmall, m_widthValueRect, m_theme->textStrong, TextAlign::RIGHT);
|
||||
@@ -1996,7 +1992,7 @@ namespace jdi
|
||||
// 全部显示/隐藏。
|
||||
if (UiPointInRect(m_toggleAllRect, fx, fy))
|
||||
{
|
||||
m_tab->SetAllVisible(*m_dataSet, !AreAllSignalsVisible());
|
||||
m_tab->SetAllVisible(!AreAllSignalsVisible());
|
||||
m_rowsDirty = true;
|
||||
return true;
|
||||
}
|
||||
@@ -2066,8 +2062,8 @@ namespace jdi
|
||||
{
|
||||
if (part == RowPart::CHECK)
|
||||
{
|
||||
const bool allVisible = m_tab->FileAllVisible(*m_dataSet, item.fileIndex);
|
||||
m_tab->SetFileVisible(*m_dataSet, item.fileIndex, !allVisible);
|
||||
const bool allVisible = m_tab->FileAllVisible(item.fileIndex);
|
||||
m_tab->SetFileVisible(item.fileIndex, !allVisible);
|
||||
m_rowsDirty = true;
|
||||
return true;
|
||||
}
|
||||
@@ -2091,7 +2087,7 @@ namespace jdi
|
||||
if (part == RowPart::CHECK)
|
||||
{
|
||||
// 勾选/取消勾选会立即触发网格重新划分(取消后空网格随之消失)。
|
||||
m_tab->ToggleVisible(*m_dataSet, ref);
|
||||
m_tab->ToggleVisible(ref);
|
||||
m_rowsDirty = true;
|
||||
}
|
||||
else if (part == RowPart::LANE_BADGE)
|
||||
@@ -2462,7 +2458,7 @@ namespace jdi
|
||||
case CMD_SIGNAL_TOGGLE:
|
||||
if (m_menuTargetSignal.IsValid())
|
||||
{
|
||||
m_tab->ToggleVisible(*m_dataSet, m_menuTargetSignal);
|
||||
m_tab->ToggleVisible(m_menuTargetSignal);
|
||||
m_rowsDirty = true;
|
||||
needRelayout = true;
|
||||
}
|
||||
@@ -2470,25 +2466,25 @@ namespace jdi
|
||||
case CMD_SIGNAL_SOLO:
|
||||
if (m_menuTargetSignal.IsValid())
|
||||
{
|
||||
m_tab->SoloSignal(*m_dataSet, m_menuTargetSignal);
|
||||
m_tab->SoloSignal(m_menuTargetSignal);
|
||||
m_rowsDirty = true;
|
||||
needRelayout = true;
|
||||
}
|
||||
break;
|
||||
case CMD_SIGNAL_SHOW_ALL:
|
||||
m_tab->SetAllVisible(*m_dataSet, true);
|
||||
m_tab->SetAllVisible(true);
|
||||
m_rowsDirty = true;
|
||||
needRelayout = true;
|
||||
break;
|
||||
case CMD_SIGNAL_HIDE_ALL:
|
||||
m_tab->SetAllVisible(*m_dataSet, false);
|
||||
m_tab->SetAllVisible(false);
|
||||
m_rowsDirty = true;
|
||||
needRelayout = true;
|
||||
break;
|
||||
case CMD_FILE_SHOW_ALL:
|
||||
if (m_menuTargetFile >= 0)
|
||||
{
|
||||
m_tab->SetFileVisible(*m_dataSet, m_menuTargetFile, true);
|
||||
m_tab->SetFileVisible(m_menuTargetFile, true);
|
||||
m_rowsDirty = true;
|
||||
needRelayout = true;
|
||||
}
|
||||
@@ -2496,7 +2492,7 @@ namespace jdi
|
||||
case CMD_FILE_HIDE_ALL:
|
||||
if (m_menuTargetFile >= 0)
|
||||
{
|
||||
m_tab->SetFileVisible(*m_dataSet, m_menuTargetFile, false);
|
||||
m_tab->SetFileVisible(m_menuTargetFile, false);
|
||||
m_rowsDirty = true;
|
||||
needRelayout = true;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user