X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSALOMEGUI%2FSALOMEGUI_TableDlg.cxx;h=1b24930b363a6c1f9c73fd0f63f8185c6e8b5831;hb=bd0aa83cc3573de6b62b2a56e168dd372097bd45;hp=a70b74df42e613d01c916114645fb32ce9666e36;hpb=b9d614a9b0642314cda41b09f92912483034922f;p=modules%2Fkernel.git diff --git a/src/SALOMEGUI/SALOMEGUI_TableDlg.cxx b/src/SALOMEGUI/SALOMEGUI_TableDlg.cxx index a70b74df4..1b24930b3 100644 --- a/src/SALOMEGUI/SALOMEGUI_TableDlg.cxx +++ b/src/SALOMEGUI/SALOMEGUI_TableDlg.cxx @@ -579,9 +579,10 @@ void SALOMEGUI_TableWidget::setColTitles( QStringList& tlts ) // !!! first column contains units !!! for ( int i = 0; i < tlts.count(); i++ ) { myOrientation == Horizontal ? - myTable->horizontalHeader()->setLabel( i+1, tlts[i] ) : - myTable->verticalHeader()->setLabel( i+1, tlts[i] ); + myTable->horizontalHeader()->setLabel( i+1, tlts[i].isNull() ? "" : tlts[i] ) : + myTable->verticalHeader()->setLabel( i+1, tlts[i].isNull() ? "" : tlts[i] ); } + setUnitsTitle( tr( "UNITS_TLT" ) ); } /*! Sets columns titles @@ -606,7 +607,7 @@ void SALOMEGUI_TableWidget::getColTitles( QStringList& tlts ) */ void SALOMEGUI_TableWidget::setUnitsTitle( const QString& tlt ) { // !!! first column contains units !!! - myOrientation == Horizontal ? myTable->horizontalHeader()->setLabel( 0, tlt ) : myTable->verticalHeader()->setLabel( 0, tlt ); + myOrientation == Horizontal ? myTable->horizontalHeader()->setLabel( 0, tlt.isNull() ? "" : tlt ) : myTable->verticalHeader()->setLabel( 0, tlt.isNull() ? "" : tlt ); } /*! Sets units @@ -614,7 +615,7 @@ void SALOMEGUI_TableWidget::setUnitsTitle( const QString& tlt ) { void SALOMEGUI_TableWidget::setUnits( QStringList& units ) { for ( int i = 0; i < units.count(); i++ ) { - myOrientation == Horizontal ? myTable->setText( i, 0, units[i] ) : myTable->setText( 0, i, units[i] ); + myOrientation == Horizontal ? myTable->setText( i, 0, units[i].isNull() ? "" : units[i] ) : myTable->setText( 0, i, units[i].isNull() ? "" : units[i] ); } } /*!