# HG changeset patch
# User Jeep-Tour@Jeep-Tour-PC
# Date 1343061335 14400
# Node ID 44704f53ffc8a14b1ce61e753d647e6788837839
# Parent  933e400ee53b8e269d95a762ddbabecf9af552a1# Parent  99173da7afaefc3e90932f38e61a722d7faf0371
Fusion

diff -r 99173da7afae -r 44704f53ffc8 .hgignore
--- a/.hgignore	Sat Jul 21 00:50:42 2012 -0400
+++ b/.hgignore	Mon Jul 23 12:35:35 2012 -0400
@@ -4,7 +4,6 @@
 *.out
 *.a
 *.o
-*.exe
 *.pyc
 *.pyo
 *~
@@ -14,6 +13,11 @@
 *.lock
 *.yml
 *.zip
+*.opensdf
+*.sdf
+*.suo
+*.user
+*.filters
 .emacs.desktop*
 
 CMakeCache.txt
@@ -23,4 +27,9 @@
 html
 bin
 build
-CMakeFiles
\ No newline at end of file
+CMakeFiles
+ipch
+win32-depends/opencv/
+win32-depends/boost/
+win32-depends/klt
+win32-depends/sqlite
diff -r 99173da7afae -r 44704f53ffc8 OpenCV.props
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OpenCV.props	Mon Jul 23 12:35:35 2012 -0400
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <DebugSuffix Condition="'$(Configuration)'=='Debug'">d</DebugSuffix>
+    <DebugSuffix Condition="'$(Configuration)'!='Debug'"></DebugSuffix>
+   </PropertyGroup>
+
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)\win32-depends\opencv\include\opencv2\;$(SolutionDir)\win32-depends\opencv\include\opencv\;$(SolutionDir)\win32-depends\opencv\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(SolutionDir)\win32-depends\opencv\libs\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>opencv_video242$(DebugSuffix).lib;opencv_ts242$(DebugSuffix).lib;opencv_objdetect242$(DebugSuffix).lib;opencv_ml242$(DebugSuffix).lib;opencv_legacy242$(DebugSuffix).lib;opencv_imgproc242$(DebugSuffix).lib;opencv_highgui242$(DebugSuffix).lib;opencv_flann242$(DebugSuffix).lib;opencv_features2d242$(DebugSuffix).lib;opencv_core242$(DebugSuffix).lib;opencv_contrib242$(DebugSuffix).lib;opencv_calib3d242$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff -r 99173da7afae -r 44704f53ffc8 README-Win32.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/README-Win32.txt	Mon Jul 23 12:35:35 2012 -0400
@@ -0,0 +1,22 @@
+To be able to use traffic intelligence on windows, you will first have to fetch the 3rd party libraries.
+To do this, go in the folder win32-depends and launch win32-depends-installer.bat. It should fetch the library 
+and unarchive them correctly.
+
+Second you will need is the project TrajectoryManagementAndAnalysis available at https://bitbucket.org/trajectories/trajectorymanagementandanalysis
+
+
+
+If you want the sln to work, the project must be in the same folder where you have cloned trafficintelligence.
+To clone the project, use hg clone https://bitbucket.org/trajectories/trajectorymanagementandanalysis
+
+If you've done everything correctly, you should have
+
+/trafficintelligence
+/trafficintelligence/win32-depends/boost/
+/trafficintelligence/win32-depends/klt/
+/trafficintelligence/win32-depends/opencv/
+/trafficintelligence/win32-depends/sqlite/
+/trajectorymanagementandanalysis
+
+
+
diff -r 99173da7afae -r 44704f53ffc8 boost.props
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boost.props	Mon Jul 23 12:35:35 2012 -0400
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)\win32-depends\boost\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(SolutionDir)\win32-depends\boost\libs\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff -r 99173da7afae -r 44704f53ffc8 klt.props
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/klt.props	Mon Jul 23 12:35:35 2012 -0400
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)\win32-depends\klt\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff -r 99173da7afae -r 44704f53ffc8 sqlite.props
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sqlite.props	Mon Jul 23 12:35:35 2012 -0400
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)\win32-depends\sqlite\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)\win32-depends\sqlite\libs\$(ConfigurationName)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff -r 99173da7afae -r 44704f53ffc8 trafficintelligence.sln
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trafficintelligence.sln	Mon Jul 23 12:35:35 2012 -0400
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "trafficintelligence", "trafficintelligence.vcxproj", "{70E43B7B-A3DA-40AD-A0D3-24758BA3FC42}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{70E43B7B-A3DA-40AD-A0D3-24758BA3FC42}.Debug|Win32.ActiveCfg = Debug|Win32
+		{70E43B7B-A3DA-40AD-A0D3-24758BA3FC42}.Debug|Win32.Build.0 = Debug|Win32
+		{70E43B7B-A3DA-40AD-A0D3-24758BA3FC42}.Release|Win32.ActiveCfg = Release|Win32
+		{70E43B7B-A3DA-40AD-A0D3-24758BA3FC42}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff -r 99173da7afae -r 44704f53ffc8 trafficintelligence.vcxproj
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trafficintelligence.vcxproj	Mon Jul 23 12:35:35 2012 -0400
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\trajectorymanagementandanalysis\trunk\src\TrajectoryManagementAndAnalysis\src\DBSQLiteAccess.cpp" />
+    <ClCompile Include="c\cvutils.cpp" />
+    <ClCompile Include="c\feature-based-tracking.cpp" />
+    <ClCompile Include="c\Motion.cpp" />
+    <ClCompile Include="c\Parameters.cpp" />
+    <ClCompile Include="c\utils.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="include\catch.hpp" />
+    <ClInclude Include="include\cvutils.hpp" />
+    <ClInclude Include="include\learning.hpp" />
+    <ClInclude Include="include\Motion.hpp" />
+    <ClInclude Include="include\Parameters.hpp" />
+    <ClInclude Include="include\utils.hpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{70E43B7B-A3DA-40AD-A0D3-24758BA3FC42}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>trafficintelligence</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="OpenCV.props" />
+    <Import Project="boost.props" />
+    <Import Project="klt.props" />
+    <Import Project="trajectory.props" />
+    <Import Project="sqlite.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="OpenCV.props" />
+    <Import Project="boost.props" />
+    <Import Project="klt.props" />
+    <Import Project="trajectory.props" />
+    <Import Project="sqlite.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)\bin\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)\bin\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)\bin\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)\bin\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;USE_OPENCV;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalUsingDirectories>
+      </AdditionalUsingDirectories>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy /Y /Q /D $(SolutionDir)\win32-depends\sqlite\bin\sqlite3.dll $(OutDir)
+xcopy /Y /Q /D $(SolutionDir)\win32-depends\opencv\bin\$(PlatformName)\$(ConfigurationName)\*.dll $(OutDir)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;USE_OPENCV;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalUsingDirectories>
+      </AdditionalUsingDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy /Y /Q /D $(SolutionDir)\win32-depends\sqlite\bin\sqlite3.dll $(OutDir)
+xcopy /Y /Q /D $(SolutionDir)\win32-depends\opencv\bin\$(PlatformName)\$(ConfigurationName)\*.dll $(OutDir)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff -r 99173da7afae -r 44704f53ffc8 trajectory.props
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trajectory.props	Mon Jul 23 12:35:35 2012 -0400
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\trajectorymanagementandanalysis\trunk\src\TrajectoryManagementAndAnalysis\src\;$(SolutionDir)\..\trajectorymanagementandanalysis\trunk\src\TrajectoryManagementAndAnalysis\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff -r 99173da7afae -r 44704f53ffc8 win32-depends/7za.exe
Binary file win32-depends/7za.exe has changed
diff -r 99173da7afae -r 44704f53ffc8 win32-depends/wget.exe
Binary file win32-depends/wget.exe has changed
diff -r 99173da7afae -r 44704f53ffc8 win32-depends/win32-depends-installer.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/win32-depends/win32-depends-installer.bat	Mon Jul 23 12:35:35 2012 -0400
@@ -0,0 +1,5 @@
+@echo off
+cls
+
+wget https://bitbucket.org/Nicolas/trafficintelligence/downloads/win32-depends.zip
+7za x win32-depends.zip 
\ No newline at end of file