DeepSeek V4.1 Flash
17eb03a1b3
网格滚动： - 修复纵向滚动时波形与文字溢出到工具栏/时间轴的问题：网格内容裁剪改为与绘图区求交， 并对网格内的图例、幅值标签与读数框增加显式可见性判定 （GDI 文本不遵循 GDI+ 裁剪区，仅裁剪矢量绘制不足以阻止溢出）。 - 网格之间改为完整矩形描边并加大间距，边界清晰；时间轴固定预留高度，不再被网格挤压。 - 时间轴刻度标签夹在绘图区横向范围内，避免与左侧时间列名重叠。 缩放交互： - 取消滚轮缩放：滚轮改为纵向滚动网格，Shift+滚轮水平平移。 - 新增「时间轴缩放」「Y 轴缩放」工具栏切换按钮：选中后在绘图区拖拽选区放大对应轴向， 拖动过程显示选区与跨度提示（时间用强调色、Y 轴用警示色）；再次点击退出该模式。 - 「适应视图」回到初始状态：恢复自适应范围并退出缩放模式。 - 移除右键框选缩放，避免与模式化缩放重复。 时间光标： - 改为工具栏「光标」按钮切换；启用时置于当前视图中心，再次点击关闭（Esc 亦可关闭）。 - 光标由鼠标靠近后拖拽移动，不再跟随鼠标；纵向贯穿全部网格并延伸到时间轴底部， 顶部带三角把手提示可拖拽。 - 具体时间读数移至绘图区顶部，仅在鼠标覆盖光标时显示，不再遮挡时间轴刻度尺。 - 双击光标进入精确时间输入，交互与线宽输入一致：整段高亮、首次键入即整体覆盖、 回车提交、Esc 取消、点击框外提交。 - 光标形态按模式区分：默认与悬停线外为箭头（不再出现十字指针）， 时间轴缩放/光标为水平双向箭头，Y 轴缩放为垂直双向箭头。
308 lines
7.7 KiB
C++
308 lines
7.7 KiB
C++
#include "Toolbar.hpp"
|
|
|
|
#include <cmath>
|
|
|
|
#include "Utf8Util.hpp"
|
|
|
|
namespace jdi
|
|
{
|
|
|
|
namespace
|
|
{
|
|
const float kButtonHeight = 30.0f; /**< 按钮高度（逻辑像素）。 */
|
|
const float kButtonGap = 6.0f; /**< 按钮间距。 */
|
|
const float kButtonPadding = 14.0f; /**< 按钮左右内边距。 */
|
|
const float kGroupGap = 18.0f; /**< 分组间距。 */
|
|
const float kButtonRadius = 5.0f; /**< 按钮圆角半径。 */
|
|
const float kSidePadding = 12.0f; /**< 工具栏左右留白。 */
|
|
const float kTopPadding = 8.0f; /**< 工具栏上下留白。 */
|
|
}
|
|
|
|
Toolbar::Toolbar() = default;
|
|
|
|
void Toolbar::Setup(const UiFonts* fonts, const Theme* theme)
|
|
{
|
|
m_fonts = fonts;
|
|
m_theme = theme;
|
|
}
|
|
|
|
void Toolbar::SetScale(float scale)
|
|
{
|
|
m_scale = (scale > 0.1f) ? scale : 1.0f;
|
|
}
|
|
|
|
void Toolbar::SetDocumentLoaded(bool hasDocument)
|
|
{
|
|
m_documentLoaded = hasDocument;
|
|
}
|
|
|
|
void Toolbar::SetStatusText(const std::wstring& text)
|
|
{
|
|
m_statusText = text;
|
|
}
|
|
|
|
float Toolbar::DesiredHeight() const
|
|
{
|
|
return (kButtonHeight + kTopPadding * 2.0f) * m_scale;
|
|
}
|
|
|
|
bool Toolbar::IsEnabled(const Button& button) const
|
|
{
|
|
return button.needsDocument ? m_documentLoaded : true;
|
|
}
|
|
|
|
void Toolbar::Layout(const gd::RectF& area)
|
|
{
|
|
m_area = area;
|
|
m_buttons.clear();
|
|
|
|
if (m_fonts == nullptr || m_fonts->ui == nullptr)
|
|
{
|
|
return;
|
|
}
|
|
|
|
struct Spec
|
|
{
|
|
ToolbarAction action;
|
|
const wchar_t* label;
|
|
bool primary;
|
|
bool needsDocument;
|
|
bool toggle;
|
|
};
|
|
|
|
const Spec specs[] = {
|
|
{ToolbarAction::OPEN_FILE, L"打开 CSV", true, false, false},
|
|
{ToolbarAction::FIT_ALL, L"适应视图", false, true, false},
|
|
{ToolbarAction::ZOOM_TIME, L"时间轴缩放", false, true, true},
|
|
{ToolbarAction::ZOOM_VALUE, L"Y 轴缩放", false, true, true},
|
|
{ToolbarAction::CURSOR, L"光标", false, true, true},
|
|
{ToolbarAction::MERGE_LANES, L"合并网格", false, true, false},
|
|
{ToolbarAction::SPLIT_LANES, L"每信号一格", false, true, false},
|
|
{ToolbarAction::SELECT_ALL, L"全选信号", false, true, false},
|
|
{ToolbarAction::CLEAR_ALL, L"清空勾选", false, true, false},
|
|
};
|
|
|
|
// 按钮宽度按实际文本像素宽 + 固定内边距计算，避免中文标签被裁切。
|
|
float cursorX = area.X + kSidePadding * m_scale;
|
|
const float top = area.Y + kTopPadding * m_scale;
|
|
const float height = kButtonHeight * m_scale;
|
|
const float horizontalPadding = kButtonPadding * 2.0f * m_scale;
|
|
|
|
for (const Spec& spec : specs)
|
|
{
|
|
Button button;
|
|
button.action = spec.action;
|
|
button.label = spec.label;
|
|
button.primary = spec.primary;
|
|
button.needsDocument = spec.needsDocument;
|
|
button.toggle = spec.toggle;
|
|
button.width = horizontalPadding + UiMeasureTextWidth(m_fonts->ui, button.label);
|
|
button.rect = gd::RectF(cursorX, top, button.width, height);
|
|
cursorX += button.width + kButtonGap * m_scale;
|
|
|
|
if (spec.action == ToolbarAction::OPEN_FILE || spec.action == ToolbarAction::CURSOR ||
|
|
spec.action == ToolbarAction::SPLIT_LANES)
|
|
{
|
|
cursorX += kGroupGap * m_scale;
|
|
}
|
|
|
|
m_buttons.push_back(std::move(button));
|
|
}
|
|
}
|
|
|
|
void Toolbar::SetToggleState(ToolbarAction action, bool checked)
|
|
{
|
|
for (Button& button : m_buttons)
|
|
{
|
|
if (button.action == action && button.toggle)
|
|
{
|
|
button.checked = checked;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
void Toolbar::Paint(gd::Graphics& g)
|
|
{
|
|
if (m_theme == nullptr || m_fonts == nullptr)
|
|
{
|
|
return;
|
|
}
|
|
|
|
UiFillRect(g, m_area, m_theme->toolbarBg);
|
|
|
|
for (const Button& button : m_buttons)
|
|
{
|
|
const bool enabled = IsEnabled(button);
|
|
std::uint32_t background = 0;
|
|
std::uint32_t border = 0;
|
|
std::uint32_t textColor = 0;
|
|
|
|
if (button.primary)
|
|
{
|
|
background = enabled ? m_theme->accent : MixColor(m_theme->accent, m_theme->toolbarBg, 0.6);
|
|
if (button.pressed)
|
|
{
|
|
background = MixColor(m_theme->accent, 0xFF000000u, 0.12);
|
|
}
|
|
else if (enabled && button.hover)
|
|
{
|
|
background = MixColor(m_theme->accent, 0xFFFFFFFFu, 0.12);
|
|
}
|
|
border = background;
|
|
textColor = m_theme->textOnAccent;
|
|
}
|
|
else
|
|
{
|
|
// 可切换按钮在选中时用强调色浅底 + 强调描边，与普通按钮区分。
|
|
background = (button.toggle && button.checked) ? m_theme->accentSoft : m_theme->toolbarBg;
|
|
if (button.pressed)
|
|
{
|
|
background = m_theme->pressed;
|
|
}
|
|
else if (enabled && button.hover)
|
|
{
|
|
background = (button.toggle && button.checked) ? MixColor(m_theme->accentSoft, m_theme->accent,
|
|
0.16)
|
|
: m_theme->hover;
|
|
}
|
|
if (!enabled)
|
|
{
|
|
background = m_theme->toolbarBg;
|
|
}
|
|
|
|
if (button.toggle && button.checked && enabled)
|
|
{
|
|
border = m_theme->accent;
|
|
}
|
|
else
|
|
{
|
|
border = MixColor(m_theme->border, m_theme->toolbarBg, enabled ? 0.0 : 0.5);
|
|
}
|
|
textColor = enabled ? ((button.toggle && button.checked) ? m_theme->textStrong : m_theme->text)
|
|
: m_theme->textMuted;
|
|
}
|
|
|
|
if (background != m_theme->toolbarBg)
|
|
{
|
|
UiFillRoundRect(g, button.rect, kButtonRadius * m_scale, background);
|
|
}
|
|
if (!button.primary)
|
|
{
|
|
UiDrawRoundRect(g, button.rect, kButtonRadius * m_scale, border, 1.0f);
|
|
}
|
|
|
|
UiText(g, button.label, m_fonts->ui, button.rect, textColor, TextAlign::CENTER);
|
|
}
|
|
|
|
// 右侧状态文本。
|
|
if (!m_statusText.empty())
|
|
{
|
|
const float rightPadding = kSidePadding * m_scale;
|
|
gd::RectF textRect(m_area.X, m_area.Y, m_area.Width - rightPadding, m_area.Height);
|
|
UiText(g, m_statusText, m_fonts->uiSmall, textRect, m_theme->textMuted, TextAlign::RIGHT);
|
|
}
|
|
|
|
// 底部分隔线。
|
|
UiDrawLine(g, m_area.X, m_area.Y + m_area.Height - 1.0f, m_area.X + m_area.Width,
|
|
m_area.Y + m_area.Height - 1.0f, m_theme->border, 1.0f);
|
|
}
|
|
|
|
bool Toolbar::HitTest(int x, int y) const
|
|
{
|
|
return UiPointInRect(m_area, static_cast<float>(x), static_cast<float>(y));
|
|
}
|
|
|
|
bool Toolbar::OnMouseMove(int x, int y)
|
|
{
|
|
int hoverIndex = -1;
|
|
for (std::size_t index = 0; index < m_buttons.size(); ++index)
|
|
{
|
|
if (UiPointInRect(m_buttons[index].rect, static_cast<float>(x), static_cast<float>(y)))
|
|
{
|
|
hoverIndex = static_cast<int>(index);
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (hoverIndex == m_hoverIndex)
|
|
{
|
|
return false;
|
|
}
|
|
m_hoverIndex = hoverIndex;
|
|
return true;
|
|
}
|
|
|
|
bool Toolbar::OnLButtonDown(int x, int y, ToolbarAction& action)
|
|
{
|
|
action = ToolbarAction::NONE;
|
|
|
|
for (std::size_t index = 0; index < m_buttons.size(); ++index)
|
|
{
|
|
Button& button = m_buttons[index];
|
|
if (!UiPointInRect(button.rect, static_cast<float>(x), static_cast<float>(y)))
|
|
{
|
|
continue;
|
|
}
|
|
if (!IsEnabled(button))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
m_pressedIndex = static_cast<int>(index);
|
|
button.pressed = true;
|
|
action = button.action;
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool Toolbar::OnLButtonUp(int x, int y, ToolbarAction& action)
|
|
{
|
|
action = ToolbarAction::NONE;
|
|
if (m_pressedIndex < 0)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
const int index = m_pressedIndex;
|
|
m_pressedIndex = -1;
|
|
if (index >= static_cast<int>(m_buttons.size()))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
Button& button = m_buttons[static_cast<std::size_t>(index)];
|
|
button.pressed = false;
|
|
|
|
const bool inside = UiPointInRect(button.rect, static_cast<float>(x), static_cast<float>(y));
|
|
m_hoverIndex = inside ? index : -1;
|
|
if (inside && IsEnabled(button))
|
|
{
|
|
action = button.action;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool Toolbar::OnMouseLeave()
|
|
{
|
|
bool changed = false;
|
|
if (m_hoverIndex >= 0)
|
|
{
|
|
m_hoverIndex = -1;
|
|
changed = true;
|
|
}
|
|
if (m_pressedIndex >= 0)
|
|
{
|
|
if (m_pressedIndex < static_cast<int>(m_buttons.size()))
|
|
{
|
|
m_buttons[static_cast<std::size_t>(m_pressedIndex)].pressed = false;
|
|
}
|
|
m_pressedIndex = -1;
|
|
changed = true;
|
|
}
|
|
return changed;
|
|
}
|
|
|
|
} // namespace jdi
|