grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2024-12-29 16:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

screws fix, arc_copies doc fix, sortidx bugfix

Browse source
This commit is contained in:
Adrian Mariano 2022-12-10 09:49:04 -05:00
parent e1a35b213e
commit a15e3e1d43
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
comparisons.scad
View file

@ -728,7 +728,6 @@ function sort(list, idx=undef) =
// idxs3 = sortidx(lst, idx=[1,3]); // Returns: [3,0,2,1] // idxs3 = sortidx(lst, idx=[1,3]); // Returns: [3,0,2,1]
function sortidx(list, idx=undef) = function sortidx(list, idx=undef) =
assert(is_list(list)||is_string(list), "Invalid list." ) assert(is_list(list)||is_string(list), "Invalid list." )
!is_list(list) || len(list)<=1 ? list :
is_homogeneous(list,1) is_homogeneous(list,1)
? let( ? let(
size = list_shape(list[0]), size = list_shape(list[0]),

2
distributors.scad
View file

@ -775,7 +775,7 @@ module zrot_copies(rots=[], cp=[0,0,0], n, sa=0, r, d, subrot=true)
// d = diameter of circle. (Default: 2) // d = diameter of circle. (Default: 2)
// dx = diameter of ellipse on X axis. Used instead of d. // dx = diameter of ellipse on X axis. Used instead of d.
// dy = diameter of ellipse on Y axis. Used instead of d. // dy = diameter of ellipse on Y axis. Used instead of d.
// rot = whether to rotate the copied children. (Default: false) // rot = whether to rotate the copied children. (Default: true)
// sa = starting angle. (Default: 0.0) // sa = starting angle. (Default: 0.0)
// ea = ending angle. Will distribute copies CCW from sa to ea. (Default: 360.0) // ea = ending angle. Will distribute copies CCW from sa to ea. (Default: 360.0)
// //

5
screws.scad
View file

@ -925,11 +925,12 @@ module screw_hole(spec, head, thread, oversize, hole_oversize, head_oversize,
parse_int(substr(tolerance,1)) parse_int(substr(tolerance,1))
: assert(false,str("Unknown tolerance ",tolerance, " for clearance hole")); : assert(false,str("Unknown tolerance ",tolerance, " for clearance hole"));
tol_table = struct_val(screwspec,"system")=="UTS" ? UTS_clearance[tol_ind] : ISO_clearance[tol_ind]; tol_table = struct_val(screwspec,"system")=="UTS" ? UTS_clearance[tol_ind] : ISO_clearance[tol_ind];
tol_gap = lookup(_nominal_diam(screwspec), tol_table);
// If we got here, hole_oversize is undefined and oversize is undefined // If we got here, hole_oversize is undefined and oversize is undefined
hole_oversize = downcase(tolerance)=="tap" ? -pitch hole_oversize = downcase(tolerance)=="tap" ? -pitch
: downcase(tolerance)=="self tap" ? -pitch*lookup(pitch,[[1,0.72],[1.5,.6]]) : downcase(tolerance)=="self tap" ? -pitch*lookup(pitch,[[1,0.72],[1.5,.6]])
: lookup(_nominal_diam(screwspec), tol_table); : tol_gap;
head_oversize = first_defined([head_oversize,hole_oversize]); head_oversize = default(head_oversize, tol_gap);
default_tag("remove") default_tag("remove")
screw(spec,head=head,thread=0,shaft_undersize=-hole_oversize, head_undersize=-head_oversize, screw(spec,head=head,thread=0,shaft_undersize=-hole_oversize, head_undersize=-head_oversize,
length=length,l=l,thread_len=thread_len, _counterbore=counterbore, length=length,l=l,thread_len=thread_len, _counterbore=counterbore,

4
tests/test_comparisons.scad
View file

@ -16,6 +16,10 @@ test_sort();
module test_sortidx() { module test_sortidx() {
assert(sortidx([3]) == [0]);
assert(sortidx([]) == []);
assert(sortidx([[5,6,7]])==[0]);
assert(sortidx(["abc"]) == [0]);
lst1 = ["da","bax","eaw","cav"]; lst1 = ["da","bax","eaw","cav"];
assert(sortidx(lst1) == [1,3,0,2]); assert(sortidx(lst1) == [1,3,0,2]);
lst5 = [3,5,1,7]; lst5 = [3,5,1,7];