Skip to content

MapFindFeature: Exclude hidden and protected objects #2371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
May 17, 2025
Merged

MapFindFeature: Exclude hidden and protected objects #2371

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a8195c6
MapFindFeature: Exclude hidden and protected objects
dl3sdo Apr 27, 2025
8c6c8f0
Factor out isSelectable()
dg0yt May 12, 2025
1e1ca1c
Revert new search functor
dg0yt May 12, 2025
116b343
Use single walk for "Find next"
dg0yt May 12, 2025
34a1c2d
Cleanup
dg0yt May 12, 2025
71d742c
Fixup
dg0yt May 12, 2025
1122a73
Fix passing of query
dl3sdo May 12, 2025
fb09aa0
Search pivot object in all objects
dg0yt May 13, 2025
b0dcb5a
Code polishing
dl3sdo May 13, 2025
1bf23da
Add test
dl3sdo May 13, 2025
b401a03
Move and revise testFindFeatures
dg0yt May 14, 2025
b223b89
Partially revert polishing
dg0yt May 14, 2025
5b11077
Refactoring, cont.
dg0yt May 14, 2025
e6b874c
Refactoring, oversight and cont.
dg0yt May 14, 2025
332f4ad
Move error message to makeQuery()
dg0yt May 14, 2025
b9cf6b3
Restore clearing the selection on error
dg0yt May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/gui/map/map_find_feature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2017-2024 Kai Pastor
* Copyright 2017-2020, 2024, 2025 Kai Pastor
*
* This file is part of OpenOrienteering.
*
Expand Down Expand Up @@ -35,7 +35,9 @@

#include "core/map.h"
#include "core/map_part.h"
#include "core/objects/object.h"
#include "core/objects/object_query.h"
#include "core/symbols/symbol.h"
#include "gui/main_window.h"
#include "gui/util_gui.h"
#include "gui/map/map_editor.h"
Expand Down Expand Up @@ -193,9 +195,11 @@ void MapFindFeature::findNext()
if (object == first_object)
first_object = nullptr;
}
else if (query(object))
else
{
next_object = object;
const auto* object_symbol = object->getSymbol();
if (!object_symbol->isProtected() && !object_symbol->isHidden() && query(object))
next_object = object;
}
}
};
Expand Down Expand Up @@ -231,10 +235,13 @@ void MapFindFeature::findAll()
controller.getWindow()->showStatusBarMessage(OpenOrienteering::TagSelectWidget::tr("Invalid query"), 2000);
return;
}

auto search = [&query](const Object* object) {
const auto* object_symbol = object->getSymbol();
return !object_symbol->isProtected() && !object_symbol->isHidden() && query(object);
};
map->getCurrentPart()->applyOnMatchingObjects([map](Object* object) {
map->addObjectToSelection(object, false);
}, std::cref(query));
}, search);
map->emitSelectionChanged();
map->ensureVisibilityOfSelectedObjects(Map::FullVisibility);
controller.getWindow()->showStatusBarMessage(OpenOrienteering::TagSelectWidget::tr("%n object(s) selected", nullptr, map->getNumSelectedObjects()), 2000);
Expand Down