From 37e0685314ade24164abe7788acf32daee704d87 Mon Sep 17 00:00:00 2001 From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de> Date: Thu, 14 Dec 2023 12:47:57 +0100 Subject: [PATCH] reorder --- GUI/Model/Job/JobItem.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp index 01ed04aa824..23f593d254c 100644 --- a/GUI/Model/Job/JobItem.cpp +++ b/GUI/Model/Job/JobItem.cpp @@ -350,20 +350,16 @@ void JobItem::importMasksFromDatafileItem() void JobItem::convertMaskCoords() { // TODO add projections - const MaskContainerItem* container = m_realItem->data2DItem()->maskContainerItem(); - if (!container) - return; - const Datafield* dfield = m_realItem->data2DItem()->c_field(); ASSERT(dfield); - MaskUnitsConverter mask_converter(dfield->frame()); // Masks conversion can be done in two steps: first from original coords to bins, // then from bins to target coords. // If 'IDetector::addBinMask' is used by detector, only "orig coords --> bins" is needed. - for (auto* maskItem : container->maskItems()) - mask_converter.convertToNbins(maskItem); + if (const auto* container = m_realItem->data2DItem()->maskContainerItem()) + for (auto* maskItem : container->maskItems()) + mask_converter.convertToNbins(maskItem); } //! Crops DatafileItem to the region of interest. -- GitLab