Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from typing import TYPE_CHECKING, Any

from raygeo.sketch.entities import Circle
from raygeo.sketch.params import ParameterContext

from ..arrays import (
Array,
Expand All @@ -14,7 +15,6 @@
resolve_template_center,
)
from ..entity_group import EntityGroup
from ..params import ParameterContext
from .base import SketchChangeCommand
from .create_array import CreateArrayCommand
from .items import AddItemsCommand, RemoveItemsCommand
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
)
from raygeo.sketch.entities import Arc, Bezier, Entity, Line
from raygeo.sketch.entities import TextBox as TextBoxEntity
from raygeo.sketch.params import ParameterContext
from raygeo.sketch.registry import EntityRegistry

from rayforge.core.asset import IAsset
Expand All @@ -53,7 +54,6 @@

from .arrays import Array
from .components import get_referenced_points
from .params import ParameterContext
from .solver import Solver
from .template_functions import get_template_functions
from .types import ConstraintStatus, EntityID, WaypointType
Expand Down Expand Up @@ -1470,7 +1470,7 @@ def solve(
# Step 3: Evaluate all expressions from scratch using the temporary
# context, seeded with the combined values.
solve_params.evaluate_all(initial_values=initial_values)
ctx = solve_params.get_all_values()
ctx: dict[str, Any] = dict(solve_params.get_all_values())

# Cache the solved context (with template functions) for
# reuse by _resolve_text_content, avoiding redundant
Expand Down Expand Up @@ -1653,7 +1653,7 @@ def _resolve_text_content(self, entity: TextBoxEntity) -> str | None:
if not initial_values and self.input_parameters:
initial_values.update(self.input_parameters.get_values())
solve_params.evaluate_all(initial_values=initial_values)
ctx = solve_params.get_all_values()
ctx: dict[str, Any] = dict(solve_params.get_all_values())
ctx.update(get_template_functions())

expr_map = ExpressionMap(ctx)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
import scipy.linalg
from raygeo.sketch.constraints import Constraint
from raygeo.sketch.entities import SketchPoint as Point
from raygeo.sketch.params import ParameterContext
from raygeo.sketch.registry import EntityRegistry
from scipy.optimize import least_squares
from threadpoolctl import ThreadpoolController

from .components import compute_constraint_components, get_referenced_points
from .params import ParameterContext
from .types import EntityID

CONFLICT_ERROR_THRESHOLD = 1e-3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import pytest
from raygeo.sketch.constraints import RadiusConstraint, RotationalConstraint
from raygeo.sketch.params import ParameterContext
from sketcher.core.arrays import CircularArrayStrategy
from sketcher.core.commands import CreateArrayCommand, EditArrayCommand
from sketcher.core.params import ParameterContext
from sketcher.core.sketch import Sketch


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
DistanceConstraint,
)
from raygeo.sketch.constraints.angle import ARC_RADIUS
from raygeo.sketch.params import ParameterContext
from raygeo.sketch.registry import EntityRegistry
from sketcher.core import Sketch
from sketcher.core.params import ParameterContext
from sketcher.core.selection import SketchSelection
from sketcher.core.solver import Solver

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import numpy as np
import pytest
from raygeo.sketch.constraints import AspectRatioConstraint
from raygeo.sketch.params import ParameterContext
from raygeo.sketch.registry import EntityRegistry
from scipy.optimize import check_grad
from sketcher.core import Sketch
from sketcher.core.params import ParameterContext
from sketcher.core.selection import SketchSelection


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import numpy as np
import pytest
from raygeo.sketch.constraints import CoincidentConstraint
from raygeo.sketch.params import ParameterContext
from raygeo.sketch.registry import EntityRegistry
from scipy.optimize import check_grad
from sketcher.core import Sketch
from sketcher.core.params import ParameterContext
from sketcher.core.selection import SketchSelection


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import numpy as np
import pytest
from raygeo.sketch.constraints import DiameterConstraint
from raygeo.sketch.params import ParameterContext
from raygeo.sketch.registry import EntityRegistry
from scipy.optimize import check_grad
from sketcher.core import Sketch
from sketcher.core.params import ParameterContext
from sketcher.core.selection import SketchSelection


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import pytest
from gi.repository import Pango, PangoCairo
from raygeo.sketch.constraints import DistanceConstraint
from raygeo.sketch.params import ParameterContext
from raygeo.sketch.registry import EntityRegistry
from scipy.optimize import check_grad
from sketcher.core import Sketch
from sketcher.core.params import ParameterContext
from sketcher.core.selection import SketchSelection


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import numpy as np
import pytest
from raygeo.sketch.constraints import DragConstraint
from raygeo.sketch.params import ParameterContext
from raygeo.sketch.registry import EntityRegistry
from scipy.optimize import check_grad
from sketcher.core.params import ParameterContext


@pytest.fixture
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import numpy as np
import pytest
from raygeo.sketch.constraints import EqualDistanceConstraint
from raygeo.sketch.params import ParameterContext
from raygeo.sketch.registry import EntityRegistry
from scipy.optimize import check_grad
from sketcher.core.params import ParameterContext


@pytest.fixture
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import numpy as np
import pytest
from raygeo.sketch.constraints import EqualLengthConstraint
from raygeo.sketch.params import ParameterContext
from raygeo.sketch.registry import EntityRegistry
from scipy.optimize import check_grad
from sketcher.core import Sketch
from sketcher.core.components import get_referenced_points
from sketcher.core.params import ParameterContext
from sketcher.core.selection import SketchSelection


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import numpy as np
import pytest
from raygeo.sketch.constraints import HorizontalConstraint
from raygeo.sketch.params import ParameterContext
from raygeo.sketch.registry import EntityRegistry
from scipy.optimize import check_grad
from sketcher.core import Sketch
from sketcher.core.params import ParameterContext
from sketcher.core.selection import SketchSelection


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import numpy as np
import pytest
from raygeo.sketch.constraints import ParallelogramConstraint
from raygeo.sketch.params import ParameterContext
from raygeo.sketch.registry import EntityRegistry
from scipy.optimize import check_grad
from sketcher.core.params import ParameterContext


@pytest.fixture
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import numpy as np
import pytest
from raygeo.sketch.constraints import PerpendicularConstraint
from raygeo.sketch.params import ParameterContext
from raygeo.sketch.registry import EntityRegistry
from scipy.optimize import check_grad
from sketcher.core import Sketch
from sketcher.core.params import ParameterContext
from sketcher.core.selection import SketchSelection


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import pytest
from raygeo.sketch.constraints import PointOnCurveConstraint
from raygeo.sketch.constraints.point_on_curve import closest_point_on_bezier
from raygeo.sketch.params import ParameterContext
from raygeo.sketch.registry import EntityRegistry
from scipy.optimize import check_grad
from sketcher.core import Sketch
from sketcher.core.params import ParameterContext
from sketcher.core.selection import SketchSelection
from sketcher.core.solver import Solver

Expand Down
Loading
Loading