Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BUG FIX: All IDataCreationAction subclasses now correctly pass the geometry path member variable when being cloned. #802

Merged
merged 2 commits into from
Dec 21, 2023
Merged

BUG FIX: All IDataCreationAction subclasses now correctly pass the geometry path member variable when being cloned. #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e84245a
BUG FIX: All IDataCreationAction subclasses now correctly pass the ge…
joeykleingers Dec 20, 2023
0dcae58
Clang format.
joeykleingers Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/complex/Filter/Actions/CreateGeometry1DAction.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,8 @@ class CreateGeometry1DAction : public IDataCreationAction
*/
UniquePointer clone() const override
{
auto action = std::unique_ptr<CreateGeometry1DAction>(new CreateGeometry1DAction());
action->m_NumEdges = m_NumEdges;
action->m_NumVertices = m_NumVertices;
action->m_VertexDataName = m_VertexDataName;
action->m_EdgeDataName = m_EdgeDataName;
action->m_SharedVerticesName = m_SharedVerticesName;
action->m_SharedEdgesName = m_SharedEdgesName;
auto action =
std::unique_ptr<CreateGeometry1DAction>(new CreateGeometry1DAction(getCreatedPath(), m_NumEdges, m_NumVertices, m_VertexDataName, m_EdgeDataName, m_SharedVerticesName, m_SharedEdgesName));
action->m_InputVertices = m_InputVertices;
action->m_InputEdges = m_InputEdges;
action->m_ArrayHandlingType = m_ArrayHandlingType;
Expand Down
9 changes: 2 additions & 7 deletions src/complex/Filter/Actions/CreateGeometry2DAction.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,8 @@ class CreateGeometry2DAction : public IDataCreationAction
*/
UniquePointer clone() const override
{
auto action = std::unique_ptr<CreateGeometry2DAction>(new CreateGeometry2DAction());
action->m_NumFaces = m_NumFaces;
action->m_NumVertices = m_NumVertices;
action->m_VertexDataName = m_VertexDataName;
action->m_FaceDataName = m_FaceDataName;
action->m_SharedVerticesName = m_SharedVerticesName;
action->m_SharedFacesName = m_SharedFacesName;
auto action =
std::unique_ptr<CreateGeometry2DAction>(new CreateGeometry2DAction(getCreatedPath(), m_NumFaces, m_NumVertices, m_VertexDataName, m_FaceDataName, m_SharedVerticesName, m_SharedFacesName));
action->m_InputVertices = m_InputVertices;
action->m_InputFaces = m_InputFaces;
action->m_ArrayHandlingType = m_ArrayHandlingType;
Expand Down
9 changes: 2 additions & 7 deletions src/complex/Filter/Actions/CreateGeometry3DAction.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,13 +243,8 @@ class CreateGeometry3DAction : public IDataCreationAction
*/
UniquePointer clone() const override
{
auto action = std::unique_ptr<CreateGeometry3DAction>(new CreateGeometry3DAction());
action->m_NumCells = m_NumCells;
action->m_NumVertices = m_NumVertices;
action->m_VertexDataName = m_VertexDataName;
action->m_CellDataName = m_CellDataName;
action->m_SharedVerticesName = m_SharedVerticesName;
action->m_SharedCellsName = m_SharedCellsName;
auto action =
std::unique_ptr<CreateGeometry3DAction>(new CreateGeometry3DAction(getCreatedPath(), m_NumCells, m_NumVertices, m_VertexDataName, m_CellDataName, m_SharedVerticesName, m_SharedCellsName));
action->m_InputVertices = m_InputVertices;
action->m_InputCells = m_InputCells;
action->m_ArrayHandlingType = m_ArrayHandlingType;
Expand Down
10 changes: 2 additions & 8 deletions src/complex/Filter/Actions/CreateRectGridGeometryAction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,8 @@ Result<> CreateRectGridGeometryAction::apply(DataStructure& dataStructure, Mode

IDataAction::UniquePointer CreateRectGridGeometryAction::clone() const
{
auto action = std::unique_ptr<CreateRectGridGeometryAction>(new CreateRectGridGeometryAction());
action->m_NumXBoundTuples = m_NumXBoundTuples;
action->m_NumYBoundTuples = m_NumYBoundTuples;
action->m_NumZBoundTuples = m_NumZBoundTuples;
action->m_CellDataName = m_CellDataName;
action->m_XBoundsArrayName = m_XBoundsArrayName;
action->m_YBoundsArrayName = m_YBoundsArrayName;
action->m_ZBoundsArrayName = m_ZBoundsArrayName;
auto action = std::unique_ptr<CreateRectGridGeometryAction>(
new CreateRectGridGeometryAction(getCreatedPath(), m_NumXBoundTuples, m_NumYBoundTuples, m_NumZBoundTuples, m_CellDataName, m_XBoundsArrayName, m_YBoundsArrayName, m_ZBoundsArrayName));
action->m_InputXBounds = m_InputXBounds;
action->m_InputYBounds = m_InputYBounds;
action->m_InputZBounds = m_InputZBounds;
Expand Down
5 changes: 1 addition & 4 deletions src/complex/Filter/Actions/CreateVertexGeometryAction.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,7 @@ class CreateVertexGeometryAction : public IDataCreationAction
*/
UniquePointer clone() const override
{
auto action = std::unique_ptr<CreateVertexGeometryAction>(new CreateVertexGeometryAction());
action->m_NumVertices = m_NumVertices;
action->m_VertexDataName = m_VertexDataName;
action->m_SharedVertexListName = m_SharedVertexListName;
auto action = std::unique_ptr<CreateVertexGeometryAction>(new CreateVertexGeometryAction(getCreatedPath(), m_NumVertices, m_VertexDataName, m_SharedVertexListName));
action->m_InputVertices = m_InputVertices;
action->m_ArrayHandlingType = m_ArrayHandlingType;
return action;
Expand Down
Loading