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
Restore usage of GenericObject wraper ( _wrap )
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
index 7b9f4974f9ad6f7d6a569f1c207dfe5423c7f8f9..dae81ae51869e14980d5210b9efd1913efc42482 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
@@
-498,10
+498,7
@@
QString SMESHGUI_GroupDlg::GetDefaultName(const QString& theOperation)
QString aName = "";
// collect all object names of SMESH component
QString aName = "";
// collect all object names of SMESH component
- SalomeApp_Study* appStudy =
- dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
- if ( !appStudy ) return aName;
- _PTR(Study) aStudy = appStudy->studyDS();
+ _PTR(Study) aStudy = SMESH::getStudy();
std::set<std::string> aSet;
_PTR(SComponent) aMeshCompo (aStudy->FindComponent( "SMESH" ));
std::set<std::string> aSet;
_PTR(SComponent) aMeshCompo (aStudy->FindComponent( "SMESH" ));
@@
-519,7
+516,7
@@
QString SMESHGUI_GroupDlg::GetDefaultName(const QString& theOperation)
bool isUnique = false;
while (!isUnique) {
aName = theOperation + "_" + QString::number(++aNumber);
bool isUnique = false;
while (!isUnique) {
aName = theOperation + "_" + QString::number(++aNumber);
- isUnique = (aSet.count(std::string(
SMESH::toUtf8(aName
))) == 0);
+ isUnique = (aSet.count(std::string(
aName.toUtf8().constData(
))) == 0);
}
return aName;
}
return aName;
@@
-528,14
+525,13
@@
QString SMESHGUI_GroupDlg::GetDefaultName(const QString& theOperation)
void SMESHGUI_GroupDlg::setDefaultName() const
{
QString aResName;
void SMESHGUI_GroupDlg::setDefaultName() const
{
QString aResName;
- _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
int i=1;
QString aPrefix ="Group_";
_PTR(SObject) anObj;
do
{
aResName = aPrefix + QString::number( i++ );
int i=1;
QString aPrefix ="Group_";
_PTR(SObject) anObj;
do
{
aResName = aPrefix + QString::number( i++ );
- anObj =
aStudy->FindObject( SMESH::toUtf8(aResName
) );
+ anObj =
SMESH::getStudy()->FindObject( aResName.toUtf8().constData(
) );
}
while ( anObj );
myName->setText(aResName);
}
while ( anObj );
myName->setText(aResName);
@@
-601,7
+597,7
@@
void SMESHGUI_GroupDlg::init (SMESH::SMESH_GroupBase_ptr theGroup,
SALOMEDS::Color aColor = theGroup->GetColor();
setGroupColor( aColor );
SALOMEDS::Color aColor = theGroup->GetColor();
setGroupColor( aColor );
- myMeshGroupLine->setText(
SMESH::fromUtf8(theGroup->GetName()
));
+ myMeshGroupLine->setText(
theGroup->GetName(
));
int aType = 0;
switch(theGroup->GetType()) {
int aType = 0;
switch(theGroup->GetType()) {
@@
-664,7
+660,7
@@
void SMESHGUI_GroupDlg::init (SMESH::SMESH_GroupBase_ptr theGroup,
else if ( grpType == 1 ) // group on geom
{
QString aShapeName( "" );
else if ( grpType == 1 ) // group on geom
{
QString aShapeName( "" );
- _PTR(Study) aStudy = SMESH::
GetActiveStudyDocument
();
+ _PTR(Study) aStudy = SMESH::
getStudy
();
GEOM::GEOM_Object_var aGroupShape = myGroupOnGeom->GetShape();
if (!aGroupShape->_is_nil())
{
GEOM::GEOM_Object_var aGroupShape = myGroupOnGeom->GetShape();
if (!aGroupShape->_is_nil())
{
@@
-688,7
+684,7
@@
void SMESHGUI_GroupDlg::init (SMESH::SMESH_GroupBase_ptr theGroup,
{
myNameChanged = true;
myName->blockSignals(true);
{
myNameChanged = true;
myName->blockSignals(true);
- myName->setText(
SMESH::fromUtf8(theGroup->GetName()
));
+ myName->setText(
theGroup->GetName(
));
myName->blockSignals(false);
}
myName->blockSignals(false);
}
@@
-915,7
+911,7
@@
void SMESHGUI_GroupDlg::setSelectionMode (int theMode)
//=================================================================================
bool SMESHGUI_GroupDlg::onApply()
{
//=================================================================================
bool SMESHGUI_GroupDlg::onApply()
{
- if (
mySMESHGUI->isActive
StudyLocked())
+ if (
SMESHGUI::is
StudyLocked())
return false;
if (myName->text().trimmed().isEmpty())
return false;
if (myName->text().trimmed().isEmpty())
@@
-1050,37
+1046,36
@@
bool SMESHGUI_GroupDlg::onApply()
if (myMesh->_is_nil() || !myGeomObjects->length())
return false;
if (myMesh->_is_nil() || !myGeomObjects->length())
return false;
- _PTR(Study) aStudy = SMESH::
GetActiveStudyDocument
();
+ _PTR(Study) aStudy = SMESH::
getStudy
();
if (myGeomObjects->length() == 1) {
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
if (myGeomObjects->length() == 1) {
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
-
SMESH::toUtf8(myName->text()
),
+
myName->text().toUtf8(
),
myGeomObjects[0]);
}
else {
SMESH::SMESH_Gen_var aSMESHGen = SMESHGUI::GetSMESHGen();
myGeomObjects[0]);
}
else {
SMESH::SMESH_Gen_var aSMESHGen = SMESHGUI::GetSMESHGen();
- if ( aSMESHGen->_is_nil() )
+ if ( aSMESHGen->_is_nil()
|| myGeomObjects->length() == 0
)
return false;
// create a geometry group
return false;
// create a geometry group
- GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen();
- _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
-
- if (geomGen->_is_nil() || !aStudy)
+ GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen( myGeomObjects[0] );
+ if (geomGen->_is_nil())
return false;
return false;
- GEOM::GEOM_IGroupOperations_wrap op = geomGen->GetIGroupOperations(
aStudy->StudyId()
);
+ GEOM::GEOM_IGroupOperations_wrap op = geomGen->GetIGroupOperations();
if (op->_is_nil())
return false;
// check and add all selected GEOM objects: they must be
// a sub-shapes of the main GEOM and must be of one type
TopAbs_ShapeEnum aGroupType = TopAbs_SHAPE;
if (op->_is_nil())
return false;
// check and add all selected GEOM objects: they must be
// a sub-shapes of the main GEOM and must be of one type
TopAbs_ShapeEnum aGroupType = TopAbs_SHAPE;
- for ( int i =0; i < (int)myGeomObjects->length(); i++) {
+ for ( CORBA::ULong i =0; i < myGeomObjects->length(); i++)
+ {
TopAbs_ShapeEnum aSubShapeType = (TopAbs_ShapeEnum)myGeomObjects[i]->GetShapeType();
TopAbs_ShapeEnum aSubShapeType = (TopAbs_ShapeEnum)myGeomObjects[i]->GetShapeType();
- if (
i == 0
)
+ if (
i == 0
)
aGroupType = aSubShapeType;
aGroupType = aSubShapeType;
- else if (
aSubShapeType != aGroupType
) {
+ else if (
aSubShapeType != aGroupType
) {
aGroupType = TopAbs_SHAPE;
break;
}
aGroupType = TopAbs_SHAPE;
break;
}
@@
-1088,6
+1083,8
@@
bool SMESHGUI_GroupDlg::onApply()
GEOM::GEOM_Object_var aMeshShape = myMesh->GetShapeToMesh();
GEOM::GEOM_Object_wrap aGroupVar = op->CreateGroup(aMeshShape, aGroupType);
GEOM::GEOM_Object_var aMeshShape = myMesh->GetShapeToMesh();
GEOM::GEOM_Object_wrap aGroupVar = op->CreateGroup(aMeshShape, aGroupType);
+ if ( aGroupVar->_is_nil() )
+ return false;
op->UnionList(aGroupVar, myGeomObjects);
if (op->IsDone()) {
op->UnionList(aGroupVar, myGeomObjects);
if (op->IsDone()) {
@@
-1095,12
+1092,12
@@
bool SMESHGUI_GroupDlg::onApply()
QString aNewGeomGroupName ( "Auto_group_for_" );
aNewGeomGroupName += myName->text();
SALOMEDS::SObject_var aNewGroupSO =
QString aNewGeomGroupName ( "Auto_group_for_" );
aNewGeomGroupName += myName->text();
SALOMEDS::SObject_var aNewGroupSO =
- geomGen->AddInStudy(a
SMESHGen->GetCurrentStudy(), a
GroupVar,
-
SMESH::toUtf8(aNewGeomGroupName
), aMeshShape);
+ geomGen->AddInStudy(aGroupVar,
+
aNewGeomGroupName.toUtf8(
), aMeshShape);
}
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
}
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
-
SMESH::toUtf8(myName->text()
),
+
myName->text().toUtf8(
),
aGroupVar);
}
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnGeom );
aGroupVar);
}
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnGeom );
@@
-1111,7
+1108,7
@@
bool SMESHGUI_GroupDlg::onApply()
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnGeom );
isCreation = false;
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnGeom );
isCreation = false;
- }
+ }
anIsOk = true;
}
if (myGrpTypeId == 2) // group on filter
anIsOk = true;
}
if (myGrpTypeId == 2) // group on filter
@@
-1124,7
+1121,7
@@
bool SMESHGUI_GroupDlg::onApply()
return false;
myGroupOnFilter = myMesh->CreateGroupFromFilter(aType,
return false;
myGroupOnFilter = myMesh->CreateGroupFromFilter(aType,
-
SMESH::toUtf8(myName->text()
),
+
myName->text().toUtf8(
),
myFilter);
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnFilter );
isCreation = true;
myFilter);
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnFilter );
isCreation = true;
@@
-1148,7
+1145,7
@@
bool SMESHGUI_GroupDlg::onApply()
if( aMeshGroupSO )
anEntryList.append( aMeshGroupSO->GetID().c_str() );
if( aMeshGroupSO )
anEntryList.append( aMeshGroupSO->GetID().c_str() );
- resultGroup->SetName(
SMESH::toUtf8(myName->text().trimmed()
));
+ resultGroup->SetName(
myName->text().trimmed().toUtf8(
));
if ( isCreation )
{
if ( isCreation )
{
@@
-1179,7
+1176,7
@@
bool SMESHGUI_GroupDlg::onApply()
if ( !anActor ) return false;
myActorsList.append( anActor );
}
if ( !anActor ) return false;
myActorsList.append( anActor );
}
- anActor->setName(
SMESH::toUtf8(myName->text()
));
+ anActor->setName(
myName->text().toUtf8(
));
QColor c;
int delta;
switch ( myTypeId ) {
QColor c;
int delta;
switch ( myTypeId ) {
@@
-1412,22
+1409,24
@@
void SMESHGUI_GroupDlg::onObjectSelectionChanged()
continue;
// Check if group constructed on the same shape as a mesh or on its child
continue;
// Check if group constructed on the same shape as a mesh or on its child
- _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
// The main shape of the group
GEOM::GEOM_Object_var aGroupMainShape;
// The main shape of the group
GEOM::GEOM_Object_var aGroupMainShape;
- if (aGeomGroup->GetType() == 37) {
+ if (aGeomGroup->GetType() == 37)
+ {
GEOM::GEOM_IGroupOperations_wrap anOp =
GEOM::GEOM_IGroupOperations_wrap anOp =
- SMESH::GetGEOMGen(
)->GetIGroupOperations(aStudy->StudyId()
);
- aGroupMainShape = anOp->GetMainShape(
aGeomGroup
);
+ SMESH::GetGEOMGen(
aGeomGroup )->GetIGroupOperations(
);
+ aGroupMainShape = anOp->GetMainShape(
aGeomGroup
);
// aGroupMainShape is an existing servant => GEOM_Object_var not GEOM_Object_wrap
}
// aGroupMainShape is an existing servant => GEOM_Object_var not GEOM_Object_wrap
}
- else {
+ else
+ {
aGroupMainShape = aGeomGroup;
aGroupMainShape->Register();
}
CORBA::String_var entry = aGroupMainShape->GetStudyEntry();
aGroupMainShape = aGeomGroup;
aGroupMainShape->Register();
}
CORBA::String_var entry = aGroupMainShape->GetStudyEntry();
- _PTR(SObject) aGroupMainShapeSO = aStudy->FindObjectID( entry.in() );
+ _PTR(SObject) aGroupMainShapeSO =
+ SMESH::getStudy()->FindObjectID( entry.in() );
_PTR(SObject) anObj, aRef;
bool isRefOrSubShape = false;
_PTR(SObject) anObj, aRef;
bool isRefOrSubShape = false;
@@
-1872,7
+1871,8
@@
void SMESHGUI_GroupDlg::onAdd()
QListWidgetItem* anItem = 0;
QList<QListWidgetItem*> listItemsToSel;
QListWidgetItem* anItem = 0;
QList<QListWidgetItem*> listItemsToSel;
- if (myCurrentLineEdit == 0) {
+ if ( myCurrentLineEdit == 0 )
+ {
//if (aNbSel != 1) { myIsBusy = false; return; }
QString aListStr = "";
int aNbItems = 0;
//if (aNbSel != 1) { myIsBusy = false; return; }
QString aListStr = "";
int aNbItems = 0;
@@
-1915,7
+1915,9
@@
void SMESHGUI_GroupDlg::onAdd()
onListSelectionChanged();
listItemsToSel.clear();
}
onListSelectionChanged();
listItemsToSel.clear();
}
- } else if (myCurrentLineEdit == mySubMeshLine) {
+ }
+ else if ( myCurrentLineEdit == mySubMeshLine )
+ {
//SALOME_ListIteratorOfListIO anIt (mySelectionMgr->StoredIObjects());
SALOME_ListIO aList;
//SALOME_ListIteratorOfListIO anIt (mySelectionMgr->StoredIObjects());
SALOME_ListIO aList;
@@
-1963,7
+1965,9
@@
void SMESHGUI_GroupDlg::onAdd()
myIsBusy = false;
onListSelectionChanged();
myIsBusy = false;
onListSelectionChanged();
- } else if (myCurrentLineEdit == myGroupLine) {
+ }
+ else if ( myCurrentLineEdit == myGroupLine )
+ {
//SALOME_ListIteratorOfListIO anIt (mySelectionMgr->StoredIObjects());
SALOME_ListIO aList;
mySelectionMgr->selectedObjects( aList );
//SALOME_ListIteratorOfListIO anIt (mySelectionMgr->StoredIObjects());
SALOME_ListIO aList;
mySelectionMgr->selectedObjects( aList );
@@
-2005,10
+2009,11
@@
void SMESHGUI_GroupDlg::onAdd()
myIsBusy = false;
onListSelectionChanged();
myIsBusy = false;
onListSelectionChanged();
- } else if (myCurrentLineEdit == myGeomGroupLine && myGeomObjects->length() == 1) {
- _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
+ }
+ else if ( myCurrentLineEdit == myGeomGroupLine && myGeomObjects->length() == 1 )
+ {
GEOM::GEOM_IGroupOperations_wrap aGroupOp =
GEOM::GEOM_IGroupOperations_wrap aGroupOp =
- SMESH::GetGEOMGen(
)->GetIGroupOperations(aStudy->StudyId()
);
+ SMESH::GetGEOMGen(
myGeomObjects[0] )->GetIGroupOperations(
);
SMESH::ElementType aGroupType = SMESH::ALL;
switch(aGroupOp->GetType(myGeomObjects[0])) {
SMESH::ElementType aGroupType = SMESH::ALL;
switch(aGroupOp->GetType(myGeomObjects[0])) {
@@
-2021,8
+2026,8
@@
void SMESHGUI_GroupDlg::onAdd()
if (aGroupType == aType) {
_PTR(SObject) aGroupSO =
if (aGroupType == aType) {
_PTR(SObject) aGroupSO =
- //
aStudy->FindObjectIOR(aStudy
->ConvertObjectToIOR(myGeomGroup));
-
aStudy
->FindObjectID(myGeomObjects[0]->GetStudyEntry());
+ //
SMESH::getStudy()->FindObjectIOR(SMESH::getStudy()
->ConvertObjectToIOR(myGeomGroup));
+
SMESH::getStudy()
->FindObjectID(myGeomObjects[0]->GetStudyEntry());
// Construct filter
SMESH::FilterManager_var aFilterMgr = SMESH::GetFilterManager();
SMESH::Filter_var aFilter = aFilterMgr->CreateFilter();
// Construct filter
SMESH::FilterManager_var aFilterMgr = SMESH::GetFilterManager();
SMESH::Filter_var aFilter = aFilterMgr->CreateFilter();
@@
-2453,9
+2458,8
@@
void SMESHGUI_GroupDlg::onPublishShapeByMeshDlg(SUIT_Operation* op)
GEOM::GEOM_Object_var aGeomVar = myShapeByMeshOp->GetShape();
if ( !aGeomVar->_is_nil() )
{
GEOM::GEOM_Object_var aGeomVar = myShapeByMeshOp->GetShape();
if ( !aGeomVar->_is_nil() )
{
- CORBA::String_var ID = aGeomVar->GetStudyEntry();
- _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
- if ( _PTR(SObject) aGeomSO = aStudy->FindObjectID( ID.in() )) {
+ QString ID = aGeomVar->GetStudyEntry();
+ if ( _PTR(SObject) aGeomSO = SMESH::getStudy()->FindObjectID( ID.toLatin1().data() )) {
SALOME_ListIO anIOList;
Handle(SALOME_InteractiveObject) anIO = new SALOME_InteractiveObject
( aGeomSO->GetID().c_str(), "SMESH", aGeomSO->GetName().c_str() );
SALOME_ListIO anIOList;
Handle(SALOME_InteractiveObject) anIO = new SALOME_InteractiveObject
( aGeomSO->GetID().c_str(), "SMESH", aGeomSO->GetName().c_str() );