feat(units): read back every form the drawing writes

The readout learned to write lengths as 5'-6 1/2" and angles as
N 45d0'0" E, but typed input was still a bare parse::<f64>() — a
coordinate could be displayed and not entered. Give the formatters
their inverses.

parse_length takes feet and inches separated by a dash, a space, or
nothing, with the closing quote optional, and whole-plus-fraction in
any of those forms: 5', 60", 5'-9", 5'9-1/2, 9-1/2, 1/2. A leading
minus is a sign; the one inside 5'-9" is a separator, since after feet
there is nothing left to subtract from.

parse_angle reads the mark that says which convention an angle is in —
g for grads, r for radians, d/'/" for degrees-minutes-seconds, compass
letters for a surveyor's bearing — and reads a bare number in whichever
convention the drawing is set to.

ANGBASE and ANGDIR now apply, but only where they mean something. Which
way a thing points is measured from the drawing's zero and runs the way
it says; how wide an arc opens is the same number whatever zero is
counted from. format_direction and parse_direction are the pair for
directions, and the polar readout and polar input both go through them,
so the bearing shown is the bearing accepted. format_angle stays for
sizes, where applying a base angle would corrupt the value.

The command prompts follow the same rule, each classified rather than
swept: OFFSET distance, FILLET radius, CHAMFER distances, ARRAY and
MINSERT spacing, TRACE width, HELIX, and EXTRUDE height read lengths;
the four dimension text-rotation prompts, ARRAY's total angle and
INSERT's rotation read angles. MLINE's scale and INSERT's scale factor
are left alone — a multiplier has no unit to be written in. INSERT read
both through one parse; they are now separate.

The typed variants also take a decimal comma, which a single-value
prompt has no other use for. parse_length itself does not: inside a
coordinate the comma separates the axes.

Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
Hakan SevenandClaude Opus 5 committed 2026-08-07 23:46:49 +03:00
1 parent 523b85f42b
commit 6cbec232bb
18 files changed
+298 -58

No files matched your search

+5 -4
View File
@@ -574,13 +574,14 @@ fn format_coords(cursor: glam::DVec3, last: Option<glam::DVec3>, mode: i16, pick
(true, Some(l)) => {
let d = cursor - l;
let dist = (d.x * d.x + d.y * d.y).sqrt();
// Kept in 0..2pi so the readout never shows a negative bearing,
// then handed over in radians for AUNITS / AUPREC to format.
let ang = d.y.atan2(d.x).rem_euclid(std::f64::consts::TAU);
// A bearing, so it is counted from the drawing's zero and runs
// the way the drawing says — and comes back out in the same
// form the polar input accepts.
let ang = d.y.atan2(d.x);
format!(
"{} < {}",
len(dist),
crate::entities::common::format_angle(ang)
crate::entities::common::format_direction(ang)
)
}
_ => abs(cursor),
+7
View File
@@ -311,6 +311,13 @@ fn with_context(state: &State, body: impl FnOnce() -> String) -> String {
luprec: state.linear_precision,
aunits: state.angular_format,
auprec: state.angular_precision,
angbase: state
.base_angle
.trim()
.parse::<f64>()
.unwrap_or(0.0)
.to_radians(),
angdir_cw: state.clockwise,
});
let out = body();
set_unit_context(previous);