Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ménage
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_FilterLibraryDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
index dd11becb0d08c28db7744048766c00139952ebd4..d692e9ef71c97635bba05133ce3e6500b2298f5b 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-211,7
+211,7
@@
QWidget* SMESHGUI_FilterLibraryDlg::createMainFrame (QWidget* theParent)
myTable->SetLibsEnabled(false);
myListBox->setMinimumHeight((int)(myTable->sizeHint().height() * 0.5));
myTable->SetLibsEnabled(false);
myListBox->setMinimumHeight((int)(myTable->sizeHint().height() * 0.5));
- //myListBox->setRowMode(QListWidget::FitToWidth);
//VSR : TODO ???
+ //myListBox->setRowMode(QListWidget::FitToWidth);
myListBox->setSelectionMode(QListWidget::SingleSelection);
myOpenBtn->setAutoDefault(false);
myListBox->setSelectionMode(QListWidget::SingleSelection);
myOpenBtn->setAutoDefault(false);
@@
-430,7
+430,7
@@
bool SMESHGUI_FilterLibraryDlg::onApply()
}
if (myFileName->text() != myLibrary->GetFileName())
}
if (myFileName->text() != myLibrary->GetFileName())
- myLibrary->SetFileName( myFileName->text().to
Latin1
().constData() );
+ myLibrary->SetFileName( myFileName->text().to
Utf8
().constData() );
bool aResult = false;
bool aResult = false;
@@
-439,8
+439,8
@@
bool SMESHGUI_FilterLibraryDlg::onApply()
} else if (myMode == EDIT || myMode == ADD_TO) {
SMESH::Filter_var aFilter = createFilter();
if (!myListBox->selectedItems().empty() &&
} else if (myMode == EDIT || myMode == ADD_TO) {
SMESH::Filter_var aFilter = createFilter();
if (!myListBox->selectedItems().empty() &&
- !myLibrary->Replace(myCurrFilterName.to
Latin1
().constData(),
- myName->text().to
Latin1
().constData(),
+ !myLibrary->Replace(myCurrFilterName.to
Utf8
().constData(),
+ myName->text().to
Utf8
().constData(),
aFilter.in())) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
tr("ERROR_OF_EDITING"));
aFilter.in())) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
tr("ERROR_OF_EDITING"));
@@
-662,7
+662,7
@@
void SMESHGUI_FilterLibraryDlg::processNewLibrary()
if (aFilterMgr->_is_nil())
return;
if (aFilterMgr->_is_nil())
return;
- myLibrary = aFilterMgr->LoadLibrary(autoExtension(getFileName()).to
Latin1
().constData());
+ myLibrary = aFilterMgr->LoadLibrary(autoExtension(getFileName()).to
Utf8
().constData());
if (myLibrary->_is_nil()) {
if (myMode == COPY_FROM) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
if (myLibrary->_is_nil()) {
if (myMode == COPY_FROM) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
@@
-670,7
+670,7
@@
void SMESHGUI_FilterLibraryDlg::processNewLibrary()
return;
} else {
myLibrary = aFilterMgr->CreateLibrary();
return;
} else {
myLibrary = aFilterMgr->CreateLibrary();
- myLibrary->SetFileName(getFileName().to
Latin1
().constData());
+ myLibrary->SetFileName(getFileName().to
Utf8
().constData());
}
}
}
}
@@
-822,14
+822,14
@@
void SMESHGUI_FilterLibraryDlg::onFilterChanged()
}
SMESH::Filter_var aFilter = createFilter();
}
SMESH::Filter_var aFilter = createFilter();
- myLibrary->Replace(myCurrFilterName.to
Latin1
().constData(),
- myName->text().to
Latin1
().constData(),
+ myLibrary->Replace(myCurrFilterName.to
Utf8
().constData(),
+ myName->text().to
Utf8
().constData(),
aFilter);
}
// Fill table with filter parameters
aFilter);
}
// Fill table with filter parameters
- SMESH::Filter_var aFilter = myLibrary->Copy(theName.to
Latin1
().constData());
+ SMESH::Filter_var aFilter = myLibrary->Copy(theName.to
Utf8
().constData());
myCurrFilterName = theName;
myCurrFilter = myListBox->currentRow();
myName->setText(theName);
myCurrFilterName = theName;
myCurrFilter = myListBox->currentRow();
myName->setText(theName);
@@
-929,8
+929,8
@@
void SMESHGUI_FilterLibraryDlg::onAddBtnPressed()
return;
SMESH::Filter_var aFilter = createFilter();
return;
SMESH::Filter_var aFilter = createFilter();
- myLibrary->Replace(myCurrFilterName.to
Latin1
().constData(),
- myName->text().to
Latin1
().constData(),
+ myLibrary->Replace(myCurrFilterName.to
Utf8
().constData(),
+ myName->text().to
Utf8
().constData(),
aFilter);
}
myTable->Clear(myTable->GetType());
aFilter);
}
myTable->Clear(myTable->GetType());
@@
-966,8
+966,8
@@
void SMESHGUI_FilterLibraryDlg::addFilterToLib (const QString& theName)
// add new filter in library
bool aResult = !aFilter->GetPredicate()->_is_nil()
// add new filter in library
bool aResult = !aFilter->GetPredicate()->_is_nil()
- ? myLibrary->Add(aName.to
Latin1
().constData(), aFilter)
- : myLibrary->AddEmpty(aName.to
Latin1
().constData(), (SMESH::ElementType)myTable->GetType());
+ ? myLibrary->Add(aName.to
Utf8
().constData(), aFilter)
+ : myLibrary->AddEmpty(aName.to
Utf8
().constData(), (SMESH::ElementType)myTable->GetType());
if (!aResult) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
if (!aResult) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
@@
-1087,7
+1087,7
@@
void SMESHGUI_FilterLibraryDlg::onDeleteBtnPressed()
int anIndex = getIndex(myCurrFilterName);
int anIndex = getIndex(myCurrFilterName);
- if (anIndex == -1 || !myLibrary->Delete(myCurrFilterName.to
Latin1
().constData())) {
+ if (anIndex == -1 || !myLibrary->Delete(myCurrFilterName.to
Utf8
().constData())) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
tr("ERROR_OF_DELETING"));
} else {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
tr("ERROR_OF_DELETING"));
} else {
@@
-1152,7
+1152,7
@@
const SMESHGUI_FilterTable* SMESHGUI_FilterLibraryDlg::GetTable() const
// name : SMESHGUI_FilterLibraryDlg::onEntityTypeChanged
// Purpose : SLOT. Called when entiyt type changed
//=======================================================================
// name : SMESHGUI_FilterLibraryDlg::onEntityTypeChanged
// Purpose : SLOT. Called when entiyt type changed
//=======================================================================
-void SMESHGUI_FilterLibraryDlg::onEntityTypeChanged(const int
theType
)
+void SMESHGUI_FilterLibraryDlg::onEntityTypeChanged(const int
/*theType*/
)
{
if (myLibrary->_is_nil())
return;
{
if (myLibrary->_is_nil())
return;
@@
-1179,8
+1179,8
@@
void SMESHGUI_FilterLibraryDlg::onNeedValidation()
if (valid)
{
SMESH::Filter_var aFilter = createFilter(myTable->GetType());
if (valid)
{
SMESH::Filter_var aFilter = createFilter(myTable->GetType());
- myLibrary->Replace(myCurrFilterName.to
Latin1
().constData(),
- myName->text().to
Latin1
().constData(),
+ myLibrary->Replace(myCurrFilterName.to
Utf8
().constData(),
+ myName->text().to
Utf8
().constData(),
aFilter);
}
}
aFilter);
}
}
@@
-1244,6
+1244,7
@@
void SMESHGUI_FilterLibraryDlg::onSelectionDone()
case SMESH::FT_BelongToMeshGroup: // get a group name and IOR
{
myTable->SetThreshold(aRow, anIO->getName() );
case SMESH::FT_BelongToMeshGroup: // get a group name and IOR
{
myTable->SetThreshold(aRow, anIO->getName() );
+ break;
}
default: // get a GEOM object
{
}
default: // get a GEOM object
{