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 'hydro/imps_2015' into V7_dev
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_BuildCompoundDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
index 7fbd6530fff32c777f394783906701a20aaabd66..ae1f5ad3f371312ded0de3e7b2193d2764268696 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-65,10
+65,6
@@
#define SPACING 6
#define MARGIN 11
#define SPACING 6
#define MARGIN 11
-//To disable automatic genericobj management, the following line should be commented.
-//Otherwise, it should be uncommented. Refer to KERNEL_SRC/src/SALOMEDSImpl/SALOMEDSImpl_AttributeIOR.cxx
-#define WITHGENERICOBJ
-
//=================================================================================
// name : SMESHGUI_BuildCompoundDlg
// Purpose :
//=================================================================================
// name : SMESHGUI_BuildCompoundDlg
// Purpose :
@@
-204,11
+200,11
@@
void SMESHGUI_BuildCompoundDlg::Init()
{
mySMESHGUI->SetActiveDialogBox((QDialog*)this);
{
mySMESHGUI->SetActiveDialogBox((QDialog*)this);
- myMesh = SMESH::SMESH_
Mesh
::_nil();
+ myMesh = SMESH::SMESH_
IDSource
::_nil();
- myMeshFilter = new SMESH_TypeFilter (SMESH::
MESH
);
+ myMeshFilter = new SMESH_TypeFilter (SMESH::
IDSOURCE
);
- myMeshArray = new SMESH::
mesh_array
();
+ myMeshArray = new SMESH::
ListOfIDSources
();
// signals and slots connections
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
// signals and slots connections
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
@@
-232,7
+228,7
@@
void SMESHGUI_BuildCompoundDlg::Init()
ComboBoxUnion->addItem(tr("RENAME"));
ComboBoxUnion->setCurrentIndex(0);
ComboBoxUnion->addItem(tr("RENAME"));
ComboBoxUnion->setCurrentIndex(0);
- CheckBoxMerge->setChecked(
fals
e);
+ CheckBoxMerge->setChecked(
tru
e);
TextLabelTol->setEnabled(CheckBoxMerge->isChecked());
SpinBoxTol->SetValue(1e-05);
TextLabelTol->setEnabled(CheckBoxMerge->isChecked());
SpinBoxTol->SetValue(1e-05);
@@
-293,7
+289,7
@@
bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
if (!isValid())
return false;
if (!isValid())
return false;
- SMESH::SMESH_Mesh_var a
Compound
Mesh;
+ SMESH::SMESH_Mesh_var aMesh;
if (!myMesh->_is_nil())
{
if (!myMesh->_is_nil())
{
@@
-304,22
+300,23
@@
bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
try {
SUIT_OverrideCursor aWaitCursor;
try {
SUIT_OverrideCursor aWaitCursor;
- myMeshArray[0]->SetParameters( aParameters.join(":").toLatin1().constData() );
+ aMesh = myMeshArray[0]->GetMesh();
+ aMesh->SetParameters( aParameters.join(":").toLatin1().constData() );
SMESH::SMESH_Gen_var aSMESHGen = SMESHGUI::GetSMESHGen();
// concatenate meshes
if(CheckBoxCommon->isChecked())
SMESH::SMESH_Gen_var aSMESHGen = SMESHGUI::GetSMESHGen();
// concatenate meshes
if(CheckBoxCommon->isChecked())
- a
Compound
Mesh = aSMESHGen->ConcatenateWithGroups(myMeshArray,
-
!(ComboBoxUnion->currentIndex()),
-
CheckBoxMerge->isChecked(),
-
SpinBoxTol->GetValue());
+ aMesh = aSMESHGen->ConcatenateWithGroups(myMeshArray,
+ !(ComboBoxUnion->currentIndex()),
+ CheckBoxMerge->isChecked(),
+ SpinBoxTol->GetValue());
else
else
- a
Compound
Mesh = aSMESHGen->Concatenate(myMeshArray,
-
!(ComboBoxUnion->currentIndex()),
-
CheckBoxMerge->isChecked(),
-
SpinBoxTol->GetValue());
+ aMesh = aSMESHGen->Concatenate(myMeshArray,
+ !(ComboBoxUnion->currentIndex()),
+ CheckBoxMerge->isChecked(),
+ SpinBoxTol->GetValue());
- _PTR(SObject) aSO = SMESH::FindSObject( a
Compound
Mesh );
+ _PTR(SObject) aSO = SMESH::FindSObject( aMesh );
if( aSO ) {
SMESH::SetName( aSO, LineEditName->text() );
anEntryList.append( aSO->GetID().c_str() );
if( aSO ) {
SMESH::SetName( aSO, LineEditName->text() );
anEntryList.append( aSO->GetID().c_str() );
@@
-336,9
+333,11
@@
bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
mySelectionMgr->clearSelected();
SMESH::UpdateView();
mySelectionMgr->clearSelected();
SMESH::UpdateView();
- _PTR(SObject) aSO = SMESH::FindSObject(a
Compound
Mesh.in());
- if ( SMESH_Actor* anActor = SMESH::CreateActor(aSO->GetStudy(), aSO->GetID().c_str()) )
+ _PTR(SObject) aSO = SMESH::FindSObject(aMesh.in());
+ if ( SMESH_Actor* anActor = SMESH::CreateActor(aSO->GetStudy(), aSO->GetID().c_str()) )
{
SMESH::DisplayActor(SMESH::GetActiveWindow(), anActor);
SMESH::DisplayActor(SMESH::GetActiveWindow(), anActor);
+ SMESH::UpdateView();
+ }
}// end IPAL21468
if( LightApp_Application* anApp =
}// end IPAL21468
if( LightApp_Application* anApp =
@@
-347,12
+346,6
@@
bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
SMESHGUI::Modified();
SMESHGUI::Modified();
- // obj has been published in study. Its refcount has been incremented.
- // It is safe to decrement its refcount
- // so that it will be destroyed when the entry in study will be removed
- if (!CORBA::is_nil(aCompoundMesh))
- aCompoundMesh->UnRegister();
-
return true;
}
return false;
return true;
}
return false;
@@
-420,12
+413,12
@@
void SMESHGUI_BuildCompoundDlg::SelectionIntoArgument()
for (int i = 0; nbSel != 0; i++, nbSel--) {
Handle(SALOME_InteractiveObject) IO = aList.First();
aList.RemoveFirst();
for (int i = 0; nbSel != 0; i++, nbSel--) {
Handle(SALOME_InteractiveObject) IO = aList.First();
aList.RemoveFirst();
- myMesh = SMESH::IObjectToInterface<SMESH::SMESH_
Mesh
>(IO);
+ myMesh = SMESH::IObjectToInterface<SMESH::SMESH_
IDSource
>(IO);
myMeshArray[i] = myMesh;
}
}
else {
myMeshArray[i] = myMesh;
}
}
else {
- myMesh = SMESH::SMESH_
Mesh
::_nil();
+ myMesh = SMESH::SMESH_
IDSource
::_nil();
aString = "";
}
aString = "";
}