Skip to content

Can now generate square cornered structures without triangular edges (force_python only) #5

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
mseryn wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Can now generate square cornered structures without triangular edges (force_python only) #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d60045c
Bug fix, line 138 - file generated downward spikes due to a percieved…
mseryn Oct 27, 2015
c2dcc3a
Made changes to allow for optional generation using square corners ra…
mseryn Oct 27, 2015
6456a7b
Fixed merge conflicts
mseryn Oct 27, 2015
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
80 changes: 61 additions & 19 deletions stl_tools/numpy2stl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
#***
#* Copyright 2015 thern (github)
#* Copyright 2015 Melanie Cornelius
#*
#* Licensed under the Apache License, Version 2.0 (the "License");
#* you may not use this file except in compliance with the License.
#* You may obtain a copy of the License at
#*
#* http://www.apache.org/licenses/LICENSE-2.0
#*
#* Unless required by applicable law or agreed to in writing, software
#* distributed under the License is distributed on an "AS IS" BASIS,
#* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#* See the License for the specific language governing permissions and
#* limitations under the License.*
#*
#*
#* Modifications made by Melanie Cornelius (nee Dooley) to include option
#* for square corner generation using force_python option
#* as well as to fix a bug in which vertical spikes were formed due to a
#* percieved typo error on (what is now) line 165.
#***

import struct
import numpy as np
from itertools import product
Expand Down Expand Up @@ -67,7 +90,8 @@ def numpy2stl(A, fn, scale=0.1, mask_val=None, ascii=False,
solid=False,
rotate=True,
min_thickness_percent=0.1,
force_python=False):
force_python=False,
square_corners=False):
"""
Reads a numpy array, and outputs an STL file

Expand Down Expand Up @@ -97,6 +121,8 @@ def numpy2stl(A, fn, scale=0.1, mask_val=None, ascii=False,
point to bottom face), as a percentage of
the thickness of the model computed up to
that point.
square_corners (bool) - When using force_python, generates square-corner
polygons as opposed to triangular polygons
Returns: (None)
"""

Expand Down Expand Up @@ -134,24 +160,40 @@ def numpy2stl(A, fn, scale=0.1, mask_val=None, ascii=False,

n1, n2 = np.zeros(3), np.zeros(3)

if (this_pt[-1] > mask_val and top_right[-1] > mask_val and
bottom_left[-1] > mask_val):

facet = np.concatenate([n1, top_right, this_pt, bottom_right])
mask[i, k] = 1
mask[i, k + 1] = 1
mask[i + 1, k] = 1
facets.append(facet)

if (this_pt[-1] > mask_val and bottom_right[-1] > mask_val and
bottom_left[-1] > mask_val):

facet = np.concatenate(
[n2, bottom_right, this_pt, bottom_left])
facets.append(facet)
mask[i, k] = 1
mask[i + 1, k + 1] = 1
mask[i + 1, k] = 1
if not square_corners:
if (this_pt[-1] > mask_val and top_right[-1] > mask_val and
bottom_right[-1] > mask_val):

facet = np.concatenate([n1, top_right, this_pt, bottom_right])
mask[i, k] = 1
mask[i, k + 1] = 1
mask[i + 1, k] = 1
facets.append(facet)

if (this_pt[-1] > mask_val and bottom_right[-1] > mask_val and
bottom_left[-1] > mask_val):

facet = np.concatenate(
[n2, bottom_right, this_pt, bottom_left])
facets.append(facet)
mask[i, k] = 1
mask[i + 1, k + 1] = 1
mask[i + 1, k] = 1

else:
# Changes made by Melanie Cornelius (mseryn)
if (this_pt[-1] > mask_val and top_right[-1] > mask_val and
bottom_right[-1] > mask_val and bottom_left[-1] > mask_val):

mask[i, k] = 1
mask[i, k + 1] = 1
mask[i + 1, k] = 1
mask[i + 1, k + 1] = 1
facet = np.concatenate([n1, top_right, this_pt, bottom_right])
facets.append(facet)

facet = np.concatenate([n2, bottom_right, this_pt, bottom_left])
facets.append(facet)
facets = np.array(facets)

if solid:
Expand Down