Skip to content

Use the new volmdlr GLB viewer in the knapsack tutorial (require volmdlr>=0.22.2) #55

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

Open
pgibertini wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use the new volmdlr GLB viewer in the knapsack tutorial (require volmdlr>=0.22.2) #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ authors = [
]
requires-python = ">=3.12"
dependencies = [
"dessia_common>=1.0.0rc1"
"dessia_common>=1.0.0rc1",
# "plot_data",
# "volmdlr>=0.18.0"
"volmdlr>=0.22.2"
]
dynamic = ["version"]

Expand Down
40 changes: 31 additions & 9 deletions src/tutorials/knapsack_problem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
from dessia_common.models.core import Model
from dessia_common.files import BinaryFile
from datatools.dataset import Dataset
from dessia_common.decorators import cad_view, plot_data_view, markdown_view
from dessia_common.decorators import cad_view, volmdlr_view, plot_data_view, markdown_view
from dessia_common.models.decorators import modelclass, model_property
from plot_data import PrimitiveGroup, SurfaceStyle, Text, TextStyle
from plot_data.colors import BLACK, Color
from volmdlr import O3D, X3D, Y3D, Z3D, Frame3D, Point2D
from volmdlr.core import VolumeModel
from volmdlr.model import VolumeModel
from volmdlr.shapes import Solid
import volmdlr.step as vms
from volmdlr.wires import ClosedPolygon2D
Expand Down Expand Up @@ -71,6 +71,11 @@ def volmdlr_primitives(self, z_offset: float = 0., reference_path: str = "#", **
def cadview(self, reference_path: str = "#"):
return VolumeModel(self.volmdlr_primitives(reference_path=reference_path)).babylon_data()

@volmdlr_view("Item view")
def volmdlr_view(self, reference_path: str = "#") -> str:
return VolumeModel(self.volmdlr_primitives(reference_path=reference_path), name=self.name).volmdlr_view(
reference_path=reference_path)

@plot_data_view("2D display for Item")
def display_2d(self, y_offset: float = 0., reference_path: str = "#"):
contour = ClosedPolygon2D([
Expand Down Expand Up @@ -154,6 +159,11 @@ def volmdlr_primitives(self, z_offset: float = 0., reference_path: str = "#", **
def cadview(self, reference_path: str = "#"):
return VolumeModel(self.volmdlr_primitives(reference_path=reference_path)).babylon_data()

@volmdlr_view("Item view")
def volmdlr_view(self, reference_path: str = "#") -> str:
return VolumeModel(self.volmdlr_primitives(reference_path=reference_path), name=self.name).volmdlr_view(
reference_path=reference_path)

@plot_data_view("2D display for Item")
def display_2d(self, y_offset: float = 0., reference_path: str = "#"):
contour = ClosedPolygon2D([
Expand Down Expand Up @@ -210,6 +220,11 @@ def volmdlr_primitives(self, reference_path: str = "#", **kwargs):
def cadview(self, reference_path: str = "#"):
return VolumeModel(self.volmdlr_primitives(reference_path=reference_path)).babylon_data()

@volmdlr_view("Knapsack view")
def volmdlr_view(self, reference_path: str = "#") -> str:
return VolumeModel(self.volmdlr_primitives(reference_path=reference_path), name=self.name).volmdlr_view(
reference_path=reference_path)

@plot_data_view("2D display for KnapsackPackage")
def display_2d(self, reference_path: str = "#"):
primitives = []
Expand Down Expand Up @@ -264,6 +279,11 @@ def from_step_stream(cls, file_component: BinaryFile) -> Knapsack:
def cadview(self, reference_path: str = "#"):
return VolumeModel(self.volmdlr_primitives(reference_path=reference_path)).babylon_data()

@volmdlr_view("Knapsack view")
def volmdlr_view(self, reference_path: str = "#") -> str:
return VolumeModel(self.volmdlr_primitives(reference_path=reference_path), name=self.name).volmdlr_view(
reference_path=reference_path)

@modelclass
class KnapsackPackage(Knapsack):
"""
Expand Down Expand Up @@ -299,18 +319,20 @@ def golds(self) -> int:
return len([i for i in self.items.items if i.color == "gold"])

def volmdlr_primitives(self, reference_path: str = "#"):
knapsack_primitives = Knapsack.volmdlr_primitives(self, reference_path=reference_path)
z_offset = 0
for i, item in enumerate(self.items.items):
item_primitives = item.volmdlr_primitives(z_offset=z_offset, reference_path=f"{reference_path}/items/{i}")
knapsack_primitives.extend(item_primitives)
z_offset += item.mass / 2 + 0.05
return knapsack_primitives
# self.items is an Items wrapper -> anchor one level deeper so item paths resolve.
primitives = Knapsack.volmdlr_primitives(self, reference_path=reference_path)
primitives += self.items.volmdlr_primitives(reference_path=f"{reference_path}/items")
return primitives

@cad_view("Knapsack Package CAD")
def cadview(self, reference_path: str = "#"):
return VolumeModel(self.volmdlr_primitives(reference_path=reference_path)).babylon_data()

@volmdlr_view("Knapsack Package view")
def volmdlr_view(self, reference_path: str = "#") -> str:
return VolumeModel(self.volmdlr_primitives(reference_path=reference_path), name=self.name).volmdlr_view(
reference_path=reference_path)

@plot_data_view("2D display for KnapsackPackage", picture=True)
def display_2d(self):
primitives = []
Expand Down