diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2018-10-16 11:59:09 +0300 |
|---|---|---|
| committer | Tatiana Yan <tatiana.kondakova@gmail.com> | 2018-10-16 12:16:52 +0300 |
| commit | 7bf18c191e1eb11c8a54b36eb0aecd7c59bff04c (patch) | |
| tree | 1d0532c931b75688898ca288eb7ea5fcfcd9cb3c /qt | |
| parent | ff9fdf07b9432305a1b1f6e0e3b1322e5b425765 (diff) | |
Review fixes.
Diffstat (limited to 'qt')
| -rw-r--r-- | qt/draw_widget.cpp | 2 | ||||
| -rw-r--r-- | qt/mainwindow.cpp | 33 |
2 files changed, 13 insertions, 22 deletions
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index 242763b07c..06f944a31b 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -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) { diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp index f70cae886d..58b342029b 100644 --- a/qt/mainwindow.cpp +++ b/qt/mainwindow.cpp @@ -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()); } |