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
23061: [CEA 1488] Import 1D-2D fails sometimes in relation with the source face discr...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MergeDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
index 046bd063c7f71b280a438b4cfed5e9801ae9771e..08fca6b6ae197f2e969ad1998e2113ffc5b0eb09 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-778,6
+778,7
@@
void SMESHGUI_MergeDlg::updateControls()
bool enable = !(myMesh->_is_nil()) && (ListCoincident->count() || (myTypeId == 0));
buttonOk->setEnabled(enable);
buttonApply->setEnabled(enable);
bool enable = !(myMesh->_is_nil()) && (ListCoincident->count() || (myTypeId == 0));
buttonOk->setEnabled(enable);
buttonApply->setEnabled(enable);
+ DetectButton->setEnabled( !myMesh->_is_nil() );
}
//=================================================================================
}
//=================================================================================
@@
-1124,12
+1125,13
@@
void SMESHGUI_MergeDlg::SelectionIntoArgument()
if (myEditCurrentArgument == (QWidget*)LineEditMesh) {
QString aString = "";
LineEditMesh->setText(aString);
if (myEditCurrentArgument == (QWidget*)LineEditMesh) {
QString aString = "";
LineEditMesh->setText(aString);
-
+
ListCoincident->clear();
ListEdit->clear();
myActor = 0;
ListCoincident->clear();
ListEdit->clear();
myActor = 0;
+ myMesh = SMESH::SMESH_Mesh::_nil();
QString aCurrentEntry = myEntry;
QString aCurrentEntry = myEntry;
-
+
int nbSel = SMESH::GetNameOfSelectedIObjects(mySelectionMgr, aString);
if (nbSel != 1) {
myIdPreview->SetPointsLabeled(false);
int nbSel = SMESH::GetNameOfSelectedIObjects(mySelectionMgr, aString);
if (nbSel != 1) {
myIdPreview->SetPointsLabeled(false);
@@
-1142,20
+1144,20
@@
void SMESHGUI_MergeDlg::SelectionIntoArgument()
SALOME_ListIO aList;
mySelectionMgr->selectedObjects(aList);
SALOME_ListIO aList;
mySelectionMgr->selectedObjects(aList);
-
+
Handle(SALOME_InteractiveObject) IO = aList.First();
myEntry = IO->getEntry();
myMesh = SMESH::GetMeshByIO(IO);
Handle(SALOME_InteractiveObject) IO = aList.First();
myEntry = IO->getEntry();
myMesh = SMESH::GetMeshByIO(IO);
-
+
if (myMesh->_is_nil())
return;
LineEditMesh->setText(aString);
if (myMesh->_is_nil())
return;
LineEditMesh->setText(aString);
-
+
myActor = SMESH::FindActorByEntry(IO->getEntry());
if (!myActor)
myActor = SMESH::FindActorByObject(myMesh);
myActor = SMESH::FindActorByEntry(IO->getEntry());
if (!myActor)
myActor = SMESH::FindActorByObject(myMesh);
-
+
if ( myActor && myTypeId == 1 && mySelector->IsSelectionEnabled() ) {
mySubMeshOrGroup = SMESH::SMESH_IDSource::_nil();
mySelectionMgr->installFilter(myMeshOrSubMeshOrGroupFilter);
if ( myActor && myTypeId == 1 && mySelector->IsSelectionEnabled() ) {
mySubMeshOrGroup = SMESH::SMESH_IDSource::_nil();
mySelectionMgr->installFilter(myMeshOrSubMeshOrGroupFilter);