Skip to content

Add side padding for Bins #195

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
chriskinsman wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add side padding for Bins #195

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion commands/commandCreateBaseplate/entry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ def command_created(args: adsk.core.CommandCreatedEventArgs):
sidePaddingGroup = plateFeaturesGroup.children.addGroupCommandInput(SIDE_PADDING_GROUP, 'Side padding')
sidePaddingGroup.isExpanded = uiState.getState(SIDE_PADDING_GROUP)
uiState.registerCommandInput(sidePaddingGroup)
generateSidePaddingInput = sidePaddingGroup.children.addBoolValueInput(BASEPLATE_WITH_SIDE_PADDING_INPUT, 'Add side padding', True, '', uiState.getState(BASEPLATE_WITH_SIDE_PADDING_INPUT))
generateSidePaddingInput = sidePaddingGroup.children.addBoolValueInput(BASEPLATE_WITH_SIDE_PADDING_INPUT, 'Add padding', True, '', uiState.getState(BASEPLATE_WITH_SIDE_PADDING_INPUT))
uiState.registerCommandInput(generateSidePaddingInput)

sidePaddingLeftInput = sidePaddingGroup.children.addValueInput(BASEPLATE_SIDE_PADDING_LEFT_INPUT, 'Padding left', defaultLengthUnits, adsk.core.ValueInput.createByReal(uiState.getState(BASEPLATE_SIDE_PADDING_LEFT_INPUT)))
Expand Down
71 changes: 68 additions & 3 deletions commands/commandCreateBin/entry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
BIN_SCOOP_GROUP_ID = 'bin_scoop_group'
BIN_TAB_FEATURES_GROUP_ID = 'bin_tab_features_group'
BIN_BASE_FEATURES_GROUP_ID = 'bin_base_features_group'
BIN_PADDING_GROUP_ID = 'bin_padding_group'
USER_CHANGES_GROUP_ID = 'user_changes_group'
PREVIEW_GROUP_ID = 'preview_group'
INFO_GROUP = 'info_group'
Expand Down Expand Up @@ -117,6 +118,11 @@
BIN_TYPE_HOLLOW = 'Hollow'
BIN_TYPE_SHELLED = 'Shelled'
BIN_TYPE_SOLID = 'Solid'
BIN_HAS_PADDING_INPUT_ID = 'bin_has_padding'
BIN_PADDING_LEFT_INPUT_ID = 'bin_padding_left'
BIN_PADDING_TOP_INPUT_ID = 'bin_padding_top'
BIN_PADDING_RIGHT_INPUT_ID = 'bin_padding_right'
BIN_PADDING_BOTTOM_INPUT_ID = 'bin_padding_bottom'

INPUT_CHANGES_SAVE_DEFAULTS = 'input_changes_buttons_save_new_defaults'
INPUT_CHANGES_RESET_TO_DEFAULTS = 'input_changes_button_reset_to_defaults'
Expand Down Expand Up @@ -152,6 +158,7 @@ def initDefaultUiState():
commandUIState.initValue(BIN_SCOOP_GROUP_ID, True, adsk.core.GroupCommandInput.classType())
commandUIState.initValue(BIN_TAB_FEATURES_GROUP_ID, True, adsk.core.GroupCommandInput.classType())
commandUIState.initValue(BIN_BASE_FEATURES_GROUP_ID, True, adsk.core.GroupCommandInput.classType())
commandUIState.initValue(BIN_PADDING_GROUP_ID, True, adsk.core.GroupCommandInput.classType())
commandUIState.initValue(USER_CHANGES_GROUP_ID, True, adsk.core.GroupCommandInput.classType())
commandUIState.initValue(PREVIEW_GROUP_ID, True, adsk.core.GroupCommandInput.classType())

