MapFindFeature: Center view on found objects

Add checkmark to center the view on the found object(s).

Author: dl3sdo

src/core/map.cpp

@@ -1114,6 +1114,10 @@ void Map::ensureVisibilityOfSelectedObjects(SelectionVisibility visibility)
 					widget->ensureVisibilityOfRect(rect, MapWidget::DiscreteZoom);
 				break;
 
+			case CenterFullVisibility:
+				widget->ensureVisibilityOfRect(rect, MapWidget::DiscreteZoom, true);
+				break;
+				
 			case IgnoreVisibilty:
 				break; // Do nothing
 

src/core/map.h

@@ -121,6 +121,7 @@ friend class XMLFileExporter;
 	{
 		FullVisibility,
 		PartialVisibility,
+		CenterFullVisibility,
 		IgnoreVisibilty
 	};
 

src/gui/map/map_find_feature.cpp

@@ -25,6 +25,7 @@
 
 #include <QAction>
 #include <QAbstractButton>
+#include <QCheckBox>
 #include <QContextMenuEvent>
 #include <QDialog>
 #include <QDialogButtonBox>
@@ -120,6 +121,9 @@ void MapFindFeature::showDialog()
 		connect(controller.getMap(), &Map::objectSelectionChanged, this, &MapFindFeature::objectSelectionChanged);
 		objectSelectionChanged();
 
+		center_view = new QCheckBox(tr("Center view"));
+		connect(center_view, &QCheckBox::stateChanged, this, &MapFindFeature::centerView);
+		
 		auto tags_button = new QPushButton(tr("Query editor"));
 		tags_button->setCheckable(true);
 
@@ -141,9 +145,10 @@ void MapFindFeature::showDialog()
 		layout->addWidget(find_all, 0, 1, 1, 1);
 		layout->addWidget(find_next, 1, 1, 1, 1);
 		layout->addWidget(delete_find_next, 2, 1, 1, 1);
-		layout->addWidget(tags_button, 4, 1, 1, 1);
-		layout->addWidget(tag_selector_buttons, 6, 1, 1, 1);
-		layout->addWidget(button_box, 7, 0, 1, 2);
+		layout->addWidget(center_view, 3, 1, 1, 1);
+		layout->addWidget(tags_button, 5, 1, 1, 1);
+		layout->addWidget(tag_selector_buttons, 7, 1, 1, 1);
+		layout->addWidget(button_box, 8, 0, 1, 2);
 
 		find_dialog->setLayout(layout);
 	}
@@ -230,7 +235,10 @@ void MapFindFeature::findNext()
 	if (next_object)
 		map->addObjectToSelection(next_object, false);
 	map->emitSelectionChanged();
-	map->ensureVisibilityOfSelectedObjects(Map::FullVisibility);
+	if (center_view->isChecked())
+		map->ensureVisibilityOfSelectedObjects(Map::CenterFullVisibility);
+	else
+		map->ensureVisibilityOfSelectedObjects(Map::FullVisibility);
 
 	if (!map->selectedObjects().empty())
 		controller.setEditTool();
@@ -271,7 +279,10 @@ void MapFindFeature::findAll()
 		map->addObjectToSelection(object, false);
 	}, search);
 	map->emitSelectionChanged();
-	map->ensureVisibilityOfSelectedObjects(Map::FullVisibility);
+	if (center_view->isChecked())
+		map->ensureVisibilityOfSelectedObjects(Map::CenterFullVisibility);
+	else
+		map->ensureVisibilityOfSelectedObjects(Map::FullVisibility);
 	controller.getWindow()->showStatusBarMessage(OpenOrienteering::TagSelectWidget::tr("%n object(s) selected", nullptr, map->getNumSelectedObjects()), 2000);
 
 	if (!map->selectedObjects().empty())
@@ -287,6 +298,18 @@ void MapFindFeature::objectSelectionChanged()
 }
 
 
