diff --git a/src/Cxx/GeometricObjects/LinearCellsDemo.cxx b/src/Cxx/GeometricObjects/LinearCellsDemo.cxx index 031762a0713752656417bacd77c6d77256604d64..5dc5eeee6caddb7d3228f812b725a1a723f74db0 100644 --- a/src/Cxx/GeometricObjects/LinearCellsDemo.cxx +++ b/src/Cxx/GeometricObjects/LinearCellsDemo.cxx @@ -820,21 +820,21 @@ vtkNew MakeWedge() // vtkNew points; // points->InsertNextPoint(0, 1, 0); - // points->InsertNextPoint(0, 0, 0); // points->InsertNextPoint(0, 0.5, 0.5); + // points->InsertNextPoint(0, 0, 0); // points->InsertNextPoint(1, 1, 0); - // points->InsertNextPoint(1, 0.0, 0.0); // points->InsertNextPoint(1, 0.5, 0.5); + // points->InsertNextPoint(1, 0.0, 0.0); // Rotate the above points -90° about the X-axis // and translate -1 along the Y-axis. vtkNew points; points->InsertNextPoint(0, 0, 0); - points->InsertNextPoint(0, 0, 1); points->InsertNextPoint(0, 0.5, 0.5); + points->InsertNextPoint(0, 0, 1); points->InsertNextPoint(1, 0, 0); - points->InsertNextPoint(1, 0, 1); points->InsertNextPoint(1, 0.5, 0.5); + points->InsertNextPoint(1, 0, 1); vtkNew wedge; for (auto i = 0; i < numberOfVertices; ++i) diff --git a/src/Python/GeometricObjects/LinearCellsDemo.py b/src/Python/GeometricObjects/LinearCellsDemo.py index a9525990b0f51e26534db01b517cfa20de16ec0e..9437b56fed207474050785532ff015933ccbd4d3 100755 --- a/src/Python/GeometricObjects/LinearCellsDemo.py +++ b/src/Python/GeometricObjects/LinearCellsDemo.py @@ -647,20 +647,20 @@ def make_wedge(): points = vtkPoints() # points.InsertNextPoint(0, 1, 0) - # points.InsertNextPoint(0, 0, 0) # points.InsertNextPoint(0, 0.5, 0.5) + # points.InsertNextPoint(0, 0, 0) # points.InsertNextPoint(1, 1, 0) - # points.InsertNextPoint(1, 0.0, 0.0) # points.InsertNextPoint(1, 0.5, 0.5) + # points.InsertNextPoint(1, 0.0, 0.0) # Rotate the above points -90° about the X-axis # and translate -1 along the Y-axis. points.InsertNextPoint(0.0, 0.0, 0.0) - points.InsertNextPoint(0.0, 0, 1.0) points.InsertNextPoint(0.0, 0.5, 0.5) + points.InsertNextPoint(0.0, 0, 1.0) points.InsertNextPoint(1.0, 0.0, 0.0) - points.InsertNextPoint(1.0, 0, 1.0) points.InsertNextPoint(1.0, 0.5, 0.5) + points.InsertNextPoint(1.0, 0, 1.0) wedge = vtkWedge() for i in range(0, number_of_vertices): diff --git a/src/PythonicAPI/GeometricObjects/LinearCellsDemo.py b/src/PythonicAPI/GeometricObjects/LinearCellsDemo.py index db9e2d9ed16111dfe2a9d7f560309b0bdfe877bc..2a29db6f7c7e87f185db5eaa5f41ed75440eb30e 100755 --- a/src/PythonicAPI/GeometricObjects/LinearCellsDemo.py +++ b/src/PythonicAPI/GeometricObjects/LinearCellsDemo.py @@ -673,20 +673,20 @@ def make_wedge(): # Original Points. # points.InsertNextPoint(0, 1, 0) - # points.InsertNextPoint(0, 0, 0) # points.InsertNextPoint(0, 0.5, 0.5) + # points.InsertNextPoint(0, 0, 0) # points.InsertNextPoint(1, 1, 0) - # points.InsertNextPoint(1, 0.0, 0.0) # points.InsertNextPoint(1, 0.5, 0.5) + # points.InsertNextPoint(1, 0.0, 0.0) # Rotate the above points -90° about the X-axis # and translate -1 along the Y-axis. points.InsertNextPoint(0.0, 0.0, 0.0) - points.InsertNextPoint(0.0, 0, 1.0) points.InsertNextPoint(0.0, 0.5, 0.5) + points.InsertNextPoint(0.0, 0, 1.0) points.InsertNextPoint(1.0, 0.0, 0.0) - points.InsertNextPoint(1.0, 0, 1.0) points.InsertNextPoint(1.0, 0.5, 0.5) + points.InsertNextPoint(1.0, 0, 1.0) wedge = vtkWedge() for i in range(0, number_of_vertices): diff --git a/src/Testing/Baseline/Cxx/GeometricObjects/TestLinearCellsDemo.png b/src/Testing/Baseline/Cxx/GeometricObjects/TestLinearCellsDemo.png index c80c3a080454df443c334ba3c052543a7b2ea485..d771a4ee619e8fc6b4093d949c17d8f397052e99 100644 --- a/src/Testing/Baseline/Cxx/GeometricObjects/TestLinearCellsDemo.png +++ b/src/Testing/Baseline/Cxx/GeometricObjects/TestLinearCellsDemo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12e5f7ffbca0d35f7c524ed0f89e2c40b0068dc05e92252fb361a0e51e9d3d10 -size 156792 +oid sha256:a644caf227499f6153fad58e0dc2b23403f889d6ed4658f4e637e2adcc2ab7a6 +size 149666 diff --git a/src/Testing/Baseline/Python/GeometricObjects/TestLinearCellsDemo.png b/src/Testing/Baseline/Python/GeometricObjects/TestLinearCellsDemo.png index c80c3a080454df443c334ba3c052543a7b2ea485..d771a4ee619e8fc6b4093d949c17d8f397052e99 100644 --- a/src/Testing/Baseline/Python/GeometricObjects/TestLinearCellsDemo.png +++ b/src/Testing/Baseline/Python/GeometricObjects/TestLinearCellsDemo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12e5f7ffbca0d35f7c524ed0f89e2c40b0068dc05e92252fb361a0e51e9d3d10 -size 156792 +oid sha256:a644caf227499f6153fad58e0dc2b23403f889d6ed4658f4e637e2adcc2ab7a6 +size 149666 diff --git a/src/Testing/Baseline/PythonicAPI/GeometricObjects/TestLinearCellsDemo.png b/src/Testing/Baseline/PythonicAPI/GeometricObjects/TestLinearCellsDemo.png index 8ae76f5ae70629d05cde83e05d0e577f9f5fd9fa..d771a4ee619e8fc6b4093d949c17d8f397052e99 100644 --- a/src/Testing/Baseline/PythonicAPI/GeometricObjects/TestLinearCellsDemo.png +++ b/src/Testing/Baseline/PythonicAPI/GeometricObjects/TestLinearCellsDemo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf7422ba4957b1488bcfd4b68d828a531a703b60f3ccdc09f62fd8cf9f0ab6b0 -size 163259 +oid sha256:a644caf227499f6153fad58e0dc2b23403f889d6ed4658f4e637e2adcc2ab7a6 +size 149666 diff --git a/src/VTKBook/05Chapter5.md b/src/VTKBook/05Chapter5.md index 9a5ebcccba0235b8095e03727a415e307216604f..546cc00b66fc984e9b5fcab119edf73d4df6bfec 100644 --- a/src/VTKBook/05Chapter5.md +++ b/src/VTKBook/05Chapter5.md @@ -78,13 +78,13 @@ U(p_i) = {C_i:p_i \in C_i} $$
- Figure5-2 + Figure5-2
Figure 5-2. Linear cell types found in VTK. Numbers define ordering of the defining points.
Figure5-3 - Figure 5-3. Example of a hexahedron cell. The topology is implicitly defined by the ordering of the point list. Physical generation of an image. +
Figure 5-3. Example of a hexahedron cell. The topology is implicitly defined by the ordering of the point list. Physical generation of an image.
The importance of "uses" and "use sets" will become evident in [Chapter 8 - Advanced Data Representation](/VTKBook/08Chapter8) when we explore the topology of datasets. @@ -142,7 +142,7 @@ Similar to pixels, our definition of a voxel cell differs from the conventional It is common in numerical analysis to use nonlinear cells, i.e., cell formulations that use nonlinear basis functions. These basis functions are generally formed by combinations of polynomials. Nonlinear cells provide more accurate interpolation functions (see ["Interpolation Functions"](/VTKBook/08Chapter8/#82-interpolation-functions) in [Chapter 8](/VTKBook/08Chapter8) for more information) and better approximate curved geometry. However, the number of possible nonlinear basis functions is unlimited, which poses a combinatorial problem to any visualization system (i.e., it is not possible to implement all non-linear cell types). To address this problem, VTK takes a dual approach. First, VTK directly supports nonlinear cell types with quadratic interpolation functions(see **Figure 5-4**). Such cells are constructed by adding mid-edge nodes, and occasionally mid-face and interior nodes, requiring extending the connectivity list to reflect the addition of these extra entries. Second, VTK has a sophisticated cell adaptor framework, enabling users to interface any basis function to VTK as long as the basis function can be uniquely characterized in an r-s-t parametric coordinates system. (Note: we will describe the cell adaptor framework in more detail in [Chapter 8 - Advanced Data Representation](/VTKBook/08Chapter8).)
- Figure5-4 + Figure5-4
Figure 5-4. Nonlinear cell types found in VTK.
diff --git a/src/VTKBook/Figures/Figure5-2.png b/src/VTKBook/Figures/Figure5-2.png deleted file mode 100644 index 1ff66fa44ca52e246ae878f327f9b278b0561e74..0000000000000000000000000000000000000000 Binary files a/src/VTKBook/Figures/Figure5-2.png and /dev/null differ diff --git a/src/VTKBook/Figures/Figure5-4.png b/src/VTKBook/Figures/Figure5-4.png deleted file mode 100644 index db78975ffe1eeb957b9bf174d5cec92e33785354..0000000000000000000000000000000000000000 Binary files a/src/VTKBook/Figures/Figure5-4.png and /dev/null differ