Commit e30a65fc authored by ics's avatar ics

correct error merge ploty2

parent 17d4262f
......@@ -343,9 +343,9 @@ void InelasticScan::updateScanValue(int32 index) {
/*
* updateScanResult
*/
void InelasticScan::updateScanResult() {
void InelasticScan::updateScanResult(int32 index) {
if (isStarted() == true) {
if (m_Scan->optimization1dResultFound() == true) {
if ((index == 0) && (m_Scan->optimization1dResultFound.get(index) == true)) {
vector<float64> results = m_Scan->getOptimizationResults();
if (results.size() > 0) {
ControllerPtr<dif::SingleCrystalHKL>& hkl = m_Setting->getHKLControllerPtr();
......
......@@ -150,7 +150,7 @@ private:
void updatePlotFit();
void updateProgression();
void updateScanValue(int32 index);
void updateScanResult();
void updateScanResult(int32 index);
/*!
* \brief Format std::string from value (h, k, l)
......
Markdown is supported
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