Closes #1959

Author: dl3sdo

src/core/map.cpp

@@ -1,6 +1,6 @@
 /*
  *    Copyright 2012-2014 Thomas Schöps
- *    Copyright 2013-2020 Kai Pastor
+ *    Copyright 2013-2021 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -475,7 +475,7 @@ void Map::init()
 {
 	color_set = new MapColorSet();
 
-	parts.push_back(new MapPart(tr("default part"), this));
+	parts.push_back(new MapPart(tr("default part"), this, 100));
 
 	widgets.clear();
 
@@ -744,7 +744,7 @@ QHash<const Symbol*, Symbol*> Map::importMap(
 					if (!dest_part)
 					{
 						// Import as new part
-						dest_part = new MapPart(part_to_import->getName(), this);
+						dest_part = new MapPart(part_to_import->getName(), this, part_to_import->getVisibility());
 						addPart(dest_part, 0);
 						undo_step->push(new MapPartUndoStep(this, MapPartUndoStep::RemoveMapPart, 0));
 					}
@@ -2284,7 +2284,10 @@ void Map::applyOnMatchingObjects(const std::function<void (Object*, MapPart*, in
 void Map::applyOnAllObjects(const std::function<void (Object*)>& operation)
 {
 	for (auto part : parts)
+	{
+		setTransientVisibility(part->getVisibility());
 		part->applyOnAllObjects(operation);
+	}
 }
 
 
@@ -2298,7 +2301,10 @@ void Map::applyOnAllObjects(const std::function<void (const Object*)>& operation
 void Map::applyOnAllObjects(const std::function<void (Object*, MapPart*, int)>& operation)
 {
 	for (auto part : parts)
+	{
+		setTransientVisibility(part->getVisibility());
 		part->applyOnAllObjects(operation);
+	}
 }
 
 

src/core/map.h

@@ -153,7 +153,7 @@ friend class XMLFileExporter;
 	 */
 	void reset();
 
-	
+
 	/**
 	 * Attempts to load the map from the specified path. Returns true on success.
 	 * 
@@ -580,6 +580,11 @@ friend class XMLFileExporter;
 	 * The full icon size (width, height) is represented by 1.0.
 	 */
 	qreal symbolIconZoom() const;
