From b03cf0c257b969eb8c3e73998892a372da897dde Mon Sep 17 00:00:00 2001 From: pandx Date: Wed, 2 Apr 2025 10:13:03 +0800 Subject: [PATCH] fix build issue. --- .vscode/settings.json | 5 +++++ cardbase.h | 19 ++----------------- radial_vibration.cpp | 20 ++++++++++---------- radial_vibration.h | 6 +++--- seismic_monitor.cpp | 8 ++++---- vibrationdata.h | 15 --------------- 6 files changed, 24 insertions(+), 49 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..9903512 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.associations": { + "memory": "cpp" + } +} \ No newline at end of file diff --git a/cardbase.h b/cardbase.h index e9970d5..55f298f 100644 --- a/cardbase.h +++ b/cardbase.h @@ -10,22 +10,7 @@ class CardBase { public: CardBase() {} - ~CardBase() {} -// void FromJson(const Json::Value &cfg) { -// version_ = cfg["version"].asInt(); -// slot_ = cfg["slot"].asInt(); -// card_type_ = static_cast(cfg["type"].asInt()); -// } - -// Json::Value ToJson() { -// Json::Value ch; -// ch[NAME(version)] = version_; -// ch[NAME(slot)] = slot_; -// ch[NAME(type)] = card_type_; -// return ch; -// } - -// protected: + virtual ~CardBase() {} int version_; int slot_; // 从1~15 CardType card_type_; @@ -34,7 +19,7 @@ class CardBase { class VariableBase { public: VariableBase() {} - ~VariableBase() {} + virtual ~VariableBase() {} int id_; VibChannelType type_; diff --git a/radial_vibration.cpp b/radial_vibration.cpp index 0ef4494..e4614fc 100644 --- a/radial_vibration.cpp +++ b/radial_vibration.cpp @@ -10,7 +10,7 @@ #include "vibrationdata.h" #include "config_mgr.h" -Radial_vibration::Radial_vibration(int slot_no_, int channel_, bool active, QWidget *parent) +Radial::Radial(int slot_no_, int channel_, bool active, QWidget *parent) : QWidget(parent) , ui(new Ui::Radial_vibration) { ui->setupUi(this); @@ -28,15 +28,15 @@ Radial_vibration::Radial_vibration(int slot_no_, int channel_, bool active, QWid Init(); } -Radial_vibration::~Radial_vibration() { +Radial::~Radial() { delete ui; } -void Radial_vibration::on_pushButton_cancel_clicked() { +void Radial::on_pushButton_cancel_clicked() { this->close(); } -void Radial_vibration::on_checkBox_1x_ampl_toggled(bool checked) { +void Radial::on_checkBox_1x_ampl_toggled(bool checked) { if (checked) { ui->comboBox_1x_value_range->setEnabled(true); ui->doubleSpinBox_1x_ampl_clamp->setEnabled(true); @@ -48,7 +48,7 @@ void Radial_vibration::on_checkBox_1x_ampl_toggled(bool checked) { ui->doubleSpinBox_1x_phase_lag_clamp->setEnabled(false); } -void Radial_vibration::on_checkBox_2x_ampl_toggled(bool checked) { +void Radial::on_checkBox_2x_ampl_toggled(bool checked) { if (checked) { ui->comboBox_2x_value_range->setEnabled(true); ui->doubleSpinBox_2x_ampl_clamp->setEnabled(true); @@ -60,7 +60,7 @@ void Radial_vibration::on_checkBox_2x_ampl_toggled(bool checked) { ui->doubleSpinBox_2x_phase_lag_clamp->setEnabled(false); } -void Radial_vibration::on_checkBox_not_1x_ampl_toggled(bool checked) { +void Radial::on_checkBox_not_1x_ampl_toggled(bool checked) { if (checked) { ui->comboBox_not_1x_ampl->setEnabled(true); ui->doubleSpinBox_not_1x_ampl_clamp->setEnabled(true); @@ -70,7 +70,7 @@ void Radial_vibration::on_checkBox_not_1x_ampl_toggled(bool checked) { ui->doubleSpinBox_not_1x_ampl_clamp->setEnabled(false); } -void Radial_vibration::on_checkBox_smax_ampl_toggled(bool checked) { +void Radial::on_checkBox_smax_ampl_toggled(bool checked) { if (checked) { ui->comboBox_smax_range->setEnabled(true); ui->doubleSpinBox_smax_clamp->setEnabled(true); @@ -80,7 +80,7 @@ void Radial_vibration::on_checkBox_smax_ampl_toggled(bool checked) { ui->doubleSpinBox_smax_clamp->setEnabled(false); } -void Radial_vibration::Init() { +void Radial::Init() { std::shared_ptr base_ptr = ConfigMgr::Instance()->GetSlotPtr(slot_no); if (base_ptr == nullptr) { qCritical() << "[Velocity::Init] should not be here"; @@ -139,7 +139,7 @@ void Radial_vibration::Init() { ui->spinBox_comparision_percentage->setValue(variable_ptr->recorder_out_.percentage); } -void Radial_vibration::on_pushButton_confirm_clicked() { +void Radial::on_pushButton_confirm_clicked() { std::shared_ptr base_ptr = ConfigMgr::Instance()->GetSlotPtr(slot_no); if (base_ptr == nullptr) { qCritical() << "[Acceleration::Init] should not be here"; @@ -245,6 +245,6 @@ void Radial_vibration::on_pushButton_confirm_clicked() { } -void Radial_vibration::on_pushButton_set_default_clicked() { +void Radial::on_pushButton_set_default_clicked() { } diff --git a/radial_vibration.h b/radial_vibration.h index e9d2a67..874a036 100644 --- a/radial_vibration.h +++ b/radial_vibration.h @@ -7,12 +7,12 @@ namespace Ui { class Radial_vibration; } -class Radial_vibration : public QWidget { +class Radial : public QWidget { Q_OBJECT public: - explicit Radial_vibration(int slot_no_, int channel_, bool active, QWidget *parent = nullptr); - ~Radial_vibration(); + explicit Radial(int slot_no_, int channel_, bool active, QWidget *parent = nullptr); + ~Radial(); int slot_no; int channel; private slots: diff --git a/seismic_monitor.cpp b/seismic_monitor.cpp index 37e04f0..434e6af 100644 --- a/seismic_monitor.cpp +++ b/seismic_monitor.cpp @@ -231,7 +231,7 @@ void Seismic_monitor::on_pushButton_config_1_clicked() { acceleration->setWindowModality(Qt::ApplicationModal); acceleration->show(); } else if (ui->comboBox_chan_type_1->currentIndex() == kVibRadial) { - Radial_vibration *radial_vibration = new Radial_vibration(slot_no, channel, ui->checkBox_enable_1->isChecked()); + Radial *radial_vibration = new Radial(slot_no, channel, ui->checkBox_enable_1->isChecked()); radial_vibration->setWindowModality(Qt::ApplicationModal); radial_vibration->show(); } else if (ui->comboBox_chan_type_1->currentIndex() == kVibVelocity) { @@ -248,7 +248,7 @@ void Seismic_monitor::on_pushButton_config_2_clicked() { acceleration->setWindowModality(Qt::ApplicationModal); acceleration->show(); } else if (ui->comboBox_chan_type_2->currentIndex() == kVibRadial) { - Radial_vibration *radial_vibration = new Radial_vibration(slot_no, channel, ui->checkBox_enable_2->isChecked()); + Radial *radial_vibration = new Radial(slot_no, channel, ui->checkBox_enable_2->isChecked()); radial_vibration->setWindowModality(Qt::ApplicationModal); radial_vibration->show(); } else if (ui->comboBox_chan_type_2->currentIndex() == kVibVelocity) { @@ -265,7 +265,7 @@ void Seismic_monitor::on_pushButton_config_3_clicked() { acceleration->setWindowModality(Qt::ApplicationModal); acceleration->show(); } else if (ui->comboBox_chan_type_3->currentIndex() == kVibRadial) { - Radial_vibration *radial_vibration = new Radial_vibration(slot_no, channel, ui->checkBox_enable_3->isChecked()); + Radial *radial_vibration = new Radial(slot_no, channel, ui->checkBox_enable_3->isChecked()); radial_vibration->setWindowModality(Qt::ApplicationModal); radial_vibration->show(); } else if (ui->comboBox_chan_type_3->currentIndex() == kVibVelocity) { @@ -282,7 +282,7 @@ void Seismic_monitor::on_pushButton_config_4_clicked() { acceleration->setWindowModality(Qt::ApplicationModal); acceleration->show(); } else if (ui->comboBox_chan_type_4->currentIndex() == kVibRadial) { - Radial_vibration *radial_vibration = new Radial_vibration(slot_no, channel, ui->checkBox_enable_4->isChecked()); + Radial *radial_vibration = new Radial(slot_no, channel, ui->checkBox_enable_4->isChecked()); radial_vibration->setWindowModality(Qt::ApplicationModal); radial_vibration->show(); } else if (ui->comboBox_chan_type_4->currentIndex() == kVibVelocity) { diff --git a/vibrationdata.h b/vibrationdata.h index a8f0efe..7a82713 100644 --- a/vibrationdata.h +++ b/vibrationdata.h @@ -8,24 +8,9 @@ class VibrationData : public CardBase { public: VibrationData(); -// void FromJson(const Json::Value &cfg) { -// version_ = cfg["version"].asInt(); -// slot_ = cfg["slot"].asInt(); -// card_type_ = static_cast(cfg["type"].asInt()); -// } - -// Json::Value ToJson() { -// Json::Value ch; -// ch[NAME(version)] = version_; -// ch[NAME(slot)] = slot_; -// ch[NAME(type)] = card_type_; -// return ch; -// } std::shared_ptr GetChannelPtr(int cid); void RemoveChannel(int cid); -// private: SeismicMonitor base_config_[CHANNEL_COUNT]; -// AllFilter filter_[CHANNEL_COUNT]; std::vector> variables_; };