First version OpenGL drawing

This commit is contained in:
2019-10-23 08:53:19 +02:00
parent 7e815634bb
commit 6aa52236a8
15 changed files with 318 additions and 17 deletions
+3 -5
View File
@@ -264,13 +264,13 @@ void LoadRunable::run()
if(m_file.endsWith(".CR2", Qt::CaseInsensitive))
{
timer.start();
loadRAW(m_file, info, m_analyzeLevel != None ? &rawImage : nullptr, &img);
loadRAW(m_file, info, &rawImage, &img);
raw = true;
qDebug() << "LoadRaw" << timer.elapsed();
}
else if(m_file.endsWith(".FIT", Qt::CaseInsensitive) || m_file.endsWith(".FITS", Qt::CaseInsensitive))
{
loadFITS(m_file, info, m_analyzeLevel != None ? &rawImage : nullptr, &img);
loadFITS(m_file, info, &rawImage, &img);
}
else
{
@@ -350,7 +350,5 @@ void LoadRunable::run()
}
}
if(rawImage)delete rawImage;
QMetaObject::invokeMethod(m_receiver, "imageLoaded", Qt::QueuedConnection, Q_ARG(QImage, img), Q_ARG(ImageInfoData, info));
QMetaObject::invokeMethod(m_receiver, "imageLoaded", Qt::QueuedConnection, Q_ARG(QImage, img), Q_ARG(void*, rawImage), Q_ARG(ImageInfoData, info));
}