Skip to content

Commit de2722f

Browse files
committed
removes homemade shielding during de-serialization
removes the homemade ‘_restoringState’ bool in favor of `mv::projects().isOpeningProject()`. Bracing `fromVariantMap` with the class bool would break when `fromVariantMap` encounters errors.
1 parent 6f7848c commit de2722f

2 files changed

Lines changed: 3 additions & 9 deletions

File tree

src/ColoringAction.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ ColoringAction::ColoringAction(QObject* parent, const QString& title) :
105105
_dimensionAction3.setPointsDataset(_currentColorPointsDataset);
106106

107107
// Auto-select the color space for datasets with exactly two or three channels
108-
if (!_restoringState) {
108+
if (!mv::projects().isOpeningProject()) {
109109
const auto numDimensions = static_cast<std::int32_t>(_currentColorPointsDataset->getNumDimensions());
110110

111111
if (numDimensions == 2) {
@@ -183,7 +183,7 @@ ColoringAction::ColoringAction(QObject* parent, const QString& title) :
183183
});
184184

185185
connect(&_colorSpaceAction, &OptionAction::currentIndexChanged, this, [this](const std::int32_t& currentIndex) {
186-
if (!_restoringState)
186+
if (!mv::projects().isOpeningProject())
187187
applyDefaultChannels();
188188

189189
updateChannelActionsReadOnly();
@@ -561,9 +561,6 @@ void ColoringAction::disconnectFromPublicAction(bool recursive)
561561

562562
void ColoringAction::fromVariantMap(const QVariantMap& variantMap)
563563
{
564-
// Suppress auto color-space selection and default channels so the saved values are honored
565-
_restoringState = true;
566-
567564
GroupAction::fromVariantMap(variantMap);
568565

569566
// Restore the color source first so the dimension pickers are targeted at the right dataset,
@@ -577,8 +574,6 @@ void ColoringAction::fromVariantMap(const QVariantMap& variantMap)
577574
_colorMap1DAction.fromParentVariantMap(variantMap);
578575
_colorMap2DAction.fromParentVariantMap(variantMap);
579576

580-
_restoringState = false;
581-
582577
// Apply the fully-restored coloring state
583578
updateChannelActionsReadOnly();
584579
updateScatterPlotWidgetColors();

src/ColoringAction.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ class ColoringAction : public VerticalGroupAction
147147
ColorMap1DAction _colorMap1DAction; /** One-dimensional color map action */
148148
ColorMap2DAction _colorMap2DAction; /** Two-dimensional color map action */
149149
Dataset<Points> _currentColorPointsDataset; /** Current color dataset */
150-
bool _restoringState = false; /** Guards auto color-space selection and default channels during state restore */
151150

152151
/** Default constant color */
153152
static const QColor DEFAULT_CONSTANT_COLOR;
@@ -158,4 +157,4 @@ class ColoringAction : public VerticalGroupAction
158157

159158
Q_DECLARE_METATYPE(ColoringAction)
160159

161-
inline const auto coloringActionMetaTypeId = qRegisterMetaType<ColoringAction*>("ColoringAction");
160+
inline const auto coloringActionMetaTypeId = qRegisterMetaType<ColoringAction*>("ColoringAction");

0 commit comments

Comments
 (0)