SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert number format

Browse Source 
fixes #495
This commit is contained in:
Sergei Krasilnikov 2024-01-24 23:05:46 +03:00
parent 76c68c9f18
commit 8333b9283d
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qucs/diagrams/rectdiagram.cpp
View File

@ -118,8 +118,6 @@ MappedPoint RectDiagram::pointToValue(const QPointF& point)
}
void RectDiagram::setLimitsBySelectionRect(QRectF select) {
int i;
double a, b, c;
// Set the diagram limits.
auto minValue = pointToValue(select.bottomLeft());
@ -233,7 +231,7 @@ if(xAxis.log) {
Lines.prepend(new qucs::Line(z, y2, z, 0, GridPen)); // x grid
if((zD < 1.5*zDstep) || (z == 0) || (z == x2)) {
if (engineeringNotation) tmp = misc::num2str(zD, 2);
if (engineeringNotation) tmp = misc::num2str(zD);
else tmp = misc::StringNiceNum(zD);
if(xAxis.up < 0.0) tmp = '-'+tmp;
w = metrics.boundingRect(tmp).width(); // width of text
@ -245,11 +243,11 @@ if(xAxis.log) {
zD += zDstep;
if(zD > 9.5*zDstep) zDstep *= 10.0;
if(back) {
z = int(corr*log10(zD / fabs(xAxis.up)) + 0.5); // int() implies floor()
z = lround(corr*log10(zD / fabs(xAxis.up)));
z = x2 - z;
}
else
z = int(corr*log10(zD / fabs(xAxis.low)) + 0.5);// int() implies floor()
z = lround(corr*log10(zD / fabs(xAxis.low)));
}
}
else { // not logarithmical
@ -263,7 +261,7 @@ else { // not logarithmical
z = int(zD); // "int(...)" implies "floor(...)"
while((z <= x2) && (z >= 0)) { // create all grid lines
if(fabs(GridNum) < 0.01*pow(10.0, Expo)) GridNum = 0.0;// make 0 really 0
if (engineeringNotation) tmp = misc::num2str(GridNum, 2);
if (engineeringNotation) tmp = misc::num2str(GridNum);
else tmp = misc::StringNiceNum(GridNum);
w = metrics.boundingRect(tmp).width(); // width of text
// center text horizontally under the x tick mark

10
qucs/misc.cpp
View File

@ -181,9 +181,7 @@ QString misc::StringNum(double num, char form, int Precision)
// #########################################################################
QString misc::StringNiceNum(double num)
{
// char Format[6] = "%.8e";
// TEMP: lower precision to avoid overly long graph axis values.
char Format[6] = "%.2e";
char Format[6] = "%.8e";
if(fabs(num) < 1e-250) return QString("0"); // avoid many problems
if(fabs(log10(fabs(num))) < 3.0) Format[3] = 'g';
@ -236,10 +234,10 @@ void misc::str2num(const QString& s_, double& Number, QString& Unit, double& Fac
}*/
QRegularExpression Expr( QRegularExpression("[^0-9\\x2E\\x2D\\x2B]") );
int i = str.indexOf( Expr );
auto i = str.indexOf( Expr );
if(i >= 0)
if((str.at(i).toLatin1() | 0x20) == 'e') {
int j = str.indexOf( Expr , ++i);
auto j = str.indexOf( Expr , ++i);
if(j == i) j--;
i = j;
}
@ -267,8 +265,6 @@ void misc::str2num(const QString& s_, double& Number, QString& Unit, double& Fac
{
Factor = 1.0;
}
return;
}
// #########################################################################