Skip to content

Commit

Permalink
Merge branch 'main' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
ctlee authored Nov 13, 2023
2 parents e3ccc6d + 726de48 commit 56ebb81
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 4 deletions.
1 change: 0 additions & 1 deletion .github/scripts/blender_pyversion_lookup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"2.93": '3.9',
"3.3": "3.10",
"3.6": "3.10",

}

if __name__ == "__main__":
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.7-alpha
2.0.7
24 changes: 23 additions & 1 deletion docs/src/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,28 @@
Changelog
#########

******************
2.0.7 (08-17-2021)
******************

This is a maintenance release which improves compatibility with ``blender`` add-on development ideals along with some fixes.

**New Features**:

- CI and packaging using Github Actions
- Make runtime errors more informative
- Preliminary support for exporting to COMSOL
- BlendGAMer support for Blender 2.93LTS

**Fixes**:

- Normal smooth no longer applies on the boundaries of a mesh
- Resolves an issue where computing normals fails due to zero-area faces

**Other**:

- Update versions of dependencies (Eigen, Tetgen, Pybind11, Google-Test)

******************
2.0.6 (02-25-2020)
******************
Expand Down Expand Up @@ -87,4 +109,4 @@ This is a maintenance release which improves compatibility with ``blender`` add-

**New Features**:

- Stable beta release! Compilation is supported on major operating systems (:pr:`16`).
- Stable beta release! Compilation is supported on major operating systems (:pr:`16`).
15 changes: 15 additions & 0 deletions pygamer/src/pygamer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,21 @@ PYBIND11_MODULE(pygamer, pygamer) {
)delim"
);

pygamer.def("readPDB_distgrid", &readPDB_distgrid,
py::arg("filename"),
py::arg("radius") = 1.4,
R"delim(
Compute the Connolly surface using a distance grid based strategy
Args:
filename (:py:class:`str`): PDB file to read.
radius (:py:class:`float`): Radius in Angstroms of ball to roll over surface.
Returns:
:py:class:`surfacemesh.SurfaceMesh`: Meshed object.
)delim"
);

pygamer.def("readPDB_gauss", &readPDB_gauss,
py::arg("filename"),
py::arg("blobbyness") = -0.2,
Expand Down
2 changes: 1 addition & 1 deletion tools/blendgamer/src/colormap.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
"PRGN": plt.cm.PRGn,
}


def curveToData(crv, context):
"""
Helper function to take a curvature object and return smoothed data.
Expand Down Expand Up @@ -218,6 +217,7 @@ def dataToVertexColor(crv, context, showplot=False, saveplot=False):

# Add axis for colorbar and plot it
ax = fig.add_axes([0.75, 0.05, 0.05, 0.9])

cb = mpl.colorbar.Colorbar(
ax, cmap=curvature_map, norm=norm, orientation="vertical"
)
Expand Down

0 comments on commit 56ebb81

Please sign in to comment.