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_ExtrusionDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
index 205544cfa0993ba688f3dfd69a386640774a7525..b1e89e0124805e0bdc921e992b6115fee8c8d749 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
@@
-337,7
+337,7
@@
void SMESHGUI_3TypesSelector::onTextChange( const QString& theNewText )
myBusy = true;
myBusy = true;
- // hilight entered elements/nodes
+ // hi
gh
light entered elements/nodes
myIDSource[ iType ]->length( 0 );
myIDSource[ iType ]->length( 0 );
@@
-819,7
+819,7
@@
SMESHGUI_ExtrusionDlg::SMESHGUI_ExtrusionDlg (SMESHGUI* theModule)
mySMESHGUI->SetActiveDialogBox(this);
mySMESHGUI->SetActiveDialogBox(this);
- myHelpFileName = "extrusion
_page
.html";
+ myHelpFileName = "extrusion.html";
Init();
Init();
@@
-1092,7
+1092,7
@@
void SMESHGUI_ExtrusionDlg::ClickOnRadio()
bool SMESHGUI_ExtrusionDlg::ClickOnApply()
{
bool SMESHGUI_ExtrusionDlg::ClickOnApply()
{
- if (
mySMESHGUI->isActive
StudyLocked())
+ if (
SMESHGUI::is
StudyLocked())
return false;
if (!isValid())
return false;
if (!isValid())
@@
-1159,7
+1159,7
@@
bool SMESHGUI_ExtrusionDlg::ClickOnApply()
SMESH::SMESH_MeshEditor_var meshEditor = mesh->GetMeshEditor();
SMESH::ListOfGroups_var groups;
SMESH::SMESH_MeshEditor_var meshEditor = mesh->GetMeshEditor();
SMESH::ListOfGroups_var groups;
- mesh->SetParameters( aParameters.join(":").to
Latin1
().constData() );
+ mesh->SetParameters( aParameters.join(":").to
Utf8
().constData() );
if ( ExtrMethod_RBut2->isVisible() &&
ExtrMethod_RBut2->isChecked() ) // Extrusion by normal
if ( ExtrMethod_RBut2->isVisible() &&
ExtrMethod_RBut2->isChecked() ) // Extrusion by normal
@@
-1289,7
+1289,7
@@
void SMESHGUI_ExtrusionDlg::ClickOnHelp()
#endif
SUIT_MessageBox::warning(this, tr("WRN_WARNING"),
tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
#endif
SUIT_MessageBox::warning(this, tr("WRN_WARNING"),
tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
- arg(app->resourceMgr()->stringValue("ExternalBrowser",
+ arg(app->resourceMgr()->stringValue("ExternalBrowser",
platform)).
arg(myHelpFileName));
}
platform)).
arg(myHelpFileName));
}
@@
-1323,7
+1323,7
@@
void SMESHGUI_ExtrusionDlg::SelectionIntoArgument()
return;
const SMDS_MeshFace* face =
return;
const SMDS_MeshFace* face =
-
dynamic_cast<const SMDS_MeshFace*
>(aMesh->FindElement(aMapIndex(1)));
+
aMesh->DownCast< SMDS_MeshFace
>(aMesh->FindElement(aMapIndex(1)));
if (!face)
return;
if (!face)
return;