Skip to content
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,3 @@ werkzeug==3.1.2
# flask
# flask-cors

opengeodeweb-microservice==1.*,>=1.0.11
5 changes: 1 addition & 4 deletions src/opengeodeweb_back/geode_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@

# Local application imports
from .geode_objects import geode_objects
from .geode_objects.types import (
GeodeObjectType,
geode_object_type,
)
from .geode_objects.types import GeodeObjectType, geode_object_type
from .geode_objects.geode_object import GeodeObject
from opengeodeweb_microservice.database.data import Data

Expand Down
6 changes: 4 additions & 2 deletions src/opengeodeweb_back/geode_objects/geode_edged_curve2d.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,14 @@ def save(self, filename: str) -> list[str]:

def save_viewable(self, filename_without_extension: str) -> str:
return viewables.save_viewable_edged_curve2D(
self.edged_curve, filename_without_extension
self.edged_curve,
filename_without_extension,
)

def save_light_viewable(self, filename_without_extension: str) -> str:
return viewables.save_light_viewable_edged_curve2D(
self.edged_curve, filename_without_extension
self.edged_curve,
filename_without_extension,
)

def inspect(self) -> og_inspector.EdgedCurveInspectionResult:
Expand Down
6 changes: 4 additions & 2 deletions src/opengeodeweb_back/geode_objects/geode_edged_curve3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,14 @@ def save(self, filename: str) -> list[str]:

def save_viewable(self, filename_without_extension: str) -> str:
return viewables.save_viewable_edged_curve3D(
self.edged_curve, filename_without_extension
self.edged_curve,
filename_without_extension,
)

def save_light_viewable(self, filename_without_extension: str) -> str:
return viewables.save_light_viewable_edged_curve3D(
self.edged_curve, filename_without_extension
self.edged_curve,
filename_without_extension,
)

def inspect(self) -> og_inspector.EdgedCurveInspectionResult:
Expand Down
2 changes: 0 additions & 2 deletions src/opengeodeweb_back/geode_objects/geode_graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

# Third party imports
import opengeode as og
import opengeode_inspector as og_inspector
import geode_viewables as viewables

# Local application imports
from .types import GeodeMeshType
Expand Down
2 changes: 0 additions & 2 deletions src/opengeodeweb_back/geode_objects/geode_grid2d.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@

# Third party imports
import opengeode as og
import geode_viewables as viewables

# Local application imports
from .types import GeodeMeshType
from .geode_mesh import GeodeMesh


Expand Down
2 changes: 0 additions & 2 deletions src/opengeodeweb_back/geode_objects/geode_grid3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@

# Third party imports
import opengeode as og
import geode_viewables as viewables

# Local application imports
from .types import GeodeMeshType
from .geode_mesh import GeodeMesh


Expand Down
7 changes: 4 additions & 3 deletions src/opengeodeweb_back/geode_objects/geode_hybrid_solid3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

# Third party imports
import opengeode as og
import opengeode_inspector as og_inspector
import geode_viewables as viewables

# Local application imports
Expand Down Expand Up @@ -62,10 +61,12 @@ def save(self, filename: str) -> list[str]:

def save_viewable(self, filename_without_extension: str) -> str:
return viewables.save_viewable_hybrid_solid3D(
self.hybrid_solid, filename_without_extension
self.hybrid_solid,
filename_without_extension,
)

def save_light_viewable(self, filename_without_extension: str) -> str:
return viewables.save_light_viewable_hybrid_solid3D(
self.hybrid_solid, filename_without_extension
self.hybrid_solid,
filename_without_extension,
)
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,24 @@ def object_priority(cls, filename: str) -> int:

def is_saveable(self, filename: str) -> bool:
return og_geosciences.is_implicit_cross_section_saveable(
self.implicit_cross_section, filename
self.implicit_cross_section,
filename,
)

def save(self, filename: str) -> list[str]:
return og_geosciences.save_implicit_cross_section(
self.implicit_cross_section, filename
self.implicit_cross_section,
filename,
)

