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
Add DLL specs.
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_RevolutionDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
b/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
index a91586798c0e9c657c4a93ec1a657a1502757fb9..717d747c16f8904e291af6bc114161140d0b02f8 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-57,7
+57,7
@@
#include <SVTK_ViewWindow.h>
#include <SVTK_Selector.h>
#include <SALOME_ListIO.hxx>
#include <SVTK_ViewWindow.h>
#include <SVTK_Selector.h>
#include <SALOME_ListIO.hxx>
-#include <VTKViewer_CellLocationsArray.h>
+
//
#include <VTKViewer_CellLocationsArray.h>
// OCCT includes
#include <TColStd_MapOfInteger.hxx>
// OCCT includes
#include <TColStd_MapOfInteger.hxx>
@@
-261,7
+261,7
@@
SMESHGUI_RevolutionDlg::SMESHGUI_RevolutionDlg( SMESHGUI* theModule )
mySMESHGUI->SetActiveDialogBox((QDialog*)this);
mySMESHGUI->SetActiveDialogBox((QDialog*)this);
- myHelpFileName = "revolution
_page
.html";
+ myHelpFileName = "revolution.html";
Init();
Init();
@@
-392,7
+392,7
@@
bool SMESHGUI_RevolutionDlg::isValid()
//=================================================================================
bool SMESHGUI_RevolutionDlg::ClickOnApply()
{
//=================================================================================
bool SMESHGUI_RevolutionDlg::ClickOnApply()
{
- if (
mySMESHGUI->isActive
StudyLocked())
+ if (
SMESHGUI::is
StudyLocked())
return false;
if (!isValid())
return false;
if (!isValid())
@@
-436,7
+436,7
@@
bool SMESHGUI_RevolutionDlg::ClickOnApply()
SMESH::SMESH_Mesh_var mesh = SelectorWdg->GetMesh();
SMESH::SMESH_Mesh_var mesh = SelectorWdg->GetMesh();
- mesh->SetParameters( aParameters.join(":").to
Latin1
().constData() );
+ mesh->SetParameters( aParameters.join(":").to
Utf8
().constData() );
SMESH::ListOfIDSources_var nodes = new SMESH::ListOfIDSources();
SMESH::ListOfIDSources_var edges = new SMESH::ListOfIDSources();
SMESH::ListOfIDSources_var nodes = new SMESH::ListOfIDSources();
SMESH::ListOfIDSources_var edges = new SMESH::ListOfIDSources();
@@
-573,7
+573,7
@@
void SMESHGUI_RevolutionDlg::ClickOnHelp()
// function : onAngleTextChange()
// purpose :
//=======================================================================
// function : onAngleTextChange()
// purpose :
//=======================================================================
-void SMESHGUI_RevolutionDlg::onAngleTextChange (const QString&
theNewText
)
+void SMESHGUI_RevolutionDlg::onAngleTextChange (const QString&
/*theNewText*/
)
{
bool isNumber;
SpinBox_Angle->text().toDouble( &isNumber );
{
bool isNumber;
SpinBox_Angle->text().toDouble( &isNumber );
@@
-602,7
+602,7
@@
void SMESHGUI_RevolutionDlg::SelectionIntoArgument()
return;
Handle(SALOME_InteractiveObject) IO = aList.First();
return;
Handle(SALOME_InteractiveObject) IO = aList.First();
-
TColStd_IndexedMapOfInteger
aMapIndex;
+
SVTK_TIndexedMapOfVtkId
aMapIndex;
mySelector->GetIndex(IO,aMapIndex);
if ( aMapIndex.Extent() != 1 )
return;
mySelector->GetIndex(IO,aMapIndex);
if ( aMapIndex.Extent() != 1 )
return;
@@
-612,9
+612,7
@@
void SMESHGUI_RevolutionDlg::SelectionIntoArgument()
if ( !aMesh )
return;
if ( !aMesh )
return;
- int aNbUnits = 0;
-
- bool isNodeSelected = (myEditCurrentArgument == (QWidget*)SpinBox_X ||
+ bool isNodeSelected = ((myEditCurrentArgument == (QWidget*)SpinBox_X ) ||
(myEditCurrentArgument == (QWidget*)SpinBox_DX &&
myVectorDefinition==POINT_SELECT));
(myEditCurrentArgument == (QWidget*)SpinBox_DX &&
myVectorDefinition==POINT_SELECT));
@@
-643,7
+641,7
@@
void SMESHGUI_RevolutionDlg::SelectionIntoArgument()
else if ( isFaceSelected )
{
const SMDS_MeshFace* face =
else if ( isFaceSelected )
{
const SMDS_MeshFace* face =
-
dynamic_cast<const SMDS_MeshFace*>(aMesh->FindElement(aMapIndex(1
)));
+
SMDS_Mesh::DownCast<SMDS_MeshFace>( aMesh->FindElement( aMapIndex( 1
)));
if (!face)
return;
gp_XYZ aNormale = SMESH::getNormale(face);
if (!face)
return;
gp_XYZ aNormale = SMESH::getNormale(face);
@@
-798,7
+796,7
@@
void SMESHGUI_RevolutionDlg::onDisplaySimulation(bool toDisplayPreview)
anAxis, anAngle, aNbSteps, aTolerance, makeGroups );
SMESH::MeshPreviewStruct_var aMeshPreviewStruct = meshEditor->GetPreviewData();
anAxis, anAngle, aNbSteps, aTolerance, makeGroups );
SMESH::MeshPreviewStruct_var aMeshPreviewStruct = meshEditor->GetPreviewData();
- mySimulation->SetData( aMeshPreviewStruct.
_ret
n() );
+ mySimulation->SetData( aMeshPreviewStruct.
i
n() );
}
catch (...) {}
}
}
catch (...) {}
}