nou/tenmon
1
0
Fork 1
Code Issues Pull Requests Projects Releases 33 Wiki Activity

Reworked RawImage class to use OpenCV

Browse Source
This commit is contained in:
Dušan Poizl
2020-05-10 17:02:16 +02:00
parent fcc1696c2c
commit 1e45a78b39
9 changed files with 265 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
loadrunable.cpp
+24 -11
View File
@@ -75,7 +75,7 @@ void printStarModel(int radius, const std::vector<double> &data, const Star &sta
std::cout << m.toStdString() << std::endl << std::endl;
}
bool loadRAW(QString path, ImageInfoData &info, RawImageAbs **image, QImage *qimage)
bool loadRAW(QString path, ImageInfoData &info, RawImage **image, QImage *qimage)
{
if(!image && !qimage)
return false;
@@ -108,7 +108,8 @@ bool loadRAW(QString path, ImageInfoData &info, RawImageAbs **image, QImage *qi
out[d++] = p;
}
}
*image = new RawImage<uint16_t>(rawdata.sizes.width, rawdata.sizes.height, out);
*image = new RawImage(rawdata.sizes.width, rawdata.sizes.height, RawImage::UINT16);
memcpy((*image)->data(), &out[0], sizeof(uint16_t)*w*h);
}
if(qimage)
@@ -143,7 +144,7 @@ bool loadRAW(QString path, ImageInfoData &info, RawImageAbs **image, QImage *qi
return true;
}
bool loadFITS(QString path, ImageInfoData &info, RawImageAbs **image, QImage *qimage)
bool loadFITS(QString path, ImageInfoData &info, RawImage **image, QImage *qimage)
{
if(!image && !qimage)
return false;
@@ -188,7 +189,11 @@ bool loadFITS(QString path, ImageInfoData &info, RawImageAbs **image, QImage *qi
for(size_t i=0; i<h; i++)
memcpy(qimage->scanLine(i), &bits8[i*w], w*sizeof(uint8_t));
}
if(image)*image = new RawImage<uint8_t>(naxes[0], naxes[1], bits8);
if(image)
{
*image = new RawImage(naxes[0], naxes[1], RawImage::UINT8);
memcpy((*image)->data(), &bits8[0], sizeof(uint8_t)*h*w);
}
break;
case SHORT_IMG:
bits16.resize(size);
@@ -203,10 +208,14 @@ bool loadFITS(QString path, ImageInfoData &info, RawImageAbs **image, QImage *qi
scanline[o] = bits16[i*w+o] >> 8;
}
}
if(image)*image = new RawImage<uint16_t>(naxes[0], naxes[1], bits16);
if(image)
{
*image = new RawImage(naxes[0], naxes[1], RawImage::UINT16);
memcpy((*image)->data(), &bits16[0], sizeof(uint16_t)*h*w);
}
break;
case LONG_IMG:
bits32.resize(size);
/*bits32.resize(size);
fits_read_pix(file, TUINT, fpixel, size, NULL, &bits32[0], NULL, &status);
if(status)break;
if(qimage)
@@ -218,7 +227,11 @@ bool loadFITS(QString path, ImageInfoData &info, RawImageAbs **image, QImage *qi
scanline[o] = bits32[i*w+o] >> 24;
}
}
if(image)*image = new RawImage<uint32_t>(naxes[0], naxes[1], bits32);
if(image)
{
*image = new RawImage(naxes[0], naxes[1], RawImage::FLOAT32);
memcpy((*image)->data(), &bits8[0], sizeof(uint32_t)*h*w);
}*/
break;
}
}
@@ -259,7 +272,7 @@ void LoadRunable::run()
info.append(StringPair(QObject::tr("Filename"), finfo.fileName()));
QImage img;
RawImageAbs *rawImage = nullptr;
RawImage *rawImage = nullptr;
bool raw = false;
if(m_file.endsWith(".CR2", Qt::CaseInsensitive))
{
@@ -288,7 +301,7 @@ void LoadRunable::run()
if(rawImage && m_analyzeLevel >= Statistics)
{
uint64_t mean, median, min, max;
double mean, median, min, max;
double stdDev;
timer.start();
rawImage->imageStats(&mean, &stdDev, &median, &min, &max);
@@ -306,9 +319,9 @@ void LoadRunable::run()
rawImage->quarter();
qDebug() << "quarter" << timer.restart();
}
RawImageAbs *medianImage = rawImage->medianFilter();
RawImage *medianImage = rawImage->medianFilter();
qDebug() << "median" << timer.restart();
int numPeaks = medianImage->findPeaks(median+stdDev, 20, peaks);
int numPeaks = medianImage->findPeaks(median+stdDev*2, 20, peaks);
delete medianImage;
qDebug() << "peaks" << timer.restart();
if(m_analyzeLevel == Peaks)