Skip to content
Snippets Groups Projects

Disambiguate class name vs object name; rename InterferenceFunction -> Interference

Merged Wuttke, Joachim requested to merge sb1 into develop
1 file
+ 2
2
Compare changes
  • Side-by-side
  • Inline
@@ -82,7 +82,7 @@ SessionItem* GUIDomainSampleVisitor::populateSampleModel(SampleModel* sampleMode
@@ -82,7 +82,7 @@ SessionItem* GUIDomainSampleVisitor::populateSampleModel(SampleModel* sampleMode
m_topSampleName = sample_name;
m_topSampleName = sample_name;
if (m_topSampleName.isEmpty())
if (m_topSampleName.isEmpty())
m_topSampleName = sample.className().c_str();
m_topSampleName = sample.sampleName().c_str();
for (const auto& [child, depth, parent] : NodeUtils::progenyPlus(&sample)) {
for (const auto& [child, depth, parent] : NodeUtils::progenyPlus(&sample)) {
setDepth(depth + 1);
setDepth(depth + 1);
@@ -129,7 +129,7 @@ void GUIDomainSampleVisitor::visit(const Layer* sample)
@@ -129,7 +129,7 @@ void GUIDomainSampleVisitor::visit(const Layer* sample)
void GUIDomainSampleVisitor::visit(const MultiLayer* sample)
void GUIDomainSampleVisitor::visit(const MultiLayer* sample)
{
{
auto multilayer_item = m_sampleModel->insertItem<MultiLayerItem>();
auto multilayer_item = m_sampleModel->insertItem<MultiLayerItem>();
multilayer_item->setItemName(sample->className().c_str());
multilayer_item->setItemName(sample->sampleName().c_str());
multilayer_item->setCrossCorrLength(sample->crossCorrLength());
multilayer_item->setCrossCorrLength(sample->crossCorrLength());
multilayer_item->setExternalField(sample->externalField());
multilayer_item->setExternalField(sample->externalField());
m_levelToParentItem[depth()] = multilayer_item;
m_levelToParentItem[depth()] = multilayer_item;
Loading