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
1 parent
4e295a2a7d
commit
53768b8b25
16 files changed
+1135
-288
No files matched your search
@@ -115,10 +115,9 @@ namespace jdi
|
||||
m_scrollOffset = 0.0f;
|
||||
m_draggingOpacity = false;
|
||||
m_draggingWidth = false;
|
||||
m_editField = StyleEditField::NONE;
|
||||
m_edit.End();
|
||||
m_editRow = -1;
|
||||
m_editFresh = false;
|
||||
m_editText.clear();
|
||||
m_editField = StyleEditField::NONE;
|
||||
m_pendingLaneMenu = false;
|
||||
m_pendingColorPicker = false;
|
||||
}
|
||||
@@ -678,7 +677,7 @@ namespace jdi
|
||||
|
||||
if (m_editField == StyleEditField::FILE_NAME && m_editRow == row)
|
||||
{
|
||||
UiDrawEditField(g, RowNameRect(row), m_editText, m_editFresh, m_fonts->uiSmall, m_scale);
|
||||
UiDrawEditField(g, RowNameRect(row), m_edit, m_fonts->uiSmall, m_scale);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -759,7 +758,7 @@ namespace jdi
|
||||
const float nameLeft = swatchRect.X + swatchRect.Width + 6.0f * m_scale;
|
||||
if (m_editField == StyleEditField::SIGNAL_NAME && m_editRow == row)
|
||||
{
|
||||
UiDrawEditField(g, RowNameRect(row), m_editText, m_editFresh, m_fonts->ui, m_scale);
|
||||
UiDrawEditField(g, RowNameRect(row), m_edit, m_fonts->ui, m_scale);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -911,7 +910,7 @@ namespace jdi
|
||||
|
||||
if (m_editField == StyleEditField::OPACITY)
|
||||
{
|
||||
UiDrawEditField(g, m_opacityValueRect, m_editText, m_editFresh, m_fonts->monoSmall, m_scale);
|
||||
UiDrawEditField(g, m_opacityValueRect, m_edit, m_fonts->monoSmall, m_scale);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -932,7 +931,7 @@ namespace jdi
|
||||
|
||||
if (m_editField == StyleEditField::WIDTH)
|
||||
{
|
||||
UiDrawEditField(g, m_widthValueRect, m_editText, m_editFresh, m_fonts->monoSmall, m_scale);
|
||||
UiDrawEditField(g, m_widthValueRect, m_edit, m_fonts->monoSmall, m_scale);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1095,8 +1094,12 @@ namespace jdi
|
||||
|
||||
m_editField = field;
|
||||
m_editRow = row;
|
||||
m_editText = std::move(initial);
|
||||
m_editFresh = true;
|
||||
|
||||
// 名称类字段可输入任意字符，数值类字段限制为数字与小数点。
|
||||
const bool nameField =
|
||||
(field == StyleEditField::SIGNAL_NAME) || (field == StyleEditField::FILE_NAME);
|
||||
m_edit.Begin(std::move(initial), true, nameField ? EditFilter::ANY : EditFilter::NUMBER,
|
||||
nameField ? 64u : 6u);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1109,12 +1112,11 @@ namespace jdi
|
||||
|
||||
const StyleEditField field = m_editField;
|
||||
const int row = m_editRow;
|
||||
const std::wstring text = m_editText;
|
||||
const std::wstring text = m_edit.Text();
|
||||
|
||||
m_editField = StyleEditField::NONE;
|
||||
m_editRow = -1;
|
||||
m_editFresh = false;
|
||||
m_editText.clear();
|
||||
m_edit.End();
|
||||
|
||||
if (!commit || m_tab == nullptr || m_dataSet == nullptr)
|
||||
{
|
||||
@@ -1210,11 +1212,21 @@ namespace jdi
|
||||
return false;
|
||||
}
|
||||
|
||||
// Ctrl+C：把当前文本复制到剪贴板。
|
||||
if (character == 0x03)
|
||||
// 剪贴板与全选快捷键经 WM_CHAR 送达（Ctrl+C/X/V/A 分别对应 3/24/22/1）。
|
||||
switch (character)
|
||||
{
|
||||
CopyTextToClipboard(m_host, m_editText);
|
||||
case 0x03: // Ctrl+C
|
||||
m_edit.CopyToClipboard(m_host);
|
||||
return false;
|
||||
case 0x18: // Ctrl+X
|
||||
return m_edit.CutToClipboard(m_host);
|
||||
case 0x16: // Ctrl+V
|
||||
return m_edit.PasteFromClipboard(m_host);
|
||||
case 0x01: // Ctrl+A
|
||||
m_edit.SelectAll();
|
||||
return true;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (character == L'\r' || character == L'\n')
|
||||
@@ -1223,57 +1235,22 @@ namespace jdi
|
||||
}
|
||||
if (character == L'\b')
|
||||
{
|
||||
m_editFresh = false;
|
||||
if (!m_editText.empty())
|
||||
{
|
||||
m_editText.pop_back();
|
||||
}
|
||||
return true;
|
||||
return m_edit.Backspace();
|
||||
}
|
||||
|
||||
// 名称类字段允许任意可打印字符（含空格、方括号、中文）。
|
||||
const bool nameField = (m_editField == StyleEditField::SIGNAL_NAME) ||
|
||||
(m_editField == StyleEditField::FILE_NAME);
|
||||
if (m_editField == StyleEditField::OPACITY && (character == L'%'))
|
||||
if (character == 0x7F)
|
||||
{
|
||||
return true;
|
||||
return m_edit.DeleteForward();
|
||||
}
|
||||
if (character < 0x20 || character == 0x7F)
|
||||
// 百分比字段允许直接输入 % 但会被忽略，其余控制字符一律丢弃。
|
||||
if (m_editField == StyleEditField::OPACITY && character == L'%')
|
||||
{
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
if (nameField && m_editText.size() >= 64)
|
||||
if (character < 0x20)
|
||||
{
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
const bool numericField = !nameField;
|
||||
if (numericField)
|
||||
{
|
||||
const bool digit = (character >= L'0' && character <= L'9');
|
||||
const bool dot = (character == L'.');
|
||||
if (!digit && !dot)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (dot && m_editText.find(L'.') != std::wstring::npos)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (!dot && m_editText.size() >= 5)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
// 首次键入直接替换原有内容，无需先手动删除。
|
||||
if (m_editFresh)
|
||||
{
|
||||
m_editText.clear();
|
||||
m_editFresh = false;
|
||||
}
|
||||
m_editText.push_back(character);
|
||||
return true;
|
||||
return m_edit.Insert(character);
|
||||
}
|
||||
|
||||
bool SignalPanel::OnEditKey(WPARAM key)
|
||||
@@ -1283,6 +1260,9 @@ namespace jdi
|
||||
return false;
|
||||
}
|
||||
|
||||
const bool shift = (GetKeyState(VK_SHIFT) & 0x8000) != 0;
|
||||
const bool control = (GetKeyState(VK_CONTROL) & 0x8000) != 0;
|
||||
|
||||
switch (key)
|
||||
{
|
||||
case VK_RETURN:
|
||||
@@ -1290,12 +1270,24 @@ namespace jdi
|
||||
case VK_ESCAPE:
|
||||
return EndEdit(false);
|
||||
case VK_BACK:
|
||||
m_editFresh = false;
|
||||
if (!m_editText.empty())
|
||||
return m_edit.Backspace();
|
||||
case VK_DELETE:
|
||||
return m_edit.DeleteForward();
|
||||
case VK_LEFT:
|
||||
return m_edit.MoveCaret(-1, shift);
|
||||
case VK_RIGHT:
|
||||
return m_edit.MoveCaret(1, shift);
|
||||
case VK_HOME:
|
||||
return m_edit.MoveHome(shift);
|
||||
case VK_END:
|
||||
return m_edit.MoveEnd(shift);
|
||||
case 'A':
|
||||
if (control)
|
||||
{
|
||||
m_editText.pop_back();
|
||||
m_edit.SelectAll();
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user