ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-30 19:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Bug IPAL19372 : Qt4 porting: it's impossible to fill a 'Filter' table.

Browse Source
This commit is contained in:
ouv 2008-03-26 12:57:40 +00:00
parent 24ccad23e4
commit 69ac5acd7e
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
View File

@ -379,6 +379,7 @@ SMESHGUI_FilterTable::CheckItem::CheckItem( bool value )
Qt::ItemFlags f = flags(); Qt::ItemFlags f = flags();
f = f | Qt::ItemIsUserCheckable; f = f | Qt::ItemIsUserCheckable;
f = f & ~Qt::ItemIsTristate; f = f & ~Qt::ItemIsTristate;
f = f & ~Qt::ItemIsEditable;
setFlags( f ); setFlags( f );
setChecked(value); setChecked(value);
} }
@ -389,6 +390,7 @@ SMESHGUI_FilterTable::CheckItem::CheckItem( const QString& text, bool value )
Qt::ItemFlags f = flags(); Qt::ItemFlags f = flags();
f = f | Qt::ItemIsUserCheckable; f = f | Qt::ItemIsUserCheckable;
f = f & ~Qt::ItemIsTristate; f = f & ~Qt::ItemIsTristate;
f = f & ~Qt::ItemIsEditable;
setFlags( f ); setFlags( f );
setChecked( value ); setChecked( value );
setText( text ); setText( text );
@ -459,7 +461,7 @@ void SMESHGUI_FilterTable::ComboDelegate::setEditorData( QWidget* editor,
const QModelIndex& index ) const const QModelIndex& index ) const
{ {
QString value = index.model()->data( index, Qt::DisplayRole ).toString(); QString value = index.model()->data( index, Qt::DisplayRole ).toString();
QComboBox* cb = static_cast<QComboBox*>( editor ); QComboBox* cb = dynamic_cast<QComboBox*>( editor );
bool bOk = false; bool bOk = false;
if ( cb ) { if ( cb ) {
int i = cb->findText( value ); int i = cb->findText( value );
@ -475,7 +477,7 @@ void SMESHGUI_FilterTable::ComboDelegate::setModelData( QWidget* editor,
QAbstractItemModel* model, QAbstractItemModel* model,
const QModelIndex& index) const const QModelIndex& index) const
{ {
QComboBox* cb = static_cast<QComboBox*>( editor ); QComboBox* cb = dynamic_cast<QComboBox*>( editor );
if ( cb ) model->setData( index, cb->currentText(), Qt::DisplayRole ); if ( cb ) model->setData( index, cb->currentText(), Qt::DisplayRole );
else QItemDelegate::setModelData( editor, model, index ); else QItemDelegate::setModelData( editor, model, index );
} }
@ -566,11 +568,11 @@ bool SMESHGUI_FilterTable::Table::isEditable (int row, int col) const
void SMESHGUI_FilterTable::Table::setReadOnly( bool on ) void SMESHGUI_FilterTable::Table::setReadOnly( bool on )
{ {
setEditTriggers( on ? setEditTriggers( on ?
QAbstractItemView::NoEditTriggers :
QAbstractItemView::DoubleClicked | QAbstractItemView::DoubleClicked |
QAbstractItemView::SelectedClicked | QAbstractItemView::SelectedClicked |
QAbstractItemView::EditKeyPressed | QAbstractItemView::EditKeyPressed |
QAbstractItemView::AnyKeyPressed : QAbstractItemView::AnyKeyPressed );
QAbstractItemView::NoEditTriggers );
} }
bool SMESHGUI_FilterTable::Table::isReadOnly() const bool SMESHGUI_FilterTable::Table::isReadOnly() const
@ -887,9 +889,10 @@ bool SMESHGUI_FilterTable::IsValid (const bool theMess, const int theEntityType)
} }
} else { } else {
bool aRes = false; bool aRes = false;
bool isSignalsBlocked = aTable->signalsBlocked();
aTable->blockSignals(true); aTable->blockSignals(true);
double aThreshold = (int)aTable->text(i, 2).toDouble(&aRes); double aThreshold = (int)aTable->text(i, 2).toDouble(&aRes);
aTable->blockSignals(false); aTable->blockSignals(isSignalsBlocked);
if (!aRes && aTable->isEditable(i, 2)) { if (!aRes && aTable->isEditable(i, 2)) {
if (theMess) if (theMess)
@ -1359,6 +1362,10 @@ void SMESHGUI_FilterTable::addRow (Table* theTable, const int theType, const boo
} }
myIsLocked = false; myIsLocked = false;
// IPAL19372 - to prevent calling onCriterionChaged() slot before completion of setItem()
bool isSignalsBlocked = theTable->signalsBlocked();
theTable->blockSignals( true );
// Criteria // Criteria
theTable->setItem(aCurrRow, 0, getCriterionItem(theType)); theTable->setItem(aCurrRow, 0, getCriterionItem(theType));
@ -1366,11 +1373,16 @@ void SMESHGUI_FilterTable::addRow (Table* theTable, const int theType, const boo
theTable->setItem(aCurrRow, 1, getCompareItem()); theTable->setItem(aCurrRow, 1, getCompareItem());
// Threshold // Threshold
//theTable->setItem(aCurrRow, 2, new QTableWidgetItem()); theTable->setItem(aCurrRow, 2, new QTableWidgetItem());
// Logical operation NOT // Logical operation NOT
theTable->setItem(aCurrRow, 3, getUnaryItem()); theTable->setItem(aCurrRow, 3, getUnaryItem());
// Logical operation AND / OR
theTable->setItem(aCurrRow, 4, new QTableWidgetItem());
theTable->blockSignals( isSignalsBlocked );
// Logical binary operation for previous value // Logical binary operation for previous value
int anAddBinOpStr = -1; int anAddBinOpStr = -1;
if (aCurrRow == theTable->rowCount() - 1) if (aCurrRow == theTable->rowCount() - 1)