From ae2b60c6ffad7cba9da948a5aa6809b26beffe43 Mon Sep 17 00:00:00 2001 From: "eduardo.davila@creatis.insa-lyon.fr" Date: Mon, 14 Apr 2025 10:21:19 +0200 Subject: [PATCH] #3534 VectorFilterDouble type 8 , k element to be order --- kernel/src/bbtkAny.h | 5 ----- packages/std/src/bbstdVectorFilterDouble.cxx | 6 ++++-- packages/std/src/bbstdVectorFilterDouble.h | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/kernel/src/bbtkAny.h b/kernel/src/bbtkAny.h index 9f161c9..4999fb8 100644 --- a/kernel/src/bbtkAny.h +++ b/kernel/src/bbtkAny.h @@ -62,11 +62,6 @@ namespace bbtk { - - - - - //========================================================= /// Abstract class used by the any class to store values class anyplaceholder diff --git a/packages/std/src/bbstdVectorFilterDouble.cxx b/packages/std/src/bbstdVectorFilterDouble.cxx index ff85b0b..3d467ca 100644 --- a/packages/std/src/bbstdVectorFilterDouble.cxx +++ b/packages/std/src/bbstdVectorFilterDouble.cxx @@ -250,8 +250,10 @@ void VectorFilterDouble::Process() Out2[j]=In2[iBack]; } // for i } // Type 7 - if (bbGetInputType()==8) // order all vectors using as base the vector In0 + if (bbGetInputType()==8) // order all vectors using as base the vector InK { + int k=0; + if (bbGetInputk1().size()==1) k=bbGetInputk1()[0]; double tmp; int i,j,ii,sizeII; sizeII=pLstVec.size(); @@ -267,7 +269,7 @@ void VectorFilterDouble::Process() { for (j=i;j,""); + BBTK_INPUT(VectorFilterDouble,k1,"(default [0]) nothing (Type0), k1[0]=new size vectors (Type 1) , nothing (Type2), k1[0] = Addition const. (Type 3), k1[0] = Substraction const. (Type 4), k1[0] = Multiplication const. (Type 5) , k1[0] = Division const. (Type 6), k1[0] In0..9 element base to be order (Type 8) , k1[spcX,spcY,spcZ] MulSpc In0_X,In1_Y,In2_Z (type 11), k1[spcX,spcY,spcZ] DivSpc In0_X,In1_Y,In2_Z (type 12) , k1[segment1, segment2,..] (type 14) , direction (type 15), direction (type 16) ",std::vector,""); BBTK_INPUT(VectorFilterDouble,In0,"Input vector",std::vector,""); BBTK_INPUT(VectorFilterDouble,In1,"Input vector",std::vector,""); BBTK_INPUT(VectorFilterDouble,In2,"Input vector",std::vector,""); -- 2.50.0