From 301a78e3af797551c93a8bb5b4f0d80bbd70c1be Mon Sep 17 00:00:00 2001
From: Thibaut Monseigne <thibaut.monseigne@inria.fr>
Date: Wed, 25 Nov 2020 15:48:10 +0100
Subject: [PATCH] :art: Update Multimodal Graz vizu box

Allow more inputs
---
 .../multimodal-graz-visualization.xml         | 97 +++++--------------
 .../ovpCGrazMultiVisualization.cpp            | 12 +--
 2 files changed, 25 insertions(+), 84 deletions(-)

diff --git a/plugins/processing/simple-visualization/box-tutorials/multimodal-graz-visualization.xml b/plugins/processing/simple-visualization/box-tutorials/multimodal-graz-visualization.xml
index 7af132cb4..90be2dacf 100644
--- a/plugins/processing/simple-visualization/box-tutorials/multimodal-graz-visualization.xml
+++ b/plugins/processing/simple-visualization/box-tutorials/multimodal-graz-visualization.xml
@@ -29,11 +29,11 @@
 			<Attributes>
 				<Attribute>
 					<Identifier>(0x1fa7a38f, 0x54edbe0b)</Identifier>
-					<Value>368</Value>
+					<Value>432</Value>
 				</Attribute>
 				<Attribute>
 					<Identifier>(0x207c9054, 0x3c841b63)</Identifier>
-					<Value>848</Value>
+					<Value>832</Value>
 				</Attribute>
 				<Attribute>
 					<Identifier>(0x4e7b798a, 0x183beafb)</Identifier>
@@ -242,49 +242,6 @@
 				</Attribute>
 			</Attributes>
 		</Box>
-		<Box>
-			<Identifier>(0x000018ec, 0x0000171d)</Identifier>
-			<Name>Feature aggregator</Name>
-			<AlgorithmClassIdentifier>(0x00682417, 0x453635f9)</AlgorithmClassIdentifier>
-			<Inputs>
-				<Input>
-					<TypeIdentifier>(0x544a003e, 0x6dcba5f6)</TypeIdentifier>
-					<Name>Input stream 1</Name>
-				</Input>
-			</Inputs>
-			<Outputs>
-				<Output>
-					<TypeIdentifier>(0x17341935, 0x152ff448)</TypeIdentifier>
-					<Name>Feature vector stream</Name>
-				</Output>
-			</Outputs>
-			<Attributes>
-				<Attribute>
-					<Identifier>(0x1fa7a38f, 0x54edbe0b)</Identifier>
-					<Value>432</Value>
-				</Attribute>
-				<Attribute>
-					<Identifier>(0x207c9054, 0x3c841b63)</Identifier>
-					<Value>848</Value>
-				</Attribute>
-				<Attribute>
-					<Identifier>(0x4e7b798a, 0x183beafb)</Identifier>
-					<Value>(0xb5d15cc9, 0x6c8c28fb)</Value>
-				</Attribute>
-				<Attribute>
-					<Identifier>(0xc80ce8af, 0xf699f813)</Identifier>
-					<Value>1</Value>
-				</Attribute>
-				<Attribute>
-					<Identifier>(0xcfad85b0, 0x7c6d841c)</Identifier>
-					<Value>1</Value>
-				</Attribute>
-				<Attribute>
-					<Identifier>(0xfba64161, 0x65304e21)</Identifier>
-					<Value></Value>
-				</Attribute>
-			</Attributes>
-		</Box>
 		<Box>
 			<Identifier>(0x00002a20, 0x00000cc7)</Identifier>
 			<Name>Lua Stimulator</Name>
@@ -773,11 +730,11 @@
 			<Attributes>
 				<Attribute>
 					<Identifier>(0x1fa7a38f, 0x54edbe0b)</Identifier>
-					<Value>240</Value>
+					<Value>304</Value>
 				</Attribute>
 				<Attribute>
 					<Identifier>(0x207c9054, 0x3c841b63)</Identifier>
-					<Value>848</Value>
+					<Value>832</Value>
 				</Attribute>
 				<Attribute>
 					<Identifier>(0x4e7b798a, 0x183beafb)</Identifier>
@@ -821,11 +778,11 @@
 			<Attributes>
 				<Attribute>
 					<Identifier>(0x1fa7a38f, 0x54edbe0b)</Identifier>
-					<Value>304</Value>
+					<Value>368</Value>
 				</Attribute>
 				<Attribute>
 					<Identifier>(0x207c9054, 0x3c841b63)</Identifier>
-					<Value>800</Value>
+					<Value>784</Value>
 				</Attribute>
 				<Attribute>
 					<Identifier>(0x30a4e5c9, 0x83502953)</Identifier>
@@ -885,11 +842,11 @@
 			<Attributes>
 				<Attribute>
 					<Identifier>(0x1fa7a38f, 0x54edbe0b)</Identifier>
-					<Value>304</Value>
+					<Value>368</Value>
 				</Attribute>
 				<Attribute>
 					<Identifier>(0x207c9054, 0x3c841b63)</Identifier>
