Skip to content

Commit 6b5681a

Browse files
committed
Delay check
1 parent eb1ab5a commit 6b5681a

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

src/ScatterplotPlugin.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -743,8 +743,6 @@ void ScatterplotPlugin::loadColors(const Dataset<Points>& pointsColor, const std
743743
/*then*/ _positionSourceDataset->getFullDataset<Points>()->getNumPoints() == numColorPoints :
744744
/*else*/ false;
745745

746-
const auto validSelectionMapping = getSelectionMapping(pointsColor, _positionDataset);
747-
748746
if (hasSameNumPointsAsFull) {
749747
std::vector<std::uint32_t> globalIndices;
750748
_positionDataset->getGlobalIndices(globalIndices);
@@ -756,12 +754,16 @@ void ScatterplotPlugin::loadColors(const Dataset<Points>& pointsColor, const std
756754
localScalars[localColorIndex++] = scalars[globalIndex];
757755

758756
std::swap(localScalars, scalars);
759-
}
760-
else if (validSelectionMapping.has_value() && validSelectionMapping.value() != nullptr) {
757+
}
758+
else if ( // only get map if derived check failed
759+
const auto selectionMapping = getSelectionMapping(pointsColor, _positionDataset);
760+
/* check if valid */ selectionMapping.has_value() && selectionMapping.value() != nullptr
761+
)
762+
{
761763
std::vector<float> localScalars(_numPoints, 0);
762764

763765
// Map values like selection
764-
const mv::SelectionMap::Map& linkedMap = validSelectionMapping.value()->getMapping().getMap();
766+
const mv::SelectionMap::Map& linkedMap = selectionMapping.value()->getMapping().getMap();
765767
const std::uint32_t numPointsInTarget = _positionDataset->getNumPoints();
766768

767769
for (const auto& [fromID, vecOfIDs] : linkedMap) {

0 commit comments

Comments
 (0)