Merge branch 'master' of github.com:nimblephysics/nimblephysics

keenon · Oct 25, 2024 · 2e771a9 · 2e771a9
2 parents 2bd0790 + 09e6bc1
commit 2e771a9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-0.10.49
+0.10.50
diff --git a/dart/biomechanics/SubjectOnDisk.cpp b/dart/biomechanics/SubjectOnDisk.cpp
@@ -3225,6 +3225,11 @@ void SubjectOnDiskTrial::setName(const std::string& name)
   mName = name;
 }
 
+const std::string& SubjectOnDiskTrial::getName() const
+{
+  return mName;
+}
+
 void SubjectOnDiskTrial::setTimestep(s_t timestep)
 {
   mTimestep = timestep;

diff --git a/dart/biomechanics/SubjectOnDisk.hpp b/dart/biomechanics/SubjectOnDisk.hpp
@@ -328,6 +328,7 @@ class SubjectOnDiskTrial
 public:
   SubjectOnDiskTrial();
   void setName(const std::string& name);
+  const std::string& getName() const;
   void setTimestep(s_t timestep);
   s_t getTimestep();
   void setTrialLength(int length);

diff --git a/python/_nimblephysics/biomechanics/SubjectOnDisk.cpp b/python/_nimblephysics/biomechanics/SubjectOnDisk.cpp
@@ -876,6 +876,9 @@ Note that these are specified in the local body frame, acting on the body at its
                 "setName",
                 &dart::biomechanics::SubjectOnDiskTrial::setName,
                 ::py::arg("name"))
+            .def(
+                "getName",
+                &dart::biomechanics::SubjectOnDiskTrial::getName)
             .def(
                 "setTimestep",
                 &dart::biomechanics::SubjectOnDiskTrial::setTimestep,