forked from 1b-agent/opencadstudio-upstream
Track mixed paper and viewport dimension references
This commit is contained in:
1 parent
bd00d679a9
commit
5424a19482
28 files changed
+823
-846
No files matched your search
@@ -482,7 +482,7 @@ impl CadCommand for AngularDimensionCommand {
|
||||
CmdResult::Cancel
|
||||
}
|
||||
|
||||
/// PR2: points and object picks may come through a paper-space viewport;
|
||||
/// Points and object picks may come through a paper-space viewport;
|
||||
/// the committed dimension then reports the model measurement.
|
||||
fn measures_through_viewports(&self) -> bool {
|
||||
true
|
||||
@@ -490,11 +490,27 @@ impl CadCommand for AngularDimensionCommand {
|
||||
|
||||
fn dimension_acquired_points(&self) -> Vec<DVec3> {
|
||||
match self.step {
|
||||
Step::Vertex => vec![], Step::FirstRay(p) => vec![p],
|
||||
Step::SecondRay { vertex, first } | Step::CircleSecondRay { vertex, first, .. } => vec![vertex, first],
|
||||
Step::SecondLine { first_start, first_end, .. } => vec![first_start, first_end],
|
||||
Step::ArcPoint3 { vertex, first, second } => vec![vertex, first, second],
|
||||
Step::ArcPoint2 { first_start, first_end, second_start, second_end } => vec![first_start, first_end, second_start, second_end],
|
||||
Step::Vertex => vec![],
|
||||
Step::FirstRay(p) => vec![p],
|
||||
Step::SecondRay { vertex, first } | Step::CircleSecondRay { vertex, first, .. } => {
|
||||
vec![vertex, first]
|
||||
}
|
||||
Step::SecondLine {
|
||||
first_start,
|
||||
first_end,
|
||||
..
|
||||
} => vec![first_start, first_end],
|
||||
Step::ArcPoint3 {
|
||||
vertex,
|
||||
first,
|
||||
second,
|
||||
} => vec![vertex, first, second],
|
||||
Step::ArcPoint2 {
|
||||
first_start,
|
||||
first_end,
|
||||
second_start,
|
||||
second_end,
|
||||
} => vec![first_start, first_end, second_start, second_end],
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user