Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenVolumeMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
7
Issues
7
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenVolumeMesh
OpenVolumeMesh
Commits
ccc3ef2d
Commit
ccc3ef2d
authored
Oct 26, 2016
by
Max Lyon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'mheistermann/OpenVolumeMesh-property-copy-pr'
parents
6093bad8
4ac81ca0
Pipeline
#3366
passed with stage
in 3 minutes and 41 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
5 deletions
+30
-5
src/OpenVolumeMesh/Core/BaseProperty.hh
src/OpenVolumeMesh/Core/BaseProperty.hh
+2
-0
src/OpenVolumeMesh/Core/OpenVolumeMeshProperty.hh
src/OpenVolumeMesh/Core/OpenVolumeMeshProperty.hh
+12
-5
src/OpenVolumeMesh/Core/PropertyPtr.hh
src/OpenVolumeMesh/Core/PropertyPtr.hh
+2
-0
src/OpenVolumeMesh/Core/PropertyPtrT.cc
src/OpenVolumeMesh/Core/PropertyPtrT.cc
+5
-0
src/Unittests/unittests_properties.cc
src/Unittests/unittests_properties.cc
+9
-0
No files found.
src/OpenVolumeMesh/Core/BaseProperty.hh
View file @
ccc3ef2d
...
...
@@ -69,6 +69,8 @@ public:
virtual
void
swap_elements
(
size_t
_idx0
,
size_t
_idx1
)
=
0
;
virtual
void
copy
(
size_t
_src_idx
,
size_t
_dst_idx
)
=
0
;
virtual
void
serialize
(
std
::
ostream
&
_ostr
)
const
=
0
;
virtual
void
deserialize
(
std
::
istream
&
_istr
)
=
0
;
...
...
src/OpenVolumeMesh/Core/OpenVolumeMeshProperty.hh
View file @
ccc3ef2d
...
...
@@ -112,10 +112,12 @@ public:
virtual
void
swap
(
size_t
_i0
,
size_t
_i1
)
{
std
::
swap
(
data_
[
_i0
],
data_
[
_i1
]);
}
void
delete_element
(
size_t
_idx
)
{
data_
.
erase
(
data_
.
begin
()
+
_idx
);
}
virtual
void
copy
(
size_t
_src_idx
,
size_t
_dst_idx
)
{
data_
[
_dst_idx
]
=
data_
[
_src_idx
];
}
void
delete_element
(
size_t
_idx
)
{
data_
.
erase
(
data_
.
begin
()
+
_idx
);
}
public:
...
...
@@ -273,6 +275,9 @@ public:
data_
[
_i0
]
=
data_
[
_i1
];
data_
[
_i1
]
=
t
;
}
virtual
void
copy
(
size_t
_src_idx
,
size_t
_dst_idx
)
{
data_
[
_dst_idx
]
=
data_
[
_src_idx
];
}
void
delete_element
(
size_t
_idx
)
{
data_
.
erase
(
data_
.
begin
()
+
_idx
);
...
...
@@ -408,7 +413,9 @@ public:
virtual
void
swap
(
size_t
_i0
,
size_t
_i1
)
{
std
::
swap
(
data_
[
_i0
],
data_
[
_i1
]);
}
virtual
void
copy
(
size_t
_src_idx
,
size_t
_dst_idx
)
{
data_
[
_dst_idx
]
=
data_
[
_src_idx
];
}
virtual
void
delete_element
(
size_t
_idx
)
{
data_
.
erase
(
data_
.
begin
()
+
_idx
);
}
...
...
src/OpenVolumeMesh/Core/PropertyPtr.hh
View file @
ccc3ef2d
...
...
@@ -85,6 +85,8 @@ public:
virtual
void
swap_elements
(
size_t
_idx0
,
size_t
_idx1
);
virtual
void
copy
(
size_t
_src_idx
,
size_t
_dst_idx
);
const_iterator
begin
()
const
{
return
ptr
::
shared_ptr
<
PropT
>::
get
()
->
begin
();
}
iterator
begin
()
{
return
ptr
::
shared_ptr
<
PropT
>::
get
()
->
begin
();
}
...
...
src/OpenVolumeMesh/Core/PropertyPtrT.cc
View file @
ccc3ef2d
...
...
@@ -88,6 +88,11 @@ void PropertyPtr<PropT,HandleT>::swap_elements(size_t _idx0, size_t _idx1) {
ptr
::
shared_ptr
<
PropT
>::
get
()
->
swap
(
_idx0
,
_idx1
);
}
template
<
class
PropT
,
class
HandleT
>
void
PropertyPtr
<
PropT
,
HandleT
>::
copy
(
size_t
_src_idx
,
size_t
_dst_idx
)
{
ptr
::
shared_ptr
<
PropT
>::
get
()
->
copy
(
_src_idx
,
_dst_idx
);
}
template
<
class
PropT
,
class
HandleT
>
void
PropertyPtr
<
PropT
,
HandleT
>::
set_handle
(
const
OpenVolumeMeshHandle
&
_handle
)
{
return
ptr
::
shared_ptr
<
PropT
>::
get
()
->
set_handle
(
_handle
);
...
...
src/Unittests/unittests_properties.cc
View file @
ccc3ef2d
...
...
@@ -161,3 +161,12 @@ TEST_F(PolyhedralMeshBase, StatusTest) {
StatusAttrib
status
(
mesh_
);
}
TEST_F
(
PolyhedralMeshBase
,
PropValueCopyTest
)
{
generatePolyhedralMesh
(
mesh_
);
VertexPropertyT
<
int
>
prop
=
mesh_
.
request_vertex_property
<
int
>
();
prop
[
0
]
=
1234
;
prop
[
1
]
=
2345
;
prop
.
copy
(
0
,
1
);
EXPECT_EQ
(
prop
[
1
],
1234
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment