From b48358b98f62d13f2f79ca4de58c494b68f3156b Mon Sep 17 00:00:00 2001 From: Monika Svedirohova Date: Mon, 1 Oct 2012 19:53:24 +0200 Subject: [PATCH] camera/color-finder: add teamcolor to recognition --- src/camera/color-finder/control/CRecognition.cpp | 2 +- src/camera/color-finder/control/CRecognition.h | 2 +- src/camera/color-finder/main/revue.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/camera/color-finder/control/CRecognition.cpp b/src/camera/color-finder/control/CRecognition.cpp index 219d80af..f961f7ac 100644 --- a/src/camera/color-finder/control/CRecognition.cpp +++ b/src/camera/color-finder/control/CRecognition.cpp @@ -42,7 +42,7 @@ void CRecognition::resetColorMap() } //nauci se dany pixel -void CRecognition::learnPixel(unsigned char* a,unsigned char color [3]) +void CRecognition::learnPixel(unsigned char* a,unsigned char color [3], int teamcolor) { if (a) { //ulozi pixel do vzoroveho diff --git a/src/camera/color-finder/control/CRecognition.h b/src/camera/color-finder/control/CRecognition.h index 4727ba89..7d858fe8 100644 --- a/src/camera/color-finder/control/CRecognition.h +++ b/src/camera/color-finder/control/CRecognition.h @@ -30,7 +30,7 @@ public: ~CRecognition(); SPixelPosition findMean(CRawImage* image); SPixelPosition findSegment(CRawImage* image); - void learnPixel(unsigned char* a,unsigned char color [3]); + void learnPixel(unsigned char* a,unsigned char color [3], int teamcolor); void increaseTolerance(); void decreaseTolerance(); void resetColorMap(); diff --git a/src/camera/color-finder/main/revue.cpp b/src/camera/color-finder/main/revue.cpp index 8fc84da1..ec826302 100644 --- a/src/camera/color-finder/main/revue.cpp +++ b/src/camera/color-finder/main/revue.cpp @@ -132,7 +132,7 @@ inline bool getCameraControlOn(void) { col = true; } } - if(col) recognition->learnPixel(pix, color); + if(col) recognition->learnPixel(pix, color, teamcolor); return camera_control_on; } -- 2.39.2