Add ability to load ParticleShapeStatistics from ShapeWorks Project via python

Author: akenmorris

Libs/Particles/ParticleShapeStatistics.cpp

@@ -476,7 +476,10 @@ int ParticleShapeStatistics::read_point_files(const std::string& s) {
 }
 
 //---------------------------------------------------------------------------
-ParticleShapeStatistics::ParticleShapeStatistics(std::shared_ptr<Project> project) {
+ParticleShapeStatistics::ParticleShapeStatistics(std::shared_ptr<Project> project) { load_from_project(project); }
+
+//---------------------------------------------------------------------------
+void ParticleShapeStatistics::load_from_project(std::shared_ptr<Project> project) {
   std::vector<Eigen::VectorXd> points;
   std::vector<int> groups;
   for (auto& s : project->get_subjects()) {
@@ -566,6 +569,13 @@ int ParticleShapeStatistics::do_pca(ParticleSystemEvaluation ParticleSystemEvalu
   return do_pca(particlePoints, domainsPerShape);
 }
 
+//---------------------------------------------------------------------------
+int ParticleShapeStatistics::do_pca(std::shared_ptr<Project> project) {
+  load_from_project(project);
+  compute_modes();
+  return 0;
+}
+
 //---------------------------------------------------------------------------
 int ParticleShapeStatistics::compute_modes() {
   SW_DEBUG("computing PCA modes");

Libs/Particles/ParticleShapeStatistics.h

@@ -19,13 +19,15 @@ class Project;
 class ParticleShapeStatistics {
  public:
   ParticleShapeStatistics(){};
-  ParticleShapeStatistics(std::shared_ptr<Project> project);
+  explicit ParticleShapeStatistics(std::shared_ptr<Project> project);
   ~ParticleShapeStatistics(){};
 
   int do_pca(std::vector<std::vector<Point>> global_pts, int domainsPerShape = 1);
 
   int do_pca(ParticleSystemEvaluation particleSystem, int domainsPerShape = 1);
 
+  int do_pca(std::shared_ptr<Project> project);
+
   //! Loads a set of point files and pre-computes some statistics.
   int import_points(std::vector<Eigen::VectorXd> points, std::vector<int> group_ids);
 
@@ -138,6 +140,8 @@ class ParticleShapeStatistics {
   //! Set the meshes for each sample (used for some evaluation metrics)
   void set_meshes(const std::vector<Mesh>& meshes) { meshes_ = meshes; }
 
+  void load_from_project(std::shared_ptr<Project> project);
+
  private:
   unsigned int num_samples_group1_;
   unsigned int num_samples_group2_;

Libs/Python/ShapeworksPython.cpp

@@ -1281,9 +1281,14 @@ PYBIND11_MODULE(shapeworks_py, m) {
 
       .def(py::init<>())
 
+      // int do_pca(ParticleSystemEvaluation particleSystem, int domainsPerShape = 1);
       .def("PCA", py::overload_cast<ParticleSystemEvaluation, int>(&ParticleShapeStatistics::do_pca),
            "calculates the eigen values and eigen vectors of the data", "particleSystem"_a, "domainsPerShape"_a = 1)
 
+      // int do_pca(std::shared_ptr<Project> project);
+      .def("PCA", py::overload_cast<std::shared_ptr<Project>>(&ParticleShapeStatistics::do_pca),
+           "calculates the eigen values and eigen vectors of the data from a project", "project"_a)
+
       .def("principalComponentProjections", &ParticleShapeStatistics::principal_component_projections,
            "projects the original data on the calculated principal components")