+// slot
+void MapFindFeature::centerView()
+{
+	if (center_view->isChecked())
+	{
+		auto map = controller.getMap();
+		if (map->getNumSelectedObjects())
+			map->ensureVisibilityOfSelectedObjects(Map::CenterFullVisibility);
+	}
+}
+
+
 // slot
 void MapFindFeature::showHelp() const
 {

src/gui/map/map_find_feature.h

@@ -1,5 +1,6 @@
 /*
  *    Copyright 2017-2019, 2025 Kai Pastor
+ *    Copyright 2025 Matthias Kühlewein
  *
  *    This file is part of OpenOrienteering.
  *
@@ -27,6 +28,7 @@
 #include <QTextEdit>
 
 class QAction;
+class QCheckBox;
 class QContextMenuEvent;
 class QDialog;
 class QPushButton;
@@ -42,8 +44,8 @@ class TagSelectWidget;
 
 
 /**
- * The context menu (right click) is extended by the possibility to insert
- * one of the keywords (e.g., SYMBOL, AND...)
+ * The context menu (right click) is extended by the possibility
+ * to select and insert one of the keywords (e.g., SYMBOL, AND...)
  */
 class MapFindTextEdit : public QTextEdit
 {
@@ -88,6 +90,8 @@ private slots:
 
 	void objectSelectionChanged();
 
+	void centerView();
+	
 	void showHelp() const;
 
 	void tagSelectorToggled(bool active);
@@ -105,6 +109,7 @@ private slots:
 	TagSelectWidget* tag_selector = nullptr; // child of find_dialog
 	QWidget* tag_selector_buttons = nullptr; // child of find_dialog
 	QPushButton* delete_find_next = nullptr; // child of find_dialog
+	QCheckBox* center_view = nullptr;        // child of find_dialog
 	QAction* show_action = nullptr;          // child of this
 	QAction* find_next_action = nullptr;     // child of this
 

src/gui/map/map_widget.cpp

@@ -1,6 +1,6 @@
 /*
  *    Copyright 2012-2014 Thomas Schöps
- *    Copyright 2013-2020 Kai Pastor
+ *    Copyright 2013-2020, 2025 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -426,7 +426,7 @@ void MapWidget::moveMap(int steps_x, int steps_y)
 	}
 }
 
-void MapWidget::ensureVisibilityOfRect(QRectF map_rect, ZoomOption zoom_option)
+void MapWidget::ensureVisibilityOfRect(QRectF map_rect, ZoomOption zoom_option, bool center_view)
 {
 	// Amount in pixels that is scrolled "too much" if the rect is not completely visible
 	// TODO: change to absolute size using dpi value
@@ -436,7 +436,11 @@ void MapWidget::ensureVisibilityOfRect(QRectF map_rect, ZoomOption zoom_option)
 	// TODO: this method assumes that the viewport is not rotated.
 
 	if (rect().contains(viewport_rect.topLeft()) && rect().contains(viewport_rect.bottomRight()))
+	{
+		if (center_view)
+			view->setCenter(MapCoord{ map_rect.center() });
 		return;
+	}
 
 	auto offset = MapCoordF{ 0, 0 };
 
@@ -451,7 +455,12 @@ void MapWidget::ensureVisibilityOfRect(QRectF map_rect, ZoomOption zoom_option)
 		offset.ry() = view->pixelToLength(viewport_rect.bottom() - height() + pixel_border) / 1000.0;
 
 	if (!qIsNull(offset.lengthSquared()))
-		view->setCenter(view->center() + offset);
+	{
+		if (center_view)
+			view->setCenter(MapCoord{ map_rect.center() });
+		else
+			view->setCenter(view->center() + offset);
+	}
 
 	// If the rect is still not completely in view, we have to zoom out
 	viewport_rect = mapToViewport(map_rect).toAlignedRect();

src/gui/map/map_widget.h

@@ -1,6 +1,6 @@
 /*
  *    Copyright 2012-2014 Thomas Schöps
- *    Copyright 2013-2020 Kai Pastor
+ *    Copyright 2013-2020, 2025 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -214,7 +214,7 @@ friend class MapView;
 	/**
 	 * Adjusts the viewport so the given rect is inside the view.
 	 */
-	void ensureVisibilityOfRect(QRectF map_rect, ZoomOption zoom_option);  // clazy:exclude=function-args-by-ref
+	void ensureVisibilityOfRect(QRectF map_rect, ZoomOption zoom_option, bool center_view = false);  // clazy:exclude=function-args-by-ref
 
 	/**
 	 * Sets the view so the rect is centered and zooomed to fill the widget.
@@ -584,4 +584,4 @@ MapWidget::CoordsType MapWidget::getCoordsDisplay() const
 
 }  // namespace OpenOrienteering
 
-#endif
+#endif // OPENORIENTEERING_MAP_WIDGET_H