Skip to content
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

Jump to bottom

MapEditorController: Show details for map part operations #2110

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

MapEditorController: Show details for map part operations #2110

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66a9f17
MapEditorController: Show details for map part operations
dl3sdo Nov 14, 2022
60df604
MapEditorController: Remove Popup window for empty map parts
dl3sdo Nov 19, 2022
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
103 changes: 51 additions & 52 deletions src/gui/map/map_editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2012, 2013 Thomas Schöps
* Copyright 2012-2021 Kai Pastor
* Copyright 2012-2022 Kai Pastor
*
* This file is part of OpenOrienteering.
*
Expand Down Expand Up @@ -3850,41 +3850,39 @@ void MapEditorController::addMapPart()
void MapEditorController::removeMapPart()
{
auto* part = map->getCurrentPart();
const auto num_objects = part->getNumObjects();

QMessageBox::StandardButton button =
QMessageBox::question(
window,
if (num_objects > 0)
{
if (QMessageBox::question(
window,
tr("Remove current part"),
tr("Do you want to remove map part \"%1\" and all its objects?").arg(part->getName()),
QMessageBox::Yes | QMessageBox::No );
tr("Do you want to remove map part \"%1\" and its %2 objects?").arg(part->getName()).arg(num_objects),
QMessageBox::Yes | QMessageBox::No ) == QMessageBox::No)
return;
}

if (button == QMessageBox::Yes)
auto index = map->getCurrentPartIndex();
UndoStep* undo_step = new MapPartUndoStep(map, MapPartUndoStep::AddMapPart, index);

if (num_objects > 0)
{
auto index = map->getCurrentPartIndex();
UndoStep* undo_step = new MapPartUndoStep(map, MapPartUndoStep::AddMapPart, index);

auto i = part->getNumObjects();
if (i > 0)
auto* add_step = new AddObjectsUndoStep(map);
for (auto i = num_objects - 1; i >= 0; --i)
{
auto* add_step = new AddObjectsUndoStep(map);
do
{
--i;
auto* object = part->getObject(i);
add_step->addObject(i, object);
part->releaseObject(object);
}
while (i > 0);

auto* combined_step = new CombinedUndoStep(map);
combined_step->push(add_step);
combined_step->push(undo_step);
undo_step = combined_step;
auto* object = part->getObject(i);
add_step->addObject(i, object);
part->releaseObject(object);
}

map->push(undo_step);
map->removePart(index);
auto* combined_step = new CombinedUndoStep(map);
combined_step->push(add_step);
combined_step->push(undo_step);
undo_step = combined_step;
}

map->push(undo_step);
map->removePart(index);
}

void MapEditorController::renameMapPart()
Expand Down Expand Up @@ -3935,33 +3933,34 @@ void MapEditorController::mergeCurrentMapPartTo(int target)
{
MapPart* const source_part = map->getCurrentPart();
MapPart* const target_part = map->getPart(target);
const QMessageBox::StandardButton button =
QMessageBox::question(
window,
tr("Merge map parts"),
tr("Do you want to move all objects from map part \"%1\" to \"%2\", "
"and to remove \"%1\"?")
.arg(source_part->getName(), target_part->getName()),
QMessageBox::Yes | QMessageBox::No );
auto num_objects = source_part->getNumObjects();

if (button == QMessageBox::Yes)
if (num_objects > 0)
{
// Beware that the source part is removed, and
// the target part's index might change during merge.
auto source = map->getCurrentPartIndex();
UndoStep* add_part_step = new MapPartUndoStep(map, MapPartUndoStep::AddMapPart, source);

auto first = map->mergeParts(source, target);

auto* switch_part_undo = new SwitchPartUndoStep(map, target, source);
for (auto i = target_part->getNumObjects(); i > first; --i)
switch_part_undo->addObject(0);

auto* undo = new CombinedUndoStep(map);
undo->push(switch_part_undo);
undo->push(add_part_step);
map->push(undo);
if (QMessageBox::question(
window,
tr("Merge map parts"),
tr("Do you want to move all %1 objects from map part \"%2\" to \"%3\", and to remove \"%2\"?")
.arg(num_objects).arg(source_part->getName(), target_part->getName()),
QMessageBox::Yes | QMessageBox::No ) == QMessageBox::No)
return;
}

// Beware that the source part is removed, and
// the target part's index might change during merge.
auto source = map->getCurrentPartIndex();
UndoStep* add_part_step = new MapPartUndoStep(map, MapPartUndoStep::AddMapPart, source);

auto first = map->mergeParts(source, target);

auto* switch_part_undo = new SwitchPartUndoStep(map, target, source);
for (num_objects = target_part->getNumObjects(); num_objects > first; --num_objects)
switch_part_undo->addObject(0);

auto* undo = new CombinedUndoStep(map);
undo->push(switch_part_undo);
undo->push(add_part_step);
map->push(undo);
}

void MapEditorController::mergeAllMapParts()
Expand Down