Changeset 601 for cpp/frams/model

Timestamp:

08/28/16 15:19:57 (8 years ago)

Author:

oriona

Message:

Possibility of fixing z axis during the alignment added.

Location:

cpp/frams/model/similarity

Files:

• simil_model.cpp (modified) (3 diffs)
• simil_model.h (modified) (1 diff)

cpp/frams/model/similarity/simil_model.cpp

@@ -1997 +1997 @@
             // get the position of the Part
             P1Pos = P1->p;
+            if (zFixed == 1)
+            {
+                P1Pos.z = 0;    
+            }
             for (iP2 = 0; iP2 < pModel->getPartCount(); iP2++)
             {
@@ -2003 +2007 @@
                 // get the position of the Part
                 P2Pos = P2->p;
+                if (zFixed == 1)
+                {
+                        P2Pos.z = 0;    
+                }
                 // compute the geometric (Euclidean) distance between the Parts
                 dDistance = P1Pos.distanceTo(P2Pos);
@@ -2011 +2019 @@
 
         MatrixTools::SVD(vEigenvalues, nSize, pDistances, m_aPositions[ iMod ]);
+        if (zFixed == 1)
+        {
+                for (int coord = 0; coord < pModel->getPartCount(); coord++)
+                {
+                        m_aPositions[ iMod ][coord].z = pModel->getPart(coord)->p.z;
+                }
+        }
+        
         free(pDistances);
     }

cpp/frams/model/similarity/simil_model.h

@@ -85 +85 @@
     int fuzzyDepth;
     int isFuzzy;
+    //for Zfixed = 1 z coordinates are not taken into account during PCA alignment
+    int zFixed;
 
     /// Interface to local parameters