Expand Down Expand Up @@ -191,6 +198,12 @@ def initDefaultUiState():
commandUIState.initValue(BIN_MAGNET_DIAMETER_INPUT, const.DIMENSION_MAGNET_CUTOUT_DIAMETER, adsk.core.ValueCommandInput.classType())
commandUIState.initValue(BIN_MAGNET_HEIGHT_INPUT, const.DIMENSION_MAGNET_CUTOUT_DEPTH, adsk.core.ValueCommandInput.classType())

commandUIState.initValue(BIN_HAS_PADDING_INPUT_ID, False, adsk.core.BoolValueCommandInput.classType())
commandUIState.initValue(BIN_PADDING_LEFT_INPUT_ID, 0, adsk.core.ValueCommandInput.classType())
commandUIState.initValue(BIN_PADDING_TOP_INPUT_ID, 0, adsk.core.ValueCommandInput.classType())
commandUIState.initValue(BIN_PADDING_RIGHT_INPUT_ID, 0, adsk.core.ValueCommandInput.classType())
commandUIState.initValue(BIN_PADDING_BOTTOM_INPUT_ID, 0, adsk.core.ValueCommandInput.classType())

commandCompartmentsTableUIState = []
recordedDefaults = configUtils.readJsonConfig(UI_INPUT_DEFAULTS_CONFIG_PATH)
if recordedDefaults is not None and 'static_ui' in recordedDefaults and 'compartments_table' in recordedDefaults:
Expand Down Expand Up @@ -331,15 +344,19 @@ def update_actual_compartment_unit_dimensions():
baseLength: float = commandUIState.getState(BIN_BASE_LENGTH_UNIT_INPUT_ID)
binWidth: float = commandUIState.getState(BIN_WIDTH_INPUT_ID)
binLength: float = commandUIState.getState(BIN_LENGTH_INPUT_ID)
binPaddingLeft: float = commandUIState.getState(BIN_PADDING_LEFT_INPUT_ID) if commandUIState.getState(BIN_HAS_PADDING_INPUT_ID) else 0
binPaddingTop: float = commandUIState.getState(BIN_PADDING_TOP_INPUT_ID) if commandUIState.getState(BIN_HAS_PADDING_INPUT_ID) else 0
binPaddingRight: float = commandUIState.getState(BIN_PADDING_RIGHT_INPUT_ID) if commandUIState.getState(BIN_HAS_PADDING_INPUT_ID) else 0
binPaddingBottom: float = commandUIState.getState(BIN_PADDING_BOTTOM_INPUT_ID) if commandUIState.getState(BIN_HAS_PADDING_INPUT_ID) else 0
gridWidth: int = commandUIState.getState(BIN_COMPARTMENTS_GRID_BASE_WIDTH_ID)
gridLength: int = commandUIState.getState(BIN_COMPARTMENTS_GRID_BASE_LENGTH_ID)
wallThickness: float = commandUIState.getState(BIN_WALL_THICKNESS_INPUT_ID)
xyClearance: float = commandUIState.getState(BIN_WITH_LIP_INPUT_ID)
try:
minCompartmentDimensionLimit = (const.BIN_CORNER_FILLET_RADIUS - wallThickness) * 2 * 10
cellWidth = round((baseWidth * binWidth - wallThickness * 2 - xyClearance * 2 - wallThickness * (gridWidth - 1)) / gridWidth * 10, 2)
cellWidth = round((baseWidth * binWidth + binPaddingLeft + binPaddingRight - wallThickness * 2 - xyClearance * 2 - wallThickness * (gridWidth - 1)) / gridWidth * 10, 2)
actualCompartmentDimensionsUiState.updateValue(BIN_COMPARTMENT_REAL_DIMENSIONS_WIDTH, formatString(f'Grid cell width: {cellWidth}mm', '' if cellWidth >= minCompartmentDimensionLimit else 'red'))
cellLength = round((baseLength * binLength - wallThickness * 2 - xyClearance * 2 - wallThickness * (gridLength - 1)) / gridLength * 10, 2)
cellLength = round((baseLength * binLength + binPaddingTop + binPaddingBottom - wallThickness * 2 - xyClearance * 2 - wallThickness * (gridLength - 1)) / gridLength * 10, 2)
actualCompartmentDimensionsUiState.updateValue(BIN_COMPARTMENT_REAL_DIMENSIONS_LENGTH, formatString(f'Grid cell length: {cellLength}mm', '' if cellLength >= minCompartmentDimensionLimit else 'red'))
except:
showErrorInMessageBox()
Expand All @@ -349,7 +366,11 @@ def update_actual_bin_dimensions():
try:
actualWidth = commandUIState.getState(BIN_BASE_WIDTH_UNIT_INPUT_ID) * commandUIState.getState(BIN_WIDTH_INPUT_ID) - const.BIN_XY_CLEARANCE * 2
actualLength = commandUIState.getState(BIN_BASE_LENGTH_UNIT_INPUT_ID) * commandUIState.getState(BIN_LENGTH_INPUT_ID) - const.BIN_XY_CLEARANCE * 2
actualHeight = commandUIState.getState(BIN_HEIGHT_UNIT_INPUT_ID) * commandUIState.getState(BIN_HEIGHT_INPUT_ID) + ((const.BIN_LIP_EXTRA_HEIGHT - const.BIN_LIP_TOP_RECESS_HEIGHT) if commandUIState.getState(BIN_WITH_LIP_INPUT_ID) else 0)
actualHeight = commandUIState.getState(BIN_HEIGHT_UNIT_INPUT_ID) * commandUIState.getState(BIN_HEIGHT_INPUT_ID) + ((const.BIN_LIP_EXTRA_HEIGHT - const.BIN_LIP_TOP_RECESS_HEIGHT) if commandUIState.getState(BIN_WITH_LIP_INPUT_ID) else 0)
if commandUIState.getState(BIN_HAS_PADDING_INPUT_ID):
actualWidth += commandUIState.getState(BIN_PADDING_LEFT_INPUT_ID) + commandUIState.getState(BIN_PADDING_RIGHT_INPUT_ID)
actualLength += commandUIState.getState(BIN_PADDING_TOP_INPUT_ID) + commandUIState.getState(BIN_PADDING_BOTTOM_INPUT_ID)

