Merge branch 'develop-50' into develop-50-vector-renamings-1063

vvvv45/addonpack/src/Addonpack.csproj

@@ -79,10 +79,6 @@
       <Project>{BE8F0188-A22A-4ED6-B94D-963F37F114AD}</Project>
       <Name>Bilerp</Name>
     </ProjectReference>
-    <ProjectReference Include="nodes\plugins\2d\Gesture2dDollarOne\Gesture2dDollarOne.csproj">
-      <Project>{815ac6af-ca87-4a2c-b1e6-cff10e89d07e}</Project>
-      <Name>Gesture2dDollarOne</Name>
-    </ProjectReference>
     <ProjectReference Include="nodes\plugins\2d\Gui2dLegacy\Gui2dLegacy.csproj">
       <Project>{E33B2854-DA30-4E94-AE54-51D53BE603B8}</Project>
       <Name>Gui2dLegacy</Name>

vvvv45/addonpack/src/Addonpack.sln

@@ -363,7 +363,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LengthSpectral", "nodes\plu
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QueueStore", "nodes\plugins\Generics\QueueStore\QueueStore.csproj", "{B08F36F6-F91F-4CFA-AE73-5701B108B9BC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gesture2dDollarOne", "nodes\plugins\2d\Gesture2dDollarOne\Gesture2dDollarOne.csproj", "{815AC6AF-CA87-4A2C-B1E6-CFF10E89D07E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneDollarRecognizer", "nodes\plugins\2d\OneDollarRecognizer\OneDollarRecognizer.csproj", "{815AC6AF-CA87-4A2C-B1E6-CFF10E89D07E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

vvvv45/addonpack/src/nodes/plugins/2d/Gesture2dDollarOne/Gesture2dDollarOne.cs → vvvv45/addonpack/src/nodes/plugins/2d/OneDollarRecognizer/OneDollarRecognizer.cs

@@ -1,73 +1,3 @@
-#region license
-/**
- * The $1 Unistroke Recognizer (VVVV Version)
- * VVVV port from C# example by motzi, 2015
- * The port uses code from the original example code found here:
- * http://depts.washington.edu/aimgroup/proj/dollar/index.html
- * 
- * The new-BSD license from the original license (see below) applies.
-**/
-/**
- * The $1 Unistroke Recognizer (C# version)
- *
- *		Jacob O. Wobbrock, Ph.D.
- * 		The Information School
- *		University of Washington
- *		Mary Gates Hall, Box 352840
- *		Seattle, WA 98195-2840
- *		wobbrock@u.washington.edu
- *
- *		Andrew D. Wilson, Ph.D.
- *		Microsoft Research
- *		One Microsoft Way
- *		Redmond, WA 98052
- *		awilson@microsoft.com
- *
- *		Yang Li, Ph.D.
- *		Department of Computer Science and Engineering
- * 		University of Washington
- *		The Allen Center, Box 352350
- *		Seattle, WA 98195-2840
- * 		yangli@cs.washington.edu
- *
- * The Protractor enhancement was published by Yang Li and programmed here by 
- * Jacob O. Wobbrock.
- *
- *	Li, Y. (2010). Protractor: A fast and accurate gesture 
- *	  recognizer. Proceedings of the ACM Conference on Human 
- *	  Factors in Computing Systems (CHI '10). Atlanta, Georgia
- *	  (April 10-15, 2010). New York: ACM Press, pp. 2169-2172.
- * 
- * This software is distributed under the "New BSD License" agreement:
- * 
- * Copyright (c) 2007-2011, Jacob O. Wobbrock, Andrew D. Wilson and Yang Li.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the names of the University of Washington nor Microsoft,
- *      nor the names of its contributors may be used to endorse or promote 
- *      products derived from this software without specific prior written
- *      permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Jacob O. Wobbrock OR Andrew D. Wilson
- * OR Yang Li BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-**/
-#endregion license
-
 #region usings
 using System;
 using System.Collections.Generic;
@@ -84,24 +14,24 @@ namespace VVVV.Nodes
 
 	#region PluginInfo
 	[PluginInfo(Name = "Resample", 
-		Category = "2d Vector Distancebased", 
+		Category = "2d", 
+        Version = "Vector Distancebased",
 		Help = "Resamples a Spread of 2d Vectors according to a specified distance between points", 
-		Tags = "linear,interpolation",
+		Tags = "linear, interpolation",
 		Author = "motzi",
 		Credits = "Jacob Wobbrock"
 	)]
 	#endregion PluginInfo
-
 	public class Vector2dDistanceResampleNode : IPluginEvaluate
 	{
 		#region fields & pins
 		[Input("Input")]
 		public ISpread<ISpread<Vector2D>> FPoints;
 
-		[Input("StepSize", DefaultValue = 1.0)]
+		[Input("Stepsize", DefaultValue = 1.0)]
 		public ISpread<double> FStep;
 
-		[Input("MinStepSize", DefaultValue = 0.01)]
+		[Input("Minimum Stepsize", DefaultValue = 0.01)]
 		public ISpread<double> FMinStep;
 
 		[Output("Output")]
@@ -179,9 +109,9 @@ public void Evaluate(int SpreadMax)
 
 	#region PluginInfo
 	[PluginInfo(Name = "Vectorize", 
-		Category = "2d Vector", 
+		Category = "2d", 
 		Help = "Normalizes a set of 2d vectors", 
-		Tags = "$1, DollarOne",
+		Tags = "$1, OneDollarRecognizer",
 		Author = "motzi",
 		Credits = "Jacob Wobbrock, Yang Li"
 	)]
@@ -357,9 +287,9 @@ private List<Vector2D> Vectorize(List<Vector2D> points)
 
 	#region PluginInfo
 	[PluginInfo(Name = "OptimalCosineDistance",
-	            Category = "2d Vector Spectral",
+	            Category = "2d",
 	            Help = "Calculates the minimal angular distance between two sets of 2d vectors",
-	            Tags = "Protractor,$1,DollarOne",
+	            Tags = "Protractor, $1, OneDollarRecognizer",
 				Author = "motzi",
 				Credits = "Yiang Li, Jacob Wobbrock"
 	)]

vvvv45/addonpack/src/nodes/plugins/2d/Gesture2dDollarOne/Gesture2dDollarOne.csproj → vvvv45/addonpack/src/nodes/plugins/2d/OneDollarRecognizer/OneDollarRecognizer.csproj

@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="..\..\Default.Plugin.Project.settings" />
-  <PropertyGroup>
-    <ProjectGuid>{815AC6AF-CA87-4A2C-B1E6-CFF10E89D07E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>VVVV.Nodes</RootNamespace>
-    <AssemblyName>Gesture2dDollarOne</AssemblyName>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\src\core\PluginInterfaces\PluginInterfaces.csproj">
-      <Project>{837C740A-485C-424C-8C38-086ED3DC73CB}</Project>
-      <Name>PluginInterfaces</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\..\common\src\core\Utils\Utils.csproj">
-      <Project>{C3773330-81FA-4253-823E-1BDE1529AA99}</Project>
-      <Name>Utils</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition.CodePlex, Version=4.1.2.0, Culture=neutral, PublicKeyToken=13e5ffd4e05db186, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\..\..\packages\VVVV.System.ComponentModel.Composition.Codeplex.2.5.0\lib\net40\System.ComponentModel.Composition.CodePlex.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Gesture2dDollarOne.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <Import Project="..\..\Default.Plugin.Project.settings" />
+  <PropertyGroup>
+    <ProjectGuid>{815AC6AF-CA87-4A2C-B1E6-CFF10E89D07E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>VVVV.Nodes</RootNamespace>
+    <AssemblyName>OneDollarGesture</AssemblyName>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\..\src\core\PluginInterfaces\PluginInterfaces.csproj">
+      <Project>{837C740A-485C-424C-8C38-086ED3DC73CB}</Project>
+      <Name>PluginInterfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\..\common\src\core\Utils\Utils.csproj">
+      <Project>{C3773330-81FA-4253-823E-1BDE1529AA99}</Project>
+      <Name>Utils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition.CodePlex, Version=4.1.2.0, Culture=neutral, PublicKeyToken=13e5ffd4e05db186, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\..\..\packages\VVVV.System.ComponentModel.Composition.Codeplex.2.5.0\lib\net40\System.ComponentModel.Composition.CodePlex.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="OneDollarRecognizer.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

vvvv45/addonpack/src/nodes/plugins/2d/Gesture2dDollarOne/Properties/AssemblyInfo.cs → vvvv45/addonpack/src/nodes/plugins/2d/OneDollarRecognizer/Properties/AssemblyInfo.cs

@@ -9,12 +9,12 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("DemoPlugin")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("OneDollar Gesture Recognizer")]
+[assembly: AssemblyDescription("OneDollar Gesture Recognizer Nodes for VVVV")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DemoPlugin")]
-[assembly: AssemblyCopyright("Copyright 2010")]
+[assembly: AssemblyProduct("OneDollarGesture")]
+[assembly: AssemblyCopyright("Jacob Wobbrock, Yiang Li, motzi")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

vvvv45/addonpack/src/nodes/plugins/2d/Gesture2dDollarOne/packages.config → vvvv45/addonpack/src/nodes/plugins/2d/OneDollarRecognizer/packages.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="VVVV.System.ComponentModel.Composition.Codeplex" version="2.5.0" targetFramework="net40" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="VVVV.System.ComponentModel.Composition.Codeplex" version="2.5.0" targetFramework="net40" />
 </packages>