Merge pull request #2222 from RubioJr9/edit_bbox_refactor

Closes #1497 and closes #2051

Author: dcwhite

src/Core/Datatypes/CMakeLists.txt

@@ -41,6 +41,7 @@ SET(Core_Datatypes_SRCS
   SparseRowMatrixFromMap.cc
   String.cc
   MetadataObject.cc
+  Feedback.cc
 )
 
 SET(Core_Datatypes_HEADERS
@@ -72,7 +73,8 @@ SET(Core_Datatypes_HEADERS
   SparseRowMatrix.h
   SparseRowMatrixFromMap.h
   String.h
-)
+  Feedback.h
+  )
 
 SCIRUN_ADD_LIBRARY(Core_Datatypes
   ${Core_Datatypes_HEADERS}

src/Core/Datatypes/Color.cc

@@ -96,9 +96,3 @@ std::ostream& SCIRun::Core::Datatypes::operator<<(std::ostream& out, const Color
   out << "Color(" << color.r() << "," << color.g() << "," << color.b() << ")";
   return out;
 }
-
-bool ViewSceneFeedback::matchesWithModuleId(const std::string& modId) const
-{
-  auto toMatch = GeometryObject::delimiter + modId + GeometryObject::delimiter;
-  return selectionName.find(toMatch) != std::string::npos;
-}

src/Core/Datatypes/Color.h

@@ -79,26 +79,6 @@ namespace Datatypes {
   typedef boost::shared_ptr<ColorRGB> ColorRGBHandle;
 
   SCISHARE std::ostream& operator<<(std::ostream& out, const ColorRGB& color);
-
-  struct SCISHARE ViewSceneFeedback : ModuleFeedback
-  {
-    Geometry::Transform transform;
-    std::string selectionName;
-    std::tuple<int,int> windowSize;
-
-    bool matchesWithModuleId(const std::string& modId) const;
-  };
-
-  struct SCISHARE MeshComponentSelectionFeedback : ModuleFeedback
-  {
-    MeshComponentSelectionFeedback() {}
-    MeshComponentSelectionFeedback(const std::string& mod, const std::string& comp, bool sel) :
-      moduleId(mod), component(comp), selected(sel) {}
-    std::string moduleId;
-    std::string component;
-    bool selected {false};
-  };
-
 }}}
 
 

src/Core/Datatypes/Feedback.cc

@@ -0,0 +1,37 @@
+/*
+   For more information, please see: http://software.sci.utah.edu
+
+   The MIT License
+
+   Copyright (c) 2020 Scientific Computing and Imaging Institute,
+   University of Utah.
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+*/
+
+
+#include <Core/Datatypes/Feedback.h>
+
+using namespace SCIRun::Core::Datatypes;
+
+bool ViewSceneFeedback::matchesWithModuleId(const std::string &modId) const
+{
+  auto toMatch = GeometryObject::delimiter + modId + GeometryObject::delimiter;
+  return selectionName.find(toMatch) != std::string::npos;
+}

src/Core/Datatypes/Feedback.h

