Fix exceptions and errors in analyzing code
This commit is contained in:
+14
-6
@@ -384,6 +384,9 @@ bool loadXISF(const QString &path, ImageInfoData &info, RawImage **image)
|
|||||||
|
|
||||||
void LoadRunable::run()
|
void LoadRunable::run()
|
||||||
{
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
|
||||||
if(!m_thumbnail && !m_receiver->isCurrent())
|
if(!m_thumbnail && !m_receiver->isCurrent())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@@ -415,10 +418,10 @@ void LoadRunable::run()
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
QImage img(m_file);
|
QImage img(m_file);
|
||||||
#ifdef COLOR_MANAGMENT
|
#ifdef COLOR_MANAGMENT
|
||||||
if(img.colorSpace().isValid() && img.colorSpace() != QColorSpace::SRgb)
|
if(img.colorSpace().isValid() && img.colorSpace() != QColorSpace::SRgb)
|
||||||
img.convertToColorSpace(QColorSpace::SRgb);
|
img.convertToColorSpace(QColorSpace::SRgb);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ExifData *exif = exif_data_new_from_file(m_file.toLocal8Bit().constData());
|
ExifData *exif = exif_data_new_from_file(m_file.toLocal8Bit().constData());
|
||||||
info.info.append({QObject::tr("Width"), QString::number(img.width())});
|
info.info.append({QObject::tr("Width"), QString::number(img.width())});
|
||||||
@@ -506,13 +509,18 @@ void LoadRunable::run()
|
|||||||
rawImage->convertToThumbnail();
|
rawImage->convertToThumbnail();
|
||||||
QMetaObject::invokeMethod(m_receiver, "thumbnailLoadFinish", Qt::QueuedConnection, Q_ARG(void*, rawImage));
|
QMetaObject::invokeMethod(m_receiver, "thumbnailLoadFinish", Qt::QueuedConnection, Q_ARG(void*, rawImage));
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
qDebug() << "failed";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
QMetaObject::invokeMethod(m_receiver, "imageLoaded", Qt::QueuedConnection, Q_ARG(void*, rawImage), Q_ARG(ImageInfoData, info));
|
QMetaObject::invokeMethod(m_receiver, "imageLoaded", Qt::QueuedConnection, Q_ARG(void*, rawImage), Q_ARG(ImageInfoData, info));
|
||||||
|
}
|
||||||
|
catch(cv::Exception e)
|
||||||
|
{
|
||||||
|
qDebug() << e.what();
|
||||||
|
}
|
||||||
|
catch(std::exception e)
|
||||||
|
{
|
||||||
|
qDebug() << e.what();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool readFITSHeader(const QString &path, ImageInfoData &info)
|
bool readFITSHeader(const QString &path, ImageInfoData &info)
|
||||||
|
|||||||
+7
-4
@@ -224,10 +224,13 @@ int RawImage::findPeaks(double background, double distance, std::vector<Peak> &p
|
|||||||
|
|
||||||
cv::Mat kernel = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(distance, distance));
|
cv::Mat kernel = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(distance, distance));
|
||||||
|
|
||||||
cv::Mat mask, dilate, locMax, result;
|
cv::Mat img, mask, dilate, locMax, result;
|
||||||
cv::dilate(m_img, dilate, kernel);
|
if(m_img.channels() == 1)img = m_img;
|
||||||
cv::compare(m_img, dilate, locMax, cv::CMP_GE);
|
else cv::cvtColor(m_img, img, cv::COLOR_RGB2GRAY);
|
||||||
cv::compare(m_img, cv::Scalar(background), mask, cv::CMP_GT);
|
|
||||||
|
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::bitwise_and(locMax, mask, result);
|
||||||
|
|
||||||
cv::findContours(result, contours, cv::noArray(), cv::RETR_EXTERNAL, cv::CHAIN_APPROX_SIMPLE);
|
cv::findContours(result, contours, cv::noArray(), cv::RETR_EXTERNAL, cv::CHAIN_APPROX_SIMPLE);
|
||||||
|
|||||||
+5
-7
@@ -237,6 +237,8 @@ StarFit::StarFit(int size)
|
|||||||
m_fdf_an.fvv = nullptr;
|
m_fdf_an.fvv = nullptr;
|
||||||
m_fdf_an.n = size*size;
|
m_fdf_an.n = size*size;
|
||||||
m_fdf_an.p = 6;//number of model parameters amplitude, x, y, sigma_x, sigma_y, angle
|
m_fdf_an.p = 6;//number of model parameters amplitude, x, y, sigma_x, sigma_y, angle
|
||||||
|
|
||||||
|
gsl_set_error_handler_off();
|
||||||
}
|
}
|
||||||
|
|
||||||
StarFit::~StarFit()
|
StarFit::~StarFit()
|
||||||
@@ -272,14 +274,10 @@ Star StarFit::fitStar(const std::vector<double> &data, bool angle)
|
|||||||
|
|
||||||
gsl_multifit_nlinear_workspace *workspace = gsl_multifit_nlinear_alloc(gsl_multifit_nlinear_trust, &m_fdf_params, fdf->n, fdf->p);
|
gsl_multifit_nlinear_workspace *workspace = gsl_multifit_nlinear_alloc(gsl_multifit_nlinear_trust, &m_fdf_params, fdf->n, fdf->p);
|
||||||
|
|
||||||
gsl_multifit_nlinear_init(start, fdf, workspace);
|
int ret = gsl_multifit_nlinear_init(start, fdf, workspace);
|
||||||
gsl_vector *f = gsl_multifit_nlinear_residual(workspace);
|
if(ret)return star;
|
||||||
|
|
||||||
double cost, cost0;
|
ret = gsl_multifit_nlinear_driver(MAX_ITER, TOL, TOL, TOL, nullptr, nullptr, &info, workspace);
|
||||||
gsl_blas_ddot(f, f, &cost0);
|
|
||||||
int ret = gsl_multifit_nlinear_driver(MAX_ITER, TOL, TOL, TOL, nullptr, nullptr, &info, workspace);
|
|
||||||
|
|
||||||
gsl_blas_ddot(f, f, &cost);
|
|
||||||
|
|
||||||
if(ret==0)
|
if(ret==0)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user