Skip to content

Commit f33747a

Browse files
Merge pull request #162 from Geode-solutions/fix/input-prority
fix(Input): add object priority
2 parents c795630 + 2d3609b commit f33747a

26 files changed

+126
-8
lines changed

bindings/python/src/explicit/representation/io/cross_section.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ namespace geode
3535
module.def( "load_cross_section", &load_cross_section );
3636
module.def(
3737
"cross_section_additional_files", &cross_section_additional_files );
38+
module.def(
39+
"cross_section_object_priority", &cross_section_object_priority );
3840
module.def( "is_cross_section_loadable", &is_cross_section_loadable );
3941
module.def( "is_cross_section_saveable", &is_cross_section_saveable );
4042
PYTHON_INPUT_CLASS( CrossSection, "CrossSection" );

bindings/python/src/explicit/representation/io/structural_model.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ namespace geode
3535
module.def( "load_structural_model", &load_structural_model );
3636
module.def( "structural_model_additional_files",
3737
&structural_model_additional_files );
38+
module.def( "structural_model_object_priority",
39+
&structural_model_object_priority );
3840
module.def(
3941
"is_structural_model_loadable", &is_structural_model_loadable );
4042
module.def(

bindings/python/src/implicit/representation/io/horizons_stack.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
"horizons_stack_additional_files" + std::to_string( dimension ) + "D"; \
3939
module.def( check##dimension.c_str(), \
4040
&horizons_stack_additional_files< dimension > ); \
41+
const auto priority##dimension = \
42+
"horizons_stack_object_priority" + std::to_string( dimension ) + "D"; \
43+
module.def( priority##dimension.c_str(), \
44+
&horizons_stack_object_priority< dimension > ); \
4145
const auto loadable##dimension = \
4246
"is_horizons_stack_loadable" + std::to_string( dimension ) + "D"; \
4347
module.def( loadable##dimension.c_str(), \

bindings/python/src/implicit/representation/io/implicit_cross_section.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ namespace geode
3737
"load_implicit_cross_section", &load_implicit_cross_section );
3838
module.def( "implicit_cross_section_additional_files",
3939
&implicit_cross_section_additional_files );
40+
module.def( "implicit_cross_section_object_priority",
41+
&implicit_cross_section_object_priority );
4042
module.def( "is_implicit_cross_section_loadable",
4143
&is_implicit_cross_section_loadable );
4244
module.def( "is_implicit_cross_section_saveable",

bindings/python/src/implicit/representation/io/implicit_structural_model.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ namespace geode
3737
"load_implicit_structural_model", &load_implicit_structural_model );
3838
module.def( "implicit_structural_model_additional_files",
3939
&implicit_structural_model_additional_files );
40+
module.def( "implicit_structural_model_object_priority",
41+
&implicit_structural_model_object_priority );
4042
module.def( "is_implicit_structural_model_loadable",
4143
&is_implicit_structural_model_loadable );
4244
module.def( "is_implicit_structural_model_saveable",

bindings/python/src/implicit/representation/io/stratigraphic_model.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ namespace geode
3535
module.def( "load_stratigraphic_model", &load_stratigraphic_model );
3636
module.def( "stratigraphic_model_additional_files",
3737
&stratigraphic_model_additional_files );
38+
module.def( "stratigraphic_model_object_priority",
39+
&stratigraphic_model_object_priority );
3840
module.def( "is_stratigraphic_model_loadable",
3941
&is_stratigraphic_model_loadable );
4042
module.def( "is_stratigraphic_model_saveable",

bindings/python/src/implicit/representation/io/stratigraphic_section.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ namespace geode
3535
module.def( "load_stratigraphic_section", &load_stratigraphic_section );
3636
module.def( "stratigraphic_section_additional_files",
3737
&stratigraphic_section_additional_files );
38+
module.def( "stratigraphic_section_object_priority",
39+
&stratigraphic_section_object_priority );
3840
module.def( "is_stratigraphic_section_loadable",
3941
&is_stratigraphic_section_loadable );
4042
module.def( "is_stratigraphic_section_saveable",

include/geode/geosciences/explicit/representation/io/cross_section_input.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ namespace geode
6363
[[nodiscard]] bool opengeode_geosciences_explicit_api
6464
is_cross_section_loadable( std::string_view filename );
6565

66+
[[nodiscard]] index_t opengeode_geosciences_explicit_api
67+
cross_section_object_priority( std::string_view filename );
68+
6669
using CrossSectionInputFactory =
6770
Factory< std::string, CrossSectionInput, std::string_view >;
6871
} // namespace geode

include/geode/geosciences/explicit/representation/io/geode/geode_cross_section_input.hpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,15 @@ namespace geode
4141

4242
[[nodiscard]] CrossSection read() final;
4343

44-
[[nodiscard]] CrossSectionInput::AdditionalFiles
45-
additional_files() const final
44+
[[nodiscard]] AdditionalFiles additional_files() const final
4645
{
4746
return {};
4847
}
48+
49+
[[nodiscard]] index_t object_priority() const final
50+
{
51+
return 0;
52+
}
4953
};
5054

5155
namespace detail

include/geode/geosciences/explicit/representation/io/geode/geode_structural_model_input.hpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,15 @@ namespace geode
4141

4242
[[nodiscard]] StructuralModel read() final;
4343

44-
[[nodiscard]] StructuralModelInput::AdditionalFiles
45-
additional_files() const final
44+
[[nodiscard]] AdditionalFiles additional_files() const final
4645
{
4746
return {};
4847
}
48+
49+
[[nodiscard]] index_t object_priority() const final
50+
{
51+
return 0;
52+
}
4953
};
5054

5155
namespace detail

0 commit comments

Comments
 (0)