totalWidthValue = round(actualWidth * 10, 2)
totalLengthValue = round(actualLength * 10, 2)
totalHeightValue = round(actualHeight * 10, 2)
Expand Down Expand Up @@ -462,6 +483,11 @@ def is_all_input_valid(inputs: adsk.core.CommandInputs):
binCompartmentsTable: adsk.core.TableCommandInput = inputs.itemById(BIN_COMPARTMENTS_TABLE_ID)
compartmentsX: adsk.core.IntegerSpinnerCommandInput = inputs.itemById(BIN_COMPARTMENTS_GRID_BASE_WIDTH_ID)
compartmentsY: adsk.core.IntegerSpinnerCommandInput = inputs.itemById(BIN_COMPARTMENTS_GRID_BASE_LENGTH_ID)
has_padding: adsk.core.BoolValueCommandInput = inputs.itemById(BIN_HAS_PADDING_INPUT_ID)
padding_left: adsk.core.ValueCommandInput = inputs.itemById(BIN_PADDING_LEFT_INPUT_ID)
padding_top: adsk.core.ValueCommandInput = inputs.itemById(BIN_PADDING_TOP_INPUT_ID)
padding_right: adsk.core.ValueCommandInput = inputs.itemById(BIN_PADDING_RIGHT_INPUT_ID)
padding_bottom: adsk.core.ValueCommandInput = inputs.itemById(BIN_PADDING_BOTTOM_INPUT_ID)

