Skip to content

Add function that will convert a fractional string #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
newellista wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add function that will convert a fractional string #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions CSV-BOM.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,19 @@ def replacePointDelimterOnPref(self, pref, value):
return str(value).replace(".", ",")
return str(value)

def convertToFloat(self, fraction_string):
try:
return float(fraction_string)
except ValueError:
num, denom = fraction_string.split('/')
try:
leading, num = num.split(' ')
whole = float(leading)
except ValueError:
whole = 0
frac = float(num) / float(denom)
return whole - frac if whole < 0 else whole + frac

def collectData(self, design, bom, prefs):
csvStr = ''
defaultUnit = design.fusionUnitsManager.defaultLengthUnits
Expand Down Expand Up @@ -208,9 +221,9 @@ def collectData(self, design, bom, prefs):
for k in item["boundingBox"]:
dim += item["boundingBox"][k]
if dim > 0:
dimX = float(design.fusionUnitsManager.formatInternalValue(item["boundingBox"]["x"], defaultUnit, False))
dimY = float(design.fusionUnitsManager.formatInternalValue(item["boundingBox"]["y"], defaultUnit, False))
dimZ = float(design.fusionUnitsManager.formatInternalValue(item["boundingBox"]["z"], defaultUnit, False))
dimX = self.convertToFloat(design.fusionUnitsManager.formatInternalValue(item["boundingBox"]["x"], defaultUnit, False))
dimY = self.convertToFloat(design.fusionUnitsManager.formatInternalValue(item["boundingBox"]["y"], defaultUnit, False))
dimZ = self.convertToFloat(design.fusionUnitsManager.formatInternalValue(item["boundingBox"]["z"], defaultUnit, False))
if prefs["sortDims"]:
dimSorted = sorted([dimX, dimY, dimZ])
bbZ = "{0:.3f}".format(dimSorted[0])
Expand Down Expand Up @@ -272,9 +285,9 @@ def collectCutList(self, design, bom, prefs):
for k in item["boundingBox"]:
dim += item["boundingBox"][k]
if dim > 0:
dimX = float(design.fusionUnitsManager.formatInternalValue(item["boundingBox"]["x"], defaultUnit, False))
dimY = float(design.fusionUnitsManager.formatInternalValue(item["boundingBox"]["y"], defaultUnit, False))
dimZ = float(design.fusionUnitsManager.formatInternalValue(item["boundingBox"]["z"], defaultUnit, False))
dimX = self.convertToFloat(design.fusionUnitsManager.formatInternalValue(item["boundingBox"]["x"], defaultUnit, False))
dimY = self.convertToFloat(design.fusionUnitsManager.formatInternalValue(item["boundingBox"]["y"], defaultUnit, False))
dimZ = self.convertToFloat(design.fusionUnitsManager.formatInternalValue(item["boundingBox"]["z"], defaultUnit, False))

if prefs["sortDims"]:
dims = sorted([dimX, dimY, dimZ])
Expand Down