-					<Value>880</Value>
+					<Value>864</Value>
 				</Attribute>
 				<Attribute>
 					<Identifier>(0x30a4e5c9, 0x83502953)</Identifier>
@@ -934,28 +891,6 @@
 				<BoxInputIndex>0</BoxInputIndex>
 			</Target>
 		</Link>
-		<Link>
-			<Identifier>(0x000022e1, 0x00004db4)</Identifier>
-			<Source>
-				<BoxIdentifier>(0x000018ec, 0x0000171d)</BoxIdentifier>
-				<BoxOutputIndex>0</BoxOutputIndex>
-			</Source>
-			<Target>
-				<BoxIdentifier>(0x00002e70, 0x00003b10)</BoxIdentifier>
-				<BoxInputIdentifier>(0x60c3eaa3, 0x0de44428)</BoxInputIdentifier>
-			</Target>
-		</Link>
-		<Link>
-			<Identifier>(0x00002fdc, 0x000018b3)</Identifier>
-			<Source>
-				<BoxIdentifier>(0x000001b4, 0x00002cd5)</BoxIdentifier>
-				<BoxOutputIndex>0</BoxOutputIndex>
-			</Source>
-			<Target>
-				<BoxIdentifier>(0x000018ec, 0x0000171d)</BoxIdentifier>
-				<BoxInputIndex>0</BoxInputIndex>
-			</Target>
-		</Link>
 		<Link>
 			<Identifier>(0x00003ad0, 0x00005743)</Identifier>
 			<Source>
@@ -1066,6 +1001,17 @@
 				<BoxInputIndex>0</BoxInputIndex>
 			</Target>
 		</Link>
+		<Link>
+			<Identifier>(0x000076c6, 0x00003b90)</Identifier>
+			<Source>
+				<BoxIdentifier>(0x000001b4, 0x00002cd5)</BoxIdentifier>
+				<BoxOutputIndex>0</BoxOutputIndex>
+			</Source>
+			<Target>
+				<BoxIdentifier>(0x00002e70, 0x00003b10)</BoxIdentifier>
+				<BoxInputIdentifier>(0x60c3eaa3, 0x0de44428)</BoxInputIdentifier>
+			</Target>
+		</Link>
 		<Link>
 			<Identifier>(0x0000790b, 0x000062b9)</Identifier>
 			<Source>
@@ -1081,7 +1027,8 @@
 	<Comments>
 		<Comment>
 			<Identifier>(0x000016ed, 0x000068e9)</Identifier>
-			<Text>Needed to trasnform 2D matrix to Vector Matrix</Text>
+			<Text>No needed to trasnform 2D matrix to Vector Matrix 
+but the buffer size must be equal to number of modality</Text>
 			<Attributes>
 				<Attribute>
 					<Identifier>(0x473d9a43, 0x97fc0a97)</Identifier>
@@ -1099,7 +1046,7 @@
 			<Attributes>
 				<Attribute>
 					<Identifier>(0x473d9a43, 0x97fc0a97)</Identifier>
-					<Value>592</Value>
+					<Value>576</Value>
 				</Attribute>
 				<Attribute>
 					<Identifier>(0x7234b86b, 0x2b8651a5)</Identifier>
diff --git a/plugins/processing/simple-visualization/src/box-algorithms/ovpCGrazMultiVisualization.cpp b/plugins/processing/simple-visualization/src/box-algorithms/ovpCGrazMultiVisualization.cpp
index b318b94ba..a0c578357 100644
--- a/plugins/processing/simple-visualization/src/box-algorithms/ovpCGrazMultiVisualization.cpp
+++ b/plugins/processing/simple-visualization/src/box-algorithms/ovpCGrazMultiVisualization.cpp
@@ -261,16 +261,10 @@ bool CGrazMultiVisualization::process()
 		m_classifDecoder.decode(i);
 		if (m_classifDecoder.isHeaderReceived())
 		{
-			if (m_iMatrix->getDimensionCount() != 1)
+			if (m_iMatrix->getBufferElementCount() != m_nbModality)
 			{
-				this->getLogManager() << LogLevel_Error << "Error, only column vectors supported as Amplitude! (matrix is a "
-						<< m_iMatrix->getDimensionCount() << "D matrix)\n";
-				return false;
-			}
-			if (m_iMatrix->getDimensionSize(0) != m_nbModality)
-			{
-				this->getLogManager() << LogLevel_Error << "Error, the vector do not contain the same number of values as modalities! ("
-						<< m_iMatrix->getDimensionSize(0) << " VS " << m_nbModality << ")\n";
+				this->getLogManager() << LogLevel_Error << "Error, the vector/matrix do not contain the same number of values as modalities! ("
+						<< m_iMatrix->getBufferElementCount() << " VS " << m_nbModality << ")\n";
 				return false;
 			}
 			m_confusionEncoder.encodeHeader();
-- 
GitLab