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 0cd63352b9c86ce79a25a0f6561459fda6ef0c86..3159231f814d6dc25863523998608b673a42a4b5 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
@@
-179,7
+179,7
@@
SMESHGUI_BuildCompoundDlg::SMESHGUI_BuildCompoundDlg( SMESHGUI* theModule )
aTopLayout->addWidget(GroupArgs);
aTopLayout->addWidget(GroupButtons);
aTopLayout->addWidget(GroupArgs);
aTopLayout->addWidget(GroupButtons);
- myHelpFileName = "building_compounds
_page
.html";
+ myHelpFileName = "building_compounds.html";
Init(); // Initialisations
}
Init(); // Initialisations
}
@@
-268,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;
@@
-299,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