Added Classification::GetFlags() method. Fixed bug in SetClasification (

#1). Added more tests for setting Point with classification flags.
libLAS · Oct 26, 2011 · f34666e · f34666e · hobu · Oct 27, 2011
1 parent f09aeb3
commit f34666e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 10 deletions.
diff --git a/include/liblas/classification.hpp b/include/liblas/classification.hpp
@@ -141,11 +141,16 @@ class LAS_DLL Classification
 
     /// Conversion operator.
     /// Returns classification object as in form of std::bitset<8>.
-    /// bitset< object 
     operator bitset_type() const
     {
         return bitset_type(m_flags);
     }
+
+    /// Named accessor converting Classification to std::bitset<8>.
+    bitset_type GetFlags() const
+    {
+        return bitset_type(m_flags);
+    }
 
     /// Raturns name of class as defined in LAS 1.1+
     /// Finds class name in lookup table based on class index

diff --git a/src/point.cpp b/src/point.cpp
@@ -715,24 +715,24 @@ void Point::SetClassification(Classification const& cls)
 {
     // "Classification" is always the 9th dimension    
     // std::vector<boost::uint8_t>::size_type pos = GetDimensionBytePosition(8);
-    std::vector<boost::uint8_t>::size_type pos = 15;
-    m_data[pos] = cls.GetClass();
+    std::vector<boost::uint8_t>::size_type const pos = 15;
+    m_data[pos] = static_cast<boost::uint8_t>(cls.GetFlags().to_ulong());
 }
 
 void Point::SetClassification(Classification::bitset_type const& flags)
 {
     // "Classification" is always the 9th dimension    
     // std::vector<boost::uint8_t>::size_type pos = GetDimensionBytePosition(8);
-    std::vector<boost::uint8_t>::size_type pos = 15;    
-    m_data[pos] = Classification(flags).GetClass();
+    std::vector<boost::uint8_t>::size_type const pos = 15;    
+    m_data[pos] = static_cast<boost::uint8_t>(flags.to_ulong());
 }
 
 void Point::SetClassification(boost::uint8_t const& flags)
 {
     // "Classification" is always the 9th dimension    
     // std::vector<boost::uint8_t>::size_type pos = GetDimensionBytePosition(8);
-    std::vector<boost::uint8_t>::size_type pos = 15;    
-    m_data[pos] = Classification(flags).GetClass();
+    std::vector<boost::uint8_t>::size_type const  pos = 15;
+    m_data[pos] = flags; 
 }
 
 void Point::SetScanAngleRank(int8_t const& rank)

diff --git a/test/unit/point_test.cpp b/test/unit/point_test.cpp
@@ -256,21 +256,43 @@ namespace tut
     {
         ensure_equals("invalid default classification",
             m_default.GetClassification(), liblas::Classification::bitset_type());
-
-        liblas::Classification c;
 
         boost::uint8_t const begclass = 0;
-        c.SetClass(begclass);
+
+        liblas::Classification c(begclass, false, true, false);
         m_default.SetClassification(c);
 
         ensure_equals("invalid class index",
             m_default.GetClassification().GetClass(), begclass);
+        ensure_not("synthetic bit", m_default.GetClassification().IsSynthetic());
+        ensure("keypoint bit", m_default.GetClassification().IsKeyPoint());
+        ensure_not("withheld bit", m_default.GetClassification().IsWithheld());
+
+        {
+            // Not paranoid, just show how to manually inspect flags
+            std::ostringstream oss;
+            oss << m_default.GetClassification().GetFlags();
+            ensure_equals(oss.str(), "01000000");
+        }
 
         boost::uint8_t const endclass = 31;
         c.SetClass(endclass);
+        c.SetSynthetic(true);
+        c.SetKeyPoint(true);
+        c.SetWithheld(false);
         m_default.SetClassification(c);
         ensure_equals("invalid class index",
             m_default.GetClassification().GetClass(), endclass);
+        ensure("synthetic bit", m_default.GetClassification().IsSynthetic());
+        ensure("keypoint bit", m_default.GetClassification().IsKeyPoint());
+        ensure_not("withheld bit", m_default.GetClassification().IsWithheld());
+
+        {
+            // Not paranoid, just show how to manually inspect flags
+            std::ostringstream oss;
+            oss << m_default.GetClassification().GetFlags();
+            ensure_equals(oss.str(), "01111111");
+        }
     }
 
     // Test Get/SetScanAngleRank