Compare commits

..

No commits in common. "f9e450c098aa84adbabb8568e9766a680b29fdc9" and "7b35e9b82303361c0761789a3c5832e209cba401" have entirely different histories.

21 changed files with 27 additions and 250 deletions

View File

@ -56,7 +56,7 @@ TwoDSpectralCompliance::TwoDSpectralCompliance(QWidget* parent)
layout->addWidget(this->_plot);
setupPlot();
createFloatingInfoWidget();
_busy_indicator = new BusyIndicatorWidget(this);
_busy_indicator = new BusyIndicator(this);
}
TwoDSpectralCompliance::~TwoDSpectralCompliance()

View File

@ -12,7 +12,7 @@ class QwtPlotPicker;
class QPushButton;
class QLineEdit;
class ScatterPlotItem;
class BusyIndicatorWidget;
class BusyIndicator;
namespace Ui {
class TwoDSpectralCompliance;
}
@ -102,7 +102,7 @@ private:
QPoint m_dragPosition;
bool m_dragging = false;
BusyIndicatorWidget* _busy_indicator = nullptr;
BusyIndicator* _busy_indicator = nullptr;
// 保存全局轴范围(用于重置放大)
double m_globalXMin = 0.0, m_globalXMax = 0.0;

View File

@ -53,7 +53,7 @@ AntiConformEnergySpectrumView::AntiConformEnergySpectrumView(QWidget* parent)
_curve->setPen(QPen(QColor(23, 229, 238), 2));
_plot->AddCurve(_curve);
_busy_indicator = new BusyIndicatorWidget(this);
_busy_indicator = new BusyIndicator(this);
}
AntiConformEnergySpectrumView::~AntiConformEnergySpectrumView()

View File

@ -6,7 +6,7 @@
class QMenu;
class CustomQwtPlot;
class QwtPlotCurve;
class BusyIndicatorWidget;
class BusyIndicator;
class AntiConformEnergySpectrumView : public MeasureAnalysisView {
Q_OBJECT
@ -28,7 +28,7 @@ private slots:
private:
QMenu* _menu = nullptr;
BusyIndicatorWidget* _busy_indicator = nullptr;
BusyIndicator* _busy_indicator = nullptr;
CustomQwtPlot* _plot = nullptr;
QwtPlotCurve* _curve = nullptr;
QString _data_filename;

View File

@ -4,29 +4,6 @@
#include <QVBoxLayout>
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);
@ -48,14 +25,14 @@ BusyIndicatorWidget::BusyIndicatorWidget(QWidget* parent)
setLayout(layout);
}
void BusyIndicatorWidget::Start()
void BusyIndicator::Start()
{
_busy_movie->start();
this->setVisible(true);
this->update();
}
void BusyIndicatorWidget::Stop()
void BusyIndicator::Stop()
{
_busy_movie->stop();
this->setVisible(false);

View File

@ -3,11 +3,10 @@
#include <QObject>
#include <QWidget>
#include <QLabel>
class QMovie;
class BusyIndicator : public QLabel
class BusyIndicator : public QWidget
{
Q_OBJECT
public:
@ -18,15 +17,4 @@ 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

View File

@ -58,7 +58,7 @@ CoincidenceEventTimeView::CoincidenceEventTimeView(QWidget *parent) :
_curve->setPen(QPen(QColor(23, 229, 238), 2));
_plot->AddCurve(_curve);
_busy_indicator = new BusyIndicatorWidget(this);
_busy_indicator = new BusyIndicator(this);
}
CoincidenceEventTimeView::~CoincidenceEventTimeView()

View File

@ -5,7 +5,7 @@
#include <QMenu>
class CustomQwtPlot;
class QwtPlotCurve;
class BusyIndicatorWidget;
class BusyIndicator;
class CoincidenceEventTimeView : public MeasureAnalysisView
{
@ -25,7 +25,7 @@ private:
private slots:
void onActionPlotConfigure();
private:
BusyIndicatorWidget* _busy_indicator = nullptr;
BusyIndicator* _busy_indicator = nullptr;
CustomQwtPlot* _plot = nullptr;
QwtPlotCurve* _curve = nullptr;
QStringList _data_filenames;

View File

@ -63,7 +63,7 @@ ConformToTheEnergySpectrum::ConformToTheEnergySpectrum(QWidget *parent) :
_curve->setPen(QPen(QColor(23, 229, 238), 2));
_plot->AddCurve(_curve);
_busy_indicator = new BusyIndicatorWidget(this);
_busy_indicator = new BusyIndicator(this);
}
ConformToTheEnergySpectrum::~ConformToTheEnergySpectrum()

View File

@ -6,7 +6,7 @@
class QMenu;
class CustomQwtPlot;
class QwtPlotCurve;
class BusyIndicatorWidget;
class BusyIndicator;
class ConformToTheEnergySpectrum : public MeasureAnalysisView
{
@ -29,7 +29,7 @@ private slots:
private:
QMenu* _menu = nullptr;
BusyIndicatorWidget* _busy_indicator = nullptr;
BusyIndicator* _busy_indicator = nullptr;
CustomQwtPlot* _plot = nullptr;
QwtPlotCurve* _curve = nullptr;
QStringList _data_filenames;

View File

@ -27,7 +27,7 @@ CountRateAnalysisView::CountRateAnalysisView(QWidget *parent) :
this->setViewType(PlotFrame);
this->_menu = new QMenu(this);
_busy_indicator = new BusyIndicatorWidget(this);
_busy_indicator = new BusyIndicator(this);
InitUi();
setupMenu();

View File

@ -7,7 +7,7 @@
#include "MeasureAnalysisView.h"
class CustomQwtPlot;
class BusyIndicatorWidget;
class BusyIndicator;
class QMenu;
namespace Ui {
@ -41,7 +41,7 @@ private slots:
private:
Ui::CountRateAnalysisView *ui;
BusyIndicatorWidget* _busy_indicator = nullptr;
BusyIndicator* _busy_indicator = nullptr;
CustomQwtPlot *plot;
QMenu* _menu = nullptr;
};

View File

@ -27,36 +27,6 @@
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)
{
@ -95,13 +65,7 @@ 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,
@ -139,11 +103,6 @@ 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;
@ -267,11 +226,6 @@ 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;
@ -501,11 +455,6 @@ 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();
@ -584,11 +533,6 @@ 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;
@ -687,11 +631,6 @@ 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<QString, int>& fit_degree_map)
{
this->_channel_energy_scale_fit_data_map = channel_energy_scale_fit_data_map;
@ -778,11 +717,6 @@ bool ChannelEnergyScaleFittingTask::processTask()
return true;
}
const QString &EnergyScaleParticleDataTask::GetTaskName()
{
return QStringLiteral(u"[%1]粒子数据能量刻度处理").arg(this->GetProjectName());
}
bool EnergyScaleParticleDataTask::processTask()
{
const QString& project_name = GetProjectName();
@ -845,11 +779,6 @@ bool EnergyScaleParticleDataTask::processTask()
return true;
}
const QString &EnergyCountProcessTask::GetTaskName()
{
return QStringLiteral(u"[%1]粒子能量计数统计处理").arg(this->GetProjectName());
}
bool EnergyCountProcessTask::processTask()
{
const QString& project_name = GetProjectName();
@ -930,11 +859,6 @@ bool EnergyCountProcessTask::processTask()
return true;
}
const QString &EnergyScaleCoincidenceDataTask::GetTaskName()
{
return QStringLiteral(u"[%1]粒子符合数据能量刻度处理").arg(this->GetProjectName());
}
bool EnergyScaleCoincidenceDataTask::processTask()
{
const QString& project_name = GetProjectName();
@ -1022,11 +946,6 @@ bool EnergyScaleCoincidenceDataTask::processTask()
return true;
}
const QString &EnergyScaleaAntiCoincidenceDataTask::GetTaskName()
{
return QStringLiteral(u"[%1]粒子反符合数据能量刻度处理").arg(this->GetProjectName());
}
bool EnergyScaleaAntiCoincidenceDataTask::processTask()
{
const QString& project_name = GetProjectName();
@ -1101,4 +1020,3 @@ bool EnergyScaleaAntiCoincidenceDataTask::processTask()
LOG_INFO(info);
return true;
}

View File

@ -16,8 +16,6 @@ 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;
@ -41,24 +39,6 @@ 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<QString, DataProcessTask*> _task_list;
};
class ParticleDataTask : public DataProcessTask
{
public:
@ -78,7 +58,6 @@ 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);
@ -95,7 +74,6 @@ namespace DataProcessWorkPool
class ParticleDataSortTask : public ParticleDataTask
{
public:
const QString& GetTaskName();
void SetSortedResultDir(const QString& sorted_result_dir);
const QString& GetSortedResultDir() const;
@ -113,16 +91,12 @@ 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<QString, QVariant>& data_files_set);
void SetResultDir(const QString& result_dir);
@ -137,12 +111,10 @@ namespace DataProcessWorkPool
int _step_win_width = 7;
};
class ChannelEnergyScaleFittingTask : public DataProcessTask
{
class ChannelEnergyScaleFittingTask : public DataProcessTask {
public:
typedef QMap<QString, QMap<int, QList<double> > > FitDataMap;
public:
const QString& GetTaskName();
void SetData(const FitDataMap& channel_energy_scale_fit_data_map, const QMap<QString, int>& fit_degree_map);
void SetResultDir(const QString& result_dir);
virtual bool IsValidSetWorkParameters() const override;
@ -156,32 +128,24 @@ 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;
};

View File

@ -77,7 +77,7 @@ class CustomQwtPlot;
class CustomQwtPlotXaxisSelector;
class QwtPlotPicker;
class QwtPlotCurve;
class BusyIndicatorWidget;
class BusyIndicator;
class EnergyCountPeakFitView : public MeasureAnalysisView {
Q_OBJECT

View File

@ -27,8 +27,6 @@
#include "GlobalDefine.h"
#include "DeviceParamsManagerDlg.h"
#include "NuclideLib.h"
#include <QListWidget>
#include <QDesktopWidget>
using namespace ads;
@ -93,7 +91,6 @@ MainWindow::MainWindow(QWidget* parent)
initMainWindow();
initAction();
initStatusBar();
this->applyStyleSheet();
_s_main_win = this;
@ -305,20 +302,6 @@ 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
@ -384,53 +367,8 @@ 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();
}
}

View File

@ -15,8 +15,6 @@ class CDockWidget;
}
class QPlainTextEdit;
class MeasureAnalysisTreeView;
class QListWidget;
class QPushButton;
QT_END_NAMESPACE
class MainWindow : public QMainWindow
@ -47,7 +45,6 @@ public:
private:
void initMainWindow();
void initAction();
void initStatusBar();
void applyStyleSheet();
void closeProject(const QString &project_name);
@ -57,19 +54,14 @@ 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;

View File

@ -61,7 +61,7 @@ ParticleInjectTimeAnalysisView::ParticleInjectTimeAnalysisView(QWidget *parent)
this->_menu = new QMenu(this);
setupMenu();
_busy_indicator = new BusyIndicatorWidget(this);
_busy_indicator = new BusyIndicator(this);
}
ParticleInjectTimeAnalysisView::~ParticleInjectTimeAnalysisView()

View File

@ -5,7 +5,7 @@
class CustomQwtPlot;
class QwtPlotCurve;
class BusyIndicatorWidget;
class BusyIndicator;
class QMenu;
class ParticleInjectTimeAnalysisView : public MeasureAnalysisView
@ -27,7 +27,7 @@ protected:
virtual void showEvent(QShowEvent* e) override final;
private:
BusyIndicatorWidget* _busy_indicator = nullptr;
BusyIndicator* _busy_indicator = nullptr;
CustomQwtPlot *_plot = nullptr;
QwtPlotCurve *_curve = nullptr;
QMenu* _menu = nullptr;

View File

@ -36,7 +36,7 @@ ParticleTimeDifferenceView::ParticleTimeDifferenceView(QWidget *parent)
this->_menu = new QMenu(this);
setupMenu();
_busy_indicator = new BusyIndicatorWidget(this);
_busy_indicator = new BusyIndicator(this);
}
ParticleTimeDifferenceView::~ParticleTimeDifferenceView()

View File

@ -9,7 +9,7 @@ class QMenu;
class CustomQwtPlot;
class CustomQwtPlotXaxisSelector;
class QwtPlotHistogram;
class BusyIndicatorWidget;
class BusyIndicator;
class ParticleTimeDifferenceView : public MeasureAnalysisView
{
@ -33,7 +33,7 @@ protected:
virtual void showEvent(QShowEvent* e) override final;
private:
BusyIndicatorWidget* _busy_indicator = nullptr;
BusyIndicator* _busy_indicator = nullptr;
CustomQwtPlot* _plot = nullptr;
QMenu* _menu = nullptr;
QDialog* _curve_show_setting_dlg = nullptr;