Fix exceptions and errors in analyzing code

loadrunable.cpp

@@ -384,6 +384,9 @@ bool loadXISF(const QString &path, ImageInfoData &info, RawImage **image)
 
 void LoadRunable::run()
 {
+    try
+    {
+
         if(!m_thumbnail && !m_receiver->isCurrent())
         {
             return;
@@ -506,14 +509,19 @@ void LoadRunable::run()
                 rawImage->convertToThumbnail();
                 QMetaObject::invokeMethod(m_receiver, "thumbnailLoadFinish", Qt::QueuedConnection, Q_ARG(void*, rawImage));
             }
-        else
-        {
-            qDebug() << "failed";
-        }
         }
         else
             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)
 {

rawimage.cpp

@@ -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 mask, dilate, locMax, result;
-    cv::dilate(m_img, dilate, kernel);
-    cv::compare(m_img, dilate, locMax, cv::CMP_GE);
-    cv::compare(m_img, cv::Scalar(background), mask, cv::CMP_GT);
+    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);

starfit.cpp

@@ -237,6 +237,8 @@ StarFit::StarFit(int size)
     m_fdf_an.fvv = nullptr;
     m_fdf_an.n = size*size;
     m_fdf_an.p = 6;//number of model parameters amplitude, x, y, sigma_x, sigma_y, angle
+
+    gsl_set_error_handler_off();
 }
 
 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_init(start, fdf, workspace);
-    gsl_vector *f = gsl_multifit_nlinear_residual(workspace);
+    int ret = gsl_multifit_nlinear_init(start, fdf, workspace);
+    if(ret)return star;
 
-    double cost, cost0;
-    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);
+    ret = gsl_multifit_nlinear_driver(MAX_ITER, TOL, TOL, TOL, nullptr, nullptr, &info, workspace);
 
     if(ret==0)
     {