#3517 ShowNPoints actual Point

[creaMaracasVisu.git] / bbtk / src / bbcreaMaracasVisuShowNPoints_Tools.cxx

diff --git a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx
index c7cf336197607b153ff64c7f49720f104b25657d..0d76ac3ddf54633515715ab69a6ca05dbf0129b3 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx
+++ b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx
@@ -272,7 +272,7 @@ void ShowNPoints_Tools::CreatePatch_Points(std::vector<double> lstX, std::vector
     }
        
     // --- Group 1 ---
-//EED    double centroid[3];
+    double centroid[3];
     
     wsp->InsertCollectionAfter_();
       p[0] = (lstX[0]+lstX[3])/2;
@@ -287,7 +287,7 @@ void ShowNPoints_Tools::CreatePatch_Points(std::vector<double> lstX, std::vector
       wsp->InsertPoint(pM[0] ,pM[1], pM[2],"");
       p[0] = (lstX[0]+lstX[1]+lstX[2]+lstX[3])/4;          p[1] = (lstY[0]+lstY[1]+lstY[2]+lstY[3])/4;          p[2] = (lstZ[0]+lstZ[1]+lstZ[2]+lstZ[3])/4;
       wsp->InsertPoint(p[0] ,p[1], p[2],"");
-//EED    std::copy(std::begin(p), std::end(p), std::begin(centroid));
+         std::copy(std::begin(p), std::end(p), std::begin(centroid));
     // --- Group 2 ---
     wsp->InsertCollectionAfter_();
     dx = lstX[2]-lstX[3];
@@ -396,18 +396,17 @@ void ShowNPoints_Tools::CreatePatch_Points(std::vector<double> lstX, std::vector
         wsp->InvertLstPoints_();
     } // if angle
     
-//EED 2023 07 12
-    //EED    std::vector<double> normalOut(n2, n2 + 3);
-    //EED    double norm = vtkMath::Norm(n2);
-    //EED    normalOut[0] = normalOut[0]/norm;
-    //EED      normalOut[1] = normalOut[1]/norm;
-    //EED      normalOut[2] = normalOut[2]/norm;
+    // You need this for expand tool
+    std::vector<double> normalOut(n2, n2 + 3);
+    double norm = vtkMath::Norm(n2);
+    normalOut[0] = normalOut[0]/norm;
+    normalOut[1] = normalOut[1]/norm;
+    normalOut[2] = normalOut[2]/norm;
+    std::vector<double> outputData;
+    outputData.insert(outputData.end(), &centroid[0], &centroid[3]);
+    outputData.insert(outputData.end(), &normalOut[0], &normalOut[3]);
        
-    //EED      std::vector<double> outputData;
-    //EED      outputData.insert(outputData.end(), &centroid[0], &centroid[3]);
-    //EED      outputData.insert(outputData.end(), &normalOut[0], &normalOut[3]);
-       
-//EED  bbSetOutputOut(outputData);
+bbSetOutputOut(outputData);
     //bbSetOutputOut(normalOut);
     
     // --- Finish ---
@@ -450,13 +449,18 @@ void ShowNPoints_Tools::MovePatchCenter()
        }
  
  */
-
-    double              step                = bbGetInputParams()[0];
-    WidgetShowNPoints   *wsp                = bbGetInputWidgetShowNPoints();
-    wsp->SetActualCollection( wsp->GetLstModelShowNPointsSize()/2 );
-    ModelShowNPoints    *modelSNP           = wsp->GetModelShowNPoints( );
-    modelSNP->SetIdCurrentPoint( modelSNP->GetLstPointsSize()/2 );
-    wsp->MovePoint_( step );
+    std::vector<double> params = bbGetInputParams();
+    if(params.size() == 1)
+    {
+        double              step                = bbGetInputParams()[0];
+        WidgetShowNPoints   *wsp                = bbGetInputWidgetShowNPoints();
+        wsp->SetActualCollection( wsp->GetLstModelShowNPointsSize()/2 );
+        ModelShowNPoints    *modelSNP           = wsp->GetModelShowNPoints( );
+        modelSNP->SetIdCurrentPoint( modelSNP->GetLstPointsSize()/2 );
+        wsp->MovePoint_( step );
+    } else {
+        printf("Error! ShowNPoints_Tools::MovePatchCenter()  Warning params are wrong. Need 1 element (step ex -1  or  1)\n");
+    } // if param size
 }
 
 /**