Skip to content

Commit 005cb8c

Browse files
committed
ENH:Got edges working
1 parent d349906 commit 005cb8c

File tree

5 files changed

+191
-67
lines changed

5 files changed

+191
-67
lines changed

Common/vtkEdgeTable.cxx

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
vtkStandardNewMacro(vtkEdgeTable);
2222

23+
//----------------------------------------------------------------------------
2324
// Instantiate object based on maximum point id.
2425
vtkEdgeTable::vtkEdgeTable()
2526
{
@@ -36,6 +37,7 @@ vtkEdgeTable::vtkEdgeTable()
3637
this->NumberOfEdges = 0;
3738
}
3839

40+
//----------------------------------------------------------------------------
3941
// Free memory and return to instantiated state.
4042
void vtkEdgeTable::Initialize()
4143
{
@@ -90,6 +92,7 @@ void vtkEdgeTable::Initialize()
9092
this->NumberOfEdges = 0;
9193
}
9294

95+
//----------------------------------------------------------------------------
9396
// Free memory and return to instantiated state.
9497
void vtkEdgeTable::Reset()
9598
{
@@ -137,11 +140,13 @@ void vtkEdgeTable::Reset()
137140
this->NumberOfEdges = 0;
138141
}
139142

143+
//----------------------------------------------------------------------------
140144
vtkEdgeTable::~vtkEdgeTable()
141145
{
142146
this->Initialize();
143147
}
144148

149+
//----------------------------------------------------------------------------
145150
int vtkEdgeTable::InitEdgeInsertion(vtkIdType numPoints, int storeAttributes)
146151
{
147152
vtkIdType i;
@@ -194,6 +199,7 @@ int vtkEdgeTable::InitEdgeInsertion(vtkIdType numPoints, int storeAttributes)
194199
return 1;
195200
}
196201

202+
//----------------------------------------------------------------------------
197203
// Return non-negative if edge (p1,p2) is an edge; otherwise -1.
198204
vtkIdType vtkEdgeTable::IsEdge(vtkIdType p1, vtkIdType p2)
199205
{
@@ -235,6 +241,7 @@ vtkIdType vtkEdgeTable::IsEdge(vtkIdType p1, vtkIdType p2)
235241
}
236242
}
237243

244+
//----------------------------------------------------------------------------
238245
// Return non-negative if edge (p1,p2) is an edge; otherwise -1.
239246
void vtkEdgeTable::IsEdge(vtkIdType p1, vtkIdType p2, void* &ptr)
240247
{
@@ -276,6 +283,7 @@ void vtkEdgeTable::IsEdge(vtkIdType p1, vtkIdType p2, void* &ptr)
276283
}
277284
}
278285

286+
//----------------------------------------------------------------------------
279287
// Insert the edge (p1,p2) into the table. It is the user's responsibility to
280288
// check if the edge has already been inserted.
281289
vtkIdType vtkEdgeTable::InsertEdge(vtkIdType p1, vtkIdType p2)
@@ -328,6 +336,7 @@ vtkIdType vtkEdgeTable::InsertEdge(vtkIdType p1, vtkIdType p2)
328336
return (this->NumberOfEdges - 1);
329337
}
330338

339+
//----------------------------------------------------------------------------
331340
void vtkEdgeTable::InsertEdge(vtkIdType p1, vtkIdType p2,
332341
vtkIdType attributeId)
333342
{
@@ -373,6 +382,7 @@ void vtkEdgeTable::InsertEdge(vtkIdType p1, vtkIdType p2,
373382
}
374383
}
375384

385+
//----------------------------------------------------------------------------
376386
void vtkEdgeTable::InsertEdge(vtkIdType p1, vtkIdType p2, void* ptr)
377387
{
378388
vtkIdType index, search;
@@ -418,6 +428,7 @@ void vtkEdgeTable::InsertEdge(vtkIdType p1, vtkIdType p2, void* ptr)
418428
}
419429

420430

431+
//----------------------------------------------------------------------------
421432
// Intialize traversal of edges in table.
422433
void vtkEdgeTable::InitTraversal()
423434
{
@@ -445,14 +456,15 @@ vtkIdType vtkEdgeTable::GetNextEdge(vtkIdType &p1, vtkIdType &p2)
445456
}
446457
else
447458
{
448-
return (-1);
459+
return (-1);
449460
}
450461
}
451462
}
452463

453464
return (-1);
454465
}
455466

467+
//----------------------------------------------------------------------------
456468
// Traverse list of edges in table. Return the edge as (p1,p2), where p1 and
457469
// p2 are point id's. The value of p1 is guaranteed to be <= p2. The
458470
// return value is either 1 for success or 0 if the list is exhausted.
@@ -541,6 +553,7 @@ vtkIdList **vtkEdgeTable::Resize(vtkIdType sz)
541553
return this->Table;
542554
}
543555

556+
//----------------------------------------------------------------------------
544557
int vtkEdgeTable::InitPointInsertion(vtkPoints *newPts, vtkIdType estSize)
545558
{
546559
// Initialize
@@ -566,6 +579,7 @@ int vtkEdgeTable::InitPointInsertion(vtkPoints *newPts, vtkIdType estSize)
566579
return 1;
567580
}
568581

582+
//----------------------------------------------------------------------------
569583
int vtkEdgeTable::InsertUniquePoint(vtkIdType p1, vtkIdType p2, double x[3],
570584
vtkIdType &ptId)
571585
{
@@ -584,6 +598,7 @@ int vtkEdgeTable::InsertUniquePoint(vtkIdType p1, vtkIdType p2, double x[3],
584598
}
585599
}
586600

601+
//----------------------------------------------------------------------------
587602
void vtkEdgeTable::PrintSelf(ostream& os, vtkIndent indent)
588603
{
589604
this->Superclass::PrintSelf(os,indent);

0 commit comments

Comments
 (0)