@@ -127,24 +127,29 @@ ColoringAction::ColoringAction(QObject* parent, const QString& title) :
127127 connect (&_scatterplotPlugin->getPositionDataset (), &Dataset<Points>::childAdded, this , &ColoringAction::updateColorByActionOptions);
128128 connect (&_scatterplotPlugin->getPositionDataset (), &Dataset<Points>::childRemoved, this , &ColoringAction::updateColorByActionOptions);
129129
130- connect (&_scatterplotPlugin->getScatterplotWidget (), &ScatterplotWidget::renderModeChanged, this , &ColoringAction::updateScatterPlotWidgetColors);
131- connect (&_scatterplotPlugin->getScatterplotWidget (), &ScatterplotWidget::coloringModeChanged, this , &ColoringAction::updateScatterPlotWidgetColors);
130+ connect (&_scatterplotPlugin->getScatterplotWidget (), &ScatterplotWidget::coloringModeChanged, this , [this ](const ScatterplotWidget::ColoringMode& coloringMode) {
131+ updateScatterPlotWidgetColors ();
132+ updateColorMapActionsReadOnly ();
133+ });
134+
135+ connect (&_scatterplotPlugin->getScatterplotWidget (), &ScatterplotWidget::renderModeChanged, this , [this ](const ScatterplotWidget::RenderMode& renderMode) {
136+ updateScatterPlotWidgetColors ();
137+ updateColorMapActionsReadOnly ();
138+ });
132139
133- connect (&_dimensionAction, &DimensionPickerAction::currentDimensionIndexChanged, this , &ColoringAction::updateScatterPlotWidgetColors);
134- connect (&_dimensionAction, &DimensionPickerAction::currentDimensionIndexChanged, this , &ColoringAction::updateColorMapActionScalarRange);
140+ connect (&_dimensionAction, &DimensionPickerAction::currentDimensionIndexChanged, this , [this ](const int32_t & currentDimensionIndex) {
141+ updateScatterPlotWidgetColors ();
142+ updateColorMapActionsReadOnly ();
143+ updateColorMapActionScalarRange ();
144+ });
135145
136146 connect (&_constantColorAction, &ColorAction::colorChanged, this , &ColoringAction::updateScatterplotWidgetColorMap);
137147 connect (&_colorMap1DAction, &ColorMapAction::imageChanged, this , &ColoringAction::updateScatterplotWidgetColorMap);
138148 connect (&_colorMap2DAction, &ColorMapAction::imageChanged, this , &ColoringAction::updateScatterplotWidgetColorMap);
139- connect (&_scatterplotPlugin->getScatterplotWidget (), &ScatterplotWidget::coloringModeChanged, this , &ColoringAction::updateScatterplotWidgetColorMap);
140- connect (&_scatterplotPlugin->getScatterplotWidget (), &ScatterplotWidget::renderModeChanged, this , &ColoringAction::updateScatterplotWidgetColorMap);
141149
142150 connect (&_colorMap1DAction.getRangeAction (ColorMapAction::Axis::X), &DecimalRangeAction::rangeChanged, this , &ColoringAction::updateScatterPlotWidgetColorMapRange);
143151 connect (&_colorMap2DAction.getRangeAction (ColorMapAction::Axis::X), &DecimalRangeAction::rangeChanged, this , &ColoringAction::updateScatterPlotWidgetColorMapRange);
144152
145- connect (&_scatterplotPlugin->getScatterplotWidget (), &ScatterplotWidget::coloringModeChanged, this , &ColoringAction::updateColorMapActionsReadOnly);
146- connect (&_scatterplotPlugin->getScatterplotWidget (), &ScatterplotWidget::renderModeChanged, this , &ColoringAction::updateColorMapActionsReadOnly);
147-
148153 const auto updateReadOnly = [this ]() {
149154 setEnabled (_scatterplotPlugin->getPositionDataset ().isValid () && _scatterplotPlugin->getScatterplotWidget ().getRenderMode () == ScatterplotWidget::SCATTERPLOT);
150155 };
0 commit comments