From 598d908d73d5ae47f0d8ec836a1b4c7128c91989 Mon Sep 17 00:00:00 2001 From: Dmitry Yurov <d.yurov@fz-juelich.de> Date: Tue, 6 Feb 2018 13:45:31 +0100 Subject: [PATCH] Renamed SpecularDataWidget --> SpecularDataCanvas --- ...SpecularDataWidget.cpp => SpecularDataCanvas.cpp} | 12 ++++++------ .../{SpecularDataWidget.h => SpecularDataCanvas.h} | 10 +++++----- GUI/coregui/Views/TestView.cpp | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) rename GUI/coregui/Views/SpecularDataWidgets/{SpecularDataWidget.cpp => SpecularDataCanvas.cpp} (90%) rename GUI/coregui/Views/SpecularDataWidgets/{SpecularDataWidget.h => SpecularDataCanvas.h} (83%) diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.cpp b/GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.cpp similarity index 90% rename from GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.cpp rename to GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.cpp index 7c0c8e95f3b..49bc45b6b3e 100644 --- a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.cpp +++ b/GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.cpp @@ -13,11 +13,11 @@ // ************************************************************************** // #include "ColorMapUtils.h" -#include "SpecularDataWidget.h" +#include "SpecularDataCanvas.h" #include "SpecularDataItem.h" #include "plot_constants.h" -SpecularDataWidget::SpecularDataWidget(QWidget* parent) +SpecularDataCanvas::SpecularDataCanvas(QWidget* parent) : QWidget(parent), m_customPlot(new QCustomPlot) { @@ -43,20 +43,20 @@ SpecularDataWidget::SpecularDataWidget(QWidget* parent) m_customPlot->yAxis->setLabelFont(QFont(QFont().family(), Constants::plot_axes_label_size)); } -void SpecularDataWidget::setData(SpecularDataItem* data_item) +void SpecularDataCanvas::setData(SpecularDataItem* data_item) { m_data_item = data_item; initGraphFromItem(); } -void SpecularDataWidget::clearData() +void SpecularDataCanvas::clearData() { m_customPlot->removeGraph(m_customPlot->graph()); initGraph(); m_customPlot->replot(); } -void SpecularDataWidget::initGraph() +void SpecularDataCanvas::initGraph() { m_customPlot->addGraph(); @@ -71,7 +71,7 @@ void SpecularDataWidget::initGraph() axisRectangle->setMargins(QMargins(em*4, fontAscent*2, em*2, fontAscent*2)); } -void SpecularDataWidget::initGraphFromItem() +void SpecularDataCanvas::initGraphFromItem() { const auto underlying_data = intensityData()->getOutputData(); for (size_t i = 0, size = underlying_data->getAllocatedSize(); i < size; ++i) { diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.h b/GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.h similarity index 83% rename from GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.h rename to GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.h index c2cc0f88ccf..bd323717f79 100644 --- a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.h +++ b/GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.h @@ -12,8 +12,8 @@ // // ************************************************************************** // -#ifndef SPECULARDATAWIDGET_H -#define SPECULARDATAWIDGET_H +#ifndef SPECULARDATACANVAS_H +#define SPECULARDATACANVAS_H #include "WinDllMacros.h" #include "qcustomplot.h" @@ -21,11 +21,11 @@ class SpecularDataItem; -class BA_CORE_API_ SpecularDataWidget : public QWidget +class BA_CORE_API_ SpecularDataCanvas : public QWidget { Q_OBJECT public: - explicit SpecularDataWidget(QWidget* parent = nullptr); + explicit SpecularDataCanvas(QWidget* parent = nullptr); public slots: void setData(SpecularDataItem* data_item); @@ -40,4 +40,4 @@ private: SpecularDataItem* m_data_item; }; -#endif // SPECULARDATAWIDGET_H +#endif // SPECULARDATACANVAS_H diff --git a/GUI/coregui/Views/TestView.cpp b/GUI/coregui/Views/TestView.cpp index 8cd2fa632d5..5e3e49ea2a8 100644 --- a/GUI/coregui/Views/TestView.cpp +++ b/GUI/coregui/Views/TestView.cpp @@ -22,7 +22,7 @@ #include "ApplicationModels.h" #include "SampleModel.h" #include "SpecularDataItem.h" -#include "SpecularDataWidget.h" +#include "SpecularDataCanvas.h" #include "TestComponentView.h" #include "mainwindow.h" #include <QTreeView> @@ -179,7 +179,7 @@ void TestView::test_specular_data_widget() layout->setMargin(0); layout->setSpacing(0); auto data = SpecularDataItem::createTestItem(); - auto widget = new SpecularDataWidget; + auto widget = new SpecularDataCanvas; widget->setData(data); layout->addWidget(widget); setLayout(layout); -- GitLab