This commit is contained in:
2026-08-12 11:03:16 +08:00
parent 0910b73ea4
commit 898a58b554
18 changed files with 521 additions and 277 deletions
+6 -1
View File
@@ -54,10 +54,15 @@ append_glob_source(Renderive_Web_Server_sources "${Renderive_Web_Server_source_d
add_executable(Renderive_Web_Server ${Renderive_Web_Server_sources})
target_compile_features(Renderive_Web_Server PRIVATE cxx_std_20)
target_link_libraries(Renderive_Web_Server PRIVATE Renderive_Web)
if (CMAKE_CONFIGURATION_TYPES)
set(Renderive_Web_assets_dir "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/webapp_gallery")
else ()
set(Renderive_Web_assets_dir "${CMAKE_CURRENT_BINARY_DIR}/webapp_gallery")
endif ()
add_custom_target(Renderive_Web_Assets
COMMAND "${CMAKE_COMMAND}" -E copy_directory
"${CMAKE_CURRENT_LIST_DIR}/../webapp_gallery"
"${CMAKE_CURRENT_BINARY_DIR}/webapp_gallery"
"${Renderive_Web_assets_dir}"
COMMENT "Synchronizing Renderive Web assets"
)
add_dependencies(Renderive_Web_Server Renderive_Web_Assets)
+2 -2
View File
@@ -96,7 +96,7 @@ struct Type_Descriptor<renderive::Frame_Observer_Snapshot> {
ADMINIVE_FIELD_LABEL(T, task_peak_parallelism, "峰值并行度"),
ADMINIVE_FIELD_LABEL(T, task_failed_node_count, "失败节点"),
ADMINIVE_FIELD_LABEL(T, task_graph_duration_ns, "任务图耗时"))
.label("Kernel Observer");
.label("内核观察器");
}
};
@@ -114,7 +114,7 @@ struct Type_Descriptor<renderive::web::Gallery_Consumer_Feedback_Snapshot> {
ADMINIVE_FIELD_LABEL(T, pixel_interval_ns, "像素响应周期"),
ADMINIVE_FIELD_LABEL(T, presentation_interval_ns, "浏览器呈现周期"),
ADMINIVE_FIELD_LABEL(T, manual_interval_ns, "手动消费者周期"))
.label("Consumer Feedback");
.label("消费者反馈");
}
};
+1 -1
View File
@@ -85,7 +85,7 @@ adminive::Table_View action_view();
namespace adminive {
template <>
struct <renderive::web::gallery_detail::Case_Model> {
struct Type_Descriptor<renderive::web::gallery_detail::Case_Model> {
static auto get() {
using T = renderive::web::gallery_detail::Case_Model;
return object<T>("renderive_gallery_case",
+210 -154
View File
@@ -233,9 +233,9 @@ struct Type_Descriptor<renderive::Range> {
static auto get() {
using T = renderive::Range;
using namespace renderive::web::gallery_adminive;
return adminive::object<T>("range", "Range",
number<&T::origin>("origin", "Origin"),
number<&T::target>("target", "Target"));
return adminive::object<T>("range", "范围",
number<&T::origin>("origin", "起点"),
number<&T::target>("target", "终点"));
}
};
@@ -244,12 +244,22 @@ struct Type_Descriptor<renderive::Pen> {
static auto get() {
using T = renderive::Pen;
using namespace renderive::web::gallery_adminive;
return adminive::object<T>("pen", "Pen",
color<&T::color>("color", "Color"),
number<&T::width>("width", "Width"),
select<&T::style>("style", "Style"),
select<&T::cap>("cap", "Cap"),
select<&T::join>("join", "Join"));
return adminive::object<T>("pen", "画笔",
color<&T::color>("color", "颜色"),
number<&T::width>("width", "宽度"),
select<&T::style>("style", "线型")
.enum_label<renderive::Line_Style::None>("")
.enum_label<renderive::Line_Style::Solid>("实线")
.enum_label<renderive::Line_Style::Dash>("虚线")
.enum_label<renderive::Line_Style::Dot>("点线"),
select<&T::cap>("cap", "端点样式")
.enum_label<renderive::Line_Cap::Butt>("平头")
.enum_label<renderive::Line_Cap::Square>("方头")
.enum_label<renderive::Line_Cap::Round>("圆头"),
select<&T::join>("join", "连接样式")
.enum_label<renderive::Line_Join::Miter>("尖角")
.enum_label<renderive::Line_Join::Bevel>("斜角")
.enum_label<renderive::Line_Join::Round>("圆角"));
}
};
@@ -258,9 +268,11 @@ struct Type_Descriptor<renderive::Brush> {
static auto get() {
using T = renderive::Brush;
using namespace renderive::web::gallery_adminive;
return adminive::object<T>("brush", "Brush",
color<&T::color>("color", "Color"),
select<&T::style>("style", "Style"));
return adminive::object<T>("brush", "画刷",
color<&T::color>("color", "颜色"),
select<&T::style>("style", "填充样式")
.enum_label<renderive::Brush_Style::None>("")
.enum_label<renderive::Brush_Style::Solid>("纯色"));
}
};
@@ -269,10 +281,10 @@ struct Type_Descriptor<renderive::Font> {
static auto get() {
using T = renderive::Font;
using namespace renderive::web::gallery_adminive;
return adminive::object<T>("font", "Font",
number<&T::size>("size", "Size"),
number<&T::weight>("weight", "Weight"),
boolean<&T::italic>("italic", "Italic"));
return adminive::object<T>("font", "字体",
number<&T::size>("size", "字号"),
number<&T::weight>("weight", "字重"),
boolean<&T::italic>("italic", "斜体"));
}
};
@@ -284,28 +296,32 @@ struct Type_Descriptor<renderive::Font> {
using P = renderive::Axis_Properties; \
using namespace renderive::web::gallery_adminive; \
return adminive::object<T>(Name, Label, \
readonly_property<T, &B::x>("x", "X"), \
readonly_property<T, &B::y>("y", "Y"), \
property_select<T, &B::orientation>("orientation", "Orientation"), \
readonly_property<T, &B::pixel_length>("pixel_length", "Pixel length"), \
property_number<T, &B::tick_length>("tick_length", "Tick length"), \
property_number<T, &B::sub_tick_length>("sub_tick_length", "Sub tick length"), \
property_color<T, &B::color>("color", "Color"), \
property_select<T, &B::locale>("locale", "Decimal separator"), \
property_text<T, &B::unit_text>("unit_text", "Unit text"), \
property_object<T, &B::unit_text_font>("unit_text_font", "Unit font"), \
property_object<T, &B::unit_text_pen>("unit_text_pen", "Unit pen"), \
property_object<T, &B::unit_text_background_brush>("unit_text_background_brush", "Unit background"), \
property_number<T, &B::label_rotation_degrees>("label_rotation_degrees", "Label rotation"), \
property_object<T, &P::coordinates>("coordinates", "Coordinates"), \
property_number<T, &P::precision>("precision", "Precision"), \
property_boolean<T, &P::wheel>("wheel", "Wheel zoom"), \
property_boolean<T, &P::drag>("drag", "Drag pan")); \
readonly_property<T, &B::x>("x", "X 位置"), \
readonly_property<T, &B::y>("y", "Y 位置"), \
property_select<T, &B::orientation>("orientation", "方向") \
.enum_label<renderive::Orientation::Horizontal>("水平") \
.enum_label<renderive::Orientation::Vertical>("垂直"), \
readonly_property<T, &B::pixel_length>("pixel_length", "像素长度"), \
property_number<T, &B::tick_length>("tick_length", "主刻度长度"), \
property_number<T, &B::sub_tick_length>("sub_tick_length", "次刻度长度"), \
property_color<T, &B::color>("color", "颜色"), \
property_select<T, &B::locale>("locale", "小数点符号") \
.enum_label<renderive::web::gallery_adminive::Number_Locale_Choice::Point>("点") \
.enum_label<renderive::web::gallery_adminive::Number_Locale_Choice::Comma>("逗号"), \
property_text<T, &B::unit_text>("unit_text", "单位文本"), \
property_object<T, &B::unit_text_font>("unit_text_font", "单位字体"), \
property_object<T, &B::unit_text_pen>("unit_text_pen", "单位画笔"), \
property_object<T, &B::unit_text_background_brush>("unit_text_background_brush", "单位背景"), \
property_number<T, &B::label_rotation_degrees>("label_rotation_degrees", "标签旋转角度"), \
property_object<T, &P::coordinates>("coordinates", "坐标范围"), \
property_number<T, &P::precision>("precision", "小数位数"), \
property_boolean<T, &P::wheel>("wheel", "滚轮缩放"), \
property_boolean<T, &P::drag>("drag", "拖拽平移")); \
} \
}
RENDERIVE_AXIS_DESCRIPTOR(Gallery_Axis, "axis", "Axis");
RENDERIVE_AXIS_DESCRIPTOR(Gallery_Frequency_Axis, "frequency_axis", "Frequency axis");
RENDERIVE_AXIS_DESCRIPTOR(Gallery_Axis, "axis", "数值轴");
RENDERIVE_AXIS_DESCRIPTOR(Gallery_Frequency_Axis, "frequency_axis", "频率轴");
#undef RENDERIVE_AXIS_DESCRIPTOR
template <>
@@ -315,24 +331,28 @@ struct Type_Descriptor<renderive::web::Gallery_Time_Axis> {
using B = renderive::Axis_Base_Properties;
using P = renderive::Time_Axis_Properties;
using namespace renderive::web::gallery_adminive;
return adminive::object<T>("time_axis", "Time axis",
readonly_property<T, &B::x>("x", "X"),
readonly_property<T, &B::y>("y", "Y"),
property_select<T, &B::orientation>("orientation", "Orientation"),
readonly_property<T, &B::pixel_length>("pixel_length", "Pixel length"),
property_number<T, &B::tick_length>("tick_length", "Tick length"),
property_number<T, &B::sub_tick_length>("sub_tick_length", "Sub tick length"),
property_color<T, &B::color>("color", "Color"),
property_select<T, &B::locale>("locale", "Decimal separator"),
property_text<T, &B::unit_text>("unit_text", "Unit text"),
property_object<T, &B::unit_text_font>("unit_text_font", "Unit font"),
property_object<T, &B::unit_text_pen>("unit_text_pen", "Unit pen"),
property_object<T, &B::unit_text_background_brush>("unit_text_background_brush", "Unit background"),
property_number<T, &B::label_rotation_degrees>("label_rotation_degrees", "Label rotation"),
property_number<T, &P::visible_count>("visible_count", "Visible points"),
property_number<T, &P::tick_label_spacing_px>("tick_label_spacing_px", "Label spacing"),
property_text<T, &P::format>("format", "Time format"),
property_boolean<T, &P::newest_at_start>("newest_at_start", "Newest at start"));
return adminive::object<T>("time_axis", "时间轴",
readonly_property<T, &B::x>("x", "X 位置"),
readonly_property<T, &B::y>("y", "Y 位置"),
property_select<T, &B::orientation>("orientation", "方向")
.enum_label<renderive::Orientation::Horizontal>("水平")
.enum_label<renderive::Orientation::Vertical>("垂直"),
readonly_property<T, &B::pixel_length>("pixel_length", "像素长度"),
property_number<T, &B::tick_length>("tick_length", "主刻度长度"),
property_number<T, &B::sub_tick_length>("sub_tick_length", "次刻度长度"),
property_color<T, &B::color>("color", "颜色"),
property_select<T, &B::locale>("locale", "小数点符号")
.enum_label<renderive::web::gallery_adminive::Number_Locale_Choice::Point>("")
.enum_label<renderive::web::gallery_adminive::Number_Locale_Choice::Comma>("逗号"),
property_text<T, &B::unit_text>("unit_text", "单位文本"),
property_object<T, &B::unit_text_font>("unit_text_font", "单位字体"),
property_object<T, &B::unit_text_pen>("unit_text_pen", "单位画笔"),
property_object<T, &B::unit_text_background_brush>("unit_text_background_brush", "单位背景"),
property_number<T, &B::label_rotation_degrees>("label_rotation_degrees", "标签旋转角度"),
property_number<T, &P::visible_count>("visible_count", "可见点数"),
property_number<T, &P::tick_label_spacing_px>("tick_label_spacing_px", "标签间距"),
property_text<T, &P::format>("format", "时间格式"),
property_boolean<T, &P::newest_at_start>("newest_at_start", "最新数据在起点"));
}
};
@@ -346,86 +366,122 @@ struct Type_Descriptor<renderive::web::Gallery_Time_Axis> {
} \
}
RENDERIVE_GALLERY_DESCRIPTOR(Gallery_Spectrum, Spectrum_Properties, "spectrum", "Spectrum",
property_number<T, &P::frequency_point_size>("frequency_point_size", "Frequency points"),
property_number<T, &P::partition_count>("partition_count", "Render partitions")
.description("0 = automatic, 1 = single task, N = N parallel partitions"),
property_object<T, &P::frequency_range>("frequency_range", "Frequency range"),
property_number<T, &P::center_frequency>("center_frequency", "Center frequency"),
property_object<T, &P::sweep_frequency_range>("sweep_frequency_range", "Sweep range"),
property_boolean<T, &P::max_hold_visible>("max_hold_visible", "Max hold"),
property_boolean<T, &P::min_hold_visible>("min_hold_visible", "Min hold"),
property_boolean<T, &P::max_marker_visible>("max_marker_visible", "Max marker"),
property_boolean<T, &P::use_min_marker>("use_min_marker", "Use min marker"),
property_boolean<T, &P::sweep_region_visible>("sweep_region_visible", "Sweep region"),
property_boolean<T, &P::visible_range_only>("visible_range_only", "Visible range only"),
property_select<T, &P::interpolation_mode>("interpolation_mode", "Interpolation"),
property_object<T, &P::max_brush>("max_brush", "Max brush"),
property_object<T, &P::current_brush>("current_brush", "Current brush"),
property_object<T, &P::min_brush>("min_brush", "Min brush"),
property_object<T, &P::max_pen>("max_pen", "Max pen"),
property_object<T, &P::current_pen>("current_pen", "Current pen"),
property_object<T, &P::min_pen>("min_pen", "Min pen"),
property_object<T, &P::selected_marker_pen>("selected_marker_pen", "Selected marker pen"),
property_object<T, &P::marker_pen>("marker_pen", "Marker pen"),
property_object<T, &P::middle_frequency_pen>("middle_frequency_pen", "Middle frequency pen"),
property_object<T, &P::sweep_region_brush>("sweep_region_brush", "Sweep region brush"),
property_boolean<T, &P::tooltip_enabled>("tooltip_enabled", "Tooltip"),
property_object<T, &P::tooltip_font>("tooltip_font", "Tooltip font"),
property_object<T, &P::tooltip_text_pen>("tooltip_text_pen", "Tooltip text pen"),
property_object<T, &P::tooltip_background_brush>("tooltip_background_brush", "Tooltip background"));
RENDERIVE_GALLERY_DESCRIPTOR(Gallery_Spectrum, Spectrum_Properties, "spectrum", "实时频谱",
property_number<T, &P::frequency_point_size>("frequency_point_size", "频率点数"),
property_select<T, &P::partition_mode>("partition_mode", "任务分区模式")
.enum_label<renderive::Render_Partition_Mode::Automatic>("自动瓶颈优化")
.enum_label<renderive::Render_Partition_Mode::Fixed>("固定分区"),
property_number<T, &P::partition_count>("partition_count", "固定分区数")
.description("固定模式下的并行任务数;1 表示不分区")
.visible_on("${$self.partition_mode == 'Fixed'}"),
property_object<T, &P::frequency_range>("frequency_range", "频率范围"),
property_number<T, &P::center_frequency>("center_frequency", "中心频率"),
property_object<T, &P::sweep_frequency_range>("sweep_frequency_range", "扫频范围"),
property_boolean<T, &P::max_hold_visible>("max_hold_visible", "显示最大保持"),
property_boolean<T, &P::min_hold_visible>("min_hold_visible", "显示最小保持"),
property_boolean<T, &P::max_marker_visible>("max_marker_visible", "显示最大值标记"),
property_boolean<T, &P::use_min_marker>("use_min_marker", "显示最小值标记"),
property_boolean<T, &P::sweep_region_visible>("sweep_region_visible", "显示扫频区域"),
property_boolean<T, &P::visible_range_only>("visible_range_only", "仅绘制可见范围"),
property_select<T, &P::interpolation_mode>("interpolation_mode", "曲线插值")
.enum_label<renderive::Line_Interpolation_Mode::Nearest_Sample>("最近样本")
.enum_label<renderive::Line_Interpolation_Mode::Linear_Value>("数值线性")
.enum_label<renderive::Line_Interpolation_Mode::Linear_Power_Domain>("功率域线性")
.enum_label<renderive::Line_Interpolation_Mode::Step_Left>("左阶梯")
.enum_label<renderive::Line_Interpolation_Mode::Step_Right>("右阶梯")
.enum_label<renderive::Line_Interpolation_Mode::Cubic_Value>("三次插值"),
property_object<T, &P::max_brush>("max_brush", "最大保持画刷"),
property_object<T, &P::current_brush>("current_brush", "当前曲线画刷"),
property_object<T, &P::min_brush>("min_brush", "最小保持画刷"),
property_object<T, &P::max_pen>("max_pen", "最大保持画笔"),
property_object<T, &P::current_pen>("current_pen", "当前曲线画笔"),
property_object<T, &P::min_pen>("min_pen", "最小保持画笔"),
property_object<T, &P::selected_marker_pen>("selected_marker_pen", "选中标记画笔"),
property_object<T, &P::marker_pen>("marker_pen", "标记画笔"),
property_object<T, &P::middle_frequency_pen>("middle_frequency_pen", "中心频率画笔"),
property_object<T, &P::sweep_region_brush>("sweep_region_brush", "扫频区域画刷"),
property_boolean<T, &P::tooltip_enabled>("tooltip_enabled", "启用提示框"),
property_object<T, &P::tooltip_font>("tooltip_font", "提示框字体"),
property_object<T, &P::tooltip_text_pen>("tooltip_text_pen", "提示框文字画笔"),
property_object<T, &P::tooltip_background_brush>("tooltip_background_brush", "提示框背景"));
RENDERIVE_GALLERY_DESCRIPTOR(Gallery_Waterfall, Waterfall_Properties, "waterfall", "Waterfall",
property_object<T, &P::frequency_range>("frequency_range", "Frequency range"),
property_object<T, &P::power_range>("power_range", "Power range"),
property_number<T, &P::frequency_bin_count>("frequency_bin_count", "Frequency bins"),
property_number<T, &P::partition_count>("partition_count", "Render partitions")
.description("0 = automatic, 1 = single task, N = N parallel partitions"),
property_boolean<T, &P::visible_range_only>("visible_range_only", "Visible range only"),
property_select<T, &P::interpolation_mode>("interpolation_mode", "Interpolation"),
property_select<T, &P::color_map>("color_map", "Color map"),
property_boolean<T, &P::tooltip_enabled>("tooltip_enabled", "Tooltip"),
property_object<T, &P::tooltip_font>("tooltip_font", "Tooltip font"),
property_object<T, &P::tooltip_text_pen>("tooltip_text_pen", "Tooltip text pen"),
property_object<T, &P::tooltip_background_brush>("tooltip_background_brush", "Tooltip background"));
RENDERIVE_GALLERY_DESCRIPTOR(Gallery_Waterfall, Waterfall_Properties, "waterfall", "频谱瀑布",
property_object<T, &P::frequency_range>("frequency_range", "频率范围"),
property_object<T, &P::power_range>("power_range", "功率范围"),
property_number<T, &P::frequency_bin_count>("frequency_bin_count", "频率格数"),
property_select<T, &P::partition_mode>("partition_mode", "任务分区模式")
.enum_label<renderive::Render_Partition_Mode::Automatic>("自动瓶颈优化")
.enum_label<renderive::Render_Partition_Mode::Fixed>("固定分区"),
property_number<T, &P::partition_count>("partition_count", "固定分区数")
.description("固定模式下的并行任务数;1 表示不分区")
.visible_on("${$self.partition_mode == 'Fixed'}"),
property_boolean<T, &P::visible_range_only>("visible_range_only", "仅绘制可见范围"),
property_select<T, &P::interpolation_mode>("interpolation_mode", "图像插值")
.enum_label<renderive::Image_Interpolation_Mode::Nearest>("最近邻")
.enum_label<renderive::Image_Interpolation_Mode::Bilinear>("双线性")
.enum_label<renderive::Image_Interpolation_Mode::Bicubic>("双三次"),
property_select<T, &P::color_map>("color_map", "色图")
.enum_label<renderive::web::gallery_adminive::Color_Map_Choice::Spectrum>("频谱")
.enum_label<renderive::web::gallery_adminive::Color_Map_Choice::Ember>("火焰")
.enum_label<renderive::web::gallery_adminive::Color_Map_Choice::Grayscale>("灰度"),
property_boolean<T, &P::tooltip_enabled>("tooltip_enabled", "启用提示框"),
property_object<T, &P::tooltip_font>("tooltip_font", "提示框字体"),
property_object<T, &P::tooltip_text_pen>("tooltip_text_pen", "提示框文字画笔"),
property_object<T, &P::tooltip_background_brush>("tooltip_background_brush", "提示框背景"));
RENDERIVE_GALLERY_DESCRIPTOR(Gallery_Afterglow, Afterglow_Properties, "afterglow", "Afterglow",
property_object<T, &P::frequency_range>("frequency_range", "Frequency range"),
property_object<T, &P::power_range>("power_range", "Power range"),
property_number<T, &P::frequency_point_size>("frequency_point_size", "Frequency points"),
property_number<T, &P::power_point_size>("power_point_size", "Power points"),
property_number<T, &P::partition_count>("partition_count", "Render partitions")
.description("0 = automatic, 1 = single task, N = N parallel partitions"),
property_boolean<T, &P::interpolate>("interpolate", "Interpolate power"),
property_number<T, &P::attenuation_rate>("attenuation_rate", "Attenuation"),
property_select<T, &P::color_map>("color_map", "Color map"));
RENDERIVE_GALLERY_DESCRIPTOR(Gallery_Afterglow, Afterglow_Properties, "afterglow", "余辉频谱",
property_object<T, &P::frequency_range>("frequency_range", "频率范围"),
property_object<T, &P::power_range>("power_range", "功率范围"),
property_number<T, &P::frequency_point_size>("frequency_point_size", "频率点数"),
property_number<T, &P::power_point_size>("power_point_size", "功率点数"),
property_select<T, &P::partition_mode>("partition_mode", "任务分区模式")
.enum_label<renderive::Render_Partition_Mode::Automatic>("自动瓶颈优化")
.enum_label<renderive::Render_Partition_Mode::Fixed>("固定分区"),
property_number<T, &P::partition_count>("partition_count", "固定分区数")
.description("固定模式下的并行任务数;1 表示不分区")
.visible_on("${$self.partition_mode == 'Fixed'}"),
property_boolean<T, &P::interpolate>("interpolate", "插值功率点"),
property_number<T, &P::attenuation_rate>("attenuation_rate", "衰减率"),
property_select<T, &P::color_map>("color_map", "色图")
.enum_label<renderive::web::gallery_adminive::Color_Map_Choice::Spectrum>("频谱")
.enum_label<renderive::web::gallery_adminive::Color_Map_Choice::Ember>("火焰")
.enum_label<renderive::web::gallery_adminive::Color_Map_Choice::Grayscale>("灰度"));
RENDERIVE_GALLERY_DESCRIPTOR(Gallery_Sweep_Spectrum, Sweep_Spectrum_Properties, "sweep_spectrum", "Sweep spectrum",
property_object<T, &P::frequency_range>("frequency_range", "Frequency range"),
property_number<T, &P::bins_per_block>("bins_per_block", "Bins per block"),
property_number<T, &P::block_count>("block_count", "Block count"),
property_object<T, &P::pen>("pen", "Sweep pen"),
property_object<T, &P::current_frequency_pen>("current_frequency_pen", "Current frequency pen"),
property_boolean<T, &P::visible_range_only>("visible_range_only", "Visible range only"),
property_select<T, &P::interpolation_mode>("interpolation_mode", "Interpolation"));
RENDERIVE_GALLERY_DESCRIPTOR(Gallery_Sweep_Spectrum, Sweep_Spectrum_Properties, "sweep_spectrum", "扫频频谱",
property_object<T, &P::frequency_range>("frequency_range", "频率范围"),
property_number<T, &P::bins_per_block>("bins_per_block", "每块频率格数"),
property_number<T, &P::block_count>("block_count", "扫频块数"),
property_object<T, &P::pen>("pen", "扫频曲线画笔"),
property_object<T, &P::current_frequency_pen>("current_frequency_pen", "当前频率画笔"),
property_boolean<T, &P::visible_range_only>("visible_range_only", "仅绘制可见范围"),
property_select<T, &P::interpolation_mode>("interpolation_mode", "曲线插值")
.enum_label<renderive::Line_Interpolation_Mode::Nearest_Sample>("最近样本")
.enum_label<renderive::Line_Interpolation_Mode::Linear_Value>("数值线性")
.enum_label<renderive::Line_Interpolation_Mode::Linear_Power_Domain>("功率域线性")
.enum_label<renderive::Line_Interpolation_Mode::Step_Left>("左阶梯")
.enum_label<renderive::Line_Interpolation_Mode::Step_Right>("右阶梯")
.enum_label<renderive::Line_Interpolation_Mode::Cubic_Value>("三次插值"));
RENDERIVE_GALLERY_DESCRIPTOR(Gallery_Frequency_Trace, Frequency_Trace_Properties, "frequency_trace", "Frequency trace",
property_object<T, &P::pen>("pen", "Trace pen"));
RENDERIVE_GALLERY_DESCRIPTOR(Gallery_Frequency_Trace, Frequency_Trace_Properties, "frequency_trace", "频率轨迹",
property_object<T, &P::pen>("pen", "轨迹画笔"));
RENDERIVE_GALLERY_DESCRIPTOR(Gallery_Selection_Rectangle_Overlay, Selection_Rectangle_Overlay_Properties, "selection_overlay", "Selection overlay",
property_object<T, &P::label_font>("label_font", "Label font"),
property_object<T, &P::label_pen>("label_pen", "Label pen"),
property_object<T, &P::selection_brush>("selection_brush", "Selection brush"),
property_object<T, &P::selection_border_pen>("selection_border_pen", "Selection border"));
RENDERIVE_GALLERY_DESCRIPTOR(Gallery_Selection_Rectangle_Overlay, Selection_Rectangle_Overlay_Properties, "selection_overlay", "框选区域",
property_object<T, &P::label_font>("label_font", "标签字体"),
property_object<T, &P::label_pen>("label_pen", "标签画笔"),
property_object<T, &P::selection_brush>("selection_brush", "选区画刷"),
property_object<T, &P::selection_border_pen>("selection_border_pen", "选区边框画笔"));
RENDERIVE_GALLERY_DESCRIPTOR(Gallery_Constellation_Diagram, Constellation_Diagram_Properties, "constellation", "Constellation diagram",
property_object<T, &P::i_range>("i_range", "I range"),
property_object<T, &P::q_range>("q_range", "Q range"),
property_color<T, &P::point_color>("point_color", "Point color"),
property_color<T, &P::anchor_color>("anchor_color", "Anchor color"),
property_number<T, &P::point_lifetime_ms>("point_lifetime_ms", "Point lifetime"),
property_select<T, &P::type>("type", "Constellation"),
property_number<T, &P::phase_offset_radians>("phase_offset_radians", "Phase offset"));
RENDERIVE_GALLERY_DESCRIPTOR(Gallery_Constellation_Diagram, Constellation_Diagram_Properties, "constellation", "星座图",
property_object<T, &P::i_range>("i_range", "I 轴范围"),
property_object<T, &P::q_range>("q_range", "Q 轴范围"),
property_color<T, &P::point_color>("point_color", "点颜色"),
property_color<T, &P::anchor_color>("anchor_color", "锚点颜色"),
property_number<T, &P::point_lifetime_ms>("point_lifetime_ms", "点保留时间"),
property_select<T, &P::type>("type", "调制类型")
.enum_label<renderive::Constellation_Diagram_Type::Psk4>("4 PSK")
.enum_label<renderive::Constellation_Diagram_Type::Psk8>("8 PSK")
.enum_label<renderive::Constellation_Diagram_Type::Psk16>("16 PSK"),
property_number<T, &P::phase_offset_radians>("phase_offset_radians", "相位偏移"));
#undef RENDERIVE_GALLERY_DESCRIPTOR
@@ -437,7 +493,7 @@ constexpr auto axis_metadata() {
return structive::type_metadata(
gallery_action("axis_probe", "读取坐标映射与刻度",
"coord_to_pixel / pixel_to_coord / tick_step / sub_tick_count / tick_label",
"Axis"));
"坐标轴"));
}
} // namespace renderive::web::gallery_action_registry
@@ -477,61 +533,61 @@ struct Type_Descriptor<renderive::web::Gallery_Time_Axis> {
return object<T>(type_metadata(
gallery_action("axis_probe", "读取坐标映射与刻度",
"coord_to_pixel / pixel_to_coord / tick_step / sub_tick_count / tick_label",
"Axis"),
"坐标轴"),
gallery_action("append_time", "追加时间点",
"Time_Axis::append_time / tick_to_time", "Time_Axis")));
"Time_Axis::append_time / tick_to_time", "时间轴")));
}
};
RENDERIVE_TYPE_ACTIONS(Gallery_Spectrum,
gallery_action("push_samples", "推送一帧样本", "Spectrum::update_samples", "Spectrum"),
gallery_action("power_at", "查询指定频率功率", "Spectrum::power_at", "Spectrum",
gallery_action("push_samples", "推送一帧样本", "Spectrum::update_samples", "频谱"),
gallery_action("power_at", "查询指定频率功率", "Spectrum::power_at", "频谱",
{}, "number", "频率", 98e6),
gallery_action("add_marker", "添加点 Marker", "Spectrum::add_custom_marker", "Marker",
gallery_action("add_marker", "添加点标记", "Spectrum::add_custom_marker", "标记",
{}, "number", "频率", 96e6),
gallery_action("add_line_marker", "添加线 Marker", "Spectrum::add_custom_line_marker", "Marker",
gallery_action("add_line_marker", "添加线标记", "Spectrum::add_custom_line_marker", "标记",
{}, "number", "频率", 100e6),
gallery_action("remove_marker", "按频率删除 Marker", "Spectrum::remove_custom_marker", "Marker",
gallery_action("remove_marker", "按频率删除标记", "Spectrum::remove_custom_marker", "标记",
{}, "number", "频率", 96e6),
gallery_action("remove_selected_marker", "删除选中 Marker",
"Spectrum::remove_selected_marker", "Marker"),
gallery_action("clear_markers", "清空 Marker", "Spectrum::clear_custom_markers", "Marker"),
gallery_action("select_marker", "选择 Marker 索引", "Spectrum::set_selected_marker_index", "Marker",
gallery_action("remove_selected_marker", "删除选中标记",
"Spectrum::remove_selected_marker", "标记"),
gallery_action("clear_markers", "清空标记", "Spectrum::clear_custom_markers", "标记"),
gallery_action("select_marker", "选择标记索引", "Spectrum::set_selected_marker_index", "标记",
{}, "number", "索引", 0.0),
gallery_action("select_next_marker", "选择下一个 Marker", "Spectrum::select_next_marker", "Marker"),
gallery_action("select_previous_marker", "选择上一个 Marker", "Spectrum::select_previous_marker", "Marker"),
gallery_action("clear_marker_selection", "清除 Marker 选择",
"Spectrum::clear_marker_selection", "Marker"),
gallery_action("set_marker_frequency", "修改选中 Marker 频率",
"Spectrum::set_marker_frequency / set_current_marker_frequency", "Marker",
gallery_action("select_next_marker", "选择下一个标记", "Spectrum::select_next_marker", "标记"),
gallery_action("select_previous_marker", "选择上一个标记", "Spectrum::select_previous_marker", "标记"),
gallery_action("clear_marker_selection", "清除标记选择",
"Spectrum::clear_marker_selection", "标记"),
gallery_action("set_marker_frequency", "修改选中标记频率",
"Spectrum::set_marker_frequency / set_current_marker_frequency", "标记",
{}, "number", "频率", 99e6));
RENDERIVE_TYPE_ACTIONS(Gallery_Waterfall,
gallery_action("append_row", "追加一行", "Waterfall::append_row", "Waterfall"),
gallery_action("append_row", "追加一行", "Waterfall::append_row", "频谱瀑布"),
gallery_action("append_tick_row", "按 tick 追加一行",
"Time_Axis::append_time / Waterfall::append_row(int, span)", "Waterfall"));
"Time_Axis::append_time / Waterfall::append_row(int, span)", "频谱瀑布"));
RENDERIVE_TYPE_ACTIONS(Gallery_Afterglow,
gallery_action("append_spectrum", "追加一帧频谱", "Afterglow::append_spectrum", "Afterglow"));
gallery_action("append_spectrum", "追加一帧频谱", "Afterglow::append_spectrum", "余辉频谱"));
RENDERIVE_TYPE_ACTIONS(Gallery_Sweep_Spectrum,
gallery_action("append_block", "追加一个扫频块", "Sweep_Spectrum::append_block", "Sweep Spectrum"));
gallery_action("append_block", "追加一个扫频块", "Sweep_Spectrum::append_block", "扫频频谱"));
RENDERIVE_TYPE_ACTIONS(Gallery_Frequency_Trace,
gallery_action("append_sample", "追加一个样本", "Frequency_Trace::append_sample", "Frequency Trace"),
gallery_action("append_sample", "追加一个样本", "Frequency_Trace::append_sample", "频率轨迹"),
gallery_action("append_tick_sample", "按 tick 追加样本",
"Time_Axis::append_time / Frequency_Trace::append_sample(int, double)",
"Frequency Trace"));
"频率轨迹"));
RENDERIVE_TYPE_ACTIONS(Gallery_Selection_Rectangle_Overlay,
gallery_action("clear_selection", "清空框选区域",
"Selection_Rectangle_Overlay::clear_selected_regions", "Selection Overlay"));
"Selection_Rectangle_Overlay::clear_selected_regions", "框选区域"));
RENDERIVE_TYPE_ACTIONS(Gallery_Constellation_Diagram,
gallery_action("append_points", "追加一组 IQ 点",
"Constellation_Diagram::append_point", "Constellation"),
"Constellation_Diagram::append_point", "星座图"),
gallery_action("fit_square", "按轴拟合正方形",
"Constellation_Diagram::fit_square_to_axes", "Constellation"));
"Constellation_Diagram::fit_square_to_axes", "星座图"));
#undef RENDERIVE_TYPE_ACTIONS
@@ -29,12 +29,12 @@ struct Type_Descriptor<renderive::web::Gallery_Feedback_Policy> {
static auto get() {
using T = renderive::web::Gallery_Feedback_Policy;
using namespace renderive::web::gallery_adminive;
return adminive::object<T>("feedback_policy", "Consumer feedback",
boolean<&T::enabled>("enabled", "Enabled"),
boolean<&T::pixel>("pixel", "Pixel feedback"),
boolean<&T::presentation>("presentation", "Presentation feedback"),
boolean<&T::manual>("manual", "Manual feedback"),
number<&T::manual_fps>("manual_fps", "Manual FPS"));
return adminive::object<T>("feedback_policy", "消费者反馈",
boolean<&T::enabled>("enabled", "启用反馈"),
boolean<&T::pixel>("pixel", "像素响应反馈"),
boolean<&T::presentation>("presentation", "浏览器呈现反馈"),
boolean<&T::manual>("manual", "手动反馈"),
number<&T::manual_fps>("manual_fps", "手动反馈帧率"));
}
};
@@ -44,16 +44,16 @@ struct Type_Descriptor<renderive::web::Gallery_Session_Control> {
using T = renderive::web::Gallery_Session_Control;
using namespace renderive::web::gallery_adminive;
const auto dirty = [](T& value) { value.plot_.notify_model_dirty(); };
return adminive::object<T>("scene", "Scene",
return adminive::object<T>("scene", "场景",
callback_property<T, renderive::Color>(
"background_color", "Background", Field_Control::color,
"background_color", "背景颜色", Field_Control::color,
[](const T& value) { return value.plot_.background_color(); },
[dirty](T& value, renderive::Color color) {
value.plot_.set_background_color(color);
dirty(value);
}),
callback_property<T, bool>(
"performance_overlay", "Performance overlay", Field_Control::boolean,
"performance_overlay", "性能叠加层", Field_Control::boolean,
[](const T& value) {
const auto overlay = value.plot_.performance_overlay();
return overlay && overlay->enabled();
@@ -63,28 +63,30 @@ struct Type_Descriptor<renderive::web::Gallery_Session_Control> {
dirty(value);
}),
callback_property<T, bool>(
"renderable_visible", "Renderable visible", Field_Control::boolean,
"renderable_visible", "显示渲染元素", Field_Control::boolean,
[](const T& value) { return value.renderable_.is_visible(); },
[dirty](T& value, bool visible) {
value.renderable_.set_visible(visible);
dirty(value);
}),
callback_property<T, renderive::Renderable_Cache_Mode>(
"cache_mode", "Cache mode", Field_Control::select,
"cache_mode", "缓存模式", Field_Control::select,
[](const T& value) { return value.renderable_.get_cache_mode(); },
[dirty](T& value, renderive::Renderable_Cache_Mode mode) {
value.renderable_.set_cache_mode(mode);
dirty(value);
}),
})
.enum_label<renderive::Renderable_Cache_Mode::Direct>("直接绘制")
.enum_label<renderive::Renderable_Cache_Mode::Local_Pixel>("本地像素缓存"),
callback_property<T, std::string>(
"object_name", "Object name", Field_Control::text,
"object_name", "对象名称", Field_Control::text,
[](const T& value) { return value.renderable_.object_name(); },
[dirty](T& value, std::string name) {
value.renderable_.set_object_name(std::move(name));
dirty(value);
}),
callback_property<T, bool>(
"frequency_limit_enabled", "Frequency limit", Field_Control::boolean,
"frequency_limit_enabled", "启用帧率限制", Field_Control::boolean,
[](const T& value) { return value.plot_.max_render_fps() > 0.0; },
[dirty](T& value, bool enabled) {
if (enabled) {
@@ -96,7 +98,7 @@ struct Type_Descriptor<renderive::web::Gallery_Session_Control> {
dirty(value);
}),
callback_property<T, double>(
"max_render_fps", "Maximum render FPS", Field_Control::number,
"max_render_fps", "最大渲染帧率", Field_Control::number,
[](const T& value) {
const double fps = value.plot_.max_render_fps();
return fps > 0.0 ? fps : 30.0;
@@ -107,7 +109,7 @@ struct Type_Descriptor<renderive::web::Gallery_Session_Control> {
dirty(value);
}),
callback_property<T, renderive::web::Gallery_Feedback_Policy>(
"feedback", "Consumer feedback", Field_Control::automatic,
"feedback", "消费者反馈", Field_Control::automatic,
[](const T& value) { return value.feedback_; },
[dirty](T& value, renderive::web::Gallery_Feedback_Policy feedback) {
value.feedback_ = std::move(feedback);
@@ -129,11 +131,11 @@ struct Type_Descriptor<renderive::web::Gallery_Session_Control> {
using T = renderive::web::Gallery_Session_Control;
using renderive::web::gallery_action;
return object<T>(type_metadata(
gallery_action("reset", "恢复本图默认值", "Gallery_Scene::rebuild", "Session"),
gallery_action("reset", "恢复本图默认值", "Gallery_Scene::rebuild", "场景"),
gallery_action("toggle_view", "切换 View 生命周期",
"Plot_Core::activate_view / deactivate_view", "Session"),
"Plot_Core::activate_view / deactivate_view", "场景"),
gallery_action("read_data_shape", "读取数据形状",
"Renderable data query / observer telemetry", "Observer")));
"Renderable data query / observer telemetry", "观察器")));
}
};
+21 -5
View File
@@ -276,6 +276,8 @@ TEST(RenderiveWebGallery, ObserverTelemetryAndDashboardUseAdminiveDescriptors) {
const auto& observer_descriptor = observer_contract.at("descriptor");
const auto& feedback_descriptor =
observer_contract.at("consumer_feedback_descriptor");
EXPECT_EQ(observer_descriptor.at("label"), "内核观察器");
EXPECT_EQ(feedback_descriptor.at("label"), "消费者反馈");
Gallery_Plot_Session session;
const auto opened = response_json(session.handle(gallery_request(
@@ -356,16 +358,26 @@ TEST(RenderiveWebGallery, AdminiveResourcesPatchTheRealRenderableState) {
spectrum.at("descriptor").at("fields").end(),
[](const auto& field) { return field.at("name") == "partition_count"; });
ASSERT_NE(partition_field, spectrum.at("descriptor").at("fields").end());
EXPECT_EQ(partition_field->at("presentation").at("label"), "固定分区数");
EXPECT_EQ(partition_field->at("presentation").at("description"),
"0 = automatic, 1 = single task, N = N parallel partitions");
"固定模式下的并行任务数;1 表示不分区");
const auto partition_mode_field = std::find_if(
spectrum.at("descriptor").at("fields").begin(),
spectrum.at("descriptor").at("fields").end(),
[](const auto& field) { return field.at("name") == "partition_mode"; });
ASSERT_NE(partition_mode_field, spectrum.at("descriptor").at("fields").end());
EXPECT_EQ(partition_mode_field->at("presentation").at("label"), "任务分区模式");
EXPECT_EQ(spectrum.at("descriptor").at("label"), "实时频谱");
response = response_json(session.handle(gallery_request(
Gallery_Request_Kind::Patch,
R"({"category":"event","type":"gallery_patch","target":"spectrum","patch":{"frequency_point_size":1024,"partition_count":4,"frequency_range":{"origin":90000000},"current_pen":{"color":"#ff8844"},"interpolation_mode":"Cubic_Value"}})")));
R"({"category":"event","type":"gallery_patch","target":"spectrum","patch":{"frequency_point_size":1024,"partition_mode":"Fixed","partition_count":4,"frequency_range":{"origin":90000000},"current_pen":{"color":"#ff8844"},"interpolation_mode":"Cubic_Value"}})")));
ASSERT_EQ(response.at("type"), "case_state");
const auto& updated = find_resource(response, "spectrum").at("data");
EXPECT_EQ(updated.at("frequency_point_size"), 1024);
EXPECT_EQ(updated.at("partition_count"), 4);
EXPECT_EQ(updated.at("partition_mode"), "Fixed");
EXPECT_EQ(updated.at("frequency_range").at("origin"), 90'000'000);
EXPECT_EQ(updated.at("current_pen").at("color"), "#ff8844");
EXPECT_EQ(updated.at("interpolation_mode"), "Cubic_Value");
@@ -394,7 +406,9 @@ TEST(RenderiveWebGallery, PartitionControlRebuildsTheObservedTaskGraph) {
return invoke_action(session, "mode_render").at("telemetry").at("kernel_observer");
};
ASSERT_EQ(patch_controls(session, {{"partition_count", 1}}, "spectrum").at("type"),
ASSERT_EQ(patch_controls(session,
{{"partition_mode", "Fixed"}, {"partition_count", 1}},
"spectrum").at("type"),
"case_state");
const auto single = render();
EXPECT_EQ(single.at("task_execution_state"), "Completed");
@@ -448,7 +462,8 @@ TEST(RenderiveWebGallery, AxisSwapAndEveryPlotDirectionAreEditableAndRenderable)
{{"orientation", "Horizontal"},
{"coordinates", {{"origin", -20.0}, {"target", -120.0}}}});
ASSERT_EQ(state.at("type"), "case_state");
state = patch(session, case_id, {{"partition_count", 4}});
state = patch(session, case_id,
{{"partition_mode", "Fixed"}, {"partition_count", 4}});
ASSERT_EQ(state.at("type"), "case_state");
EXPECT_EQ(resource_data(state, "frequency_axis").at("orientation"), "Vertical");
EXPECT_EQ(resource_data(state, "value_axis").at("orientation"), "Horizontal");
@@ -467,7 +482,8 @@ TEST(RenderiveWebGallery, AxisSwapAndEveryPlotDirectionAreEditableAndRenderable)
state = patch(waterfall, "time_axis",
{{"orientation", "Horizontal"}, {"newest_at_start", true}});
ASSERT_EQ(state.at("type"), "case_state");
state = patch(waterfall, "waterfall", {{"partition_count", 4}});
state = patch(waterfall, "waterfall",
{{"partition_mode", "Fixed"}, {"partition_count", 4}});
ASSERT_EQ(state.at("type"), "case_state");
EXPECT_EQ(resource_data(state, "frequency_axis").at("orientation"), "Vertical");
EXPECT_EQ(resource_data(state, "time_axis").at("orientation"), "Horizontal");