// Module : SALOME
// $Header$
-using namespace std;
#include "SALOMEGUI_TableDlg.h"
#include "QAD_Tools.h"
#include "QAD_MessageBox.h"
#include <qinputdialog.h>
#include <qlabel.h>
#include "utilities.h"
+using namespace std;
#define MARGIN_SIZE 11
#define SPACING_SIZE 6
}
if ( !bEmptyRow ) { // Skip rows with no data !!!
// set row title
- tblIntAttr->SetRowTitle( nRow+1, rowTitles[ i ].isNull() ? strdup( "" ) : strdup( rowTitles[ i ] ) );
+ tblIntAttr->SetRowTitle( nRow+1, rowTitles[ i ].isNull() ? QString( "" ) : QString( rowTitles[ i ] ) );
// set row unit
- tblIntAttr->SetRowUnit( nRow+1, units[ i ].isNull() ? strdup( "" ) : strdup( units[ i ] ) );
+ tblIntAttr->SetRowUnit( nRow+1, units[ i ].isNull() ? QString( "" ) : QString( units[ i ] ) );
nRow++;
}
}
if ( nRow > 0 ) { // Set columns only if table is not empty, otherwise exception is raised !!!
// column titles
for ( i = 0; i < colTitles.count(); i++ )
- tblIntAttr->SetColumnTitle( i+1, colTitles[ i ].isNull() ? strdup( "" ) : strdup( colTitles[ i ] ) );
+ tblIntAttr->SetColumnTitle( i+1, colTitles[ i ].isNull() ? QString( "" ) : QString( colTitles[ i ] ) );
}
}
// title
}
if ( !bEmptyRow ) { // Skip rows with no data !!!
// set row title
- tblRealAttr->SetRowTitle( nRow+1, rowTitles[ i ].isNull() ? strdup( "" ) : strdup( rowTitles[ i ] ) );
+ tblRealAttr->SetRowTitle( nRow+1, rowTitles[ i ].isNull() ? QString( "" ) : QString( rowTitles[ i ] ) );
// set row unit
- tblRealAttr->SetRowUnit( nRow+1, units[ i ].isNull() ? strdup( "" ) : strdup( units[ i ] ) );
+ tblRealAttr->SetRowUnit( nRow+1, units[ i ].isNull() ? QString( "" ) : QString( units[ i ] ) );
nRow++;
}
}
if ( nRow > 0 ) { // Set columns only if table is not empty, otherwise exception is raised !!!
// column titles
for ( i = 0; i < colTitles.count(); i++ )
- tblRealAttr->SetColumnTitle( i+1, colTitles[ i ].isNull() ? strdup( "" ) : strdup( colTitles[ i ] ) );
+ tblRealAttr->SetColumnTitle( i+1, colTitles[ i ].isNull() ? QString( "" ) : QString( colTitles[ i ] ) );
}
}
// title
try {
SALOMEGUI_Table* tbl = myIntTable->getTable();
// title
- myIntTable->setTableTitle( strdup( tblIntAttr->GetTitle() ) );
+ myIntTable->setTableTitle( CORBA::string_dup( tblIntAttr->GetTitle() ) );
// nb of rows & cols
int nbRows = tblIntAttr->GetNbRows() ;
int nbCols = tblIntAttr->GetNbColumns();
SALOMEDS::StringSeq_var rowTitles = tblIntAttr->GetRowTitles();
for ( i = 0; i < nbRows; i++ ) {
if ( rowTitles->length() > 0 )
- strlist.append( strdup( rowTitles[i] ) );
+ strlist.append( CORBA::string_dup( rowTitles[i] ) );
else
strlist.append( "" );
}
SALOMEDS::StringSeq_var colTitles = tblIntAttr->GetColumnTitles();
for ( i = 0; i < nbCols; i++ ) {
if ( colTitles->length() > 0 )
- strlist.append( strdup( colTitles[i] ) );
+ strlist.append( CORBA::string_dup( colTitles[i] ) );
else
strlist.append( "" );
}
SALOMEDS::StringSeq_var rowUnits = tblIntAttr->GetRowUnits();
if ( rowUnits->length() > 0 ) {
for ( i = 0; i < nbRows; i++ )
- strlist.append( strdup( rowUnits[i] ) );
+ strlist.append( CORBA::string_dup( rowUnits[i] ) );
myIntTable->setUnits( strlist );
}
// data
try {
SALOMEGUI_Table* tbl = myRealTable->getTable();
// title
- myRealTable->setTableTitle( strdup( tblRealAttr->GetTitle() ) );
+ myRealTable->setTableTitle( CORBA::string_dup( tblRealAttr->GetTitle() ) );
// nb of rows & cols
int nbRows = tblRealAttr->GetNbRows() ;
int nbCols = tblRealAttr->GetNbColumns();
SALOMEDS::StringSeq_var rowTitles = tblRealAttr->GetRowTitles();
for ( i = 0; i < nbRows; i++ ) {
if ( rowTitles->length() > 0 )
- strlist.append( strdup( rowTitles[i] ) );
+ strlist.append( CORBA::string_dup( rowTitles[i] ) );
else
strlist.append( "" );
}
SALOMEDS::StringSeq_var colTitles = tblRealAttr->GetColumnTitles();
for ( i = 0; i < nbCols; i++ ) {
if ( colTitles->length() > 0 )
- strlist.append( strdup( colTitles[i] ) );
+ strlist.append( CORBA::string_dup( colTitles[i] ) );
else
strlist.append( "" );
}
SALOMEDS::StringSeq_var rowUnits = tblRealAttr->GetRowUnits();
if ( rowUnits->length() > 0 ) {
for ( i = 0; i < nbRows; i++ )
- strlist.append( strdup( rowUnits[i] ) );
+ strlist.append( CORBA::string_dup( rowUnits[i] ) );
myRealTable->setUnits( strlist );
}
// data
// !!! 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
*/
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
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] );
}
}
/*!