result = result and base_width_unit.value > 1
result = result and base_length_unit.value > 1
Expand Down Expand Up @@ -654,6 +680,28 @@ def command_created(args: adsk.core.CommandCreatedEventArgs):
magnetHeightInput.isMinimumInclusive = True
commandUIState.registerCommandInput(magnetHeightInput)

paddingGroup = inputs.addGroupCommandInput(BIN_PADDING_GROUP_ID, 'Side padding')
paddingGroup.isExpanded = commandUIState.getState(BIN_PADDING_GROUP_ID)
commandUIState.registerCommandInput(paddingGroup)
hasPaddingCheckboxInput = paddingGroup.children.addBoolValueInput(BIN_HAS_PADDING_INPUT_ID, 'Add padding', True, '', commandUIState.getState(BIN_HAS_PADDING_INPUT_ID))
commandUIState.registerCommandInput(hasPaddingCheckboxInput)
paddingLeftInput = paddingGroup.children.addValueInput(BIN_PADDING_LEFT_INPUT_ID, 'Padding left', defaultLengthUnits, adsk.core.ValueInput.createByReal(commandUIState.getState(BIN_PADDING_LEFT_INPUT_ID)))
paddingLeftInput.minimumValue = 0
paddingLeftInput.isMinimumInclusive = True
commandUIState.registerCommandInput(paddingLeftInput)
paddingTopInput = paddingGroup.children.addValueInput(BIN_PADDING_TOP_INPUT_ID, 'Padding top', defaultLengthUnits, adsk.core.ValueInput.createByReal(commandUIState.getState(BIN_PADDING_TOP_INPUT_ID)))
paddingTopInput.minimumValue = 0
paddingTopInput.isMinimumInclusive = True
commandUIState.registerCommandInput(paddingTopInput)
paddingRightInput = paddingGroup.children.addValueInput(BIN_PADDING_RIGHT_INPUT_ID, 'Padding right', defaultLengthUnits, adsk.core.ValueInput.createByReal(commandUIState.getState(BIN_PADDING_RIGHT_INPUT_ID)))
paddingRightInput.minimumValue = 0
paddingRightInput.isMinimumInclusive = True
commandUIState.registerCommandInput(paddingRightInput)
paddingBottomInput = paddingGroup.children.addValueInput(BIN_PADDING_BOTTOM_INPUT_ID, 'Padding bottom', defaultLengthUnits, adsk.core.ValueInput.createByReal(commandUIState.getState(BIN_PADDING_BOTTOM_INPUT_ID)))
paddingBottomInput.minimumValue = 0
paddingBottomInput.isMinimumInclusive = True
commandUIState.registerCommandInput(paddingBottomInput)

userChangesGroup = inputs.addGroupCommandInput(USER_CHANGES_GROUP_ID, 'Changes')
userChangesGroup.isExpanded = commandUIState.getState(USER_CHANGES_GROUP_ID)
commandUIState.registerCommandInput(userChangesGroup)
Expand Down Expand Up @@ -882,6 +930,12 @@ def generateBin(args: adsk.core.CommandEventArgs):
binCompartmentsTable: adsk.core.TableCommandInput = inputs.itemById(BIN_COMPARTMENTS_TABLE_ID)
compartmentsX: adsk.core.IntegerSpinnerCommandInput = inputs.itemById(BIN_COMPARTMENTS_GRID_BASE_WIDTH_ID)
compartmentsY: adsk.core.IntegerSpinnerCommandInput = inputs.itemById(BIN_COMPARTMENTS_GRID_BASE_LENGTH_ID)
bin_padding: adsk.core.BoolValueCommandInput = inputs.itemById(BIN_HAS_PADDING_INPUT_ID)
bin_padding_left: adsk.core.ValueCommandInput = inputs.itemById(BIN_PADDING_LEFT_INPUT_ID)
bin_padding_top: adsk.core.ValueCommandInput = inputs.itemById(BIN_PADDING_TOP_INPUT_ID)
bin_padding_right: adsk.core.ValueCommandInput = inputs.itemById(BIN_PADDING_RIGHT_INPUT_ID)
bin_padding_bottom: adsk.core.ValueCommandInput = inputs.itemById(BIN_PADDING_BOTTOM_INPUT_ID)


