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 branch 'origin/V8_5_asterstudy'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_BuildCompoundDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
index 4477dee8a45003f8b880166abf2571824cf85c16..3159231f814d6dc25863523998608b673a42a4b5 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
@@
-250,10
+250,7
@@
QString SMESHGUI_BuildCompoundDlg::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"));
@@
-271,7
+268,7
@@
QString SMESHGUI_BuildCompoundDlg::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(aName.to
Latin1
().data()) == 0);
+ isUnique = (aSet.count(aName.to
Utf8
().data()) == 0);
}
return aName;
}
return aName;
@@
-283,7
+280,7
@@
QString SMESHGUI_BuildCompoundDlg::GetDefaultName(const QString& theOperation)
//=================================================================================
bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
{
//=================================================================================
bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
{
- if (
mySMESHGUI->isActive
StudyLocked())
+ if (
SMESHGUI::is
StudyLocked())
return false;
if (!isValid())
return false;
if (!isValid())
@@
-302,7
+299,7
@@
bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
try {
aMesh = myMeshArray[0]->GetMesh();
try {
aMesh = myMeshArray[0]->GetMesh();
- aMesh->SetParameters( aParameters.join(":").to
Latin1
().constData() );
+ aMesh->SetParameters( aParameters.join(":").to
Utf8
().constData() );
SMESH::SMESH_Gen_var aSMESHGen = SMESHGUI::GetSMESHGen();
// concatenate meshes
SMESH::SMESH_Gen_var aSMESHGen = SMESHGUI::GetSMESHGen();
// concatenate meshes
@@
-335,7
+332,7
@@
bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
SMESH::UpdateView();
_PTR(SObject) aSO = SMESH::FindSObject(aMesh.in());
SMESH::UpdateView();
_PTR(SObject) aSO = SMESH::FindSObject(aMesh.in());
- if ( SMESH_Actor* anActor = SMESH::CreateActor(
aSO->GetStudy(),
aSO->GetID().c_str()) ) {
+ if ( SMESH_Actor* anActor = SMESH::CreateActor( aSO->GetID().c_str()) ) {
SMESH::DisplayActor(SMESH::GetActiveWindow(), anActor);
SMESH::UpdateView();
}
SMESH::DisplayActor(SMESH::GetActiveWindow(), anActor);
SMESH::UpdateView();
}