Skip to content
Browse files

environment paths updated. boundingbox type updated

  • Loading branch information...
1 parent 77eb8e4 commit a4a7b6ccfb204249c076865a4e3d535332ca1a37 @macrini macrini committed
View
2 Tools/BasicTypes.h
@@ -159,7 +159,7 @@ template <typename T> struct BoundingBox
/*!
Note: the coordinates are regularized so that min is always mi and max is always max.
*/
- BoundingBox(const T& xn, const T& xx, const T& yn, const T& yx, bool regularizeCoords = true)
+ BoundingBox(const T& xn, const T& xx, const T& yn, const T& yx, bool regularizeCoords)
: xmin(xn), xmax(xx), ymin(yn), ymax(yx)
{
if (regularizeCoords)
View
2 VideoParser/ImageProcessor.cpp
@@ -163,7 +163,7 @@ bool ImageProcessor::OnGUIEvent(const UserEventInfo& uei)
if (uei.id == EVENT_MOUSE_PUSH)
{
- UIBoundingBox bbox(x, x, y, y);
+ UIBoundingBox bbox(x, x, y, y, false); // coords are not regularized
GetROISequence().push_back(bbox);
}
View
14 VideoParserVC/ParentPropertySheet.props
@@ -2,7 +2,9 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<RootDir>$(SolutionDir)..</RootDir>
- <LibRoot>$(SolutionDir)..\..\..\Libraries</LibRoot>
+ <LibRoot>$(RootDir)\..\Libraries</LibRoot>
+ <BuildDir>$(RootDir)\..\Builds</BuildDir>
+ <ExperimentsDir>$(RootDir)\..\Experiments</ExperimentsDir>
<OpenCVVersion>231</OpenCVVersion>
<OpenCVConfiguration>$(Configuration)</OpenCVConfiguration>
<OpenCVDir>$(LibRoot)\OpenCV2.3.1</OpenCVDir>
@@ -30,8 +32,8 @@
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir>$(SolutionDir)..\..\..\Builds\$(SolutionName)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)..\..\..\Builds\$(SolutionName)\$(ProjectName)\$(Configuration)\</IntDir>
+ <OutDir>$(BuildDir)\$(SolutionName)\$(Configuration)\</OutDir>
+ <IntDir>$(BuildDir)\$(SolutionName)\$(ProjectName)\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
@@ -55,6 +57,12 @@
<BuildMacro Include="LibRoot">
<Value>$(LibRoot)</Value>
</BuildMacro>
+ <BuildMacro Include="BuildDir">
+ <Value>$(BuildDir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="ExperimentsDir">
+ <Value>$(ExperimentsDir)</Value>
+ </BuildMacro>
<BuildMacro Include="OpenCVVersion">
<Value>$(OpenCVVersion)</Value>
</BuildMacro>
View
6 VideoParserVC/VideoParserGUI/VideoParserGUI.vcxproj.user
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LocalDebuggerCommandArguments>Experiment1a.txt -gui</LocalDebuggerCommandArguments>
+ <LocalDebuggerCommandArguments>params.txt -gui</LocalDebuggerCommandArguments>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LocalDebuggerWorkingDirectory>$(SolutionDir)\..\..\..\ShapeMatchingExperiments</LocalDebuggerWorkingDirectory>
+ <LocalDebuggerWorkingDirectory>$(ExperimentsDir)</LocalDebuggerWorkingDirectory>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LocalDebuggerEnvironment>PATH=$(OpenCVBin);$(MySQLBin)</LocalDebuggerEnvironment>
@@ -24,7 +24,7 @@
<LocalDebuggerCommandArguments>params.txt -gui</LocalDebuggerCommandArguments>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LocalDebuggerWorkingDirectory>$(SolutionDir)\..\..\..\ShapeMatchingExperiments</LocalDebuggerWorkingDirectory>
+ <LocalDebuggerWorkingDirectory>$(ExperimentsDir)</LocalDebuggerWorkingDirectory>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LocalDebuggerEnvironment>PATH=$(OpenCVBin);$(MySQLBin)</LocalDebuggerEnvironment>
View
BIN VideoParserVC/VideoParserVC.suo
Binary file not shown.

0 comments on commit a4a7b6c

Please sign in to comment.
Something went wrong with that request. Please try again.