Codework

1 files changed, 17 insertions, 9 deletions

diff --git a/source/Concept/Framework/modules/interpreter/position_tracker.h b/source/Concept/Framework/modules/interpreter/position_tracker.h
index e93ef0c..47d0740 100755
--- a/source/Concept/Framework/modules/interpreter/position_tracker.h
+++ b/source/Concept/Framework/modules/interpreter/position_tracker.h
@@ -32,19 +32,27 @@ protected:
 public:

 	void Update();

 

-	float GetPositionX()

-	{

-		return positionX;

+	// Sets the current position; x and y in mm

+	void SetPosition(int newPositionX, int newPositionY, float newOrientation) {

+		positionX = newPositionX*(TICKS_PER_CM/10.0f);

+		positionY = newPositionY*(TICKS_PER_CM/10.0f);

+		orientation = easyAngle(newOrientation);

 	}

 

-	float GetPositionY()

-	{

-		return positionY;

+	// returns x-koordinate in mm

+	int GetPositionX() 	{

+		return (int)((positionX*10.0f)/TICKS_PER_CM);

 	}

 

-	float GetOrientation()

-	{

-		return orientation;

+	// returns y-koordinate in mm

+	int GetPositionY() 	{

+		return (int)((positionY*10.0f)/TICKS_PER_CM);

+	}

+

+	// returns orientation

+	float GetOrientation()	{

+		return 0.0f; //tmp!!!!!!!!!!

+		//return orientation;

 	}

 };