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 multi-study removal branch.
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
index c2575f14e533e0d8430a9fd72916ad07d5119ec8..ce7f8b88af92956310cc239b856e2920d0f1cefa 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_GroupDlg.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
@@
-444,7
+444,6
@@
void SMESHGUI_GroupDlg::initDialog( bool create)
/* Init selection */
mySMESHGUI->SetActiveDialogBox(this);
/* Init selection */
mySMESHGUI->SetActiveDialogBox(this);
- mySMESHGUI->SetState(800);
SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>( mySMESHGUI->application()->activeStudy() );
mySelectionMode = grpNoSelection;
SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>( mySMESHGUI->application()->activeStudy() );
mySelectionMode = grpNoSelection;
@@
-499,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" ));
@@
-529,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( SMESH::toUtf8(aResName) );
}
while ( anObj );
myName->setText(aResName);
}
while ( anObj );
myName->setText(aResName);
@@
-665,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())
{
@@
-916,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())
@@
-936,7
+931,7
@@
bool SMESHGUI_GroupDlg::onApply()
QStringList anEntryList;
SMESH::SMESH_GroupBase_var resultGroup;
QStringList anEntryList;
SMESH::SMESH_GroupBase_var resultGroup;
- bool isCreation, isConversion = false;
+ bool isCreation
= false
, isConversion = false;
SUIT_OverrideCursor wc;
SUIT_OverrideCursor wc;
@@
-1051,7
+1046,7
@@
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,
@@
-1065,12
+1060,11
@@
bool SMESHGUI_GroupDlg::onApply()
// create a geometry group
GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen();
// create a geometry group
GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen();
- _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
- if (geomGen->_is_nil()
|| !aStudy
)
+ 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;
if (op->_is_nil())
return false;
@@
-1096,7
+1090,7
@@
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,
+ geomGen->AddInStudy(aGroupVar,
SMESH::toUtf8(aNewGeomGroupName), aMeshShape);
}
SMESH::toUtf8(aNewGeomGroupName), aMeshShape);
}
@@
-1413,13
+1407,12
@@
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;
if (aGeomGroup->GetType() == 37) {
GEOM::GEOM_IGroupOperations_wrap anOp =
// The main shape of the group
GEOM::GEOM_Object_var aGroupMainShape;
if (aGeomGroup->GetType() == 37) {
GEOM::GEOM_IGroupOperations_wrap anOp =
- SMESH::GetGEOMGen()->GetIGroupOperations(
aStudy->StudyId()
);
+ SMESH::GetGEOMGen()->GetIGroupOperations();
aGroupMainShape = anOp->GetMainShape(aGeomGroup);
// aGroupMainShape is an existing servant => GEOM_Object_var not GEOM_Object_wrap
}
aGroupMainShape = anOp->GetMainShape(aGeomGroup);
// aGroupMainShape is an existing servant => GEOM_Object_var not GEOM_Object_wrap
}
@@
-1428,7
+1421,7
@@
void SMESHGUI_GroupDlg::onObjectSelectionChanged()
aGroupMainShape->Register();
}
_PTR(SObject) aGroupMainShapeSO =
aGroupMainShape->Register();
}
_PTR(SObject) aGroupMainShapeSO =
-
aStudy
->FindObjectID(aGroupMainShape->GetStudyEntry());
+
SMESH::getStudy()
->FindObjectID(aGroupMainShape->GetStudyEntry());
_PTR(SObject) anObj, aRef;
bool isRefOrSubShape = false;
_PTR(SObject) anObj, aRef;
bool isRefOrSubShape = false;
@@
-1609,6
+1602,8
@@
void SMESHGUI_GroupDlg::onSelectAll()
mySortBtn->setEnabled ( !noElemsModif );
mySelectBox->setEnabled ( !noElemsModif );
myAllowElemsModif->setEnabled( !mySelectAll->isChecked() );
mySortBtn->setEnabled ( !noElemsModif );
mySelectBox->setEnabled ( !noElemsModif );
myAllowElemsModif->setEnabled( !mySelectAll->isChecked() );
+ if ( noElemsModif ) mySMESHGUI->ResetState();
+ else mySMESHGUI->SetState(800);
int selMode = mySelectionMode;
mySelectionMode = grpNoSelection;
int selMode = mySelectionMode;
mySelectionMode = grpNoSelection;
@@
-2005,9
+2000,8
@@
void SMESHGUI_GroupDlg::onAdd()
onListSelectionChanged();
} else if (myCurrentLineEdit == myGeomGroupLine && myGeomObjects->length() == 1) {
onListSelectionChanged();
} else if (myCurrentLineEdit == myGeomGroupLine && myGeomObjects->length() == 1) {
- _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
GEOM::GEOM_IGroupOperations_wrap aGroupOp =
GEOM::GEOM_IGroupOperations_wrap aGroupOp =
- SMESH::GetGEOMGen()->GetIGroupOperations(
aStudy->StudyId()
);
+ SMESH::GetGEOMGen()->GetIGroupOperations();
SMESH::ElementType aGroupType = SMESH::ALL;
switch(aGroupOp->GetType(myGeomObjects[0])) {
SMESH::ElementType aGroupType = SMESH::ALL;
switch(aGroupOp->GetType(myGeomObjects[0])) {
@@
-2020,8
+2014,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();
@@
-2332,9
+2326,9
@@
void SMESHGUI_GroupDlg::enterEvent (QEvent*)
setEnabled(true);
mySelectionMode = grpNoSelection;
setSelectionMode(myTypeId);
setEnabled(true);
mySelectionMode = grpNoSelection;
setSelectionMode(myTypeId);
- //mySMESHGUI->SetActiveDialogBox((QDialog*)this);
mySMESHGUI->SetActiveDialogBox(this);
mySMESHGUI->SetActiveDialogBox(this);
- mySMESHGUI->SetState(800);
+ if ( mySelectBox->isEnabled() ) mySMESHGUI->SetState(800);
+ else mySMESHGUI->ResetState();
}
}
}
}
@@
-2453,8
+2447,7
@@
void SMESHGUI_GroupDlg::onPublishShapeByMeshDlg(SUIT_Operation* op)
if ( !aGeomVar->_is_nil() )
{
QString ID = aGeomVar->GetStudyEntry();
if ( !aGeomVar->_is_nil() )
{
QString ID = aGeomVar->GetStudyEntry();
- _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
- if ( _PTR(SObject) aGeomSO = aStudy->FindObjectID( ID.toLatin1().data() )) {
+ 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() );