isHollow = binTypeDropdownInput.selectedItem.name == BIN_TYPE_HOLLOW
isSolid = binTypeDropdownInput.selectedItem.name == BIN_TYPE_SOLID
Expand Down Expand Up @@ -923,6 +977,12 @@ def generateBin(args: adsk.core.CommandEventArgs):
baseGeneratorInput.screwHolesDiameter = bin_screw_hole_diameter.value
baseGeneratorInput.magnetCutoutsDiameter = bin_magnet_cutout_diameter.value
baseGeneratorInput.magnetCutoutsDepth = bin_magnet_cutout_depth.value
# Needed to calculate base clearance
baseGeneratorInput.hasPadding = bin_padding.value
baseGeneratorInput.paddingLeft = bin_padding_left.value
baseGeneratorInput.paddingTop = bin_padding_top.value
baseGeneratorInput.paddingRight = bin_padding_right.value
baseGeneratorInput.paddingBottom = bin_padding_bottom.value

baseBodies: list[adsk.fusion.BRepBody]
if bin_generate_base.value:
Expand Down Expand Up @@ -956,6 +1016,11 @@ def generateBin(args: adsk.core.CommandEventArgs):
binBodyInput.tabOverhangAngle = binTabAngle.value
binBodyInput.compartmentsByX = compartmentsX.value
binBodyInput.compartmentsByY = compartmentsY.value
binBodyInput.hasPadding = bin_padding.value
binBodyInput.paddingLeft = bin_padding_left.value
binBodyInput.paddingTop = bin_padding_top.value
binBodyInput.paddingRight = bin_padding_right.value
binBodyInput.paddingBottom = bin_padding_bottom.value

if binCompartmentGridTypeDropdownInput.selectedItem.name == BIN_COMPARTMENTS_GRID_TYPE_UNIFORM:
binBodyInput.compartments = uniformCompartments(binBodyInput.compartmentsByX, binBodyInput.compartmentsByY)
Expand Down
18 changes: 13 additions & 5 deletions lib/gridfinityUtils/baseGenerator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,8 +403,8 @@ def cutBaseClearance(
basesYCount,
targetComponent: adsk.fusion.Component,
):
actual_base_width = baseConfiguration.baseWidth * basesXCount - baseConfiguration.xyClearance * 2
actual_base_length = baseConfiguration.baseLength * basesYCount - baseConfiguration.xyClearance * 2
actual_base_width = baseConfiguration.baseWidth * basesXCount + baseConfiguration.paddingLeft + baseConfiguration.paddingRight - baseConfiguration.xyClearance * 2
actual_base_length = baseConfiguration.baseLength * basesYCount + baseConfiguration.paddingTop + baseConfiguration.paddingBottom - baseConfiguration.xyClearance * 2
features = targetComponent.features
baseConstructionPlaneInput: adsk.fusion.ConstructionPlaneInput = targetComponent.constructionPlanes.createInput()
baseConstructionPlaneInput.setByOffset(targetComponent.xYConstructionPlane, adsk.core.ValueInput.createByReal(baseConfiguration.originPoint.z))
Expand All @@ -416,8 +416,8 @@ def cutBaseClearance(
actual_base_width,
actual_base_length,
adsk.core.Point3D.create(
baseConfiguration.originPoint.x + baseConfiguration.xyClearance,
baseConfiguration.originPoint.y + baseConfiguration.xyClearance,
baseConfiguration.originPoint.x + baseConfiguration.xyClearance - baseConfiguration.paddingLeft,
baseConfiguration.originPoint.y + baseConfiguration.xyClearance - baseConfiguration.paddingBottom,
baseConfiguration.originPoint.z,
),
baseClearanceCutSketch
Expand All @@ -438,7 +438,15 @@ def cutBaseClearance(
geometricConstraints.addEqual(fillet3, fillet4)
sketchDimensions.addRadialDimension(fillet1, fillet1.startSketchPoint.geometry)

baseClearanceCutSketch.offset(commonUtils.objectCollectionFromList([fillet1, fillet2, fillet3, fillet4, side1, side2, side3, side4]), baseConfiguration.originPoint, 1)
baseClearanceCutSketch.offset(
commonUtils.objectCollectionFromList([fillet1, fillet2, fillet3, fillet4, side1, side2, side3, side4]),
adsk.core.Point3D.create(
baseConfiguration.originPoint.x - baseConfiguration.paddingLeft,
baseConfiguration.originPoint.y - baseConfiguration.paddingBottom,
baseConfiguration.originPoint.z,
),
1
)

cuttingProfile = min(list(baseClearanceCutSketch.profiles), key=lambda x: x.boundingBox.minPoint.x)
clearanceCutExtrudeInput = features.extrudeFeatures.createInput(
Expand Down
47 changes: 46 additions & 1 deletion lib/gridfinityUtils/baseGeneratorInput.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ def __init__(self):
self.magnetCutoutsDiameter = DIMENSION_MAGNET_CUTOUT_DIAMETER
self.magnetCutoutsDepth = DIMENSION_MAGNET_CUTOUT_DEPTH
self.cornerFilletRadius = BIN_CORNER_FILLET_RADIUS
self.hasPadding = False
self.paddingLeft = 0
self.paddingTop = 0
self.paddingRight = 0
self.paddingBottom = 0

@property
def originPoint(self) -> adsk.core.Point3D:
Expand Down Expand Up @@ -98,4 +103,44 @@ def magnetCutoutsDepth(self) -> float:

@magnetCutoutsDepth.setter
def magnetCutoutsDepth(self, value: float):
self._magnetCutoutsDepth = value
self._magnetCutoutsDepth = value

@property
def hasPadding(self) -> bool:
return self._hasPadding

@hasPadding.setter
def hasPadding(self, value: bool):
self._hasPadding = value

@property
def paddingLeft(self) -> float:
return self._paddingLeft if self._hasPadding else 0

@paddingLeft.setter
def paddingLeft(self, value: float):
self._paddingLeft = value

@property
def paddingTop(self) -> float:
return self._paddingTop if self._hasPadding else 0

@paddingTop.setter
def paddingTop(self, value: float):
self._paddingTop = value

@property
def paddingRight(self) -> float:
return self._paddingRight if self._hasPadding else 0

@paddingRight.setter
def paddingRight(self, value: float):
self._paddingRight = value

@property
def paddingBottom(self) -> float:
return self._paddingBottom if self._hasPadding else 0

@paddingBottom.setter
def paddingBottom(self, value: float):
self._paddingBottom = value
8 changes: 4 additions & 4 deletions lib/gridfinityUtils/baseplateGeneratorInput.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,31 +115,31 @@ def hasPadding(self, value: bool):

@property
def paddingLeft(self) -> float:
return self._paddingLeft
return self._paddingLeft if self._hasPadding else 0

@paddingLeft.setter
def paddingLeft(self, value: float):
self._paddingLeft = value

@property
def paddingTop(self) -> float:
return self._paddingTop
return self._paddingTop if self._hasPadding else 0

@paddingTop.setter
def paddingTop(self, value: float):
self._paddingTop = value

@property
def paddingRight(self) -> float:
return self._paddingRight
return self._paddingRight if self._hasPadding else 0

@paddingRight.setter
def paddingRight(self, value: float):
self._paddingRight = value

@property
def paddingBottom(self) -> float:
return self._paddingBottom
return self._paddingBottom if self._hasPadding else 0

@paddingBottom.setter
def paddingBottom(self, value: float):
Expand Down
Loading