Compare commits

..
12 changed files with 19 additions and 17 deletions
+3 -1
View File
@@ -7,7 +7,9 @@ use std::collections::{HashMap, HashSet};
use cadcraft_doc::Handle;
use serde_json::{Value, json};
use super::super::*;
use super::super::{CommandSpec, bad};
use super::super::always;
use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
pub fn specs() -> Vec<CommandSpec> {
+2
View File
@@ -11,11 +11,13 @@ use serde_json::{Value, json};
use super::helpers::lwpoly;
use super::*;
use crate::{Accept, EngineError, Input, Interactive, Picker, Prompt, Result, Session, Step};
mod assoc;
mod edit;
mod pick;
use super::has_doc;
pub(crate) use assoc::update as refill_associative;
pub use pick::{HatchPicks, PickMode};
+1 -1
View File
@@ -13,7 +13,7 @@ use cadcraft_doc::library::{PatternLine, pattern, standard_patterns};
use serde_json::{Value, json};
use super::super::helpers::support_text;
use super::*;
use super::{Result, Session, bad, bool_or};
/// Most user patterns held at once.
pub const MAX_USER_PATTERNS: usize = 4096;
+4 -1
View File
@@ -6,7 +6,8 @@ use cadcraft_doc::{Entity, EntityKind, Handle};
use cadcraft_geom::{Polyline, Vec2, Vec3};
use serde_json::{Value, json};
use super::*;
use super::{CommandSpec, bad, bool_or, f64_req, point_req, point_value, points_param, targets};
use crate::units::{format_angle, format_distance};
use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
@@ -1130,6 +1131,8 @@ impl Interactive for AreaM {
#[cfg(test)]
mod tests {
use cadcraft_doc::Handle;
use super::*;
/// #1440 review: a value one ulp past its bound (a border rectangle's shoelace area against
+2 -1
View File
@@ -9,7 +9,8 @@ use cadcraft_doc::{Drawing, Entity, EntityKind, Handle, Insert, MAX_BLOCK_DEPTH,
use cadcraft_geom::{Mat3, Vec2};
use serde_json::{Value, json};
use super::super::*;
use super::super::{bad, bool_or, point_req, str_param, targets};
use super::SelfCheck;
use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
+2 -1
View File
@@ -13,7 +13,8 @@ use cadcraft_doc::{EntityKind, Handle};
use cadcraft_geom::{Arc as GeoArc, EPS, Vec2};
use serde_json::{Value, json};
use super::super::*;
use super::super::bad;
use crate::{Result, Session};
const CMD: &str = "loops";
+1 -2
View File
@@ -11,8 +11,7 @@ use cadcraft_geom::{Line, Vec2, line_line, point_in_polygon};
use serde_json::{Value, json};
use super::super::machines::{SelOutcome, SelectPhase, SelectRun};
use super::super::{CommandSpec, bad, targets};
use super::super::*;
use super::SelfCheck;
use crate::{EngineError, Input, Interactive, Prompt, Result, Session, Step};
+1 -3
View File
@@ -6,9 +6,7 @@ use cadcraft_doc::{Entity, EntityKind};
use cadcraft_geom::{Bounds2, Polyline, Vec2, intersect_segments};
use serde_json::{Value, json};
use super::super::bad;
use super::super::point_value;
use super::super::*;
use super::{SelfCheck, area_of, object_area};
use crate::{Result, Session};
+1 -2
View File
@@ -8,9 +8,8 @@ use std::collections::{HashMap, HashSet};
use cadcraft_doc::{Drawing, Entity, EntityKind};
use serde_json::{Value, json};
use super::super::bad;
use super::super::blocks::purge;
use super::super::*;
use crate::{Result, Session};
const CMD: &str = "usage";
+1 -2
View File
@@ -7,8 +7,7 @@ use cadcraft_doc::{Layer, Lineweight};
use serde_json::{Value, json};
use super::machines::SelectRun;
use super::{CommandSpec, bad, bool_or, ok, str_param, targets};
use super::*;
use crate::{Result, Session};
pub fn specs() -> Vec<CommandSpec> {
-1
View File
@@ -10,7 +10,6 @@ use serde_json::{Value, json};
use super::file::{base64_encode, io};
use super::*;
use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
use viewports::MviewM;
+1 -2
View File
@@ -8,8 +8,7 @@
use cadcraft_doc::{Drawing, PlotStyle, PlotStyleKind, PlotStyleTable};
use serde_json::{Value, json};
use super::super::targets;
use super::{CommandSpec, Result, Session, bad, str_param};
use super::*;
pub fn specs() -> Vec<CommandSpec> {
vec![