ae/Radio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

初步重构

Browse Source
This commit is contained in:
种太阳的热带美短
2026-07-23 18:11:07 +08:00
parent 4530cd3fbe
commit a13a0e15f2
13 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/radio/BackEnd/IntermediateFrequencyWidget.cpp
+10 -10
View File
@@ -18,15 +18,15 @@ static double max = 160;
QWidget* IntermediateFrequencyWidget::createSpectrogramPowerPlot() { QWidget* IntermediateFrequencyWidget::createSpectrogramPowerPlot() {
class SpectrumPlot : public YSG::Plot { class SpectrumPlot : public YSG::Plot {
public: public:
YSG::FrequentAxis *xAxis{}; YSG::Frequent_Axis *xAxis{};
YSG::Axis *yAxis{}; YSG::Axis *yAxis{};
YSG::MutiSelectRect* msr{}; YSG::Muti_Select_Rect* msr{};
YSG::Spectrum *sp{}; YSG::Spectrum *sp{};
QMenu *mMenu{}; QMenu *mMenu{};
void init() override { void init() override {
Plot::init(); Plot::init();
mObjectName = "SpectrumPlot"; object_name = "SpectrumPlot";
xAxis = YSG::FrequentAxis::Builder(this, Qt::Horizontal) xAxis = YSG::Frequent_Axis::Builder(this, Qt::Horizontal)
.set_tick_length(-10) .set_tick_length(-10)
.set_coord_range(frequent_range) .set_coord_range(frequent_range)
.set_tick_length(-10) .set_tick_length(-10)
@@ -46,7 +46,7 @@ QWidget* IntermediateFrequencyWidget::createSpectrogramPowerPlot() {
.set_frequent_point_size(1024) .set_frequent_point_size(1024)
.build(); .build();
msr = YSG::MutiSelectRect::Builder(xAxis, yAxis).build(); msr = YSG::Muti_Select_Rect::Builder(xAxis, yAxis).build();
} }
protected: protected:
void resizeEvent(QResizeEvent* event) override { void resizeEvent(QResizeEvent* event) override {
@@ -83,15 +83,15 @@ QWidget* IntermediateFrequencyWidget::createSpectrogramPowerPlot() {
QWidget* IntermediateFrequencyWidget::create_Afterglow_Plot(){ QWidget* IntermediateFrequencyWidget::create_Afterglow_Plot(){
class AfterglowPlot : public YSG::Plot { class AfterglowPlot : public YSG::Plot {
public: public:
YSG::FrequentAxis *xAxis{}; YSG::Frequent_Axis *xAxis{};
YSG::Axis *yAxis{}; YSG::Axis *yAxis{};
YSG::Afterglow *ag{}; YSG::Afterglow *ag{};
YSG::MutiSelectRect* msr{}; YSG::Muti_Select_Rect* msr{};
QMenu *mMenu{}; QMenu *mMenu{};
void init() override { void init() override {
Plot::init(); Plot::init();
mObjectName = "AfterglowPlot"; object_name = "AfterglowPlot";
xAxis = YSG::FrequentAxis::Builder(this, Qt::Horizontal) xAxis = YSG::Frequent_Axis::Builder(this, Qt::Horizontal)
.set_coord_range(frequent_range) .set_coord_range(frequent_range)
.set_tick_length(-10) .set_tick_length(-10)
.set_sub_tick_length(-5) .set_sub_tick_length(-5)
@@ -113,7 +113,7 @@ QWidget* IntermediateFrequencyWidget::create_Afterglow_Plot(){
.build(); .build();
msr = YSG::MutiSelectRect::Builder(xAxis, yAxis).build(); msr = YSG::Muti_Select_Rect::Builder(xAxis, yAxis).build();
} }
protected: protected:
void resizeEvent(QResizeEvent* event) override { void resizeEvent(QResizeEvent* event) override {
module/radio/BackEnd/MainWidget.h
+1 -1
View File
@@ -17,7 +17,7 @@ class QVBoxLayout;
class TopMenuBar; class TopMenuBar;
class ServerSettingWidget; class ServerSettingWidget;
class FileExplorer; class FileExplorer;
class MainWidget : public QWidget, public YSG::SingletonWidget<MainWidget> { class MainWidget : public QWidget, public YSG::Singleton_Widget<MainWidget> {
public: public:
explicit MainWidget(QWidget *parent = nullptr); explicit MainWidget(QWidget *parent = nullptr);
QVBoxLayout *mMainLayout; QVBoxLayout *mMainLayout;
module/radio/BackEnd/RadioWidget.cpp
+26 -26
View File
@@ -16,17 +16,17 @@ static YSG::Range frequent_range = {-12000, 12000};
QWidget* RadioWidget::createSpectrogramPowerPlot() { QWidget* RadioWidget::createSpectrogramPowerPlot() {
class SpectrumPlot : public YSG::Plot { class SpectrumPlot : public YSG::Plot {
public: public:
YSG::FrequentAxis *xAxis{}; YSG::Frequent_Axis *xAxis{};
YSG::Axis *yAxis{}; YSG::Axis *yAxis{};
YSG::MutiSelectRect* msr{}; YSG::Muti_Select_Rect* msr{};
YSG::Spectrum *sp{}; YSG::Spectrum *sp{};
QMenu *mMenu{}; QMenu *mMenu{};
void init() override { void init() override {
Plot::init(); Plot::init();
mObjectName = "SpectrumPlot"; object_name = "SpectrumPlot";
xAxis = YSG::FrequentAxis::Builder(this, Qt::Horizontal) xAxis = YSG::Frequent_Axis::Builder(this, Qt::Horizontal)
.set_coord_range(frequent_range) .set_coord_range(frequent_range)
.set_tick_length(-10) .set_tick_length(-10)
.build(); .build();
@@ -41,7 +41,7 @@ QWidget* RadioWidget::createSpectrogramPowerPlot() {
.set_frequent_range(frequent_range) .set_frequent_range(frequent_range)
.set_frequent_point_size(1024) .set_frequent_point_size(1024)
.build(); .build();
msr = YSG::MutiSelectRect::Builder(xAxis, yAxis).build(); msr = YSG::Muti_Select_Rect::Builder(xAxis, yAxis).build();
if(use_Performance_shower) set_use_performance_shower(true); if(use_Performance_shower) set_use_performance_shower(true);
} }
protected: protected:
@@ -80,29 +80,29 @@ QWidget* RadioWidget::createSpectrogramPowerPlot() {
QWidget* RadioWidget::createWaterFallPlot() { QWidget* RadioWidget::createWaterFallPlot() {
class WaterFallPlot : public YSG::Plot { class WaterFallPlot : public YSG::Plot {
public: public:
YSG::FrequentAxis *xAxis{}; YSG::Frequent_Axis *xAxis{};
YSG::TimeAxis *yAxis{}; YSG::Time_Axis *yAxis{};
YSG::MutiSelectRect *msr{}; YSG::Muti_Select_Rect *msr{};
YSG::WaterFall *wf{}; YSG::Waterfall *wf{};
QMenu *mMenu{}; QMenu *mMenu{};
void init() override { void init() override {
Plot::init(); Plot::init();
mObjectName = "WaterFallPlot"; object_name = "WaterFallPlot";
xAxis = YSG::FrequentAxis::Builder(this, Qt::Horizontal) xAxis = YSG::Frequent_Axis::Builder(this, Qt::Horizontal)
.set_tick_length(-10) .set_tick_length(-10)
.set_sub_tick_length(-5) .set_sub_tick_length(-5)
.set_coord_range(frequent_range) .set_coord_range(frequent_range)
.build(); .build();
yAxis = YSG::TimeAxis::Builder(this, Qt::Vertical) yAxis = YSG::Time_Axis::Builder(this, Qt::Vertical)
.set_time_point_size(100) .set_time_point_size(100)
.build(); .build();
wf = YSG::WaterFall::Builder(xAxis, yAxis) wf = YSG::Waterfall::Builder(xAxis, yAxis)
.set_frequent_range(frequent_range) .set_frequent_range(frequent_range)
.set_frequent_point_size(1024) .set_frequent_point_size(1024)
.set_power_range({0, max}) .set_power_range({0, max})
// .set_time_point_size(100) // .set_time_point_size(100)
.build(); .build();
msr = YSG::MutiSelectRect::Builder(xAxis, yAxis).build(); msr = YSG::Muti_Select_Rect::Builder(xAxis, yAxis).build();
if(use_Performance_shower) set_use_performance_shower(true); if(use_Performance_shower) set_use_performance_shower(true);
} }
protected: protected:
@@ -136,17 +136,17 @@ QWidget* RadioWidget::createWaterFallPlot() {
QWidget* RadioWidget::createAudioSpectrogramPlot() { QWidget* RadioWidget::createAudioSpectrogramPlot() {
class SpectrumPlot : public YSG::Plot { class SpectrumPlot : public YSG::Plot {
public: public:
YSG::FrequentAxis *xAxis{}; YSG::Frequent_Axis *xAxis{};
YSG::Axis *yAxis{}; YSG::Axis *yAxis{};
YSG::MutiSelectRect* msr{}; YSG::Muti_Select_Rect* msr{};
YSG::Spectrum *sp{}; YSG::Spectrum *sp{};
QMenu *mMenu{}; QMenu *mMenu{};
void init() override { void init() override {
Plot::init(); Plot::init();
mObjectName = "SpectrumPlot"; object_name = "SpectrumPlot";
xAxis = YSG::FrequentAxis::Builder(this, Qt::Horizontal) xAxis = YSG::Frequent_Axis::Builder(this, Qt::Horizontal)
.set_coord_range({-12000 ,12000}) .set_coord_range({-12000 ,12000})
.set_tick_length(-10) .set_tick_length(-10)
.set_sub_tick_length(-5) .set_sub_tick_length(-5)
@@ -163,7 +163,7 @@ QWidget* RadioWidget::createAudioSpectrogramPlot() {
.set_frequent_point_size(512) .set_frequent_point_size(512)
.build(); .build();
msr = YSG::MutiSelectRect::Builder(xAxis, yAxis).build(); msr = YSG::Muti_Select_Rect::Builder(xAxis, yAxis).build();
if(use_Performance_shower) set_use_performance_shower(true); if(use_Performance_shower) set_use_performance_shower(true);
} }
@@ -199,16 +199,16 @@ QWidget* RadioWidget::createAudioSpectrogramPlot() {
QWidget* RadioWidget::createTimePowerPlot() { QWidget* RadioWidget::createTimePowerPlot() {
class AudioPlot : public YSG::Plot { class AudioPlot : public YSG::Plot {
public: public:
YSG::TimeAxis *xAxis{}; YSG::Time_Axis *xAxis{};
YSG::Axis *yAxis{}; YSG::Axis *yAxis{};
YSG::AudioFrequent *audio{}; YSG::Audio_Frequent *audio{};
YSG::MutiSelectRect* msr{}; YSG::Muti_Select_Rect* msr{};
QMenu *mMenu{}; QMenu *mMenu{};
void init() override { void init() override {
Plot::init(); Plot::init();
mObjectName = "AudioPlot"; object_name = "AudioPlot";
xAxis = YSG::TimeAxis::Builder(this, Qt::Horizontal) xAxis = YSG::Time_Axis::Builder(this, Qt::Horizontal)
.set_tick_length(-10) .set_tick_length(-10)
.set_sub_tick_length(-5) .set_sub_tick_length(-5)
.build(); .build();
@@ -218,9 +218,9 @@ QWidget* RadioWidget::createTimePowerPlot() {
.build(); .build();
audio = YSG::AudioFrequent::Builder(xAxis, yAxis) audio = YSG::Audio_Frequent::Builder(xAxis, yAxis)
.build(); .build();
msr = YSG::MutiSelectRect::Builder(xAxis, yAxis).build(); msr = YSG::Muti_Select_Rect::Builder(xAxis, yAxis).build();
if(use_Performance_shower) set_use_performance_shower(true); if(use_Performance_shower) set_use_performance_shower(true);
module/radio/BackEnd/RadioWidget.h
+2 -2
View File
@@ -27,8 +27,8 @@ public:
QWidget* createWaterFallPlot(); QWidget* createWaterFallPlot();
YSG::Spectrum *mSpectrogramLine{}; YSG::Spectrum *mSpectrogramLine{};
YSG::Spectrum* mAudioSpectrogramPlot{}; YSG::Spectrum* mAudioSpectrogramPlot{};
YSG::AudioFrequent *mTimePower{}; YSG::Audio_Frequent *mTimePower{};
YSG::WaterFall *mWaterFall{}; YSG::Waterfall *mWaterFall{};
protected: protected:
void focusInEvent(QFocusEvent *event) override; void focusInEvent(QFocusEvent *event) override;
void keyPressEvent(QKeyEvent *event) override; void keyPressEvent(QKeyEvent *event) override;
module/radio/BackEnd/SweepFrequencyWidget.cpp
+5 -5
View File
@@ -16,12 +16,12 @@ QWidget* SweepFrequencyWidget::createSpectrogramPowerPlot() {
public: public:
YSG::Axis *xAxis{}; YSG::Axis *xAxis{};
YSG::Axis *yAxis{}; YSG::Axis *yAxis{};
YSG::MutiSelectRect *msr{}; YSG::Muti_Select_Rect *msr{};
YSG::SweepFrequent* sf{}; YSG::Sweep_Frequent* sf{};
QMenu *mMenu{}; QMenu *mMenu{};
void init() override { void init() override {
Plot::init(); Plot::init();
mObjectName = "AxisTestPlot"; object_name = "AxisTestPlot";
xAxis = YSG::Axis::Builder(this, Qt::Horizontal) xAxis = YSG::Axis::Builder(this, Qt::Horizontal)
@@ -33,14 +33,14 @@ QWidget* SweepFrequencyWidget::createSpectrogramPowerPlot() {
.set_tick_length(-10).build(); .set_tick_length(-10).build();
sf = YSG::SweepFrequent::Builder(xAxis, yAxis) sf = YSG::Sweep_Frequent::Builder(xAxis, yAxis)
.set_block_num(200) .set_block_num(200)
.set_block_frequent_point_size(20) .set_block_frequent_point_size(20)
.set_frequent_range({0 , 100}) .set_frequent_range({0 , 100})
.build(); .build();
msr = YSG::MutiSelectRect::Builder(xAxis, yAxis).build(); msr = YSG::Muti_Select_Rect::Builder(xAxis, yAxis).build();
} }
protected: protected:
void resizeEvent(QResizeEvent* event) override { void resizeEvent(QResizeEvent* event) override {
module/radio/BackEnd/SweepFrequencyWidget.h
+1 -1
View File
@@ -22,7 +22,7 @@ public:
FrequentShower *mSelectValueWidget; FrequentShower *mSelectValueWidget;
ProgressBar *mProgressBar1, *mProgressBar2; ProgressBar *mProgressBar1, *mProgressBar2;
void initMenu(); void initMenu();
YSG::SweepFrequent *mSweepFrequencyLine{}; YSG::Sweep_Frequent *mSweepFrequencyLine{};
QWidget* createSpectrogramPowerPlot(); QWidget* createSpectrogramPowerPlot();
protected: protected:
void focusInEvent(QFocusEvent *event) override; void focusInEvent(QFocusEvent *event) override;
module/radio/Global.cpp
+2 -2
View File
@@ -100,14 +100,14 @@ QPushButton *createButton(const QString& text, int fontSize, const std::functio
} }
QPushButton *createClickButton(const QString &text, int fontSize, const std::function<void(void)> &mFunc, QPushButton *createClickButton(const QString &text, int fontSize, const std::function<void(void)> &mFunc,
YSG::RollObject<QPushButton> *rollObject) { YSG::Roll_Object<QPushButton> *rollObject) {
auto button = new QPushButton; auto button = new QPushButton;
initClickButton(button, text, fontSize, mFunc, rollObject); initClickButton(button, text, fontSize, mFunc, rollObject);
return button; return button;
} }
void initClickButton(QPushButton* button, const QString &text, int fontSize, const std::function<void(void)> &mFunc, void initClickButton(QPushButton* button, const QString &text, int fontSize, const std::function<void(void)> &mFunc,
YSG::RollObject<QPushButton> *rollObject){ YSG::Roll_Object<QPushButton> *rollObject){
button->setText(text); button->setText(text);
button->setFocusPolicy(Qt::NoFocus); button->setFocusPolicy(Qt::NoFocus);
button->setFlat(true); button->setFlat(true);
module/radio/Global.h
+3 -3
View File
@@ -34,13 +34,13 @@ QPushButton* createButton(const QString& text, int fontSize, const std::function
namespace YSG{ namespace YSG{
template <typename T> template <typename T>
class RollObject; class Roll_Object;
} }
class BaseWidgetMenu; class BaseWidgetMenu;
void initClickButton(QPushButton* button, const QString &text, int fontSize, const std::function<void(void)> &mFunc, YSG::RollObject<QPushButton>*); void initClickButton(QPushButton* button, const QString &text, int fontSize, const std::function<void(void)> &mFunc, YSG::Roll_Object<QPushButton>*);
QPushButton *createClickButton(const QString &text, int fontSize, const std::function<void(void)> &mFunc, YSG::RollObject<QPushButton>*); QPushButton *createClickButton(const QString &text, int fontSize, const std::function<void(void)> &mFunc, YSG::Roll_Object<QPushButton>*);
module/radio/component/ExpandInput.cpp
+1 -1
View File
@@ -8,7 +8,7 @@ ExpandInput::ExpandInput(QWidget *parent) : QLineEdit(parent) {
setMinimumSize(0, 0); setMinimumSize(0, 0);
setFrame(false); setFrame(false);
mFont.setBold(true); mFont.setBold(true);
YSG::VirtualKeyBoard::instance()->setEdit(this); YSG::Virtual_Keyboard::instance()->set_edit(this);
} }
void ExpandInput::paintEvent(QPaintEvent *event) { void ExpandInput::paintEvent(QPaintEvent *event) {
module/radio/component/TopMenuBar.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ TopMenuBar::TopMenuBar(QWidget *parent) : QWidget(parent) {
mSPL = createButton("SPL", fontSize); mSPL = createButton("SPL", fontSize);
mFIL1 = createButton("FIL1", fontSize); mFIL1 = createButton("FIL1", fontSize);
mAGC_A = createButton("AGC_A", fontSize); mAGC_A = createButton("AGC_A", fontSize);
mTextButtonList = new YSG::RollObject<QPushButton>({mAM, mATU, mVSQL, mNB, mNR, mDNF, mPRE, mATT, mSPL, mFIL1, mAGC_A}, [](QPushButton* cur){ mTextButtonList = new YSG::Roll_Object<QPushButton>({mAM, mATU, mVSQL, mNB, mNR, mDNF, mPRE, mATT, mSPL, mFIL1, mAGC_A}, [](QPushButton* cur){
}, [](QPushButton* btn){ }, [](QPushButton* btn){
module/radio/component/TopMenuBar.h
+2 -2
View File
@@ -7,12 +7,12 @@ class TopButton;
class ShowTime; class ShowTime;
class Wifi; class Wifi;
class QPushButton; class QPushButton;
class TopMenuBar : public QWidget, public YSG::SingletonWidget<TopMenuBar> { class TopMenuBar : public QWidget, public YSG::Singleton_Widget<TopMenuBar> {
public: public:
explicit TopMenuBar(QWidget *parent = nullptr); explicit TopMenuBar(QWidget *parent = nullptr);
QPushButton *mAM, *mATU, *mVSQL, *mNB, *mNR, *mDNF, *mPRE, *mATT, *mSPL, *mFIL1, *mAGC_A; QPushButton *mAM, *mATU, *mVSQL, *mNB, *mNR, *mDNF, *mPRE, *mATT, *mSPL, *mFIL1, *mAGC_A;
Wifi* mWifi; Wifi* mWifi;
YSG::RollObject<QPushButton> *mTextButtonList; YSG::Roll_Object<QPushButton> *mTextButtonList;
int index = 0; int index = 0;
ShowTime *mShowTime; ShowTime *mShowTime;
protected: protected:
module/radio/menu/BaseWidgetMenu.h
+2 -2
View File
@@ -1,7 +1,7 @@
#ifndef BaseWidgetMenu_H #ifndef BaseWidgetMenu_H
#define BaseWidgetMenu_H #define BaseWidgetMenu_H
#include "YSGraphic_Core/base/Node.hpp" #include "YSGraphic_Core/base/Node.hpp"
#include "YSGraphic_Core/base/RollObject.h" #include "YSGraphic_Core/base/Roll_Object.h"
#include "YSGraphic_Core/export.h" #include "YSGraphic_Core/export.h"
#include <QMap> #include <QMap>
@@ -22,7 +22,7 @@ public:
QHBoxLayout *mFirstLayout; QHBoxLayout *mFirstLayout;
QHBoxLayout *mSecondLayout; QHBoxLayout *mSecondLayout;
AbstractMenuButton *parentBtn{}; AbstractMenuButton *parentBtn{};
YSG::RollObject<AbstractMenuButton> mRollObject; YSG::Roll_Object<AbstractMenuButton> mRollObject;
BaseWidgetMenu* createSubWidgetMenu(AbstractMenuButton * btn); BaseWidgetMenu* createSubWidgetMenu(AbstractMenuButton * btn);
void esc(BaseWidgetMenu* menu); void esc(BaseWidgetMenu* menu);
void confirm(); void confirm();
module/radio/subWidget/ServerSettingWidget.h
+1 -1
View File
@@ -12,7 +12,7 @@ public:
QLabel *mRigNameLabel, *mUserNameLabel, *mPasswordLabel, *mCtrlPortLabel, *mCivPortLabel, *mAudioPortLabel; QLabel *mRigNameLabel, *mUserNameLabel, *mPasswordLabel, *mCtrlPortLabel, *mCivPortLabel, *mAudioPortLabel;
ExpandInput *mRigNameEdit, *mUserNameEdit, *mPasswordEdit, *mCtrlPortEdit, *mCivPortEdit, *mAudioPortEdit; ExpandInput *mRigNameEdit, *mUserNameEdit, *mPasswordEdit, *mCtrlPortEdit, *mCivPortEdit, *mAudioPortEdit;
ShowHelpInfo* mShowHelpInfo; ShowHelpInfo* mShowHelpInfo;
YSG::RollObject<QPushButton> mRollObject; YSG::Roll_Object<QPushButton> mRollObject;
QPushButton *mStartButton, *mDefaultButton, *mClearButton, *mSaveButton, *mExitButton; QPushButton *mStartButton, *mDefaultButton, *mClearButton, *mSaveButton, *mExitButton;
static QLabel* createLabel(const QString& text); static QLabel* createLabel(const QString& text);
protected: protected: