Skip to content

Commit

Permalink
.inchfrac member for formatting inch values as mixed fractional
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasa88 committed Jan 29, 2022
1 parent f45e31e commit d45ed74
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 0 deletions.
4 changes: 4 additions & 0 deletions ParametricText.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
importlib.reload(thomasa88lib.settings)

from . import paramparser
from . import paramformatter

MAP_CMD_ID = 'thomasa88_ParametricText_Map'
MIGRATE_CMD_ID = 'thomasa88_ParametricText_Migrate'
Expand Down Expand Up @@ -831,6 +832,7 @@ def sub_func(subst_match):
member_sep = ''
member = ''

# Strings can be sliced
string_value = False

if var_name == '_':
Expand Down Expand Up @@ -918,6 +920,8 @@ def sub_func(subst_match):
value = param.expression
elif member == 'unit':
value = param.unit
elif member == 'inchfrac':
value = paramformatter.mixed_frac_inch(param, design)
else:
return f'<Unknown member of {var_name}: {member}>'

Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@ https://parametrictext.readthedocs.io/en/stable/
[My Fusion 360™ app store page](https://apps.autodesk.com/en/Publisher/PublisherHomepage?ID=JLH9M8296BET)

[All my add-ins on Github](https://github.com/topics/fusion-360?q=user%3Athomasa88)

## Development

### Running tests

Currently, each unit test file is self-contained. Just execute each file with Python.
61 changes: 61 additions & 0 deletions paramformatter.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# This file is part of Parametric Text, a Fusion 360 add-in for creating text
# parameters.
#
# Copyright (c) 2020 Thomas Axelsson
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

# Helper functions for formatting parameter values

import math
import fractions

def mixed_frac_inch(param, design):
if param.unit == '':
# Unit-less
inch_value = param.value
else:
inch_value = design.fusionUnitsManager.convert(param.value, 'internalUnits', 'in')

sign_char = ''
if math.copysign(1, inch_value) < 0:
sign_char = '-'

# Convert the number to a fractional number ("1.75" to "1 3/4")
frac = abs(fractions.Fraction(inch_value).limit_denominator())

# Get the integer part ("1" from "1 3/4"), if it's not 0.
int_part = int(frac)

# Get the fractional part ("3/4" from "1 3/4"), if it's not 0.
fractional_part = frac % 1

value = sign_char
if int_part == 0 and fractional_part == 0:
value += '0'
elif int_part == 0:
value += str(fractional_part)
elif fractional_part == 0:
value += str(int_part)
else:
value += f'{int_part} {fractional_part}'
value += '"'

# Build the mixed fraction ("(-)1 3/4")
return value
23 changes: 23 additions & 0 deletions paramparser.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
# This file is part of Parametric Text, a Fusion 360 add-in for creating text
# parameters.
#
# Copyright (c) 2020 Thomas Axelsson
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

import re

# <var>[.<member>][<slice range>][:<format>]
Expand Down

0 comments on commit d45ed74

Please sign in to comment.