@@ -0,0 +1,90 @@
+/*
+   For more information, please see: http://software.sci.utah.edu
+
+   The MIT License
+
+   Copyright (c) 2020 Scientific Computing and Imaging Institute,
+   University of Utah.
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+*/
+
+
+#ifndef CORE_DATATYPES_FEEDBACK_H
+#define CORE_DATATYPES_FEEDBACK_H
+
+#include <iosfwd>
+#include <Core/Datatypes/Datatype.h>
+#include <Core/Datatypes/Geometry.h>
+#include <Core/GeometryPrimitives/Transform.h>
+#include <Core/Datatypes/share.h>
+
+namespace SCIRun {
+namespace Core {
+namespace Datatypes {
+// These will give different types of widget movement through ViewScene.
+// To use rotation and scaling, an origin point must be given.
+enum WidgetMovement
+{
+  NONE,
+  TRANSLATE,
+  ROTATE,
+  SCALE,
+  TRANSLATE_AXIS,
+  TRANSLATE_AXIS_HALF,
+  TRANSLATE_AXIS_REVERSE,
+  SCALE_UNIDIRECTIONAL,
+  SCALE_AXIS,
+  SCALE_AXIS_HALF,
+  SCALE_AXIS_UNIDIRECTIONAL,
+};
+
+struct EnumClassHash
+{
+  template <typename T> std::size_t operator()(T t) const
+  {
+    return static_cast<std::size_t>(t);
+  }
+};
+
+enum class MouseButton { NONE = 0, LEFT, MIDDLE, RIGHT, STATE_COUNT };
+
+struct SCISHARE ViewSceneFeedback : ModuleFeedback
+{
+  Geometry::Transform transform;
+  MouseButton buttonClicked;
+  WidgetMovement movementType;
+  std::string selectionName;
+  std::tuple<int,int> windowSize;
+
+  bool matchesWithModuleId(const std::string& modId) const;
+};
+
+struct SCISHARE MeshComponentSelectionFeedback : ModuleFeedback
+{
+  MeshComponentSelectionFeedback() {}
+  MeshComponentSelectionFeedback(const std::string& mod, const std::string& comp, bool sel) :
+    moduleId(mod), component(comp), selected(sel) {}
+  std::string moduleId;
+  std::string component;
+  bool selected {false};
+};
+}}}
+
+#endif

src/Core/GeometryPrimitives/Tests/TransformTests.cc

@@ -183,7 +183,7 @@ TEST(TransformTests, LoadIdentity)
 TEST(TransformTests, GetRotation)
 {
   Transform t(testPos, testRot[0], testRot[1], testRot[2]);
-  auto rot = t.get_rotation();
+  auto rot = t.get_transformation_vectors();
   for(int i = 0; i < 3; ++i)
     EXPECT_EQ(testRot[i], rot[i]);
 }
@@ -195,11 +195,27 @@ TEST(TransformTests, GetPosition)
   EXPECT_EQ(testPos, pos);
 }
 
+TEST(TransformTests, SetPositionDouble)
+{
+  Transform t;
+  t.set_translation(2.3);
+  auto pos = t.get_translation();
+  EXPECT_EQ(Point(2.3, 2.3, 2.3), pos);
+}
+
+TEST(TransformTests, SetPositionPoint)
+{
+  Transform t;
+  t.set_translation(testPos);
+  auto pos = t.get_translation();
+  EXPECT_EQ(testPos, pos);
+}
+
 TEST(TransformTests, Orthogonalize)
 {
   Transform t(testPos, testRot[0], testRot[1], testRot[2]);
   t.orthogonalize();
-  auto rot = t.get_rotation();
+  auto rot = t.get_transformation_vectors();
 
   EXPECT_NEAR(0.0, Dot(rot[0], rot[1]), errorOfMargin);
   EXPECT_NEAR(0.0, Dot(rot[0], rot[2]), errorOfMargin);
@@ -212,7 +228,7 @@ TEST(TransformTests, Orthonormalize)
 {
   Transform t(testPos, testRot[0], testRot[1], testRot[2]);
   t.orthonormalize();
-  auto rot = t.get_rotation();
+  auto rot = t.get_transformation_vectors();
 
   EXPECT_NEAR(0.0, Dot(rot[0], rot[1]), errorOfMargin);
   EXPECT_NEAR(0.0, Dot(rot[0], rot[2]), errorOfMargin);
@@ -254,7 +270,7 @@ TEST(TransformTests, MultplicationTransform)
   Transform t1(testPos, testRot[0], testRot[1], testRot[2]);
   Transform t2(Point(0,0,0), Vector(1,0,0), Vector(0,2,0), Vector(0,0,3));
   Transform t3 = t2 * t1;
-  auto vecs = t3.get_rotation();
+  auto vecs = t3.get_transformation_vectors();
   for(int i = 0; i < 3; ++i)
     EXPECT_EQ(vecs[i], Vector(testRot[i].x(), testRot[i].y() * 2, testRot[i].z() * 3));
 }

src/Core/GeometryPrimitives/Tests/VectorTests.cc

@@ -47,3 +47,10 @@ TEST(VectorTests, CanScale)
   EXPECT_EQ(Vector(2,2,2), p2);
   EXPECT_EQ(Vector(2,2,2), 2 * p);
 }
