lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-17 06:46:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update source to v6.8.18240.20051

Browse Source 
Previous source was actually for 6.1...
This commit is contained in:
Will Pearson
2018-09-15 11:26:15 -07:00
committed by Bozo
parent 0ae09c4811
commit 5f462fed0d
124 changed files with 27735 additions and 4925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
opennurbs_textlog.cpp
View File

@@ -49,20 +49,32 @@ ON_TextLogIndent::~ON_TextLogIndent()
//////////////////////////////////////////////////////////////////////////////
ON_TextLog::ON_TextLog() : m_pFile(0), m_pString(0), m_indent(""), m_beginning_of_line(1), m_indent_size(0)
ON_TextLog::ON_TextLog()
{
SetFloatFormat("%g");
SetDoubleFormat("%.17g");
}
ON_TextLog::ON_TextLog( FILE* pFile ) : m_pFile(pFile), m_pString(0), m_indent(""), m_beginning_of_line(1), m_indent_size(0)
ON_TextLog::ON_TextLog( FILE* pFile )
: m_pFile(pFile)
, m_bNullTextLog(((ON__UINT_PTR)pFile) <= ON_PTR_SEMAPHORE_MAX)
{
if (m_bNullTextLog)
{
m_pFile = nullptr;
}
SetFloatFormat("%g");
SetDoubleFormat("%.17g");
}
ON_TextLog::ON_TextLog( ON_wString& wstr ) : m_pFile(0), m_pString(&wstr), m_indent(""), m_beginning_of_line(1), m_indent_size(0)
ON_TextLog::ON_TextLog( ON_wString& wstr )
: m_pString(&wstr)
, m_bNullTextLog(((ON__UINT_PTR)&wstr) <= ON_PTR_SEMAPHORE_MAX)
{
if (m_bNullTextLog)
{
m_pString = nullptr;
}
SetFloatFormat("%g");
SetDoubleFormat("%.17g");
}
@@ -164,6 +176,12 @@ void ON_TextLog::SetIndentCount(
void ON_VARGS_FUNC_CDECL ON_TextLog::Print(const char* format, ...)
{
if (m_bNullTextLog)
return;
// NOTE:
// This code does not work on Traditional Chinese Windows 10.
//
if (nullptr == format || 0 == format[0])
return;
@@ -206,6 +224,9 @@ void ON_VARGS_FUNC_CDECL ON_TextLog::Print(const char* format, ...)
void ON_VARGS_FUNC_CDECL ON_TextLog::Print(const wchar_t* format, ...)
{
if (m_bNullTextLog)
return;
if (nullptr == format || 0 == format[0])
return;
@@ -246,23 +267,19 @@ void ON_VARGS_FUNC_CDECL ON_TextLog::Print(const wchar_t* format, ...)
}
static bool Internal_TextLogIsNull(const void* p)
{
const bool bTextLogIsNull = (1 == ((ON__INT_PTR)p));
return bTextLogIsNull;
}
void ON_TextLog::AppendText( const char* s )
{
// This is a virtual function
if (m_bNullTextLog)
return;
if ( s && *s )
{
if ( m_pString)
if ( nullptr != m_pString)
{
if ( false == Internal_TextLogIsNull(m_pString) )
(*m_pString) += s;
(*m_pString) += s;
}
else if ( m_pFile )
else if ( nullptr != m_pFile )
{
fputs( s, m_pFile );
}
@@ -276,10 +293,12 @@ void ON_TextLog::AppendText( const char* s )
void ON_TextLog::AppendText( const wchar_t* s )
{
// This is a virtual function
if ( m_pString )
if (m_bNullTextLog)
return;
if ( nullptr != m_pString )
{
if ( false == Internal_TextLogIsNull(m_pString) )
(*m_pString) += s;
(*m_pString) += s;
}
else
{
@@ -541,6 +560,19 @@ void ON_TextLog::PrintRGB( const ON_Color& color )
Print("%d %d %d",color.Red(),color.Green(),color.Blue());
}
void ON_TextLog::PrintCurrentTime()
{
struct tm current_time;
memset(&current_time, 0, sizeof(current_time));
time_t uct = time(nullptr);
const struct tm* t = gmtime(&uct);
if (t)
{
current_time = *t;
}
PrintTime(current_time);
}
void ON_TextLog::PrintTime( const struct tm& t )
{
if ( 0 != t.tm_sec