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

[screenshots] Screenshots mode.

Browse source
This commit is contained in:
Daria Volvenkova 2019-03-28 19:15:20 +03:00 • committed by Roman Kuznetsov
parent acce74daca
commit cdbccd4ab0
15 changed files with 216 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drape_frontend/drape_hints.hpp
View file

@ -6,5 +6,6 @@ struct Hints
{
bool m_isFirstLaunch = false;
bool m_isLaunchByDeepLink = false;
bool m_isScreenshotMode = false;
};
} // namespace df

5
drape_frontend/frontend_renderer.cpp
View file

@ -189,6 +189,7 @@ FrontendRenderer::FrontendRenderer(Params && params)
, m_isIsometry(false)
, m_blockTapEvents(params.m_blockTapEvents)
, m_choosePositionMode(false)
, m_screenshotMode(params.m_myPositionParams.m_hints.m_isScreenshotMode)
, m_viewport(params.m_viewport)
, m_modelViewChangedFn(params.m_modelViewChangedFn)
, m_tapEventInfoFn(params.m_tapEventFn)
@ -1427,7 +1428,7 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView, bool activeFram
m_myPositionController->Render(m_context, make_ref(m_gpuProgramManager), modelView, m_currentZoomLevel,
m_frameValues);
if (m_guiRenderer != nullptr)
if (m_guiRenderer != nullptr && !m_screenshotMode)
{
m_guiRenderer->Render(m_context, make_ref(m_gpuProgramManager), m_myPositionController->IsInRouting(),
modelView);
@ -2256,7 +2257,7 @@ void FrontendRenderer::OnContextCreate()
m_postprocessRenderer->SetEffectEnabled(m_context, effect, true /* enabled */);
m_enabledOnStartEffects.clear();
if (dp::SupportManager::Instance().IsAntialiasingEnabledByDefault())
if (dp::SupportManager::Instance().IsAntialiasingEnabledByDefault() || m_screenshotMode)
m_postprocessRenderer->SetEffectEnabled(m_context, PostprocessRenderer::Antialiasing, true);
#endif

1
drape_frontend/frontend_renderer.hpp
View file

@ -307,6 +307,7 @@ private:
bool m_blockTapEvents;
bool m_choosePositionMode;
bool m_screenshotMode;
dp::Viewport m_viewport;
UserEventStream m_userEventStream;

7
drape_frontend/my_position_controller.cpp
View file

@ -643,8 +643,11 @@ void MyPositionController::Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<
m_shape->SetAccuracy(static_cast<float>(m_errorRadius));
m_shape->SetRoutingMode(IsInRouting());
m_shape->RenderAccuracy(context, mng, screen, zoomLevel, frameValues);
m_shape->RenderMyPosition(context, mng, screen, zoomLevel, frameValues);
if (!m_hints.m_isScreenshotMode)
{
m_shape->RenderAccuracy(context, mng, screen, zoomLevel, frameValues);
m_shape->RenderMyPosition(context, mng, screen, zoomLevel, frameValues);
}
}
}

4
map/framework.cpp
View file

@ -1103,7 +1103,7 @@ void Framework::ShowTrack(kml::TrackId trackId)
ShowRect(rect);
}
void Framework::ShowBookmarkCategory(kml::MarkGroupId categoryId)
void Framework::ShowBookmarkCategory(kml::MarkGroupId categoryId, bool animation)
{
auto const & bm = GetBookmarkManager();
if (bm.IsCategoryEmpty(categoryId))
@ -1126,7 +1126,7 @@ void Framework::ShowBookmarkCategory(kml::MarkGroupId categoryId)
double const kPaddingScale = 1.2;
StopLocationFollow();
rect.Scale(kPaddingScale);
ShowRect(rect);
ShowRect(rect, -1 /* maxScale */, animation);
}
void Framework::ShowFeatureByMercator(m2::PointD const & pt)

2
map/framework.hpp
View file

@ -359,7 +359,7 @@ public:
void ShowBookmark(Bookmark const * bookmark);
void ShowTrack(kml::TrackId trackId);
void ShowFeatureByMercator(m2::PointD const & pt);
void ShowBookmarkCategory(kml::MarkGroupId categoryId);
void ShowBookmarkCategory(kml::MarkGroupId categoryId, bool animation = true);
void AddBookmarksFile(string const & filePath, bool isTemporaryFile);

10
qt/draw_widget.cpp
View file

