Skip to content

pass shapes #31

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

Closed
wants to merge 1 commit into from
Closed

pass shapes #31

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
38 changes: 22 additions & 16 deletions openglider/plots/patterns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,17 @@
from openglider.utils.config import Config
from openglider.vector.drawing import Layout
from openglider.vector.text import Text

from openglider.plots.sketches.shapeplot import ShapePlotConfig
import openglider.plots.sketches as sketch
#import openglider.plots.sketches

logger = logging.getLogger(__name__)

class PatternsNew:
plotmaker = PlotMaker
config: PatternConfigOld
shapeplotconfig = ShapePlotConfig(apply_zrot=True)


DefaultConf = PlotMaker.DefaultConf

Expand All @@ -39,6 +42,10 @@ def __init__(self, project: GliderProject, config: Config | None=None):
self.config = self.DefaultConf(config)


self.shapeplot = sketch.ShapePlot(self.project)
self.shapes = self.shapeplot._get_shapes(self.shapeplotconfig)


self.glider_2d = self.project.glider
self.logger = logging.getLogger(f"{self.__class__.__module__}.{self.__class__.__name__}")
self.weight: dict[str, MaterialUsage] = {}
Expand All @@ -54,26 +61,25 @@ def prepare_glider_project(self, project: GliderProject) -> GliderProject:
return project

def _get_sketches(self) -> list[Layout]:
import openglider.plots.sketches as sketch
shapeplot = sketch.ShapePlot(self.project)
design_upper = shapeplot.copy().draw_design(lower=True)
design_upper.draw_cell_names()
design_lower = shapeplot.copy().draw_design(lower=False)
shapeplot = self.shapeplot
design_upper = shapeplot.copy().draw_design(self.shapes, lower=True)
design_upper.draw_cell_names(self.shapes)
design_lower = shapeplot.copy().draw_design(self.shapes, lower=False)

lineplan = shapeplot.copy()
lineplan.draw_design(lower=True)
lineplan.draw_attachment_points()
lineplan.draw_rib_names()
lineplan.draw_design(self.shapes, lower=True)
lineplan.draw_attachment_points(self.shapes)
lineplan.draw_rib_names(self.shapes)

diagonals = sketch.ShapePlot(self.project)
diagonals.draw_cells()
diagonals.draw_attachment_points(add_text=False)
diagonals.draw_diagonals()
diagonals.draw_cells(self.shapes)
diagonals.draw_attachment_points(self.shapes, add_text=False)
diagonals.draw_diagonals(self.shapes)

straps = sketch.ShapePlot(self.project)
straps.draw_cells()
straps.draw_attachment_points(add_text=False)
straps.draw_straps()
straps.draw_cells(self.shapes)
straps.draw_attachment_points(self.shapes, add_text=False)
straps.draw_straps(self.shapes)

drawings: list[Layout] = [design_upper.drawing, design_lower.drawing, lineplan.drawing, diagonals.drawing, straps.drawing]

Expand Down Expand Up @@ -127,7 +133,7 @@ def unwrap(self, outdir: Path | str) -> None:
all_patterns.scale(1000)
all_patterns.export_dxf(outdir / "plots_all.dxf")

sketches = openglider.plots.sketches.get_all_plots(self.project)
sketches = openglider.plots.sketches.get_all_plots(self.project, self.shapes)

for sketch_name, sketch in sketches.items():
fill = False
Expand Down
41 changes: 21 additions & 20 deletions openglider/plots/sketches/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,40 @@
from openglider.glider.project import GliderProject
from openglider.plots.sketches.shapeplot import ShapePlot
from openglider.plots.sketches.lineplan import LinePlan
from openglider.glider.shape import Shape


def get_all_plots(project: GliderProject) -> dict[str, ShapePlot]:
def get_all_plots(project: GliderProject, shapes: tuple[Shape, Shape]) -> dict[str, ShapePlot]:
design_upper = ShapePlot(project)
design_upper.draw_design(lower=False)
design_upper.draw_design(lower=False, left=True)
design_upper.draw_design(shapes, lower=False)
design_upper.draw_design(shapes, lower=False, left=True)

design_lower = ShapePlot(project)
design_lower.draw_design(lower=True)
design_lower.draw_design(lower=True, left=True)
design_lower.draw_cells()
design_lower.draw_cells(left=True)
design_lower.draw_design(shapes, lower=True)
design_lower.draw_design(shapes, lower=True, left=True)
design_lower.draw_cells(shapes)
design_lower.draw_cells(shapes, left=True)

lineplan = LinePlan(project) #.draw_shape().draw_attachment_points()
lineplan.draw_cells()
lineplan.draw_cells(left=True)
lineplan.draw_attachment_points(add_text=False)
lineplan.draw_attachment_points(add_text=False, left=True)
lineplan.draw_lines(add_text=True)
lineplan.draw_cells(shapes)
lineplan.draw_cells(shapes, left=True)
lineplan.draw_attachment_points(shapes, add_text=False)
lineplan.draw_attachment_points(shapes, add_text=False, left=True)
lineplan.draw_lines(shapes, add_text=True)

base_shape = ShapePlot(project)
base_shape.draw_cells()
base_shape.draw_cells(left=True)
base_shape.draw_design(lower=True)
base_shape.draw_design(lower=True, left=True)
base_shape.draw_cells(shapes)
base_shape.draw_cells(shapes, left=True)
base_shape.draw_design(shapes, lower=True)
base_shape.draw_design(shapes, lower=True, left=True)

straps = base_shape.copy()
straps.draw_straps()
straps.draw_straps(left=True)
straps.draw_straps(shapes)
straps.draw_straps(shapes, left=True)

diagonals = base_shape.copy()
diagonals.draw_diagonals()
diagonals.draw_diagonals(left=True)
diagonals.draw_diagonals(shapes)
diagonals.draw_diagonals(shapes, left=True)


return {
Expand Down
Loading