tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Conversion math library update

Browse Source 
* Now inputs diameter instead of radius to prevent confusion
* Added length_from_weight
This commit is contained in:
Donkie
2023-07-10 11:02:22 +02:00
parent 6afbdb17f3
commit f995662f05
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spoolman/math.py
View File

@@ -3,17 +3,33 @@
import math
def weight_from_length(*, length: float, radius: float, density: float) -> float:
def weight_from_length(*, length: float, diameter: float, density: float) -> float:
"""Calculate the weight of a piece of filament.
Args:
length (float): Filament length in mm
radius (float): Filament radius in mm
diameter (float): Filament diameter in mm
density (float): Density of filament material in g/cm3
Returns:
float: Weight in g
"""
volume_mm3 = length * math.pi * radius * radius
volume_mm3 = length * math.pi * (diameter / 2) ** 2
volume_cm3 = volume_mm3 / 1000
return density * volume_cm3
def length_from_weight(*, weight: float, diameter: float, density: float) -> float:
"""Calculate the length of a piece of filament.
Args:
weight (float): Filament weight in g
diameter (float): Filament diameter in mm
density (float): Density of filament material in g/cm3
Returns:
float: Length in mm
"""
volume_cm3 = weight / density
volume_mm3 = volume_cm3 * 1000
return volume_mm3 / (math.pi * (diameter / 2) ** 2)