caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mode: convert averaging mode as a method used in all modes

Browse Source
This commit is contained in:
Kiara Navarro 2022-07-14 08:51:45 -05:00
parent 6bd80c5944
commit fd5d21db0f
No known key found for this signature in database
GPG Key ID: CBA9F2172CE33FBA
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Software/PC_Application/Generator/generator.h
View File

@ -18,6 +18,8 @@ public:
virtual nlohmann::json toJSON() override; virtual nlohmann::json toJSON() override;
virtual void fromJSON(nlohmann::json j) override; virtual void fromJSON(nlohmann::json j) override;
void setAveragingMode(Averaging::Mode mode) override {Q_UNUSED(mode)};
private slots: private slots:
void updateDevice(); void updateDevice();

2
Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.h
View File

@ -28,7 +28,7 @@ public:
virtual void fromJSON(nlohmann::json j) override; virtual void fromJSON(nlohmann::json j) override;
void updateGraphColors(); void updateGraphColors();
void setAveragingMode(Averaging::Mode mode); void setAveragingMode(Averaging::Mode mode) override;
private: private:

2
Software/PC_Application/VNA/vna.h
View File

@ -31,7 +31,7 @@ public:
virtual void fromJSON(nlohmann::json j) override; virtual void fromJSON(nlohmann::json j) override;
void updateGraphColors(); void updateGraphColors();
void setAveragingMode(Averaging::Mode mode); void setAveragingMode(Averaging::Mode mode) override;
enum class SweepType { enum class SweepType {
Frequency = 0, Frequency = 0,

11
Software/PC_Application/appwindow.cpp
View File

@ -290,19 +290,12 @@ AppWindow::AppWindow(QWidget *parent)
switch (m->getType()) switch (m->getType())
{ {
case Mode::Type::VNA: case Mode::Type::VNA:
if(p.Acquisition.useMedianAveraging) {
static_cast<VNA*>(m)->setAveragingMode(Averaging::Mode::Median);
}
else {
static_cast<VNA*>(m)->setAveragingMode(Averaging::Mode::Mean);
}
break;
case Mode::Type::SA: case Mode::Type::SA:
if(p.Acquisition.useMedianAveraging) { if(p.Acquisition.useMedianAveraging) {
static_cast<SpectrumAnalyzer*>(m)->setAveragingMode(Averaging::Mode::Median); m->setAveragingMode(Averaging::Mode::Median);
} }
else { else {
static_cast<SpectrumAnalyzer*>(m)->setAveragingMode(Averaging::Mode::Mean); m->setAveragingMode(Averaging::Mode::Mean);
} }
break; break;
case Mode::Type::SG: case Mode::Type::SG:

2
Software/PC_Application/mode.h
View File

@ -41,6 +41,8 @@ public:
virtual void saveSreenshot(); virtual void saveSreenshot();
virtual void setAveragingMode(Averaging::Mode mode) = 0;
signals: signals:
void statusbarMessage(QString msg); void statusbarMessage(QString msg);
protected: protected: