From 89cdfa005328e463074b388bb105dd81c9f09a14 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Thu, 9 Mar 2017 14:33:04 +0100
Subject: [PATCH] DetectorItem was renamed to DetectorContainerItem.
---
GUI/coregui/Models/DetectorItems.cpp | 8 ++++----
GUI/coregui/Models/DetectorItems.h | 6 +++---
GUI/coregui/Models/GUIObjectBuilder.cpp | 2 +-
GUI/coregui/Models/InstrumentItem.cpp | 4 ++--
GUI/coregui/Models/InstrumentItem.h | 4 ++--
GUI/coregui/Models/ItemFactory.cpp | 4 ++--
GUI/coregui/Models/JobModelFunctions.cpp | 6 +++---
GUI/coregui/Models/TransformFromDomain.cpp | 10 +++++-----
GUI/coregui/Models/TransformFromDomain.h | 6 +++---
GUI/coregui/Models/TransformToDomain.cpp | 2 +-
.../Views/ImportDataWidgets/ImportDataAssistant.cpp | 8 ++++----
.../ImportDataWidgets/LinkInstrumentManager.cpp | 4 ++--
GUI/coregui/Views/InstrumentView.cpp | 6 +++---
GUI/coregui/Views/InstrumentView.h | 4 ++--
.../Views/InstrumentWidgets/DetectorEditorWidget.cpp | 8 ++++----
.../Views/InstrumentWidgets/DetectorEditorWidget.h | 8 ++++----
.../Views/InstrumentWidgets/DetectorMaskDelegate.cpp | 6 +++---
.../Views/InstrumentWidgets/DetectorMaskDelegate.h | 8 ++++----
.../InstrumentWidgets/ExtendedDetectorDialog.cpp | 2 +-
.../Views/InstrumentWidgets/ExtendedDetectorDialog.h | 4 ++--
.../InstrumentWidgets/InstrumentComponentsWidget.cpp | 6 +++---
.../InstrumentWidgets/InstrumentComponentsWidget.h | 8 ++++----
.../InstrumentWidgets/InstrumentEditorWidget.cpp | 4 ++--
.../Views/InstrumentWidgets/InstrumentEditorWidget.h | 4 ++--
.../InstrumentWidgets/SphericalDetectorWidget.cpp | 6 +++---
.../InstrumentWidgets/SphericalDetectorWidget.h | 6 +++---
Tests/UnitTests/GUI/TestMapperCases.h | 12 ++++++------
27 files changed, 78 insertions(+), 78 deletions(-)
diff --git a/GUI/coregui/Models/DetectorItems.cpp b/GUI/coregui/Models/DetectorItems.cpp
index 93680a6da31..fabcf480910 100644
--- a/GUI/coregui/Models/DetectorItems.cpp
+++ b/GUI/coregui/Models/DetectorItems.cpp
@@ -17,10 +17,10 @@
#include "DetectorItems.h"
#include "MaskItems.h"
-const QString DetectorItem::P_DETECTOR = "DetectorType";
-const QString DetectorItem::T_MASKS = "Mask tag";
+const QString DetectorContainerItem::P_DETECTOR = "DetectorType";
+const QString DetectorContainerItem::T_MASKS = "Mask tag";
-DetectorItem::DetectorItem()
+DetectorContainerItem::DetectorContainerItem()
: SessionItem(Constants::DetectorType)
{
addGroupProperty(P_DETECTOR, Constants::DetectorGroup);
@@ -41,7 +41,7 @@ DetectorItem::DetectorItem()
});
}
-MaskContainerItem *DetectorItem::maskContainerItem() const
+MaskContainerItem *DetectorContainerItem::maskContainerItem() const
{
foreach(SessionItem *item, childItems()) {
if(MaskContainerItem *container = dynamic_cast<MaskContainerItem *>(item)) {
diff --git a/GUI/coregui/Models/DetectorItems.h b/GUI/coregui/Models/DetectorItems.h
index 6fcac9ba0bb..1a978cfe808 100644
--- a/GUI/coregui/Models/DetectorItems.h
+++ b/GUI/coregui/Models/DetectorItems.h
@@ -23,13 +23,13 @@
class MaskContainerItem;
//! DetectorItem, holds masks and either rectangular or spherical detector as sub item
-class BA_CORE_API_ DetectorItem : public SessionItem
+class BA_CORE_API_ DetectorContainerItem : public SessionItem
{
public:
static const QString P_DETECTOR;
static const QString T_MASKS;
- explicit DetectorItem();
- virtual ~DetectorItem(){}
+ explicit DetectorContainerItem();
+ virtual ~DetectorContainerItem(){}
MaskContainerItem *maskContainerItem() const;
};
diff --git a/GUI/coregui/Models/GUIObjectBuilder.cpp b/GUI/coregui/Models/GUIObjectBuilder.cpp
index 5d23a3439ab..5ca363d7e6a 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.cpp
+++ b/GUI/coregui/Models/GUIObjectBuilder.cpp
@@ -113,7 +113,7 @@ SessionItem* GUIObjectBuilder::populateInstrumentModel(
TransformFromDomain::setItemFromSample(beamItem, simulation);
// detector
- DetectorItem* detectorItem = dynamic_cast<DetectorItem*>(instrumentModel->insertNewItem(
+ DetectorContainerItem* detectorItem = dynamic_cast<DetectorContainerItem*>(instrumentModel->insertNewItem(
Constants::DetectorType, instrumentModel->indexOfItem(instrumentItem)));
TransformFromDomain::setItemFromSample(detectorItem, simulation);
diff --git a/GUI/coregui/Models/InstrumentItem.cpp b/GUI/coregui/Models/InstrumentItem.cpp
index 0e3a5321c07..75a411dc683 100644
--- a/GUI/coregui/Models/InstrumentItem.cpp
+++ b/GUI/coregui/Models/InstrumentItem.cpp
@@ -41,10 +41,10 @@ BeamItem *InstrumentItem::beamItem() const
return 0;
}
-DetectorItem *InstrumentItem::detectorItem() const
+DetectorContainerItem *InstrumentItem::detectorItem() const
{
for(SessionItem *item : childItems())
if(item->modelType() == Constants::DetectorType)
- return dynamic_cast<DetectorItem *>(item);
+ return dynamic_cast<DetectorContainerItem *>(item);
return 0;
}
diff --git a/GUI/coregui/Models/InstrumentItem.h b/GUI/coregui/Models/InstrumentItem.h
index b622609c7f0..eb2818684e9 100644
--- a/GUI/coregui/Models/InstrumentItem.h
+++ b/GUI/coregui/Models/InstrumentItem.h
@@ -20,7 +20,7 @@
#include "SessionItem.h"
class BeamItem;
-class DetectorItem;
+class DetectorContainerItem;
class BA_CORE_API_ InstrumentItem : public SessionItem
{
@@ -29,7 +29,7 @@ public:
InstrumentItem();
BeamItem *beamItem() const;
- DetectorItem *detectorItem() const;
+ DetectorContainerItem *detectorItem() const;
};
#endif // INSTRUMENTITEM_H
diff --git a/GUI/coregui/Models/ItemFactory.cpp b/GUI/coregui/Models/ItemFactory.cpp
index 4ac6e435072..840f25ca167 100644
--- a/GUI/coregui/Models/ItemFactory.cpp
+++ b/GUI/coregui/Models/ItemFactory.cpp
@@ -76,7 +76,7 @@ ItemFactory::ItemMap_t initializeItemMap() {
result[Constants::InterferenceFunction2DLatticeType] = &createInstance<InterferenceFunction2DLatticeItem>;
result[Constants::InterferenceFunction1DLatticeType] = &createInstance<InterferenceFunction1DLatticeItem>;
result[Constants::InstrumentType] = &createInstance<InstrumentItem>;
- result[Constants::DetectorType] = &createInstance<DetectorItem>;
+ result[Constants::DetectorType] = &createInstance<DetectorContainerItem>;
result[Constants::BeamType] = &createInstance<BeamItem>;
result[Constants::VectorType] = &createInstance<VectorItem>;
result[Constants::PropertyType] = &createInstance<PropertyItem>;
@@ -111,7 +111,7 @@ ItemFactory::ItemMap_t initializeItemMap() {
result[Constants::LayerBasicRoughnessType] = &createInstance<LayerBasicRoughnessItem>;
result[Constants::LayerZeroRoughnessType] = &createInstance<LayerZeroRoughnessItem>;
- result[Constants::DetectorType] = &createInstance<DetectorItem>;
+ result[Constants::DetectorType] = &createInstance<DetectorContainerItem>;
result[Constants::SphericalDetectorType] = &createInstance<SphericalDetectorItem>;
result[Constants::RectangularDetectorType] = &createInstance<RectangularDetectorItem>;
diff --git a/GUI/coregui/Models/JobModelFunctions.cpp b/GUI/coregui/Models/JobModelFunctions.cpp
index 364191e0035..8388bb95ae3 100644
--- a/GUI/coregui/Models/JobModelFunctions.cpp
+++ b/GUI/coregui/Models/JobModelFunctions.cpp
@@ -97,15 +97,15 @@ void JobModelFunctions::processInstrumentLink(JobItem *jobItem)
void JobModelFunctions::copyMasksToInstrument(JobItem *jobItem)
{
IntensityDataItem *intensityItem = jobItem->realDataItem()->intensityDataItem();
- DetectorItem *detector = jobItem->instrumentItem()->detectorItem();
+ DetectorContainerItem *detector = jobItem->instrumentItem()->detectorItem();
// removing original masks from the detector, if exists
if(detector->maskContainerItem())
- detector->takeItem(0, DetectorItem::T_MASKS);
+ detector->takeItem(0, DetectorContainerItem::T_MASKS);
if(MaskContainerItem *container = intensityItem->maskContainerItem()) {
SessionModel *model = detector->model();
- model->copyParameterizedItem(container, detector, DetectorItem::T_MASKS);
+ model->copyParameterizedItem(container, detector, DetectorContainerItem::T_MASKS);
}
}
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index 10e85cc7dee..3494db2fd3b 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -219,14 +219,14 @@ void TransformFromDomain::setItemFromSample(BeamItem* beamItem, const GISASSimul
}
}
-void TransformFromDomain::setItemFromSample(DetectorItem* detectorItem,
+void TransformFromDomain::setItemFromSample(DetectorContainerItem* detectorItem,
const GISASSimulation& simulation)
{
Q_ASSERT(detectorItem);
const IDetector2D* iDetector = simulation.getInstrument().getDetector();
if(auto detector = dynamic_cast<const SphericalDetector*>(iDetector)) {
auto item = dynamic_cast<SphericalDetectorItem*>
- (detectorItem->setGroupProperty(DetectorItem::P_DETECTOR,
+ (detectorItem->setGroupProperty(DetectorContainerItem::P_DETECTOR,
Constants::SphericalDetectorType));
Q_ASSERT(item);
setItemFromSample(item,* detector);
@@ -234,7 +234,7 @@ void TransformFromDomain::setItemFromSample(DetectorItem* detectorItem,
else if(auto detector = dynamic_cast<const RectangularDetector*>(iDetector)) {
auto item = dynamic_cast<RectangularDetectorItem*>
- (detectorItem->setGroupProperty(DetectorItem::P_DETECTOR,
+ (detectorItem->setGroupProperty(DetectorContainerItem::P_DETECTOR,
Constants::RectangularDetectorType));
Q_ASSERT(item);
setItemFromSample(item,* detector);
@@ -406,12 +406,12 @@ void TransformFromDomain::setItemFromSample(RectangularDetectorItem* detectorIte
}
-void TransformFromDomain::setDetectorMasks(DetectorItem* detectorItem, const GISASSimulation& simulation)
+void TransformFromDomain::setDetectorMasks(DetectorContainerItem* detectorItem, const GISASSimulation& simulation)
{
Q_ASSERT(detectorItem);
double scale(1.0);
- if(detectorItem->getGroupItem(DetectorItem::P_DETECTOR)->modelType()
+ if(detectorItem->getGroupItem(DetectorContainerItem::P_DETECTOR)->modelType()
== Constants::SphericalDetectorType)
scale = 1./Units::degree;
diff --git a/GUI/coregui/Models/TransformFromDomain.h b/GUI/coregui/Models/TransformFromDomain.h
index 8a3631c9439..90986891925 100644
--- a/GUI/coregui/Models/TransformFromDomain.h
+++ b/GUI/coregui/Models/TransformFromDomain.h
@@ -22,7 +22,7 @@
class BeamDistributionItem;
class BeamItem;
-class DetectorItem;
+class DetectorContainerItem;
class FormFactorAnisoPyramid;
class GISASSimulation;
class InterferenceFunction1DLattice;
@@ -71,7 +71,7 @@ BA_CORE_API_ bool isValidRoughness(const LayerRoughness *roughness);
BA_CORE_API_ void setItemFromSample(BeamItem *beamItem,
const GISASSimulation &simulation);
-BA_CORE_API_ void setItemFromSample(DetectorItem *detectorItem,
+BA_CORE_API_ void setItemFromSample(DetectorContainerItem *detectorItem,
const GISASSimulation &simulation);
BA_CORE_API_ void setItemFromSample(SphericalDetectorItem *detectorItem,
@@ -80,7 +80,7 @@ BA_CORE_API_ void setItemFromSample(SphericalDetectorItem *detectorItem,
BA_CORE_API_ void setItemFromSample(RectangularDetectorItem *detectorItem,
const RectangularDetector &detector);
-BA_CORE_API_ void setDetectorMasks(DetectorItem *detectorItem,
+BA_CORE_API_ void setDetectorMasks(DetectorContainerItem *detectorItem,
const GISASSimulation &simulation);
BA_CORE_API_ void setItemFromSample(BeamDistributionItem *beamDistributionItem,
diff --git a/GUI/coregui/Models/TransformToDomain.cpp b/GUI/coregui/Models/TransformToDomain.cpp
index aa7681d0148..a28c27fa626 100644
--- a/GUI/coregui/Models/TransformToDomain.cpp
+++ b/GUI/coregui/Models/TransformToDomain.cpp
@@ -165,7 +165,7 @@ std::unique_ptr<Beam> TransformToDomain::createBeam(const SessionItem& item)
void TransformToDomain::initInstrumentFromDetectorItem(const SessionItem& detectorItem,
Instrument* instrument)
{
- auto subDetector = detectorItem.getGroupItem(DetectorItem::P_DETECTOR);
+ auto subDetector = detectorItem.getGroupItem(DetectorContainerItem::P_DETECTOR);
Q_ASSERT(subDetector);
double scale(1.0);
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
index 4292e0e393d..3d084665a16 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
@@ -161,11 +161,11 @@ void ImportDataAssistant::realDataShape(const RealDataItem *realData, int &nx, i
void ImportDataAssistant::detectorShape(const InstrumentItem *instrumentItem, int &nx, int &ny)
{
nx = ny = 0;
- DetectorItem *detectorItem = instrumentItem ->detectorItem();
+ DetectorContainerItem *detectorItem = instrumentItem ->detectorItem();
Q_ASSERT(detectorItem);
// FIXME Refactor subDetector
- auto subDetector = detectorItem->getGroupItem(DetectorItem::P_DETECTOR);
+ auto subDetector = detectorItem->getGroupItem(DetectorContainerItem::P_DETECTOR);
Q_ASSERT(subDetector);
std::unique_ptr<IDetector2D> detector;
@@ -189,11 +189,11 @@ void ImportDataAssistant::setInstrumentShapeToData(InstrumentItem *instrumentIte
int nxData(0), nyData(0);
realDataShape(realDataItemItem, nxData, nyData);
- DetectorItem *detectorItem = instrumentItem ->detectorItem();
+ DetectorContainerItem *detectorItem = instrumentItem ->detectorItem();
Q_ASSERT(detectorItem);
// FIXME Refactor subDetector
- auto subDetector = detectorItem->getGroupItem(DetectorItem::P_DETECTOR);
+ auto subDetector = detectorItem->getGroupItem(DetectorContainerItem::P_DETECTOR);
Q_ASSERT(subDetector);
if (subDetector->modelType() == Constants::SphericalDetectorType) {
diff --git a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
index 25057c55e34..9286aaa0693 100644
--- a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
@@ -108,7 +108,7 @@ bool LinkInstrumentManager::canLinkDataToInstrument(const RealDataItem *realData
return true;
// FIXME temporary hack to get rid from Instrument's own masks and ROI
- DetectorItem *detectorItem = instrumentItem->detectorItem();
+ DetectorContainerItem *detectorItem = instrumentItem->detectorItem();
if(SessionItem *maskContainer = detectorItem->maskContainerItem()) {
SessionItem *item = detectorItem->takeRow(detectorItem->rowOfChild(maskContainer));
delete item;
@@ -176,7 +176,7 @@ void LinkInstrumentManager::onInstrumentChildChange(InstrumentItem *instrument,
return;
if(child->itemName() == BasicAxisItem::P_NBINS ||
- child->parent()->itemName() == DetectorItem::P_DETECTOR) {
+ child->parent()->itemName() == DetectorContainerItem::P_DETECTOR) {
onInstrumentBinningChange(instrument);
} else {
onInstrumentLayoutChange(instrument);
diff --git a/GUI/coregui/Views/InstrumentView.cpp b/GUI/coregui/Views/InstrumentView.cpp
index a527b794bb4..63ffc3cb695 100644
--- a/GUI/coregui/Views/InstrumentView.cpp
+++ b/GUI/coregui/Views/InstrumentView.cpp
@@ -92,9 +92,9 @@ void InstrumentView::onSelectionChanged(
if( !widget) {
widget = new InstrumentEditorWidget();
connect(widget,
- SIGNAL(extendedDetectorEditorRequest(DetectorItem *)),
+ SIGNAL(extendedDetectorEditorRequest(DetectorContainerItem *)),
this,
- SLOT(onExtendedDetectorEditorRequest(DetectorItem *))
+ SLOT(onExtendedDetectorEditorRequest(DetectorContainerItem *))
);
widget->setInstrumentItem(instrument);
@@ -149,7 +149,7 @@ void InstrumentView::onRowsAboutToBeRemoved(QModelIndex parent, int first, int /
delete widget;
}
-void InstrumentView::onExtendedDetectorEditorRequest(DetectorItem *detectorItem)
+void InstrumentView::onExtendedDetectorEditorRequest(DetectorContainerItem *detectorItem)
{
ExtendedDetectorDialog *dialog = new ExtendedDetectorDialog(this);
dialog->setDetectorContext(m_instrumentModel, detectorItem);
diff --git a/GUI/coregui/Views/InstrumentView.h b/GUI/coregui/Views/InstrumentView.h
index d8c5bea8869..0087e929b0b 100644
--- a/GUI/coregui/Views/InstrumentView.h
+++ b/GUI/coregui/Views/InstrumentView.h
@@ -29,7 +29,7 @@ class QStackedWidget;
class QItemSelection;
class SessionItem;
class QToolButton;
-class DetectorItem;
+class DetectorContainerItem;
class BA_CORE_API_ InstrumentView : public QWidget
@@ -46,7 +46,7 @@ public slots:
void onAddInstrument();
void onRemoveInstrument();
void onRowsAboutToBeRemoved(QModelIndex,int,int);
- void onExtendedDetectorEditorRequest(DetectorItem *detectorItem);
+ void onExtendedDetectorEditorRequest(DetectorContainerItem *detectorItem);
private:
void setupConnections();
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
index 3826ea3aeb6..0028d90715b 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
@@ -54,7 +54,7 @@ DetectorEditorWidget::~DetectorEditorWidget()
{
}
-void DetectorEditorWidget::setDetectorItem(DetectorItem *detectorItem)
+void DetectorEditorWidget::setDetectorItem(DetectorContainerItem *detectorItem)
{
if(m_detectorItem == detectorItem) {
return;
@@ -73,7 +73,7 @@ void DetectorEditorWidget::setDetectorItem(DetectorItem *detectorItem)
}, this);
m_detectorTypeEditor->clearEditor();
- m_detectorTypeEditor->addItem(m_detectorItem->getItem(DetectorItem::P_DETECTOR));
+ m_detectorTypeEditor->addItem(m_detectorItem->getItem(DetectorContainerItem::P_DETECTOR));
init_SubDetector_Widget();
}
@@ -97,7 +97,7 @@ void DetectorEditorWidget::setDetectorItem(DetectorItem *detectorItem)
void DetectorEditorWidget::onPropertyChanged(const QString &propertyName)
{
- if(propertyName == DetectorItem::P_DETECTOR) {
+ if(propertyName == DetectorContainerItem::P_DETECTOR) {
init_SubDetector_Widget();
}
}
@@ -114,7 +114,7 @@ void DetectorEditorWidget::init_SubDetector_Widget()
m_subDetectorWidget = 0;
- SessionItem *subItem = m_detectorItem->getGroupItem(DetectorItem::P_DETECTOR);
+ SessionItem *subItem = m_detectorItem->getGroupItem(DetectorContainerItem::P_DETECTOR);
// if(SphericalDetectorItem *SphericalDetectorItem = dynamic_cast<)
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h
index 7a06ed59258..a52a287925c 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h
@@ -22,7 +22,7 @@
#include <memory>
class GroupInfoBox;
-class DetectorItem;
+class DetectorContainerItem;
class ComponentBoxEditor;
class QGridLayout;
class SphericalDetectorWidget;
@@ -35,10 +35,10 @@ public:
DetectorEditorWidget(ColumnResizer *columnResizer, QWidget *parent = 0);
virtual ~DetectorEditorWidget();
- void setDetectorItem(DetectorItem *detectorItem);
+ void setDetectorItem(DetectorContainerItem *detectorItem);
signals:
- void extendedDetectorEditorRequest(DetectorItem *);
+ void extendedDetectorEditorRequest(DetectorContainerItem *);
public slots:
void onPropertyChanged(const QString &propertyName);
@@ -51,7 +51,7 @@ private:
ComponentBoxEditor *m_detectorTypeEditor;
ColumnResizer *m_columnResizer;
GroupInfoBox *m_groupBox;
- DetectorItem *m_detectorItem;
+ DetectorContainerItem *m_detectorItem;
QWidget *m_subDetectorWidget;
};
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
index 0e76746b14b..fca368af830 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
@@ -36,7 +36,7 @@ DetectorMaskDelegate::DetectorMaskDelegate(QObject *parent)
void DetectorMaskDelegate::initMaskEditorContext(
MaskEditor *maskEditor, InstrumentModel *instrumentModel,
- DetectorItem *detectorItem)
+ DetectorContainerItem *detectorItem)
{
m_instrumentModel = instrumentModel;
m_detectorItem = detectorItem;
@@ -103,12 +103,12 @@ void DetectorMaskDelegate::createMaskContainer()
//! Creates OutputData from DetectorItem's axes for later initialization of
//! IntensityDataItem
OutputData<double> *
-DetectorMaskDelegate::createOutputData(DetectorItem *detectorItem)
+DetectorMaskDelegate::createOutputData(DetectorContainerItem *detectorItem)
{
Q_ASSERT(detectorItem);
OutputData<double> *result = new OutputData<double>;
- auto subDetector = detectorItem->getGroupItem(DetectorItem::P_DETECTOR);
+ auto subDetector = detectorItem->getGroupItem(DetectorContainerItem::P_DETECTOR);
Q_ASSERT(subDetector);
if (subDetector->modelType() == Constants::SphericalDetectorType) {
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
index 01f1f60f000..148f57293a5 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
@@ -23,7 +23,7 @@
template <class T> class OutputData;
-class DetectorItem;
+class DetectorContainerItem;
class InstrumentModel;
class IntensityDataItem;
class MaskEditor;
@@ -41,16 +41,16 @@ public:
void initMaskEditorContext(MaskEditor *maskEditor,
InstrumentModel *instrumentModel,
- DetectorItem *detectorItem);
+ DetectorContainerItem *detectorItem);
private:
void createIntensityDataItem();
void createMaskContainer();
- OutputData<double> *createOutputData(DetectorItem *detectorItem);
+ OutputData<double> *createOutputData(DetectorContainerItem *detectorItem);
SessionModel *m_tempIntensityDataModel;
InstrumentModel *m_instrumentModel;
- DetectorItem *m_detectorItem;
+ DetectorContainerItem *m_detectorItem;
IntensityDataItem *m_intensityItem;
};
diff --git a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
index 39f4965fd70..8b1b59bf7e6 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
@@ -66,7 +66,7 @@ ExtendedDetectorDialog::ExtendedDetectorDialog(QWidget *parent)
}
void ExtendedDetectorDialog::setDetectorContext(InstrumentModel *instrumentModel,
- DetectorItem *detectorItem)
+ DetectorContainerItem *detectorItem)
{
m_detectorMaskDelegate->initMaskEditorContext(m_maskEditor, instrumentModel,
detectorItem);
diff --git a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h
index 1f4f75dfd1b..4fa22fd77f6 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h
+++ b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h
@@ -20,7 +20,7 @@
#include <QDialog>
class MaskEditor;
-class DetectorItem;
+class DetectorContainerItem;
class DetectorMaskDelegate;
class InstrumentModel;
@@ -35,7 +35,7 @@ public:
virtual ~ExtendedDetectorDialog(){}
public slots:
- void setDetectorContext(InstrumentModel *instrumentModel, DetectorItem *detectorItem);
+ void setDetectorContext(InstrumentModel *instrumentModel, DetectorContainerItem *detectorItem);
private:
void reject();
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
index aec9b0f98a1..0f4d9351b12 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
@@ -38,9 +38,9 @@ InstrumentComponentsWidget::InstrumentComponentsWidget(QWidget *parent)
m_columnResizer->addWidgetsFromGridLayout(m_beamEditor->getGridLayout(), 2);
connect(m_detectorEditor,
- SIGNAL(extendedDetectorEditorRequest(DetectorItem *)),
+ SIGNAL(extendedDetectorEditorRequest(DetectorContainerItem *)),
this,
- SIGNAL(extendedDetectorEditorRequest(DetectorItem *))
+ SIGNAL(extendedDetectorEditorRequest(DetectorContainerItem *))
);
}
@@ -51,7 +51,7 @@ void InstrumentComponentsWidget::setBeamItem(BeamItem *beamItem)
m_beamEditor->setBeamItem(beamItem);
}
-void InstrumentComponentsWidget::setDetectorItem(DetectorItem *detectorItem)
+void InstrumentComponentsWidget::setDetectorItem(DetectorContainerItem *detectorItem)
{
m_detectorItem = detectorItem;
m_detectorEditor->setDetectorItem(detectorItem);
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h
index a053de5ba54..76597ce1776 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h
@@ -21,7 +21,7 @@
#include <QWidget>
class BeamItem;
-class DetectorItem;
+class DetectorContainerItem;
class BeamEditorWidget;
class DetectorEditorWidget;
class ColumnResizer;
@@ -33,17 +33,17 @@ public:
InstrumentComponentsWidget(QWidget *parent = 0);
void setBeamItem(BeamItem *beamItem);
- void setDetectorItem(DetectorItem *detectorItem);
+ void setDetectorItem(DetectorContainerItem *detectorItem);
signals:
- void extendedDetectorEditorRequest(DetectorItem *);
+ void extendedDetectorEditorRequest(DetectorContainerItem *);
private:
ColumnResizer *m_columnResizer;
BeamEditorWidget *m_beamEditor;
DetectorEditorWidget *m_detectorEditor;
BeamItem *m_beamItem;
- DetectorItem *m_detectorItem;
+ DetectorContainerItem *m_detectorItem;
};
#endif // INSTRUMENTCOMPONENTSWIDGET_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
index c3ac17189ba..11eca1dd7cb 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
@@ -101,9 +101,9 @@ InstrumentEditorWidget::InstrumentEditorWidget(QWidget *parent)
);
connect(m_instrumentComponents,
- SIGNAL(extendedDetectorEditorRequest(DetectorItem *)),
+ SIGNAL(extendedDetectorEditorRequest(DetectorContainerItem *)),
this,
- SIGNAL(extendedDetectorEditorRequest(DetectorItem *))
+ SIGNAL(extendedDetectorEditorRequest(DetectorContainerItem *))
);
}
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
index 4f97785ee75..55e46fd04d4 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
@@ -29,7 +29,7 @@ class BeamEditorWidget;
class QLineEdit;
class QComboBox;
class InstrumentComponentsWidget;
-class DetectorItem;
+class DetectorContainerItem;
class BA_CORE_API_ InstrumentEditorWidget : public QWidget
{
@@ -42,7 +42,7 @@ public:
void setInstrumentItem(SessionItem *instrument);
signals:
- void extendedDetectorEditorRequest(DetectorItem *);
+ void extendedDetectorEditorRequest(DetectorContainerItem *);
public slots:
void onChangedEditor(const QString &);
diff --git a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
index 4fd8b726a8f..ae77f75c88f 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
@@ -24,7 +24,7 @@
#include <QVBoxLayout>
SphericalDetectorWidget::SphericalDetectorWidget(ColumnResizer *columnResizer,
- DetectorItem *detectorItem, QWidget *parent)
+ DetectorContainerItem *detectorItem, QWidget *parent)
: QWidget(parent)
, m_columnResizer(columnResizer)
, m_phiAxisEditor(0)
@@ -66,7 +66,7 @@ SphericalDetectorWidget::~SphericalDetectorWidget()
}
-void SphericalDetectorWidget::setDetectorItem(DetectorItem *detectorItem)
+void SphericalDetectorWidget::setDetectorItem(DetectorContainerItem *detectorItem)
{
m_phiAxisEditor->clearEditor();
m_alphaAxisEditor->clearEditor();
@@ -76,7 +76,7 @@ void SphericalDetectorWidget::setDetectorItem(DetectorItem *detectorItem)
return;
SphericalDetectorItem *sphericalDetector = dynamic_cast<SphericalDetectorItem *>(
- detectorItem->getGroupItem(DetectorItem::P_DETECTOR));
+ detectorItem->getGroupItem(DetectorContainerItem::P_DETECTOR));
Q_ASSERT(sphericalDetector);
SessionItem *phiAxisItem = sphericalDetector->getItem(SphericalDetectorItem::P_PHI_AXIS);
diff --git a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h
index 62c0a54b17e..4540820c95a 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h
@@ -20,7 +20,7 @@
#include "WinDllMacros.h"
#include <QWidget>
-class DetectorItem;
+class DetectorContainerItem;
class QGridLayout;
class ColumnResizer;
class ComponentBoxEditor;
@@ -32,10 +32,10 @@ class BA_CORE_API_ SphericalDetectorWidget : public QWidget
Q_OBJECT
public:
SphericalDetectorWidget(ColumnResizer *columnResizer,
- DetectorItem *detectorItem, QWidget *parent = 0);
+ DetectorContainerItem *detectorItem, QWidget *parent = 0);
virtual ~SphericalDetectorWidget();
- void setDetectorItem(DetectorItem *detectorItem);
+ void setDetectorItem(DetectorContainerItem *detectorItem);
public slots:
void onColumnResizerDestroyed(QObject *object);
diff --git a/Tests/UnitTests/GUI/TestMapperCases.h b/Tests/UnitTests/GUI/TestMapperCases.h
index cea39190e49..93ca347b3d9 100644
--- a/Tests/UnitTests/GUI/TestMapperCases.h
+++ b/Tests/UnitTests/GUI/TestMapperCases.h
@@ -51,8 +51,8 @@ inline void TestMapperCases::test_instrumentAlignmentPropertyVisibility()
InstrumentModel model;
SessionItem *instrument = model.insertNewItem(Constants::InstrumentType);
SessionItem *detector = model.insertNewItem(Constants::DetectorType, instrument->index());
- detector->setGroupProperty(DetectorItem::P_DETECTOR, Constants::RectangularDetectorType);
- SessionItem *rectangular = detector->getGroupItem(DetectorItem::P_DETECTOR);
+ detector->setGroupProperty(DetectorContainerItem::P_DETECTOR, Constants::RectangularDetectorType);
+ SessionItem *rectangular = detector->getGroupItem(DetectorContainerItem::P_DETECTOR);
ComboProperty alignment = rectangular->getItemValue(RectangularDetectorItem::P_ALIGNMENT)
@@ -74,12 +74,12 @@ inline void TestMapperCases::test_removeMaskOnDetectorChange()
InstrumentModel model;
SessionItem *instrument = model.insertNewItem(Constants::InstrumentType);
SessionItem *detector = model.insertNewItem(Constants::DetectorType, instrument->index());
- detector->setGroupProperty(DetectorItem::P_DETECTOR, Constants::RectangularDetectorType);
+ detector->setGroupProperty(DetectorContainerItem::P_DETECTOR, Constants::RectangularDetectorType);
model.insertNewItem(Constants::MaskContainerType, detector->index());
- QVERIFY(detector->getItems(DetectorItem::T_MASKS).size() == 1);
+ QVERIFY(detector->getItems(DetectorContainerItem::T_MASKS).size() == 1);
// after change the mask container should be removed
- detector->setGroupProperty(DetectorItem::P_DETECTOR, Constants::SphericalDetectorType);
- QVERIFY(detector->getItems(DetectorItem::T_MASKS).size() == 0);
+ detector->setGroupProperty(DetectorContainerItem::P_DETECTOR, Constants::SphericalDetectorType);
+ QVERIFY(detector->getItems(DetectorContainerItem::T_MASKS).size() == 0);
}
inline void TestMapperCases::test_SimulationOptionsComputationToggle()
--
GitLab