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

Carried out heavy log functions into cpp files.

Browse source
This commit is contained in:
vng 2011-07-03 12:57:10 +03:00 • committed by Alex Zolotarev
parent dd135f2c5a
commit 3aa944980b
7 changed files with 81 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
base/base.pro
View file

@ -24,6 +24,8 @@ SOURCES += \
normalize_unicode.cpp \
runner.cpp \
timer.cpp \
internal/message.cpp \
exception.cpp
HEADERS += \
SRC_FIRST.hpp \

15
base/base_tests/assert_test.cpp
View file

@ -2,6 +2,9 @@
#include "../../testing/testing.hpp"
#include "../../base/base.hpp"
#include "../../base/exception.hpp"
#include "../../base/logging.hpp"
UNIT_TEST(Assert_Smoke)
{
@ -18,3 +21,15 @@ UNIT_TEST(Check_Smoke)
CHECK_NOT_EQUAL ( x, 6, () );
//CHECK_EQUAL ( x, 666, ("Skip this to continue test") );
}
UNIT_TEST(Exception_Formatting)
{
try
{
MYTHROW(RootException, ("String1", "String2", "String3"));
}
catch (RootException const & e)
{
LOG(LINFO, ("Exception string: ", e.what()));
}
}

21
base/exception.cpp Normal file
View file

@ -0,0 +1,21 @@
#include "exception.hpp"
char const * RootException::what() const throw()
{
size_t const count = m_Msg.size();
string asciiMsg;
asciiMsg.resize(count);
for (size_t i = 0; i < count; ++i)
{
if (static_cast<unsigned char>(m_Msg[i]) < 128)
asciiMsg[i] = char(m_Msg[i]);
else
asciiMsg[i] = '?';
}
static string msg;
msg = string(m_What) + ", \"" + asciiMsg + "\"";
return msg.c_str();
}

20
base/exception.hpp
View file

@ -16,25 +16,7 @@ public:
{
}
virtual char const * what() const throw()
{
size_t const count = m_Msg.size();
string asciiMsg;
asciiMsg.resize(count);
for (size_t i = 0; i < count; ++i)
{
if (static_cast<unsigned char>(m_Msg[i]) < 128)
asciiMsg[i] = char(m_Msg[i]);
else
asciiMsg[i] = '?';
}
static string msg;
msg = string(m_What) + ", \"" + asciiMsg + "\"";
return msg.c_str();
}
virtual char const * what() const throw();
string const & Msg() const throw()
{

27
base/internal/message.cpp Normal file
View file

@ -0,0 +1,27 @@
#include "message.hpp"
string debug_print(string const & t)
{
string res;
res.push_back('\"');
for (string::const_iterator it = t.begin(); it != t.end(); ++it)
{
static char const toHex[] = "0123456789abcdef";
unsigned char const c = static_cast<unsigned char>(*it);
if (c >= ' ' && c <= '~' && c != '\\' && c != '"')
res.push_back(*it);
else
{
res.push_back('\\');
if (c == '\\' || c == '"')
res.push_back(c);
else
{
res.push_back(toHex[c >> 4]);
res.push_back(toHex[c & 0xf]);
}
}
}
res.push_back('\"');
return res;
}

32
base/internal/message.hpp
View file

@ -10,41 +10,21 @@
#include "../../std/vector.hpp"
/// @name Declarations.
//@{
template <typename T> inline string debug_print(T const & t);
inline string debug_print(string const & t);
string debug_print(string const & t);
inline string debug_print(char const * t);
inline string debug_print(char t);
template <typename U, typename V> inline string debug_print(pair<U,V> const & p);
template <typename T> inline string debug_print(list<T> const & v);
template <typename T> inline string debug_print(vector<T> const & v);
template <typename T> inline string debug_print(set<T> const & v);
template <typename U, typename V> inline string debug_print(map<U,V> const & v);
//@}
inline string debug_print(string const & t)
{
string res;
res.push_back('\"');
for (string::const_iterator it = t.begin(); it != t.end(); ++it)
{
static char const toHex[] = "0123456789abcdef";
unsigned char const c = static_cast<unsigned char>(*it);
if (c >= ' ' && c <= '~' && c != '\\' && c != '"')
res.push_back(*it);
else
{
res.push_back('\\');
if (c == '\\' || c == '"')
res.push_back(c);
else
{
res.push_back(toHex[c >> 4]);
res.push_back(toHex[c & 0xf]);
}
}
}
res.push_back('\"');
return res;
}
inline string debug_print(char const * t)
{

19
map/framework.cpp
View file

@ -451,11 +451,10 @@ void FrameWork<TModel>::AddRedrawCommandSure()
template <typename TModel>
void FrameWork<TModel>::SendBenchmarkResults()
{
// ofstream fout(GetPlatform().WritablePathForFile("benchmarks/results.txt").c_str(), ios::app);
// fout << "[COMPLETED]";
// fout.close();
/// send to server for adding to statistics graphics
/// and delete results file
//ofstream fout(GetPlatform().WritablePathForFile("benchmarks/results.txt").c_str(), ios::app);
//fout << "[COMPLETED]";
//fout.close();
/// @todo send to server for adding to statistics graphics and delete results file
}
template <typename TModel>
@ -690,7 +689,8 @@ void FrameWork<TModel>::AddRedrawCommandSure()
}
template <typename TModel>
void FrameWork<TModel>::initializeGL(shared_ptr<yg::gl::RenderContext> const & primaryContext,
void FrameWork<TModel>::initializeGL(
shared_ptr<yg::gl::RenderContext> const & primaryContext,
shared_ptr<yg::ResourceManager> const & resourceManager)
{
m_resourceManager = resourceManager;
@ -844,8 +844,7 @@ void FrameWork<TModel>::AddRedrawCommandSure()
void FrameWork<TModel>::PaintImpl(shared_ptr<PaintEvent> e,
ScreenBase const & screen,
m2::RectD const & selectRect,
int scaleLevel
)
int scaleLevel)
{
fwork::DrawProcessor doDraw(selectRect, screen, e, scaleLevel, m_renderQueue.renderStatePtr(), e->drawer()->screen()->glyphCache());
m_renderQueue.renderStatePtr()->m_isEmptyModelCurrent = true;
@ -1149,7 +1148,7 @@ void FrameWork<TModel>::AddRedrawCommandSure()
void FrameWork<TModel>::Move(double azDir, double factor)
{
m_navigator.Move(azDir, factor);
// m_tiler.seed(m_navigator.Screen(), m_tileSize);
//m_tiler.seed(m_navigator.Screen(), m_tileSize);
UpdateNow();
}
//@}
@ -1178,7 +1177,7 @@ void FrameWork<TModel>::AddRedrawCommandSure()
void FrameWork<TModel>::Scale(double scale)
{
m_navigator.Scale(scale);
// m_tiler.seed(m_navigator.Screen(), m_tileSize);
//m_tiler.seed(m_navigator.Screen(), m_tileSize);
UpdateNow();
}