Skip to content

Commit 70ad21d

Browse files
MelchiorSchuhMelchiorSchuh
committed
Merge branch 'v15' of github.com:Geode-solutions/OpenGeode-Inspector into fix/explicit_keyword_on_point_and_vector
2 parents df48bd0 + c120967 commit 70ad21d

16 files changed

+112
-104
lines changed

‎.vscode/settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"C_Cpp.default.cppStandard": "c++11",
2+
"C_Cpp.default.cppStandard": "c++17",
33
"C_Cpp.default.includePath": [
44
"${workspaceFolder}/include",
55
"${workspaceFolder}/build",

‎bindings/python/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile bindings/python/requirements.in
5+
# pip-compile --pre bindings/python/requirements.in
66
#
7-
opengeode-core==14.*,>=14.24.3
7+
opengeode-core==14.*,>=14.25.2rc2
88
# via -r bindings/python/requirements.in

‎include/geode/inspector/topology/brep_blocks_topology.h‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@
2323

2424
#pragma once
2525

26+
#include <optional>
2627
#include <string>
2728
#include <utility>
2829
#include <vector>
2930

30-
#include <absl/types/optional.h>
31-
3231
#include <geode/basic/uuid.h>
3332

3433
#include <geode/inspector/common.h>
@@ -77,11 +76,11 @@ namespace geode
7776

7877
bool brep_blocks_topology_is_valid( index_t unique_vertex_index ) const;
7978

80-
absl::optional< std::string >
79+
std::optional< std::string >
8180
unique_vertex_is_part_of_two_blocks_and_no_boundary_surface(
8281
index_t unique_vertex_index ) const;
8382

84-
absl::optional< std::string >
83+
std::optional< std::string >
8584
unique_vertex_block_cmvs_count_is_incorrect(
8685
index_t unique_vertex_index ) const;
8786

‎include/geode/inspector/topology/brep_corners_topology.h‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323

2424
#pragma once
2525

26+
#include <optional>
2627
#include <string>
2728

28-
#include <absl/types/optional.h>
29-
3029
#include <geode/basic/uuid.h>
3130

3231
#include <geode/inspector/common.h>
@@ -86,16 +85,16 @@ namespace geode
8685
*/
8786
bool brep_corner_topology_is_valid( index_t unique_vertex_index ) const;
8887

89-
absl::optional< std::string > unique_vertex_has_multiple_corners(
88+
std::optional< std::string > unique_vertex_has_multiple_corners(
9089
index_t unique_vertex_index ) const;
9190

92-
absl::optional< std::string > corner_has_multiple_embeddings(
91+
std::optional< std::string > corner_has_multiple_embeddings(
9392
index_t unique_vertex_index ) const;
9493

95-
absl::optional< std::string > corner_is_not_internal_nor_boundary(
94+
std::optional< std::string > corner_is_not_internal_nor_boundary(
9695
index_t unique_vertex_index ) const;
9796

98-
absl::optional< std::string > corner_is_part_of_line_but_not_boundary(
97+
std::optional< std::string > corner_is_part_of_line_but_not_boundary(
9998
index_t unique_vertex_index ) const;
10099

101100
BRepCornersTopologyInspectionResult inspect_corners_topology() const;

‎include/geode/inspector/topology/brep_lines_topology.h‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
*/
2323

2424
#pragma once
25+
#include <optional>
2526
#include <string>
2627

27-
#include <absl/types/optional.h>
28-
2928
#include <geode/basic/uuid.h>
3029

3130
#include <geode/inspector/common.h>
@@ -93,17 +92,17 @@ namespace geode
9392
*/
9493
bool brep_lines_topology_is_valid( index_t unique_vertex_index ) const;
9594

96-
absl::optional< std::string >
95+
std::optional< std::string >
9796
vertex_is_part_of_not_internal_nor_boundary_line(
9897
index_t unique_vertex_index ) const;
9998

100-
absl::optional< std::string > vertex_is_part_of_invalid_embedded_line(
99+
std::optional< std::string > vertex_is_part_of_invalid_embedded_line(
101100
index_t unique_vertex_index ) const;
102101

103-
absl::optional< std::string > vertex_is_part_of_invalid_single_line(
102+
std::optional< std::string > vertex_is_part_of_invalid_single_line(
104103
index_t unique_vertex_index ) const;
105104

106-
absl::optional< std::string > vertex_has_lines_but_is_not_a_corner(
105+
std::optional< std::string > vertex_has_lines_but_is_not_a_corner(
107106
index_t unique_vertex_index ) const;
108107

109108
BRepLinesTopologyInspectionResult inspect_lines_topology() const;

‎include/geode/inspector/topology/brep_surfaces_topology.h‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
#pragma once
25-
#include <absl/types/optional.h>
25+
#include <optional>
2626

2727
#include <geode/inspector/common.h>
2828
#include <geode/inspector/information.h>
@@ -103,22 +103,21 @@ namespace geode
103103
bool brep_surfaces_topology_is_valid(
104104
index_t unique_vertex_index ) const;
105105

106-
absl::optional< std::string >
106+
std::optional< std::string >
107107
vertex_is_part_of_not_internal_nor_boundary_surface(
108108
index_t unique_vertex_index ) const;
109109

110-
absl::optional< std::string >
111-
vertex_is_part_of_invalid_embedded_surface(
112-
index_t unique_vertex_index ) const;
110+
std::optional< std::string > vertex_is_part_of_invalid_embedded_surface(
111+
index_t unique_vertex_index ) const;
113112

114-
absl::optional< std::string > vertex_is_part_of_invalid_single_surface(
113+
std::optional< std::string > vertex_is_part_of_invalid_single_surface(
115114
index_t unique_vertex_index ) const;
116115

117-
absl::optional< std::string >
116+
std::optional< std::string >
118117
vertex_is_part_of_invalid_multiple_surfaces(
119118
index_t unique_vertex_index ) const;
120119

121-
absl::optional< std::string >
120+
std::optional< std::string >
122121
vertex_is_part_of_line_and_not_on_surface_border(
123122
index_t unique_vertex_index ) const;
124123

‎include/geode/inspector/topology/section_corners_topology.h‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
*/
2323

2424
#pragma once
25+
#include <optional>
2526
#include <string>
2627

27-
#include <absl/types/optional.h>
28-
2928
#include <geode/basic/uuid.h>
3029

3130
#include <geode/inspector/common.h>
@@ -87,16 +86,16 @@ namespace geode
8786
bool section_corner_topology_is_valid(
8887
index_t unique_vertex_index ) const;
8988

90-
absl::optional< std::string > unique_vertex_has_multiple_corners(
89+
std::optional< std::string > unique_vertex_has_multiple_corners(
9190
index_t unique_vertex_index ) const;
9291

93-
absl::optional< std::string > corner_has_multiple_embeddings(
92+
std::optional< std::string > corner_has_multiple_embeddings(
9493
index_t unique_vertex_index ) const;
9594

96-
absl::optional< std::string > corner_is_not_internal_nor_boundary(
95+
std::optional< std::string > corner_is_not_internal_nor_boundary(
9796
index_t unique_vertex_index ) const;
9897

99-
absl::optional< std::string > corner_is_part_of_line_but_not_boundary(
98+
std::optional< std::string > corner_is_part_of_line_but_not_boundary(
10099
index_t unique_vertex_index ) const;
101100

102101
SectionCornersTopologyInspectionResult inspect_corners_topology() const;

‎include/geode/inspector/topology/section_lines_topology.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
*/
2323
#pragma once
24-
#include <absl/types/optional.h>
24+
#include <optional>
2525

2626
#include <geode/basic/uuid.h>
2727

@@ -93,17 +93,17 @@ namespace geode
9393
bool section_lines_topology_is_valid(
9494
index_t unique_vertex_index ) const;
9595

96-
absl::optional< std::string >
96+
std::optional< std::string >
9797
vertex_is_part_of_not_internal_nor_boundary_line(
9898
const index_t unique_vertex_index ) const;
9999

100-
absl::optional< std::string > vertex_is_part_of_invalid_embedded_line(
100+
std::optional< std::string > vertex_is_part_of_invalid_embedded_line(
101101
const index_t unique_vertex_index ) const;
102102

103-
absl::optional< std::string > vertex_is_part_of_invalid_single_line(
103+
std::optional< std::string > vertex_is_part_of_invalid_single_line(
104104
index_t unique_vertex_index ) const;
105105

106-
absl::optional< std::string > vertex_has_lines_but_is_not_a_corner(
106+
std::optional< std::string > vertex_has_lines_but_is_not_a_corner(
107107
index_t unique_vertex_index ) const;
108108

109109
SectionLinesTopologyInspectionResult inspect_lines_topology() const;

‎include/geode/inspector/topology/section_surfaces_topology.h‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
#pragma once
25-
#include <absl/types/optional.h>
25+
#include <optional>
2626

2727
#include <geode/basic/uuid.h>
2828

@@ -78,11 +78,10 @@ namespace geode
7878
bool section_vertex_surfaces_topology_is_valid(
7979
index_t unique_vertex_index ) const;
8080

81-
absl::optional< std::string >
82-
vertex_is_part_of_invalid_embedded_surface(
83-
index_t unique_vertex_index ) const;
81+
std::optional< std::string > vertex_is_part_of_invalid_embedded_surface(
82+
index_t unique_vertex_index ) const;
8483

85-
absl::optional< std::string >
84+
std::optional< std::string >
8685
vertex_is_part_of_line_and_not_on_surface_border(
8786
index_t unique_vertex_index ) const;
8887

‎src/geode/inspector/topology/brep_blocks_topology.cpp‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
#include <geode/inspector/topology/brep_blocks_topology.h>
2525

26+
#include <optional>
27+
2628
#include <absl/container/flat_hash_set.h>
2729

2830
#include <geode/basic/algorithm.h>
@@ -113,15 +115,15 @@ namespace geode
113115
unique_vertex_index ) );
114116
}
115117

116-
absl::optional< std::string > BRepBlocksTopology::
118+
std::optional< std::string > BRepBlocksTopology::
117119
unique_vertex_is_part_of_two_blocks_and_no_boundary_surface(
118120
index_t unique_vertex_index ) const
119121
{
120122
const auto block_uuids = detail::components_uuids(
121123
brep_, unique_vertex_index, Block3D::component_type_static() );
122124
if( block_uuids.size() != 2 )
123125
{
124-
return absl::nullopt;
126+
return std::nullopt;
125127
}
126128
for( const auto& surface_cmv :
127129
brep_.component_mesh_vertices( unique_vertex_index ) )
@@ -136,7 +138,7 @@ namespace geode
136138
&& brep_.Relationships::is_boundary(
137139
surface_cmv.component_id.id(), block_uuids[1] ) )
138140
{
139-
return absl::nullopt;
141+
return std::nullopt;
140142
}
141143
for( const auto& line_cmv :
142144
brep_.component_mesh_vertices( unique_vertex_index ) )
@@ -154,7 +156,7 @@ namespace geode
154156
|| brep_.Relationships::is_boundary(
155157
surface_cmv.component_id.id(), block_uuids[1] ) ) )
156158
{
157-
return absl::nullopt;
159+
return std::nullopt;
158160
}
159161
}
160162
}
@@ -164,7 +166,7 @@ namespace geode
164166
"surfaces." );
165167
}
166168

167-
absl::optional< std::string >
169+
std::optional< std::string >
168170
BRepBlocksTopology::unique_vertex_block_cmvs_count_is_incorrect(
169171
index_t unique_vertex_index ) const
170172
{
@@ -324,7 +326,7 @@ namespace geode
324326
" block CMVs (should be ", predicted_nb_block_cmvs, ")." );
325327
}
326328
}
327-
return absl::nullopt;
329+
return std::nullopt;
328330
}
329331

330332
BRepBlocksTopologyInspectionResult

0 commit comments

Comments
 (0)