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

[screenshots] Check viewport before taking a screenshot. Wait graphics after user marks updating on BackendRenderer.

Browse source
This commit is contained in:
Daria Volvenkova 2019-04-12 18:35:15 +03:00 • committed by Roman Kuznetsov
parent f3d8045593
commit 29583912e3
13 changed files with 113 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drape_frontend/backend_renderer.cpp
View file

@ -583,6 +583,17 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
break;
}
#if defined(OMIM_OS_MAC) || defined(OMIM_OS_LINUX)
case Message::Type::NotifyGraphicsReady:
{
ref_ptr<NotifyGraphicsReadyMessage> msg = message;
m_commutator->PostMessage(ThreadsCommutator::RenderThread,
make_unique_dp<NotifyGraphicsReadyMessage>(msg->GetCallback()),
MessagePriority::Normal);
break;
}
#endif
default:
ASSERT(false, ());
break;

2
drape_frontend/drape_engine.cpp
View file

@ -502,7 +502,7 @@ void DrapeEngine::SetModelViewListener(TModelViewListenerFn && fn)
#if defined(OMIM_OS_MAC) || defined(OMIM_OS_LINUX)
void DrapeEngine::NotifyGraphicsReady(TGraphicsReadyFn const & fn)
{
m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
make_unique_dp<NotifyGraphicsReadyMessage>(fn),
MessagePriority::Normal);
}

3
drape_frontend/frontend_renderer.cpp
View file

@ -1010,7 +1010,8 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
if (m_graphicsReadyFn)
{
m_graphicsStage = GraphicsStage::WaitReady;
InvalidateRect(m_userEventStream.GetCurrentScreen().ClipRect());
if (m_notFinishedTiles.empty())
InvalidateRect(m_userEventStream.GetCurrentScreen().ClipRect());
}
break;
}

1
drape_frontend/message.cpp
View file

@ -96,6 +96,7 @@ std::string DebugPrint(Message::Type msgType)
case Message::Type::FlushTransitScheme: return "FlushTransitScheme";
case Message::Type::ShowDebugInfo: return "ShowDebugInfo";
case Message::Type::NotifyRenderThread: return "NotifyRenderThread";
case Message::Type::NotifyGraphicsReady: return "NotifyGraphicsReady";
}
ASSERT(false, ("Unknown message type."));
return "Unknown type";

9
map/bookmark_helpers.cpp
View file

@ -492,3 +492,12 @@ bool IsMyCategory(User const & user, kml::CategoryData const & categoryData)
{
return IsMyCategory(user.GetUserId(), categoryData);
}
void ExpandBookmarksRectForPreview(m2::RectD & rect)
{
if (!rect.IsValid())
return;
double const kPaddingScale = 1.2;
rect.Scale(kPaddingScale);
}

4
map/bookmark_helpers.hpp
View file

@ -6,6 +6,8 @@
#include "coding/reader.hpp"
#include "geometry/rect2d.hpp"
#include <memory>
#include <string>
@ -52,3 +54,5 @@ bool FromCatalog(kml::FileData const & kmlData);
bool FromCatalog(kml::CategoryData const & categoryData, std::string const & serverId);
bool IsMyCategory(std::string const & userId, kml::CategoryData const & categoryData);
bool IsMyCategory(User const & user, kml::CategoryData const & categoryData);
void ExpandBookmarksRectForPreview(m2::RectD & rect);

24
map/bookmark_manager.cpp
View file

@ -853,6 +853,30 @@ std::string BookmarkManager::GetCategoryFileName(kml::MarkGroupId categoryId) co
return category->GetFileName();
}
m2::RectD BookmarkManager::GetCategoryRect(kml::MarkGroupId categoryId) const
{
CHECK_THREAD_CHECKER(m_threadChecker, ());
auto const category = GetBmCategory(categoryId);
CHECK(category != nullptr, ());
m2::RectD rect;
if (category->IsEmpty())
return rect;
for (auto markId : category->GetUserMarks())
{
auto const bookmark = GetBookmark(markId);
rect.Add(bookmark->GetPivot());
}
for (auto trackId : category->GetUserLines())
{
auto const track = GetTrack(trackId);
rect.Add(track->GetLimitRect());
}
return rect;
}
kml::CategoryData const & BookmarkManager::GetCategoryData(kml::MarkGroupId categoryId) const
{
CHECK_THREAD_CHECKER(m_threadChecker, ());

1
map/bookmark_manager.hpp
View file

@ -179,6 +179,7 @@ public:
std::string GetCategoryName(kml::MarkGroupId categoryId) const;
std::string GetCategoryFileName(kml::MarkGroupId categoryId) const;
m2::RectD GetCategoryRect(kml::MarkGroupId categoryId) const;
kml::CategoryData const & GetCategoryData(kml::MarkGroupId categoryId) const;
kml::MarkGroupId GetCategoryId(std::string const & name) const;

26
map/framework.cpp
View file

@ -1103,42 +1103,26 @@ void Framework::ShowBookmark(Bookmark const * mark)
void Framework::ShowTrack(kml::TrackId trackId)
{
double const kPaddingScale = 1.2;
auto const track = GetBookmarkManager().GetTrack(trackId);
if (track == nullptr)
return;
StopLocationFollow();
auto rect = track->GetLimitRect();
rect.Scale(kPaddingScale);
ExpandBookmarksRectForPreview(rect);
StopLocationFollow();
ShowRect(rect);
}
void Framework::ShowBookmarkCategory(kml::MarkGroupId categoryId, bool animation)
{
auto const & bm = GetBookmarkManager();
if (bm.IsCategoryEmpty(categoryId))
return;
m2::RectD rect;
for (auto const id : bm.GetUserMarkIds(categoryId))
{
auto const bookmark = bm.GetBookmark(id);
rect.Add(bookmark->GetPivot());
}
for (auto const id : bm.GetTrackIds(categoryId))
{
auto const track = bm.GetTrack(id);
rect.Add(track->GetLimitRect());
}
auto rect = GetBookmarkManager().GetCategoryRect(categoryId);
if (!rect.IsValid())
return;
double const kPaddingScale = 1.2;
ExpandBookmarksRectForPreview(rect);
StopLocationFollow();
rect.Scale(kPaddingScale);
ShowRect(rect, -1 /* maxScale */, animation);
}

5
qt/CMakeLists.txt
View file

@ -162,6 +162,11 @@ copy_resources(
countries-strings
resources-default
resources-mdpi_clear
resources-hdpi_clear
resources-xhdpi_clear
resources-xxhdpi_clear
resources-xxxhdpi_clear
resources-6plus_clear
cuisine-strings
taxi_places
eula.html

2
qt/mainwindow.cpp
View file

@ -81,7 +81,7 @@ MainWindow::MainWindow(Framework & framework, bool apiOpenGLES3,
{
screenshotParams->m_statusChangedFn = [this](std::string const & state, bool finished)
{
statusBar()->showMessage(QString::fromStdString("Screenshot mode. " + state));
statusBar()->showMessage(QString::fromStdString(state));
if (finished)
QCoreApplication::quit();
};

56
qt/screenshoter.cpp
View file

@ -37,6 +37,13 @@ void Screenshoter::Start()
if (m_screenshotParams.m_dstPath.empty())
m_screenshotParams.m_dstPath = base::JoinPath(m_screenshotParams.m_kmlPath, "screenshots");
LOG(LINFO, ("\nScreenshoter parameters:"
"\n kml_path:", m_screenshotParams.m_kmlPath,
"\n dst_path:", m_screenshotParams.m_dstPath,
"\n width:", m_screenshotParams.m_width,
"\n height:", m_screenshotParams.m_height,
"\n dpi_scale:", m_screenshotParams.m_dpiScale));
if (!Platform::IsDirectory(m_screenshotParams.m_kmlPath) || !Platform::MkDirChecked(m_screenshotParams.m_dstPath))
{
ChangeState(State::FileError);
@ -60,16 +67,16 @@ void Screenshoter::Start()
void Screenshoter::ProcessNextKml()
{
CHECK_EQUAL(m_state, State::Ready, ());
ChangeState(State::LoadKml);
std::string const prefix = languages::GetCurrentNorm() + "_";
std::string const postfix = "_" + languages::GetCurrentNorm();
std::unique_ptr<kml::FileData> kmlData;
while (kmlData == nullptr && !m_filesToProcess.empty())
{
auto const filePath = m_filesToProcess.front();
m_filesToProcess.pop_front();
m_nextScreenshotName = prefix + base::GetNameFromFullPathWithoutExt(filePath);
m_nextScreenshotName = base::GetNameFromFullPathWithoutExt(filePath) + postfix;
ChangeState(State::LoadKml);
kmlData = LoadKmlFile(filePath, KmlFileType::Text);
if (kmlData != nullptr && kmlData->m_bookmarksData.empty() && kmlData->m_tracksData.empty())
kmlData.reset();
@ -96,6 +103,11 @@ void Screenshoter::ProcessNextKml()
ChangeState(State::WaitPosition);
auto const newCatId = bookmarkManager.GetBmGroupsIdList().front();
m_dataRect = bookmarkManager.GetCategoryRect(newCatId);
ExpandBookmarksRectForPreview(m_dataRect);
CHECK(m_dataRect.IsValid(), ());
m_framework.ShowBookmarkCategory(newCatId, false);
}
@ -122,7 +134,10 @@ void Screenshoter::PrepareCountries()
}
if (m_countriesToDownload.empty())
{
ChangeState(State::WaitGraphics);
WaitGraphics();
}
}
void Screenshoter::OnCountryChanged(storage::CountryId countryId)
@ -135,7 +150,11 @@ void Screenshoter::OnCountryChanged(storage::CountryId countryId)
{
m_countriesToDownload.erase(countryId);
if (m_countriesToDownload.empty())
WaitGraphics();
{
ChangeState(State::WaitGraphics);
auto const kDelay = std::chrono::seconds(3);
GetPlatform().RunDelayedTask(Platform::Thread::File, kDelay, [this]{ WaitGraphics(); });
}
}
}
@ -144,7 +163,18 @@ void Screenshoter::OnViewportChanged()
if (m_state != State::WaitPosition)
return;
PrepareCountries();
auto const currentViewport = m_framework.GetCurrentViewport();
double const kEpsRect = 1e-2;
double const kEpsCenter = 1e-3;
double const minCheckedZoomLevel = 5;
if (m_framework.GetDrawScale() < minCheckedZoomLevel ||
(m_dataRect.Center().EqualDxDy(currentViewport.Center(), kEpsCenter) &&
(fabs(m_dataRect.SizeX() - currentViewport.SizeX()) < kEpsRect ||
fabs(m_dataRect.SizeY() - currentViewport.SizeY()) < kEpsRect)))
{
PrepareCountries();
}
}
void Screenshoter::OnGraphicsReady()
@ -158,7 +188,6 @@ void Screenshoter::OnGraphicsReady()
void Screenshoter::WaitGraphics()
{
ChangeState(State::WaitGraphics);
m_framework.NotifyGraphicsReady([this]()
{
GetPlatform().RunTask(Platform::Thread::Gui, [this] { OnGraphicsReady(); });
@ -169,10 +198,20 @@ void Screenshoter::SaveScreenshot()
{
CHECK_EQUAL(m_state, State::Ready, ());
if (!Platform::MkDirChecked(m_screenshotParams.m_dstPath))
{
ChangeState(State::FileError);
return;
}
QPixmap pixmap(QSize(m_screenshotParams.m_width, m_screenshotParams.m_height));
m_widget->render(&pixmap, QPoint(), QRegion(m_widget->geometry()));
pixmap.save(QString::fromStdString(base::JoinPath(m_screenshotParams.m_dstPath, m_nextScreenshotName + ".png")),
nullptr, 100);
if (!pixmap.save(QString::fromStdString(base::JoinPath(m_screenshotParams.m_dstPath, m_nextScreenshotName + ".png")),
nullptr, 100))
{
ChangeState(State::FileError);
return;
}
m_nextScreenshotName.clear();
ProcessNextKml();
@ -186,6 +225,7 @@ void Screenshoter::ChangeState(State newState)
std::ostringstream ss;
ss << "[" << m_filesCount - m_filesToProcess.size() << "/" << m_filesCount << "] file: "
<< m_nextScreenshotName << " state: " << DebugPrint(newState);
LOG(LINFO, (ss.str()));
m_screenshotParams.m_statusChangedFn(ss.str(), newState == Screenshoter::State::Done);
}
}

1
qt/screenshoter.hpp
View file

@ -70,6 +70,7 @@ private:
size_t m_filesCount = 0;
std::set<storage::CountryId> m_countriesToDownload;
std::string m_nextScreenshotName;
m2::RectD m_dataRect;
};
std::string DebugPrint(Screenshoter::State state);