def save_viewable(self, filename_without_extension: str) -> str:
return viewables.save_viewable_implicit_cross_section(
self.implicit_cross_section, filename_without_extension
self.implicit_cross_section,
filename_without_extension,
)

def save_light_viewable(self, filename_without_extension: str) -> str:
return viewables.save_light_viewable_implicit_cross_section(
self.implicit_cross_section, filename_without_extension
self.implicit_cross_section,
filename_without_extension,
)
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# Third party imports
import opengeode as og
import opengeode_geosciences as og_geosciences
import opengeode_inspector as og_inspector
import geode_viewables as viewables

# Local application imports
Expand Down Expand Up @@ -66,20 +65,24 @@ def object_priority(cls, filename: str) -> int:

def is_saveable(self, filename: str) -> bool:
return og_geosciences.is_implicit_structural_model_saveable(
self.implicit_structural_model, filename
self.implicit_structural_model,
filename,
)

def save(self, filename: str) -> list[str]:
return og_geosciences.save_implicit_structural_model(
self.implicit_structural_model, filename
self.implicit_structural_model,
filename,
)

def save_viewable(self, filename_without_extension: str) -> str:
return viewables.save_viewable_implicit_structural_model(
self.implicit_structural_model, filename_without_extension
self.implicit_structural_model,
filename_without_extension,
)

def save_light_viewable(self, filename_without_extension: str) -> str:
return viewables.save_light_viewable_implicit_structural_model(
self.implicit_structural_model, filename_without_extension
self.implicit_structural_model,
filename_without_extension,
)
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

# Third party imports
import opengeode as og
import opengeode_inspector as og_inspector
import geode_viewables as viewables

# Local application imports
Expand Down Expand Up @@ -57,12 +56,14 @@ def save(self, filename: str) -> list[str]:

def save_viewable(self, filename_without_extension: str) -> str:
return viewables.save_viewable_light_regular_grid2D(
self.light_regular_grid, filename_without_extension
self.light_regular_grid,
filename_without_extension,
)

def save_light_viewable(self, filename_without_extension: str) -> str:
return viewables.save_light_viewable_light_regular_grid2D(
self.light_regular_grid, filename_without_extension
self.light_regular_grid,
filename_without_extension,
)

def vertex_attribute_manager(self) -> og.AttributeManager:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

# Third party imports
import opengeode as og
import opengeode_inspector as og_inspector
import geode_viewables as viewables

# Local application imports
Expand Down Expand Up @@ -57,12 +56,14 @@ def save(self, filename: str) -> list[str]:

def save_viewable(self, filename_without_extension: str) -> str:
return viewables.save_viewable_light_regular_grid3D(
self.light_regular_grid, filename_without_extension
self.light_regular_grid,
filename_without_extension,
)

def save_light_viewable(self, filename_without_extension: str) -> str:
return viewables.save_light_viewable_light_regular_grid3D(
self.light_regular_grid, filename_without_extension
self.light_regular_grid,
filename_without_extension,
)

def vertex_attribute_manager(self) -> og.AttributeManager:
Expand Down
2 changes: 1 addition & 1 deletion src/opengeodeweb_back/geode_objects/geode_mesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import opengeode as og

# Local application imports
from .types import GeodeObjectType, ViewerType
from .types import ViewerType
from .geode_object import GeodeObject


Expand Down
5 changes: 2 additions & 3 deletions src/opengeodeweb_back/geode_objects/geode_model.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
# Standard library imports
from __future__ import annotations
from abc import ABC, abstractmethod
from typing import Literal, Any, get_args, cast
from abc import abstractmethod

# Third party imports
import opengeode as og

# Local application imports
from .types import GeodeObjectType, GeodeModelType, ViewerType
from .types import ViewerType
from .geode_object import GeodeObject

ComponentRegistry = dict[og.ComponentType, list[og.uuid]]
Expand Down
2 changes: 1 addition & 1 deletion src/opengeodeweb_back/geode_objects/geode_object.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Standard library imports
from __future__ import annotations
from abc import ABC, abstractmethod
from typing import Literal, Any, get_args, cast
from typing import Any

