From: Eduardo DAVILA <davila@creatis.insa-lyon.fr>
Date: Thu, 6 Oct 2022 09:25:37 +0000 (+0200)
Subject: Merge branch 'vtk9itk5wx3-macos' of ssh://git.creatis.insa-lyon.fr/creaVtk into vtk9i... 
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a1e1835f24c8f0ead63f94fd605ad2ebb2f7bc62;hp=-c;p=creaVtk.git

Merge branch 'vtk9itk5wx3-macos' of ssh://git.creatis.insa-lyon.fr/creaVtk into vtk9itk5wx3-macos
---

a1e1835f24c8f0ead63f94fd605ad2ebb2f7bc62
diff --combined bbtk_creaVtk_PKG/src/bbcreaVtkMeshDeformation.cxx
index e65b411,760d70b..865a6fa
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkMeshDeformation.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkMeshDeformation.cxx
@@@ -28,7 -28,6 +28,7 @@@ void MeshDeformation::Process(
  //    bbSetOutputOut( bbGetInputIn() );
  //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
  
 +
      std::vector<double> lstCenter = bbGetInputCenter();
  
      double  s   = bbGetInputS();
@@@ -48,9 -47,6 +48,9 @@@
  
      if ( (bbGetInputIn()!=NULL) && (ok==true) && (bbGetInputEdgeId()>=0) && (bbGetInputActive()==true) )
      {
 +
 +        printf(" EED MeshDeformation::Process   %ld   %ld  -   %f %f %f \n", EdgeIdBack, bbGetInputEdgeId() , lstCenter[0],lstCenter[1],lstCenter[2] );
 +
          vtkPoints* points=bbGetInputIn()->GetPoints();
          long    i,size=points->GetNumberOfPoints();
          double  p[3];  // point
@@@ -71,6 -67,9 +71,9 @@@
              displcement_y = bbGetInputDirection()[1];
              displcement_z = bbGetInputDirection()[2];
          } // if TypeIn 0 Direction
+ 		
+ 		printf(" EED MeshDeformation::Process   %ld   %ld  -   %f %f %f \n", EdgeIdBack, bbGetInputEdgeId() , lstCenter[0],lstCenter[1],lstCenter[2] );
+ 		
          if (bbGetInputTypeIn()==1) // Center
          {
              if (EdgeIdBack==bbGetInputEdgeId() )
@@@ -87,9 -86,6 +90,6 @@@
          if (EdgeIdBack!=bbGetInputEdgeId() )
          {
              EdgeIdBack = bbGetInputEdgeId();
-             displcement_x = 0;
-             displcement_y = 0;
-             displcement_z = 0;
              voiIdPoints.clear();
              for ( i=0 ; i<size ; i++)
              {
@@@ -101,7 -97,10 +101,10 @@@
                      voiIdPoints.push_back( i );
                  } // if
              } // for i
-         } // back
+ 			backLstCenter[0] = lstCenter[0];
+ 			backLstCenter[1] = lstCenter[1];
+ 			backLstCenter[2] = lstCenter[2];
+         } // if EdgeIdBack
  
          if ( !((displcement_x==0) &&(displcement_y==0) && (displcement_z==0)) )
          {
@@@ -155,7 -154,6 +158,7 @@@ void MeshDeformation::bbUserSetDefaultV
      backLstCenter.push_back(0);
      backLstCenter.push_back(0);
  }
 +
  //===== 
  // 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)
  //===== 
@@@ -169,18 -167,19 +172,18 @@@ void MeshDeformation::bbUserInitializeP
  
    
  }
 +
  //===== 
  // 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)
  //===== 
  void MeshDeformation::bbUserFinalizeProcessing()
  {
 -
  //  THE FINALIZATION METHOD BODY :
  //    Here does nothing 
  //    but this is where you should desallocate the internal/output pointers 
  //    if any
 -  
  }
 -}
 -// EO namespace bbcreaVtk
 +
 +}// EO namespace bbcreaVtk