From cfc5c6a7122c365a412162dd6804e39befd98d9e Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Tue, 9 Aug 2016 15:33:12 -0700 Subject: [PATCH] [designer tool] Added button for geom index regeneration and config in prefs --- CMakeLists.txt | 33 +++++++++++++++++++ indexer/map_style_reader.cpp | 4 +++ qt/CMakeLists.txt | 12 +++++++ qt/build_style/build_style.cpp | 19 ++++++++--- qt/draw_widget.cpp | 2 +- qt/draw_widget.hpp | 1 + qt/main.cpp | 4 +-- qt/mainwindow.cpp | 56 ++++++++++++++++++++++++++++----- qt/mainwindow.hpp | 16 +++++----- qt/preferences_dialog.cpp | 26 +++++++++++++++ qt/preferences_dialog.hpp | 9 ++++++ qt/res/geom.png | Bin 0 -> 4443 bytes qt/res/resources.qrc | 1 + qt/update_dialog.cpp | 26 --------------- tools/unix/build_designer.sh | 6 ++-- 15 files changed, 162 insertions(+), 53 deletions(-) create mode 100644 qt/res/geom.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 41eac49e6d..9a3eadd740 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,39 @@ cmake_minimum_required(VERSION 3.2) project(omim C CXX) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + +# Set environment variables + +set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) +set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) + +if ($ENV{QT_PATH}) + set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT_PATH}) +else() + set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "/usr/local/opt/qt5") +endif() + +if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Release") +endif() + +if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + add_definitions(-DDEBUG) +endif() + +if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") + add_definitions(-DRELEASE) +endif() + +if (NOT SKIP_TESTS) + set(SKIP_TESTS FALSE) +endif() + +add_definitions(-DBUILD_DESIGNER) + +# End of setting environment variables + # Set target platform: function(omim_set_platform_var PLATFORM_VAR pattern) set(${PLATFORM_VAR} FALSE PARENT_SCOPE) diff --git a/indexer/map_style_reader.cpp b/indexer/map_style_reader.cpp index c4a821bd6f..df9db9fb2a 100644 --- a/indexer/map_style_reader.cpp +++ b/indexer/map_style_reader.cpp @@ -38,10 +38,14 @@ std::string GetStyleRulesSuffix(MapStyle mapStyle) } LOG(LWARNING, ("Unknown map style", mapStyle)); return kSuffixClear; +#endif // BUILD_DESIGNER } std::string GetStyleResourcesSuffix(MapStyle mapStyle) { +#ifdef BUILD_DESIGNER + return string(); +#else // We use the same resources for default and vehicle styles // to avoid textures duplication and package size increasing. switch (mapStyle) diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index 6471c3970b..30399a5868 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -22,6 +22,18 @@ set( SRC about.cpp about.hpp + build_style/build_common.cpp + build_style/build_common.h + build_style/build_drules.cpp + build_style/build_drules.h + build_style/build_skins.cpp + build_style/build_skins.h + build_style/build_statistics.cpp + build_style/build_statistics.h + build_style/build_style.cpp + build_style/build_style.h + build_style/run_tests.cpp + build_style/run_tests.h create_feature_dialog.cpp create_feature_dialog.hpp draw_widget.cpp diff --git a/qt/build_style/build_style.cpp b/qt/build_style/build_style.cpp index e0bb3f6057..ddfcfa0ea3 100644 --- a/qt/build_style/build_style.cpp +++ b/qt/build_style/build_style.cpp @@ -57,12 +57,21 @@ void BuildAndApply(QString const & mapcssFile) if (!QDir().mkdir(outputDir)) throw runtime_error("Unable to make the output directory"); - auto future = std::async(BuildSkins, styleDir, outputDir); - BuildDrawingRules(mapcssFile, outputDir); - future.get(); // may rethrow exception from the BuildSkin + bool const hasSymbols = QDir(styleDir + "symbols/").exists(); + if (hasSymbols) + { + auto future = std::async(BuildSkins, styleDir, outputDir); + BuildDrawingRules(mapcssFile, outputDir); + future.get(); // may rethrow exception from the BuildSkin - ApplyDrawingRules(outputDir); - ApplySkins(outputDir); + ApplyDrawingRules(outputDir); + ApplySkins(outputDir); + } + else + { + BuildDrawingRules(mapcssFile, outputDir); + ApplyDrawingRules(outputDir); + } } void RunRecalculationGeometryScript(QString const & mapcssFile) diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index fdeaeba96a..69adde3a65 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -513,7 +513,7 @@ void DrawWidget::SetDefaultSurfaceFormat(bool apiOpenGLES3) void DrawWidget::RefreshDrawingRules() { - SetMapStyle(MapStyleLight); + SetMapStyle(MapStyleClear); } } diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp index 9d54105771..189967799a 100644 --- a/qt/draw_widget.hpp +++ b/qt/draw_widget.hpp @@ -59,6 +59,7 @@ public: void PrepareShutdown(); Framework & GetFramework() { return m_framework; } + void SetMapStyle(MapStyle mapStyle); void SetRouter(routing::RouterType routerType); diff --git a/qt/main.cpp b/qt/main.cpp index 9cf1aa8d2f..46e7294621 100644 --- a/qt/main.cpp +++ b/qt/main.cpp @@ -173,7 +173,7 @@ int main(int argc, char * argv[]) { build_style::RunRecalculationGeometryScript(mapcssFilePath); } - catch (exception & e) + catch (std::exception & e) { QMessageBox msgBox; msgBox.setWindowTitle("Error"); @@ -184,8 +184,6 @@ int main(int argc, char * argv[]) } } - dbg::ObjectTracker::PrintLeaks(); - LOG_SHORT(LINFO, ("MapsWithMe finished with code", returnCode)); return returnCode; } diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp index 76ea040d25..ae8dd98583 100644 --- a/qt/mainwindow.cpp +++ b/qt/mainwindow.cpp @@ -116,12 +116,15 @@ extern char const * kTokenSecretSetting; MainWindow::MainWindow(Framework & framework, bool apiOpenGLES3, QString const & mapcssFilePath /*= QString()*/) : m_Docks{} + , m_locationService(CreateDesktopLocationService(*this)) +#ifdef BUILD_DESIGNER + , m_mapcssFilePath(mapcssFilePath) , m_pBuildStyleAction(nullptr) + , m_pRecalculateGeomIndex(nullptr) , m_pDrawDebugRectAction(nullptr) , m_pGetStatisticsAction(nullptr) , m_pRunTestsAction(nullptr) - , m_locationService(CreateDesktopLocationService(*this)) - , m_mapcssFilePath(mapcssFilePath) +#endif { // Always runs on the first desktop QDesktopWidget const * desktop(QApplication::desktop()); @@ -425,6 +428,13 @@ void MainWindow::CreateNavigationBar() SLOT(OnBuildStyle())); m_pBuildStyleAction->setCheckable(false); m_pBuildStyleAction->setToolTip(tr("Build style")); + + m_pRecalculateGeomIndex = pToolBar->addAction(QIcon(":/navig64/geom.png"), + tr("Recalculate geometry index"), + this, + SLOT(OnRecalculateGeomIndex())); + m_pRecalculateGeomIndex->setCheckable(false); + m_pRecalculateGeomIndex->setToolTip(tr("Recalculate geometry index")); } // Add "Debug style" button @@ -666,10 +676,42 @@ void MainWindow::OnBuildStyle() { build_style::BuildAndApply(m_mapcssFilePath); // m_pDrawWidget->RefreshDrawingRules(); - build_style::NeedRecalculate = true; - QMainWindow::close(); + + bool enabled = false; + settings::Get(kEnabledAutoRegenGeomIndex, enabled); + if (enabled) + { + build_style::NeedRecalculate = true; + QMainWindow::close(); + } } - catch (exception & e) + catch (std::exception & e) + { + QMessageBox msgBox; + msgBox.setWindowTitle("Error"); + msgBox.setText(e.what()); + msgBox.setStandardButtons(QMessageBox::Ok); + msgBox.setDefaultButton(QMessageBox::Ok); + msgBox.exec(); + } +} + +void MainWindow::OnRecalculateGeomIndex() +{ + try + { + QMessageBox msgBox; + msgBox.setWindowTitle("Warning"); + msgBox.setText("Geometry index will be regenerated. It can take a while.\nApplication may be closed and reopened!"); + msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); + msgBox.setDefaultButton(QMessageBox::Yes); + if (msgBox.exec() == QMessageBox::Yes) + { + build_style::NeedRecalculate = true; + QMainWindow::close(); + } + } + catch (std::exception & e) { QMessageBox msgBox; msgBox.setWindowTitle("Error"); @@ -695,7 +737,7 @@ void MainWindow::OnGetStatistics() InfoDialog dlg(QString("Style statistics"), text, NULL); dlg.exec(); } - catch (exception & e) + catch (std::exception & e) { QMessageBox msgBox; msgBox.setWindowTitle("Error"); @@ -714,7 +756,7 @@ void MainWindow::OnRunTests() InfoDialog dlg(QString("Style tests: ") + (res.first ? "OK" : "FAILED"), res.second, NULL); dlg.exec(); } - catch (exception & e) + catch (std::exception & e) { QMessageBox msgBox; msgBox.setWindowTitle("Error"); diff --git a/qt/mainwindow.hpp b/qt/mainwindow.hpp index 5e8ab334d6..f9a30eec70 100644 --- a/qt/mainwindow.hpp +++ b/qt/mainwindow.hpp @@ -39,7 +39,9 @@ class MainWindow : public QMainWindow, location::LocationObserver QAction * m_selectFinishRoutePoint; QAction * m_selectIntermediateRoutePoint; #ifdef BUILD_DESIGNER + QString const m_mapcssFilePath; QAction * m_pBuildStyleAction; + QAction * m_pRecalculateGeomIndex; QAction * m_pDrawDebugRectAction; QAction * m_pGetStatisticsAction; QAction * m_pRunTestsAction; @@ -58,16 +60,13 @@ class MainWindow : public QMainWindow, location::LocationObserver // This object is managed by Qt memory system. TrafficMode * m_trafficMode = nullptr; - - QString const m_mapcssFilePath; Q_OBJECT public: MainWindow(Framework & framework, bool apiOpenGLES3, QString const & mapcssFilePath = QString()); - virtual void OnLocationError(location::TLocationError errorCode); - virtual void OnLocationUpdated(location::GpsInfo const & info); +Q_OBJECT static void SetDefaultSurfaceFormat(bool apiOpenGLES3); @@ -126,10 +125,11 @@ protected Q_SLOTS: void OnClearRoute(); #ifdef BUILD_DESIGNER - void OnBuildStyle(); - void OnDebugStyle(); - void OnGetStatistics(); - void OnRunTests(); + void OnBuildStyle(); + void OnRecalculateGeomIndex(); + void OnDebugStyle(); + void OnGetStatistics(); + void OnRunTests(); #endif // BUILD_DESIGNER }; } diff --git a/qt/preferences_dialog.cpp b/qt/preferences_dialog.cpp index 7606ce0a0b..cce3e0bcde 100644 --- a/qt/preferences_dialog.cpp +++ b/qt/preferences_dialog.cpp @@ -29,6 +29,10 @@ using namespace measurement_utils; +#ifdef BUILD_DESIGNER +string const kEnabledAutoRegenGeomIndex = "EnabledAutoRegenGeomIndex"; +#endif + namespace qt { PreferencesDialog::PreferencesDialog(QWidget * parent) @@ -67,6 +71,18 @@ namespace qt connect(m_pUnits, SIGNAL(buttonClicked(int)), this, SLOT(OnUnitsChanged(int))); } + #ifdef BUILD_DESIGNER + QCheckBox * checkBox = new QCheckBox("Enable auto regeneration of geometry index"); + { + bool enabled = false; + if (!settings::Get(kEnabledAutoRegenGeomIndex, enabled)) + { + settings::Set(kEnabledAutoRegenGeomIndex, false); + } + checkBox->setChecked(enabled); + connect(checkBox, SIGNAL(stateChanged(int)), this, SLOT(OnEnabledAutoRegenGeomIndex(int))); + } + #endif QHBoxLayout * bottomLayout = new QHBoxLayout(); { @@ -82,6 +98,9 @@ namespace qt QVBoxLayout * finalLayout = new QVBoxLayout(); finalLayout->addWidget(radioBox); + #ifdef BUILD_DESIGNER + finalLayout->addWidget(checkBox); + #endif finalLayout->addLayout(bottomLayout); setLayout(finalLayout); } @@ -104,4 +123,11 @@ namespace qt settings::Set(kMeasurementUnits, u); } + +#ifdef BUILD_DESIGNER + void PreferencesDialog::OnEnabledAutoRegenGeomIndex(int i) + { + settings::Set(kEnabledAutoRegenGeomIndex, static_cast(i)); + } +#endif } diff --git a/qt/preferences_dialog.hpp b/qt/preferences_dialog.hpp index 7347e9fd8a..3442344b4d 100644 --- a/qt/preferences_dialog.hpp +++ b/qt/preferences_dialog.hpp @@ -1,5 +1,7 @@ #pragma once +#include "std/string.hpp" + #include #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #include @@ -26,8 +28,15 @@ namespace qt private slots: void OnCloseClick(); void OnUnitsChanged(int i); +#ifdef BUILD_DESIGNER + void OnEnabledAutoRegenGeomIndex(int i); +#endif private: QButtonGroup * m_pUnits; }; } // namespace qt + +#ifdef BUILD_DESIGNER +extern string const kEnabledAutoRegenGeomIndex; +#endif diff --git a/qt/res/geom.png b/qt/res/geom.png new file mode 100644 index 0000000000000000000000000000000000000000..6dd49d22037ac8e22a6457d9c7214b79524a54f6 GIT binary patch literal 4443 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 PI|6X9bFrbug.png chart.png test.png + geom.png logo.png diff --git a/qt/update_dialog.cpp b/qt/update_dialog.cpp index 1b9f3c32c0..4576a837e4 100644 --- a/qt/update_dialog.cpp +++ b/qt/update_dialog.cpp @@ -57,34 +57,8 @@ bool DeleteNotUploadedEditsConfirmation() } } // namespace -namespace -{ -MapOptions GetMapOptionsAvailableForDownload(Storage & st, TCountryId const & countryIndex) -{ - platform::CountryFile const & countryFile = st.GetCountryFile(countryIndex); - bool const hasCarRouting = (0 != countryFile.GetRemoteSize(MapOptions::CarRouting)); - - MapOptions options = MapOptions::Map; - if (hasCarRouting) - options = SetOptions(options, MapOptions::CarRouting); - - return options; -} -} // namespace - namespace qt { - /// adds custom sorting for "Size" column - class QTreeWidgetItemWithCustomSorting : public QTreeWidgetItem - { - public: - virtual bool operator<(QTreeWidgetItem const & other) const - { - return data(KColumnIndexSize, Qt::UserRole).toULongLong() < other.data(KColumnIndexSize, Qt::UserRole).toULongLong(); - } - }; - - UpdateDialog::UpdateDialog(QWidget * parent, Framework & framework) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), m_framework(framework), diff --git a/tools/unix/build_designer.sh b/tools/unix/build_designer.sh index 091ee33d0f..164269d43b 100755 --- a/tools/unix/build_designer.sh +++ b/tools/unix/build_designer.sh @@ -44,10 +44,10 @@ cp "$OMIM_PATH/tools/python/recalculate_geom_index.py" "$MAC_RESOURCES/recalcula # Copy all drules and resources (required for test environment) rm -rf $MAC_RESOURCES/drules_proto* rm -rf $MAC_RESOURCES/resources-* -for i in ldpi mdpi hdpi xhdpi xxhdpi 6plus; do - cp -r $OMIM_PATH/data/resources-${i}_legacy/ $MAC_RESOURCES/resources-$i/ +for i in mdpi hdpi xhdpi xxhdpi 6plus; do + cp -r $OMIM_PATH/data/resources-${i}_clear/ $MAC_RESOURCES/resources-$i/ done -cp $OMIM_PATH/data/drules_proto_legacy.bin $MAC_RESOURCES/drules_proto.bin +cp $OMIM_PATH/data/drules_proto_clear.bin $MAC_RESOURCES/drules_proto.bin for i in resources-default countries-strings cuisine-strings WorldCoasts_obsolete.mwm countries.txt cuisines.txt countries_obsolete.txt packed_polygons.bin packed_polygons_obsolete.bin; do cp -r $OMIM_PATH/data/$i $MAC_RESOURCES/ done