Complete freehand sketch workflow

This commit is contained in:
ramox81 committed 2026-08-20 16:31:22 +03:00
1 parent bb49f92e99
commit e3bfbf1590
11 files changed
+620 -108

No files matched your search

+6 -1
View File
@@ -475,7 +475,12 @@ impl OpenCADStudio {
"SKETCH" => {
use crate::modules::draw::draw::sketch::SketchCommand;
let new_cmd = SketchCommand::new();
let header = &self.tabs[i].scene.document.header;
let new_cmd = SketchCommand::new(
header.sketch_type,
header.sketch_increment,
header.sketch_tolerance,
);
self.command_line.push_info(&new_cmd.prompt());
self.tabs[i].active_cmd = Some(Box::new(new_cmd));
}
+1
View File
@@ -914,6 +914,7 @@ impl OpenCADStudio {
&mut header.text_height,
&mut header.trace_width,
&mut header.sketch_increment,
&mut header.sketch_tolerance,
&mut header.thickness,
&mut header.polyline_width,
&mut header.fillet_radius,
+2
View File
@@ -518,6 +518,8 @@ inventory::submit!(crate::command::CommandRegistration {
"HALOGAP",
"TRACEWID",
"SKETCHINC",
"SKPOLY",
"SKTOLERANCE",
// Reset selected entities' overrides to follow their layer.
"SETBYLAYER",
// Remove duplicate objects; set drawing base point; audit integrity;
+32 -7
View File
@@ -923,6 +923,8 @@ impl OpenCADStudio {
| "HALOGAP"
| "TRACEWID"
| "SKETCHINC"
| "SKPOLY"
| "SKTOLERANCE"
) =>
{
return self.dispatch_styleprops(&format!("SETVAR {cmd}"), i);
@@ -945,7 +947,7 @@ impl OpenCADStudio {
let value = it.next().map(|s| s.trim().to_string());
if name.is_empty() || name == "?" {
self.command_line.push_info(
"SETVAR: LTSCALE CELTSCALE PDMODE PDSIZE TEXTSIZE ORTHOMODE FILLMODE MIRRTEXT ZOOMWHEEL ZOOMFACTOR CURSORSIZE PICKBOX CURSORTYPE SNAPANG ATTREQ ATTDIA DIMASSOC ANGBASE ANGDIR | CLAYER CELTYPE TEXTSTYLE (read-only)",
"SETVAR: LTSCALE CELTSCALE PDMODE PDSIZE TEXTSIZE ORTHOMODE FILLMODE MIRRTEXT ZOOMWHEEL ZOOMFACTOR CURSORSIZE PICKBOX CURSORTYPE SNAPANG ATTREQ ATTDIA DIMASSOC ANGBASE ANGDIR SKETCHINC SKPOLY SKTOLERANCE | CLAYER CELTYPE TEXTSTYLE (read-only)",
);
} else {
// Parse a boolean given as 0/1 or ON/OFF.
@@ -1628,15 +1630,38 @@ impl OpenCADStudio {
None => Ok((format!("TRACEWID = {}", h.trace_width), false)),
},
"SKETCHINC" => match &value {
Some(v) => v
.parse::<f64>()
.map(|x| {
Some(v) => match v.parse::<f64>() {
Ok(x) if x.is_finite() && x > 0.0 => {
h.sketch_increment = x;
(format!("SKETCHINC = {x}"), true)
})
.map_err(|_| "SETVAR: numeric value required.".into()),
Ok((format!("SKETCHINC = {x}"), true))
}
_ => Err("SETVAR: positive numeric value required.".into()),
},
None => Ok((format!("SKETCHINC = {}", h.sketch_increment), false)),
},
"SKPOLY" => match &value {
Some(v) => match v.parse::<i16>() {
Ok(x @ 0..=2) => {
h.sketch_type = x;
Ok((format!("SKPOLY = {x}"), true))
}
_ => Err("SETVAR: integer value from 0 to 2 required.".into()),
},
None => Ok((format!("SKPOLY = {}", h.sketch_type), false)),
},
"SKTOLERANCE" => match &value {
Some(v) => match v.parse::<f64>() {
Ok(x) if x.is_finite() && x >= 0.0 => {
h.sketch_tolerance = x;
Ok((format!("SKTOLERANCE = {x}"), true))
}
_ => Err("SETVAR: non-negative numeric value required.".into()),
},
None => Ok((
format!("SKTOLERANCE = {}", h.sketch_tolerance),
false,
)),
},
"CLAYER" => match &value {
Some(_) => Err(
"SETVAR: CLAYER is read-only here — use the CLAYER command."