Handle MAX_PATH every where

database.cpp

@@ -15,32 +15,33 @@ bool Database::init(const QLatin1String &connectionName)
     QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
     QDir dir(path);
 
-    QSqlDatabase m_database = QSqlDatabase::addDatabase("QSQLITE", connectionName);
+    QSqlDatabase database = QSqlDatabase::addDatabase("QSQLITE", connectionName);
 
     if(!dir.mkpath("."))
         return false;
 
-    if(m_database.isValid())
+    if(database.isValid())
     {
-        m_database.setDatabaseName(dir.absoluteFilePath("database2.db"));
-        if(m_database.open())
+        database.setDatabaseName(dir.absoluteFilePath("database2.db"));
+        if(database.open())
         {
-            m_database.exec("PRAGMA foreign_keys = ON");
+            QSqlQuery query(database);
+            query.exec("PRAGMA foreign_keys = ON");
             int version = checkVersion();
             if(version == 0)
             {
-                m_database.exec("PRAGMA user_version = 1");
-                m_database.exec("CREATE TABLE IF NOT EXISTS files (id INTEGER PRIMARY KEY AUTOINCREMENT, file VARCHAR(255) UNIQUE)");
-                m_database.exec("CREATE TABLE IF NOT EXISTS fits_files (id INTEGER PRIMARY KEY AUTOINCREMENT, file VARCHAR(255) UNIQUE, mtime DATETIME,"
+                query.exec("PRAGMA user_version = 1");
+                query.exec("CREATE TABLE IF NOT EXISTS files (id INTEGER PRIMARY KEY AUTOINCREMENT, file VARCHAR(255) UNIQUE)");
+                query.exec("CREATE TABLE IF NOT EXISTS fits_files (id INTEGER PRIMARY KEY AUTOINCREMENT, file VARCHAR(255) UNIQUE, mtime DATETIME,"
                                 " minRa REAL, maxRa REAL, minDec REAL, maxDec REAL, crVal1 REAL, crVal2 REAL)");
-                m_database.exec("CREATE TABLE IF NOT EXISTS fits_headers (id INTEGER PRIMARY KEY AUTOINCREMENT, id_file INTEGER,"
+                query.exec("CREATE TABLE IF NOT EXISTS fits_headers (id INTEGER PRIMARY KEY AUTOINCREMENT, id_file INTEGER,"
                                 "key VARCHAR(81), value VARCHAR(81), comment VARCHAR(81), FOREIGN KEY(id_file) REFERENCES fits_files(id) ON DELETE CASCADE)");
-                m_database.exec("CREATE INDEX IF NOT EXISTS key_value ON fits_headers(key, value)");
-                m_database.exec("CREATE INDEX IF NOT EXISTS id_file ON fits_headers(id_file)");
-                m_database.exec("CREATE INDEX IF NOT EXISTS minRa_idx ON fits_files(minRa)");
-                m_database.exec("CREATE INDEX IF NOT EXISTS maxRa_idx ON fits_files(maxRa)");
-                m_database.exec("CREATE INDEX IF NOT EXISTS minDec_idx ON fits_files(minDec)");
-                m_database.exec("CREATE INDEX IF NOT EXISTS maxDec_idx ON fits_files(maxDec)");
+                query.exec("CREATE INDEX IF NOT EXISTS key_value ON fits_headers(key, value)");
+                query.exec("CREATE INDEX IF NOT EXISTS id_file ON fits_headers(id_file)");
+                query.exec("CREATE INDEX IF NOT EXISTS minRa_idx ON fits_files(minRa)");
+                query.exec("CREATE INDEX IF NOT EXISTS maxRa_idx ON fits_files(maxRa)");
+                query.exec("CREATE INDEX IF NOT EXISTS minDec_idx ON fits_files(minDec)");
+                query.exec("CREATE INDEX IF NOT EXISTS maxDec_idx ON fits_files(maxDec)");
             }
             else if(version > 1)
             {
@@ -48,28 +49,28 @@ bool Database::init(const QLatin1String &connectionName)
                 return false;
             }
 
-            QSqlError error = m_database.lastError();
+            QSqlError error = database.lastError();
 
             if(error.type() == QSqlError::NoError)
             {
-                m_markQuery = QSqlQuery(m_database);
+                m_markQuery = QSqlQuery(database);
                 m_markQuery.prepare("INSERT INTO files (file) VALUES (?)");
-                m_unmarkQuery = QSqlQuery(m_database);
+                m_unmarkQuery = QSqlQuery(database);
                 m_unmarkQuery.prepare("DELETE FROM files WHERE file = (?)");
-                m_isMarkedQuery = QSqlQuery(m_database);
+                m_isMarkedQuery = QSqlQuery(database);
                 m_isMarkedQuery.prepare("SELECT * FROM files WHERE file = (:name)");
 
-                m_insertFile = QSqlQuery(m_database);
+                m_insertFile = QSqlQuery(database);
                 m_insertFile.prepare("INSERT INTO fits_files (file, mtime) VALUES (?, ?)");
-                m_insertFileWcs = QSqlQuery(m_database);
+                m_insertFileWcs = QSqlQuery(database);
                 m_insertFileWcs.prepare("INSERT INTO fits_files (file, mtime, minRa, maxRa, minDec, maxDec, crVal1, crVal2) VALUES (?, ?, ?, ?, ?, ?, ?, ?)");
-                m_insertFitsHeader = QSqlQuery(m_database);
+                m_insertFitsHeader = QSqlQuery(database);
                 m_insertFitsHeader.prepare("INSERT INTO fits_headers (id_file, key, value, comment) VALUES (?, ?, ?, ?)");
-                m_checkFile = QSqlQuery(m_database);
+                m_checkFile = QSqlQuery(database);
                 m_checkFile.prepare("SELECT id,mtime FROM fits_files WHERE file=?");
-                m_headerKeywords = QSqlQuery(m_database);
+                m_headerKeywords = QSqlQuery(database);
                 m_headerKeywords.prepare("SELECT DISTINCT key FROM fits_headers ORDER BY key");
-                m_deleteFile = QSqlQuery(m_database);
+                m_deleteFile = QSqlQuery(database);
                 m_deleteFile.prepare("DELETE FROM fits_files WHERE id=?");
                 return true;
             }
@@ -130,7 +131,7 @@ QStringList Database::getMarkedFiles()
 
 void Database::clearMarkedFiles()
 {
-    QSqlDatabase::database().exec("DELETE FROM files");
+    QSqlQuery query("DELETE FROM files");
 }
 
 bool Database::checkError(QSqlQuery &query)
@@ -148,7 +149,7 @@ bool Database::checkError(QSqlQuery &query)
 int Database::checkVersion()
 {
     QSqlDatabase db = QSqlDatabase::database();
-    QSqlQuery query = db.exec("PRAGMA user_version");
+    QSqlQuery query("PRAGMA user_version");
     if(query.next())
         return query.value(0).toInt();
     return -1;
@@ -194,10 +195,10 @@ void Database::reindex(QProgressDialog *progress)
     QVariantList deleteids;
     QSqlDatabase database = QSqlDatabase::database();
     database.transaction();
-    QSqlQuery size = database.exec("SELECT COUNT(*) FROM fits_files");
+    QSqlQuery size("SELECT COUNT(*) FROM fits_files", database);
     size.next();
     progress->setMaximum(size.value(0).toInt());
-    QSqlQuery files = database.exec("SELECT id,file,mtime FROM fits_files");
+    QSqlQuery files("SELECT id,file,mtime FROM fits_files", database);
     int i = 0;
     while(files.next())
     {

databaseview.cpp

@@ -375,7 +375,7 @@ bool DataBaseView::exportCSV(const QString &path)
     if(!csv.open(QIODevice::WriteOnly | QIODevice::Text))
         return false;
 
-    QSqlQuery sql = m_model->query();
+    QSqlQuery sql(m_model->query().lastQuery());
     int colCount = m_model->columnCount();
     QStringList header;
     for(int i=0; i<colCount; i++)

imageinfo.cpp

@@ -51,14 +51,6 @@ FITSRecord::FITSRecord(const LibXISF::Property &property)
     xisf = true;
 }
 
-QByteArray FITSRecord::valueToByteArray() const
-{
-    if(value.type() == QVariant::Bool)
-        return value.toBool() ? "T" : "F";
-    else
-        return value.toString().toLatin1();
-}
-
 ImageInfo::ImageInfo(QWidget *parent) : QTreeWidget(parent)
 {
     setColumnCount(3);

imageinfo.h

@@ -19,7 +19,6 @@ struct FITSRecord
     FITSRecord(const QByteArray &key, const QVariant &value, const QByteArray &comment);
     FITSRecord(const LibXISF::FITSKeyword &record);
     FITSRecord(const LibXISF::Property &property);
-    QByteArray valueToByteArray() const;
 };
 
 class SkyPoint

imageringlist.cpp

@@ -22,13 +22,13 @@ Image::Image(const QString name, int number, ImageRingList *ringList) :
 {
 }
 
-void Image::load()
+void Image::load(QThreadPool *pool)
 {
     if(!m_rawImage && !m_loading)
     {
         m_loading = true;
         m_released = false;
-        QThreadPool::globalInstance()->start(new LoadRunable(m_name, this, m_ringList->analyzeLevel()));
+        pool->start(new LoadRunable(m_name, this, m_ringList->analyzeLevel()));
     }
     if(!m_loading && m_rawImage)
         emit pixmapLoaded(this);
@@ -110,7 +110,10 @@ ImageRingList::ImageRingList(Database *database, const QStringList &nameFilter,
 {
     connect(&m_fileSystemWatcher, SIGNAL(directoryChanged(QString)), this, SLOT(dirChanged(QString)));
     m_nameFilter.replaceInStrings(QRegularExpression("^"), "*.");
+    m_loadPool = new QThreadPool(this);
+    m_loadPool->setThreadPriority(QThread::LowPriority);
     m_thumbPool = new QThreadPool(this);
+    m_thumbPool->setThreadPriority(QThread::LowPriority);
 
     m_slideShowTimer = new QTimer(this);
     connect(m_slideShowTimer, &QTimer::timeout, this, static_cast<void (ImageRingList::*)()>(&ImageRingList::increment));
@@ -123,10 +126,10 @@ ImageRingList::ImageRingList(Database *database, const QStringList &nameFilter,
 
 ImageRingList::~ImageRingList()
 {
-    QThreadPool::globalInstance()->clear();
+    m_loadPool->clear();
     m_thumbPool->clear();
 
-    QThreadPool::globalInstance()->waitForDone();
+    m_loadPool->waitForDone();
     m_thumbPool->waitForDone();
 }
 
@@ -173,11 +176,14 @@ bool ImageRingList::setDir(const QString path, const QString &currentFile, bool
 
 void ImageRingList::setFile(const QString &file)
 {
-    QFileInfo info(file);
-    if(info.isDir())
-        setDir(file, QString(), true);
-    else
-        setDir(info.absolutePath(), file);
+    if(!file.isEmpty())
+    {
+        QFileInfo info(file);
+        if(info.isDir())
+            setDir(file, QString(), true);
+        else
+            setDir(info.absolutePath(), file);
+    }
 }
 
 ImagePtr ImageRingList::currentImage()
@@ -199,9 +205,9 @@ void ImageRingList::increment()
         (*m_firstImage)->release();
         m_firstImage = increment(m_firstImage);
         m_currImage = increment(m_currImage);
-        (*m_currImage)->load();
+        (*m_currImage)->load(m_loadPool);
         m_lastImage = increment(m_lastImage);
-        (*m_lastImage)->load();
+        (*m_lastImage)->load(m_loadPool);
     }
 }
 
@@ -212,9 +218,9 @@ void ImageRingList::decrement()
         (*m_lastImage)->release();
         m_firstImage = decrement(m_firstImage);
         m_currImage = decrement(m_currImage);
-        (*m_currImage)->load();
+        (*m_currImage)->load(m_loadPool);
         m_lastImage = decrement(m_lastImage);
-        (*m_firstImage)->load();
+        (*m_firstImage)->load(m_loadPool);
     }
 }
 
@@ -268,7 +274,7 @@ void ImageRingList::loadFile(int row)
             if(m_images.empty())
                 return;
 
-            (*m_currImage)->load();
+            (*m_currImage)->load(m_loadPool);
 
             m_width = DEFAULT_WIDTH<m_images.size()/2 ? DEFAULT_WIDTH : m_images.size()/2;
             if(m_liveMode)
@@ -277,9 +283,9 @@ void ImageRingList::loadFile(int row)
             for(int i=0; i<m_width; i++)
             {
                 m_firstImage = decrement(m_firstImage);
-                (*m_firstImage)->load();
+                (*m_firstImage)->load(m_loadPool);
                 m_lastImage = increment(m_lastImage);
-                (*m_lastImage)->load();
+                (*m_lastImage)->load(m_loadPool);
             }
             if(m_lastImage != m_firstImage)
             {
@@ -403,9 +409,9 @@ void ImageRingList::setPreload(int width)
         for(int i = newWidth - m_width; i>0; i--)
         {
             m_firstImage = decrement(m_firstImage);
-            (*m_firstImage)->load();
+            (*m_firstImage)->load(m_loadPool);
             m_lastImage = increment(m_lastImage);
-            (*m_lastImage)->load();
+            (*m_lastImage)->load(m_loadPool);
         }
     }
     if(newWidth < m_width)
@@ -460,9 +466,9 @@ void ImageRingList::toggleSlideshow(bool start)
 
 void ImageRingList::setFiles(const QStringList files, const QString &currentFile)
 {
-    QThreadPool::globalInstance()->clear();
+    m_loadPool->clear();
     m_thumbPool->clear();
-    QThreadPool::globalInstance()->waitForDone();
+    m_loadPool->waitForDone();
     m_thumbPool->waitForDone();
     beginResetModel();
     m_images.clear();

imageringlist.h

@@ -27,7 +27,7 @@ class Image : public QObject
     ImageRingList *m_ringList;
 public:
     explicit Image(const QString name, int number, ImageRingList *ringList);
-    void load();
+    void load(QThreadPool *pool);
     void loadThumbnail(QThreadPool *pool);
     void release();
     QString name() const;
@@ -62,6 +62,7 @@ class ImageRingList : public QAbstractItemModel
     QDir::SortFlag m_sort = QDir::Name;
     bool m_reversed = false;
     AnalyzeLevel m_analyzeLevel;
+    QThreadPool *m_loadPool;
     QThreadPool *m_thumbPool;
     Database *m_database;
     QStringList m_nameFilter;

loadrunable.cpp

@@ -15,8 +15,23 @@
 #include "starfit.h"
 #include <lcms2.h>
 
+QString makeMaxPath(QString path)
+{
+#ifdef Q_OS_WIN64
+    if(!path.startsWith("\\\\?\\"))
+    {
+        QFileInfo info(path);
+        path = info.absoluteFilePath();
+        path = QDir::toNativeSeparators(path);
+        path.prepend("\\\\?\\");
+        qDebug() << path;
+    }
+#endif
+    return path;
+}
+
 LoadRunable::LoadRunable(const QString &file, Image *receiver, AnalyzeLevel level, bool thumbnail) :
-    m_file(file),
+    m_file(makeMaxPath(file)),
     m_receiver(receiver),
     m_analyzeLevel(level),
     m_thumbnail(thumbnail)
@@ -451,7 +466,8 @@ bool readFITSHeader(const QString &path, ImageInfoData &info)
 {
     fitsfile *fr;
     int status = 0;
-    fits_open_diskfile(&fr, path.toLocal8Bit().data(), READONLY, &status);
+    QString path2 = makeMaxPath(path);
+    fits_open_diskfile(&fr, path2.toLocal8Bit().data(), READONLY, &status);
 
     if(fr && status == 0)
     {
@@ -463,10 +479,11 @@ bool readFITSHeader(const QString &path, ImageInfoData &info)
 
 bool readXISFHeader(const QString &path, ImageInfoData &info)
 {
+    QString path2 = makeMaxPath(path);
     try
     {
         LibXISF::XISFReader xisf;
-        xisf.open(path.toLocal8Bit().data());
+        xisf.open(path2.toLocal8Bit().data());
         const LibXISF::Image &image = xisf.getImage(0, false);
 
         auto fitskeywords = image.fitsKeywords();
@@ -532,8 +549,8 @@ bool loadImage(const QString &path, ImageInfoData &info, std::shared_ptr<RawImag
 }
 
 ConvertRunable::ConvertRunable(const QString &in, const QString &out, const QString &format, const ConvertParams &params, QSemaphore *semaphore) :
-    m_infile(in),
-    m_outfile(out),
+    m_infile(makeMaxPath(in)),
+    m_outfile(makeMaxPath(out)),
     m_format(format),
     m_params(params),
     m_semaphore(semaphore)

loadrunable.h

@@ -8,6 +8,7 @@
 
 class RawImage;
 
+QString makeMaxPath(QString path);
 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, bool planar = false);

markedfiles.cpp

@@ -60,6 +60,6 @@ void MarkedFiles::clearSelected()
 void MarkedFiles::clearAll()
 {
     QSqlDatabase db = QSqlDatabase::database();
-    db.exec("DELETE FROM files");
+    QSqlQuery("DELETE FROM files", db);
     m_model->select();
 }

scriptengine.cpp

@@ -3,6 +3,7 @@
 #include <QFileInfo>
 #include <QDebug>
 #include <QInputDialog>
+#include <QJsonValue>
 #include "loadrunable.h"
 #include "rawimage.h"
 #include "loadrunable.h"
@@ -28,6 +29,7 @@ ScriptEngine::ScriptEngine(BatchProcessing *parent)
     _jsEngine->globalObject().setProperty("FITSRecordModify", fitsRecordObject);
     _database->init(QLatin1String("scriptengine"));
     _semaphore.release(_pool->maxThreadCount());
+    _pool->setThreadPriority(QThread::LowPriority);
 
 #ifdef PLATESOLVER
     _solver = new Solver(this);
@@ -162,6 +164,58 @@ bool ScriptEngine::convert(File *file, QString &outpath, const QString &format,
 }
 
 #ifdef PLATESOLVER
+void ScriptEngine::setSolverProfile(int index)
+{
+    if(_solver && index >= SSolver::Parameters::DEFAULT && index < SSolver::Parameters::BIG_STARS)
+    {
+        _solver->setParameters((SSolver::Parameters::ParametersProfile)index);
+    }
+}
+
+void ScriptEngine::setSolverProfile(const QVariantMap &profile)
+{
+    if(_solver)
+    {
+        SSolver::Parameters params = SSolver::Parameters::convertFromMap(profile);
+        _solver->setParameters(params);
+    }
+}
+
+QJSValue ScriptEngine::getSolverProfile() const
+{
+    if(_solver)
+    {
+        QMap<QString, QVariant> params = SSolver::Parameters::convertToMap(_solver->getProfile());
+        QJSValue ret = _jsEngine->newObject();
+        for(auto i = params.begin(); i != params.end(); i++)
+        {
+            switch(i.value().metaType().id())
+            {
+            case QMetaType::Int:
+                ret.setProperty(i.key(), i.value().toInt());
+                break;
+            case QMetaType::Double:
+                ret.setProperty(i.key(), i.value().toDouble());
+                break;
+            case QMetaType::Bool:
+                ret.setProperty(i.key(), i.value().toBool());
+                break;
+            case QMetaType::QString:
+                ret.setProperty(i.key(), i.value().toString());
+                break;
+            default:
+                qWarning() << "unhandled metatype" << i.key() << i.value();
+                break;
+            }
+        }
+        return ret;
+    }
+    else
+    {
+        return QJSValue();
+    }
+}
+
 void ScriptEngine::setStartingSolution(const QJSValue &solution)
 {
     if(solution.isObject())
@@ -465,7 +519,8 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
     {
         fitsfile *file;
         int status = 0;
-        fits_open_diskfile(&file, _path.toLocal8Bit().data(), READWRITE, &status);
+        QString path = makeMaxPath(_path);
+        fits_open_diskfile(&file, path.toLocal8Bit().data(), READWRITE, &status);
         int num = 0;
         fits_get_num_hdus(file, &num, &status);
         if(status)
@@ -588,9 +643,10 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
         try
         {
             LibXISF::XISFModify modifyXISF;
-            modifyXISF.open(_path.toLocal8Bit().data());
-            QFileInfo in(_path);
-            QFileInfo out(_path + "~");
+            QString in = makeMaxPath(absoluteFilePath());
+            QString out = in + "~";
+            modifyXISF.open(in.toLocal8Bit().data());
+            qDebug() << "modify" << in << out;
 
             for(auto &remove : modify->_remove)
                 modifyXISF.removeFITSKeyword(0, remove.toStdString());
@@ -601,9 +657,9 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
             for(auto &record : modify->_add)
                 modifyXISF.addFITSKeyword(0, {record.key.toStdString(), record.value.toString().toStdString(), record.comment.toStdString()});
 
-            modifyXISF.save(out.absoluteFilePath().toLocal8Bit().toStdString());
+            modifyXISF.save(out.toLocal8Bit().toStdString());
             modifyXISF.close();
-            std::filesystem::rename(out.filesystemAbsoluteFilePath(), in.filesystemAbsoluteFilePath());
+            std::filesystem::rename(out.toLocal8Bit().toStdString(), in.toLocal8Bit().toStdString());
             return true;
         }
         catch(std::filesystem::filesystem_error &err)

scriptengine.h

@@ -49,6 +49,9 @@ public:
     Q_INVOKABLE QJSValue getItem(const QStringList &items, const QString &label = "", int current = 0) const;
     bool convert(File *file, QString &outpath, const QString &format, const QVariantMap &params, bool async);
 #ifdef PLATESOLVER
+    Q_INVOKABLE void setSolverProfile(int index);
+    Q_INVOKABLE void setSolverProfile(const QVariantMap &profile);
+    Q_INVOKABLE QJSValue getSolverProfile() const;
     Q_INVOKABLE void setStartingSolution(const QJSValue &solution = QJSValue());
     QJSValue solveImage(File *file, bool updateHeader);
     QJSValue extractStars(File *file, bool hfr);

solver.cpp

@@ -205,6 +205,11 @@ void Solver::setParameters(const Parameters &parameters)
     _solver->setParameters(profile);
 }
 
+Parameters Solver::getProfile() const
+{
+    return _solver->getCurrentParameters();
+}
+
 void Solver::setSearchScale(double fovLow, double fowHigh, SSolver::ScaleUnits units)
 {
     _solver->setSearchScale(fovLow, fowHigh, units);

solver.h

@@ -34,6 +34,7 @@ public:
     bool updateHeader(QString &error);
     void setParameters(SSolver::Parameters::ParametersProfile profile);
     void setParameters(const SSolver::Parameters &parameters);
+    SSolver::Parameters getProfile() const;
     void setSearchScale(double fovLow, double fowHigh, ScaleUnits units);
     void setSearchPosition(double ra, double dec);
     void clearStartingPositionAndScale();

space.nouspiro.tenmon.metainfo.xml

@@ -57,6 +57,15 @@
     </screenshots>
     <content_rating type="oars-1.1"/>
     <releases>
+    <release version="20250126" date="2025-01-26">
+      <description>
+        <ul>
+          <li>Support for really big images +50000px</li>
+          <li>Fix handling of MAX_PATH on Windows</li>
+          <li>Add setting solver profile in scripts</li>
+        </ul>
+      </description>
+    </release>
     <release version="20241116" date="2024-11-16">
       <description>
         <ul>