Merge branch 'master' into largeMeshPreformace

Author: jessdtate

Superbuild/CMakeLists.txt

@@ -37,3 +37,4 @@ ENDIF()
 PROJECT(Superbuild)
 
 INCLUDE(${CMAKE_SOURCE_DIR}/Superbuild.cmake)
+

src/Core/GeometryPrimitives/Vector.cc

@@ -112,7 +112,7 @@ Vector::safe_normal() const
    return v;
 }
 
-std::istream& operator>>( std::istream& is, Vector& v)
+std::istream& SCIRun::Core::Geometry::operator>>( std::istream& is, Vector& v)
 {
   double x, y, z;
   char st;
@@ -194,3 +194,11 @@ const TypeDescription* SCIRun::Core::Geometry::get_type_description(Vector*)
   }
   return td;
 }
+
+Vector SCIRun::Core::Geometry::vectorFromString(const std::string& str)
+{
+  std::istringstream istr(str);
+  Vector v;
+  istr >> v;
+  return v;
+}

src/Core/GeometryPrimitives/Vector.h

@@ -152,6 +152,7 @@ SCISHARE bool operator==(const Vector& v1, const Vector& v2);
 SCISHARE bool operator!=(const Vector& v1, const Vector& v2);
 SCISHARE std::ostream& operator<<(std::ostream& os, const Vector& p);
 SCISHARE std::istream& operator>>(std::istream& os, Vector& p);
+SCISHARE Vector vectorFromString(const std::string& str);
 
 inline Vector::Vector()
 {