Changed floats to doubles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -109,7 +109,7 @@ wxExpr::wxExpr(long the_integer)
|
|||||||
next = NULL;
|
next = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxExpr::wxExpr(float the_real)
|
wxExpr::wxExpr(double the_real)
|
||||||
{
|
{
|
||||||
type = wxExprReal;
|
type = wxExprReal;
|
||||||
value.real = the_real;
|
value.real = the_real;
|
||||||
@@ -428,7 +428,7 @@ void wxExpr::AddAttributeValue(const wxString& attribute, long val)
|
|||||||
Append(listExpr);
|
Append(listExpr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxExpr::AddAttributeValue(const wxString& attribute, float val)
|
void wxExpr::AddAttributeValue(const wxString& attribute, double val)
|
||||||
{
|
{
|
||||||
if (type != wxExprList)
|
if (type != wxExprList)
|
||||||
{
|
{
|
||||||
@@ -584,6 +584,18 @@ bool wxExpr::GetAttributeValue(const wxString& att, long& var) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool wxExpr::GetAttributeValue(const wxString& att, float& var) const
|
bool wxExpr::GetAttributeValue(const wxString& att, float& var) const
|
||||||
|
{
|
||||||
|
wxExpr *expr = AttributeValue(att);
|
||||||
|
if (expr && (expr->Type() == wxExprInteger || expr->Type() == wxExprReal))
|
||||||
|
{
|
||||||
|
var = (float) expr->RealValue();
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool wxExpr::GetAttributeValue(const wxString& att, double& var) const
|
||||||
{
|
{
|
||||||
wxExpr *expr = AttributeValue(att);
|
wxExpr *expr = AttributeValue(att);
|
||||||
if (expr && (expr->Type() == wxExprInteger || expr->Type() == wxExprReal))
|
if (expr && (expr->Type() == wxExprInteger || expr->Type() == wxExprReal))
|
||||||
@@ -702,7 +714,7 @@ void wxExpr::WriteExpr(ostream& stream) // Write as any other subexpression
|
|||||||
}
|
}
|
||||||
case wxExprReal:
|
case wxExprReal:
|
||||||
{
|
{
|
||||||
float f = value.real;
|
double f = value.real;
|
||||||
/* Now the parser can cope with this.
|
/* Now the parser can cope with this.
|
||||||
// Prevent printing in 'e' notation. Any better way?
|
// Prevent printing in 'e' notation. Any better way?
|
||||||
if (fabs(f) < 0.00001)
|
if (fabs(f) < 0.00001)
|
||||||
@@ -924,7 +936,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, long val)
|
|||||||
return found;
|
return found;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxExpr *wxExprDatabase::FindClause(const wxString& word, float val)
|
wxExpr *wxExprDatabase::FindClause(const wxString& word, double val)
|
||||||
{
|
{
|
||||||
wxExpr *found = NULL;
|
wxExpr *found = NULL;
|
||||||
while (position && !found)
|
while (position && !found)
|
||||||
@@ -1124,7 +1136,7 @@ char *make_real(char *str1, char *str2)
|
|||||||
char buf[50];
|
char buf[50];
|
||||||
|
|
||||||
sprintf(buf, "%s.%s", str1, str2);
|
sprintf(buf, "%s.%s", str1, str2);
|
||||||
float f = (float)atof(buf);
|
double f = (double)atof(buf);
|
||||||
wxExpr *x = new wxExpr(f);
|
wxExpr *x = new wxExpr(f);
|
||||||
|
|
||||||
return (char *)x;
|
return (char *)x;
|
||||||
@@ -1139,7 +1151,7 @@ char *make_exp(char *str1, char *str2)
|
|||||||
|
|
||||||
double d = mantissa * pow(10.0, exponent);
|
double d = mantissa * pow(10.0, exponent);
|
||||||
|
|
||||||
wxExpr *x = new wxExpr((float)d);
|
wxExpr *x = new wxExpr(d);
|
||||||
|
|
||||||
return (char *)x;
|
return (char *)x;
|
||||||
}
|
}
|
||||||
@@ -1154,7 +1166,7 @@ char *make_exp2(char *str1, char *str2, char *str3)
|
|||||||
|
|
||||||
double d = mantissa * pow(10.0, exponent);
|
double d = mantissa * pow(10.0, exponent);
|
||||||
|
|
||||||
wxExpr *x = new wxExpr((float)d);
|
wxExpr *x = new wxExpr(d);
|
||||||
|
|
||||||
return (char *)x;
|
return (char *)x;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user