# Third party imports
import opengeode as og
Expand Down
6 changes: 4 additions & 2 deletions src/opengeodeweb_back/geode_objects/geode_point_set2d.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,14 @@ def save(self, filename: str) -> list[str]:

def save_viewable(self, filename_without_extension: str) -> str:
return viewables.save_viewable_point_set2D(
self.point_set, filename_without_extension
self.point_set,
filename_without_extension,
)

def save_light_viewable(self, filename_without_extension: str) -> str:
return viewables.save_light_viewable_point_set2D(
self.point_set, filename_without_extension
self.point_set,
filename_without_extension,
)

def inspect(self) -> og_inspector.PointSetInspectionResult:
Expand Down
6 changes: 4 additions & 2 deletions src/opengeodeweb_back/geode_objects/geode_point_set3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,14 @@ def save(self, filename: str) -> list[str]:

def save_viewable(self, filename_without_extension: str) -> str:
return viewables.save_viewable_point_set3D(
self.point_set, filename_without_extension
self.point_set,
filename_without_extension,
)

def save_light_viewable(self, filename_without_extension: str) -> str:
return viewables.save_light_viewable_point_set3D(
self.point_set, filename_without_extension
self.point_set,
filename_without_extension,
)

def inspect(self) -> og_inspector.PointSetInspectionResult:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

# Third party imports
import opengeode as og
import opengeode_inspector as og_inspector
import geode_viewables as viewables

# Local application imports
Expand Down Expand Up @@ -64,10 +63,12 @@ def save(self, filename: str) -> list[str]:

def save_viewable(self, filename_without_extension: str) -> str:
return viewables.save_viewable_polygonal_surface2D(
self.polygonal_surface, filename_without_extension
self.polygonal_surface,
filename_without_extension,
)

def save_light_viewable(self, filename_without_extension: str) -> str:
return viewables.save_light_viewable_polygonal_surface2D(
self.polygonal_surface, filename_without_extension
self.polygonal_surface,
filename_without_extension,
)
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

# Third party imports
import opengeode as og
import opengeode_inspector as og_inspector
import geode_viewables as viewables

# Local application imports
Expand Down Expand Up @@ -64,10 +63,12 @@ def save(self, filename: str) -> list[str]:

def save_viewable(self, filename_without_extension: str) -> str:
return viewables.save_viewable_polygonal_surface3D(
self.polygonal_surface, filename_without_extension
self.polygonal_surface,
filename_without_extension,
)

def save_light_viewable(self, filename_without_extension: str) -> str:
return viewables.save_light_viewable_polygonal_surface3D(
self.polygonal_surface, filename_without_extension
self.polygonal_surface,
filename_without_extension,
)
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

# Third party imports
import opengeode as og
import opengeode_inspector as og_inspector
import geode_viewables as viewables

# Local application imports
Expand Down Expand Up @@ -64,10 +63,12 @@ def save(self, filename: str) -> list[str]:

def save_viewable(self, filename_without_extension: str) -> str:
return viewables.save_viewable_polyhedral_solid3D(
self.polyhedral_solid, filename_without_extension
self.polyhedral_solid,
filename_without_extension,
)

def save_light_viewable(self, filename_without_extension: str) -> str:
return viewables.save_light_viewable_polyhedral_solid3D(
self.polyhedral_solid, filename_without_extension
self.polyhedral_solid,
filename_without_extension,
)
7 changes: 4 additions & 3 deletions src/opengeodeweb_back/geode_objects/geode_raster_image2d.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

# Third party imports
import opengeode as og
import opengeode_inspector as og_inspector
import geode_viewables as viewables

# Local application imports
Expand Down Expand Up @@ -68,12 +67,14 @@ def save(self, filename: str) -> list[str]:

def save_viewable(self, filename_without_extension: str) -> str:
return viewables.save_viewable_raster_image2D(
self.raster_image, filename_without_extension
self.raster_image,
filename_without_extension,
)

def save_light_viewable(self, filename_without_extension: str) -> str:
return viewables.save_light_viewable_raster_image2D(
self.raster_image, filename_without_extension
self.raster_image,
filename_without_extension,
)

def inspect(self) -> None:
Expand Down
Loading