diff --git a/src/2DSpectralCompliance/TwoDSpectralCompliance.cpp b/src/2DSpectralCompliance/TwoDSpectralCompliance.cpp index 8a7db2b..9f5a085 100644 --- a/src/2DSpectralCompliance/TwoDSpectralCompliance.cpp +++ b/src/2DSpectralCompliance/TwoDSpectralCompliance.cpp @@ -56,7 +56,7 @@ TwoDSpectralCompliance::TwoDSpectralCompliance(QWidget* parent) layout->addWidget(this->_plot); setupPlot(); createFloatingInfoWidget(); - _busy_indicator = new BusyIndicator(this); + _busy_indicator = new BusyIndicatorWidget(this); } TwoDSpectralCompliance::~TwoDSpectralCompliance() diff --git a/src/2DSpectralCompliance/TwoDSpectralCompliance.h b/src/2DSpectralCompliance/TwoDSpectralCompliance.h index 4f9c267..0c13adc 100644 --- a/src/2DSpectralCompliance/TwoDSpectralCompliance.h +++ b/src/2DSpectralCompliance/TwoDSpectralCompliance.h @@ -12,7 +12,7 @@ class QwtPlotPicker; class QPushButton; class QLineEdit; class ScatterPlotItem; -class BusyIndicator; +class BusyIndicatorWidget; namespace Ui { class TwoDSpectralCompliance; } @@ -102,7 +102,7 @@ private: QPoint m_dragPosition; bool m_dragging = false; - BusyIndicator* _busy_indicator = nullptr; + BusyIndicatorWidget* _busy_indicator = nullptr; // 保存全局轴范围（用于重置放大） double m_globalXMin = 0.0, m_globalXMax = 0.0; diff --git a/src/AntiConformEnergySpectrumView/AntiConformEnergySpectrumView.cpp b/src/AntiConformEnergySpectrumView/AntiConformEnergySpectrumView.cpp index 87f68a9..336ca0a 100644 --- a/src/AntiConformEnergySpectrumView/AntiConformEnergySpectrumView.cpp +++ b/src/AntiConformEnergySpectrumView/AntiConformEnergySpectrumView.cpp @@ -53,7 +53,7 @@ AntiConformEnergySpectrumView::AntiConformEnergySpectrumView(QWidget* parent) _curve->setPen(QPen(QColor(23, 229, 238), 2)); _plot->AddCurve(_curve); - _busy_indicator = new BusyIndicator(this); + _busy_indicator = new BusyIndicatorWidget(this); } AntiConformEnergySpectrumView::~AntiConformEnergySpectrumView() diff --git a/src/AntiConformEnergySpectrumView/AntiConformEnergySpectrumView.h b/src/AntiConformEnergySpectrumView/AntiConformEnergySpectrumView.h index b414585..da4c465 100644 --- a/src/AntiConformEnergySpectrumView/AntiConformEnergySpectrumView.h +++ b/src/AntiConformEnergySpectrumView/AntiConformEnergySpectrumView.h @@ -6,7 +6,7 @@ class QMenu; class CustomQwtPlot; class QwtPlotCurve; -class BusyIndicator; +class BusyIndicatorWidget; class AntiConformEnergySpectrumView : public MeasureAnalysisView { Q_OBJECT @@ -28,7 +28,7 @@ private slots: private: QMenu* _menu = nullptr; - BusyIndicator* _busy_indicator = nullptr; + BusyIndicatorWidget* _busy_indicator = nullptr; CustomQwtPlot* _plot = nullptr; QwtPlotCurve* _curve = nullptr; QString _data_filename; diff --git a/src/BusyIndicator/BusyIndicator.cpp b/src/BusyIndicator/BusyIndicator.cpp index b13c04f..755a441 100644 --- a/src/BusyIndicator/BusyIndicator.cpp +++ b/src/BusyIndicator/BusyIndicator.cpp @@ -4,6 +4,29 @@ #include BusyIndicator::BusyIndicator(QWidget* parent) + : QLabel { parent } +{ + _busy_movie = new QMovie(":gif/BusyIndicator.gif"); // 转圈 GIF + _busy_movie->setScaledSize(QSize(50, 50)); + this->setMovie(_busy_movie); + _busy_movie->start(); +} + +void BusyIndicator::Start() +{ + _busy_movie->start(); + // this->setVisible(true); + // this->update(); +} + +void BusyIndicator::Stop() +{ + _busy_movie->stop(); + // this->setVisible(false); + // this->update(); +} + +BusyIndicatorWidget::BusyIndicatorWidget(QWidget* parent) : QWidget { parent } { setAttribute(Qt::WA_TransparentForMouseEvents); @@ -25,14 +48,14 @@ BusyIndicator::BusyIndicator(QWidget* parent) setLayout(layout); } -void BusyIndicator::Start() +void BusyIndicatorWidget::Start() { _busy_movie->start(); this->setVisible(true); this->update(); } -void BusyIndicator::Stop() +void BusyIndicatorWidget::Stop() { _busy_movie->stop(); this->setVisible(false); diff --git a/src/BusyIndicator/BusyIndicator.h b/src/BusyIndicator/BusyIndicator.h index 6474421..60c820f 100644 --- a/src/BusyIndicator/BusyIndicator.h +++ b/src/BusyIndicator/BusyIndicator.h @@ -3,10 +3,11 @@ #include #include +#include class QMovie; -class BusyIndicator : public QWidget +class BusyIndicator : public QLabel { Q_OBJECT public: @@ -17,4 +18,15 @@ private: QMovie* _busy_movie; }; +class BusyIndicatorWidget : public QWidget +{ + Q_OBJECT +public: + explicit BusyIndicatorWidget(QWidget *parent = nullptr); + void Start(); + void Stop(); +private: + QMovie* _busy_movie; +}; + #endif // BUSYINDICATOR_H diff --git a/src/CoincidenceEventTimeView/CoincidenceEventTimeView.cpp b/src/CoincidenceEventTimeView/CoincidenceEventTimeView.cpp index 87d50f4..0bef82f 100644 --- a/src/CoincidenceEventTimeView/CoincidenceEventTimeView.cpp +++ b/src/CoincidenceEventTimeView/CoincidenceEventTimeView.cpp @@ -58,7 +58,7 @@ CoincidenceEventTimeView::CoincidenceEventTimeView(QWidget *parent) : _curve->setPen(QPen(QColor(23, 229, 238), 2)); _plot->AddCurve(_curve); - _busy_indicator = new BusyIndicator(this); + _busy_indicator = new BusyIndicatorWidget(this); } CoincidenceEventTimeView::~CoincidenceEventTimeView() diff --git a/src/CoincidenceEventTimeView/CoincidenceEventTimeView.h b/src/CoincidenceEventTimeView/CoincidenceEventTimeView.h index 75de489..a31f608 100644 --- a/src/CoincidenceEventTimeView/CoincidenceEventTimeView.h +++ b/src/CoincidenceEventTimeView/CoincidenceEventTimeView.h @@ -5,7 +5,7 @@ #include class CustomQwtPlot; class QwtPlotCurve; -class BusyIndicator; +class BusyIndicatorWidget; class CoincidenceEventTimeView : public MeasureAnalysisView { @@ -25,7 +25,7 @@ private: private slots: void onActionPlotConfigure(); private: - BusyIndicator* _busy_indicator = nullptr; + BusyIndicatorWidget* _busy_indicator = nullptr; CustomQwtPlot* _plot = nullptr; QwtPlotCurve* _curve = nullptr; QStringList _data_filenames; diff --git a/src/ConformToTheEnergySpectrum/ConformToTheEnergySpectrum.cpp b/src/ConformToTheEnergySpectrum/ConformToTheEnergySpectrum.cpp index f9c8630..393a8b3 100644 --- a/src/ConformToTheEnergySpectrum/ConformToTheEnergySpectrum.cpp +++ b/src/ConformToTheEnergySpectrum/ConformToTheEnergySpectrum.cpp @@ -63,7 +63,7 @@ ConformToTheEnergySpectrum::ConformToTheEnergySpectrum(QWidget *parent) : _curve->setPen(QPen(QColor(23, 229, 238), 2)); _plot->AddCurve(_curve); - _busy_indicator = new BusyIndicator(this); + _busy_indicator = new BusyIndicatorWidget(this); } ConformToTheEnergySpectrum::~ConformToTheEnergySpectrum() diff --git a/src/ConformToTheEnergySpectrum/ConformToTheEnergySpectrum.h b/src/ConformToTheEnergySpectrum/ConformToTheEnergySpectrum.h index 14d9cc2..0bd94e3 100644 --- a/src/ConformToTheEnergySpectrum/ConformToTheEnergySpectrum.h +++ b/src/ConformToTheEnergySpectrum/ConformToTheEnergySpectrum.h @@ -6,7 +6,7 @@ class QMenu; class CustomQwtPlot; class QwtPlotCurve; -class BusyIndicator; +class BusyIndicatorWidget; class ConformToTheEnergySpectrum : public MeasureAnalysisView { @@ -29,7 +29,7 @@ private slots: private: QMenu* _menu = nullptr; - BusyIndicator* _busy_indicator = nullptr; + BusyIndicatorWidget* _busy_indicator = nullptr; CustomQwtPlot* _plot = nullptr; QwtPlotCurve* _curve = nullptr; QStringList _data_filenames; diff --git a/src/CountRateAnalysisView/CountRateAnalysisView.cpp b/src/CountRateAnalysisView/CountRateAnalysisView.cpp index 66675d4..2472d78 100644 --- a/src/CountRateAnalysisView/CountRateAnalysisView.cpp +++ b/src/CountRateAnalysisView/CountRateAnalysisView.cpp @@ -27,7 +27,7 @@ CountRateAnalysisView::CountRateAnalysisView(QWidget *parent) : this->setViewType(PlotFrame); this->_menu = new QMenu(this); - _busy_indicator = new BusyIndicator(this); + _busy_indicator = new BusyIndicatorWidget(this); InitUi(); setupMenu(); diff --git a/src/CountRateAnalysisView/CountRateAnalysisView.h b/src/CountRateAnalysisView/CountRateAnalysisView.h index caada6c..ef5527f 100644 --- a/src/CountRateAnalysisView/CountRateAnalysisView.h +++ b/src/CountRateAnalysisView/CountRateAnalysisView.h @@ -7,7 +7,7 @@ #include "MeasureAnalysisView.h" class CustomQwtPlot; -class BusyIndicator; +class BusyIndicatorWidget; class QMenu; namespace Ui { @@ -41,7 +41,7 @@ private slots: private: Ui::CountRateAnalysisView *ui; - BusyIndicator* _busy_indicator = nullptr; + BusyIndicatorWidget* _busy_indicator = nullptr; CustomQwtPlot *plot; QMenu* _menu = nullptr; }; diff --git a/src/DataProcessWorkPool.cpp b/src/DataProcessWorkPool.cpp index e5b8d6d..901227d 100644 --- a/src/DataProcessWorkPool.cpp +++ b/src/DataProcessWorkPool.cpp @@ -27,6 +27,36 @@ using namespace DataProcessWorkPool; using namespace io; +DataProcessTaskList* DataProcessTaskList::_s_instance = nullptr; + +DataProcessTaskList *DataProcessTaskList::Instance() +{ + if (!_s_instance) { + _s_instance = new DataProcessTaskList(); + } + return _s_instance; +} + +DataProcessTaskList::~DataProcessTaskList() +{ + Clear(); +} + +void DataProcessTaskList::InserTask(DataProcessTask* task) +{ + _task_list.insert(task->GetTaskName(), task); +} + +void DataProcessTaskList::RemoveTask(const QString &task_name) +{ + _task_list.remove(task_name); +} + +void DataProcessTaskList::Clear() +{ + +} + void DataProcessTask::SetFinishedNotifier(QObject* finished_notifier, const char* finished_process, const QString& project_name) { @@ -65,7 +95,13 @@ void DataProcessTask::run() if (!IsValidSetWorkParameters()) { return; } + + DataProcessTaskList::Instance()->InserTask(this); + bool task_ok = processTask(); + + DataProcessTaskList::Instance()->RemoveTask(this->GetTaskName()); + if ((GetFinishedNotifier() != nullptr) && (GetFinishedNotifierProcess() != nullptr)) { QMetaObject::invokeMethod( _finished_notifier, @@ -103,6 +139,11 @@ bool ParticleDataTask::processTask() return processEveryChannelParticleData(); } +const QString &EveryChannelParticleCountDataTask::GetTaskName() +{ + return QStringLiteral(u"[%1]通道粒子计数统计处理").arg(this->GetProjectName()); +} + void EveryChannelParticleCountDataTask::SetAllChannelCountResultDir(const QString& dir_path) { this->_all_ch_count_dir = dir_path; @@ -226,6 +267,11 @@ bool EveryChannelParticleCountDataTask::processEveryChannelParticleData() //////////////////////////////////////////////////////////////////////////////////// +const QString &ParticleDataSortTask::GetTaskName() +{ + return QStringLiteral(u"[%1]粒子数据按时间排序处理").arg(this->GetProjectName()); +} + void ParticleDataSortTask::SetSortedResultDir(const QString& sorted_result_dir) { this->_sorted_result_dir = sorted_result_dir; @@ -455,6 +501,11 @@ bool ParticleDataSortByMinimysTask::processEveryChannelParticleData() return ret_ok; } +const QString &CoincidenceEventAnalysisTask::GetTaskName() +{ + return QStringLiteral(u"[%1]粒子数据符合处理").arg(this->GetProjectName()); +} + bool CoincidenceEventAnalysisTask::processTask() { const QString& project_name = GetProjectName(); @@ -533,6 +584,11 @@ bool CoincidenceEventAnalysisTask::processTask() return true; } +const QString &AutoFindPeaksTask::GetTaskName() +{ + return QStringLiteral(u"[%1]粒子通道计数谱自动寻峰处理").arg(this->GetProjectName()); +} + void AutoFindPeaksTask::SetAnalysisType(AnalysisType analysis_type) { this->_analysis_type = analysis_type; @@ -631,6 +687,11 @@ bool AutoFindPeaksTask::processTask() return true; } +const QString &ChannelEnergyScaleFittingTask::GetTaskName() +{ + return QStringLiteral(u"[%1]能量刻度拟合处理").arg(this->GetProjectName()); +} + void ChannelEnergyScaleFittingTask::SetData(const FitDataMap& channel_energy_scale_fit_data_map, const QMap& fit_degree_map) { this->_channel_energy_scale_fit_data_map = channel_energy_scale_fit_data_map; @@ -717,6 +778,11 @@ bool ChannelEnergyScaleFittingTask::processTask() return true; } +const QString &EnergyScaleParticleDataTask::GetTaskName() +{ + return QStringLiteral(u"[%1]粒子数据能量刻度处理").arg(this->GetProjectName()); +} + bool EnergyScaleParticleDataTask::processTask() { const QString& project_name = GetProjectName(); @@ -779,6 +845,11 @@ bool EnergyScaleParticleDataTask::processTask() return true; } +const QString &EnergyCountProcessTask::GetTaskName() +{ + return QStringLiteral(u"[%1]粒子能量计数统计处理").arg(this->GetProjectName()); +} + bool EnergyCountProcessTask::processTask() { const QString& project_name = GetProjectName(); @@ -859,6 +930,11 @@ bool EnergyCountProcessTask::processTask() return true; } +const QString &EnergyScaleCoincidenceDataTask::GetTaskName() +{ + return QStringLiteral(u"[%1]粒子符合数据能量刻度处理").arg(this->GetProjectName()); +} + bool EnergyScaleCoincidenceDataTask::processTask() { const QString& project_name = GetProjectName(); @@ -946,6 +1022,11 @@ bool EnergyScaleCoincidenceDataTask::processTask() return true; } +const QString &EnergyScaleaAntiCoincidenceDataTask::GetTaskName() +{ + return QStringLiteral(u"[%1]粒子反符合数据能量刻度处理").arg(this->GetProjectName()); +} + bool EnergyScaleaAntiCoincidenceDataTask::processTask() { const QString& project_name = GetProjectName(); @@ -1020,3 +1101,4 @@ bool EnergyScaleaAntiCoincidenceDataTask::processTask() LOG_INFO(info); return true; } + diff --git a/src/DataProcessWorkPool.h b/src/DataProcessWorkPool.h index a5bfb03..233dd77 100644 --- a/src/DataProcessWorkPool.h +++ b/src/DataProcessWorkPool.h @@ -16,6 +16,8 @@ namespace DataProcessWorkPool class DataProcessTask : public QRunnable { public: + virtual const QString& GetTaskName() = 0; + void SetFinishedNotifier(QObject* finished_notifier, const char* finished_process, const QString& project_name); const QString& GetProjectName() const; const char* GetFinishedNotifierProcess() const; @@ -39,6 +41,24 @@ namespace DataProcessWorkPool QVariant _task_result_data; }; + class DataProcessTaskList + { + public: + static DataProcessTaskList* Instance(); + virtual ~DataProcessTaskList(); + void InserTask(DataProcessTask *task); + void RemoveTask(const QString& task_name); + void Clear(); + signals: + void taskInserted(); + void taskRemoved(const QString& task_name); + private: + explicit DataProcessTaskList() {} + static DataProcessTaskList* _s_instance; + private: + QMap _task_list; + }; + class ParticleDataTask : public DataProcessTask { public: @@ -58,6 +78,7 @@ namespace DataProcessWorkPool class EveryChannelParticleCountDataTask : public ParticleDataTask { public: + const QString& GetTaskName(); void SetAllChannelCountResultDir(const QString& dir_path); const QString& GetAllChannelCountResultDir() const; void SetEveryChannelCountResultDir(const QString&dir_path); @@ -74,6 +95,7 @@ namespace DataProcessWorkPool class ParticleDataSortTask : public ParticleDataTask { public: + const QString& GetTaskName(); void SetSortedResultDir(const QString& sorted_result_dir); const QString& GetSortedResultDir() const; @@ -91,12 +113,16 @@ namespace DataProcessWorkPool class CoincidenceEventAnalysisTask : public DataProcessTask { + public: + const QString& GetTaskName(); private: virtual bool processTask() override; }; - class AutoFindPeaksTask : public DataProcessTask { + class AutoFindPeaksTask : public DataProcessTask + { public: + const QString& GetTaskName(); void SetAnalysisType(AnalysisType analysis_type); void SetDataFileList(const QMap& data_files_set); void SetResultDir(const QString& result_dir); @@ -111,10 +137,12 @@ namespace DataProcessWorkPool int _step_win_width = 7; }; - class ChannelEnergyScaleFittingTask : public DataProcessTask { + class ChannelEnergyScaleFittingTask : public DataProcessTask + { public: typedef QMap > > FitDataMap; public: + const QString& GetTaskName(); void SetData(const FitDataMap& channel_energy_scale_fit_data_map, const QMap& fit_degree_map); void SetResultDir(const QString& result_dir); virtual bool IsValidSetWorkParameters() const override; @@ -128,24 +156,32 @@ namespace DataProcessWorkPool class EnergyScaleParticleDataTask : public DataProcessTask { + public: + const QString& GetTaskName(); private: virtual bool processTask() override; }; class EnergyCountProcessTask : public DataProcessTask { + public: + const QString& GetTaskName(); private: virtual bool processTask() override; }; class EnergyScaleCoincidenceDataTask : public DataProcessTask { + public: + const QString& GetTaskName(); private: virtual bool processTask() override; }; class EnergyScaleaAntiCoincidenceDataTask : public DataProcessTask { + public: + const QString& GetTaskName(); private: virtual bool processTask() override; }; diff --git a/src/EnergyCountPeakFitView/EnergyCountPeakFitView.h b/src/EnergyCountPeakFitView/EnergyCountPeakFitView.h index 5471f51..91ef9e4 100644 --- a/src/EnergyCountPeakFitView/EnergyCountPeakFitView.h +++ b/src/EnergyCountPeakFitView/EnergyCountPeakFitView.h @@ -77,7 +77,7 @@ class CustomQwtPlot; class CustomQwtPlotXaxisSelector; class QwtPlotPicker; class QwtPlotCurve; -class BusyIndicator; +class BusyIndicatorWidget; class EnergyCountPeakFitView : public MeasureAnalysisView { Q_OBJECT diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 5fa886c..7125b41 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -27,6 +27,8 @@ #include "GlobalDefine.h" #include "DeviceParamsManagerDlg.h" #include "NuclideLib.h" +#include +#include using namespace ads; @@ -91,6 +93,7 @@ MainWindow::MainWindow(QWidget* parent) initMainWindow(); initAction(); + initStatusBar(); this->applyStyleSheet(); _s_main_win = this; @@ -302,6 +305,20 @@ void MainWindow::initAction() }); } +void MainWindow::initStatusBar() +{ + _w_watcher_list = new QListWidget(this); + _w_watcher_list->setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint); + QPalette palette = _w_watcher_list->palette(); + palette.setColor(QPalette::Base, Qt::gray); + _w_watcher_list->setPalette(palette); + _w_watcher_list->setAutoFillBackground(true); + + _btn_task_watcher = new QPushButton(QStringLiteral(u"后台任务监视"), _status_bar); + _status_bar->addPermanentWidget(_btn_task_watcher); + connect(_btn_task_watcher, &QPushButton::clicked, this, &MainWindow::onShowBackgroundTaskList); +} + void MainWindow::applyStyleSheet() { // #ifdef ENABLE_DEBUG @@ -367,8 +384,53 @@ void MainWindow::closeEvent(QCloseEvent* event) QMainWindow::closeEvent(event); } +void MainWindow::moveEvent(QMoveEvent *event) +{ + QMainWindow::moveEvent(event); + if (this->_w_watcher_list->isVisible()) { + onShowBackgroundTaskList(); + } +} + void MainWindow::on_action_nuclideLib_triggered() { NuclideLibManage *nuclidelib = new NuclideLibManage(); nuclidelib->show(); } + +void MainWindow::onShowBackgroundTaskList() +{ + this->updateGeometry(); + this->_btn_task_watcher->updateGeometry(); + + this->_w_watcher_list->adjustSize(); + QSize pop_size = this->_w_watcher_list->size(); + + QPoint btn_top_teft = this->_btn_task_watcher->mapToGlobal(QPoint(0, 0)); + int btn_width = this->_btn_task_watcher->width(); + // int btn_height = this->_btn_task_watcher->height(); + + int x = btn_top_teft.x() + btn_width - pop_size.width() - 2; + int y = btn_top_teft.y() - pop_size.height() - 6; + + // QRect screen_rect = QApplication::desktop()->availableGeometry(this); + // if (x < screen_rect.left() + 6) + // x = screen_rect.left(); + // if (x + pop_size.width() > screen_rect.right()) + // x = screen_rect.right() - pop_size.width(); + // if (y < screen_rect.top()) + // y = btn_top_teft.y() + btn_height + 6; + + this->_w_watcher_list->move(x, y); + this->_w_watcher_list->show(); +} + + +void MainWindow::resizeEvent(QResizeEvent *event) +{ + QMainWindow::resizeEvent(event); + if (this->_w_watcher_list->isVisible()) { + onShowBackgroundTaskList(); + } +} + diff --git a/src/MainWindow.h b/src/MainWindow.h index e7cbfd4..6d66505 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -15,6 +15,8 @@ class CDockWidget; } class QPlainTextEdit; class MeasureAnalysisTreeView; +class QListWidget; +class QPushButton; QT_END_NAMESPACE class MainWindow : public QMainWindow @@ -45,6 +47,7 @@ public: private: void initMainWindow(); void initAction(); + void initStatusBar(); void applyStyleSheet(); void closeProject(const QString &project_name); @@ -54,14 +57,19 @@ signals: protected: virtual void showEvent(QShowEvent* event) override; virtual void closeEvent(QCloseEvent* event) override; + virtual void moveEvent(QMoveEvent* event) override; + virtual void resizeEvent(QResizeEvent* event) override; private slots: void on_action_nuclideLib_triggered(); + void onShowBackgroundTaskList(); private: QMutex _mutex_info_output; QPlainTextEdit* _plain_edit_info_output; QStatusBar* _status_bar; + QPushButton* _btn_task_watcher; + QListWidget* _w_watcher_list; private: Ui::MainWindow *ui; diff --git a/src/ParticleInjectTimeView/ParticleInjectTimeAnalysisView.cpp b/src/ParticleInjectTimeView/ParticleInjectTimeAnalysisView.cpp index e32e31e..03e5d27 100644 --- a/src/ParticleInjectTimeView/ParticleInjectTimeAnalysisView.cpp +++ b/src/ParticleInjectTimeView/ParticleInjectTimeAnalysisView.cpp @@ -61,7 +61,7 @@ ParticleInjectTimeAnalysisView::ParticleInjectTimeAnalysisView(QWidget *parent) this->_menu = new QMenu(this); setupMenu(); - _busy_indicator = new BusyIndicator(this); + _busy_indicator = new BusyIndicatorWidget(this); } ParticleInjectTimeAnalysisView::~ParticleInjectTimeAnalysisView() diff --git a/src/ParticleInjectTimeView/ParticleInjectTimeAnalysisView.h b/src/ParticleInjectTimeView/ParticleInjectTimeAnalysisView.h index 603acb9..43f409f 100644 --- a/src/ParticleInjectTimeView/ParticleInjectTimeAnalysisView.h +++ b/src/ParticleInjectTimeView/ParticleInjectTimeAnalysisView.h @@ -5,7 +5,7 @@ class CustomQwtPlot; class QwtPlotCurve; -class BusyIndicator; +class BusyIndicatorWidget; class QMenu; class ParticleInjectTimeAnalysisView : public MeasureAnalysisView @@ -27,7 +27,7 @@ protected: virtual void showEvent(QShowEvent* e) override final; private: - BusyIndicator* _busy_indicator = nullptr; + BusyIndicatorWidget* _busy_indicator = nullptr; CustomQwtPlot *_plot = nullptr; QwtPlotCurve *_curve = nullptr; QMenu* _menu = nullptr; diff --git a/src/ParticleTimeDifferenceView/ParticleTimeDifferenceView.cpp b/src/ParticleTimeDifferenceView/ParticleTimeDifferenceView.cpp index 3c259c5..14d7aaa 100644 --- a/src/ParticleTimeDifferenceView/ParticleTimeDifferenceView.cpp +++ b/src/ParticleTimeDifferenceView/ParticleTimeDifferenceView.cpp @@ -36,7 +36,7 @@ ParticleTimeDifferenceView::ParticleTimeDifferenceView(QWidget *parent) this->_menu = new QMenu(this); setupMenu(); - _busy_indicator = new BusyIndicator(this); + _busy_indicator = new BusyIndicatorWidget(this); } ParticleTimeDifferenceView::~ParticleTimeDifferenceView() diff --git a/src/ParticleTimeDifferenceView/ParticleTimeDifferenceView.h b/src/ParticleTimeDifferenceView/ParticleTimeDifferenceView.h index 785dec8..1fa6189 100644 --- a/src/ParticleTimeDifferenceView/ParticleTimeDifferenceView.h +++ b/src/ParticleTimeDifferenceView/ParticleTimeDifferenceView.h @@ -9,7 +9,7 @@ class QMenu; class CustomQwtPlot; class CustomQwtPlotXaxisSelector; class QwtPlotHistogram; -class BusyIndicator; +class BusyIndicatorWidget; class ParticleTimeDifferenceView : public MeasureAnalysisView { @@ -33,7 +33,7 @@ protected: virtual void showEvent(QShowEvent* e) override final; private: - BusyIndicator* _busy_indicator = nullptr; + BusyIndicatorWidget* _busy_indicator = nullptr; CustomQwtPlot* _plot = nullptr; QMenu* _menu = nullptr; QDialog* _curve_show_setting_dlg = nullptr;