root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modifiche dalla versione Linux sulla 2.1

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@11848 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2004-03-12 23:41:28 +00:00
parent 1d697528db
commit 4370098e6f
4 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/printapp.cpp
View File

@ -970,7 +970,7 @@ void TPrint_application::set_row (
#ifdef __LONGDOUBLE__ #ifdef __LONGDOUBLE__
sprintf (q.get_buffer(), formato, (long double)rrr); sprintf (q.get_buffer(), formato, (long double)rrr);
#else #else
rrr.sprintf(q.get_buffer(), (char*)(const char*)formato); q = rrr.format(formato);
#endif #endif
} }
if (rrr.is_zero () && !_print_zero) if (rrr.is_zero () && !_print_zero)
@ -1484,7 +1484,7 @@ bool TPrint_application::print_one (
#ifdef __LONGDOUBLE__ #ifdef __LONGDOUBLE__
sprintf(ps.get_buffer(), fff, (long double)rrr); sprintf(ps.get_buffer(), fff, (long double)rrr);
#else #else
rrr.sprintf(ps.get_buffer(), (char*)fff); ps = rrr.format(fff);
#endif #endif
} }
if (rrr.is_zero () && !_print_zero) if (rrr.is_zero () && !_print_zero)

12
include/real.cpp
View File

@ -1579,6 +1579,18 @@ const char* real::string(const char *picture) const
return f; return f;
} }
// Certified 50%
const char* real::format(const char *picture) const
{
if (*picture == '\0')
return string ();
TString& f = get_tmp_string();
dsprintf((char *)(const char *) f, (char *) picture, ptr());
return f;
}
// Certified 99% // Certified 99%
const char* real::stringa (int len, int dec, char pad) const const char* real::stringa (int len, int dec, char pad) const
{ {

2
include/real.h
View File

@ -206,6 +206,8 @@ public:
const char* stringa(int len = 0, int dec = UNDEFINED, char pad = ' ') const; const char* stringa(int len = 0, int dec = UNDEFINED, char pad = ' ') const;
// @cmember Ritorna la stringa con il formato passato // @cmember Ritorna la stringa con il formato passato
const char* string(const char* picture) const; const char* string(const char* picture) const;
// @cmember Ritorna la stringa con il formato passato
const char* real::format(const char *picture) const;
// @cmember Ritorna la precisione del reale (numero di decimali) // @cmember Ritorna la precisione del reale (numero di decimali)
int precision() const; int precision() const;

15
include/xml.cpp
View File

@ -1,8 +1,12 @@
#include "real.h" #include "real.h"
#include "xml.h" #include "xml.h"
#ifdef WIN32
#include <fstream.h> #include <fstream.h>
#include <strstrea.h> #include <strstrea.h>
#else
#include <incstr.h>
#endif
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// Utilities // Utilities
@ -417,8 +421,10 @@ void TXmlItem::Write(ostream& outf, int tab) const
} }
if (GetChildren() > 0) if (GetChildren() > 0)
{ {
int n;
outf << '>'; outf << '>';
for (int n = 0; ; n++) for (n = 0; ; n++)
{ {
TXmlItem* c = GetChild(n); TXmlItem* c = GetChild(n);
if (c == NULL) if (c == NULL)
@ -444,7 +450,12 @@ void TXmlItem::AsString(TString& str) const
{ {
char* buf = str.get_buffer(nSize); char* buf = str.get_buffer(nSize);
memset(buf, 0, nSize); memset(buf, 0, nSize);
#ifdef WIN32
ostrstream outf(buf, nSize); ostrstream outf(buf, nSize);
#else
ostringstream outf(buf);
#endif
Write(outf, 0); Write(outf, 0);
if (buf[nSize-1] == '\0') if (buf[nSize-1] == '\0')
break; break;
@ -486,7 +497,7 @@ TXmlItem* TXmlItem::FindFirst(const char* strTag) const
} }
TXmlItem::TXmlItem() TXmlItem::TXmlItem()
: m_strTag(15), m_Attributes(NULL), m_Children(NULL), m_strText(NULL) : m_strTag(15), m_strText(NULL), m_Attributes(NULL), m_Children(NULL)
{ } { }
TXmlItem::~TXmlItem() TXmlItem::~TXmlItem()