Skip to content

Commit 33c5b6b

Browse files
committed
Remove point size restriction
1 parent 2410be6 commit 33c5b6b

File tree

1 file changed

+5
-19
lines changed

1 file changed

+5
-19
lines changed

src/DatasetsAction.cpp

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -172,17 +172,10 @@ void DatasetsAction::setupPointSizeDatasetPickerAction(ScatterplotPlugin* scatte
172172
auto& pointSizeAction = pointPlotAction.getSizeAction();
173173

174174
_pointSizeDatasetPickerAction.setFilterFunction([this, scatterplotPlugin](mv::Dataset<DatasetImpl> dataset) -> bool {
175-
if (dataset->getDataType() != PointType)
175+
if (!scatterplotPlugin->getPositionDataset().isValid())
176176
return false;
177177

178-
const auto positionDataset = scatterplotPlugin->getPositionDataset();
179-
180-
if (!positionDataset.isValid())
181-
return false;
182-
183-
const mv::Dataset<Points> candidatePoints(dataset);
184-
185-
if (candidatePoints->getNumPoints() != positionDataset->getNumPoints())
178+
if (dataset->getDataType() != PointType)
186179
return false;
187180

188181
return true;
@@ -219,19 +212,12 @@ void DatasetsAction::setupPointOpacityDatasetPickerAction(ScatterplotPlugin* sca
219212
auto& pointOpacityAction = pointPlotAction.getOpacityAction();
220213

221214
_pointOpacityDatasetPickerAction.setFilterFunction([this, scatterplotPlugin](mv::Dataset<DatasetImpl> dataset) -> bool {
222-
if (dataset->getDataType() != PointType)
223-
return false;
224-
225-
const auto positionDataset = scatterplotPlugin->getPositionDataset();
226-
227-
if (!positionDataset.isValid())
215+
if (!scatterplotPlugin->getPositionDataset().isValid())
228216
return false;
229217

230-
const mv::Dataset<Points> candidatePoints(dataset);
231-
232-
if (candidatePoints->getNumPoints() != positionDataset->getNumPoints())
218+
if (dataset->getDataType() != PointType)
233219
return false;
234-
220+
235221
return true;
236222
});
237223

0 commit comments

Comments
 (0)