+
+TEST(VectorTests, Norm)
+{
+  const static auto epsilon = 2e-12;
+  Vector p(1,1,1);
+  EXPECT_NEAR(std::sqrt(3), p.norm(), epsilon);
+}

src/Core/GeometryPrimitives/Transform.cc

@@ -767,7 +767,7 @@ void Transform::orthonormalize()
 
 void Transform::gram_schmidt(bool normalize)
 {
-  auto vecs = get_rotation();
+  auto vecs = get_transformation_vectors();
   double vals[3];
   // Get eigenvalues and normalize eigenvectors
   for(int i = 0; i < 3; i++)
@@ -946,21 +946,38 @@ Transform::operator=(const Transform& copy)
   return *this;
 }
 
-std::vector<Vector> Transform::get_rotation() const
+std::vector<Vector> Transform::get_transformation_vectors() const
 {
   std::vector<Vector> column_vectors(3);
   for(int i = 0; i < 3; i++)
-  {
     column_vectors[i] = Vector(mat[0][i], mat[1][i], mat[2][i]);
-  }
   return column_vectors;
 }
 
+std::vector<Vector> Transform::get_rotation_vectors() const
+{  auto vecs = get_transformation_vectors();
+  for (int i = 0; i < 3; ++i)
+    vecs[i].normalize();
+  return vecs;
+}
+
 Point Transform::get_translation() const
 {
   return Point(mat[0][3], mat[1][3], mat[2][3]);
 }
 
+void Transform::set_translation(double d)
+{
+  for (int i = 0; i < 3; ++i)
+    this->set_mat_val(i, 3, d);
+}
+
+void Transform::set_translation(const Point& v)
+{
+  for (int i = 0; i < 3; ++i)
+    this->set_mat_val(i, 3, v[i]);
+}
+
 Point
 SCIRun::Core::Geometry::operator*(const Transform &t, const Point &d)
 {

src/Core/GeometryPrimitives/Transform.h

@@ -74,6 +74,8 @@ namespace SCIRun {
       public:
         double get_imat_val(int i, int j) const { return imat[i][j]; }
         void set_imat_val(int i, int j, double val) { imat[i][j] = val; }
+        void set_translation(double d);
+        void set_translation(const Point& v);
 
         static const Transform& Identity();
 
@@ -157,8 +159,9 @@ namespace SCIRun {
 
         /// Persistent I/O.
         static PersistentTypeID type_id;
+        std::vector<Vector> get_rotation_vectors() const;
+        std::vector<Vector> get_transformation_vectors() const;
         void io(Piostream &stream) override;
-        std::vector<Vector> get_rotation() const;
         Point get_translation() const;
       };
 

src/Core/GeometryPrimitives/Vector.h

@@ -108,6 +108,7 @@ class Vector
     inline Vector operator-(const Vector&) const;
     inline Vector operator-(const Point&) const;
     inline Vector& operator-=(const Vector&);
+    inline double norm() const;
     inline double normalize();
     inline double safe_normalize();
     inline Vector getArbitraryTangent() const;
@@ -236,10 +237,15 @@ inline Vector Max(const Vector &v1, const Vector &v2)
 
 SCISHARE void Pio( Piostream&, Vector& );
 
+inline double Vector::norm() const
+{
+  return std::sqrt(d_[0]*d_[0] + d_[1]*d_[1] + d_[2]*d_[2]);
+}
+
 inline
   double Vector::safe_normalize()
 {
-  double l = std::sqrt(d_[0]*d_[0] + d_[1]*d_[1] + d_[2]*d_[2]);
+  double l = norm();
   if (l > 0.0)
   {
     d_[0]/=l;
@@ -454,7 +460,7 @@ inline double Vector::w() const
 inline
 double Vector::normalize()
 {
-  double l=sqrt(d_[0]*d_[0] + d_[1]*d_[1] + d_[2]*d_[2]);
+  double l = norm();
   if (l > 0.0)
   {
     d_[0]/=l;