Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bos#34419 - class member was not initialized
[modules/geom.git]
/
src
/
OCC2VTK
/
GEOM_EdgeSource.cxx
diff --git
a/src/OCC2VTK/GEOM_EdgeSource.cxx
b/src/OCC2VTK/GEOM_EdgeSource.cxx
old mode 100755
(executable)
new mode 100644
(file)
index
b5d65b4
..
df75c68
--- a/
src/OCC2VTK/GEOM_EdgeSource.cxx
+++ b/
src/OCC2VTK/GEOM_EdgeSource.cxx
@@
-1,9
+1,9
@@
-// Copyright (C) 2007-20
13
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-37,10
+37,11
@@
#include <vtkInformation.h>
#include <vtkInformationVector.h>
#include <vtkInformation.h>
#include <vtkInformationVector.h>
-vtkStandardNewMacro(GEOM_EdgeSource)
;
+vtkStandardNewMacro(GEOM_EdgeSource)
GEOM_EdgeSource::GEOM_EdgeSource() :
GEOM_EdgeSource::GEOM_EdgeSource() :
- myIsVector(false)
+ myIsVector(false),
+ myIsVectorMode(false)
{
this->SetNumberOfInputPorts(0);
}
{
this->SetNumberOfInputPorts(0);
}
@@
-126,11
+127,11
@@
void GEOM_EdgeSource::OCC2VTK (const TopoDS_Edge& theEdge,
pt2.Transform(edgeTransf);
}
pt2.Transform(edgeTransf);
}
- float aCoord1[3] = {
pt1.X(), pt1.Y(),
pt1.Z()};
+ float aCoord1[3] = {
(float)pt1.X(), (float)pt1.Y(), (float)
pt1.Z()};
vtkIdType anIds[2];
anIds[0] = thePts->InsertNextPoint(aCoord1);
vtkIdType anIds[2];
anIds[0] = thePts->InsertNextPoint(aCoord1);
- float aCoord2[3] = {
pt2.X(), pt2.Y(),
pt2.Z()};
+ float aCoord2[3] = {
(float)pt2.X(), (float)pt2.Y(), (float)
pt2.Z()};
anIds[1] = thePts->InsertNextPoint(aCoord2);
thePolyData->InsertNextCell(VTK_LINE,2,anIds);
anIds[1] = thePts->InsertNextPoint(aCoord2);
thePolyData->InsertNextCell(VTK_LINE,2,anIds);
@@
-138,17
+139,16
@@
void GEOM_EdgeSource::OCC2VTK (const TopoDS_Edge& theEdge,
} else {
Standard_Integer aNbNodes = aEdgePoly->NbNodes();
const TColStd_Array1OfInteger& aNodeIds = aEdgePoly->Nodes();
} else {
Standard_Integer aNbNodes = aEdgePoly->NbNodes();
const TColStd_Array1OfInteger& aNodeIds = aEdgePoly->Nodes();
- const TColgp_Array1OfPnt& anId2Pnts = T->Nodes();
- aP1 =
anId2Pnts
(aNodeIds(1));
- aP2 =
anId2Pnts
(aNodeIds(aNbNodes));
+ aP1 =
T->Node
(aNodeIds(1));
+ aP2 =
T->Node
(aNodeIds(aNbNodes));
for(int j = 1; j < aNbNodes; j++) {
Standard_Integer id1 = aNodeIds(j);
Standard_Integer id2 = aNodeIds(j+1);
for(int j = 1; j < aNbNodes; j++) {
Standard_Integer id1 = aNodeIds(j);
Standard_Integer id2 = aNodeIds(j+1);
- gp_Pnt pt1 =
anId2Pnts
(id1);
- gp_Pnt pt2 =
anId2Pnts
(id2);
+ gp_Pnt pt1 =
T->Node
(id1);
+ gp_Pnt pt2 =
T->Node
(id2);
if(!isidtrsf) {
// apply edge transformation
if(!isidtrsf) {
// apply edge transformation
@@
-156,11
+156,11
@@
void GEOM_EdgeSource::OCC2VTK (const TopoDS_Edge& theEdge,
pt2.Transform(edgeTransf);
}
pt2.Transform(edgeTransf);
}
- float aCoord1[3] = {
pt1.X(), pt1.Y(),
pt1.Z()};
+ float aCoord1[3] = {
(float)pt1.X(), (float)pt1.Y(), (float)
pt1.Z()};
vtkIdType anIds[2];
anIds[0] = thePts->InsertNextPoint(aCoord1);
vtkIdType anIds[2];
anIds[0] = thePts->InsertNextPoint(aCoord1);
- float aCoord2[3] = {
pt2.X(), pt2.Y(),
pt2.Z()};
+ float aCoord2[3] = {
(float)pt2.X(), (float)pt2.Y(), (float)
pt2.Z()};
anIds[1] = thePts->InsertNextPoint(aCoord2);
thePolyData->InsertNextCell(VTK_LINE,2,anIds);
anIds[1] = thePts->InsertNextPoint(aCoord2);
thePolyData->InsertNextCell(VTK_LINE,2,anIds);
@@
-226,7
+226,7
@@
void GEOM_EdgeSource::OCC2VTK (const TopoDS_Edge& theEdge,
// Add points and segments, composing the arrow
Standard_Real cosinus, sinus, Tg = tan(anAngle);
// Add points and segments, composing the arrow
Standard_Real cosinus, sinus, Tg = tan(anAngle);
- float coord[3] = {
xo, yo,
zo};
+ float coord[3] = {
(float)xo, (float)yo, (float)
zo};
vtkIdType ptLoc = thePts->InsertNextPoint(coord);
vtkIdType ptFirst = 0;
vtkIdType ptLoc = thePts->InsertNextPoint(coord);
vtkIdType ptFirst = 0;