diff --git a/GUI/Model/Data/MaskEditorFlags.h b/GUI/Model/Data/MaskEditorFlags.h index 174ee7c6398834a132682a96fa90ed231af3dc3b..1eee998a4002afb2d4b33bff31f8797224e778a9 100644 --- a/GUI/Model/Data/MaskEditorFlags.h +++ b/GUI/Model/Data/MaskEditorFlags.h @@ -40,14 +40,10 @@ public: enum EMaskValue { MASK_OFF, MASK_ON }; Q_DECLARE_FLAGS(MaskValue, EMaskValue) - - enum EPresentationType { MASK_EDITOR, MASK_PRESENTER }; - Q_DECLARE_FLAGS(PresentationType, EPresentationType) }; Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::Activity) Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::Stacking) Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::MaskValue) -Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::PresentationType) #endif // BORNAGAIN_GUI_MODEL_DATA_MASKEDITORFLAGS_H diff --git a/GUI/View/Mask/MaskEditorCanvas.cpp b/GUI/View/Mask/MaskEditorCanvas.cpp index b2a6acd569a583dfe2295ffa31286fd370e2afae..6a345b767825eba9252761a9ddc9684617d23fff 100644 --- a/GUI/View/Mask/MaskEditorCanvas.cpp +++ b/GUI/View/Mask/MaskEditorCanvas.cpp @@ -76,16 +76,14 @@ MaskGraphicsScene* MaskEditorCanvas::getScene() return m_scene; } -void MaskEditorCanvas::onPresentationChange(MaskEditorFlags::PresentationType presentationType) +void MaskEditorCanvas::onPresentationChange(bool pixelized) { m_scene->clearSelection(); // important to avoid crash (unsubscribe while calling subscribers) - m_resultsPresenter->updatePresenter(presentationType != MaskEditorFlags::MASK_EDITOR); + m_resultsPresenter->updatePresenter(pixelized); - if (auto* container = m_data2DItem->maskContainerItem()) { - bool tempVisible = presentationType == MaskEditorFlags::MASK_EDITOR; + if (auto* container = m_data2DItem->maskContainerItem()) for (MaskItem* mask : container->maskItems()) - mask->setIsVisible(tempVisible && mask->wasVisible()); - } + mask->setIsVisible(!pixelized && mask->wasVisible()); } //! Saves plot into project directory. diff --git a/GUI/View/Mask/MaskEditorCanvas.h b/GUI/View/Mask/MaskEditorCanvas.h index 1565a0f79448d7a38d0c269bc6750a19d0574123..76f9533950cfb3c22b08711db0b8c0b6bead4e26 100644 --- a/GUI/View/Mask/MaskEditorCanvas.h +++ b/GUI/View/Mask/MaskEditorCanvas.h @@ -46,7 +46,7 @@ signals: void deleteSelectedRequest(); public slots: - void onPresentationChange(MaskEditorFlags::PresentationType presentationType); + void onPresentationChange(bool pixelized); void onSavePlotRequest(); void onResetViewRequest(); diff --git a/GUI/View/Mask/MaskEditorToolbar.cpp b/GUI/View/Mask/MaskEditorToolbar.cpp index 182e78a9779a27e56ec6f29122e4acb8dfa663ab..9bb56e84b31fd015163106b4093d7cb05a05d5d6 100644 --- a/GUI/View/Mask/MaskEditorToolbar.cpp +++ b/GUI/View/Mask/MaskEditorToolbar.cpp @@ -154,9 +154,9 @@ MaskEditorToolbar::MaskEditorToolbar(MaskEditorActions* editorActions, QWidget* addWidget(presentationButton); connect(presentationButton, &QToolButton::pressed, - [this]() { emit presentationTypeRequest(MaskEditorFlags::MASK_PRESENTER); }); + [this]() { emit presentationTypeRequest(true); }); connect(presentationButton, &QToolButton::released, - [this]() { emit presentationTypeRequest(MaskEditorFlags::MASK_EDITOR); }); + [this]() { emit presentationTypeRequest(false); }); auto* propertyPanelButton = new QToolButton(this); propertyPanelButton->setIcon(QIcon(":/Mask/images/maskeditor_toolpanel.svg")); diff --git a/GUI/View/Mask/MaskEditorToolbar.h b/GUI/View/Mask/MaskEditorToolbar.h index a7fa65e33c3a29ea3e32b4dd7c9716578aa3423b..827688f0508d7fb349947f0c09cdbee3cd047dc7 100644 --- a/GUI/View/Mask/MaskEditorToolbar.h +++ b/GUI/View/Mask/MaskEditorToolbar.h @@ -30,7 +30,7 @@ public: signals: void activityModeChanged(MaskEditorFlags::Activity); - void presentationTypeRequest(MaskEditorFlags::PresentationType); + void presentationTypeRequest(bool); void maskValueChanged(MaskEditorFlags::MaskValue); public slots: