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

implementing visual log. see IPlatform::IsVisualLog and InformationDisplay for details.

Browse source
This commit is contained in:
rachytski 2011-02-23 01:25:08 +02:00 • committed by Alex Zolotarev
parent cbc41ff256
commit 08a1d43923
13 changed files with 137 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
base/logging.cpp
View file

@ -3,6 +3,7 @@
#include "macros.hpp"
#include "timer.hpp"
#include "../std/iostream.hpp"
#include "../std/iomanip.hpp"
namespace my
{
@ -36,7 +37,7 @@ namespace my
else
std::cerr << level;
int64_t const milliseconds = static_cast<int64_t>(s_Timer.ElapsedSeconds() * 1000 + 0.5);
std::cerr << " " << milliseconds / 1000 << "." << (milliseconds % 1000);
std::cerr << " " << std::setw(3) << milliseconds / 1000 << "." << std::setw(4) << std::setiosflags(std::ios::left) << (milliseconds % 1000) << std::resetiosflags(std::ios::left);
std::cerr << " " << srcPoint.FileName() << ":" << srcPoint.Line() << " " << srcPoint.Function()
<< "() " << msg << endl;
@ -44,7 +45,12 @@ namespace my
}
#endif
void (*LogMessage)(LogLevel, SrcPoint const &, string const &) = &LogMessageDefault;
LogMessageFn LogMessage = &LogMessageDefault;
void SetLogMessageFn(LogMessageFn fn)
{
LogMessage = fn;
};
#ifdef DEBUG
LogLevel g_LogLevel = LDEBUG;

6
base/logging.hpp
View file

@ -14,8 +14,12 @@ namespace my
LCRITICAL
};
extern void (*LogMessage)(LogLevel level, SrcPoint const &, string const &);
typedef void (*LogMessageFn)(LogLevel level, SrcPoint const &, string const &);
extern LogMessageFn LogMessage;
extern LogLevel g_LogLevel;
void SetLogMessageFn(LogMessageFn fn);
}
using ::my::LDEBUG;

1
iphone/Maps/Platform/IPhonePlatform.hpp
View file

@ -22,6 +22,7 @@ public:
virtual double PeriodicalUpdateInterval() const;
virtual vector<string> GetFontNames() const;
virtual bool IsBenchmarking() const;
virtual bool IsVisualLog() const;
virtual string const DeviceID() const;
private:

7
iphone/Maps/Platform/IPhonePlatform.mm
View file

@ -188,12 +188,17 @@ vector<string> IPhonePlatform::GetFontNames() const
return res;
}
bool IPhonePlatform::IsBenchmarking() const
{
return false;
}
bool IPhonePlatform::IsVisualLog() const
{
return false;
}
string const IPhonePlatform::DeviceID() const
{
return m_deviceID;

2
map/framework.hpp
View file

@ -189,6 +189,8 @@ public:
m_informationDisplay.enableDebugInfo(true);
#endif
m_informationDisplay.enableLog(GetPlatform().IsVisualLog(), m_windowHandle.get());
m_informationDisplay.enableBenchmarkInfo(m_isBenchmarking);
m_informationDisplay.setVisualScale(GetPlatform().VisualScale());

72
map/information_display.cpp
View file

@ -12,6 +12,7 @@
#include "../base/string_utils.hpp"
#include "../base/logging.hpp"
#include "../base/mutex.hpp"
InformationDisplay::InformationDisplay()
: m_headingOrientation(-math::pi / 2)
@ -402,6 +403,75 @@ void InformationDisplay::drawMemoryWarning(DrawerYG * drawer)
enableMemoryWarning(false);
}
bool InformationDisplay::s_isLogEnabled = false;
list<string> InformationDisplay::s_log;
size_t InformationDisplay::s_logSize = 10;
my::LogMessageFn InformationDisplay::s_oldLogFn = 0;
threads::Mutex s_logMutex;
WindowHandle * InformationDisplay::s_windowHandle = 0;
void InformationDisplay::logMessage(my::LogLevel level, my::SrcPoint const & srcPoint, string const & msg)
{
{
threads::MutexGuard guard(s_logMutex);
ostringstream out;
char const * names[] = { "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL" };
out << "LOG ";
if (level >= 0 && level <= static_cast<int>(ARRAY_SIZE(names)))
out << names[level];
else
out << level;
// out << " " << srcPoint.FileName() << ":" << srcPoint.Line() << " " << srcPoint.Function()
// << "() " << msg << endl;
out << msg << endl;
s_log.push_back(out.str());
while (s_log.size() > s_logSize)
s_log.pop_front();
}
/// call redisplay
s_windowHandle->invalidate();
}
void InformationDisplay::enableLog(bool doEnable, WindowHandle * windowHandle)
{
if (doEnable == s_isLogEnabled)
return;
s_isLogEnabled = doEnable;
if (s_isLogEnabled)
{
s_oldLogFn = my::LogMessage;
my::LogMessage = logMessage;
s_windowHandle = windowHandle;
}
else
{
my::LogMessage = s_oldLogFn;
s_windowHandle = 0;
}
}
void InformationDisplay::drawLog(DrawerYG * pDrawer)
{
threads::MutexGuard guard(s_logMutex);
for (list<string>::const_iterator it = s_log.begin(); it != s_log.end(); ++it)
{
m_yOffset += 20;
pDrawer->screen()->drawText(
m2::PointD(m_displayRect.minX() + 10, m_displayRect.minY() + m_yOffset),
0, 10,
yg::Color(0, 0, 0, 255),
it->c_str(),
true,
yg::Color(255, 255, 255, 255),
yg::maxDepth,
true,
false
);
}
}
void InformationDisplay::enableBenchmarkInfo(bool doEnable)
{
m_isBenchmarkInfoEnabled = doEnable;
@ -499,4 +569,6 @@ void InformationDisplay::doDraw(DrawerYG *drawer)
drawMemoryWarning(drawer);
if (m_isBenchmarkInfoEnabled)
drawBenchmarkInfo(drawer);
if (s_isLogEnabled)
drawLog(drawer);
}

14
map/information_display.hpp
View file

@ -1,9 +1,11 @@
#pragma once
#include "window_handle.hpp"
#include "../geometry/point2d.hpp"
#include "../geometry/rect2d.hpp"
#include "../geometry/screenbase.hpp"
#include "../base/timer.hpp"
#include "../base/logging.hpp"
class DrawerYG;
@ -63,6 +65,12 @@ private:
my::Timer m_lastMemoryWarning;
bool m_isMemoryWarningEnabled;
static bool s_isLogEnabled;
static my::LogMessageFn s_oldLogFn;
static list<string> s_log;
static size_t s_logSize;
static WindowHandle * s_windowHandle;
public:
InformationDisplay();
@ -110,4 +118,10 @@ public:
void drawBenchmarkInfo(DrawerYG * pDrawer);
void doDraw(DrawerYG * drawer);
void enableLog(bool doEnable, WindowHandle * windowHandle);
void setLogSize(size_t logSize);
void drawLog(DrawerYG * pDrawer);
static void logMessage(my::LogLevel, my::SrcPoint const &, string const &);
};

2
platform/platform.hpp
View file

@ -73,6 +73,8 @@ public:
virtual bool IsBenchmarking() const = 0;
virtual bool IsVisualLog() const = 0;
virtual string const DeviceID() const = 0;
};

5
platform/qtplatform.cpp
View file

@ -389,6 +389,11 @@ public:
{
return "DesktopVersion";
}
bool IsVisualLog() const
{
return false;
}
};
extern "C" Platform & GetPlatform()

2
yg/area_renderer.cpp
View file

@ -27,7 +27,7 @@ namespace yg
void AreaRenderer::endFrame()
{
if (isDebugging())
LOG(LINFO, ("Drawing ", m_areasCount, " areas comprised of ", m_trianglesCount, " triangles total"));
LOG(LINFO, ("Drawing ", m_areasCount, " areas, ", m_trianglesCount, " triangles total"));
base_t::endFrame();
}

18
yg/geometry_batcher.cpp
View file

@ -107,6 +107,11 @@ namespace yg
{
base_t::beginFrame();
reset(-1);
for (size_t i = 0; i < m_pipelines.size(); ++i)
{
m_pipelines[i].m_verticesDrawn = 0;
m_pipelines[i].m_indicesDrawn = 0;
}
}
void GeometryBatcher::clear(yg::Color const & c, bool clearRT, float depth, bool clearDepth)
@ -127,6 +132,13 @@ namespace yg
/// Syncronization point.
enableClipRect(false);
OGLCHECK(glFinish());
if (isDebugging())
{
for (size_t i = 0; i < m_pipelines.size(); ++i)
LOG(LINFO, ("pipeline #", i, " vertices=", m_pipelines[i].m_verticesDrawn, ", triangles=", m_pipelines[i].m_indicesDrawn / 3));
}
base_t::endFrame();
}
@ -174,7 +186,11 @@ namespace yg
if (isDebugging())
LOG(LINFO, ("Pipeline #", i - 1, "draws ", pipeline.m_currentIndex / 3, "/", pipeline.m_maxIndices / 3," triangles"));
{
pipeline.m_verticesDrawn += pipeline.m_currentVertex;
pipeline.m_indicesDrawn += pipeline.m_currentIndex;
// LOG(LINFO, ("Pipeline #", i - 1, "draws ", pipeline.m_currentIndex / 3, "/", pipeline.m_maxIndices / 3," triangles"));
}
renderedData = true;

3
yg/geometry_batcher.hpp
View file

@ -56,6 +56,9 @@ namespace yg
struct GeometryPipeline
{
size_t m_verticesDrawn;
size_t m_indicesDrawn;
size_t m_currentVertex;
size_t m_currentIndex;

2
yg/path_renderer.cpp
View file

@ -259,7 +259,7 @@ namespace yg
void PathRenderer::endFrame()
{
if (isDebugging())
LOG(LINFO, ("Drawing ", m_pathCount, " pathes comprised of ", m_pointsCount, " points total"));
LOG(LINFO, ("Drawing ", m_pathCount, " pathes, ", m_pointsCount, " points total"));
base_t::endFrame();
}