+
+	/**
+	 * Returns the visibility of the map part being currently processed in applyOnAllObjects().
+	 */
+	int getTransientVisibility() const;
 
 public slots:
 	/**
@@ -1575,6 +1580,7 @@ protected slots:
 	void addSelectionRenderables(const Object* object);
 	void updateSelectionRenderables(const Object* object);
 	void removeSelectionRenderables(const Object* object);
+	void setTransientVisibility(int visibility);
 
 	static void initStatic();
 
@@ -1602,6 +1608,8 @@ protected slots:
 	MapGrid grid;
 
 	int renderable_options;
+
+	int transientVisibility;	// temporarily store the visibility of the map part being processed by applyOnAllObjects()
 
 	QScopedPointer<MapPrinterConfig> printer_config;
 
@@ -1639,6 +1647,18 @@ protected slots:
 
 // ### Map inline code ###
 
+inline
+void Map::setTransientVisibility(int visibility)
+{
+	transientVisibility = visibility;
+}
+
+inline
+int Map::getTransientVisibility() const
+{
+	return transientVisibility;
+}
+
 inline
 int Map::getNumColors() const
 {

src/core/map_part.cpp

@@ -1,6 +1,6 @@
 /*
  *    Copyright 2012, 2013 Thomas Schöps
- *    Copyright 2012-2017 Kai Pastor
+ *    Copyright 2012-2021 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -47,15 +47,17 @@ namespace literal
 	const QLatin1String objects("objects");
 	const QLatin1String object("object");
 	const QLatin1String count("count");
+	const QLatin1String visibility("visibility");
 }
 
 
 
 namespace OpenOrienteering {
 
-MapPart::MapPart(const QString& name, Map* map)
+MapPart::MapPart(const QString& name, Map* map, int visibility)
 : name(name)
 , map(map)
+, visibility(visibility)
 {
 	Q_ASSERT(map);
 	; // nothing else
@@ -75,12 +77,21 @@ void MapPart::setName(const QString& new_name)
 		emit map->mapPartChanged(map->findPartIndex(this), this);
 }
 
-
+void MapPart::setVisibility(int new_visibility)
+{
+	visibility = new_visibility;
+	if (map)
+	{
+		emit map->mapPartChanged(map->findPartIndex(this), this);
+		map->updateAllObjects();
+	}
+}
 
 void MapPart::save(QXmlStreamWriter& xml) const
 {
 	XmlElementWriter part_element(xml, literal::part);
 	part_element.writeAttribute(literal::name, name);
+	part_element.writeAttribute(literal::visibility, visibility);
 	{
 		XmlElementWriter objects_element(xml, literal::objects);
 		objects_element.writeAttribute(literal::count, objects.size());
@@ -98,7 +109,8 @@ MapPart* MapPart::load(QXmlStreamReader& xml, Map& map, SymbolDictionary& symbol
 	Q_ASSERT(xml.name() == literal::part);
 
 	XmlElementReader part_element(xml);
-	auto part = new MapPart(part_element.attribute<QString>(literal::name), &map);
+	int visibility = part_element.hasAttribute(literal::visibility) ? part_element.attribute<int>(literal::visibility) : 100;
+	auto part = new MapPart(part_element.attribute<QString>(literal::name), &map, visibility);
 
 	while (xml.readNextStartElement())
 	{

src/core/map_part.h

@@ -1,6 +1,6 @@
 /*
  *    Copyright 2012, 2013 Thomas Schöps
- *    Copyright 2012-2017 Kai Pastor
+ *    Copyright 2012-2021 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -62,16 +62,14 @@ using SelectionInfoVector = std::vector<std::pair<int, Object*>> ;
  * a map part for event-specific map objects and parts for course-specific
  * map objects. Then a course can be printed by merging the event-specific part
  * with the part for the course.
- * 
- * Currently, only one map part can be used per map.
  */
 class MapPart
 {
 public:
 	/**
 	 * Creates a new map part with the given name for a map.
 	 */
-	MapPart(const QString& name, Map* map);
+	MapPart(const QString& name, Map* map, int visibility);
 
 	MapPart(const MapPart&) = delete;
 
@@ -106,6 +104,15 @@ class MapPart
 	 */
 	void setName(const QString& new_name);
 
+	/**
+	 * Returns the part's visibility.
+	 */
+	int getVisibility() const;
+
+	/**
+	 * Sets the part's visibility.
+	 */
+	void setVisibility(int new_visibility);
 
 	/**
 	 * Returns the number of objects in the part.
@@ -269,6 +276,7 @@ class MapPart
 	QString name;
 	ObjectList objects;  ///< @todo This could be a spatial representation optimized for quick access
 	Map* const map;
+	int visibility;  // percentage as general approach, first use only values 0 and 100
 };
 
 
@@ -281,6 +289,12 @@ const QString& MapPart::getName() const
 	return name;
 }
 
+inline
+int MapPart::getVisibility() const
+{
+	return visibility;
+}
+
 inline
 int MapPart::getNumObjects() const
 {

src/core/objects/object.cpp

@@ -1,6 +1,6 @@
 /*
  *    Copyright 2012, 2013 Thomas Schöps
- *    Copyright 2012-2020 Kai Pastor
+ *    Copyright 2012-2021 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -491,7 +491,9 @@ bool Object::update() const
 	}
 
 	output.deleteRenderables();
-	
+	if (map && !map->getTransientVisibility())
+		return true;
+
 	extent = QRectF();
 
 	updateEvent();

src/gdal/ogr_file_format.cpp

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2020 Kai Pastor
+ *    Copyright 2016-2021 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -869,7 +869,7 @@ bool OgrFileImport::importImplementation()
 					}
 					else
 					{
-						part = new MapPart(QString::fromUtf8(OGR_L_GetName(layer)), map);
+						part = new MapPart(QString::fromUtf8(OGR_L_GetName(layer)), map, 100);
 						auto index = std::size_t(map->getNumParts());
 						map->addPart(part, index);
 						map->setCurrentPartIndex(index);

src/gui/map/map_editor.cpp

@@ -257,6 +257,7 @@ MapEditorController::MapEditorController(OperatingMode mode, Map* map, MapView*
 , template_list_widget(nullptr)
 , mappart_remove_act(nullptr)
 , mappart_merge_act(nullptr)
+, mappart_visibility_act(nullptr)
 , mappart_merge_menu(nullptr)
 , mappart_move_menu(nullptr)
 , mappart_selector_box(nullptr)
@@ -468,6 +469,7 @@ void MapEditorController::setEditingInProgress(bool value)
 		mappart_add_act->setEnabled(!editing_in_progress);
 		mappart_rename_act->setEnabled(!editing_in_progress && num_parts > 0);
 		mappart_remove_act->setEnabled(!editing_in_progress && num_parts > 1);
+		mappart_visibility_act->setEnabled(!editing_in_progress && num_parts > 0);
 		mappart_move_menu->setEnabled(!editing_in_progress && num_parts > 1);
 		mappart_merge_act->setEnabled(!editing_in_progress && num_parts > 1);
 		mappart_merge_menu->setEnabled(!editing_in_progress && num_parts > 1);
@@ -1092,8 +1094,9 @@ void MapEditorController::createActions()
 	mappart_add_act = newAction("addmappart", tr("Add new part..."), this, SLOT(addMapPart()));
 	mappart_rename_act = newAction("renamemappart", tr("Rename current part..."), this, SLOT(renameMapPart()));
 	mappart_remove_act = newAction("removemappart", tr("Remove current part"), this, SLOT(removeMapPart()));
+	mappart_visibility_act = newAction("visibilitymappart", tr("Hide current part"), this, SLOT(switchVisibilityMapPart()));	// exact text doesn't matter since replaced in updateMapPartsUI() below, so use something that is already in use
 	mappart_merge_act = newAction("mergemapparts", tr("Merge all parts"), this, SLOT(mergeAllMapParts()));
-	
+
 	import_act = newAction("import", tr("Import..."), this, SLOT(importClicked()), nullptr, QString{}, "file_menu.html");
 
 	map_coordinates_act = new QAction(tr("Map coordinates"), this);
@@ -1251,6 +1254,7 @@ void MapEditorController::createMenuAndToolbars()
 	map_menu->addAction(mappart_add_act);
 	map_menu->addAction(mappart_rename_act);
 	map_menu->addAction(mappart_remove_act);
+	map_menu->addAction(mappart_visibility_act);
 	map_menu->addMenu(mappart_move_menu);
 	map_menu->addMenu(mappart_merge_menu);
 	map_menu->addAction(mappart_merge_act);
@@ -3796,6 +3800,11 @@ void MapEditorController::updateMapPartsUI()
 	{
 		toolbar_mapparts->setVisible(have_multiple_parts);
 	}
+	if (mappart_visibility_act && count)
+	{
+		MapPart* const part = map->getCurrentPart();
+		mappart_visibility_act->setText(part->getVisibility() ? tr("Hide current part") : tr("Show current part"));
+	}
 
 	if (count > 0)
 	{
@@ -3835,7 +3844,7 @@ void MapEditorController::addMapPart()
 	                   &accepted );
 	if (accepted && !name.isEmpty())
 	{
-		auto* part = new MapPart(name, map);
+		auto* part = new MapPart(name, map, 100);
 		map->addPart(part, map->getCurrentPartIndex() + 1);
 		map->setCurrentPart(part);
 		map->push(new MapPartUndoStep(map, MapPartUndoStep::RemoveMapPart, part));
@@ -3996,6 +4005,11 @@ void MapEditorController::mergeAllMapParts()
 	}
 }
 
+void MapEditorController::switchVisibilityMapPart()
+{
+	MapPart* const part = map->getCurrentPart();
+	part->setVisibility(part->getVisibility() ? 0 : 100);
+}
 
 void MapEditorController::templateAdded(int /*pos*/, const Template* /*temp*/)
 {

src/gui/map/map_editor.h

@@ -520,6 +520,8 @@ public slots:
 	void mergeCurrentMapPartTo(int target);
 	/** Merges all map parts into the current one. */
 	void mergeAllMapParts();
+	/** Switches the visibility of the current map part */
+	void switchVisibilityMapPart();
 
 	/** Updates action enabled states after a template has been added */
 	void templateAdded(int pos, const OpenOrienteering::Template* temp);
@@ -822,6 +824,7 @@ protected slots:
 	QAction* mappart_rename_act = {};
 	QAction* mappart_remove_act = {};
 	QAction* mappart_merge_act = {};
+	QAction* mappart_visibility_act = {};
 	QMenu* mappart_merge_menu;
 	QMenu* mappart_move_menu;