diff --git a/main.cmake b/main.cmake index 35258b0..24913b8 100644 --- a/main.cmake +++ b/main.cmake @@ -2,7 +2,7 @@ set(module_dir "${CMAKE_CURRENT_LIST_DIR}/module") set(dir "${module_dir}/radio") file(GLOB_RECURSE srcs "${dir}/*.c" "${dir}/*.cpp" "${dir}/*.h" "${dir}/*.hpp" "${dir}/*.qrc") add_executable(radio ${srcs}) -target_link_libraries(radio PUBLIC Renderive Renderive_Widget) +target_link_libraries(radio PUBLIC Renderive Renderive_Diagnostics Renderive_Widget) # 为了一起维护代码 #target_link_libraries(radio PUBLIC Demo_Gallery_Lib) if (MSVC) @@ -38,7 +38,7 @@ psc_add_graphviz_directory_target(psc_radio_graphviz COLLAPSE_THRESHOLD 20 ) psc_add_cmake_graphviz_target(psc_radio_cmake_graphviz - TARGETS radio Renderive Demo_Gallery Core_Static asio_object + TARGETS radio Renderive Renderive_Diagnostics Demo_Gallery Core_Static asio_object OUTPUT_DIR "${CMAKE_BINARY_DIR}/docs/graphviz/radio" FORMAT svg ) diff --git a/module/radio/BackEnd/BackEnd_Mock.cpp b/module/radio/BackEnd/BackEnd_Mock.cpp index 988ae55..238bce1 100644 --- a/module/radio/BackEnd/BackEnd_Mock.cpp +++ b/module/radio/BackEnd/BackEnd_Mock.cpp @@ -10,7 +10,7 @@ #include #include #include -#include "../../../third_party/Renderive/Renderive/Generate_Mock_Data.h" +#include "../../../third_party/Renderive/Widget/base/Generate_Mock_Data.h" #include "../../../third_party/Renderive/Renderive/base/Memory.h" namespace { struct Mock_Config { @@ -48,9 +48,9 @@ void push_radio_data(Radio_Widget* rw) { return; { auto r = rw->spectrogram_line->power_axis()->coord_range(); - renderive::Range nr = {r.center() - r.length() / 4, r.center() + r.length() / 4}; + renderive::Range nr = {r.middle() - r.length() / 4, r.middle() + r.length() / 4}; auto data = make_random_data(nr, rw->spectrogram_line->frequency_point_size(), renderive::Memory_Domain::Spectrum); - double middle_power = data.empty() ? nr.center() : data[data.size() / 2]; + double middle_power = data.empty() ? nr.middle() : data[data.size() / 2]; rw->spectrogram_line->give_data(std::move(data)); rw->progress_bar1->setValue(middle_power); } @@ -59,12 +59,12 @@ void push_radio_data(Radio_Widget* rw) { } { renderive::Range r = rw->time_power->value_axis()->coord_range(); - renderive::Range nr = {r.center() - r.length() / 4, r.center() + r.length() / 4}; + renderive::Range nr = {r.middle() - r.length() / 4, r.middle() + r.length() / 4}; rw->time_power->give_data(QTime::currentTime(), make_random_value(nr)); } { auto r = rw->audio_spectrogram_plot->power_axis()->coord_range(); - renderive::Range nr = {r.center() - r.length() / 4, r.center() + r.length() / 4}; + renderive::Range nr = {r.middle() - r.length() / 4, r.middle() + r.length() / 4}; rw->audio_spectrogram_plot->give_data(make_random_data(nr, rw->audio_spectrogram_plot->frequency_point_size(), renderive::Memory_Domain::Spectrum)); } rw->progress_bar2->setValue(make_random_value({1, 5})); @@ -75,7 +75,7 @@ void push_radio_data_perf(Radio_Widget* rw) { { renderive::Range nr = {40, 120}; auto data = make_random_data(nr, 1024, renderive::Memory_Domain::Spectrum); - double middle_power = data.empty() ? nr.center() : data[data.size() / 2]; + double middle_power = data.empty() ? nr.middle() : data[data.size() / 2]; rw->spectrogram_line->give_data(std::move(data)); rw->progress_bar1->setValue(middle_power); } diff --git a/module/radio/BackEnd/IntermediateFrequencyWidget.cpp b/module/radio/BackEnd/IntermediateFrequencyWidget.cpp index 2f9813c..e555349 100644 --- a/module/radio/BackEnd/IntermediateFrequencyWidget.cpp +++ b/module/radio/BackEnd/IntermediateFrequencyWidget.cpp @@ -11,7 +11,7 @@ #include "../BaseWidget.h" #include "../menu/BaseWidgetMenu.h" #include "../BackEnd/MainWidget.h" -#include "../../../third_party/Renderive/Renderive/base/Tool.h" +#include "../../../third_party/Renderive/Demo_Gallery/base/Tool.h" static renderive::Range frequent_range = {-12000, 12000}; static double max = 160; QWidget* Intermediate_Frequency_Widget::create_spectrogram_power_plot() { @@ -73,7 +73,7 @@ QWidget* Intermediate_Frequency_Widget::create_spectrogram_power_plot() { w->init(); spectrogram_line = w->sp; progress_bar1->set_value = [this]() { - double middle_frequent = this->spectrogram_line->frequency_range().center(); + double middle_frequent = this->spectrogram_line->frequency_range().middle(); bool ok = false; double power = spectrogram_line->get_power(middle_frequent, ok, renderive::SRC::Render); if (ok) diff --git a/module/radio/BackEnd/RadioWidget.cpp b/module/radio/BackEnd/RadioWidget.cpp index 161980a..367a12d 100644 --- a/module/radio/BackEnd/RadioWidget.cpp +++ b/module/radio/BackEnd/RadioWidget.cpp @@ -8,7 +8,7 @@ #include "../menu/BaseWidgetMenu.h" #include "BackEnd.h" #include "../BackEnd/MainWidget.h" -#include "../../../third_party/Renderive/Renderive/base/Tool.h" +#include "../../../third_party/Renderive/Demo_Gallery/base/Tool.h" static bool use_Performance_shower = false; static double max = 160; static renderive::Range frequent_range = {-12000, 12000}; @@ -26,8 +26,6 @@ static void configure_radio_plot_perf(renderive::Latency_Eager_Plot* plot) { if (!radio_mock_perf_mode()) return; plot->set_max_render_fps(1000); - if (radio_show_performance_overlay()) - plot->set_use_performance_shower(true); } QWidget* Radio_Widget::create_spectrogram_power_plot() { class Spectrum_Plot : public renderive::Latency_Eager_Plot { @@ -62,7 +60,6 @@ QWidget* Radio_Widget::create_spectrogram_power_plot() { .set_frequency_point_size(1024) .build(); msr = renderive::Multi_Select_Rect::Builder(overlay, x_axis, y_axis).build(); - if (use_Performance_shower) set_use_performance_shower(true); } protected: void resizeEvent(QResizeEvent* event) override { @@ -90,7 +87,7 @@ QWidget* Radio_Widget::create_spectrogram_power_plot() { spectrogram_line = w->sp; if (!radio_mock_perf_mode()) { progress_bar1->set_value = [this]() { - double middle_frequent = this->spectrogram_line->frequency_range().center(); + double middle_frequent = this->spectrogram_line->frequency_range().middle(); bool ok = false; double power = spectrogram_line->get_power(middle_frequent, ok, renderive::SRC::Render); if (ok) @@ -132,7 +129,6 @@ QWidget* Radio_Widget::create_water_fall_plot() { .set_power_range({0, max}) .build(); msr = renderive::Multi_Select_Rect::Builder(overlay, x_axis, y_axis).build(); - if (use_Performance_shower) set_use_performance_shower(true); } protected: void resizeEvent(QResizeEvent* event) override { @@ -191,7 +187,6 @@ QWidget* Radio_Widget::create_audio_spectrogram_plot() { .set_frequency_point_size(512) .build(); msr = renderive::Multi_Select_Rect::Builder(overlay, x_axis, y_axis).build(); - if (use_Performance_shower) set_use_performance_shower(true); } protected: void resizeEvent(QResizeEvent* event) override { @@ -248,7 +243,6 @@ QWidget* Radio_Widget::create_time_power_plot() { audio = renderive::Audio_Frequency::Builder(data, x_axis, y_axis) .build(); msr = renderive::Multi_Select_Rect::Builder(overlay, x_axis, y_axis).build(); - if (use_Performance_shower) set_use_performance_shower(true); } protected: void resizeEvent(QResizeEvent* event) override { diff --git a/module/radio/BackEnd/SweepFrequencyWidget.cpp b/module/radio/BackEnd/SweepFrequencyWidget.cpp index 1ab8c2e..9af7ec5 100644 --- a/module/radio/BackEnd/SweepFrequencyWidget.cpp +++ b/module/radio/BackEnd/SweepFrequencyWidget.cpp @@ -9,7 +9,7 @@ #include "../component/ShowTime.h" #include "../Global.h" #include "../menu/BaseWidgetMenu.h" -#include "Renderive/base/Tool.h" +#include "Demo_Gallery/base/Tool.h" QWidget* Sweep_Frequency_Widget::create_spectrogram_power_plot() { class Sweep_Frequent_Plot : public renderive::Latency_Eager_Plot { public: