diff --git a/GUI/View/Access/DataPropertyWidget.cpp b/GUI/View/Access/DataPropertyWidget.cpp index ca5335cc98e6de1340d4b9ca34acfed5d2ed252c..846d08cfc0e26bd255e02400cba6313e5dfc8f5f 100644 --- a/GUI/View/Access/DataPropertyWidget.cpp +++ b/GUI/View/Access/DataPropertyWidget.cpp @@ -32,9 +32,9 @@ DataPropertyWidget::DataPropertyWidget(QWidget* parent) m_mainLayout->setSpacing(5); } -void DataPropertyWidget::setJobOrDatafileItem(QObject* job_or_real_Item) +void DataPropertyWidget::setJobOrDatafileItem(QObject* item) { - setBaseItem(job_or_real_Item); + setBaseItem(item); createPanelElements(); } diff --git a/GUI/View/Access/DataPropertyWidget.h b/GUI/View/Access/DataPropertyWidget.h index 76a6db03ce4e6e51e615a5b11e3a03bc3ff5be8e..8d304dddd128c9a8744c66d761113b18d96b39f2 100644 --- a/GUI/View/Access/DataPropertyWidget.h +++ b/GUI/View/Access/DataPropertyWidget.h @@ -28,7 +28,7 @@ class DataPropertyWidget : public DataAccessWidget { public: explicit DataPropertyWidget(QWidget* parent = nullptr); - void setJobOrDatafileItem(QObject* job_or_real_Item) override; + void setJobOrDatafileItem(QObject* item) override; signals: void axesRangeResetRequested(); diff --git a/GUI/View/Canvas/IntensityDataCanvas.cpp b/GUI/View/Canvas/IntensityDataCanvas.cpp index 7049b39d133333f44d67f28b7ed21f9ba4db8e14..e51c202f4ec9e89cfe22c8da3a0bce8511491267 100644 --- a/GUI/View/Canvas/IntensityDataCanvas.cpp +++ b/GUI/View/Canvas/IntensityDataCanvas.cpp @@ -70,9 +70,9 @@ IntensityDataCanvas::IntensityDataCanvas() &IntensityDataCanvas::onMousePress, Qt::UniqueConnection); } -void IntensityDataCanvas::setJobOrDatafileItem(QObject* job_or_real_Item) +void IntensityDataCanvas::setJobOrDatafileItem(QObject* item) { - setBaseItem(job_or_real_Item); + setBaseItem(item); m_colorMapCanvas->itemToCanvas(currentData2DItem()); if (!m_rotateDataAction) diff --git a/GUI/View/Canvas/IntensityDataCanvas.h b/GUI/View/Canvas/IntensityDataCanvas.h index 2e18b2e7db8cecf3070845de6111c1d59a764c98..4ccf3ee91fef476d2a9a972710c902f2e467ce7d 100644 --- a/GUI/View/Canvas/IntensityDataCanvas.h +++ b/GUI/View/Canvas/IntensityDataCanvas.h @@ -28,7 +28,7 @@ class IntensityDataCanvas : public DataAccessWidget { public: explicit IntensityDataCanvas(); - void setJobOrDatafileItem(QObject* job_or_real_Item) override; + void setJobOrDatafileItem(QObject* item) override; QSize sizeHint() const override; QSize minimumSizeHint() const override; diff --git a/GUI/View/Canvas/SpecularDataCanvas.cpp b/GUI/View/Canvas/SpecularDataCanvas.cpp index 95de2cfa2e771dfc2a3a9365b3bf463971f10c09..eebd2eacc892269c0104ee9f1559f48a808008bc 100644 --- a/GUI/View/Canvas/SpecularDataCanvas.cpp +++ b/GUI/View/Canvas/SpecularDataCanvas.cpp @@ -54,9 +54,9 @@ SpecularDataCanvas::SpecularDataCanvas(QWidget* parent) enableDeprecatedOnMousePress(true); // true for legacy reasons } -void SpecularDataCanvas::setJobOrDatafileItem(QObject* job_or_real_Item) +void SpecularDataCanvas::setJobOrDatafileItem(QObject* item) { - setBaseItem(job_or_real_Item); + setBaseItem(item); m_plot_canvas->setData1DItems({currentData1DItem()}); } diff --git a/GUI/View/Canvas/SpecularDataCanvas.h b/GUI/View/Canvas/SpecularDataCanvas.h index 6531b2d8bff477e5adc2d53ac06be5a6bf31a4e2..2505adfc51b25317cdb71bed7094f2d96e5eb4d0 100644 --- a/GUI/View/Canvas/SpecularDataCanvas.h +++ b/GUI/View/Canvas/SpecularDataCanvas.h @@ -27,7 +27,7 @@ class SpecularDataCanvas : public DataAccessWidget { public: explicit SpecularDataCanvas(QWidget* parent = nullptr); - void setJobOrDatafileItem(QObject* job_or_real_Item) override; + void setJobOrDatafileItem(QObject* item) override; QSize sizeHint() const override; QSize minimumSizeHint() const override; diff --git a/GUI/View/Frame/SpecularFrame.cpp b/GUI/View/Frame/SpecularFrame.cpp index e672de89247060a9a9ac7c6cdf0254182b110939..8a67b0af1431ccd169486a788932fda315aa3adf 100644 --- a/GUI/View/Frame/SpecularFrame.cpp +++ b/GUI/View/Frame/SpecularFrame.cpp @@ -43,11 +43,11 @@ SpecularFrame::SpecularFrame(QWidget* parent) m_propertyWidget->setVisible(false); } -void SpecularFrame::setJobOrDatafileItem(QObject* job_or_real_Item) +void SpecularFrame::setJobOrDatafileItem(QObject* item) { - setBaseItem(job_or_real_Item); - m_specular_canvas->setJobOrDatafileItem(job_or_real_Item); - m_propertyWidget->setJobOrDatafileItem(job_or_real_Item); + setBaseItem(item); + m_specular_canvas->setJobOrDatafileItem(item); + m_propertyWidget->setJobOrDatafileItem(item); } QList<QAction*> SpecularFrame::actionList() diff --git a/GUI/View/Frame/SpecularFrame.h b/GUI/View/Frame/SpecularFrame.h index a9c6c430a6dda6bab3d7274eaeab59231b149ba3..a2f37c253f442829dfea2bb5899e551b44df0c24 100644 --- a/GUI/View/Frame/SpecularFrame.h +++ b/GUI/View/Frame/SpecularFrame.h @@ -25,7 +25,7 @@ class SpecularFrame : public DataAccessWidget { public: SpecularFrame(QWidget* parent = nullptr); - void setJobOrDatafileItem(QObject* job_or_real_Item) override; + void setJobOrDatafileItem(QObject* item) override; QList<QAction*> actionList() override;