Skip to content
Snippets Groups Projects
Commit 0f91d6a7 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rename 'RealDataSelectorWidget', 'DatafilesListing'

parent aba66392
No related branches found
No related tags found
1 merge request!2134rename some files and directories in GUI/View
Hide whitespace changes
Inline Side-by-side
GUI/View/Import/RealDataSelectorWidget.cpp → GUI/View/Import/DatafilesListing.cpp
+ 27
− 29
View file @ 0f91d6a7
......@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/Import/RealDataSelectorWidget.cpp
//! @brief Implements class RealDataSelectorWidget.
//! @file GUI/View/Import/DatafilesListing.cpp
//! @brief Implements class DatafilesListing.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
......@@ -12,7 +12,7 @@
//
// ************************************************************************************************
#include "GUI/View/Import/RealDataSelectorWidget.h"
#include "GUI/View/Import/DatafilesListing.h"
#include "Base/Util/Assert.h"
#include "Device/Data/Datafield.h"
#include "Device/IO/IOFactory.h"
......@@ -60,7 +60,7 @@ T filterkey2type(std::vector<std::pair<const QString, T>> _nomap, const QString&
} // namespace
RealDataSelectorWidget::RealDataSelectorWidget(QWidget* parent, ProjectDocument* document)
DatafilesListing::DatafilesListing(QWidget* parent, ProjectDocument* document)
: QWidget(parent)
, m_import1dDataAction(new QAction(this))
, m_import2dDataAction(new QAction(this))
......@@ -73,7 +73,7 @@ RealDataSelectorWidget::RealDataSelectorWidget(QWidget* parent, ProjectDocument*
{
setMinimumSize(250, 600);
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
setWindowTitle("RealDataSelectorWidget");
setWindowTitle("DatafilesListing");
m_import2dDataAction->setText("Import 2D data");
m_import2dDataAction->setIcon(QIcon(":/images/shape-square-plus.svg"));
......@@ -91,15 +91,13 @@ RealDataSelectorWidget::RealDataSelectorWidget(QWidget* parent, ProjectDocument*
m_renameDataAction->setIcon(QIcon()); // #baTODO: Icon needed?
m_renameDataAction->setIconText("Rename");
m_renameDataAction->setToolTip("Rename data");
connect(m_renameDataAction, &QAction::triggered, this,
&RealDataSelectorWidget::renameCurrentItem);
connect(m_renameDataAction, &QAction::triggered, this, &DatafilesListing::renameCurrentItem);
m_removeDataAction->setText("Remove");
m_removeDataAction->setIcon(QIcon(":/images/delete.svg"));
m_removeDataAction->setIconText("Remove");
m_removeDataAction->setToolTip("Remove selected data");
connect(m_removeDataAction, &QAction::triggered, this,
&RealDataSelectorWidget::removeCurrentItem);
connect(m_removeDataAction, &QAction::triggered, this, &DatafilesListing::removeCurrentItem);
// m_itemTree->setAttribute(Qt::WA_MacShowFocusRect, false); // TODO/Mac: needed?
m_itemTree->setItemsExpandable(false);
......@@ -121,20 +119,20 @@ RealDataSelectorWidget::RealDataSelectorWidget(QWidget* parent, ProjectDocument*
setLayout(mainLayout);
connect(m_propertiesWidget, &RealDataPropertiesWidget::instrumentUpdated, this,
&RealDataSelectorWidget::selectionChanged);
&DatafilesListing::selectionChanged);
connect(m_itemTree, &QTreeView::customContextMenuRequested, this,
&RealDataSelectorWidget::onContextMenuRequest);
&DatafilesListing::onContextMenuRequest);
connect(m_document, &ProjectDocument::modifiedStateChanged, this,
&RealDataSelectorWidget::updateFunctionalities);
&DatafilesListing::updateFunctionalities);
connect(m_treeModel, &QAbstractItemModel::modelReset, [this]() { m_itemTree->expandAll(); });
connect(m_treeModel, &QAbstractItemModel::rowsInserted, [this]() { m_itemTree->expandAll(); });
connect(m_itemTree->selectionModel(), &QItemSelectionModel::selectionChanged, this,
&RealDataSelectorWidget::onSelectionChanged, Qt::UniqueConnection);
&DatafilesListing::onSelectionChanged, Qt::UniqueConnection);
m_itemTree->expandAll();
updateActionEnabling();
......@@ -146,22 +144,22 @@ RealDataSelectorWidget::RealDataSelectorWidget(QWidget* parent, ProjectDocument*
m_itemTree, [this](const QModelIndex& i, bool h) { return getOverlayActions(i, h); });
}
QSize RealDataSelectorWidget::sizeHint() const
QSize DatafilesListing::sizeHint() const
{
return {200, 400};
}
QSize RealDataSelectorWidget::minimumSizeHint() const
QSize DatafilesListing::minimumSizeHint() const
{
return {128, 200};
}
RealItem* RealDataSelectorWidget::currentItem()
RealItem* DatafilesListing::currentItem()
{
return m_treeModel->itemForIndex(currentIndex());
}
void RealDataSelectorWidget::setCurrentItem(RealItem* item)
void DatafilesListing::setCurrentItem(RealItem* item)
{
m_itemTree->selectionModel()->clearSelection();
QModelIndex index = m_treeModel->indexForItem(item);
......@@ -169,7 +167,7 @@ void RealDataSelectorWidget::setCurrentItem(RealItem* item)
m_itemTree->selectionModel()->setCurrentIndex(index, QItemSelectionModel::SelectCurrent);
}
void RealDataSelectorWidget::restoreSelection()
void DatafilesListing::restoreSelection()
{
int lastIndex = m_document->realModel()->selectedIndex();
int lastRank = m_document->realModel()->selectedRank();
......@@ -186,14 +184,14 @@ void RealDataSelectorWidget::restoreSelection()
emit selectionChanged(currentItem());
}
QModelIndex RealDataSelectorWidget::currentIndex()
QModelIndex DatafilesListing::currentIndex()
{
if (!m_itemTree->selectionModel()->isSelected(m_itemTree->selectionModel()->currentIndex()))
return {};
return m_itemTree->selectionModel()->currentIndex();
}
QList<QAction*> RealDataSelectorWidget::getOverlayActions(const QModelIndex& index, bool asHover)
QList<QAction*> DatafilesListing::getOverlayActions(const QModelIndex& index, bool asHover)
{
if (m_treeModel->isHeadline(index)) {
if (asHover)
......@@ -224,7 +222,7 @@ QList<QAction*> RealDataSelectorWidget::getOverlayActions(const QModelIndex& ind
return {removeAction};
}
void RealDataSelectorWidget::onSelectionChanged()
void DatafilesListing::onSelectionChanged()
{
updateActionEnabling();
......@@ -235,7 +233,7 @@ void RealDataSelectorWidget::onSelectionChanged()
emit selectionChanged(currentItem());
}
void RealDataSelectorWidget::onContextMenuRequest(const QPoint& point)
void DatafilesListing::onContextMenuRequest(const QPoint& point)
{
auto* realItemAtPoint = m_treeModel->itemForIndex(m_itemTree->indexAt(point));
updateActionEnabling(realItemAtPoint);
......@@ -254,7 +252,7 @@ void RealDataSelectorWidget::onContextMenuRequest(const QPoint& point)
menu.exec(m_itemTree->mapToGlobal(point));
}
void RealDataSelectorWidget::importData1D()
void DatafilesListing::importData1D()
{
static const std::vector<std::pair<const QString, IO::Filetype1D>> filters1D{
{"Legacy table / interactive configuration (*.csv *.dat *.tab *.txt *.dat.gz)", IO::csv1D},
......@@ -320,7 +318,7 @@ void RealDataSelectorWidget::importData1D()
gProjectDocument.value()->setModified();
}
void RealDataSelectorWidget::importData2D()
void DatafilesListing::importData2D()
{
static const std::vector<std::pair<const QString, IO::Filetype2D>> filters2D{
{"all (*.*)", IO::unknown2D},
......@@ -375,7 +373,7 @@ void RealDataSelectorWidget::importData2D()
gProjectDocument.value()->setModified();
}
void RealDataSelectorWidget::renameCurrentItem()
void DatafilesListing::renameCurrentItem()
{
if (currentIndex().isValid()) {
// First delete any existing index widget. This is necessary if overlay buttons are used,
......@@ -387,18 +385,18 @@ void RealDataSelectorWidget::renameCurrentItem()
}
}
void RealDataSelectorWidget::removeCurrentItem()
void DatafilesListing::removeCurrentItem()
{
m_treeModel->removeDataItem(currentItem());
gProjectDocument.value()->setModified();
}
void RealDataSelectorWidget::updateActionEnabling()
void DatafilesListing::updateActionEnabling()
{
updateActionEnabling(currentItem());
}
void RealDataSelectorWidget::updateActionEnabling(const RealItem* item) const
void DatafilesListing::updateActionEnabling(const RealItem* item) const
{
m_import2dDataAction->setEnabled(true);
m_import1dDataAction->setEnabled(true);
......@@ -407,7 +405,7 @@ void RealDataSelectorWidget::updateActionEnabling(const RealItem* item) const
m_renameDataAction->setEnabled(item != nullptr);
}
void RealDataSelectorWidget::updateFunctionalities()
void DatafilesListing::updateFunctionalities()
{
QSet<int> visibleRanks;
if (m_document->functionalities().testFlag(ProjectDocument::Specular))
......
GUI/View/Import/RealDataSelectorWidget.h → GUI/View/Import/DatafilesListing.h
+ 8
− 8
View file @ 0f91d6a7
......@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/Import/RealDataSelectorWidget.h
//! @brief Defines class RealDataSelectorWidget.
//! @file GUI/View/Import/DatafilesListing.h
//! @brief Defines class DatafilesListing.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
......@@ -12,8 +12,8 @@
//
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_IMPORT_REALDATASELECTORWIDGET_H
#define BORNAGAIN_GUI_VIEW_IMPORT_REALDATASELECTORWIDGET_H
#ifndef BORNAGAIN_GUI_VIEW_IMPORT_DATAFILESLISTING_H
#define BORNAGAIN_GUI_VIEW_IMPORT_DATAFILESLISTING_H
#include <QWidget>
......@@ -24,14 +24,14 @@ class RealDataPropertiesWidget;
class RealItem;
class RealTreeModel;
//! The RealDataSelectorWidget represents left panel of ImportDataView. Contains a tree to
//! The DatafilesListing represents left panel of ImportDataView. Contains a tree to
//! select data set (m_itemTree & m_treeModel) and properties of currently selected data
//! (RealDataPropertiesWidget).
class RealDataSelectorWidget : public QWidget {
class DatafilesListing : public QWidget {
Q_OBJECT
public:
RealDataSelectorWidget(QWidget* parent, ProjectDocument* document);
DatafilesListing(QWidget* parent, ProjectDocument* document);
QSize sizeHint() const override;
QSize minimumSizeHint() const override;
......@@ -70,4 +70,4 @@ private:
ProjectDocument* m_document;
};
#endif // BORNAGAIN_GUI_VIEW_IMPORT_REALDATASELECTORWIDGET_H
#endif // BORNAGAIN_GUI_VIEW_IMPORT_DATAFILESLISTING_H
GUI/View/Import/ImportDataView.cpp
+ 3
− 3
View file @ 0f91d6a7
......@@ -16,7 +16,7 @@
#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Tool/mainwindow_constants.h"
#include "GUI/View/Import/RealDataSelectorWidget.h"
#include "GUI/View/Import/DatafilesListing.h"
#include "GUI/View/Import/RealDataStackPresenter.h"
#include <QAction>
#include <QSplitter>
......@@ -33,7 +33,7 @@ ImportDataView::ImportDataView(QWidget* parent, ProjectDocument* document)
auto* splitter = new QSplitter;
mainLayout->addWidget(splitter);
m_selectorWidget = new RealDataSelectorWidget(this, document);
m_selectorWidget = new DatafilesListing(this, document);
splitter->addWidget(m_selectorWidget);
m_selectorWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
......@@ -41,7 +41,7 @@ ImportDataView::ImportDataView(QWidget* parent, ProjectDocument* document)
splitter->addWidget(stackedWidget);
stackedWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
stackedWidget->setSizeHint(QSize(1024, 1024));
connect(m_selectorWidget, &RealDataSelectorWidget::selectionChanged,
connect(m_selectorWidget, &DatafilesListing::selectionChanged,
[=](RealItem* realItem) { stackedWidget->setItem(realItem); });
splitter->setCollapsible(0, false);
......
GUI/View/Import/ImportDataView.h
+ 2
− 2
View file @ 0f91d6a7
......@@ -17,7 +17,7 @@
#include <QWidget>
class RealDataSelectorWidget;
class DatafilesListing;
class RealDataStackPresenter;
class RealItem;
class ProjectDocument;
......@@ -33,7 +33,7 @@ private:
//! Show/hide UI elements according to settings in current project
void updateFunctionalityNarrowing();
RealDataSelectorWidget* m_selectorWidget;
DatafilesListing* m_selectorWidget;
ProjectDocument* m_document;
};
......
GUI/View/Import/RealDataPropertiesWidget.h
+ 1
− 1
View file @ 0f91d6a7
......@@ -22,7 +22,7 @@ class QComboBox;
class RealItem;
//! The RealDataPropertiesWidget class holds instrument selector to link with RealItem.
//! Part of RealDataSelectorWidget, resides at lower left corner of ImportDataView.
//! Part of DatafilesListing, resides at lower left corner of ImportDataView.
class RealDataPropertiesWidget : public QWidget {
Q_OBJECT
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment