Merge from V4_1_0_maintainance branch (from tag mergeto_BR_QT4_Dev_08Jul08)

[modules/geom.git] / src / DlgRef / DlgRef.cxx

diff --git a/src/DlgRef/DlgRef.cxx b/src/DlgRef/DlgRef.cxx
index 8acd7cc9ea50583fd0b1f24675b9ff21166cc69a..434faf86e6b23a919b84b2a97e04551aca6eaefd 100644 (file)
--- a/src/DlgRef/DlgRef.cxx
+++ b/src/DlgRef/DlgRef.cxx
@@ -317,6 +317,20 @@ DlgRef_2Sel1Spin::~DlgRef_2Sel1Spin()
 {
 }
 
+//////////////////////////////////////////
+// DlgRef_2Sel2List
+//////////////////////////////////////////
+
+DlgRef_2Sel2List::DlgRef_2Sel2List( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_2Sel2List::~DlgRef_2Sel2List()
+{
+}
+
 //////////////////////////////////////////
 // DlgRef_2Sel2Spin1Check
 //////////////////////////////////////////
@@ -487,7 +501,37 @@ DlgRef_3Sel3Spin1Check::~DlgRef_3Sel3Spin1Check()
 
 void DlgRef_3Sel3Spin1Check::ShowRows( int fromRow, int toRow, bool toShow )
 {
-  const int maxRows = 6;
+  const int maxRows = 7;
+  
+  if ( toRow >= fromRow && fromRow >= 0 && toRow <= maxRows ) {
+    int c = gridLayout1->count();
+    for ( int i = 0; i < c; i++ ) {
+      QWidget* w = gridLayout1->itemAt( i )->widget();
+      int row, col, rowspan, colspan;
+      gridLayout1->getItemPosition( i, &row, &col, &rowspan, &colspan );
+      if ( w && row >= fromRow && row <= toRow )
+       w->setVisible( toShow );
+    }
+  }
+}
+
+//////////////////////////////////////////
+// DlgRef_3Sel3Spin2Check
+//////////////////////////////////////////
+
+DlgRef_3Sel3Spin2Check::DlgRef_3Sel3Spin2Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_3Sel3Spin2Check::~DlgRef_3Sel3Spin2Check()
+{
+}
+
+void DlgRef_3Sel3Spin2Check::ShowRows( int fromRow, int toRow, bool toShow )
+{
+  const int maxRows = 8;
   
   if ( toRow >= fromRow && fromRow >= 0 && toRow <= maxRows ) {
     int c = gridLayout1->count();
@@ -649,9 +693,22 @@ DlgRef_Skeleton::~DlgRef_Skeleton()
 
 QString DlgRef::PrintDoubleValue( double theValue, int thePrecision )
 {
+  const double prec = 1e-12;
+
   QString aRes;
   aRes.setNum( theValue, 'g', thePrecision );
 
+  if ( prec > 0 ) {
+    int p = 0;
+    while ( p < thePrecision ) {
+      aRes.setNum( theValue, 'g', p++ );
+      double v = aRes.toDouble();
+      double err = qAbs( theValue - v );
+      if ( err > 0 && err <= prec )
+       break;
+    }
+  }
+
   // remove trailing zeroes
   QString delim( "." );