Commit 658ca9a0 authored by Hahn, Steven's avatar Hahn, Steven
Browse files

In Vates subdirectory replace .insert with .emplace.

parent 2a3da3fb
......@@ -62,8 +62,8 @@ void MDHWLoadingPresenter::transposeWs(Mantid::API::IMDHistoWorkspace_sptr &inHi
nonIntegratedDims.push_back(i);
}
}
std::vector<int> orderedDims;
orderedDims = nonIntegratedDims;
std::vector<int> orderedDims = nonIntegratedDims;
orderedDims.insert(orderedDims.end(), integratedDims.begin(),
integratedDims.end());
......
......@@ -195,14 +195,13 @@ SaveMDWorkspaceToVTKImpl::translateStringToVisualNormalization(
}
void SaveMDWorkspaceToVTKImpl::setupMembers() {
m_normalizations.insert(
std::make_pair("AutoSelect", VisualNormalization::AutoSelect));
m_normalizations.insert(
std::make_pair("NoNormalization", VisualNormalization::NoNormalization));
m_normalizations.insert(std::make_pair(
"NumEventsNormalization", VisualNormalization::NumEventsNormalization));
m_normalizations.insert(std::make_pair(
"VolumeNormalization", VisualNormalization::VolumeNormalization));
m_normalizations.emplace("AutoSelect", VisualNormalization::AutoSelect);
m_normalizations.emplace("NoNormalization",
VisualNormalization::NoNormalization);
m_normalizations.emplace("NumEventsNormalization",
VisualNormalization::NumEventsNormalization);
m_normalizations.emplace("VolumeNormalization",
VisualNormalization::VolumeNormalization);
m_thresholds.push_back("IgnoreZerosThresholdRange");
m_thresholds.push_back("NoThresholdRange");
......
......@@ -29,13 +29,6 @@ ModeControlWidget::ModeControlWidget(QWidget *parent) : QWidget(parent)
this, SLOT(onThreeSliceViewButtonClicked()));
QObject::connect(this->ui.splatterPlotButton, SIGNAL(clicked()),
this, SLOT(onSplatterPlotViewButtonClicked()));
// Add the mapping from string to the view enum
MantidQt::API::MdConstants mdConstants;
mapFromStringToView.insert(std::pair<QString, ModeControlWidget::Views>(mdConstants.getStandardView(), ModeControlWidget::STANDARD));
mapFromStringToView.insert(std::pair<QString, ModeControlWidget::Views>(mdConstants.getThreeSliceView(), ModeControlWidget::THREESLICE));
mapFromStringToView.insert(std::pair<QString, ModeControlWidget::Views>(mdConstants.getMultiSliceView(), ModeControlWidget::MULTISLICE));
mapFromStringToView.insert(std::pair<QString, ModeControlWidget::Views>(mdConstants.getSplatterPlotView(), ModeControlWidget::SPLATTERPLOT));
}
ModeControlWidget::~ModeControlWidget()
......
......@@ -396,11 +396,13 @@ namespace Mantid
inputWorkspace = m_rebinnedWorkspaceAndSourceToOriginalWorkspace[createKeyPairForSource(source)];
outputWorkspace = m_tempPrefix + inputWorkspace + algorithmType + m_tempPostfix;
// Keep track of the old rebinned workspace and source
m_newRebinnedWorkspacePairBuffer.insert(std::pair<std::string, std::pair<std::string, pqPipelineSource*>>(workspaceName, std::pair<std::string, pqPipelineSource*>(outputWorkspace, source)));
m_newRebinnedWorkspacePairBuffer.emplace(
workspaceName, std::make_pair(outputWorkspace, source));
}
}
// Record the workspaces
m_newWorkspacePairBuffer.insert(std::pair<std::string, std::pair<std::string, pqPipelineSource*>>(inputWorkspace, std::pair<std::string, pqPipelineSource*>(outputWorkspace, source)));
m_newWorkspacePairBuffer.emplace(
inputWorkspace, std::make_pair(outputWorkspace, source));
m_inputSource= source;
}
......
Supports Markdown
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