Skip to content
Snippets Groups Projects
Unverified Commit 1846a3f6 authored by Walter Van Herck's avatar Walter Van Herck Committed by GitHub
Browse files

Merge pull request #443 from gpospelov/hotfix

Fixed bug with axes range
parents d907a0d0 ba188380
No related branches found
No related tags found
No related merge requests found
......@@ -307,9 +307,6 @@ void IntensityDataItem::updateDataRange()
if (isZAxisLocked())
return;
if (getLowerZ() <= getUpperZ())
return;
computeDataRange();
}
......
......@@ -80,16 +80,11 @@ void JobItemUtils::setResults(IntensityDataItem* intensityItem, const Simulation
if (intensityItem->getOutputData() == nullptr) {
const IDetector* detector = simulation->getInstrument().getDetector();
setIntensityItemAxesUnits(intensityItem, detector);
auto selected_units = axesUnitsFromName(intensityItem->selectedAxesUnits());
updateAxesTitle(intensityItem);
std::unique_ptr<OutputData<double>> data(sim_result.data(selected_units));
intensityItem->setOutputData(data.release());
} else {
std::unique_ptr<OutputData<double>> data(sim_result.data());
intensityItem->setRawDataVector(data.get());
if (!intensityItem->isZAxisLocked())
intensityItem->computeDataRange();
}
auto selected_units = axesUnitsFromName(intensityItem->selectedAxesUnits());
std::unique_ptr<OutputData<double>> data(sim_result.data(selected_units));
intensityItem->setOutputData(data.release());
}
//! Updates axes of OutputData in IntensityData item to correspond with ::P_AXES_UNITS selection.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment