Remove dead code
This commit is contained in:
@@ -279,46 +279,6 @@ void RawImage::calcStats()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void RawImage::rect(int &x, int &y, int w, int h, std::vector<double> &r) const
|
|
||||||
{
|
|
||||||
/*r.resize(w*h);
|
|
||||||
x -= w/2;
|
|
||||||
y -= h/2;
|
|
||||||
if(x<0)x = 0;
|
|
||||||
if(y<0)y = 0;
|
|
||||||
if(x+w >= m_img.cols)x = m_img.cols-w;
|
|
||||||
if(y+h >= m_img.rows)y = m_img.rows-h;
|
|
||||||
cv::Mat roiImg(m_img, cv::Rect(x, y, w, h));
|
|
||||||
cv::Mat doubleMat;
|
|
||||||
roiImg.convertTo(doubleMat, CV_64F);
|
|
||||||
r = std::vector<double>(doubleMat.begin<double>(), doubleMat.end<double>());*/
|
|
||||||
}
|
|
||||||
|
|
||||||
int RawImage::findPeaks(double background, double distance, std::vector<Peak> &peaks) const
|
|
||||||
{
|
|
||||||
/*std::vector<std::vector<cv::Point>> contours;
|
|
||||||
|
|
||||||
cv::Mat kernel = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(distance, distance));
|
|
||||||
|
|
||||||
cv::Mat img, mask, dilate, locMax, result;
|
|
||||||
if(m_img.channels() == 1)img = m_img;
|
|
||||||
else cv::cvtColor(m_img, img, cv::COLOR_RGB2GRAY);
|
|
||||||
|
|
||||||
cv::dilate(img, dilate, kernel);
|
|
||||||
cv::compare(img, dilate, locMax, cv::CMP_GE);
|
|
||||||
cv::compare(img, cv::Scalar(background), mask, cv::CMP_GT);
|
|
||||||
cv::bitwise_and(locMax, mask, result);
|
|
||||||
|
|
||||||
cv::findContours(result, contours, cv::noArray(), cv::RETR_EXTERNAL, cv::CHAIN_APPROX_SIMPLE);
|
|
||||||
peaks.reserve(contours.size());
|
|
||||||
for(auto contour : contours)
|
|
||||||
{
|
|
||||||
peaks.push_back(Peak(1, contour[0].x, contour[0].y));
|
|
||||||
}
|
|
||||||
|
|
||||||
return peaks.size();*/
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t RawImage::width() const
|
uint32_t RawImage::width() const
|
||||||
{
|
{
|
||||||
return m_width;
|
return m_width;
|
||||||
|
|||||||
@@ -86,8 +86,6 @@ public:
|
|||||||
RawImage(const QImage &img);
|
RawImage(const QImage &img);
|
||||||
const RawImage::Stats& imageStats() const;
|
const RawImage::Stats& imageStats() const;
|
||||||
void calcStats();
|
void calcStats();
|
||||||
void rect(int &x, int &y, int w, int h, std::vector<double> &r) const;
|
|
||||||
int findPeaks(double background, double distance, std::vector<Peak> &peaks) const;
|
|
||||||
uint32_t width() const;
|
uint32_t width() const;
|
||||||
uint32_t height() const;
|
uint32_t height() const;
|
||||||
uint32_t channels() const;
|
uint32_t channels() const;
|
||||||
|
|||||||
Reference in New Issue
Block a user