AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-10-16 11:59:09 +03:00 • committed by Tatiana Yan
parent ff9fdf07b9
commit 7bf18c191e
3 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/framework.cpp
View file

@ -101,6 +101,7 @@
#include "std/algorithm.hpp"
#include "std/bind.hpp"
#include "std/map.hpp"
#include "std/target_os.hpp"
#include "api/internal/c/api-client-internals.h"
@ -3344,6 +3345,9 @@ void Framework::VisualizeCityRoadsInRect(m2::RectD const & rect)
size_t counter = 0;
GetDataSource().ForEachInRect(
[this, &rect, &cityRoads, &counter](FeatureType & ft) {
if (ft.GetFeatureType() != feature::GEOM_LINE)
return;
auto const & mwmId = ft.GetID().m_mwmId;
auto const it = cityRoads.find(mwmId);
if (it == cityRoads.cend())

2
qt/draw_widget.cpp
View file

@ -237,7 +237,7 @@ void DrawWidget::mouseReleaseEvent(QMouseEvent * e)
{
CHECK(!m_cityBoundariesSelectionMode, ());
CHECK(!m_cityRoadsSelectionMode, ());
m_framework.VisualizeCityRoadsInRect(rect);
m_framework.VisualizeRoadsInRect(rect);
}
else if (m_cityBoundariesSelectionMode)
{

33
qt/mainwindow.cpp
View file

@ -563,42 +563,33 @@ void MainWindow::OnCreateFeatureClicked()
void MainWindow::OnSwitchSelectionMode()
{
if (m_selectionCityBoundariesMode->isChecked() || m_selectionCityRoadsMode->isChecked())
{
m_selectionCityBoundariesMode->setChecked(false);
m_pDrawWidget->SetCityBoundariesSelectionMode(false);
m_selectionCityBoundariesMode->setChecked(false);
m_pDrawWidget->SetCityBoundariesSelectionMode(false);
m_selectionCityRoadsMode->setChecked(false);
m_pDrawWidget->SetCityRoadsSelectionMode(false);
}
m_selectionCityRoadsMode->setChecked(false);
m_pDrawWidget->SetCityRoadsSelectionMode(false);
m_pDrawWidget->SetSelectionMode(m_selectionMode->isChecked());
}
void MainWindow::OnSwitchCityBoundariesSelectionMode()
{
if (m_selectionMode->isChecked() || m_selectionCityRoadsMode->isChecked())
{
m_selectionMode->setChecked(false);
m_pDrawWidget->SetSelectionMode(false);
m_selectionMode->setChecked(false);
m_pDrawWidget->SetSelectionMode(false);
m_selectionCityRoadsMode->setChecked(false);
m_pDrawWidget->SetCityRoadsSelectionMode(false);
}
m_selectionCityRoadsMode->setChecked(false);
m_pDrawWidget->SetCityRoadsSelectionMode(false);
m_pDrawWidget->SetCityBoundariesSelectionMode(m_selectionCityBoundariesMode->isChecked());
}
void MainWindow::OnSwitchCityRoadsSelectionMode()
{
if (m_selectionMode->isChecked() || m_selectionCityBoundariesMode->isChecked())
{
m_selectionMode->setChecked(false);
m_pDrawWidget->SetSelectionMode(false);
m_selectionMode->setChecked(false);
m_pDrawWidget->SetSelectionMode(false);
m_selectionCityBoundariesMode->setChecked(false);
m_pDrawWidget->SetCityBoundariesSelectionMode(false);
}
m_selectionCityBoundariesMode->setChecked(false);
m_pDrawWidget->SetCityBoundariesSelectionMode(false);
m_pDrawWidget->SetCityRoadsSelectionMode(m_selectionCityRoadsMode->isChecked());
}