GetSize now works with variant counts

bigfug · Jan 31, 2018 · 707a130 · 707a130
1 parent c8a466b
commit 707a130
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 44 deletions.
diff --git a/plugins/Core/getsizenode.cpp b/plugins/Core/getsizenode.cpp
@@ -2,6 +2,7 @@
 
 #include <fugio/core/uuid.h>
 #include <fugio/core/size_interface.h>
+#include <fugio/pin_variant_iterator.h>
 
 GetSizeNode::GetSizeNode( QSharedPointer<fugio::NodeInterface> pNode )
 	: NodeControlBase( pNode )
@@ -37,69 +38,92 @@ void GetSizeNode::inputsUpdated( qint64 pTimeStamp )
 
 		fugio::SizeInterface	*SzeInt = input<fugio::SizeInterface *>( PinI );
 
-		if( !SzeInt )
+		if( SzeInt )
 		{
-			continue;
-		}
+			QVariant	Size;
 
-		QVariant	Size;
+			switch( SzeInt->sizeDimensions() )
+			{
+				case 1:
+					Size = SzeInt->sizeWidth();
 
-		switch( SzeInt->sizeDimensions() )
-		{
-			case 1:
-				Size = SzeInt->sizeWidth();
+					if( PinO->controlUuid() != PID_FLOAT )
+					{
+						QSharedPointer<fugio::PinControlInterface> PCI = mNode->context()->createPinControl( PID_FLOAT, PinO );
 
-				if( PinO->controlUuid() != PID_FLOAT )
-				{
-					QSharedPointer<fugio::PinControlInterface> PCI = mNode->context()->createPinControl( PID_FLOAT, PinO );
+						if( PCI )
+						{
+							PinO->setControl( PCI );
+
+							VarO = qobject_cast<fugio::VariantInterface *>( PCI->qobject() );
+						}
+					}
+					break;
+
+				case 2:
+					Size = SzeInt->toSizeF();
 
-					if( PCI )
+					if( PinO->controlUuid() != PID_SIZE )
 					{
-						PinO->setControl( PCI );
+						QSharedPointer<fugio::PinControlInterface> PCI = mNode->context()->createPinControl( PID_SIZE, PinO );
 
-						VarO = qobject_cast<fugio::VariantInterface *>( PCI->qobject() );
-					}
-				}
-				break;
+						if( PCI )
+						{
+							PinO->setControl( PCI );
 
-			case 2:
-				Size = SzeInt->toSizeF();
+							VarO = qobject_cast<fugio::VariantInterface *>( PCI->qobject() );
+						}
+					}
+					break;
 
-				if( PinO->controlUuid() != PID_SIZE )
-				{
-					QSharedPointer<fugio::PinControlInterface> PCI = mNode->context()->createPinControl( PID_SIZE, PinO );
+				case 3:
+					Size = SzeInt->toVector3D();
 
-					if( PCI )
+					if( PinO->controlUuid() != PID_SIZE_3D )
 					{
-						PinO->setControl( PCI );
+						QSharedPointer<fugio::PinControlInterface> PCI = mNode->context()->createPinControl( PID_SIZE_3D, PinO );
 
-						VarO = qobject_cast<fugio::VariantInterface *>( PCI->qobject() );
+						if( PCI )
+						{
+							PinO->setControl( PCI );
+
+							VarO = qobject_cast<fugio::VariantInterface *>( PCI->qobject() );
+						}
 					}
-				}
-				break;
+					break;
+			}
 
-			case 3:
-				Size = SzeInt->toVector3D();
+			if( VarO->variant() != Size )
+			{
+				VarO->setVariant( Size );
 
-				if( PinO->controlUuid() != PID_SIZE_3D )
-				{
-					QSharedPointer<fugio::PinControlInterface> PCI = mNode->context()->createPinControl( PID_SIZE_3D, PinO );
+				pinUpdated( PinO );
+			}
+		}
+		else
+		{
+			if( PinO->controlUuid() != PID_INTEGER )
+			{
+				QSharedPointer<fugio::PinControlInterface> PCI = mNode->context()->createPinControl( PID_INTEGER, PinO );
 
-					if( PCI )
-					{
-						PinO->setControl( PCI );
+				if( PCI )
+				{
+					PinO->setControl( PCI );
 
-						VarO = qobject_cast<fugio::VariantInterface *>( PCI->qobject() );
-					}
+					VarO = qobject_cast<fugio::VariantInterface *>( PCI->qobject() );
 				}
-				break;
-		}
+			}
 
-		if( VarO->variant() != Size )
-		{
-			VarO->setVariant( Size );
+			fugio::PinVariantIterator	PinItr( PinI );
+
+			VarO->setVariantCount( 1 );
+
+			if( VarO->variant().toInt() != PinItr.size() )
+			{
+				VarO->setVariant( PinItr.size() );
 
-			pinUpdated( PinO );
+				pinUpdated( PinO );
+			}
 		}
 	}
 }

diff --git a/plugins/Core/getsizenode.h b/plugins/Core/getsizenode.h
@@ -34,7 +34,7 @@ class GetSizeNode : public fugio::NodeControlBase, fugio::PairedPinsHelperInterf
 
 	// PairedPinsHelperInterface interface
 public:
-	virtual QUuid pairedPinControlUuid(QSharedPointer<fugio::PinInterface> pPin) const Q_DECL_OVERRIDE;
+	virtual QUuid pairedPinControlUuid( QSharedPointer<fugio::PinInterface> pPin ) const Q_DECL_OVERRIDE;
 };
 
 #endif // GETSIZENODE_H