From 1d789a7972ea198ffbe599648d0009db8ba8e0d9 Mon Sep 17 00:00:00 2001 From: tritao Date: Wed, 15 Jan 2025 13:39:43 +0000 Subject: [PATCH] Gui: Rename `SoFCHighlightAction` to preselect terminology. --- src/Gui/Selection/SoFCSelectionAction.cpp | 48 +++++++++++----------- src/Gui/Selection/SoFCSelectionAction.h | 12 +++--- src/Gui/Selection/SoFCUnifiedSelection.cpp | 16 ++++---- src/Gui/SoFCDB.cpp | 8 ++-- src/Gui/View3DInventorViewer.cpp | 8 ++-- 5 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/Gui/Selection/SoFCSelectionAction.cpp b/src/Gui/Selection/SoFCSelectionAction.cpp index 55f4f06067..6d66687b5e 100644 --- a/src/Gui/Selection/SoFCSelectionAction.cpp +++ b/src/Gui/Selection/SoFCSelectionAction.cpp @@ -69,7 +69,7 @@ using namespace Gui; -SO_ACTION_SOURCE(SoFCHighlightAction) +SO_ACTION_SOURCE(SoFCPreselectionAction) /** * The order of the defined SO_ACTION_ADD_METHOD statements is very important. First the base @@ -79,28 +79,28 @@ SO_ACTION_SOURCE(SoFCHighlightAction) * This means that \c SoSwitch must be listed after \c SoGroup and \c SoFCSelection after * \c SoSeparator because both classes inherits the others. */ -void SoFCHighlightAction::initClass() +void SoFCPreselectionAction::initClass() { - SO_ACTION_INIT_CLASS(SoFCHighlightAction,SoAction); + SO_ACTION_INIT_CLASS(SoFCPreselectionAction,SoAction); - SO_ENABLE(SoFCHighlightAction, SoSwitchElement); + SO_ENABLE(SoFCPreselectionAction, SoSwitchElement); SO_ACTION_ADD_METHOD(SoNode,nullAction); - SO_ENABLE(SoFCHighlightAction, SoModelMatrixElement); - SO_ENABLE(SoFCHighlightAction, SoShapeStyleElement); - SO_ENABLE(SoFCHighlightAction, SoComplexityElement); - SO_ENABLE(SoFCHighlightAction, SoComplexityTypeElement); - SO_ENABLE(SoFCHighlightAction, SoCoordinateElement); - SO_ENABLE(SoFCHighlightAction, SoFontNameElement); - SO_ENABLE(SoFCHighlightAction, SoFontSizeElement); - SO_ENABLE(SoFCHighlightAction, SoProfileCoordinateElement); - SO_ENABLE(SoFCHighlightAction, SoProfileElement); - SO_ENABLE(SoFCHighlightAction, SoSwitchElement); - SO_ENABLE(SoFCHighlightAction, SoUnitsElement); - SO_ENABLE(SoFCHighlightAction, SoViewVolumeElement); - SO_ENABLE(SoFCHighlightAction, SoViewingMatrixElement); - SO_ENABLE(SoFCHighlightAction, SoViewportRegionElement); + SO_ENABLE(SoFCPreselectionAction, SoModelMatrixElement); + SO_ENABLE(SoFCPreselectionAction, SoShapeStyleElement); + SO_ENABLE(SoFCPreselectionAction, SoComplexityElement); + SO_ENABLE(SoFCPreselectionAction, SoComplexityTypeElement); + SO_ENABLE(SoFCPreselectionAction, SoCoordinateElement); + SO_ENABLE(SoFCPreselectionAction, SoFontNameElement); + SO_ENABLE(SoFCPreselectionAction, SoFontSizeElement); + SO_ENABLE(SoFCPreselectionAction, SoProfileCoordinateElement); + SO_ENABLE(SoFCPreselectionAction, SoProfileElement); + SO_ENABLE(SoFCPreselectionAction, SoSwitchElement); + SO_ENABLE(SoFCPreselectionAction, SoUnitsElement); + SO_ENABLE(SoFCPreselectionAction, SoViewVolumeElement); + SO_ENABLE(SoFCPreselectionAction, SoViewingMatrixElement); + SO_ENABLE(SoFCPreselectionAction, SoViewportRegionElement); @@ -125,28 +125,28 @@ void SoFCHighlightAction::initClass() SO_ACTION_ADD_METHOD(SoPointSet,callDoAction); } -void SoFCHighlightAction::finish() +void SoFCPreselectionAction::finish() { atexit_cleanup(); } -SoFCHighlightAction::SoFCHighlightAction (const SelectionChanges &SelCh) +SoFCPreselectionAction::SoFCPreselectionAction (const SelectionChanges &SelCh) :SelChange(SelCh) { - SO_ACTION_CONSTRUCTOR(SoFCHighlightAction); + SO_ACTION_CONSTRUCTOR(SoFCPreselectionAction); } -SoFCHighlightAction::~SoFCHighlightAction() = default; +SoFCPreselectionAction::~SoFCPreselectionAction() = default; -void SoFCHighlightAction::beginTraversal(SoNode *node) +void SoFCPreselectionAction::beginTraversal(SoNode *node) { traverse(node); } -void SoFCHighlightAction::callDoAction(SoAction *action,SoNode *node) +void SoFCPreselectionAction::callDoAction(SoAction *action,SoNode *node) { node->doAction(action); } diff --git a/src/Gui/Selection/SoFCSelectionAction.h b/src/Gui/Selection/SoFCSelectionAction.h index c3e36e0c06..f1c3191056 100644 --- a/src/Gui/Selection/SoFCSelectionAction.h +++ b/src/Gui/Selection/SoFCSelectionAction.h @@ -38,17 +38,17 @@ namespace Gui { class SelectionChanges; /** - * The SoFCHighlightAction class is used to inform an SoFCSelection node - * whether an object gets highlighted. + * The SoFCPreselectionAction class is used to inform an SoFCSelection node + * whether an object gets preselected. * @author Jürgen Riegel */ -class GuiExport SoFCHighlightAction : public SoAction +class GuiExport SoFCPreselectionAction : public SoAction { - SO_ACTION_HEADER(SoFCHighlightAction); + SO_ACTION_HEADER(SoFCPreselectionAction); public: - SoFCHighlightAction (const SelectionChanges &SelCh); - ~SoFCHighlightAction() override; + SoFCPreselectionAction (const SelectionChanges &SelCh); + ~SoFCPreselectionAction() override; static void initClass(); static void finish(); diff --git a/src/Gui/Selection/SoFCUnifiedSelection.cpp b/src/Gui/Selection/SoFCUnifiedSelection.cpp index 2be6b29bd4..79460ba148 100644 --- a/src/Gui/Selection/SoFCUnifiedSelection.cpp +++ b/src/Gui/Selection/SoFCUnifiedSelection.cpp @@ -342,10 +342,10 @@ void SoFCUnifiedSelection::doAction(SoAction *action) this->colorHighlight = highlightColorAction->highlightColor; } - if (action->getTypeId() == SoFCHighlightAction::getClassTypeId()) { - auto highlightAction = static_cast(action); - // Do not clear currently highlighted object when setting new pre-selection - if (!setPreSelection && highlightAction->SelChange.Type == SelectionChanges::RmvPreselect) { + if (action->getTypeId() == SoFCPreselectionAction::getClassTypeId()) { + auto preselectAction = static_cast(action); + // Do not clear currently preselected object when setting new pre-selection + if (!setPreSelection && preselectAction->SelChange.Type == SelectionChanges::RmvPreselect) { if (currentHighlightPath) { SoHighlightElementAction highlightAction; highlightAction.apply(currentHighlightPath); @@ -354,7 +354,7 @@ void SoFCUnifiedSelection::doAction(SoAction *action) } } else if (preselectionMode.getValue() != OFF - && highlightAction->SelChange.Type == SelectionChanges::SetPreselect) { + && preselectAction->SelChange.Type == SelectionChanges::SetPreselect) { if (currentHighlightPath) { SoHighlightElementAction highlightAction; highlightAction.apply(currentHighlightPath); @@ -362,10 +362,10 @@ void SoFCUnifiedSelection::doAction(SoAction *action) currentHighlightPath = nullptr; } - App::Document* doc = App::GetApplication().getDocument(highlightAction->SelChange.pDocName); - App::DocumentObject* obj = doc->getObject(highlightAction->SelChange.pObjectName); + App::Document* doc = App::GetApplication().getDocument(preselectAction->SelChange.pDocName); + App::DocumentObject* obj = doc->getObject(preselectAction->SelChange.pObjectName); ViewProvider*vp = Application::Instance->getViewProvider(obj); - SoDetail* detail = vp->getDetail(highlightAction->SelChange.pSubName); + SoDetail* detail = vp->getDetail(preselectAction->SelChange.pSubName); SoHighlightElementAction highlightAction; highlightAction.setHighlighted(true); diff --git a/src/Gui/SoFCDB.cpp b/src/Gui/SoFCDB.cpp index d762615c11..43b18b56b1 100644 --- a/src/Gui/SoFCDB.cpp +++ b/src/Gui/SoFCDB.cpp @@ -107,13 +107,13 @@ void Gui::SoFCDB::init() SoFCBoundingBox ::initClass(); SoFCSelection ::initClass(); SoFCUnifiedSelection ::initClass(); - SoFCHighlightAction ::initClass(); + SoFCPreselectionAction ::initClass(); SoFCSelectionAction ::initClass(); SoFCDocumentAction ::initClass(); SoGLWidgetNode ::initClass(); SoGLVBOActivatedElement ::initClass(); SoFCEnableSelectionAction ::initClass(); - SoFCEnableHighlightAction ::initClass(); + SoFCEnablePreselectionAction ::initClass(); SoFCSelectionColorAction ::initClass(); SoFCHighlightColorAction ::initClass(); SoFCDocumentObjectAction ::initClass(); @@ -226,12 +226,12 @@ void Gui::SoFCDB::finish() SoFCBackgroundGradient ::finish(); SoFCBoundingBox ::finish(); SoFCSelection ::finish(); - SoFCHighlightAction ::finish(); + SoFCPreselectionAction ::finish(); SoFCSelectionAction ::finish(); SoFCDocumentAction ::finish(); SoFCDocumentObjectAction ::finish(); SoFCEnableSelectionAction ::finish(); - SoFCEnableHighlightAction ::finish(); + SoFCEnablePreselectionAction ::finish(); SoFCSelectionColorAction ::finish(); SoUpdateVBOAction ::finish(); SoFCHighlightColorAction ::finish(); diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp index 9f677de628..13ec6525af 100644 --- a/src/Gui/View3DInventorViewer.cpp +++ b/src/Gui/View3DInventorViewer.cpp @@ -794,11 +794,11 @@ void View3DInventorViewer::onSelectionChanged(const SelectionChanges & reason) { //Hint: do not create a tmp. instance of SelectionChanges SelectionChanges selChanges(SelectionChanges::RmvPreselect); - SoFCHighlightAction cAct(selChanges); - cAct.apply(pcViewProviderRoot); + SoFCPreselectionAction preselectionAction(selChanges); + preselectionAction.apply(pcViewProviderRoot); } else { - SoFCSelectionAction cAct(Reason); - cAct.apply(pcViewProviderRoot); + SoFCSelectionAction selectionAction(Reason); + selectionAction.apply(pcViewProviderRoot); } } /// @endcond