ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-10 22:03:08 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug from the additional comment from Ilya MATVEYEV 2008-04-28 14:32 for bug IPAL19572: the content of previously created filter is not cleaned.

Browse Source
This commit is contained in:
akl 2008-06-06 11:25:41 +00:00
parent fb78ee1007
commit f8dd22cb6e
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
View File

@ -582,7 +582,7 @@ void SMESHGUI_FilterTable::Table::setReadOnly( bool on )
bool SMESHGUI_FilterTable::Table::isReadOnly() const bool SMESHGUI_FilterTable::Table::isReadOnly() const
{ {
return editTriggers() != QAbstractItemView::NoEditTriggers; return editTriggers() == QAbstractItemView::NoEditTriggers;
} }
//======================================================================= //=======================================================================
@ -733,7 +733,7 @@ void SMESHGUI_FilterTable::Init (const QList<int>& theTypes)
// layout widgets // layout widgets
QGridLayout* aLay = new QGridLayout(myTableGrp); QGridLayout* aLay = new QGridLayout(myTableGrp);
aLay->setMargin(0); aLay->setMargin(MARGIN);
aLay->setSpacing(SPACING); aLay->setSpacing(SPACING);
aLay->addWidget(mySwitchTableGrp, 0, 0, 7, 1); aLay->addWidget(mySwitchTableGrp, 0, 0, 7, 1);

14
src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
View File

@ -225,8 +225,8 @@ QWidget* SMESHGUI_FilterLibraryDlg::createMainFrame (QWidget* theParent)
connect(myFileName, SIGNAL(returnPressed()), this, SLOT(onReturnPressed())); connect(myFileName, SIGNAL(returnPressed()), this, SLOT(onReturnPressed()));
connect(myOpenBtn, SIGNAL(clicked()), this, SLOT(onBrowse())); connect(myOpenBtn, SIGNAL(clicked()), this, SLOT(onBrowse()));
connect(myListBox, SIGNAL( currentItemChanged( QListWidgetItem*, QListWidgetItem* ) ), connect(myListBox, SIGNAL(itemSelectionChanged()),
this, SLOT( onFilterChanged( QListWidgetItem*, QListWidgetItem* ) ) ); this, SLOT(onFilterChanged()));
connect(myAddBtn, SIGNAL(clicked()), this, SLOT(onAddBtnPressed())); connect(myAddBtn, SIGNAL(clicked()), this, SLOT(onAddBtnPressed()));
connect(myDeleteBtn, SIGNAL(clicked()), this, SLOT(onDeleteBtnPressed())); connect(myDeleteBtn, SIGNAL(clicked()), this, SLOT(onDeleteBtnPressed()));
@ -809,11 +809,11 @@ bool SMESHGUI_FilterLibraryDlg::isValid(const bool theMess) const
//======================================================================= //=======================================================================
// name : SMESHGUI_FilterLibraryDlg::onFilterChanged // name : SMESHGUI_FilterLibraryDlg::onFilterChanged
// Purpose : SLOT. Called when selected filter of library changed // Purpose : SLOT. Called when selected filter of library is changed
//======================================================================= //=======================================================================
void SMESHGUI_FilterLibraryDlg::onFilterChanged( QListWidgetItem* item, QListWidgetItem* ) void SMESHGUI_FilterLibraryDlg::onFilterChanged()
{ {
QString theName = item ? item->text() : QString::null; QString theName = myListBox->currentItem() ? myListBox->currentItem()->text() : QString::null;
if (myLibrary->_is_nil()) if (myLibrary->_is_nil())
return; return;
@ -934,13 +934,13 @@ void SMESHGUI_FilterLibraryDlg::onAddBtnPressed()
{ {
if (!isValid(true)) if (!isValid(true))
return; return;
}
{
SMESH::Filter_var aFilter = createFilter(); SMESH::Filter_var aFilter = createFilter();
myLibrary->Replace(myCurrFilterName.toLatin1().constData(), myLibrary->Replace(myCurrFilterName.toLatin1().constData(),
myName->text().toLatin1().constData(), myName->text().toLatin1().constData(),
aFilter); aFilter);
} }
myTable->Clear(myTable->GetType());
addFilterToLib(getDefaultFilterName()); addFilterToLib(getDefaultFilterName());
} }

2
src/SMESHGUI/SMESHGUI_FilterLibraryDlg.h
View File

@ -90,7 +90,7 @@ private slots:
void onBrowse(); void onBrowse();
void onReturnPressed(); void onReturnPressed();
void onFilterChanged( QListWidgetItem*, QListWidgetItem* ); void onFilterChanged();
void onAddBtnPressed(); void onAddBtnPressed();
void onDeleteBtnPressed(); void onDeleteBtnPressed();
void onFilterNameChanged( const QString& ); void onFilterNameChanged( const QString& );