improve DoubleToQSting

diff --git a/src/TableViewer/TableViewer_Tool.cxx b/src/TableViewer/TableViewer_Tool.cxx
index b39554d6804a7dc66bdc1223baa020217bfbe006..54de5342aa597f4893dc694fd412cf5dccea7e9a 100755 (executable)
--- a/src/TableViewer/TableViewer_Tool.cxx
+++ b/src/TableViewer/TableViewer_Tool.cxx
@@ -71,12 +71,69 @@ double TableViewer_Tool::ToDouble( const QString& txt, bool& isDone )
 // Function : DoubleToQString
 // Purpose  : convert string to double
 //================================================================
-QString TableViewer_Tool::DoubleToQString( const double val, const bool replaceDot )
-{
-  QString txt = QString::number( val );
-  if ( replaceDot )
-    txt.replace( '.', ',' );
-  return txt;
+QString TableViewer_Tool::DoubleToQString( const double theVal, const int thePrecision, const bool IsRemoveInsignificantZeroes, const bool replaceDot )
+{  
+  char* aResult = new char[256];  
+
+  int aWholePart = int( theVal );
+  QString aWholePartStr = QString::number( aWholePart );
+
+  int i = aWholePartStr.at( 0 ) == '0' ? 1:0;      
+  int aDigitsBeforeDot = aWholePartStr.size() - i;
+  
+  int aFractionalPartLen = thePrecision-aDigitsBeforeDot;  
+  int aFieldWidth = aFractionalPartLen > 0 ? aFractionalPartLen:0;                             
+
+//  char* aFieldWidthStr;
+//  std::sprintf( aFieldWidthStr, "%d", (int)aFieldWidth );
+
+  std::string aFieldWidthStr = QString::number( aFieldWidth ).toStdString();
+
+  std::string aPercent = "%";
+  std::string aFormat = "";
+  std::string aOption = "";
+  
+  int aNum = (int)( theVal*( 10^thePrecision ) );
+  
+  if ( aNum>0 ) {
+    aOption = ".*f";
+  }
+  else {
+    aOption = ".*g";
+  }    
+  
+  aFormat = aPercent+aFieldWidthStr;
+  aFormat += aOption;         
+  
+  std::sprintf( aResult, aFormat.c_str(), aFieldWidth, (double)theVal );    
+    
+  if ( IsRemoveInsignificantZeroes ) {                                                                             
+    string aResultStr = aResult;           
+    string aNewResult = "";        
+    int counter = 0;        
+    for ( int jj = aResultStr.size()-1; jj>=aWholePartStr.size(); --jj ) {
+      if ( aResultStr.at(jj) == '0' || aResultStr.at( jj ) == '.' ) {
+       counter++;
+      } 
+      else {
+        break;
+      }
+    }              
+    for ( int ii = 0;  ii<aResultStr.size()-counter; ii++) {                
+      aNewResult += aResultStr.at( ii );      
+    }  
+    QString aResultQStr( (char*)aNewResult.c_str() );    
+    if( replaceDot ) 
+      aResultQStr.replace( '.', ',' );        
+    return aResultQStr;
+  }
+  else {  
+    QString aResultQStr( aResult );
+    delete aResult;
+    if( replaceDot ) 
+      aResultQStr.replace( '.', ',' );    
+    return aResultQStr;
+  } 
 }
 
 //================================================================

diff --git a/src/TableViewer/TableViewer_Tool.h b/src/TableViewer/TableViewer_Tool.h
index e94dc9dc6fddef0b881a38e5dcc10124c63c6ec2..a64e42a8fd0719d64ddc50bda082f62a5f4e8e67 100755 (executable)
--- a/src/TableViewer/TableViewer_Tool.h
+++ b/src/TableViewer/TableViewer_Tool.h
@@ -32,7 +32,7 @@ public:
   static TCollection_ExtendedString  ToExtString( const QString& );
   static double                      ToDouble( const QString& );
   static double                      ToDouble( const QString&, bool& );
-  static QString                     DoubleToQString( const double, const bool = false );
+  static QString                     DoubleToQString( const double, const int, const bool = false, const bool = false );
 
   static Quantity_Color                           Color( const QColor& );
   static QColor                                   Color( const Quantity_Color& );