]> rtime.felk.cvut.cz Git - eurobot/public.git/commitdiff
camera/color-finder: add teamcolor to recognition
authorMonika Svedirohova <svedimon@fel.cvut.cz>
Mon, 1 Oct 2012 17:53:24 +0000 (19:53 +0200)
committerMonika Svedirohova <svedimon@fel.cvut.cz>
Mon, 1 Oct 2012 17:53:24 +0000 (19:53 +0200)
src/camera/color-finder/control/CRecognition.cpp
src/camera/color-finder/control/CRecognition.h
src/camera/color-finder/main/revue.cpp

index 219d80af9360fa6c38f69fe4d5f16c0cb114604c..f961f7ac193e1dde36868c2149e747f9fe6b4a8f 100644 (file)
@@ -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
index 4727ba8978788ab64181fb073d2b942e061344c6..7d858fe85f49518ce42c843f98c8abdf32b07669 100644 (file)
@@ -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();
index 8fc84da104951e76b590cbe3a4e2886647479b0d..ec8263027e9af3d63baff55d22a52fd88b748022 100644 (file)
@@ -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;
 }