名称优化
This commit is contained in:
+10
-10
@@ -24,7 +24,7 @@ Color from_qcolor(const QColor& color) {
|
||||
}
|
||||
|
||||
QColor to_qcolor(Color color) {
|
||||
return QColor(color.red, color.green, color.blue, color.alpha);
|
||||
return QColor(color.r, color.g, color.b, color.a);
|
||||
}
|
||||
|
||||
std::string to_utf8_string(const QString& text) {
|
||||
@@ -49,7 +49,7 @@ void Abs_Plot_Private::attach_widget(Abs_Plot* plot) {
|
||||
core->set_presentation_sink(presentation_sink);
|
||||
QPointer<Abs_Plot> guarded_plot(plot);
|
||||
auto pending = performance_update_pending;
|
||||
set_performance_shower_update_callback(*core, [guarded_plot, pending]() mutable {
|
||||
set_performance_overlay_update_callback(*core, [guarded_plot, pending]() mutable {
|
||||
if (!guarded_plot || pending->exchange(true, std::memory_order_acq_rel))
|
||||
return;
|
||||
QTimer::singleShot(0, guarded_plot.data(), [guarded_plot, pending]() mutable {
|
||||
@@ -70,7 +70,7 @@ Abs_Plot::Abs_Plot(Abs_Plot_Private* private_data)
|
||||
|
||||
Abs_Plot::~Abs_Plot() {
|
||||
if (d) {
|
||||
set_performance_shower_update_callback(*d->core, {});
|
||||
set_performance_overlay_update_callback(*d->core, {});
|
||||
d->core->pause_render();
|
||||
delete d;
|
||||
d = nullptr;
|
||||
@@ -89,7 +89,7 @@ Plot_Core* Abs_Plot::core() const {
|
||||
return d ? d->core.get() : nullptr;
|
||||
}
|
||||
|
||||
std::shared_ptr<Renderable> Abs_Plot::get_root_renderable() const {
|
||||
std::shared_ptr<Renderable> Abs_Plot::root_renderable() const {
|
||||
return d->core->root_renderable();
|
||||
}
|
||||
|
||||
@@ -147,7 +147,7 @@ void Abs_Plot_Private::paint_event(Abs_Plot* plot, QPaintEvent* event) {
|
||||
else {
|
||||
painter.fillRect(plot->rect(), plot->background_color());
|
||||
}
|
||||
auto performance_snapshot = performance_shower_snapshot(*core);
|
||||
auto performance_snapshot = performance_overlay_snapshot(*core);
|
||||
if (performance_snapshot && !performance_snapshot->image.empty()) {
|
||||
Size current_size = core->viewport_size();
|
||||
auto ctx = core->render_context();
|
||||
@@ -180,7 +180,7 @@ bool Abs_Plot_Private::event(Abs_Plot* plot, QEvent* event, bool base_result) {
|
||||
case QEvent::Resize: {
|
||||
auto* resize_event = static_cast<QResizeEvent*>(event);
|
||||
core->set_viewport_size(Qt_Event_Adapter::to_size(resize_event->size()));
|
||||
notify_performance_shower_viewport_changed(*core);
|
||||
notify_performance_overlay_viewport_changed(*core);
|
||||
core->dispatch_event(Qt_Event_Adapter::to_resize_event(resize_event));
|
||||
core->mark_render_state_dirty();
|
||||
break;
|
||||
@@ -204,7 +204,7 @@ bool Abs_Plot_Private::event(Abs_Plot* plot, QEvent* event, bool base_result) {
|
||||
}
|
||||
case QEvent::Wheel: {
|
||||
auto wheel_event = Qt_Event_Adapter::to_wheel_event(static_cast<QWheelEvent*>(event));
|
||||
if (performance_shower_handle_wheel(*core, wheel_event.position, wheel_event.angle_delta_y, wheel_event.pixel_delta_y)) {
|
||||
if (performance_overlay_handle_wheel(*core, wheel_event.position, wheel_event.angle_delta_y, wheel_event.pixel_delta_y)) {
|
||||
event->accept();
|
||||
request_performance_overlay_update(plot);
|
||||
return true;
|
||||
@@ -214,7 +214,7 @@ bool Abs_Plot_Private::event(Abs_Plot* plot, QEvent* event, bool base_result) {
|
||||
}
|
||||
case QEvent::MouseMove: {
|
||||
auto pointer_event = Qt_Event_Adapter::to_pointer_event(static_cast<QMouseEvent*>(event), Event_Type::Pointer_Move);
|
||||
if (performance_shower_handle_pointer_move(*core, pointer_event.position)) {
|
||||
if (performance_overlay_handle_pointer_move(*core, pointer_event.position)) {
|
||||
event->accept();
|
||||
request_performance_overlay_update(plot);
|
||||
return true;
|
||||
@@ -225,7 +225,7 @@ bool Abs_Plot_Private::event(Abs_Plot* plot, QEvent* event, bool base_result) {
|
||||
case QEvent::MouseButtonPress: {
|
||||
auto* mouse_event = static_cast<QMouseEvent*>(event);
|
||||
auto pointer_event = Qt_Event_Adapter::to_pointer_event(mouse_event, Event_Type::Pointer_Press);
|
||||
if (mouse_event->button() == Qt::LeftButton && performance_shower_handle_pointer_press(*core, pointer_event.position)) {
|
||||
if (mouse_event->button() == Qt::LeftButton && performance_overlay_handle_pointer_press(*core, pointer_event.position)) {
|
||||
event->accept();
|
||||
request_performance_overlay_update(plot);
|
||||
return true;
|
||||
@@ -236,7 +236,7 @@ bool Abs_Plot_Private::event(Abs_Plot* plot, QEvent* event, bool base_result) {
|
||||
case QEvent::MouseButtonRelease: {
|
||||
auto* mouse_event = static_cast<QMouseEvent*>(event);
|
||||
auto pointer_event = Qt_Event_Adapter::to_pointer_event(mouse_event, Event_Type::Pointer_Release);
|
||||
if (mouse_event->button() == Qt::LeftButton && performance_shower_handle_pointer_release(*core, pointer_event.position)) {
|
||||
if (mouse_event->button() == Qt::LeftButton && performance_overlay_handle_pointer_release(*core, pointer_event.position)) {
|
||||
event->accept();
|
||||
request_performance_overlay_update(plot);
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user