diff --git a/hurricane/src/hurricane/DbU.cpp b/hurricane/src/hurricane/DbU.cpp index cb2da7b9..f941a1bc 100644 --- a/hurricane/src/hurricane/DbU.cpp +++ b/hurricane/src/hurricane/DbU.cpp @@ -260,16 +260,16 @@ namespace Hurricane { if ( _stringMode == Grid ) { unitSymbol = 'g'; - snprintf ( buffer, 1024, "%.3f", getGrid(u) ); + snprintf ( buffer, 1024, "%.1f", getGrid(u) ); } else if ( _stringMode == Symbolic ) { unitSymbol = 'l'; - snprintf ( buffer, 1024, "%.3f", getLambda(u) ); + snprintf ( buffer, 1024, "%.1f", getLambda(u) ); } else if ( _stringMode == Physical ) { switch ( _stringModeUnitPower ) { case Pico: unitSymbol = 'p'; break; case Nano: unitSymbol = 'n'; break; - case Micro: unitSymbol = 'm'; break; - case Milli: unitSymbol = 'M'; break; + case Micro: unitSymbol = 'u'; break; + case Milli: unitSymbol = 'm'; break; case Unity: unitSymbol = 'U'; break; case Kilo: unitSymbol = 'k'; break; default: unitSymbol = '?'; break; diff --git a/hurricane/src/hviewer/CellWidget.cpp b/hurricane/src/hviewer/CellWidget.cpp index e20f8dd4..5707e913 100644 --- a/hurricane/src/hviewer/CellWidget.cpp +++ b/hurricane/src/hviewer/CellWidget.cpp @@ -1906,7 +1906,7 @@ namespace Hurricane { textGrad = DbU::getValueString( gradStep*tick , DbU::SmartTruncate|((symbolicMode())?DbU::Symbolic:DbU::Grid) ); - textGrad.resize ( textGrad.size()-1 ); + if ( tick ) textGrad.resize ( textGrad.size()-1 ); drawDisplayText ( QPoint ( pxGrad - 1, pxOrigin.y() + tickLength ) , textGrad.c_str() @@ -1922,7 +1922,7 @@ namespace Hurricane { textGrad = DbU::getValueString ( angle.getX() - origin.getX() , DbU::SmartTruncate|((symbolicMode())?DbU::Symbolic:DbU::Grid) ); - textGrad.resize ( textGrad.size()-1 ); + //textGrad.resize ( textGrad.size()-1 ); drawDisplayText ( QPoint ( pxAngle.x() - 1,pxAngle.y() + tickLength ) , textGrad.c_str() @@ -1966,7 +1966,7 @@ namespace Hurricane { textGrad = DbU::getValueString( gradStep*tick , DbU::SmartTruncate|((symbolicMode())?DbU::Symbolic:DbU::Grid) ); - textGrad.resize ( textGrad.size()-1 ); + if ( tick ) textGrad.resize ( textGrad.size()-1 ); drawDisplayText ( QPoint(pxOrigin.x() - tickLength,pyGrad + 1) , textGrad.c_str() @@ -1982,7 +1982,7 @@ namespace Hurricane { textGrad = DbU::getValueString( angle.getY() - origin.getY() , DbU::SmartTruncate|((symbolicMode())?DbU::Symbolic:DbU::Grid) ); - textGrad.resize ( textGrad.size()-1 ); + //textGrad.resize ( textGrad.size()-1 ); drawDisplayText ( QPoint(pxOrigin.x() - tickLength,pxAngle.y() + 1) , textGrad.c_str()