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 remote-tracking branch 'origin/master' into V8_5_BR
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_FilterLibraryDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
index 2fc4c48fd58947ca399c36f6ebac37713fc73e97..2972d8cda38fadd75a7ef840350523c3e19806ac 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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);
}
@@
-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;
@@
-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();
@@
-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,10
@@
void SMESHGUI_FilterLibraryDlg::onSelectionDone()
}
break;
}
}
break;
}
+ case SMESH::FT_BelongToMeshGroup: // get a group name and IOR
+ {
+ myTable->SetThreshold(aRow, anIO->getName() );
+ }
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);