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
Ménage avant intégration
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_AddMeshElementDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
index 25bbd46e7c12d24af2e0db2541e6bb6c3d72ffe7..165b1487c4426442cdb0f8d1cfac28fb8d4a57ea 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
@@
-40,7
+40,7
@@
#include <SMESH_FaceOrientationFilter.h>
#include <SMDS_Mesh.hxx>
#include <SMESH_FaceOrientationFilter.h>
#include <SMDS_Mesh.hxx>
-// SALOME GUI inclues
+// SALOME GUI inclu
d
es
#include <SUIT_Desktop.h>
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Desktop.h>
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
@@
-56,7
+56,7
@@
#include <Qtx.h>
#include <Qtx.h>
-// IDL incl
du
es
+// IDL incl
ud
es
#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
// OCCT includes
#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
// OCCT includes
@@
-217,6
+217,7
@@
namespace SMESH
void SetBallPosition(SMESH_Actor* theActor,TVTKIds& theIds, double theDiameter)
{
vtkUnstructuredGrid *aGrid = theActor->GetUnstructuredGrid();
void SetBallPosition(SMESH_Actor* theActor,TVTKIds& theIds, double theDiameter)
{
vtkUnstructuredGrid *aGrid = theActor->GetUnstructuredGrid();
+ myBallPolyData->SetPoints(NULL);
myBallPolyData->Reset();
myBallPolyData->DeleteCells();
myBallPolyData->SetPoints(aGrid->GetPoints());
myBallPolyData->Reset();
myBallPolyData->DeleteCells();
myBallPolyData->SetPoints(aGrid->GetPoints());
@@
-307,68
+308,68
@@
SMESHGUI_AddMeshElementDlg::SMESHGUI_AddMeshElementDlg( SMESHGUI* theMo
myNbNodes = 1;
myElementType = SMDSAbs_0DElement;
elemName = "ELEM0D";
myNbNodes = 1;
myElementType = SMDSAbs_0DElement;
elemName = "ELEM0D";
- myHelpFileName = "adding_nodes_and_elements
_page.html#adding_0delems_
anchor";
+ myHelpFileName = "adding_nodes_and_elements
.html#adding-0delems-
anchor";
break;
case SMDSEntity_Ball:
myNbNodes = 1;
myElementType = SMDSAbs_Ball;
elemName = "BALL";
break;
case SMDSEntity_Ball:
myNbNodes = 1;
myElementType = SMDSAbs_Ball;
elemName = "BALL";
- myHelpFileName = "adding_nodes_and_elements
_page.html#adding_ball_
anchor";
+ myHelpFileName = "adding_nodes_and_elements
.html#adding-balls-
anchor";
break;
case SMDSEntity_Edge:
myNbNodes = 2;
myElementType = SMDSAbs_Edge;
elemName = "EDGE";
break;
case SMDSEntity_Edge:
myNbNodes = 2;
myElementType = SMDSAbs_Edge;
elemName = "EDGE";
- myHelpFileName = "adding_nodes_and_elements
_page.html#adding_edges_
anchor";
+ myHelpFileName = "adding_nodes_and_elements
.html#adding-edges-
anchor";
break;
case SMDSEntity_Triangle:
myNbNodes = 3;
elemName = "TRIANGLE";
myElementType = SMDSAbs_Face;
break;
case SMDSEntity_Triangle:
myNbNodes = 3;
elemName = "TRIANGLE";
myElementType = SMDSAbs_Face;
- myHelpFileName = "adding_nodes_and_elements
_page.html#adding_triangles_
anchor";
+ myHelpFileName = "adding_nodes_and_elements
.html#adding-triangles-
anchor";
break;
case SMDSEntity_Quadrangle:
myNbNodes = 4;
myElementType = SMDSAbs_Face;
elemName = "QUADRANGLE";
break;
case SMDSEntity_Quadrangle:
myNbNodes = 4;
myElementType = SMDSAbs_Face;
elemName = "QUADRANGLE";
- myHelpFileName = "adding_nodes_and_elements
_page.html#adding_quadrangles_
anchor";
+ myHelpFileName = "adding_nodes_and_elements
.html#adding-quadrangles-
anchor";
break;
case SMDSEntity_Polygon:
myNbNodes = 0;
myElementType = SMDSAbs_Face;
elemName = "POLYGON";
myIsPoly = true;
break;
case SMDSEntity_Polygon:
myNbNodes = 0;
myElementType = SMDSAbs_Face;
elemName = "POLYGON";
myIsPoly = true;
- myHelpFileName = "adding_nodes_and_elements
_page.html#adding_polygons_
anchor";
+ myHelpFileName = "adding_nodes_and_elements
.html#adding-polygons-
anchor";
break;
case SMDSEntity_Tetra:
myNbNodes = 4;
elemName = "TETRAS";
break;
case SMDSEntity_Tetra:
myNbNodes = 4;
elemName = "TETRAS";
- myHelpFileName = "adding_nodes_and_elements
_page.html#adding_tetrahedrons_
anchor";
+ myHelpFileName = "adding_nodes_and_elements
.html#adding-tetrahedrons-
anchor";
break;
case SMDSEntity_Pyramid:
myNbNodes = 5;
elemName = "PYRAMID";
break;
case SMDSEntity_Pyramid:
myNbNodes = 5;
elemName = "PYRAMID";
- myHelpFileName = "adding_nodes_and_elements
_page.html#adding_pyramids_
anchor";
+ myHelpFileName = "adding_nodes_and_elements
.html#adding-pyramids-
anchor";
break;
case SMDSEntity_Hexa:
myNbNodes = 8;
elemName = "HEXAS";
break;
case SMDSEntity_Hexa:
myNbNodes = 8;
elemName = "HEXAS";
- myHelpFileName = "adding_nodes_and_elements
_page.html#adding_hexahedrons_
anchor";
+ myHelpFileName = "adding_nodes_and_elements
.html#adding-hexahedrons-
anchor";
break;
case SMDSEntity_Penta:
myNbNodes = 6;
elemName = "PENTA";
break;
case SMDSEntity_Penta:
myNbNodes = 6;
elemName = "PENTA";
- myHelpFileName = "adding_nodes_and_elements
_page.html#adding_pentahedrons_
anchor";
+ myHelpFileName = "adding_nodes_and_elements
.html#adding-pentahedrons-
anchor";
break;
case SMDSEntity_Hexagonal_Prism:
myNbNodes = 12;
elemName = "OCTA";
break;
case SMDSEntity_Hexagonal_Prism:
myNbNodes = 12;
elemName = "OCTA";
- myHelpFileName = "adding_nodes_and_elements
_page.html#adding_octahedrons_
anchor";
+ myHelpFileName = "adding_nodes_and_elements
.html#adding-octahedrons-
anchor";
break;
default:
myNbNodes = 2;
elemName = "EDGE";
break;
default:
myNbNodes = 2;
elemName = "EDGE";
- myHelpFileName = "adding_nodes_and_elements
_page.html#adding_edges_
anchor";
+ myHelpFileName = "adding_nodes_and_elements
.html#adding-edges-
anchor";
}
QString iconName = tr(QString("ICON_DLG_%1").arg(elemName).toLatin1().data());
}
QString iconName = tr(QString("ICON_DLG_%1").arg(elemName).toLatin1().data());
@@
-549,7
+550,7
@@
void SMESHGUI_AddMeshElementDlg::ClickOnApply()
if( !isValid() )
return;
if( !isValid() )
return;
- if (myNbOkNodes && !
mySMESHGUI->isActive
StudyLocked()) {
+ if (myNbOkNodes && !
SMESHGUI::is
StudyLocked()) {
myBusy = true;
QStringList aListId = myEditCurrentArgument->text().split(" ", QString::SkipEmptyParts);
SMESH::long_array_var anArrayOfIndices = new SMESH::long_array;
myBusy = true;
QStringList aListId = myEditCurrentArgument->text().split(" ", QString::SkipEmptyParts);
SMESH::long_array_var anArrayOfIndices = new SMESH::long_array;
@@
-777,7
+778,7
@@
void SMESHGUI_AddMeshElementDlg::onTextChange (const QString& theNewText)
mySimulation->SetVisibility(false);
mySimulation->SetVisibility(false);
- // hilight entered nodes
+ // hi
gh
light entered nodes
SMDS_Mesh* aMesh = 0;
if (myActor)
aMesh = myActor->GetObject()->GetMesh();
SMDS_Mesh* aMesh = 0;
if (myActor)
aMesh = myActor->GetObject()->GetMesh();