Rename SolveCraft to SolidCraft everywhere, with compatibility shims (#389)
* WIP deep rename (not for push) * WIP2 * WIP3 * WIP4 wxs fix * rustfmt * Rename the remaining identifiers in merged crash-report code Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RjGw4gA5ZvKrU8MQP6sBgT --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
27415e4dd7
commit
296683229d
464 files changed
+3408
-2956
No files matched your search
@@ -2,8 +2,8 @@
|
||||
//! inference for interactive tools.
|
||||
|
||||
use serde_json::{Value, json};
|
||||
use solvecraft_geom::Vec2;
|
||||
use solvecraft_sketch::{ConstraintKind, CurveKind, Sketch};
|
||||
use solidcraft_geom::Vec2;
|
||||
use solidcraft_sketch::{ConstraintKind, CurveKind, Sketch};
|
||||
|
||||
use super::sketch::{add_c, dof_now, edit, reject_redundant};
|
||||
use super::{CommandSpec, in_sketch};
|
||||
@@ -120,7 +120,7 @@ const MAX_TRIALS: usize = 2000;
|
||||
|
||||
/// Add `k` if it removes a degree of freedom and the sketch still solves; else leave the
|
||||
/// sketch as it was. Returns the new dof when kept.
|
||||
fn try_add(sk: &mut Sketch, doc: &mut solvecraft_doc::Document, k: ConstraintKind, dof: usize, dim: bool) -> Option<usize> {
|
||||
fn try_add(sk: &mut Sketch, doc: &mut solidcraft_doc::Document, k: ConstraintKind, dof: usize, dim: bool) -> Option<usize> {
|
||||
let saved = sk.clone();
|
||||
let param = if dim {
|
||||
let v = k.value()?;
|
||||
@@ -136,7 +136,7 @@ fn try_add(sk: &mut Sketch, doc: &mut solvecraft_doc::Document, k: ConstraintKin
|
||||
return None;
|
||||
}
|
||||
let mut trial = sk.clone();
|
||||
let rep = solvecraft_sketch::solve(&mut trial);
|
||||
let rep = solidcraft_sketch::solve(&mut trial);
|
||||
if rep.ok() && rep.dof < dof {
|
||||
*sk = trial;
|
||||
return Some(rep.dof);
|
||||
@@ -148,7 +148,7 @@ fn try_add(sk: &mut Sketch, doc: &mut solvecraft_doc::Document, k: ConstraintKin
|
||||
None
|
||||
}
|
||||
|
||||
fn run_auto(sk: &mut Sketch, doc: &mut solvecraft_doc::Document, p: &Value, datum: usize) -> (Vec<String>, usize) {
|
||||
fn run_auto(sk: &mut Sketch, doc: &mut solidcraft_doc::Document, p: &Value, datum: usize) -> (Vec<String>, usize) {
|
||||
use ConstraintKind::*;
|
||||
let tol = num(p, "tolerance").filter(|t| *t > 0.0).unwrap_or(0.01);
|
||||
let atol = num(p, "angle_tolerance").filter(|t| *t > 0.0).unwrap_or(1.0).to_radians();
|
||||
@@ -156,7 +156,7 @@ fn run_auto(sk: &mut Sketch, doc: &mut solvecraft_doc::Document, p: &Value, datu
|
||||
let n0 = sk.constraints.len();
|
||||
let mut dof = dof_now(sk);
|
||||
let mut trials = 0;
|
||||
let mut attempt = |sk: &mut Sketch, doc: &mut solvecraft_doc::Document, k: ConstraintKind, dim: bool, dof: &mut usize| {
|
||||
let mut attempt = |sk: &mut Sketch, doc: &mut solidcraft_doc::Document, k: ConstraintKind, dim: bool, dof: &mut usize| {
|
||||
if *dof == 0 || trials >= MAX_TRIALS {
|
||||
return;
|
||||
}
|
||||
@@ -284,7 +284,7 @@ fn guess(sk: &Sketch, ents: &[String], cmd: &str) -> Result<ConstraintKind> {
|
||||
sk.resolve_point(r).map(|p| (Some(p), None)).ok_or_else(|| bad(cmd, format!("unknown sketch entity `{r}`")))
|
||||
};
|
||||
let line_dir = |c: usize| match sk.shape(c) {
|
||||
Some(solvecraft_sketch::Shape::Line { a, b }) => (b - a).normalized(),
|
||||
Some(solidcraft_sketch::Shape::Line { a, b }) => (b - a).normalized(),
|
||||
_ => None,
|
||||
};
|
||||
let round = |c: usize| matches!(sk.curves.get(c).map(|c| &c.kind), Some(CurveKind::Circle { .. } | CurveKind::Arc { .. }));
|
||||
@@ -313,7 +313,7 @@ fn guess(sk: &Sketch, ents: &[String], cmd: &str) -> Result<ConstraintKind> {
|
||||
if cross < 0.2 {
|
||||
// Parallel; on one line → collinear.
|
||||
let off = match (sk.shape(x), sk.shape(y)) {
|
||||
(Some(solvecraft_sketch::Shape::Line { a, .. }), Some(solvecraft_sketch::Shape::Line { a: b0, .. })) => {
|
||||
(Some(solidcraft_sketch::Shape::Line { a, .. }), Some(solidcraft_sketch::Shape::Line { a: b0, .. })) => {
|
||||
u.cross(b0 - a).abs()
|
||||
}
|
||||
_ => f64::INFINITY,
|
||||
|
||||
Reference in new issue
Block a user