Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

implemented a rotating guarddog rectangle for mapping :) will be impr…

…oved
  • Loading branch information...
commit ec695baa85b1dec68beb9fa745e56c0a66cc15a5 1 parent 6e99de6
@AmmarkoV authored
View
BIN  MotorFoundation/Arduino/libRoboVisionSensorLib.a
Binary file not shown
View
7 MotorFoundation/MotorHAL.h
@@ -7,6 +7,13 @@
#ifdef __cplusplus
extern "C" {
#endif
+
+extern unsigned int robot_height; // mm
+extern unsigned int robot_length; // mm
+extern unsigned int robot_width; // mm
+extern unsigned int motors_distance; // mm
+extern unsigned int wheel_diameter; // mm
+
unsigned int RobotInit(char * md23_device_id,char * arduino_device_id);
unsigned int RobotClose();
View
4 MotorFoundation/MotorHAL.layout
@@ -2,9 +2,9 @@
<CodeBlocks_layout_file>
<ActiveTarget name="Release" />
<File name="MotorHAL.c" open="1" top="0" tabpos="1">
- <Cursor position="1822" topLine="30" />
+ <Cursor position="361" topLine="0" />
</File>
<File name="MotorHAL.h" open="1" top="0" tabpos="2">
- <Cursor position="59" topLine="0" />
+ <Cursor position="279" topLine="0" />
</File>
</CodeBlocks_layout_file>
View
4 RoboVisionX.workspace
@@ -9,7 +9,7 @@
<Project filename="VideoInput/VideoInput.cbp" />
<Project filename="RoboKernel/RoboKernel.cbp" />
<Project filename="WorldMapping/MasterWorld/MasterWorld.cbp" />
- <Project filename="VisualCortex/VisualCortex.cbp" active="1" />
- <Project filename="RoboVisionX/RoboVisionX.cbp" />
+ <Project filename="VisualCortex/VisualCortex.cbp" />
+ <Project filename="RoboVisionX/RoboVisionX.cbp" active="1" />
</Workspace>
</CodeBlocks_workspace_file>
View
151 RoboVisionX/MapOverview.cpp
@@ -5,8 +5,11 @@
#include <wx/intl.h>
//*)
+#include <math.h>
+
#include "../RoboKernel/RoboKernel.h"
#include "../WorldMapping/MasterpathPlanning/MasterpathPlanning.h"
+#include "../MotorFoundation/MotorHAL.h"
#include <wx/dc.h>
@@ -21,6 +24,8 @@ unsigned int map_box_size=4;
unsigned int map_box_size_half=2;
+#define PI 3.14159265
+
wxBitmap *draw_area=0;
unsigned int draw_area_width=866;
unsigned int draw_area_height=500;
@@ -45,6 +50,9 @@ const long MapOverview::ID_CHECKBOX1 = wxNewId();
const long MapOverview::ID_BUTTON1 = wxNewId();
const long MapOverview::ID_BUTTON2 = wxNewId();
const long MapOverview::ID_BUTTON3 = wxNewId();
+const long MapOverview::ID_STATICTEXT2 = wxNewId();
+const long MapOverview::ID_SPINCTRL1 = wxNewId();
+const long MapOverview::ID_TIMER1 = wxNewId();
//*)
BEGIN_EVENT_TABLE(MapOverview,wxFrame)
@@ -67,15 +75,22 @@ MapOverview::MapOverview(wxWindow* parent,wxWindowID id,const wxPoint& pos,const
StaticText3 = new wxStaticText(this, ID_STATICTEXT3, _("Target Position"), wxPoint(304,536), wxDefaultSize, 0, _T("ID_STATICTEXT3"));
TextTargetPosX = new wxTextCtrl(this, ID_TEXTCTRL3, _("0"), wxPoint(400,532), wxSize(48,27), 0, wxDefaultValidator, _T("ID_TEXTCTRL3"));
TextTargetPosY = new wxTextCtrl(this, ID_TEXTCTRL4, _("0"), wxPoint(448,532), wxSize(48,27), 0, wxDefaultValidator, _T("ID_TEXTCTRL4"));
- CheckBoxAutoUpdate = new wxCheckBox(this, ID_CHECKBOX1, _("Auto Update"), wxPoint(672,536), wxDefaultSize, 0, wxDefaultValidator, _T("ID_CHECKBOX1"));
+ CheckBoxAutoUpdate = new wxCheckBox(this, ID_CHECKBOX1, _("Auto Update"), wxPoint(688,533), wxDefaultSize, 0, wxDefaultValidator, _T("ID_CHECKBOX1"));
CheckBoxAutoUpdate->SetValue(false);
- ButtonExecute = new wxButton(this, ID_BUTTON1, _("Execute"), wxPoint(808,528), wxDefaultSize, 0, wxDefaultValidator, _T("ID_BUTTON1"));
+ ButtonExecute = new wxButton(this, ID_BUTTON1, _("Execute"), wxPoint(800,520), wxSize(104,48), 0, wxDefaultValidator, _T("ID_BUTTON1"));
ButtonSetCurPos = new wxButton(this, ID_BUTTON2, _("Set"), wxPoint(248,530), wxSize(32,29), 0, wxDefaultValidator, _T("ID_BUTTON2"));
ButtonSetTargetPos = new wxButton(this, ID_BUTTON3, _("Set"), wxPoint(496,530), wxSize(32,29), 0, wxDefaultValidator, _T("ID_BUTTON3"));
+ StaticText2 = new wxStaticText(this, ID_STATICTEXT2, _("Rotation"), wxPoint(544,536), wxDefaultSize, 0, _T("ID_STATICTEXT2"));
+ SpinCtrlOrientation = new wxSpinCtrl(this, ID_SPINCTRL1, _T("0"), wxPoint(608,532), wxSize(56,27), 0, -360, 360, 0, _T("ID_SPINCTRL1"));
+ SpinCtrlOrientation->SetValue(_T("0"));
+ Timer1.SetOwner(this, ID_TIMER1);
+ Timer1.Start(100, false);
Connect(ID_BUTTON1,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&MapOverview::OnButtonExecuteClick);
Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&MapOverview::OnButtonSetCurPosClick);
Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&MapOverview::OnButtonSetTargetPosClick);
+ Connect(ID_SPINCTRL1,wxEVT_COMMAND_SPINCTRL_UPDATED,(wxObjectEventFunction)&MapOverview::OnSpinCtrlOrientationChange);
+ Connect(ID_TIMER1,wxEVT_TIMER,(wxObjectEventFunction)&MapOverview::OnTimer1Trigger);
//*)
draw_area = new wxBitmap(draw_area_width,draw_area_height,-1);
@@ -128,19 +143,127 @@ void DrawSolvePath(wxMemoryDC &mem)
return;
}
-void DrawStartPoint(wxMemoryDC &mem,unsigned int startx,unsigned int starty)
+void DrawStartPoint(wxMemoryDC &mem,unsigned int startx,unsigned int starty,float heading)
{
wxBrush greenback(wxColour(0,255,0),wxSOLID);
wxPen green(wxColour(0,255,0),1,wxSOLID);
+ fprintf(stderr,"Drawing Start point @ %u,%u heading %0.2f\n",startx,starty,heading);
+
+ // We have a box sized 6x12
+ // and want to rotate it accordign to heading
+ /*
+
+ |
+ | * X',Y'
+ | - * X,Y
+ | r - -
+ | - -
+ | - - r
+ | - -
+ |_-_________________
+
+ (old coordinates are (x, y) and the new coordinates are (x', y'))
+
+ q = initial angle, f = angle of rotation.
+
+ x = r cos q
+ y = r sin q
+
+ x' = r cos ( q + f ) = r cos q cos f - r sin q sin f
+ y' = r sin ( q + w ) = r sin q cos f + r cos q sin f
+
+ hence:
+ x' = x cos f - y sin f
+ y' = y cos f + x sin f
+
+
+ We also asume
+
+-,- 0,+ + . -
+
+ XL,YL
+X4,Y4________________ X1,Y1
+ | |
+XB | * | XF
+ YB| | YF
+ |________________|
+X3,Y3 X2,Y2
+-.+ 0,- + , +
+ XR,YR
+ */
+
+ float box_width = robot_length/1000;
+ float box_height = robot_width/1000;
+
+
+ float XA1 = 0.0+box_width/2 ;
+ float YA1 = 0.0-box_height/2 ;
+ float XA2 = 0.0+box_width/2 ;
+ float YA2 = 0.0+box_height/2 ;
+ float XA3 = 0.0-box_width/2 ;
+ float YA3 = 0.0+box_height/2 ;
+ float XA4 = 0.0-box_width/2 ;
+ float YA4 = 0.0-box_height/2 ;
+
+ float XAF = 0.0+box_width/2 ;
+ float YAF = 0.0;
+ float XAB= 0.0-box_width/2 ;
+ float YAB = 0.0;
+ float XAR = 0.0;
+ float YAR = 0.0+box_height/2 ;
+ float XAL = 0.0 ;
+ float YAL = 0.0-box_height/2 ;
+
+ float XB1 , YB1, XB2, YB2, XB3 , YB3, XB4, YB4 , XBF, YBF , XBB, YBB , XBR, YBR , XBL, YBL ;
+
+ XB1 = startx + (XA1 * cos(heading*PI/180)) - (YA1 * sin(heading*PI/180));
+ YB1 = starty + (YA1 * cos(heading*PI/180)) + (XA1 * sin(heading*PI/180));
+
+
+ XB2 = startx + XA2 * cos(heading*PI/180) - YA2 * sin(heading*PI/180);
+ YB2 = starty + YA2 * cos(heading*PI/180) + XA2 * sin(heading*PI/180);
+
+
+ XB3 = startx + XA3 * cos(heading*PI/180) - YA3 * sin(heading*PI/180);
+ YB3 = starty + YA3 * cos(heading*PI/180) + XA3 * sin(heading*PI/180);
+
+
+ XB4 = startx + XA4 * cos(heading*PI/180) - YA4 * sin(heading*PI/180);
+ YB4 = starty + YA4 * cos(heading*PI/180) + XA4 * sin(heading*PI/180);
+
+ XBF = startx + XAF * cos(heading*PI/180) - YAF * sin(heading*PI/180);
+ YBF = starty + YAF * cos(heading*PI/180) + XAF * sin(heading*PI/180);
+
+ XBB = startx + XAB * cos(heading*PI/180) - YAB * sin(heading*PI/180);
+ YBB = starty + YAB * cos(heading*PI/180) + XAB * sin(heading*PI/180);
+
+ XBR = startx + XAR * cos(heading*PI/180) - YAR * sin(heading*PI/180);
+ YBR = starty + YAR * cos(heading*PI/180) + XAR * sin(heading*PI/180);
+
+ XBL = startx + XAL * cos(heading*PI/180) - YAL * sin(heading*PI/180);
+ YBL = starty + YAL * cos(heading*PI/180) + XAL * sin(heading*PI/180);
+
+
+ fprintf(stderr,"We have points %0.2f,%0.2f %0.2f,%0.2f %0.2f,%0.2f %0.2f,%0.2f \n",XB1,YB1,XB2,YB2,XB3,YB3,XB4,YB4);
if ( (startx!=0) || (starty!=0) )
{
+ mem.SetPen(green);
+ mem.SetBrush(greenback);
+
+ mem.DrawLine((signed int)XB1,(signed int)YB1,(signed int)XB2,(signed int)YB2);
+ mem.DrawLine((signed int)XB2,(signed int)YB2,(signed int)XB3,(signed int)YB3);
+ mem.DrawLine((signed int)XB3,(signed int)YB3,(signed int)XB4,(signed int)YB4);
+ mem.DrawLine((signed int)XB4,(signed int)YB4,(signed int)XB1,(signed int)YB1);
+
+ //ARROW
+ mem.DrawLine((signed int)XBB,(signed int)YBB,(signed int)XBF,(signed int)YBF);
+ mem.DrawLine((signed int)XBF,(signed int)YBF,(signed int)XBL,(signed int)YBL);
+ mem.DrawLine((signed int)XBF,(signed int)YBF,(signed int)XBR,(signed int)YBR);
- mem.SetPen(green);
- mem.SetBrush(greenback);
- mem.DrawRectangle(startx*map_box_size-3,starty*map_box_size-3,map_box_size+6,map_box_size+6);
+ mem.DrawRectangle(startx*map_box_size-3,starty*map_box_size-3,map_box_size+6,map_box_size+6);
}
}
@@ -185,9 +308,9 @@ void DrawWorld(wxMemoryDC &mem,struct Map *floorplancopy)
mem.SetPen(black);
mem.SetBrush(whiteback);
- for (int y =0; y<draw_area_actual_pointsY; y++ )
+ for (unsigned int y =0; y<draw_area_actual_pointsY; y++ )
{
- for (int x =0; x<draw_area_actual_pointsX; x++ )
+ for (unsigned int x =0; x<draw_area_actual_pointsX; x++ )
{
obj = ObstacleExists(GetWorldHandler(),x,y);
@@ -231,7 +354,7 @@ void DrawWorld(wxMemoryDC &mem,struct Map *floorplancopy)
unsigned int startx=0,starty=0;
GetAgentLocation(GetWorldHandler(),OURROBOT,&startx,&starty);
- DrawStartPoint(mem,startx,starty);
+ DrawStartPoint(mem,startx,starty,GetAgentHeading(GetWorldHandler(),OURROBOT));
}
@@ -345,3 +468,13 @@ void MapOverview::OnButtonSetTargetPosClick(wxCommandEvent& event)
{
set_point_flag=2;
}
+
+void MapOverview::OnTimer1Trigger(wxTimerEvent& event)
+{
+}
+
+void MapOverview::OnSpinCtrlOrientationChange(wxSpinEvent& event)
+{
+ SetAgentHeading(GetWorldHandler(),OURROBOT,(float) SpinCtrlOrientation->GetValue());
+ Refresh();
+}
View
10 RoboVisionX/MapOverview.h
@@ -2,12 +2,14 @@
#define MAPOVERVIEW_H
//(*Headers(MapOverview)
+#include <wx/spinctrl.h>
#include <wx/checkbox.h>
#include <wx/button.h>
#include <wx/statbox.h>
#include <wx/frame.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>
+#include <wx/timer.h>
//*)
class MapOverview: public wxFrame
@@ -20,13 +22,16 @@ class MapOverview: public wxFrame
//(*Declarations(MapOverview)
wxButton* ButtonExecute;
wxTextCtrl* TextTargetPosX;
+ wxSpinCtrl* SpinCtrlOrientation;
wxCheckBox* CheckBoxAutoUpdate;
wxStaticText* StaticText1;
+ wxTimer Timer1;
wxButton* ButtonSetTargetPos;
wxTextCtrl* TextCurPosX;
wxButton* ButtonSetCurPos;
wxStaticText* StaticText3;
wxStaticBox* StaticBox1;
+ wxStaticText* StaticText2;
wxTextCtrl* TextTargetPosY;
wxTextCtrl* TextCurPosY;
//*)
@@ -45,6 +50,9 @@ class MapOverview: public wxFrame
static const long ID_BUTTON1;
static const long ID_BUTTON2;
static const long ID_BUTTON3;
+ static const long ID_STATICTEXT2;
+ static const long ID_SPINCTRL1;
+ static const long ID_TIMER1;
//*)
private:
@@ -53,6 +61,8 @@ class MapOverview: public wxFrame
void OnButtonExecuteClick(wxCommandEvent& event);
void OnButtonSetCurPosClick(wxCommandEvent& event);
void OnButtonSetTargetPosClick(wxCommandEvent& event);
+ void OnTimer1Trigger(wxTimerEvent& event);
+ void OnSpinCtrlOrientationChange(wxSpinEvent& event);
//*)
void OnPaint(wxPaintEvent& event);
View
43 RoboVisionX/RoboVisionX.depend
@@ -636,7 +636,7 @@
1314284222 /usr/include/wx-2.8/wx/gtk/textctrl.h
-1326843154 /home/ammar/Documents/Programming/RoboVision/VisualCortex/VisualCortex.h
+1333557760 /home/ammar/Documents/Programming/RoboVision/VisualCortex/VisualCortex.h
1324775140 source:/home/ammar/Documents/Programming/RoboVision/RoboVisionX/FeedScreenMemory.cpp
"FeedScreenMemory.h"
@@ -1513,7 +1513,7 @@
"wx/defs.h"
"wx/object.h"
-1324782999 /home/ammar/Documents/Programming/RoboVision/MotorFoundation/MotorHAL.h
+1333930768 /home/ammar/Documents/Programming/RoboVision/MotorFoundation/MotorHAL.h
"../WorldMapping/MasterpathPlanning/MasterpathPlanning.h"
1289554847 /home/ammar/Documents/Programming/RoboVision/WorldMapping/MasterpathPlanning/MasterpathPlanning.h
@@ -1602,11 +1602,12 @@
1323564375 /home/ammar/Documents/Programming/RoboVision/WorldMapping/MasterWorld/MasterWorld.h
-1333667554 source:/home/ammar/Documents/Programming/RoboVision/RoboVisionX/MapOverview.cpp
+1333928136 source:/home/ammar/Documents/Programming/RoboVision/RoboVisionX/MapOverview.cpp
"MapOverview.h"
"RoboVisionXMain.h"
<wx/string.h>
<wx/intl.h>
+ <math.h>
"../RoboKernel/RoboKernel.h"
"../WorldMapping/MasterpathPlanning/MasterpathPlanning.h"
<wx/dc.h>
@@ -1615,11 +1616,45 @@
<wx/colour.h>
<wx/utils.h>
-1333661169 /home/ammar/Documents/Programming/RoboVision/RoboVisionX/MapOverview.h
+1333917095 /home/ammar/Documents/Programming/RoboVision/RoboVisionX/MapOverview.h
+ <wx/spinctrl.h>
<wx/checkbox.h>
<wx/button.h>
<wx/statbox.h>
<wx/frame.h>
<wx/stattext.h>
<wx/textctrl.h>
+ <wx/timer.h>
+
+1314284222 /usr/include/wx-2.8/wx/spinctrl.h
+ "wx/defs.h"
+ "wx/spinbutt.h"
+ "wx/generic/spinctlg.h"
+ "wx/msw/spinctrl.h"
+ "wx/os2/spinctrl.h"
+ "wx/gtk/spinctrl.h"
+ "wx/gtk1/spinctrl.h"
+ "wx/generic/spinctlg.h"
+ "wx/mac/spinctrl.h"
+ "wx/generic/spinctlg.h"
+
+1314284222 /usr/include/wx-2.8/wx/spinbutt.h
+ "wx/defs.h"
+ "wx/control.h"
+ "wx/event.h"
+ "wx/univ/spinbutt.h"
+ "wx/msw/spinbutt.h"
+ "wx/motif/spinbutt.h"
+ "wx/gtk/spinbutt.h"
+ "wx/gtk1/spinbutt.h"
+ "wx/mac/spinbutt.h"
+ "wx/cocoa/spinbutt.h"
+ "wx/os2/spinbutt.h"
+
+1314284222 /usr/include/wx-2.8/wx/gtk/spinbutt.h
+
+1314284222 /usr/include/wx-2.8/wx/generic/spinctlg.h
+ "wx/textctrl.h"
+
+1314284222 /usr/include/wx-2.8/wx/gtk/spinctrl.h
View
12 RoboVisionX/RoboVisionX.layout
@@ -2,7 +2,7 @@
<CodeBlocks_layout_file>
<ActiveTarget name="Release" />
<File name="CortexSettings.cpp" open="1" top="0" tabpos="6">
- <Cursor position="28442" topLine="371" />
+ <Cursor position="32706" topLine="470" />
</File>
<File name="CortexSettings.h" open="1" top="0" tabpos="7">
<Cursor position="254" topLine="0" />
@@ -19,11 +19,11 @@
<File name="FramesOSD.h" open="1" top="0" tabpos="13">
<Cursor position="475" topLine="0" />
</File>
- <File name="MapOverview.cpp" open="1" top="0" tabpos="14">
- <Cursor position="9624" topLine="300" />
+ <File name="MapOverview.cpp" open="1" top="1" tabpos="14">
+ <Cursor position="12334" topLine="356" />
</File>
<File name="MapOverview.h" open="1" top="0" tabpos="15">
- <Cursor position="1558" topLine="18" />
+ <Cursor position="1889" topLine="1" />
</File>
<File name="RememberImage.cpp" open="1" top="0" tabpos="8">
<Cursor position="2953" topLine="34" />
@@ -37,8 +37,8 @@
<File name="RoboVisionXApp.h" open="1" top="0" tabpos="3">
<Cursor position="0" topLine="0" />
</File>
- <File name="RoboVisionXMain.cpp" open="1" top="1" tabpos="1">
- <Cursor position="4588" topLine="111" />
+ <File name="RoboVisionXMain.cpp" open="1" top="0" tabpos="1">
+ <Cursor position="4988" topLine="111" />
</File>
<File name="RoboVisionXMain.h" open="1" top="0" tabpos="2">
<Cursor position="783" topLine="135" />
View
21 RoboVisionX/wxsmith/MapOverview.wxs
@@ -40,11 +40,12 @@
</object>
<object class="wxCheckBox" name="ID_CHECKBOX1" variable="CheckBoxAutoUpdate" member="yes">
<label>Auto Update</label>
- <pos>672,536</pos>
+ <pos>688,533</pos>
</object>
<object class="wxButton" name="ID_BUTTON1" variable="ButtonExecute" member="yes">
<label>Execute</label>
- <pos>808,528</pos>
+ <pos>800,520</pos>
+ <size>104,48</size>
<handler function="OnButtonExecuteClick" entry="EVT_BUTTON" />
</object>
<object class="wxButton" name="ID_BUTTON2" variable="ButtonSetCurPos" member="yes">
@@ -59,5 +60,21 @@
<size>32,29</size>
<handler function="OnButtonSetTargetPosClick" entry="EVT_BUTTON" />
</object>
+ <object class="wxStaticText" name="ID_STATICTEXT2" variable="StaticText2" member="yes">
+ <label>Rotation</label>
+ <pos>544,536</pos>
+ </object>
+ <object class="wxSpinCtrl" name="ID_SPINCTRL1" variable="SpinCtrlOrientation" member="yes">
+ <value>0</value>
+ <min>-360</min>
+ <max>360</max>
+ <pos>608,532</pos>
+ <size>56,27</size>
+ <handler function="OnSpinCtrlOrientationChange" entry="EVT_SPINCTRL" />
+ </object>
+ <object class="wxTimer" name="ID_TIMER1" variable="Timer1" member="yes">
+ <interval>100</interval>
+ <handler function="OnTimer1Trigger" entry="EVT_TIMER" />
+ </object>
</object>
</wxsmith>
View
2  VisualCortex/VisualCortex.depend
@@ -186,7 +186,7 @@
"VisCortexTimer.h"
"StateSetting.h"
-1333835826 source:/home/ammar/Documents/Programming/RoboVision/VisualCortex/VisualCortex.c
+1333840397 source:/home/ammar/Documents/Programming/RoboVision/VisualCortex/VisualCortex.c
"VisualCortex.h"
"VisionMemory.h"
"Precalculations.h"
View
58 VisualCortex/VisualCortex.layout
@@ -2,19 +2,19 @@
<CodeBlocks_layout_file>
<ActiveTarget name="Release" />
<File name="CameraPose.c" open="1" top="0" tabpos="44">
- <Cursor position="918" topLine="114" />
+ <Cursor position="918" topLine="0" />
</File>
<File name="CameraPose.h" open="1" top="0" tabpos="43">
<Cursor position="862" topLine="0" />
</File>
<File name="DisparityDepthMap.c" open="1" top="0" tabpos="7">
- <Cursor position="2909" topLine="95" />
+ <Cursor position="31354" topLine="682" />
</File>
<File name="DisparityDepthMap.h" open="1" top="0" tabpos="8">
<Cursor position="89" topLine="0" />
</File>
<File name="DisparityDepthMap_Heuristics.c" open="1" top="0" tabpos="26">
- <Cursor position="15298" topLine="415" />
+ <Cursor position="4507" topLine="120" />
</File>
<File name="DisparityDepthMap_Heuristics.h" open="1" top="0" tabpos="34">
<Cursor position="1348" topLine="0" />
@@ -26,67 +26,67 @@
<Cursor position="209" topLine="0" />
</File>
<File name="FeatureExtraction.c" open="1" top="0" tabpos="14">
- <Cursor position="5302" topLine="0" />
+ <Cursor position="4247" topLine="149" />
</File>
<File name="FeatureExtraction.h" open="1" top="0" tabpos="15">
<Cursor position="162" topLine="0" />
</File>
<File name="FeatureLists.c" open="1" top="0" tabpos="38">
- <Cursor position="8403" topLine="0" />
+ <Cursor position="8403" topLine="180" />
</File>
<File name="FeatureLists.h" open="1" top="0" tabpos="30">
<Cursor position="647" topLine="0" />
</File>
<File name="FeatureTracking.c" open="1" top="0" tabpos="20">
- <Cursor position="288" topLine="0" />
+ <Cursor position="15232" topLine="358" />
</File>
<File name="FeatureTracking.h" open="1" top="0" tabpos="29">
<Cursor position="571" topLine="0" />
</File>
<File name="IntegralImageConversion.c" open="1" top="0" tabpos="21">
- <Cursor position="9868" topLine="306" />
+ <Cursor position="15090" topLine="378" />
</File>
<File name="IntegralImageConversion.h" open="1" top="0" tabpos="22">
- <Cursor position="850" topLine="0" />
+ <Cursor position="1084" topLine="0" />
</File>
<File name="LinearAlgebra.c" open="1" top="0" tabpos="25">
- <Cursor position="11545" topLine="351" />
+ <Cursor position="11545" topLine="218" />
</File>
<File name="LinearAlgebra.h" open="1" top="0" tabpos="31">
<Cursor position="261" topLine="0" />
</File>
<File name="Matrix.c" open="1" top="0" tabpos="45">
- <Cursor position="614" topLine="147" />
+ <Cursor position="614" topLine="0" />
</File>
<File name="Matrix.h" open="1" top="0" tabpos="46">
<Cursor position="180" topLine="0" />
</File>
<File name="MovementRegistration.c" open="1" top="0" tabpos="9">
- <Cursor position="1262" topLine="0" />
+ <Cursor position="3346" topLine="49" />
</File>
<File name="MovementRegistration.h" open="1" top="0" tabpos="10">
<Cursor position="633" topLine="0" />
</File>
<File name="PatchComparison.c" open="1" top="0" tabpos="32">
- <Cursor position="3843" topLine="63" />
+ <Cursor position="3843" topLine="39" />
</File>
<File name="PatchComparison.h" open="1" top="0" tabpos="33">
<Cursor position="133" topLine="0" />
</File>
<File name="PatternRecognition.c" open="1" top="0" tabpos="16">
- <Cursor position="6503" topLine="224" />
+ <Cursor position="6503" topLine="165" />
</File>
<File name="PatternRecognition.h" open="1" top="0" tabpos="17">
<Cursor position="299" topLine="0" />
</File>
<File name="Precalculations.c" open="1" top="0" tabpos="11">
- <Cursor position="817" topLine="2" />
+ <Cursor position="817" topLine="0" />
</File>
<File name="Precalculations.h" open="1" top="0" tabpos="35">
<Cursor position="350" topLine="0" />
</File>
<File name="StateSetting.c" open="1" top="0" tabpos="18">
- <Cursor position="3673" topLine="89" />
+ <Cursor position="3673" topLine="81" />
</File>
<File name="StateSetting.h" open="1" top="0" tabpos="19">
<Cursor position="141" topLine="0" />
@@ -98,52 +98,52 @@
<Cursor position="386" topLine="0" />
</File>
<File name="VideoInputAdapter.c" open="1" top="0" tabpos="36">
- <Cursor position="8936" topLine="236" />
+ <Cursor position="2990" topLine="85" />
</File>
<File name="VideoInputAdapter.h" open="1" top="0" tabpos="37">
<Cursor position="409" topLine="0" />
</File>
<File name="VisCortexConvolutionFilters.c" open="1" top="0" tabpos="27">
- <Cursor position="395" topLine="0" />
+ <Cursor position="5447" topLine="37" />
</File>
<File name="VisCortexConvolutionFilters.h" open="1" top="0" tabpos="28">
- <Cursor position="333" topLine="0" />
+ <Cursor position="122" topLine="0" />
</File>
- <File name="VisCortexFilters.c" open="1" top="1" tabpos="3">
- <Cursor position="6097" topLine="168" />
+ <File name="VisCortexFilters.c" open="1" top="0" tabpos="3">
+ <Cursor position="20106" topLine="652" />
</File>
<File name="VisCortexFilters.h" open="1" top="0" tabpos="4">
- <Cursor position="632" topLine="0" />
+ <Cursor position="698" topLine="0" />
</File>
<File name="VisCortexHeuristics.c" open="1" top="0" tabpos="24">
- <Cursor position="1626" topLine="0" />
+ <Cursor position="1326" topLine="33" />
</File>
<File name="VisCortexHeuristics.h" open="1" top="0" tabpos="23">
- <Cursor position="293" topLine="0" />
+ <Cursor position="324" topLine="0" />
</File>
<File name="VisCortexOptimizedConvolutionFilters.c" open="1" top="0" tabpos="39">
<Cursor position="1378" topLine="0" />
</File>
<File name="VisCortexOptimizedConvolutionFilters.h" open="1" top="0" tabpos="40">
- <Cursor position="243" topLine="0" />
+ <Cursor position="138" topLine="0" />
</File>
<File name="VisCortexTimer.c" open="1" top="0" tabpos="41">
- <Cursor position="1162" topLine="20" />
+ <Cursor position="1162" topLine="4" />
</File>
<File name="VisCortexTimer.h" open="1" top="0" tabpos="42">
<Cursor position="693" topLine="0" />
</File>
<File name="VisionMemory.c" open="1" top="0" tabpos="5">
- <Cursor position="12198" topLine="265" />
+ <Cursor position="25520" topLine="630" />
</File>
<File name="VisionMemory.h" open="1" top="0" tabpos="6">
- <Cursor position="1303" topLine="45" />
+ <Cursor position="4306" topLine="127" />
</File>
<File name="VisualCortex.c" open="1" top="0" tabpos="1">
- <Cursor position="8315" topLine="823" />
+ <Cursor position="25869" topLine="617" />
</File>
<File name="VisualCortex.h" open="1" top="0" tabpos="2">
- <Cursor position="1221" topLine="45" />
+ <Cursor position="1221" topLine="19" />
</File>
<File name="version.h" open="1" top="0" tabpos="49">
<Cursor position="0" topLine="0" />
View
BIN  WorldMapping/MasterWorld/libMasterWorld.a
Binary file not shown
View
4 WorldMapping/MasterpathPlanning/MasterpathPlanning.layout
@@ -8,7 +8,7 @@
<Cursor position="405" topLine="0" />
</File>
<File name="MasterpathPlanning.h" open="1" top="0" tabpos="2">
- <Cursor position="2334" topLine="94" />
+ <Cursor position="1568" topLine="67" />
</File>
<File name="NormalizePath.c" open="1" top="0" tabpos="7">
<Cursor position="8509" topLine="275" />
@@ -35,6 +35,6 @@
<Cursor position="0" topLine="0" />
</File>
<File name="main.c" open="1" top="0" tabpos="1">
- <Cursor position="319" topLine="348" />
+ <Cursor position="7074" topLine="308" />
</File>
</CodeBlocks_layout_file>
View
BIN  WorldMapping/MasterpathPlanning/libMasterpathPlanning.a
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.