Changed indents to be consistent

This commit is contained in:
Matt Hill
2015-03-18 18:32:07 -04:00
parent c04dd4104d
commit fb3c93a162
2 changed files with 143 additions and 156 deletions

View File

@@ -1,57 +1,51 @@
/* /*
* Copyright (c) 2014 New Designs Unlimited, LLC * Copyright (c) 2014 New Designs Unlimited, LLC
* Opensource Automated License Plate Recognition [http://www.openalpr.com] * Opensource Automated License Plate Recognition [http://www.openalpr.com]
* *
* This file is part of OpenAlpr. * This file is part of OpenAlpr.
* *
* OpenAlpr is free software: you can redistribute it and/or modify * OpenAlpr is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License * it under the terms of the GNU Affero General Public License
* version 3 as published by the Free Software Foundation * version 3 as published by the Free Software Foundation
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details. * GNU Affero General Public License for more details.
* *
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "detectormorph.h" #include "detectormorph.h"
using namespace cv; using namespace cv;
using namespace std; using namespace std;
namespace alpr namespace alpr {
{
DetectorMorph::DetectorMorph(Config* config) : Detector(config) { DetectorMorph::DetectorMorph(Config* config) : Detector(config) {
this->loaded = true; this->loaded = true;
} }
DetectorMorph::~DetectorMorph() { DetectorMorph::~DetectorMorph() {
} }
vector<PlateRegion> DetectorMorph::detect(Mat frame, std::vector<cv::Rect> regionsOfInterest) vector<PlateRegion> DetectorMorph::detect(Mat frame, std::vector<cv::Rect> regionsOfInterest) {
{
Mat frame_gray; Mat frame_gray;
cvtColor(frame, frame_gray, CV_BGR2GRAY); cvtColor(frame, frame_gray, CV_BGR2GRAY);
vector<PlateRegion> detectedRegions; vector<PlateRegion> detectedRegions;
for (int i = 0; i < regionsOfInterest.size(); i++) for (int i = 0; i < regionsOfInterest.size(); i++) {
{
Mat img_open, img_result; Mat img_open, img_result;
Mat element = getStructuringElement(MORPH_RECT, Size(30, 4)); Mat element = getStructuringElement(MORPH_RECT, Size(30, 4));
morphologyEx(frame_gray, img_open, CV_MOP_OPEN, element, cv::Point(-1, -1)); morphologyEx(frame_gray, img_open, CV_MOP_OPEN, element, cv::Point(-1, -1));
img_result = frame_gray - img_open; img_result = frame_gray - img_open;
if (config->debugDetector && config->debugShowImages) if (config->debugDetector && config->debugShowImages) {
{
imshow("Opening", img_result); imshow("Opening", img_result);
} }
@@ -59,8 +53,7 @@ namespace alpr
Mat img_threshold, img_open2; Mat img_threshold, img_open2;
threshold(img_result, img_threshold, 0, 255, CV_THRESH_OTSU + CV_THRESH_BINARY); threshold(img_result, img_threshold, 0, 255, CV_THRESH_OTSU + CV_THRESH_BINARY);
if (config->debugDetector && config->debugShowImages) if (config->debugDetector && config->debugShowImages) {
{
imshow("Threshold Detector", img_threshold); imshow("Threshold Detector", img_threshold);
} }
@@ -69,8 +62,7 @@ namespace alpr
Mat rectElement = getStructuringElement(cv::MORPH_RECT, Size(20, 4)); Mat rectElement = getStructuringElement(cv::MORPH_RECT, Size(20, 4));
morphologyEx(img_open2, img_threshold, CV_MOP_CLOSE, rectElement, cv::Point(-1, -1)); morphologyEx(img_open2, img_threshold, CV_MOP_CLOSE, rectElement, cv::Point(-1, -1));
if (config->debugDetector && config->debugShowImages) if (config->debugDetector && config->debugShowImages) {
{
imshow("Close", img_threshold); imshow("Close", img_threshold);
waitKey(0); waitKey(0);
} }
@@ -87,14 +79,12 @@ namespace alpr
vector<RotatedRect> rects; vector<RotatedRect> rects;
//Remove patch that are no inside limits of aspect ratio and area. //Remove patch that are no inside limits of aspect ratio and area.
while (itc != contours.end()) while (itc != contours.end()) {
{
//Create bounding rect of object //Create bounding rect of object
RotatedRect mr = minAreaRect(Mat(*itc)); RotatedRect mr = minAreaRect(Mat(*itc));
if (!CheckSizes(mr)) if (!CheckSizes(mr))
itc = contours.erase(itc); itc = contours.erase(itc);
else else {
{
++itc; ++itc;
if (itc == contours.end()) continue; if (itc == contours.end()) continue;
rects.push_back(mr); rects.push_back(mr);
@@ -104,8 +94,7 @@ namespace alpr
//Now prunning based on checking all candidate plates for a min/max number of blobs //Now prunning based on checking all candidate plates for a min/max number of blobs
Mat img_crop, img_crop_b; Mat img_crop, img_crop_b;
vector< vector< Point> > plateBlobs; vector< vector< Point> > plateBlobs;
for (int i = 0; i < rects.size(); i++) for (int i = 0; i < rects.size(); i++) {
{
RotatedRect PlateRect = rects[i]; RotatedRect PlateRect = rects[i];
Size rect_size = PlateRect.size; Size rect_size = PlateRect.size;
@@ -137,8 +126,7 @@ namespace alpr
return detectedRegions; return detectedRegions;
} }
bool DetectorMorph::CheckSizes(RotatedRect& mr) bool DetectorMorph::CheckSizes(RotatedRect& mr) {
{
float error = 1.2; float error = 1.2;
@@ -151,12 +139,12 @@ namespace alpr
float rmax = 7.0; float rmax = 7.0;
int area = mr.size.height * mr.size.width; int area = mr.size.height * mr.size.width;
float r = (float)mr.size.width / (float)mr.size.height; float r = (float) mr.size.width / (float) mr.size.height;
if (r<1) if (r < 1)
r = (float)mr.size.height / (float)mr.size.width; r = (float) mr.size.height / (float) mr.size.width;
if ((area < min || area > max) || (r < rmin || r > rmax) || if ((area < min || area > max) || (r < rmin || r > rmax) ||
(mr.size.width < 20 || mr.size.width > 300) ) (mr.size.width < 20 || mr.size.width > 300))
return false; return false;
else else
return true; return true;

View File

@@ -1,21 +1,21 @@
/* /*
* Copyright (c) 2014 New Designs Unlimited, LLC * Copyright (c) 2014 New Designs Unlimited, LLC
* Opensource Automated License Plate Recognition [http://www.openalpr.com] * Opensource Automated License Plate Recognition [http://www.openalpr.com]
* *
* This file is part of OpenAlpr. * This file is part of OpenAlpr.
* *
* OpenAlpr is free software: you can redistribute it and/or modify * OpenAlpr is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License * it under the terms of the GNU Affero General Public License
* version 3 as published by the Free Software Foundation * version 3 as published by the Free Software Foundation
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details. * GNU Affero General Public License for more details.
* *
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef OPENALPR_DETECTORMORPH_H #ifndef OPENALPR_DETECTORMORPH_H
#define OPENALPR_DETECTORMORPH_H #define OPENALPR_DETECTORMORPH_H
@@ -31,8 +31,7 @@
#include "detector.h" #include "detector.h"
namespace alpr namespace alpr {
{
class DetectorMorph : public Detector { class DetectorMorph : public Detector {
public: public: