From dccc1b70825e17e55f776419e4006d9026a35b16 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 24 Jan 2024 08:50:27 +0100
Subject: [PATCH] rename class and sources GUI/View/Sample/SampleListing ->
GUI/View/Sample/SamplesQListView
---
GUI/View/Sample/SampleView.cpp | 12 ++---
GUI/View/Sample/SampleView.h | 4 +-
...SampleListing.cpp => SamplesQListView.cpp} | 48 +++++++++----------
.../{SampleListing.h => SamplesQListView.h} | 14 +++---
4 files changed, 39 insertions(+), 39 deletions(-)
rename GUI/View/Sample/{SampleListing.cpp => SamplesQListView.cpp} (84%)
rename GUI/View/Sample/{SampleListing.h => SamplesQListView.h} (85%)
diff --git a/GUI/View/Sample/SampleView.cpp b/GUI/View/Sample/SampleView.cpp
index 6982ec88b1d..aee5e6bc9b2 100644
--- a/GUI/View/Sample/SampleView.cpp
+++ b/GUI/View/Sample/SampleView.cpp
@@ -23,7 +23,7 @@
#include "GUI/View/Realspace/RealspacePanel.h"
#include "GUI/View/Realspace/RealspaceWidget.h"
#include "GUI/View/Sample/SampleEditor.h"
-#include "GUI/View/Sample/SampleListing.h"
+#include "GUI/View/Sample/SamplesQListView.h"
#include "GUI/View/Sample/ScriptPanel.h"
#include "GUI/View/Widget/StyledToolbar.h"
#include <QBoxLayout>
@@ -37,7 +37,7 @@
SampleView::SampleView()
: m_realspace_panel(new RealspacePanel(this))
- , m_listing(new SampleListing)
+ , m_listing(new SamplesQListView)
{
auto* layout = new QVBoxLayout(this);
layout->setContentsMargins(0, 0, 0, 0);
@@ -99,18 +99,18 @@ SampleView::SampleView()
toolbar->widgetForAction(m_listing->chooseFromLibraryAction())))
btn->setPopupMode(QToolButton::InstantPopup);
- connect(m_listing, &SampleListing::currentSampleChanged, editor,
+ connect(m_listing, &SamplesQListView::currentSampleChanged, editor,
&SampleEditor::setCurrentSample);
- connect(m_listing, &SampleListing::currentSampleChanged,
+ connect(m_listing, &SamplesQListView::currentSampleChanged,
[&](SampleItem* m) { onRequestViewInRealspace(m); });
- connect(m_listing, &SampleListing::currentSampleChanged, scriptPanel,
+ connect(m_listing, &SamplesQListView::currentSampleChanged, scriptPanel,
&ScriptPanel::setCurrentSample);
connect(editor, &SampleEditor::modified, scriptPanel, &ScriptPanel::onSampleModified);
- connect(editor, &SampleEditor::modified, m_listing, &SampleListing::onSampleModified);
+ connect(editor, &SampleEditor::modified, m_listing, &SamplesQListView::onSampleModified);
connect(editor, &SampleEditor::requestViewInRealspace, this,
&SampleView::onRequestViewInRealspace);
diff --git a/GUI/View/Sample/SampleView.h b/GUI/View/Sample/SampleView.h
index 58500d22e84..7e9e995be4b 100644
--- a/GUI/View/Sample/SampleView.h
+++ b/GUI/View/Sample/SampleView.h
@@ -20,7 +20,7 @@
class Item3D;
class RealspacePanel;
-class SampleListing;
+class SamplesQListView;
class SampleView : public QWidget {
Q_OBJECT
@@ -42,7 +42,7 @@ private:
void saveSplitterPos();
RealspacePanel* m_realspace_panel;
- SampleListing* m_listing;
+ SamplesQListView* m_listing;
};
#endif // BORNAGAIN_GUI_VIEW_SAMPLE_SAMPLEVIEW_H
diff --git a/GUI/View/Sample/SampleListing.cpp b/GUI/View/Sample/SamplesQListView.cpp
similarity index 84%
rename from GUI/View/Sample/SampleListing.cpp
rename to GUI/View/Sample/SamplesQListView.cpp
index 12301603db6..0ad13721478 100644
--- a/GUI/View/Sample/SampleListing.cpp
+++ b/GUI/View/Sample/SamplesQListView.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Sample/SampleListing.cpp
-//! @brief Implements class SampleListing.
+//! @file GUI/View/Sample/SamplesQListView.cpp
+//! @brief Implements class SamplesQListView.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Sample/SampleListing.h"
+#include "GUI/View/Sample/SamplesQListView.h"
#include "Base/Util/SysUtil.h"
#include "GUI/Model/FromCore/GUIExamplesFactory.h"
#include "GUI/Model/Project/ProjectDocument.h"
@@ -63,7 +63,7 @@ protected:
} // namespace
-SampleListing::SampleListing()
+SamplesQListView::SamplesQListView()
: m_model(new SamplesQModel)
, m_new_sample_action(new QAction(this))
, m_import_sample_action(new QAction(this))
@@ -80,16 +80,16 @@ SampleListing::SampleListing()
setItemDelegate(new ItemDelegateForSampleTree(this));
connect(selectionModel(), &QItemSelectionModel::currentChanged, this,
- &SampleListing::onCurrentChanged);
+ &SamplesQListView::onCurrentChanged);
- connect(this, &QWidget::customContextMenuRequested, this, &SampleListing::showContextMenu);
+ connect(this, &QWidget::customContextMenuRequested, this, &SamplesQListView::showContextMenu);
m_new_sample_action->setText("Create new sample");
m_new_sample_action->setIcon(QIcon(":/images/shape-square-plus.svg"));
m_new_sample_action->setIconText("New");
m_new_sample_action->setToolTip("Create new sample");
- connect(m_new_sample_action, &QAction::triggered, this, &SampleListing::createNewSample);
+ connect(m_new_sample_action, &QAction::triggered, this, &SamplesQListView::createNewSample);
m_import_sample_action->setText("Import sample from python script (experimental)");
@@ -101,7 +101,7 @@ SampleListing::SampleListing()
#ifdef BORNAGAIN_PYTHON
connect(m_import_sample_action, &QAction::triggered, this,
- &SampleListing::importSampleFromPython);
+ &SamplesQListView::importSampleFromPython);
#else
m_import_sample_action->setVisible(false);
#endif
@@ -127,38 +127,38 @@ SampleListing::SampleListing()
}
}
-void SampleListing::setCurrentSample(SampleItem* sample)
+void SamplesQListView::setCurrentSample(SampleItem* sample)
{
setCurrentIndex(m_model->indexForItem(sample));
}
-SampleItem* SampleListing::currentSampleItem()
+SampleItem* SamplesQListView::currentSampleItem()
{
return m_model->itemForIndex(currentIndex());
}
-QSize SampleListing::sizeHint() const
+QSize SamplesQListView::sizeHint() const
{
QSize s = QListView::sizeHint();
s.setWidth(std::max(300, s.width()));
return s;
}
-void SampleListing::onSampleModified()
+void SamplesQListView::onSampleModified()
{
// if length of description changes height of TreeItem, the position of the overlay buttons
// has to be updated -> schedule a re-layout
scheduleDelayedItemsLayout();
}
-void SampleListing::createNewSample()
+void SamplesQListView::createNewSample()
{
const QModelIndex newIndex = m_model->createSample();
setCurrentIndex(newIndex);
gDoc->setModified();
}
-void SampleListing::createSampleFromLibrary(const QString& classname, const QString& title,
- const QString& description)
+void SamplesQListView::createSampleFromLibrary(const QString& classname, const QString& title,
+ const QString& description)
{
const QModelIndex newIndex = m_model->createSampleFromExamples(classname, title, description);
if (newIndex.isValid()) {
@@ -167,7 +167,7 @@ void SampleListing::createSampleFromLibrary(const QString& classname, const QStr
}
}
-void SampleListing::importSampleFromPython()
+void SamplesQListView::importSampleFromPython()
{
#ifdef BORNAGAIN_PYTHON
const QModelIndex newIndex = m_model->createSampleFromPython();
@@ -178,7 +178,7 @@ void SampleListing::importSampleFromPython()
#endif
}
-QList<QAction*> SampleListing::getOverlayActions(const QModelIndex& index, bool asHover)
+QList<QAction*> SamplesQListView::getOverlayActions(const QModelIndex& index, bool asHover)
{
if (!asHover)
return {};
@@ -190,13 +190,13 @@ QList<QAction*> SampleListing::getOverlayActions(const QModelIndex& index, bool
return {createRemoveAction(this, item)};
}
-void SampleListing::onCurrentChanged(const QModelIndex& index)
+void SamplesQListView::onCurrentChanged(const QModelIndex& index)
{
gDoc->sampleModel()->setSelectedIndex(index.row());
emit currentSampleChanged(m_model->itemForIndex(index));
}
-void SampleListing::restoreSelection()
+void SamplesQListView::restoreSelection()
{
int selected = gDoc->sampleModel()->selectedIndex();
if (selected < 0 || selected >= m_model->rowCount())
@@ -209,19 +209,19 @@ void SampleListing::restoreSelection()
}
}
-void SampleListing::removeSample(SampleItem* item)
+void SamplesQListView::removeSample(SampleItem* item)
{
m_model->removeSample(item);
gDoc->setModified();
}
-void SampleListing::copySample(SampleItem* item)
+void SamplesQListView::copySample(SampleItem* item)
{
m_model->copySample(item);
gDoc->setModified();
}
-QAction* SampleListing::createRemoveAction(QObject* parent, SampleItem* item)
+QAction* SamplesQListView::createRemoveAction(QObject* parent, SampleItem* item)
{
auto* removeAction = new QAction(parent);
removeAction->setText("Remove");
@@ -233,7 +233,7 @@ QAction* SampleListing::createRemoveAction(QObject* parent, SampleItem* item)
return removeAction;
}
-QAction* SampleListing::createCopyAction(QObject* parent, SampleItem* item)
+QAction* SamplesQListView::createCopyAction(QObject* parent, SampleItem* item)
{
auto* copyAction = new QAction(parent);
copyAction->setText("Clone");
@@ -245,7 +245,7 @@ QAction* SampleListing::createCopyAction(QObject* parent, SampleItem* item)
return copyAction;
}
-void SampleListing::showContextMenu(const QPoint& pos)
+void SamplesQListView::showContextMenu(const QPoint& pos)
{
auto* sampleAtPoint = m_model->itemForIndex(indexAt(pos));
diff --git a/GUI/View/Sample/SampleListing.h b/GUI/View/Sample/SamplesQListView.h
similarity index 85%
rename from GUI/View/Sample/SampleListing.h
rename to GUI/View/Sample/SamplesQListView.h
index 1e4a4e80874..9f1dcec76d2 100644
--- a/GUI/View/Sample/SampleListing.h
+++ b/GUI/View/Sample/SamplesQListView.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Sample/SampleListing.h
-//! @brief Defines class SampleListing.
+//! @file GUI/View/Sample/SamplesQListView.h
+//! @brief Defines class SamplesQListView.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_SAMPLE_SAMPLELISTING_H
-#define BORNAGAIN_GUI_VIEW_SAMPLE_SAMPLELISTING_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLE_SAMPLESQLISTVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLE_SAMPLESQLISTVIEW_H
#include <QListView>
@@ -21,10 +21,10 @@ class SampleItem;
class SamplesQModel;
//! List view to select one sample (left side of layer-oriented sample editor)
-class SampleListing : public QListView {
+class SamplesQListView : public QListView {
Q_OBJECT
public:
- SampleListing();
+ SamplesQListView();
void setCurrentSample(SampleItem* sample);
SampleItem* currentSampleItem();
@@ -64,4 +64,4 @@ private:
QAction* m_choose_from_library_action;
};
-#endif // BORNAGAIN_GUI_VIEW_SAMPLE_SAMPLELISTING_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLE_SAMPLESQLISTVIEW_H
--
GitLab