|
|
|
|
@ -62,20 +62,26 @@ fn main() -> io::Result<()> {
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let options = converter::ProgramOptions {
|
|
|
|
|
tolerance: matches
|
|
|
|
|
let mut options = ProgramOptions::default();
|
|
|
|
|
|
|
|
|
|
if let Some(tolerance) = matches
|
|
|
|
|
.value_of("tolerance")
|
|
|
|
|
.map(|x| x.parse().expect("could not parse tolerance"))
|
|
|
|
|
.unwrap_or(0.002),
|
|
|
|
|
feedrate: matches
|
|
|
|
|
.map(|tolerance| tolerance.parse().expect("could not parse tolerance"))
|
|
|
|
|
{
|
|
|
|
|
options.tolerance = tolerance;
|
|
|
|
|
}
|
|
|
|
|
if let Some(feedrate) = matches
|
|
|
|
|
.value_of("feedrate")
|
|
|
|
|
.map(|x| x.parse().expect("could not parse feedrate"))
|
|
|
|
|
.unwrap_or(300.0),
|
|
|
|
|
dpi: matches
|
|
|
|
|
.map(|feedrate| feedrate.parse().expect("could not parse tolerance"))
|
|
|
|
|
{
|
|
|
|
|
options.feedrate = feedrate;
|
|
|
|
|
}
|
|
|
|
|
if let Some(dpi) = matches
|
|
|
|
|
.value_of("dpi")
|
|
|
|
|
.map(|x| x.parse().expect("could not parse DPI"))
|
|
|
|
|
.unwrap_or(96.0),
|
|
|
|
|
};
|
|
|
|
|
.map(|dpi| dpi.parse().expect("could not parse tolerance"))
|
|
|
|
|
{
|
|
|
|
|
options.dpi = dpi;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let machine = machine::Machine::new(
|
|
|
|
|
matches
|
|
|
|
|
@ -120,19 +126,32 @@ fn main() -> io::Result<()> {
|
|
|
|
|
mod test {
|
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn square_produces_expected_gcode() {
|
|
|
|
|
let shapes = include_str!("../tests/square.svg");
|
|
|
|
|
fn get_actual(input: &str) -> String {
|
|
|
|
|
let options = ProgramOptions::default();
|
|
|
|
|
let machine = Machine::default();
|
|
|
|
|
let document = roxmltree::Document::parse(&shapes).unwrap();
|
|
|
|
|
let document = roxmltree::Document::parse(input).unwrap();
|
|
|
|
|
|
|
|
|
|
let mut program = converter::svg2program(&document, options, machine);
|
|
|
|
|
postprocess::set_origin(&mut program, lyon_geom::math::point(0., 0.));
|
|
|
|
|
|
|
|
|
|
let program = converter::svg2program(&document, options, machine);
|
|
|
|
|
let mut actual = vec![];
|
|
|
|
|
assert!(gcode::program2gcode(program, &mut actual).is_ok());
|
|
|
|
|
assert_eq!(
|
|
|
|
|
String::from_utf8(actual).unwrap(),
|
|
|
|
|
include_str!("../tests/square.gcode")
|
|
|
|
|
)
|
|
|
|
|
String::from_utf8(actual).unwrap()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn square_produces_expected_gcode() {
|
|
|
|
|
let square = include_str!("../tests/square.svg");
|
|
|
|
|
let actual = get_actual(square);
|
|
|
|
|
|
|
|
|
|
assert_eq!(actual, include_str!("../tests/square.gcode"))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn square_transformed_produces_expected_gcode() {
|
|
|
|
|
let square_transformed = include_str!("../tests/square_transformed.svg");
|
|
|
|
|
let actual = get_actual(square_transformed);
|
|
|
|
|
|
|
|
|
|
assert_eq!(actual, include_str!("../tests/square_transformed.gcode"))
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Sameer Puri
5 years ago
