#3501 Geodesic Deformation

[bbtk.git] / packages / itkvtk / src / bbitkvtkGeodesicMeshDeformation.cxx

diff --git a/packages/itkvtk/src/bbitkvtkGeodesicMeshDeformation.cxx b/packages/itkvtk/src/bbitkvtkGeodesicMeshDeformation.cxx
index f99dc9cb5a26b0f35e7bdc47f3a5e1b91294e85f..98559509fcff7fbd279be8b342c6a87be2b9c03e 100644 (file)
--- a/packages/itkvtk/src/bbitkvtkGeodesicMeshDeformation.cxx
+++ b/packages/itkvtk/src/bbitkvtkGeodesicMeshDeformation.cxx
@@ -14,7 +14,6 @@ BBTK_BLACK_BOX_IMPLEMENTATION(GeodesicMeshDeformation,bbtk::AtomicBlackBox);
 //===== 
 void GeodesicMeshDeformation::Process()
 {
-//printf("PG GeodesicMeshDeformation::Process START \n");
 // THE MAIN PROCESSING METHOD BODY
 //   Here we simply set the input 'In' value to the output 'Out'
 //   And print out the output value
@@ -27,13 +26,18 @@ void GeodesicMeshDeformation::Process()
 //    * TYPE is the C++ type of the input/output
 //      (the one provided in the attribute 'type' of the tag 'input')
     std::vector<double> lstCenter = bbGetInputCenter();
-    double s   = bbGetInputS();
-    bool    ok  = false;
-    using MeshType = itk::QuadEdgeMesh<double, 3>;
+    double  s           = bbGetInputS();
+    bool    ok          = false;
+    bool       pdChanged   = false;
+    using MeshType      = itk::QuadEdgeMesh<double, 3>;
+    std::vector<double> deformInfo;
+       bbSetOutputOut(deformInfo);
+       //std::vector<double> displacementVector;
     
     //Set up QuadEdge and filter every time polydata changes
     if ((bbGetInputIn() != polydata) && (bbGetInputActive()==true) && (bbGetInputIn() != NULL))
     {
+       pdChanged = true;
        //Reset displacement
        if(lstCenter.size() != NULL)
        {
@@ -123,10 +127,10 @@ void GeodesicMeshDeformation::Process()
         double  p[3];  // point
         double  pb[3]; // point base
         double  np[3]; // new point
-        double  sx,sy,sz;
-        sx = s*2;
-        sy = sx;
-        sz = sy;
+//        double  sx,sy,sz;
+//        sx = s*2;
+//        sy = s*2;
+//        sz = s*2;
 
         double displcement_x = 0;
         double displcement_y = 0;
@@ -139,7 +143,7 @@ void GeodesicMeshDeformation::Process()
             displcement_z = bbGetInputDirection()[2];
         } // if TypeIn 0 Direction
                
-               printf(" EED GeodesicMeshDeformation::Process   %ld   %ld  -   %f %f %f \n", EdgeIdBack, bbGetInputEdgeId() , lstCenter[0],lstCenter[1],lstCenter[2] );
+               //printf(" EED GeodesicMeshDeformation::Process   %ld   %ld  -   %f %f %f \n", EdgeIdBack, bbGetInputEdgeId() , lstCenter[0],lstCenter[1],lstCenter[2] );
                
         if (bbGetInputTypeIn()==1) // Center
         {
@@ -155,8 +159,8 @@ void GeodesicMeshDeformation::Process()
             
         } // if TypeIn 1 Center
         points->GetPoint( bbGetInputEdgeId() , pb );
-        if (EdgeIdBack!=bbGetInputEdgeId() )
-        {
+        if (EdgeIdBack!=bbGetInputEdgeId() || pdChanged)
+        {printf("PG GeodesicMeshDeformation::Process ENTERED \n");
             EdgeIdBack = bbGetInputEdgeId();
             
                        backLstCenter[0] = lstCenter[0];
@@ -183,7 +187,7 @@ void GeodesicMeshDeformation::Process()
                                using CriterionType = itk::FastMarchingThresholdStoppingCriterion<MeshType, MeshType>;
                                auto criterion = CriterionType::New();
                                sCurrent = s;
-                               criterion->SetThreshold(s*2);
+                               criterion->SetThreshold(s*4);
                                fmmFilter->SetStoppingCriterion(criterion);
                        }
                        fmmFilter->Update();
@@ -213,12 +217,16 @@ void GeodesicMeshDeformation::Process()
                                        }
                                        ++BegProcessedIt;
                                }
+                               //double directionMoved[3] = {lstCenter[0]-displcement_x, lstCenter[1]-displcement_y, lstCenter[2]-displcement_z};
+                               //vtkMath::Normalize(directionMoved);
+                               std::vector<double> info{lstCenter[0],lstCenter[1],lstCenter[2], bbGetInputDirection()[0] , bbGetInputDirection()[1], bbGetInputDirection()[2],(double) bbGetInputEdgeId(), s};
+                               bbSetOutputOut(info);
+                               cout << "info updated" << endl;
                                points->Modified();
-               bbGetInputIn()->Modified();
+                       bbGetInputIn()->Modified();
                        }// if ffmFilter != NULL
         } // if distance_x y z  != 0
     } // In != NULL    ok    active
-//    printf("PG GeodesicMeshDeformation::Process END \n");
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
@@ -239,6 +247,8 @@ void GeodesicMeshDeformation::bbUserSetDefaultValues()
        EdgeIdBack=-1;
        bbSetInputEdgeId(EdgeIdBack);
        bbSetInputS(10);
+       std::vector<double> OutputVect;
+       bbSetOutputOut(OutputVect);
 
        backLstCenter.push_back(0);
        backLstCenter.push_back(0);