@ -38,8 +38,8 @@ using namespace qt::common;
namespace qt
{
DrawWidget::DrawWidget(Framework & framework, bool apiOpenGLES3, QWidget * parent)
: TBase(framework, apiOpenGLES3, parent)
DrawWidget::DrawWidget(Framework & framework, bool apiOpenGLES3, bool isScreenshotMode, QWidget * parent)
: TBase(framework, apiOpenGLES3, isScreenshotMode, parent)
, m_rubberBand(nullptr)
, m_emulatingLocation(false)
{
@ -159,7 +159,11 @@ void DrawWidget::ChoosePositionModeDisable()
void DrawWidget::initializeGL()
{
m_framework.LoadBookmarks();
if (m_isScreenshotMode)
m_framework.GetBookmarkManager().EnableTestMode(true);
else
m_framework.LoadBookmarks();
MapWidget::initializeGL();
m_framework.GetRoutingManager().LoadRoutePoints([this](bool success)

2
qt/draw_widget.hpp
View file

@ -44,7 +44,7 @@ public Q_SLOTS:
void OnUpdateCountryStatusByTimer();
public:
DrawWidget(Framework & framework, bool apiOpenGLES3, QWidget * parent);
DrawWidget(Framework & framework, bool apiOpenGLES3, bool isScreenshotMode, QWidget * parent);
~DrawWidget();
bool Search(search::EverywhereSearchParams const & params);

19
qt/main.cpp
View file

@ -20,8 +20,8 @@
#include "3party/Alohalytics/src/alohalytics.h"
#include "3party/gflags/src/gflags/gflags.h"
#include <QtWidgets/QMessageBox>
#include <QtCore/QDir>
#include <QtWidgets/QMessageBox>
#include <QtWidgets/QApplication>
#include <QtWidgets/QFileDialog>
@ -29,6 +29,9 @@ DEFINE_string(data_path, "", "Path to data directory");
DEFINE_string(log_abort_level, base::ToString(base::GetDefaultLogAbortLevel()),
"Log messages severity that causes termination.");
DEFINE_string(resources_path, "", "Path to resources directory");
DEFINE_string(kml_path, "", "Path to a directory with kml files to take screenshots.");
DEFINE_int32(width, 0, "Screenshot width");
DEFINE_int32(height, 0, "Screenshot height");
namespace
{
@ -148,8 +151,20 @@ int main(int argc, char * argv[])
if (eulaAccepted) // User has accepted EULA
{
bool apiOpenGLES3 = false;
std::unique_ptr<qt::ScreenshotParams> screenshotParams;
#if defined(OMIM_OS_MAC)
apiOpenGLES3 = a.arguments().contains("es3", Qt::CaseInsensitive);
if (!FLAGS_kml_path.empty())
{
screenshotParams = std::make_unique<qt::ScreenshotParams>();
screenshotParams->m_path = FLAGS_kml_path;
if (FLAGS_width > 0)
screenshotParams->m_width = FLAGS_width;
if (FLAGS_height > 0)
screenshotParams->m_height = FLAGS_height;
}
#endif
qt::MainWindow::SetDefaultSurfaceFormat(apiOpenGLES3);
@ -166,7 +181,7 @@ int main(int argc, char * argv[])
#endif // BUILD_DESIGNER
Framework framework;
qt::MainWindow w(framework, apiOpenGLES3, mapcssFilePath);
qt::MainWindow w(framework, apiOpenGLES3, std::move(screenshotParams), mapcssFilePath);
w.show();
returnCode = a.exec();
}

27
qt/mainwindow.cpp
View file

@ -60,9 +60,12 @@ namespace qt
extern char const * kTokenKeySetting;
extern char const * kTokenSecretSetting;
MainWindow::MainWindow(Framework & framework, bool apiOpenGLES3, QString const & mapcssFilePath /*= QString()*/)
MainWindow::MainWindow(Framework & framework, bool apiOpenGLES3,
std::unique_ptr<ScreenshotParams> && screenshotParams,
QString const & mapcssFilePath /*= QString()*/)
: m_Docks{}
, m_locationService(CreateDesktopLocationService(*this))
, m_screenshotParams(std::move(screenshotParams))
#ifdef BUILD_DESIGNER
, m_mapcssFilePath(mapcssFilePath)
#endif
@ -71,7 +74,16 @@ MainWindow::MainWindow(Framework & framework, bool apiOpenGLES3, QString const &
QDesktopWidget const * desktop(QApplication::desktop());
setGeometry(desktop->screenGeometry(desktop->primaryScreen()));
m_pDrawWidget = new DrawWidget(framework, apiOpenGLES3, this);
if (m_screenshotParams != nullptr)
{
QSizePolicy policy(QSizePolicy::Fixed, QSizePolicy::Fixed);
setSizePolicy(policy);
QSize size(m_screenshotParams->m_width, m_screenshotParams->m_height);
setMaximumSize(size);
setMinimumSize(size);
}
m_pDrawWidget = new DrawWidget(framework, apiOpenGLES3, m_screenshotParams != nullptr, this);
setCentralWidget(m_pDrawWidget);
QObject::connect(m_pDrawWidget, SIGNAL(BeforeEngineCreation()), this, SLOT(OnBeforeEngineCreation()));
@ -242,7 +254,6 @@ void MainWindow::CreateNavigationBar()
QToolBar * pToolBar = new QToolBar(tr("Navigation Bar"), this);
pToolBar->setOrientation(Qt::Vertical);
pToolBar->setIconSize(QSize(32, 32));
{
m_pDrawWidget->BindHotkeys(*this);
@ -420,7 +431,6 @@ void MainWindow::CreateNavigationBar()
}
qt::common::ScaleSlider::Embed(Qt::Vertical, *pToolBar, *m_pDrawWidget);
#ifndef NO_DOWNLOADER
{
// add mainframe actions
@ -432,13 +442,15 @@ void MainWindow::CreateNavigationBar()
}
#endif // NO_DOWNLOADER
if (m_screenshotParams != nullptr)
pToolBar->setVisible(false);
addToolBar(Qt::RightToolBarArea, pToolBar);
}
void MainWindow::CreateCountryStatusControls()
{
QHBoxLayout * mainLayout = new QHBoxLayout();
m_downloadButton = new QPushButton("Download");
mainLayout->addWidget(m_downloadButton, 0, Qt::AlignHCenter);
m_downloadButton->setVisible(false);
@ -894,4 +906,9 @@ void MainWindow::SetDefaultSurfaceFormat(bool apiOpenGLES3)
{
DrawWidget::SetDefaultSurfaceFormat(apiOpenGLES3);
}
void MainWindow::MakeScreenshots()
{
}
} // namespace qt

17
qt/mainwindow.hpp
View file

@ -11,6 +11,7 @@
#include <QtWidgets/QMainWindow>
#include <array>
#include <string>
#include <memory>
class Framework;
@ -25,6 +26,16 @@ namespace qt
{
class DrawWidget;
struct ScreenshotParams
{
static uint32_t constexpr kDefaultWidth = 576;
static uint32_t constexpr kDefaultHeight = 720;
std::string m_path;
uint32_t m_width = kDefaultWidth;
uint32_t m_height = kDefaultHeight;
};
class MainWindow : public QMainWindow, location::LocationObserver
{
DrawWidget * m_pDrawWidget = nullptr;
@ -38,6 +49,7 @@ class MainWindow : public QMainWindow, location::LocationObserver
storage::CountryId m_lastCountry;
std::unique_ptr<location::LocationService> const m_locationService;
std::unique_ptr<ScreenshotParams> const m_screenshotParams;
QAction * m_pMyPositionAction = nullptr;
QAction * m_pCreateFeatureAction = nullptr;
@ -65,7 +77,8 @@ class MainWindow : public QMainWindow, location::LocationObserver
Q_OBJECT
public:
MainWindow(Framework & framework, bool apiOpenGLES3, QString const & mapcssFilePath = QString());
MainWindow(Framework & framework, bool apiOpenGLES3, std::unique_ptr<ScreenshotParams> && screenshotParams,
QString const & mapcssFilePath = QString());
static void SetDefaultSurfaceFormat(bool apiOpenGLES3);
@ -82,6 +95,8 @@ protected:
void CreateSearchBarAndPanel();
void CreateCountryStatusControls();
void MakeScreenshots();
#if defined(Q_WS_WIN)
/// to handle menu messages
bool winEvent(MSG * msg, long * result) override;

4
qt/qt_common/map_widget.cpp
View file

@ -26,10 +26,11 @@ namespace common
{
//#define ENABLE_AA_SWITCH
MapWidget::MapWidget(Framework & framework, bool apiOpenGLES3, QWidget * parent)
MapWidget::MapWidget(Framework & framework, bool apiOpenGLES3, bool isScreenshotMode, QWidget * parent)
: QOpenGLWidget(parent)
, m_framework(framework)
, m_apiOpenGLES3(apiOpenGLES3)
, m_isScreenshotMode(isScreenshotMode)
, m_slider(nullptr)
, m_sliderState(SliderState::Released)
, m_ratio(1.0)
@ -92,6 +93,7 @@ void MapWidget::CreateEngine()
p.m_surfaceWidth = m_ratio * width();
p.m_surfaceHeight = m_ratio * height();
p.m_visualScale = m_ratio;
p.m_hints.m_isScreenshotMode = m_isScreenshotMode;
m_skin.reset(new gui::Skin(gui::ResolveGuiSkinFile("default"), m_ratio));
m_skin->Resize(p.m_surfaceWidth, p.m_surfaceHeight);

3
qt/qt_common/map_widget.hpp
View file

@ -36,7 +36,7 @@ class MapWidget : public QOpenGLWidget
Q_OBJECT
public:
MapWidget(Framework & framework, bool apiOpenGLES3, QWidget * parent);
MapWidget(Framework & framework, bool apiOpenGLES3, bool isScreenshotMode, QWidget * parent);
~MapWidget() override;
void BindHotkeys(QWidget & parent);
@ -92,6 +92,7 @@ protected:
Framework & m_framework;
bool m_apiOpenGLES3;
bool m_isScreenshotMode;
ScaleSlider * m_slider;
SliderState m_sliderState;
kml::MarkGroupId m_bookmarksCategoryId = 0;

104
qt/screenshoter.cpp Normal file
View file

@ -0,0 +1,104 @@
#include "qt/screenshoter.hpp"
#incldue "storage/storage.hpp"
#include "map/bookmark_helpers.hpp"
#include "map/bookmark_manager.hpp"
#include "map/framework.hpp"
#include <QtGui/QPixmap>
Screenshoter::Screenshoter(Framework & framework, QWidget * widget)
: m_framework(framework)
, m_widget(widget)
{
}
void Screenshoter::ProcessBookmarks(std::string const & dir)
{
Platform::FilesList files;
Platform::GetFilesByExt(dir, kKmlExtension, files);
for (auto const & file : files)
{
auto const filePath = base::JoinPath(dir, file);
m_filesToProcess.push_back(filePath);
}
}
void Screenshoter::ProcessNextKml()
{
std::unique_ptr<kml::FileData> kmlData;
while (kmlData == nullptr && !m_filesToProcess.empty())
{
auto const filePath = m_filesToProcess.front();
m_filesToProcess.pop_front();
kmlData = LoadKmlFile(filePath, KmlFileType::Text);
if (kmlData != nullptr && kmlData->m_bookmarksData.empty() && kmlData->m_tracksData.empty())
kmlData.reset();
}
if (kmlData == nullptr)
return;
m_nextScreenshotName = kmlData->m_serverId;
BookmarkManager::KMLDataCollection collection;
collection.emplace_back("", std::move(kmlData));
auto & bookmarkManager = m_framework.GetBookmarkManager();
auto es = bookmarkManager.GetEditSession();
auto const idList = bookmarkManager.GetBmGroupsIdList();
for (auto catId : idList)
es.DeleteBmCategory(catId);
bookmarkManager.CreateCategories(std::move(collection), false);
auto const newCatId = bookmarkManager.GetBmGroupsIdList().front();
m_framework.ShowBookmarkCategory(newCatId, false);
}
void Screenshoter::PrepareCountries()
{
ASSERT(m_countriesToDownload.empty(), ());
auto & storage = m_framework.GetStorage();
int const kMinCountryZoom = 10;
if (GetDrawScale() >= kMinCountryZoom)
{
auto countryIds = m_framework.GetCountryInfoGetter()->GetRegionsCountryIdByRect(GetCurrentViewport(),
false /* rough */);
for (auto const & countryId : countryIds)
{
if (storage.CountryStatusEx(countryId) == storage::Status::ENotDownloaded)
{
storage.DownloadCountry(countryId, MapOptions::Map);
m_countriesToDownload.insert(countryId);
}
}
}
if (m_countriesToDownload.empty())
DoScreenshot();
}
void Screenshoter::OnCountryStatusChanged(storage::CountryId countryId)
{
m_countriesToDownload.erase(countryId);
if (m_countriesToDownload.empty())
DoScreenshot();
}
void Screenshoter::DoScreenshot()
{
QPixmap pixmap(m_widget->size());
m_widget->render(&pixmap, QPoint(), QRegion(m_widget->geometry()));
pixmap.save("/Users/daravolvenkova/Pictures/test_screen/" + m_nextScreenshotName + ".png", 0, 100);
m_nextScreenshotName.clear();
ProcessNextKml();
}

31
qt/screenshoter.hpp Normal file
View file

@ -0,0 +1,31 @@
#pragma once
#include "storage/storage_defines.hpp"
#include <QtWidgets/QWidget>
#include <list>
#include <string>
class Framework;
class Screenshoter
{
public:
Screenshoter(Framework & framework, QWidget * widget);
void ProcessBookmarks(std::string const & dir);
void PrepareCountries();
void OnCountryStatusChanged(storage::CountryId countryId);
private:
void ProcessNextKml();
void DoScreenshot();
Framework & m_framework;
QWidget * m_widget;
std::list<std::string> m_filesToProcess;
std::set<storage::CountryId> countriesToDownload;
std::string m_nextScreenshotName;
};