Implementation modifications.

Author: valentina-kustikova

sample_template/application.cpp

@@ -104,29 +104,20 @@ void onButtonsOnOffClick(int eventId, int x, int y, int flags, void *userData)
         elems->state = Application::OnFilter;
         return;
     }
-    if (offButtonClicked(elems->offButtonPlace, x, y))
+    if (onButtonClicked(elems->offButtonPlace, x, y))
     {
         elems->state = Application::OffFilter;
         return;
     }
 }
 
-bool onButtonClicked(cv::Rect onButtonPlace, int x, int y)
+bool onButtonClicked(cv::Rect buttonPlace, int x, int y)
 {
-    if (x < onButtonPlace.x || x > onButtonPlace.x + onButtonPlace.width ||
-        y < onButtonPlace.y || y > onButtonPlace.y + onButtonPlace.height)
+    if (x < buttonPlace.x || x > buttonPlace.x + buttonPlace.width ||
+        y < buttonPlace.y || y > buttonPlace.y + buttonPlace.height)
     {
         return false;
     }
     return true;
 }
 
-bool offButtonClicked(cv::Rect offButtonPlace, int x, int y)
-{
-    if (x < offButtonPlace.x || x > offButtonPlace.x + offButtonPlace.width ||
-        y < offButtonPlace.y || y > offButtonPlace.y + offButtonPlace.height)
-    {
-        return false;
-    }
-    return true;
-}

sample_template/application.hpp

@@ -6,8 +6,7 @@
 
 #include "processing.hpp"
 
-bool onButtonClicked(cv::Rect onButtonPlace, int x, int y);
-bool offButtonClicked(cv::Rect offButtonPlace, int x, int y);
+bool onButtonClicked(cv::Rect buttonPlace, int x, int y);
 void onButtonsOnOffClick(int eventId, int x, int y, int flags, void *userData);
 
 class Application
@@ -46,6 +45,5 @@ class Application
 
     int drawButtons(cv::Mat &display);
 
-    friend bool onButtonClicked(cv::Rect onButtonPlace, int x, int y);
-    friend bool offButtonClicked(cv::Rect offButtonPlace, int x, int y);
+    friend bool onButtonClicked(cv::Rect buttonPlace, int x, int y);
 };