terminal output
This commit is contained in:
@@ -0,0 +1 @@
|
|||||||
|
/target
|
||||||
Generated
+196
@@ -0,0 +1,196 @@
|
|||||||
|
# This file is automatically @generated by Cargo.
|
||||||
|
# It is not intended for manual editing.
|
||||||
|
version = 4
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "anstream"
|
||||||
|
version = "1.0.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
|
||||||
|
dependencies = [
|
||||||
|
"anstyle",
|
||||||
|
"anstyle-parse",
|
||||||
|
"anstyle-query",
|
||||||
|
"anstyle-wincon",
|
||||||
|
"colorchoice",
|
||||||
|
"is_terminal_polyfill",
|
||||||
|
"utf8parse",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "anstyle"
|
||||||
|
version = "1.0.14"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "anstyle-parse"
|
||||||
|
version = "1.0.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
|
||||||
|
dependencies = [
|
||||||
|
"utf8parse",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "anstyle-query"
|
||||||
|
version = "1.1.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
|
||||||
|
dependencies = [
|
||||||
|
"windows-sys",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "anstyle-wincon"
|
||||||
|
version = "3.0.11"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
|
||||||
|
dependencies = [
|
||||||
|
"anstyle",
|
||||||
|
"once_cell_polyfill",
|
||||||
|
"windows-sys",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "clap"
|
||||||
|
version = "4.6.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
|
||||||
|
dependencies = [
|
||||||
|
"clap_builder",
|
||||||
|
"clap_derive",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "clap_builder"
|
||||||
|
version = "4.6.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
|
||||||
|
dependencies = [
|
||||||
|
"anstream",
|
||||||
|
"anstyle",
|
||||||
|
"clap_lex",
|
||||||
|
"strsim",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "clap_derive"
|
||||||
|
version = "4.6.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9"
|
||||||
|
dependencies = [
|
||||||
|
"heck",
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "clap_lex"
|
||||||
|
version = "1.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "colorchoice"
|
||||||
|
version = "1.0.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "colored"
|
||||||
|
version = "3.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34"
|
||||||
|
dependencies = [
|
||||||
|
"windows-sys",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "heck"
|
||||||
|
version = "0.5.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "is_terminal_polyfill"
|
||||||
|
version = "1.70.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "new_plaster_calc"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"clap",
|
||||||
|
"colored",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "once_cell_polyfill"
|
||||||
|
version = "1.70.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "proc-macro2"
|
||||||
|
version = "1.0.106"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
|
||||||
|
dependencies = [
|
||||||
|
"unicode-ident",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "quote"
|
||||||
|
version = "1.0.45"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "strsim"
|
||||||
|
version = "0.11.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "syn"
|
||||||
|
version = "2.0.117"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"unicode-ident",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "unicode-ident"
|
||||||
|
version = "1.0.24"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "utf8parse"
|
||||||
|
version = "0.2.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-link"
|
||||||
|
version = "0.2.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-sys"
|
||||||
|
version = "0.61.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
|
||||||
|
dependencies = [
|
||||||
|
"windows-link",
|
||||||
|
]
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
[package]
|
||||||
|
name = "new_plaster_calc"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
clap = { version = "4.0", features = ["derive"] }
|
||||||
|
colored = "3.1.1"
|
||||||
+138
@@ -0,0 +1,138 @@
|
|||||||
|
use clap::{Parser, ValueEnum};
|
||||||
|
use colored::*;
|
||||||
|
|
||||||
|
/// Concentration of plaster slurry
|
||||||
|
/// in parts of water per 100 parts plaster by weight
|
||||||
|
const DEFAULT_CONCENTRATION: f64 = 70.0;
|
||||||
|
/// Density of plaster slurry (g/L).
|
||||||
|
const DEFAULT_DENSITY: f64 = 1674.0;
|
||||||
|
const PERCENT: f64 = 100.0;
|
||||||
|
/// The amount of slack added
|
||||||
|
const SLACK: f64 = 0.10;
|
||||||
|
/// The multiplier for the water that becomes part of the mold
|
||||||
|
///
|
||||||
|
/// 18 parts water for every part plaster becomes part
|
||||||
|
/// of the mold.
|
||||||
|
const DRY_WEIGHT_MULTIPLIER: f64 = 1.18;
|
||||||
|
|
||||||
|
// Color and Styling Configurations
|
||||||
|
const COLOR_PARAM: Color = Color::Yellow;
|
||||||
|
const COLOR_PLASTER: Color = Color::Green;
|
||||||
|
const COLOR_WATER: Color = Color::Blue;
|
||||||
|
const COLOR_TARGET: Color = Color::Magenta;
|
||||||
|
|
||||||
|
#[derive(ValueEnum, Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
|
enum ColorChoice {
|
||||||
|
Never,
|
||||||
|
Auto,
|
||||||
|
Always,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Parser, Debug)]
|
||||||
|
#[command(author, version, about = "Calculates plaster mixing weights", long_about = None)]
|
||||||
|
struct Args {
|
||||||
|
/// Volume in cm³ or ml
|
||||||
|
volume: f64,
|
||||||
|
|
||||||
|
/// Concentration (parts water per 100 parts plaster by weight)
|
||||||
|
#[arg(short, long, default_value_t = 70.0)]
|
||||||
|
concentration: f64,
|
||||||
|
|
||||||
|
/// Density in grams per liter (defaults to 1674 if concentration is 70)
|
||||||
|
#[arg(short, long)]
|
||||||
|
density: Option<f64>,
|
||||||
|
|
||||||
|
/// Control terminal color output
|
||||||
|
#[arg(long, default_value = "auto")]
|
||||||
|
color: ColorChoice,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let args = Args::parse();
|
||||||
|
|
||||||
|
// Configure color output globally based on the CLI argument
|
||||||
|
match args.color {
|
||||||
|
ColorChoice::Always => colored::control::set_override(true),
|
||||||
|
ColorChoice::Never => colored::control::set_override(false),
|
||||||
|
ColorChoice::Auto => {} // Respects standard stream capabilities (default)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine density and target wet weight
|
||||||
|
let density = args.density.or_else(|| {
|
||||||
|
if (args.concentration - DEFAULT_CONCENTRATION).abs() < f64::EPSILON {
|
||||||
|
Some(DEFAULT_DENSITY)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
});
|
||||||
|
let target_wet_weight = density.map(|d| (args.volume / 1000.0) * d);
|
||||||
|
|
||||||
|
let (plaster_nominal, water_nominal) = match target_wet_weight {
|
||||||
|
Some(wet_weight) => {
|
||||||
|
let plaster = wet_weight / (1.0 + (args.concentration / PERCENT));
|
||||||
|
let water = plaster * (args.concentration / PERCENT);
|
||||||
|
(Some(plaster), Some(water))
|
||||||
|
}
|
||||||
|
None => (None, None),
|
||||||
|
};
|
||||||
|
|
||||||
|
// Output Header
|
||||||
|
println!("--- Plaster Calculation Parameters ---");
|
||||||
|
println!(
|
||||||
|
"Volume: {}ml",
|
||||||
|
format!("{}", args.volume).color(COLOR_PARAM).bold()
|
||||||
|
);
|
||||||
|
println!(
|
||||||
|
"Concentration: {}g water per 100g plaster",
|
||||||
|
format!("{}", args.concentration).color(COLOR_PARAM).bold()
|
||||||
|
);
|
||||||
|
|
||||||
|
let density_str = density.map_or("Not provided/calculated".to_string(), |d| {
|
||||||
|
format!("{}g/L", format!("{}", d).color(COLOR_PARAM).bold())
|
||||||
|
});
|
||||||
|
println!("Density: {}", density_str);
|
||||||
|
println!("--------------------------------------");
|
||||||
|
|
||||||
|
// Output Mixing Amounts and Target Weights
|
||||||
|
if let (Some(p_nom), Some(w_nom)) = (plaster_nominal, water_nominal) {
|
||||||
|
let p_slack = p_nom * (1.0 + SLACK);
|
||||||
|
let w_slack = w_nom * (1.0 + SLACK);
|
||||||
|
let dry_weight = p_nom * DRY_WEIGHT_MULTIPLIER;
|
||||||
|
|
||||||
|
println!("Mixing Amounts:");
|
||||||
|
println!(" Nominal:");
|
||||||
|
println!(
|
||||||
|
" Plaster: {}g",
|
||||||
|
format!("{:.1}", p_nom).color(COLOR_PLASTER)
|
||||||
|
);
|
||||||
|
println!(
|
||||||
|
" Water: {}g",
|
||||||
|
format!("{:.1}", w_nom).color(COLOR_WATER)
|
||||||
|
);
|
||||||
|
println!(" {:2}% Slack:", SLACK * PERCENT);
|
||||||
|
println!(
|
||||||
|
" Plaster: {}g",
|
||||||
|
format!("{:.1}", p_slack).color(COLOR_PLASTER).bold()
|
||||||
|
);
|
||||||
|
println!(
|
||||||
|
" Water: {}g",
|
||||||
|
format!("{:.1}", w_slack).color(COLOR_WATER).bold()
|
||||||
|
);
|
||||||
|
|
||||||
|
println!("\nTarget Weights:");
|
||||||
|
println!(
|
||||||
|
" Wet Cast: {}g",
|
||||||
|
format!("{:.1}", target_wet_weight.unwrap())
|
||||||
|
.color(COLOR_TARGET)
|
||||||
|
.bold()
|
||||||
|
);
|
||||||
|
println!(
|
||||||
|
" Dry Cast: {}g",
|
||||||
|
format!("{:.1}", dry_weight).color(COLOR_TARGET).bold()
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
println!("{}",
|
||||||
|
"Target weights and mixing amounts cannot be calculated. Please specify a density with `-d` for any non-70 concentration.".red()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user