Refractor LoadRunable

loadrunable.cpp

@@ -372,44 +372,10 @@ void LoadRunable::run()
         info.info.append({QObject::tr("Filename"), finfo.fileName()});
 
         std::shared_ptr<RawImage> rawImage;
-        timer.start();
+        if(!loadImage(m_file, info, rawImage))
-        if(m_file.endsWith(".CR2", Qt::CaseInsensitive) || m_file.endsWith(".CR3", Qt::CaseInsensitive) || m_file.endsWith(".NEF", Qt::CaseInsensitive) || m_file.endsWith(".DNG", Qt::CaseInsensitive))
+            info.info.append({QObject::tr("Error"), QObject::tr("Failed to load image")});
-        {
-            loadRAW(m_file, info, rawImage);
-            qDebug() << "LoadRAW" << timer.elapsed();
-        }
-        else if(m_file.endsWith(".FIT", Qt::CaseInsensitive) || m_file.endsWith(".FITS", Qt::CaseInsensitive))
-        {
-            loadFITS(m_file, info, rawImage);
-            qDebug() << "LoadFITS" << timer.elapsed();
-        }
-        else if(m_file.endsWith(".XISF", Qt::CaseInsensitive))
-        {
-            loadXISF(m_file, info, rawImage);
-            qDebug() << "LoadXISF" << timer.elapsed();
-        }
-        else
-        {
-            QImage img(m_file);
-    #ifdef COLOR_MANAGMENT
-            if(img.colorSpace().isValid() && img.colorSpace() != QColorSpace::SRgb)
-                img.convertToColorSpace(QColorSpace::SRgb);
-    #endif
 
-            ExifData *exif = exif_data_new_from_file(m_file.toLocal8Bit().constData());
+        if(rawImage && !m_thumbnail)
-            info.info.append({QObject::tr("Width"), QString::number(img.width())});
-            info.info.append({QObject::tr("Height"), QString::number(img.height())});
-            if(exif)
-            {
-                loadExifEntry(info, exif->ifd[EXIF_IFD_EXIF], EXIF_TAG_ISO_SPEED_RATINGS);
-                loadExifEntry(info, exif->ifd[EXIF_IFD_EXIF], EXIF_TAG_SHUTTER_SPEED_VALUE);
-                exif_data_free(exif);
-            }
-            rawImage = std::make_shared<RawImage>(img);
-            qDebug() << "LoadQImage" << timer.elapsed();
-        }
-
-        if(rawImage /*&& m_analyzeLevel >= Statistics*/ && !m_thumbnail)
         {
             timer.start();
             rawImage->calcStats();
@@ -437,52 +403,6 @@ void LoadRunable::run()
                                   .arg(100.0 * stats.m_saturated[1] / rawImage->size())
                                   .arg(100.0 * stats.m_saturated[2] / rawImage->size())});
             }
-
-            if(m_analyzeLevel >= Peaks)
-            {
-                std::vector<Peak> peaks;
-                /*RawImage *medianImage = rawImage->medianFilter();
-                qDebug() << "median" << timer.restart();
-                int numPeaks = medianImage->findPeaks(median+stdDev*2, 20, peaks);
-                delete medianImage;
-                qDebug() << "peaks" << timer.restart();
-                //if(m_analyzeLevel == Peaks)
-                //    drawPeaks(img, peaks);
-                qDebug() << "draw peaks" << timer.restart();
-                info.info.append({QObject::tr("Peaks"), QString::number(numPeaks)});
-                //info.info.append({QObject::tr("Peaks draw"), QString::number(peaks.size())});
-
-                if(m_analyzeLevel>= Stars)
-                {
-                    double fwhmX = 0;
-                    double fwhmY = 0;
-                    const int radius = 13;
-                    StarFit starFit(radius);
-                    std::vector<Star> stars;
-                    for(uint i=0; i<peaks.size(); i++)
-                    {
-                        Peak p = peaks[i];
-                        std::vector<double> r;
-                        int x = p.x();
-                        int y = p.y();
-                        rawImage->rect(x, y, radius, radius, r);
-                        Star star = starFit.fitStar(r, false);
-                        if(star.valid())
-                        {
-                            //printStarModel(radius, r, star);
-                            star.m_x += x;
-                            star.m_y += y;
-                            fwhmX += star.fwhmX();
-                            fwhmY += star.fwhmY();
-                            stars.push_back(star);
-                        }
-                    }
-                    //drawStars(img, stars);
-                    info.info.append({QObject::tr("FWHM X"), QString::number(fwhmX/stars.size())});
-                    info.info.append({QObject::tr("FWHM Y"), QString::number(fwhmY/stars.size())});
-                }
-                qDebug() << "Star fit" << timer.restart();*/
-            }
         }
 
         if(m_thumbnail)
@@ -551,6 +471,50 @@ bool readXISFHeader(const QString &path, ImageInfoData &info)
     return true;
 }
 
+bool loadImage(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage> &rawImage)
+{
+    bool ret = false;
+    QElapsedTimer timer;
+    timer.start();
+    if(path.endsWith(".CR2", Qt::CaseInsensitive) || path.endsWith(".CR3", Qt::CaseInsensitive) || path.endsWith(".NEF", Qt::CaseInsensitive) || path.endsWith(".DNG", Qt::CaseInsensitive))
+    {
+        ret = loadRAW(path, info, rawImage);
+        qDebug() << "LoadRAW" << timer.elapsed();
+    }
+    else if(path.endsWith(".FIT", Qt::CaseInsensitive) || path.endsWith(".FITS", Qt::CaseInsensitive))
+    {
+        ret = loadFITS(path, info, rawImage);
+        qDebug() << "LoadFITS" << timer.elapsed();
+    }
+    else if(path.endsWith(".XISF", Qt::CaseInsensitive))
+    {
+        ret = loadXISF(path, info, rawImage);
+        qDebug() << "LoadXISF" << timer.elapsed();
+    }
+    else
+    {
+        QImage img(path);
+#ifdef COLOR_MANAGMENT
+        if(img.colorSpace().isValid() && img.colorSpace() != QColorSpace::SRgb)
+            img.convertToColorSpace(QColorSpace::SRgb);
+#endif
+
+        ExifData *exif = exif_data_new_from_file(path.toLocal8Bit().constData());
+        info.info.append({QObject::tr("Width"), QString::number(img.width())});
+        info.info.append({QObject::tr("Height"), QString::number(img.height())});
+        if(exif)
+        {
+            loadExifEntry(info, exif->ifd[EXIF_IFD_EXIF], EXIF_TAG_ISO_SPEED_RATINGS);
+            loadExifEntry(info, exif->ifd[EXIF_IFD_EXIF], EXIF_TAG_SHUTTER_SPEED_VALUE);
+            exif_data_free(exif);
+        }
+        rawImage = std::make_shared<RawImage>(img);
+        qDebug() << "LoadQImage" << timer.elapsed();
+        ret = !img.isNull();
+    }
+    return ret;
+}
+
 ConvertRunable::ConvertRunable(const QString &in, const QString &out, const QString &format) :
     m_infile(in),
     m_outfile(out),

loadrunable.h

@@ -5,8 +5,11 @@
 #include <QString>
 #include "imageinfo.h"
 
+class RawImage;
+
 bool readFITSHeader(const QString &path, ImageInfoData &info);
 bool readXISFHeader(const QString &path, ImageInfoData &info);
+bool loadImage(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage> &rawImage);
 
 class Image;