fix: 统一输入框编辑能力、修复拖拽合并网格并支持光标吸附数据点

统一文本输入(新增 Utilities/Inc/TextEdit.hpp + TextEdit.cpp)
- 一个共享的编辑模型,提供光标/选区/过滤/限长,接入全部输入框:
  样式区数值与信号名/分组名、波形图例改名、视图标签页改名、
  拾色器 R/G/B 与色号、光标时间与网格上下限。
- 新增能力:Ctrl+A/C/X/V(含剪贴板清洗)、Shift+方向键与 Home/End 选区、
  退格与删除清除选区、代理对安全的光标步进。
- 渲染改为选区高亮 + 插入符,文本超出框宽时水平滚动并让插入符始终可见;
  初始态为整段选中,首字符键入即整体替换(保持"登录框"式交互)。
- 新增 Utf8Util::PasteTextFromClipboard(换行/制表符折叠为空格)。

修复网格合并(Utilities/Src/DataModel.cpp)
- 拖拽信号到其它网格时先固定目标网格的锚信号,再移除源信号并按引用找回目标,
  避免空网格回收导致下标错位,从"与原网格交换位置"改为真正合并。
- 自定义划分下未分配网格的可见信号改为各自独占一个新网格,
  修复"拖拽合并后再勾选新信号被并入该合并网格"的问题。

绘图区(Components/PlotView)
- 网格右键菜单新增"时间轴自适应(匹配本网格)",把时间轴对齐到该网格信号范围。
- 时间轴放大到采样点在屏幕上可分辨(>=6 逻辑像素)时,拖动光标吸附到最近数据点;
  缩小到无法分辨时保持自由移动,避免光标"跳格"。

验证:真实输入脚本逐项核对——拖拽合并后单网格含两条曲线、拖拽合并再勾选新信号得 G2 独立网格、
Shift 选区 + Delete 清除、Ctrl+A/C/V 复制粘贴、46 字符文本水平滚动、拾色器色号 1E90FF、
标签页改名 A1、光标时间框复制粘贴、全视图拖动得 0.522213(不吸附)而放大后得 0.28125(= 225 × 0.00125,已吸附)。
This commit is contained in:
DeepSeek V4.1 Flash committed 2026-09-30 13:40:58 +08:00
1 parent 4e295a2a7d
commit 53768b8b25
16 files changed
+1135 -288

No files matched your search

