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
Merge branch 'gni/adaptation' of https://codev-tuleap.cea.fr/plugins/git/salome/smesh...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_FilterLibraryDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
index ee16256859428f94085d8cd6ac260c724a84a8c8..d692e9ef71c97635bba05133ce3e6500b2298f5b 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
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
@@
-153,7
+153,7
@@
void SMESHGUI_FilterLibraryDlg::construct (const QList<int>& theTypes,
aDlgLay->setStretchFactor(myMainFrame, 1);
aDlgLay->setStretchFactor(myMainFrame, 1);
- myHelpFileName = "selection_filter_library
_page
.html";
+ myHelpFileName = "selection_filter_library.html";
Init(myTypes, myMode);
}
Init(myTypes, myMode);
}
@@
-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"));
@@
-517,7
+517,7
@@
void SMESHGUI_FilterLibraryDlg::onHelp()
//=======================================================================
// name : SMESHGUI_FilterLibraryDlg::onDeactivate
//=======================================================================
// name : SMESHGUI_FilterLibraryDlg::onDeactivate
-// Purpose : SLOT called when dialog must be deativated
+// Purpose : SLOT called when dialog must be dea
c
tivated
//=======================================================================
void SMESHGUI_FilterLibraryDlg::onDeactivate()
{
//=======================================================================
void SMESHGUI_FilterLibraryDlg::onDeactivate()
{
@@
-602,7
+602,7
@@
QStringList SMESHGUI_FilterLibraryDlg::prepareFilters() const
//================================================================
// Function : onBrowse
//================================================================
// Function : onBrowse
-// Purpose : SLOT. Display "Open file" dialog for chosing library name
+// Purpose : SLOT. Display "Open file" dialog for cho
o
sing library name
//================================================================
void SMESHGUI_FilterLibraryDlg::onBrowse()
{
//================================================================
void SMESHGUI_FilterLibraryDlg::onBrowse()
{
@@
-611,7
+611,7
@@
void SMESHGUI_FilterLibraryDlg::onBrowse()
//aDlg->setMode(myMode == COPY_FROM ? QFileDialogP::ExistingFile : QFileDialogP::AnyFile);
aDlg->setFileMode(myMode == COPY_FROM ? QFileDialog::ExistingFile : QFileDialog::AnyFile);
//aDlg->setMode(myMode == COPY_FROM ? QFileDialogP::ExistingFile : QFileDialogP::AnyFile);
aDlg->setFileMode(myMode == COPY_FROM ? QFileDialog::ExistingFile : QFileDialog::AnyFile);
- aDlg->setFilters(prepareFilters());
+ aDlg->set
Name
Filters(prepareFilters());
aDlg->selectFile(getFileName());
QPushButton* anOkBtn = (QPushButton*)aDlg->findChild<QPushButton*>("OK");
aDlg->selectFile(getFileName());
QPushButton* anOkBtn = (QPushButton*)aDlg->findChild<QPushButton*>("OK");
@@
-629,8
+629,8
@@
void SMESHGUI_FilterLibraryDlg::onBrowse()
if (QFileInfo(fName).suffix().isEmpty())
fName = autoExtension(fName);
if (QFileInfo(fName).suffix().isEmpty())
fName = autoExtension(fName);
- fName = QDir::
convert
Separators(fName);
- QString prev = QDir::
convert
Separators(getFileName());
+ fName = QDir::
toNative
Separators(fName);
+ QString prev = QDir::
toNative
Separators(getFileName());
if (prev == fName)
return;
if (prev == fName)
return;
@@
-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());
}
}
}
}
@@
-756,7
+756,7
@@
bool SMESHGUI_FilterLibraryDlg::isPermissionValid(const bool theIsExistingOnly)
if (QFileInfo(fName).suffix().isEmpty())
fName = autoExtension(fName);
if (QFileInfo(fName).suffix().isEmpty())
fName = autoExtension(fName);
- fName = QDir::
convert
Separators(fName);
+ fName = QDir::
toNative
Separators(fName);
if (QFileInfo(fName).exists()) {
isWritable = QFileInfo(fName).isWritable();
if (QFileInfo(fName).exists()) {
isWritable = QFileInfo(fName).isWritable();
@@
-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);
@@
-892,7
+892,7
@@
void SMESHGUI_FilterLibraryDlg::enableMainButtons()
//=======================================================================
// name : SMESHGUI_FilterLibraryDlg::createFilter
//=======================================================================
// name : SMESHGUI_FilterLibraryDlg::createFilter
-// Purpose : C
er
ate filter in accordance with library
+// Purpose : C
re
ate filter in accordance with library
//=======================================================================
SMESH::Filter_ptr SMESHGUI_FilterLibraryDlg::createFilter(const int theType)
{
//=======================================================================
SMESH::Filter_ptr SMESHGUI_FilterLibraryDlg::createFilter(const int theType)
{
@@
-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);
}
}
@@
-1205,11
+1205,11
@@
void SMESHGUI_FilterLibraryDlg::onSelectionDone()
return;
const int type = myTable->GetCriterionType(aRow);
return;
const int type = myTable->GetCriterionType(aRow);
- QList<int> types;
- types << SMESH::FT_BelongToGeom << SMESH::FT_BelongToPlane
- << SMESH::FT_BelongToCylinder << SMESH::FT_BelongToGenSurface
- << SMESH::FT_LyingOnGeom << SMESH::FT_CoplanarFaces
- << SMESH::FT_ConnectedElements;
+ QList<int> types;
+ types << SMESH::FT_BelongToGeom
<< SMESH::FT_BelongToPlane
+ << SMESH::FT_BelongToCylinder
<< SMESH::FT_BelongToGenSurface
+ << SMESH::FT_LyingOnGeom
<< SMESH::FT_CoplanarFaces
+ << SMESH::FT_ConnectedElements
<< SMESH::FT_BelongToMeshGroup
;
if ( !types.contains( type ))
return;
if ( !types.contains( type ))
return;
@@
-1241,6
+1241,11
@@
void SMESHGUI_FilterLibraryDlg::onSelectionDone()
}
break;
}
}
break;
}
+ case SMESH::FT_BelongToMeshGroup: // get a group name and IOR
+ {
+ myTable->SetThreshold(aRow, anIO->getName() );
+ break;
+ }
default: // get a GEOM object
{
GEOM::GEOM_Object_var anObj = SMESH::IObjectToInterface<GEOM::GEOM_Object>(anIO);
default: // get a GEOM object
{
GEOM::GEOM_Object_var anObj = SMESH::IObjectToInterface<GEOM::GEOM_Object>(anIO);