+340
View File
@@ -0,0 +1,340 @@
#include "TextEdit.hpp"
#include <algorithm>
#include "Utf8Util.hpp"
namespace jdi
{
namespace
{
/** @brief 判断字符是否为 UTF-16 高位代理。 */
bool IsHighSurrogate(wchar_t c)
{
return c >= 0xD800 && c <= 0xDBFF;
}
/** @brief 判断字符是否为 UTF-16 低位代理。 */
bool IsLowSurrogate(wchar_t c)
{
return c >= 0xDC00 && c <= 0xDFFF;
}
/** @brief 判断字符是否符合数值输入(数字与科学计数法符号)。 */
bool IsNumberChar(wchar_t c)
{
return (c >= L'0' && c <= L'9') || c == L'.' || c == L'-' || c == L'+' || c == L'e' || c == L'E';
}
/** @brief 判断字符是否为十六进制数字。 */
bool IsHexDigit(wchar_t c)
{
return (c >= L'0' && c <= L'9') || (c >= L'a' && c <= L'f') || (c >= L'A' && c <= L'F');
}
/** @brief 判断字符是否为十进制数字。 */
bool IsDigit(wchar_t c)
{
return c >= L'0' && c <= L'9';
}
}
bool TextEdit::AcceptsCharacter(EditFilter filter, wchar_t character)
{
switch (filter)
{
case EditFilter::NUMBER:
return IsNumberChar(character);
case EditFilter::HEX:
return IsHexDigit(character) || character == L'#';
case EditFilter::BYTE:
return IsDigit(character);
case EditFilter::ANY:
default:
return character >= L' ' && character != 0x7F;
}
}
void TextEdit::Begin(const std::wstring& text, bool selectAll, EditFilter filter, std::size_t maxLength)
{
m_active = true;
m_text = text;
m_filter = filter;
m_maxLength = maxLength;
m_caret = m_text.size();
m_anchor = selectAll ? 0 : m_text.size();
m_fresh = selectAll && !m_text.empty();
}
void TextEdit::End()
{
m_active = false;
m_fresh = false;
m_text.clear();
m_caret = 0;
m_anchor = 0;
m_filter = EditFilter::ANY;
m_maxLength = 0;
}
std::size_t TextEdit::ClampOffset(std::size_t offset) const
{
if (offset > m_text.size())
{
offset = m_text.size();
}
// 避免光标落在代理对中间(否则渲染与删除都会错位)。
if (offset > 0 && offset < m_text.size() && IsLowSurrogate(m_text[offset]) &&
IsHighSurrogate(m_text[offset - 1]))
{
--offset;
}
return offset;
}
std::size_t TextEdit::StepLeft(std::size_t offset) const
{
if (offset == 0)
{
return 0;
}
--offset;
if (offset > 0 && IsLowSurrogate(m_text[offset]) && IsHighSurrogate(m_text[offset - 1]))
{
--offset;
}
return offset;
}
std::size_t TextEdit::StepRight(std::size_t offset) const
{
if (offset >= m_text.size())
{
return m_text.size();
}
++offset;
if (offset < m_text.size() && IsLowSurrogate(m_text[offset]) && IsHighSurrogate(m_text[offset - 1]))
{
++offset;
}
return offset;
}
bool TextEdit::ReplaceSelection(const std::wstring& replacement)
{
const bool hadSelection = HasSelection();
const std::size_t begin = SelectionBegin();
const std::size_t end = SelectionEnd();
std::wstring merged = m_text.substr(0, begin) + replacement + m_text.substr(end);
if (m_maxLength > 0 && merged.size() > m_maxLength)
{
merged.resize(m_maxLength);
}
const bool changed = (merged != m_text) || hadSelection;
m_text = std::move(merged);
m_caret = ClampOffset(begin + replacement.size());
m_anchor = m_caret;
m_fresh = false;
return changed;
}
bool TextEdit::Insert(wchar_t character)
{
if (!m_active || character == 0)
{
return false;
}
if (!AcceptsCharacter(m_filter, character))
{
return true;
}
return ReplaceSelection(std::wstring(1, character));
}
bool TextEdit::Backspace()
{
if (!m_active)
{
return false;
}
if (HasSelection())
{
// 存在选区时退格清除整个选区。
return ReplaceSelection(std::wstring());
}
if (m_caret == 0)
{
m_fresh = false;
return false;
}
const std::size_t previous = StepLeft(m_caret);
const std::size_t removed = m_caret - previous;
m_text.erase(previous, removed);
m_caret = previous;
m_anchor = previous;
m_fresh = false;
return true;
}
bool TextEdit::DeleteForward()
{
if (!m_active)
{
return false;
}
if (HasSelection())
{
// 存在选区时删除键清除整个选区。
return ReplaceSelection(std::wstring());
}
if (m_caret >= m_text.size())
{
m_fresh = false;
return false;
}
const std::size_t next = StepRight(m_caret);
m_text.erase(m_caret, next - m_caret);
m_anchor = m_caret;
m_fresh = false;
return true;
}
bool TextEdit::MoveCaret(int delta, bool extendSelection)
{
if (!m_active || delta == 0)
{
return false;
}
std::size_t offset = m_caret;
const int steps = (delta > 0) ? delta : -delta;
for (int index = 0; index < steps; ++index)
{
offset = (delta > 0) ? StepRight(offset) : StepLeft(offset);
}
offset = ClampOffset(offset);
if (offset == m_caret)
{
return false;
}
m_caret = offset;
if (!extendSelection)
{
m_anchor = offset;
m_fresh = false;
}
else
{
m_fresh = false;
}
return true;
}
bool TextEdit::MoveHome(bool extendSelection)
{
if (!m_active || m_caret == 0)
{
return false;
}
m_caret = 0;
if (!extendSelection)
{
m_anchor = 0;
}
m_fresh = false;
return true;
}
bool TextEdit::MoveEnd(bool extendSelection)
{
if (!m_active || m_caret == m_text.size())
{
return false;
}
m_caret = m_text.size();
if (!extendSelection)
{
m_anchor = m_caret;
}
m_fresh = false;
return true;
}
void TextEdit::SelectAll()
{
m_anchor = 0;
m_caret = m_text.size();
m_fresh = !m_text.empty();
}
bool TextEdit::CopyToClipboard(HWND owner) const
{
if (m_text.empty())
{
return false;
}
const std::wstring payload =
HasSelection() ? m_text.substr(SelectionBegin(), SelectionEnd() - SelectionBegin()) : m_text;
return CopyTextToClipboard(owner, payload);
}
bool TextEdit::CutToClipboard(HWND owner)
{
if (m_text.empty())
{
return false;
}
const bool copied = CopyToClipboard(owner);
if (!copied)
{
return false;
}
if (HasSelection())
{
return ReplaceSelection(std::wstring());
}
m_text.clear();
m_caret = 0;
m_anchor = 0;
m_fresh = false;
return true;
}
bool TextEdit::PasteFromClipboard(HWND owner)
{
if (!m_active)
{
return false;
}
std::wstring pasted;
if (!PasteTextFromClipboard(owner, pasted))
{
return false;
}
// 按当前过滤策略清洗粘贴内容,避免数值框被灌入非法字符。
std::wstring cleaned;
cleaned.reserve(pasted.size());
for (const wchar_t c : pasted)
{
if (AcceptsCharacter(m_filter, c))
{
cleaned.push_back(c);
}
}
if (cleaned.empty())
{
return false;
}
return ReplaceSelection(cleaned);
}
} // namespace jdi