Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7e95440dd6 | |||
| 03492972cb | |||
| 9cca183677 | |||
| afd059b36b | |||
| 1b9f218acb | |||
| 32f91d7b2f | |||
| 69fbad34b6 | |||
| e026042604 | |||
| bb7e5182af | |||
| f0152e2496 | |||
| eccf928032 | |||
| 897306d1c3 | |||
| cbc779090f | |||
| d826744f26 | |||
| 3bdfb12d4f | |||
| c416ae9941 | |||
| abbba2890f | |||
| 9c6847d334 | |||
| af1c26a9fe | |||
| e0441a6494 | |||
| a88f05a9fe |
+3
-1
@@ -34,7 +34,9 @@ set(TENMON_SRC
|
|||||||
src/database.cpp src/database.h
|
src/database.cpp src/database.h
|
||||||
src/databaseview.cpp src/databaseview.h
|
src/databaseview.cpp src/databaseview.h
|
||||||
src/delete.cpp
|
src/delete.cpp
|
||||||
|
src/filemanager.h src/filemanager.cpp src/filemanager.ui
|
||||||
src/filesystemwidget.cpp src/filesystemwidget.h
|
src/filesystemwidget.cpp src/filesystemwidget.h
|
||||||
|
src/fitskeyword.ui
|
||||||
src/histogram.cpp src/histogram.h
|
src/histogram.cpp src/histogram.h
|
||||||
src/httpdownloader.h src/httpdownloader.cpp
|
src/httpdownloader.h src/httpdownloader.cpp
|
||||||
src/imageinfo.cpp src/imageinfo.h
|
src/imageinfo.cpp src/imageinfo.h
|
||||||
@@ -77,7 +79,7 @@ endif()
|
|||||||
qt_add_executable(tenmon WIN32 MACOSX_BUNDLE ${tenmon_ICON} ${TENMON_SRC})
|
qt_add_executable(tenmon WIN32 MACOSX_BUNDLE ${tenmon_ICON} ${TENMON_SRC})
|
||||||
|
|
||||||
find_path(FITS_INCLUDE fitsio2.h PATH_SUFFIXES cfitsio REQUIRED)
|
find_path(FITS_INCLUDE fitsio2.h PATH_SUFFIXES cfitsio REQUIRED)
|
||||||
target_include_directories(tenmon PRIVATE ${FITS_INCLUDE} ${CMAKE_BINARY_DIR} ${libXISF_SOURCE_DIR})
|
target_include_directories(tenmon PRIVATE ${FITS_INCLUDE} ${CMAKE_BINARY_DIR} ${libXISF_SOURCE_DIR} "src")
|
||||||
|
|
||||||
option(COLOR_MANAGMENT "Enable sRGB framebuffer support for gamma correct images and color profiles support" ON)
|
option(COLOR_MANAGMENT "Enable sRGB framebuffer support for gamma correct images and color profiles support" ON)
|
||||||
if(COLOR_MANAGMENT)
|
if(COLOR_MANAGMENT)
|
||||||
|
|||||||
+1
-1
Submodule libXISF updated: 9a32138f6a...c6581e1122
+87
-4
@@ -13,6 +13,7 @@
|
|||||||
#include <QChart>
|
#include <QChart>
|
||||||
#include <QChartView>
|
#include <QChartView>
|
||||||
#include <QLineSeries>
|
#include <QLineSeries>
|
||||||
|
#include <QCompleter>
|
||||||
#include "scriptengine.h"
|
#include "scriptengine.h"
|
||||||
#include "chartgraph.h"
|
#include "chartgraph.h"
|
||||||
|
|
||||||
@@ -110,6 +111,35 @@ BatchProcessing::BatchProcessing(Database *database, QWidget *parent) : QDialog(
|
|||||||
|
|
||||||
_textColor = _ui->log->palette().text().color();
|
_textColor = _ui->log->palette().text().color();
|
||||||
|
|
||||||
|
_engine = new Script::ScriptEngine(_database, this);
|
||||||
|
connect(_engine, &Script::ScriptEngine::newMessage, this, &BatchProcessing::newMessage);
|
||||||
|
QStringList apiList;
|
||||||
|
apiList << "core.log" << "core.mark" << "core.unmark" << "core.isMarked" << "core.getObjects" << "core.setMaxthread";
|
||||||
|
apiList << "core.sync" << "core.getString" << "core.getInt" << "core.getFloat" << "core.question" << "core.plot";
|
||||||
|
apiList << "fileName" << "absoluteFileName";
|
||||||
|
_completerModel = new QStringListModel(this);
|
||||||
|
_completerModel->setStringList(apiList);
|
||||||
|
_completer = new QCompleter(_completerModel, this);
|
||||||
|
_ui->consoleLineEdit->setCompleter(_completer);
|
||||||
|
connect(_ui->executeButton, &QPushButton::clicked, _ui->consoleLineEdit, &QLineEdit::returnPressed);
|
||||||
|
connect(_ui->consoleLineEdit, &QLineEdit::returnPressed, [this](){
|
||||||
|
if(!_completer->popup()->isVisible())
|
||||||
|
{
|
||||||
|
QString program = _ui->consoleLineEdit->text();
|
||||||
|
QJSValue val = _engine->eval(program);
|
||||||
|
_ui->consoleLineEdit->addLine();
|
||||||
|
qDebug() << val.toString();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
connect(_ui->consoleLineEdit, &QLineEdit::textEdited, [this](const QString &text){
|
||||||
|
QStringList comp = _engine->complete(text);
|
||||||
|
qDebug() << comp;
|
||||||
|
_completerModel->setStringList(comp);
|
||||||
|
});
|
||||||
|
|
||||||
|
_ui->addFilesButton->setAutoDefault(false);
|
||||||
|
|
||||||
QSettings settings;
|
QSettings settings;
|
||||||
_ui->outputPath->setText(settings.value("batchprocessing/outputpath", QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).first()).toString());
|
_ui->outputPath->setText(settings.value("batchprocessing/outputpath", QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).first()).toString());
|
||||||
}
|
}
|
||||||
@@ -143,6 +173,15 @@ void BatchProcessing::closeEvent(QCloseEvent *event)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void BatchProcessing::refreshPaths()
|
||||||
|
{
|
||||||
|
QStringList paths;
|
||||||
|
for(int i=0; i<_ui->pathsList->count(); i++)
|
||||||
|
paths.append(_ui->pathsList->item(i)->text());
|
||||||
|
_paths = scanDirectories(paths);
|
||||||
|
_engine->setParams("", _paths, _ui->outputPath->text());
|
||||||
|
}
|
||||||
|
|
||||||
void BatchProcessing::addFiles()
|
void BatchProcessing::addFiles()
|
||||||
{
|
{
|
||||||
QSettings settings;
|
QSettings settings;
|
||||||
@@ -152,6 +191,7 @@ void BatchProcessing::addFiles()
|
|||||||
_ui->pathsList->addItems(files);
|
_ui->pathsList->addItems(files);
|
||||||
settings.setValue("batchprocessing/inputpath", QFileInfo(files.first()).absolutePath());
|
settings.setValue("batchprocessing/inputpath", QFileInfo(files.first()).absolutePath());
|
||||||
}
|
}
|
||||||
|
refreshPaths();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BatchProcessing::addDir()
|
void BatchProcessing::addDir()
|
||||||
@@ -163,6 +203,7 @@ void BatchProcessing::addDir()
|
|||||||
_ui->pathsList->addItem(dir);
|
_ui->pathsList->addItem(dir);
|
||||||
settings.setValue("batchprocessing/inputpath", dir);
|
settings.setValue("batchprocessing/inputpath", dir);
|
||||||
}
|
}
|
||||||
|
refreshPaths();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BatchProcessing::addMarked()
|
void BatchProcessing::addMarked()
|
||||||
@@ -174,17 +215,20 @@ void BatchProcessing::addMarked()
|
|||||||
if(info.exists() && info.isReadable())
|
if(info.exists() && info.isReadable())
|
||||||
_ui->pathsList->addItem(file);
|
_ui->pathsList->addItem(file);
|
||||||
};
|
};
|
||||||
|
refreshPaths();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BatchProcessing::removePath()
|
void BatchProcessing::removePath()
|
||||||
{
|
{
|
||||||
for(auto &item : _ui->pathsList->selectedItems())
|
for(auto &item : _ui->pathsList->selectedItems())
|
||||||
delete item;
|
delete item;
|
||||||
|
refreshPaths();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BatchProcessing::removeAllPaths()
|
void BatchProcessing::removeAllPaths()
|
||||||
{
|
{
|
||||||
_ui->pathsList->clear();
|
_ui->pathsList->clear();
|
||||||
|
refreshPaths();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BatchProcessing::browse()
|
void BatchProcessing::browse()
|
||||||
@@ -208,9 +252,6 @@ void BatchProcessing::runScript()
|
|||||||
_engineThread = new Script::ScriptEngineThread(_database, this);
|
_engineThread = new Script::ScriptEngineThread(_database, this);
|
||||||
connect(_engineThread, &Script::ScriptEngineThread::newMessage, this, &BatchProcessing::newMessage);
|
connect(_engineThread, &Script::ScriptEngineThread::newMessage, this, &BatchProcessing::newMessage);
|
||||||
connect(_engineThread, &Script::ScriptEngineThread::finished, this, &BatchProcessing::scriptFinished);
|
connect(_engineThread, &Script::ScriptEngineThread::finished, this, &BatchProcessing::scriptFinished);
|
||||||
QStringList paths;
|
|
||||||
for(int i=0; i<_ui->pathsList->count(); i++)
|
|
||||||
paths.append(_ui->pathsList->item(i)->text());
|
|
||||||
|
|
||||||
QFileInfo outDir(_ui->outputPath->text());
|
QFileInfo outDir(_ui->outputPath->text());
|
||||||
if(outDir.exists() && outDir.isWritable())
|
if(outDir.exists() && outDir.isWritable())
|
||||||
@@ -221,7 +262,7 @@ void BatchProcessing::runScript()
|
|||||||
else
|
else
|
||||||
script = ":/scripts/" + script;
|
script = ":/scripts/" + script;
|
||||||
|
|
||||||
_engineThread->setParams(script, scanDirectories(paths), _ui->outputPath->text());
|
_engineThread->setParams(script, _paths, _ui->outputPath->text());
|
||||||
_engineThread->start();
|
_engineThread->start();
|
||||||
_ui->startButton->setEnabled(false);
|
_ui->startButton->setEnabled(false);
|
||||||
_ui->stopButton->setEnabled(true);
|
_ui->stopButton->setEnabled(true);
|
||||||
@@ -329,6 +370,48 @@ void BatchProcessing::plot(const QVariant &graph)
|
|||||||
chart->plot(graph);
|
chart->plot(graph);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ConsoleLine::ConsoleLine(QWidget *parent) : QLineEdit(parent)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void ConsoleLine::addLine()
|
||||||
|
{
|
||||||
|
QString line = text();
|
||||||
|
clear();
|
||||||
|
if(_history.size() && _history.last() == line)return;
|
||||||
|
|
||||||
|
_history.append(line);
|
||||||
|
if(_history.size() > 100)_history.removeFirst();
|
||||||
|
_currentLine = _history.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ConsoleLine::keyReleaseEvent(QKeyEvent *event)
|
||||||
|
{
|
||||||
|
if(event->key() == Qt::Key_Up)
|
||||||
|
{
|
||||||
|
_currentLine--;
|
||||||
|
if(_currentLine < 0)
|
||||||
|
{
|
||||||
|
_currentLine = -1;
|
||||||
|
clear();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setText(_history.at(_currentLine));
|
||||||
|
}
|
||||||
|
else if(event->key() == Qt::Key_Down)
|
||||||
|
{
|
||||||
|
_currentLine++;
|
||||||
|
if(_currentLine >= _history.size())
|
||||||
|
{
|
||||||
|
_currentLine = _history.size();
|
||||||
|
clear();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setText(_history.at(_currentLine));
|
||||||
|
}
|
||||||
|
else QLineEdit::keyReleaseEvent(event);
|
||||||
|
}
|
||||||
|
|
||||||
void openDir(const QString &path)
|
void openDir(const QString &path)
|
||||||
{
|
{
|
||||||
#ifdef Q_OS_LINUX
|
#ifdef Q_OS_LINUX
|
||||||
|
|||||||
@@ -3,6 +3,9 @@
|
|||||||
|
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
#include <QFileSystemWatcher>
|
#include <QFileSystemWatcher>
|
||||||
|
#include <QStringListModel>
|
||||||
|
#include <QCompleter>
|
||||||
|
#include <QLineEdit>
|
||||||
#include "scriptengine.h"
|
#include "scriptengine.h"
|
||||||
|
|
||||||
namespace Ui { class BatchProcessing; }
|
namespace Ui { class BatchProcessing; }
|
||||||
@@ -16,8 +19,12 @@ class BatchProcessing : public QDialog
|
|||||||
QString _scriptBasePath;
|
QString _scriptBasePath;
|
||||||
QFileSystemWatcher _fileWatcher;
|
QFileSystemWatcher _fileWatcher;
|
||||||
Script::ScriptEngineThread *_engineThread = nullptr;
|
Script::ScriptEngineThread *_engineThread = nullptr;
|
||||||
|
Script::ScriptEngine *_engine = nullptr;
|
||||||
QColor _textColor;
|
QColor _textColor;
|
||||||
Database *_database;
|
Database *_database;
|
||||||
|
QStringListModel *_completerModel = nullptr;
|
||||||
|
QCompleter *_completer = nullptr;
|
||||||
|
QList<QPair<QString, QString>> _paths;
|
||||||
private slots:
|
private slots:
|
||||||
void scanScriptDir();
|
void scanScriptDir();
|
||||||
public:
|
public:
|
||||||
@@ -25,6 +32,7 @@ public:
|
|||||||
~BatchProcessing();
|
~BatchProcessing();
|
||||||
protected:
|
protected:
|
||||||
void closeEvent(QCloseEvent *event);
|
void closeEvent(QCloseEvent *event);
|
||||||
|
void refreshPaths();
|
||||||
public slots:
|
public slots:
|
||||||
void addFiles();
|
void addFiles();
|
||||||
void addDir();
|
void addDir();
|
||||||
@@ -47,6 +55,18 @@ public slots:
|
|||||||
void plot(const QVariant &graph);
|
void plot(const QVariant &graph);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class ConsoleLine : public QLineEdit
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
explicit ConsoleLine(QWidget *parent = nullptr);
|
||||||
|
void addLine();
|
||||||
|
void keyReleaseEvent(QKeyEvent *event) override;
|
||||||
|
private:
|
||||||
|
int _currentLine = 0;
|
||||||
|
QStringList _history;
|
||||||
|
};
|
||||||
|
|
||||||
void openDir(const QString &path);
|
void openDir(const QString &path);
|
||||||
|
|
||||||
#endif // BATCHPROCESSING_H
|
#endif // BATCHPROCESSING_H
|
||||||
|
|||||||
+63
-33
@@ -43,6 +43,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Add files</string>
|
<string>Add files</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@@ -50,6 +53,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Add directories</string>
|
<string>Add directories</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@@ -57,6 +63,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Add marked</string>
|
<string>Add marked</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@@ -64,6 +73,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Remove</string>
|
<string>Remove</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@@ -71,6 +83,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Remove all</string>
|
<string>Remove all</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
@@ -98,6 +113,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Browse</string>
|
<string>Browse</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
@@ -129,6 +147,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Open scripts</string>
|
<string>Open scripts</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
@@ -171,23 +192,30 @@
|
|||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer_2">
|
<widget class="ConsoleLine" name="consoleLineEdit">
|
||||||
<property name="orientation">
|
<property name="placeholderText">
|
||||||
<enum>Qt::Horizontal</enum>
|
<string>Console</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" stdset="0">
|
</widget>
|
||||||
<size>
|
</item>
|
||||||
<width>40</width>
|
<item>
|
||||||
<height>20</height>
|
<widget class="QPushButton" name="executeButton">
|
||||||
</size>
|
<property name="text">
|
||||||
|
<string>Execute</string>
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="startButton">
|
<widget class="QPushButton" name="startButton">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Start script</string>
|
<string>Start script</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@@ -198,12 +226,8 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Stop script</string>
|
<string>Stop script</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
<property name="autoDefault">
|
||||||
</item>
|
<bool>false</bool>
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="closeButton">
|
|
||||||
<property name="text">
|
|
||||||
<string>Close</string>
|
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -211,23 +235,29 @@
|
|||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
|
<customwidgets>
|
||||||
|
<customwidget>
|
||||||
|
<class>ConsoleLine</class>
|
||||||
|
<extends>QLineEdit</extends>
|
||||||
|
<header>batchprocessing.h</header>
|
||||||
|
</customwidget>
|
||||||
|
</customwidgets>
|
||||||
|
<tabstops>
|
||||||
|
<tabstop>pathsList</tabstop>
|
||||||
|
<tabstop>addFilesButton</tabstop>
|
||||||
|
<tabstop>addDirButton</tabstop>
|
||||||
|
<tabstop>addMarkedButton</tabstop>
|
||||||
|
<tabstop>removeButton</tabstop>
|
||||||
|
<tabstop>removeAllButton</tabstop>
|
||||||
|
<tabstop>browseButton</tabstop>
|
||||||
|
<tabstop>openScriptsButton</tabstop>
|
||||||
|
<tabstop>scriptsList</tabstop>
|
||||||
|
<tabstop>consoleLineEdit</tabstop>
|
||||||
|
<tabstop>startButton</tabstop>
|
||||||
|
<tabstop>stopButton</tabstop>
|
||||||
|
<tabstop>outputPath</tabstop>
|
||||||
|
<tabstop>log</tabstop>
|
||||||
|
</tabstops>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections>
|
<connections/>
|
||||||
<connection>
|
|
||||||
<sender>closeButton</sender>
|
|
||||||
<signal>released()</signal>
|
|
||||||
<receiver>BatchProcessing</receiver>
|
|
||||||
<slot>close()</slot>
|
|
||||||
<hints>
|
|
||||||
<hint type="sourcelabel">
|
|
||||||
<x>973</x>
|
|
||||||
<y>745</y>
|
|
||||||
</hint>
|
|
||||||
<hint type="destinationlabel">
|
|
||||||
<x>511</x>
|
|
||||||
<y>383</y>
|
|
||||||
</hint>
|
|
||||||
</hints>
|
|
||||||
</connection>
|
|
||||||
</connections>
|
|
||||||
</ui>
|
</ui>
|
||||||
|
|||||||
+24
-8
@@ -181,7 +181,7 @@ int Database::checkVersion(QSqlDatabase &db)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static QStringList nameFilters = {"*.fit", "*.fits", "*.fz", "*.xisf"};
|
static QStringList nameFilters = {"*.fit", "*.fits", "*.fz", "*.fts", "*.xisf"};
|
||||||
|
|
||||||
static int countFiles(const QDir &dir, QStringList &scannedDirs)
|
static int countFiles(const QDir &dir, QStringList &scannedDirs)
|
||||||
{
|
{
|
||||||
@@ -271,15 +271,30 @@ QVector<SkyObject> Database::getObjects(double minRa, double maxRa, double minDe
|
|||||||
while(m_getNgc.next())
|
while(m_getNgc.next())
|
||||||
{
|
{
|
||||||
QString name;
|
QString name;
|
||||||
|
QString name2;
|
||||||
QString m = m_getNgc.value("M").toString();
|
QString m = m_getNgc.value("M").toString();
|
||||||
QString ic = m_getNgc.value("IC").toString();
|
QString ic = m_getNgc.value("IC").toString();
|
||||||
if(!m.isEmpty())name = "M" + m + " ";
|
if(!m.isEmpty())
|
||||||
if(!ic.isEmpty())name += "IC" + ic + " ";
|
{
|
||||||
name += m_getNgc.value("Name").toString();
|
name = "M" + m;
|
||||||
|
m.clear();
|
||||||
|
}
|
||||||
|
else if(!ic.isEmpty())
|
||||||
|
{
|
||||||
|
name = "IC" + ic;
|
||||||
|
ic.clear();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
name = m_getNgc.value("Name").toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!ic.isEmpty())name2 += "IC" + ic + " ";
|
||||||
|
name2 += m_getNgc.value("Common names").toString();
|
||||||
|
|
||||||
objects.append({
|
objects.append({
|
||||||
name,
|
name,
|
||||||
m_getNgc.value("Common names").toString(),
|
name2,
|
||||||
{m_getNgc.value("RA_deg").toDouble(), m_getNgc.value("DEC_deg").toDouble()},
|
{m_getNgc.value("RA_deg").toDouble(), m_getNgc.value("DEC_deg").toDouble()},
|
||||||
m_getNgc.value("MajAx").toDouble(),
|
m_getNgc.value("MajAx").toDouble(),
|
||||||
m_getNgc.value("MinAx").toDouble(),
|
m_getNgc.value("MinAx").toDouble(),
|
||||||
@@ -332,10 +347,10 @@ bool Database::indexFile(const QFileInfo &file)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ok;
|
bool ok = false;
|
||||||
if(filePath.endsWith(".xisf", Qt::CaseInsensitive))
|
if(isXISF(file.suffix()))
|
||||||
ok = readXISFHeader(filePath, info);
|
ok = readXISFHeader(filePath, info);
|
||||||
else
|
else if(isFITS(file.suffix()))
|
||||||
ok = readFITSHeader(filePath, info);
|
ok = readFITSHeader(filePath, info);
|
||||||
|
|
||||||
qlonglong last_id = -1;
|
qlonglong last_id = -1;
|
||||||
@@ -376,6 +391,7 @@ bool Database::indexFile(const QFileInfo &file)
|
|||||||
QVariantList file_id, keys, values, comments;
|
QVariantList file_id, keys, values, comments;
|
||||||
for(const auto &record : info.fitsHeader)
|
for(const auto &record : info.fitsHeader)
|
||||||
{
|
{
|
||||||
|
if(record.xisf && record.key.startsWith("PCL:"))continue;
|
||||||
file_id << last_id;
|
file_id << last_id;
|
||||||
keys << QString(record.key);
|
keys << QString(record.key);
|
||||||
values << record.value.toString();
|
values << record.value.toString();
|
||||||
|
|||||||
@@ -0,0 +1,754 @@
|
|||||||
|
#include "filemanager.h"
|
||||||
|
#include "ui_filemanager.h"
|
||||||
|
#include "ui_fitskeyword.h"
|
||||||
|
|
||||||
|
#include <QSettings>
|
||||||
|
#include <QStandardPaths>
|
||||||
|
#include <QDesktopServices>
|
||||||
|
#include <QMimeData>
|
||||||
|
#include <QClipboard>
|
||||||
|
#include <QThread>
|
||||||
|
#include "loadimage.h"
|
||||||
|
|
||||||
|
class FileTimes
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
explicit FileTimes(const QString &path)
|
||||||
|
{
|
||||||
|
QFile file(path);
|
||||||
|
#ifndef Q_OS_WIN
|
||||||
|
birthTime = file.fileTime(QFileDevice::FileBirthTime);
|
||||||
|
#endif
|
||||||
|
modificationTime = file.fileTime(QFileDevice::FileModificationTime);
|
||||||
|
accessTime = file.fileTime(QFileDevice::FileAccessTime);
|
||||||
|
}
|
||||||
|
void apply(const QString &path)
|
||||||
|
{
|
||||||
|
QFile file(path);
|
||||||
|
if(file.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::ExistingOnly))
|
||||||
|
{
|
||||||
|
#ifndef Q_OS_WIN // Only windows allow changing birth time
|
||||||
|
file.setFileTime(birthTime, QFileDevice::FileBirthTime);
|
||||||
|
#endif
|
||||||
|
file.setFileTime(accessTime, QFileDevice::FileAccessTime);
|
||||||
|
file.setFileTime(modificationTime, QFileDevice::FileModificationTime);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private:
|
||||||
|
QDateTime birthTime;
|
||||||
|
QDateTime modificationTime;
|
||||||
|
QDateTime accessTime;
|
||||||
|
};
|
||||||
|
|
||||||
|
FileTransfer::FileTransfer(FileManager *fm) :
|
||||||
|
_fm(fm)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
FileTransfer::~FileTransfer()
|
||||||
|
{
|
||||||
|
_run = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void FileTransfer::copy(const QStringList &src, const QString &dst)
|
||||||
|
{
|
||||||
|
_run = true;
|
||||||
|
perform(src, dst, true);
|
||||||
|
emit finished();
|
||||||
|
}
|
||||||
|
|
||||||
|
void FileTransfer::move(const QStringList &src, const QString &dst)
|
||||||
|
{
|
||||||
|
_run = true;
|
||||||
|
perform(src, dst, false);
|
||||||
|
emit finished();
|
||||||
|
}
|
||||||
|
|
||||||
|
void FileTransfer::cancel()
|
||||||
|
{
|
||||||
|
_run = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void FileTransfer::perform(const QStringList &src, const QString &dst, bool copy)
|
||||||
|
{
|
||||||
|
QDir dstDir(dst);
|
||||||
|
if(!dstDir.exists())
|
||||||
|
{
|
||||||
|
emit error(tr("Error"), tr("Destination directory %1 doesn't exists").arg(dstDir.absolutePath()));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
QList<Action> actions;
|
||||||
|
QStringList dirs;
|
||||||
|
|
||||||
|
emit progress(0);
|
||||||
|
|
||||||
|
for(const QString &i : src)
|
||||||
|
{
|
||||||
|
QFileInfo srcInfo(i);
|
||||||
|
if(srcInfo.absolutePath() == dst || dst.startsWith(srcInfo.absoluteFilePath()))
|
||||||
|
return;
|
||||||
|
|
||||||
|
if(srcInfo.isDir())
|
||||||
|
{
|
||||||
|
QDir srcDir(i);
|
||||||
|
//qDebug() << "dir" << srcInfo.absoluteFilePath() << srcInfo.fileName();
|
||||||
|
if(!copy && !dstDir.exists(srcInfo.fileName()))
|
||||||
|
{
|
||||||
|
if(QFile::rename(srcInfo.absoluteFilePath(), dstDir.absoluteFilePath(srcInfo.fileName())))
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
actions.append({srcInfo.absoluteFilePath(), srcInfo.fileName(), true});
|
||||||
|
if(!copy)dirs.prepend(srcInfo.absoluteFilePath());
|
||||||
|
QDirIterator it(i, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
|
||||||
|
while(it.hasNext())
|
||||||
|
{
|
||||||
|
QFileInfo info = it.nextFileInfo();
|
||||||
|
if(info.fileName() == "." || info.fileName() == "..")
|
||||||
|
continue;
|
||||||
|
|
||||||
|
QString relativePath = srcDir.dirName() + "/" + srcDir.relativeFilePath(info.absoluteFilePath());
|
||||||
|
if(info.isDir())
|
||||||
|
{
|
||||||
|
actions.append({"", relativePath, true});
|
||||||
|
if(!copy)dirs.prepend(info.absoluteFilePath());
|
||||||
|
//qDebug() << "dir" << info.absoluteFilePath() << relativePath;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
actions.append({info.absoluteFilePath(), dstDir.absoluteFilePath(relativePath), false});
|
||||||
|
//qDebug() << "file" << info.absoluteFilePath() << dstDir.absoluteFilePath(relativePath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
actions.append({srcInfo.absoluteFilePath(), dstDir.absoluteFilePath(srcInfo.fileName())});
|
||||||
|
//qDebug() << "file" << srcInfo.absoluteFilePath() << dstDir.absoluteFilePath(srcInfo.fileName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool overwriteAll = false;
|
||||||
|
bool skipAll = false;
|
||||||
|
int total = actions.size();
|
||||||
|
int i = 0;
|
||||||
|
for(auto &a : actions)
|
||||||
|
{
|
||||||
|
if(!_run)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if(a.dir)
|
||||||
|
{
|
||||||
|
dstDir.mkpath(a.dst);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
QFileInfo dstInfo(a.dst);
|
||||||
|
if(dstInfo.exists())
|
||||||
|
{
|
||||||
|
if(overwriteAll)
|
||||||
|
{
|
||||||
|
QFile::remove(dstInfo.absoluteFilePath());
|
||||||
|
}
|
||||||
|
else if(skipAll)
|
||||||
|
{
|
||||||
|
emit progress(i++ * 100 / total);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
QMessageBox::StandardButton ret;
|
||||||
|
QMetaObject::invokeMethod(_fm, "overwrite", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QMessageBox::StandardButton, ret), Q_ARG(QString, dstInfo.fileName()));
|
||||||
|
switch(ret)
|
||||||
|
{
|
||||||
|
case QMessageBox::YesToAll:
|
||||||
|
overwriteAll = true;//break; is intentionally missing
|
||||||
|
case QMessageBox::Yes:
|
||||||
|
QFile::remove(dstInfo.absoluteFilePath());
|
||||||
|
break;
|
||||||
|
case QMessageBox::NoToAll:
|
||||||
|
skipAll = true;//break; is intentionally missing
|
||||||
|
case QMessageBox::No:
|
||||||
|
emit progress(i++ * 100 / total);
|
||||||
|
continue;
|
||||||
|
break;
|
||||||
|
case QMessageBox::Cancel:
|
||||||
|
return;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FileTimes t(a.src);
|
||||||
|
if(copy)
|
||||||
|
{
|
||||||
|
if(!QFile::copy(a.src, a.dst))
|
||||||
|
{
|
||||||
|
emit error(tr("Copy failed"), tr("Failed to copy file %1 to %2").arg(a.src).arg(a.dst));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if(!QFile::rename(a.src, a.dst))
|
||||||
|
{
|
||||||
|
emit error(tr("Move failed"), tr("Failed to move file %1 to %2").arg(a.src).arg(a.dst));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
t.apply(a.dst);
|
||||||
|
}
|
||||||
|
emit progress(i++ * 100 / total);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!copy)
|
||||||
|
{
|
||||||
|
for(const QString &d : dirs)
|
||||||
|
{
|
||||||
|
QDir dir(d);
|
||||||
|
if(dir.isEmpty())
|
||||||
|
dir.removeRecursively();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
PathTabBar::PathTabBar(const QStringList &tabs) :
|
||||||
|
_tabs(tabs)
|
||||||
|
{
|
||||||
|
setTabsClosable(true);
|
||||||
|
setExpanding(false);
|
||||||
|
|
||||||
|
for(auto &t : _tabs)
|
||||||
|
{
|
||||||
|
QDir dir(t);
|
||||||
|
int i = addTab(tabName(t));
|
||||||
|
setTabToolTip(i, t);
|
||||||
|
}
|
||||||
|
|
||||||
|
connect(this, &QTabBar::currentChanged, [this](int index){
|
||||||
|
QString path = _tabs.at(index);
|
||||||
|
emit pathChanged(path);
|
||||||
|
});
|
||||||
|
connect(this, &QTabBar::tabCloseRequested, [this](int index){
|
||||||
|
if(_tabs.size() >= 2)
|
||||||
|
{
|
||||||
|
_tabs.remove(index);
|
||||||
|
removeTab(index);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
connect(this, &QTabBar::currentChanged, [this](int index){
|
||||||
|
emit tabChanged(_tabs[index]);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
QHBoxLayout *PathTabBar::createLayout()
|
||||||
|
{
|
||||||
|
QHBoxLayout *hlayout = new QHBoxLayout();
|
||||||
|
|
||||||
|
hlayout->addWidget(this);
|
||||||
|
hlayout->addStretch(2);
|
||||||
|
QPushButton *addButton = new QPushButton("+");
|
||||||
|
connect(addButton, &QPushButton::clicked, [this](){
|
||||||
|
QString path = _tabs[currentIndex()];
|
||||||
|
_tabs.append(path);
|
||||||
|
int i = addTab(tabName(path));
|
||||||
|
setTabToolTip(i, path);
|
||||||
|
});
|
||||||
|
hlayout->addWidget(addButton);
|
||||||
|
return hlayout;
|
||||||
|
}
|
||||||
|
|
||||||
|
const QStringList &PathTabBar::tabPaths() const
|
||||||
|
{
|
||||||
|
return _tabs;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString PathTabBar::currentTabPath() const
|
||||||
|
{
|
||||||
|
int index = std::clamp(currentIndex(), 0, (int)_tabs.size());
|
||||||
|
return _tabs[index];
|
||||||
|
}
|
||||||
|
|
||||||
|
void PathTabBar::pathChanged(const QString &path)
|
||||||
|
{
|
||||||
|
QDir dir(path);
|
||||||
|
int index = currentIndex();
|
||||||
|
setTabText(index, tabName(path));
|
||||||
|
setTabToolTip(index, path);
|
||||||
|
_tabs[index] = path;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString PathTabBar::tabName(const QString &path)
|
||||||
|
{
|
||||||
|
QDir dir(path);
|
||||||
|
if(dir.dirName().isEmpty())
|
||||||
|
return path;
|
||||||
|
else
|
||||||
|
return dir.dirName();
|
||||||
|
}
|
||||||
|
|
||||||
|
FITSSelection::FITSSelection(const QStringList &keywords, QWidget *parent) : QDialog(parent)
|
||||||
|
,ui(new Ui::FITSKeyword)
|
||||||
|
{
|
||||||
|
ui->setupUi(this);
|
||||||
|
connect(ui->addButton, &QPushButton::clicked, [this](){
|
||||||
|
auto item = ui->keywordList->findItems(ui->keyword->text(), Qt::MatchFixedString | Qt::MatchCaseSensitive);
|
||||||
|
if(item.size())return;
|
||||||
|
ui->keywordList->addItem(ui->keyword->text());
|
||||||
|
});
|
||||||
|
connect(ui->removeButton, &QPushButton::clicked, [this](){
|
||||||
|
auto items = ui->keywordList->selectedItems();
|
||||||
|
for(auto item : items)
|
||||||
|
delete item;
|
||||||
|
});
|
||||||
|
|
||||||
|
ui->keywordList->addItems(keywords);
|
||||||
|
}
|
||||||
|
|
||||||
|
FITSSelection::~FITSSelection()
|
||||||
|
{
|
||||||
|
delete ui;
|
||||||
|
}
|
||||||
|
|
||||||
|
QStringList FITSSelection::FITSKeywords() const
|
||||||
|
{
|
||||||
|
QStringList keywords;
|
||||||
|
for(int i = 0; i < ui->keywordList->count(); i++)
|
||||||
|
keywords.append(ui->keywordList->item(i)->text());
|
||||||
|
|
||||||
|
return keywords;
|
||||||
|
}
|
||||||
|
|
||||||
|
FileManager::FileManager(const QSet<QString> &openFilter, QWidget *parent) : QMainWindow(parent)
|
||||||
|
,ui(new Ui::FileManager)
|
||||||
|
{
|
||||||
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
QStringList standardLocations = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation);
|
||||||
|
QString picturesPath;
|
||||||
|
if(standardLocations.size())
|
||||||
|
picturesPath = standardLocations.first();
|
||||||
|
|
||||||
|
QSettings settings;
|
||||||
|
QStringList leftTabs = settings.value("filemanager/leftTabPaths", picturesPath).toStringList();
|
||||||
|
QStringList rightTabs = settings.value("filemanager/rightTabPaths", picturesPath).toStringList();
|
||||||
|
if(leftTabs.empty())leftTabs.append(picturesPath);
|
||||||
|
if(rightTabs.empty())rightTabs.append(picturesPath);
|
||||||
|
|
||||||
|
ui->leftTab->setOpenFilter(openFilter);
|
||||||
|
ui->rightTab->setOpenFilter(openFilter);
|
||||||
|
|
||||||
|
_rightTabBar = new PathTabBar(rightTabs);
|
||||||
|
ui->rightLayout->insertLayout(0, _rightTabBar->createLayout());
|
||||||
|
connect(_rightTabBar, &PathTabBar::tabChanged, ui->rightTab, &DirView::setDir);
|
||||||
|
|
||||||
|
_leftTabBar = new PathTabBar(leftTabs);
|
||||||
|
ui->leftLayout->insertLayout(0, _leftTabBar->createLayout());
|
||||||
|
connect(_leftTabBar, &PathTabBar::tabChanged, ui->leftTab, &DirView::setDir);
|
||||||
|
|
||||||
|
connect(ui->leftTab, &DirView::dirChanged, ui->leftPath, &QLineEdit::setText);
|
||||||
|
connect(ui->leftTab, &DirView::dirChanged, _leftTabBar, &PathTabBar::pathChanged);
|
||||||
|
connect(ui->rightTab, &DirView::dirChanged, ui->rightPath, &QLineEdit::setText);
|
||||||
|
connect(ui->rightTab, &DirView::dirChanged, _rightTabBar, &PathTabBar::pathChanged);
|
||||||
|
connect(ui->leftTab, &DirView::openFile, this, &FileManager::openFile);
|
||||||
|
connect(ui->rightTab, &DirView::openFile, this, &FileManager::openFile);
|
||||||
|
connect(ui->leftTab, &DirView::filesAction, this, &FileManager::copyMoveFiles, Qt::QueuedConnection);
|
||||||
|
connect(ui->rightTab, &DirView::filesAction, this, &FileManager::copyMoveFiles, Qt::QueuedConnection);
|
||||||
|
connect(ui->actionLoad_FITS_keywordsLeft, &QAction::toggled, ui->leftTab, &DirView::loadFitsKeywords);
|
||||||
|
connect(ui->actionLoad_FITS_keywordsRight, &QAction::toggled, ui->rightTab, &DirView::loadFitsKeywords);
|
||||||
|
|
||||||
|
ui->leftTab->setDir(_leftTabBar->currentTabPath());
|
||||||
|
ui->leftTab->setFITSKeywords(settings.value("filemanager/leftFitsKeywords", QStringList("OBJECT")).toStringList());
|
||||||
|
ui->leftTab->header()->restoreState(settings.value("filemanager/leftTabHeader").toByteArray());
|
||||||
|
ui->rightTab->setDir(_rightTabBar->currentTabPath());
|
||||||
|
ui->rightTab->setFITSKeywords(settings.value("filemanager/rightFitsKeywords", QStringList("OBJECT")).toStringList());
|
||||||
|
ui->rightTab->header()->restoreState(settings.value("filemanager/rightTabHeader").toByteArray());
|
||||||
|
|
||||||
|
ui->actionLoad_FITS_keywordsLeft->setChecked(settings.value("filemanager/leftLoadFitsKeywords", true).toBool());
|
||||||
|
ui->actionLoad_FITS_keywordsRight->setChecked(settings.value("filemanager/rightLoadFitsKeywords", true).toBool());
|
||||||
|
restoreGeometry(settings.value("filemanager/geometry").toByteArray());
|
||||||
|
|
||||||
|
setAttribute(Qt::WA_DeleteOnClose);
|
||||||
|
|
||||||
|
connect(ui->actionSelect_columnsLeft, &QAction::triggered, this, &FileManager::selectFITSKeywords);
|
||||||
|
connect(ui->actionSelect_columnsRight, &QAction::triggered, this, &FileManager::selectFITSKeywords);
|
||||||
|
connect(ui->actionCopySelectedFilesPathsLeft, &QAction::triggered, this, &FileManager::copySelectedFilesPaths);
|
||||||
|
connect(ui->actionCopySelectedFilesPathsRight, &QAction::triggered, this, &FileManager::copySelectedFilesPaths);
|
||||||
|
connect(ui->leftPath, &QLineEdit::returnPressed, this, &FileManager::pathEdited);
|
||||||
|
connect(ui->rightPath, &QLineEdit::returnPressed, this, &FileManager::pathEdited);
|
||||||
|
|
||||||
|
QFileInfoList drives = QDir::drives();
|
||||||
|
for(auto &drive : drives)
|
||||||
|
{
|
||||||
|
QString path = drive.absoluteFilePath();
|
||||||
|
ui->menuLeft_Tab->addAction(drive.absoluteFilePath(), [path, this](){ ui->leftTab->setDir(path); });
|
||||||
|
ui->menuRight_Tab->addAction(drive.absoluteFilePath(), [path, this](){ ui->rightTab->setDir(path); });
|
||||||
|
}
|
||||||
|
|
||||||
|
ui->progressBar->hide();
|
||||||
|
ui->cancelButton->hide();
|
||||||
|
|
||||||
|
_thread = new QThread(this);
|
||||||
|
_thread->start();
|
||||||
|
_fileTransfer = new FileTransfer(this);
|
||||||
|
_fileTransfer->moveToThread(_thread);
|
||||||
|
connect(_fileTransfer, &FileTransfer::progress, ui->progressBar, &QProgressBar::setValue);
|
||||||
|
connect(_fileTransfer, &FileTransfer::error, this, &FileManager::errorMessage);
|
||||||
|
connect(_fileTransfer, &FileTransfer::finished, [this](){
|
||||||
|
ui->leftTab->setDragEnabled(true);
|
||||||
|
ui->rightTab->setDragEnabled(true);
|
||||||
|
ui->progressBar->hide();
|
||||||
|
ui->cancelButton->hide();
|
||||||
|
});
|
||||||
|
connect(this, &FileManager::copy, _fileTransfer, &FileTransfer::copy);
|
||||||
|
connect(this, &FileManager::move, _fileTransfer, &FileTransfer::move);
|
||||||
|
connect(ui->cancelButton, &QPushButton::clicked, [this](){ _fileTransfer->cancel(); });
|
||||||
|
}
|
||||||
|
|
||||||
|
FileManager::~FileManager()
|
||||||
|
{
|
||||||
|
QSettings settings;
|
||||||
|
settings.setValue("filemanager/leftFitsKeywords", ui->leftTab->FITSKeywords());
|
||||||
|
settings.setValue("filemanager/leftTabPaths", _leftTabBar->tabPaths());
|
||||||
|
settings.setValue("filemanager/leftTabHeader", ui->leftTab->header()->saveState());
|
||||||
|
settings.setValue("filemanager/rightFitsKeywords", ui->rightTab->FITSKeywords());
|
||||||
|
settings.setValue("filemanager/rightTabPaths", _rightTabBar->tabPaths());
|
||||||
|
settings.setValue("filemanager/rightTabHeader", ui->rightTab->header()->saveState());
|
||||||
|
settings.setValue("filemanager/leftLoadFitsKeywords", ui->actionLoad_FITS_keywordsLeft->isChecked());
|
||||||
|
settings.setValue("filemanager/rightLoadFitsKeywords", ui->actionLoad_FITS_keywordsRight->isChecked());
|
||||||
|
settings.setValue("filemanager/geometry", saveGeometry());
|
||||||
|
delete ui;
|
||||||
|
|
||||||
|
_fileTransfer->cancel();
|
||||||
|
_thread->quit();
|
||||||
|
_thread->wait();
|
||||||
|
|
||||||
|
delete _fileTransfer;
|
||||||
|
}
|
||||||
|
|
||||||
|
void FileManager::selectFITSKeywords()
|
||||||
|
{
|
||||||
|
QStringList columns;
|
||||||
|
if(sender() == ui->actionSelect_columnsLeft)
|
||||||
|
columns = ui->leftTab->FITSKeywords();
|
||||||
|
if(sender() == ui->actionSelect_columnsRight)
|
||||||
|
columns = ui->rightTab->FITSKeywords();
|
||||||
|
|
||||||
|
FITSSelection selection(columns, this);
|
||||||
|
int ret = selection.exec();
|
||||||
|
|
||||||
|
if(ret == QDialog::Accepted)
|
||||||
|
{
|
||||||
|
if(sender() == ui->actionSelect_columnsLeft)
|
||||||
|
ui->leftTab->setFITSKeywords(selection.FITSKeywords());
|
||||||
|
|
||||||
|
if(sender() == ui->actionSelect_columnsRight)
|
||||||
|
ui->rightTab->setFITSKeywords(selection.FITSKeywords());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void FileManager::copySelectedFilesPaths()
|
||||||
|
{
|
||||||
|
if(sender() == ui->actionCopySelectedFilesPathsLeft)
|
||||||
|
ui->leftTab->copySelectedFilesPathsToClipboard();
|
||||||
|
if(sender() == ui->actionCopySelectedFilesPathsRight)
|
||||||
|
ui->rightTab->copySelectedFilesPathsToClipboard();
|
||||||
|
}
|
||||||
|
|
||||||
|
void FileManager::pathEdited()
|
||||||
|
{
|
||||||
|
if(sender() == ui->leftPath)
|
||||||
|
{
|
||||||
|
QDir dir(ui->leftPath->text());
|
||||||
|
if(dir.exists())
|
||||||
|
ui->leftTab->setDir(dir.absolutePath());
|
||||||
|
}
|
||||||
|
if(sender() == ui->rightPath)
|
||||||
|
{
|
||||||
|
QDir dir(ui->rightPath->text());
|
||||||
|
if(dir.exists())
|
||||||
|
ui->rightTab->setDir(dir.absolutePath());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void FileManager::copyMoveFiles(Qt::DropAction action, const QStringList &src, const QString &dst)
|
||||||
|
{
|
||||||
|
ui->leftTab->setDragEnabled(false);
|
||||||
|
ui->rightTab->setDragEnabled(false);
|
||||||
|
ui->progressBar->show();
|
||||||
|
ui->cancelButton->show();
|
||||||
|
|
||||||
|
switch(action)
|
||||||
|
{
|
||||||
|
case Qt::CopyAction:
|
||||||
|
emit copy(src, dst);
|
||||||
|
break;
|
||||||
|
case Qt::MoveAction:
|
||||||
|
emit move(src, dst);
|
||||||
|
break;
|
||||||
|
case Qt::LinkAction:
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QMessageBox::StandardButton FileManager::overwrite(const QString &dst)
|
||||||
|
{
|
||||||
|
QMessageBox::StandardButton button = QMessageBox::question(this, tr("Overwrite file?"), tr("Destination file %1 already exists. Overwrite?").arg(dst),
|
||||||
|
QMessageBox::Yes | QMessageBox::YesToAll | QMessageBox::No | QMessageBox::NoToAll | QMessageBox::Cancel);
|
||||||
|
|
||||||
|
return button;
|
||||||
|
}
|
||||||
|
|
||||||
|
void FileManager::errorMessage(const QString &title, const QString &text)
|
||||||
|
{
|
||||||
|
QMessageBox::critical(this, title, text);
|
||||||
|
}
|
||||||
|
|
||||||
|
QCache<QString, ImageInfoData>* DirFileSystemModel::getCacheInstance()
|
||||||
|
{
|
||||||
|
static bool init = true;
|
||||||
|
static QCache<QString, ImageInfoData> cache;
|
||||||
|
if(!init)
|
||||||
|
{
|
||||||
|
cache.setMaxCost(10000);
|
||||||
|
init = false;
|
||||||
|
}
|
||||||
|
return &cache;
|
||||||
|
}
|
||||||
|
|
||||||
|
DirFileSystemModel::DirFileSystemModel(QWidget *parentWidget) : QFileSystemModel(parentWidget)
|
||||||
|
,_parentWidget(parentWidget)
|
||||||
|
{
|
||||||
|
_cache = getCacheInstance();
|
||||||
|
setFilter(QDir::AllEntries | QDir::NoDot);
|
||||||
|
_fitsKeywords = {"OBJECT"};
|
||||||
|
}
|
||||||
|
|
||||||
|
void DirFileSystemModel::setDir(const QString &path)
|
||||||
|
{
|
||||||
|
_dir = index(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
QString DirFileSystemModel::dir() const
|
||||||
|
{
|
||||||
|
return fileInfo(_dir).canonicalFilePath();
|
||||||
|
}
|
||||||
|
|
||||||
|
void DirFileSystemModel::setFITSKeywords(const QStringList &keywords)
|
||||||
|
{
|
||||||
|
beginResetModel();
|
||||||
|
_fitsKeywords = keywords;
|
||||||
|
endResetModel();
|
||||||
|
}
|
||||||
|
|
||||||
|
const QStringList &DirFileSystemModel::FITSKeywords() const
|
||||||
|
{
|
||||||
|
return _fitsKeywords;
|
||||||
|
}
|
||||||
|
|
||||||
|
Qt::ItemFlags DirFileSystemModel::flags(const QModelIndex &index) const
|
||||||
|
{
|
||||||
|
Qt::ItemFlags ret = QFileSystemModel::flags(index) & ~Qt::ItemIsEditable;
|
||||||
|
if(index.row() == 0)ret &= ~Qt::ItemIsDragEnabled;
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
int DirFileSystemModel::columnCount(const QModelIndex &parent) const
|
||||||
|
{
|
||||||
|
return QFileSystemModel::columnCount(parent) + _fitsKeywords.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
QVariant DirFileSystemModel::data(const QModelIndex &index, int role) const
|
||||||
|
{
|
||||||
|
if(index.column() >= QFileSystemModel::columnCount() && role == Qt::DisplayRole)
|
||||||
|
{
|
||||||
|
QFileInfo info = fileInfo(index);
|
||||||
|
QString path = info.canonicalFilePath();
|
||||||
|
QString suffix = info.suffix();
|
||||||
|
ImageInfoData *infoData = nullptr;
|
||||||
|
if(_cache->contains(path))
|
||||||
|
{
|
||||||
|
infoData = _cache->object(path);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if(_loadFitsKeywords)
|
||||||
|
{
|
||||||
|
infoData = new ImageInfoData;
|
||||||
|
if(isFITS(suffix))
|
||||||
|
readFITSHeader(path, *infoData);
|
||||||
|
else if(isXISF(suffix))
|
||||||
|
readXISFHeader(path, *infoData);
|
||||||
|
_cache->insert(path, infoData);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(infoData)
|
||||||
|
{
|
||||||
|
int column = index.column() - QFileSystemModel::columnCount();
|
||||||
|
if(column < _fitsKeywords.size())
|
||||||
|
{
|
||||||
|
const QString &key = _fitsKeywords.at(column);
|
||||||
|
for(auto &record : infoData->fitsHeader)
|
||||||
|
if(record.key == key)
|
||||||
|
return record.value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return QFileSystemModel::data(index, role);
|
||||||
|
}
|
||||||
|
|
||||||
|
QVariant DirFileSystemModel::headerData(int section, Qt::Orientation orientation, int role) const
|
||||||
|
{
|
||||||
|
if(orientation == Qt::Horizontal && role == Qt::DisplayRole && section >= QFileSystemModel::columnCount())
|
||||||
|
return _fitsKeywords.at(section - QFileSystemModel::columnCount());
|
||||||
|
|
||||||
|
return QFileSystemModel::headerData(section, orientation, role);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DirFileSystemModel::hasChildren(const QModelIndex &parent) const
|
||||||
|
{
|
||||||
|
if(parent.parent() == _dir)return false;
|
||||||
|
|
||||||
|
return QFileSystemModel::hasChildren(parent);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DirFileSystemModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
|
||||||
|
{
|
||||||
|
Q_UNUSED(row);
|
||||||
|
Q_UNUSED(column);
|
||||||
|
if(data->hasUrls())
|
||||||
|
{
|
||||||
|
QStringList srcPaths;
|
||||||
|
for(auto &url : data->urls())
|
||||||
|
srcPaths.append(url.toLocalFile());
|
||||||
|
emit filesAction(action, srcPaths, filePath(parent));
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void DirFileSystemModel::loadFitsKeywords(bool enable)
|
||||||
|
{
|
||||||
|
_loadFitsKeywords = enable;
|
||||||
|
}
|
||||||
|
|
||||||
|
DirView::DirView(QWidget *parent) : QTreeView(parent)
|
||||||
|
{
|
||||||
|
_dirFileSystemModel = new DirFileSystemModel(this);
|
||||||
|
_dirFileSystemModel->setRootPath(QDir::drives().first().path());
|
||||||
|
_dirFileSystemModel->setReadOnly(false);
|
||||||
|
setDragEnabled(true);
|
||||||
|
setAcceptDrops(true);
|
||||||
|
|
||||||
|
connect(_dirFileSystemModel, &DirFileSystemModel::filesAction, this, &DirView::filesAction);
|
||||||
|
|
||||||
|
setModel(_dirFileSystemModel);
|
||||||
|
setSelectionMode(QAbstractItemView::ExtendedSelection);
|
||||||
|
|
||||||
|
connect(this, &QTreeView::doubleClicked, [this](const QModelIndex &index){
|
||||||
|
QFileInfo info = _dirFileSystemModel->fileInfo(index);
|
||||||
|
if(_dirFileSystemModel->isDir(index))
|
||||||
|
{
|
||||||
|
setDir(info.canonicalFilePath());
|
||||||
|
}
|
||||||
|
else if(info.isFile())
|
||||||
|
{
|
||||||
|
if(_openFilter.contains(info.suffix().toLower()))
|
||||||
|
emit openFile(info.absoluteFilePath());
|
||||||
|
else
|
||||||
|
QDesktopServices::openUrl(QUrl::fromLocalFile(info.absoluteFilePath()));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
header()->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||||
|
connect(header(), &QHeaderView::customContextMenuRequested, this, &DirView::headerContextMenu);
|
||||||
|
}
|
||||||
|
|
||||||
|
void DirView::setDir(const QString &path)
|
||||||
|
{
|
||||||
|
QString oldPath = _dirFileSystemModel->dir();
|
||||||
|
#ifdef Q_OS_WINDOWS
|
||||||
|
const int ROOT_LEN = 3;
|
||||||
|
#else
|
||||||
|
const int ROOT_LEN = 1;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if(oldPath.left(ROOT_LEN) != path.left(ROOT_LEN))
|
||||||
|
_dirFileSystemModel->setRootPath(path.left(ROOT_LEN));
|
||||||
|
|
||||||
|
_dirFileSystemModel->setDir(path);
|
||||||
|
setRootIndex(_dirFileSystemModel->index(path, 0));
|
||||||
|
clearSelection();
|
||||||
|
if(oldPath != path)emit dirChanged(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
QString DirView::dir() const
|
||||||
|
{
|
||||||
|
return _dirFileSystemModel->dir();
|
||||||
|
}
|
||||||
|
|
||||||
|
void DirView::setOpenFilter(const QSet<QString> &openFilter)
|
||||||
|
{
|
||||||
|
_openFilter = openFilter;
|
||||||
|
}
|
||||||
|
|
||||||
|
void DirView::setFITSKeywords(const QStringList &keywords)
|
||||||
|
{
|
||||||
|
QString d = dir();
|
||||||
|
_dirFileSystemModel->setFITSKeywords(keywords);
|
||||||
|
setDir(d);
|
||||||
|
}
|
||||||
|
|
||||||
|
const QStringList &DirView::FITSKeywords() const
|
||||||
|
{
|
||||||
|
return _dirFileSystemModel->FITSKeywords();
|
||||||
|
}
|
||||||
|
|
||||||
|
void DirView::headerContextMenu(const QPoint &pos)
|
||||||
|
{
|
||||||
|
QHeaderView *head = header();
|
||||||
|
QMenu menu;
|
||||||
|
int count = head->count();
|
||||||
|
for(int i = 0; i < count; i++)
|
||||||
|
{
|
||||||
|
QAction *a = menu.addAction(head->model()->headerData(i, Qt::Horizontal).toString());
|
||||||
|
a->setCheckable(true);
|
||||||
|
a->setChecked(!head->isSectionHidden(i));
|
||||||
|
a->setData(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
QAction *a = menu.exec(mapToGlobal(pos));
|
||||||
|
if(a)
|
||||||
|
{
|
||||||
|
if(a->isChecked())head->showSection(a->data().toInt());
|
||||||
|
else head->hideSection(a->data().toInt());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void DirView::loadFitsKeywords(bool enable)
|
||||||
|
{
|
||||||
|
_dirFileSystemModel->loadFitsKeywords(enable);
|
||||||
|
}
|
||||||
|
|
||||||
|
void DirView::copySelectedFilesPathsToClipboard() const
|
||||||
|
{
|
||||||
|
QList<QUrl> urls;
|
||||||
|
QString text;
|
||||||
|
auto selected = selectionModel()->selectedRows();
|
||||||
|
for(auto &item : selected)
|
||||||
|
{
|
||||||
|
if(item.column() == 0)
|
||||||
|
{
|
||||||
|
QString path = _dirFileSystemModel->filePath(item);
|
||||||
|
text.append(path); text.append('\n');
|
||||||
|
urls.append(QUrl::fromLocalFile(path));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QClipboard *clipboard = QApplication::clipboard();
|
||||||
|
QMimeData *mimeData = new QMimeData();
|
||||||
|
mimeData->setUrls(urls);
|
||||||
|
mimeData->setText(text);
|
||||||
|
clipboard->setMimeData(mimeData);
|
||||||
|
}
|
||||||
@@ -0,0 +1,150 @@
|
|||||||
|
#ifndef FILEMANAGER_H
|
||||||
|
#define FILEMANAGER_H
|
||||||
|
|
||||||
|
#include <QMainWindow>
|
||||||
|
#include <QCache>
|
||||||
|
#include <QFileSystemModel>
|
||||||
|
#include <QTreeView>
|
||||||
|
#include <QDialog>
|
||||||
|
#include <QTabBar>
|
||||||
|
#include <QHBoxLayout>
|
||||||
|
#include <QMessageBox>
|
||||||
|
#include "imageinfodata.h"
|
||||||
|
|
||||||
|
namespace Ui {
|
||||||
|
class FileManager;
|
||||||
|
class FITSKeyword;
|
||||||
|
}
|
||||||
|
|
||||||
|
class FileManager;
|
||||||
|
|
||||||
|
class FileTransfer: public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
explicit FileTransfer(FileManager *fm);
|
||||||
|
~FileTransfer();
|
||||||
|
public slots:
|
||||||
|
void copy(const QStringList &src, const QString &dst);
|
||||||
|
void move(const QStringList &src, const QString &dst);
|
||||||
|
void cancel();
|
||||||
|
signals:
|
||||||
|
void progress(int percent);
|
||||||
|
void finished();
|
||||||
|
void error(const QString &title, const QString &text);
|
||||||
|
private:
|
||||||
|
void perform(const QStringList &src, const QString &dst, bool copy);
|
||||||
|
struct Action
|
||||||
|
{
|
||||||
|
QString src;
|
||||||
|
QString dst;
|
||||||
|
bool dir = false;
|
||||||
|
};
|
||||||
|
FileManager *_fm;
|
||||||
|
bool _run = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
class PathTabBar : public QTabBar
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
explicit PathTabBar(const QStringList &tabs);
|
||||||
|
QHBoxLayout* createLayout();
|
||||||
|
const QStringList& tabPaths() const;
|
||||||
|
QString currentTabPath() const;
|
||||||
|
public slots:
|
||||||
|
void pathChanged(const QString &path);
|
||||||
|
signals:
|
||||||
|
void tabChanged(const QString &path);
|
||||||
|
private:
|
||||||
|
QStringList _tabs;
|
||||||
|
QString tabName(const QString &path);
|
||||||
|
};
|
||||||
|
|
||||||
|
class FITSSelection : public QDialog
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
FITSSelection(const QStringList &keywords, QWidget *parent = nullptr);
|
||||||
|
~FITSSelection();
|
||||||
|
QStringList FITSKeywords() const;
|
||||||
|
private:
|
||||||
|
Ui::FITSKeyword *ui;
|
||||||
|
};
|
||||||
|
|
||||||
|
class FileManager : public QMainWindow
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
explicit FileManager(const QSet<QString> &openFilter, QWidget *parent = nullptr);
|
||||||
|
~FileManager();
|
||||||
|
public slots:
|
||||||
|
void selectFITSKeywords();
|
||||||
|
void copySelectedFilesPaths();
|
||||||
|
void pathEdited();
|
||||||
|
void copyMoveFiles(Qt::DropAction action, const QStringList &src, const QString &dst);
|
||||||
|
QMessageBox::StandardButton overwrite(const QString &dst);
|
||||||
|
void errorMessage(const QString &title, const QString &text);
|
||||||
|
signals:
|
||||||
|
void openFile(const QString &path);
|
||||||
|
void copy(const QStringList &src, const QString &dst);
|
||||||
|
void move(const QStringList &src, const QString &dst);
|
||||||
|
private:
|
||||||
|
Ui::FileManager *ui;
|
||||||
|
PathTabBar *_leftTabBar;
|
||||||
|
PathTabBar *_rightTabBar;
|
||||||
|
QThread *_thread;
|
||||||
|
FileTransfer *_fileTransfer;
|
||||||
|
};
|
||||||
|
|
||||||
|
class DirFileSystemModel : public QFileSystemModel
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
explicit DirFileSystemModel(QWidget *parentWidget);
|
||||||
|
void setDir(const QString &path);
|
||||||
|
QString dir() const;
|
||||||
|
void setFITSKeywords(const QStringList &keywords);
|
||||||
|
const QStringList& FITSKeywords() const;
|
||||||
|
Qt::ItemFlags flags(const QModelIndex &index) const override;
|
||||||
|
int columnCount(const QModelIndex &parent) const override;
|
||||||
|
QVariant data(const QModelIndex &index, int role) const override;
|
||||||
|
QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
|
||||||
|
bool hasChildren(const QModelIndex &parent) const override;
|
||||||
|
bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
|
||||||
|
public slots:
|
||||||
|
void loadFitsKeywords(bool enable);
|
||||||
|
signals:
|
||||||
|
void filesAction(Qt::DropAction action, const QStringList &src, const QString &dst);
|
||||||
|
private:
|
||||||
|
mutable QCache<QString, ImageInfoData> *_cache = nullptr;
|
||||||
|
static QCache<QString, ImageInfoData>* getCacheInstance();
|
||||||
|
QModelIndex _dir;
|
||||||
|
QStringList _fitsKeywords;
|
||||||
|
bool _loadFitsKeywords = true;
|
||||||
|
QWidget *_parentWidget = nullptr;
|
||||||
|
};
|
||||||
|
|
||||||
|
class DirView : public QTreeView
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
DirFileSystemModel *_dirFileSystemModel = nullptr;
|
||||||
|
QSet<QString> _openFilter;
|
||||||
|
public:
|
||||||
|
explicit DirView(QWidget *parent = nullptr);
|
||||||
|
void setDir(const QString &path);
|
||||||
|
QString dir() const;
|
||||||
|
void setOpenFilter(const QSet<QString> &openFilter);
|
||||||
|
void setFITSKeywords(const QStringList &keywords);
|
||||||
|
const QStringList& FITSKeywords() const;
|
||||||
|
public slots:
|
||||||
|
void headerContextMenu(const QPoint &pos);
|
||||||
|
void loadFitsKeywords(bool enable);
|
||||||
|
void copySelectedFilesPathsToClipboard() const;
|
||||||
|
signals:
|
||||||
|
void dirChanged(const QString &path);
|
||||||
|
void openFile(const QString &path);
|
||||||
|
void filesAction(Qt::DropAction action, const QStringList &src, const QString &dst);
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // FILEMANAGER_H
|
||||||
@@ -0,0 +1,150 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<ui version="4.0">
|
||||||
|
<class>FileManager</class>
|
||||||
|
<widget class="QMainWindow" name="FileManager">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>0</x>
|
||||||
|
<y>0</y>
|
||||||
|
<width>1282</width>
|
||||||
|
<height>858</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="windowTitle">
|
||||||
|
<string>File Manager</string>
|
||||||
|
</property>
|
||||||
|
<widget class="QWidget" name="centralwidget">
|
||||||
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
|
<item>
|
||||||
|
<layout class="QVBoxLayout" name="leftLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="QLineEdit" name="leftPath"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="DirView" name="leftTab"/>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QVBoxLayout" name="rightLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="QLineEdit" name="rightPath"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="DirView" name="rightTab"/>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="progressLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="QProgressBar" name="progressBar">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||||
|
<horstretch>1</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="value">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="cancelButton">
|
||||||
|
<property name="text">
|
||||||
|
<string>Cancel</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
<widget class="QMenuBar" name="menubar">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>0</x>
|
||||||
|
<y>0</y>
|
||||||
|
<width>1282</width>
|
||||||
|
<height>23</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<widget class="QMenu" name="menuLeft_Tab">
|
||||||
|
<property name="title">
|
||||||
|
<string>Left Tab</string>
|
||||||
|
</property>
|
||||||
|
<addaction name="actionLoad_FITS_keywordsLeft"/>
|
||||||
|
<addaction name="actionSelect_columnsLeft"/>
|
||||||
|
<addaction name="actionCopySelectedFilesPathsLeft"/>
|
||||||
|
<addaction name="separator"/>
|
||||||
|
</widget>
|
||||||
|
<widget class="QMenu" name="menuRight_Tab">
|
||||||
|
<property name="title">
|
||||||
|
<string>Right Tab</string>
|
||||||
|
</property>
|
||||||
|
<addaction name="actionLoad_FITS_keywordsRight"/>
|
||||||
|
<addaction name="actionSelect_columnsRight"/>
|
||||||
|
<addaction name="actionCopySelectedFilesPathsRight"/>
|
||||||
|
<addaction name="separator"/>
|
||||||
|
</widget>
|
||||||
|
<addaction name="menuLeft_Tab"/>
|
||||||
|
<addaction name="menuRight_Tab"/>
|
||||||
|
</widget>
|
||||||
|
<action name="actionLoad_FITS_keywordsLeft">
|
||||||
|
<property name="checkable">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Load FITS keywords</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
|
<action name="actionLoad_FITS_keywordsRight">
|
||||||
|
<property name="checkable">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Load FITS keywords</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
|
<action name="actionSelect_columnsLeft">
|
||||||
|
<property name="text">
|
||||||
|
<string>Select columns</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
|
<action name="actionSelect_columnsRight">
|
||||||
|
<property name="text">
|
||||||
|
<string>Select columns</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
|
<action name="actionCopySelectedFilesPathsLeft">
|
||||||
|
<property name="text">
|
||||||
|
<string>Copy selected files paths</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
|
<action name="actionCopySelectedFilesPathsRight">
|
||||||
|
<property name="text">
|
||||||
|
<string>Copy selected files paths</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
|
</widget>
|
||||||
|
<customwidgets>
|
||||||
|
<customwidget>
|
||||||
|
<class>DirView</class>
|
||||||
|
<extends>QTreeView</extends>
|
||||||
|
<header>filemanager.h</header>
|
||||||
|
</customwidget>
|
||||||
|
</customwidgets>
|
||||||
|
<resources/>
|
||||||
|
<connections/>
|
||||||
|
</ui>
|
||||||
@@ -5,6 +5,7 @@
|
|||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
#include <QHeaderView>
|
#include <QHeaderView>
|
||||||
|
#include <QMimeDatabase>
|
||||||
|
|
||||||
FilesystemWidget::FilesystemWidget(QAbstractItemModel *model, QWidget *parent) : QWidget(parent)
|
FilesystemWidget::FilesystemWidget(QAbstractItemModel *model, QWidget *parent) : QWidget(parent)
|
||||||
, m_model(model)
|
, m_model(model)
|
||||||
@@ -117,6 +118,7 @@ void Filetree::contextMenuEvent(QContextMenuEvent *event)
|
|||||||
{
|
{
|
||||||
setRootIndex(index);
|
setRootIndex(index);
|
||||||
m_rootDir = m_fileSystemModel->filePath(index);
|
m_rootDir = m_fileSystemModel->filePath(index);
|
||||||
|
m_fileSystemModel->setRootPath(m_rootDir);
|
||||||
}
|
}
|
||||||
else if(a == resetRoot)
|
else if(a == resetRoot)
|
||||||
{
|
{
|
||||||
@@ -127,6 +129,7 @@ void Filetree::contextMenuEvent(QContextMenuEvent *event)
|
|||||||
{
|
{
|
||||||
setRootIndex(rootIndex().parent());
|
setRootIndex(rootIndex().parent());
|
||||||
m_rootDir = m_fileSystemModel->filePath(rootIndex().parent());
|
m_rootDir = m_fileSystemModel->filePath(rootIndex().parent());
|
||||||
|
m_fileSystemModel->setRootPath(m_rootDir);
|
||||||
}
|
}
|
||||||
else if(a == copy)
|
else if(a == copy)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
#include <QFileSystemModel>
|
#include <QFileSystemModel>
|
||||||
|
#include <QIdentityProxyModel>
|
||||||
#include <QListView>
|
#include <QListView>
|
||||||
#include <QTreeView>
|
#include <QTreeView>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,98 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<ui version="4.0">
|
||||||
|
<class>FITSKeyword</class>
|
||||||
|
<widget class="QDialog" name="FITSKeyword">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>0</x>
|
||||||
|
<y>0</y>
|
||||||
|
<width>432</width>
|
||||||
|
<height>443</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="windowTitle">
|
||||||
|
<string>FITS Columns</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="QListWidget" name="keywordList">
|
||||||
|
<property name="dragEnabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="dragDropMode">
|
||||||
|
<enum>QAbstractItemView::InternalMove</enum>
|
||||||
|
</property>
|
||||||
|
<property name="defaultDropAction">
|
||||||
|
<enum>Qt::MoveAction</enum>
|
||||||
|
</property>
|
||||||
|
<property name="selectionMode">
|
||||||
|
<enum>QAbstractItemView::ExtendedSelection</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLineEdit" name="keyword"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="addButton">
|
||||||
|
<property name="text">
|
||||||
|
<string>Add</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="removeButton">
|
||||||
|
<property name="text">
|
||||||
|
<string>Remove</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QDialogButtonBox" name="buttonBox">
|
||||||
|
<property name="standardButtons">
|
||||||
|
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
<resources/>
|
||||||
|
<connections>
|
||||||
|
<connection>
|
||||||
|
<sender>buttonBox</sender>
|
||||||
|
<signal>accepted()</signal>
|
||||||
|
<receiver>FITSKeyword</receiver>
|
||||||
|
<slot>accept()</slot>
|
||||||
|
<hints>
|
||||||
|
<hint type="sourcelabel">
|
||||||
|
<x>215</x>
|
||||||
|
<y>420</y>
|
||||||
|
</hint>
|
||||||
|
<hint type="destinationlabel">
|
||||||
|
<x>215</x>
|
||||||
|
<y>221</y>
|
||||||
|
</hint>
|
||||||
|
</hints>
|
||||||
|
</connection>
|
||||||
|
<connection>
|
||||||
|
<sender>buttonBox</sender>
|
||||||
|
<signal>rejected()</signal>
|
||||||
|
<receiver>FITSKeyword</receiver>
|
||||||
|
<slot>reject()</slot>
|
||||||
|
<hints>
|
||||||
|
<hint type="sourcelabel">
|
||||||
|
<x>215</x>
|
||||||
|
<y>420</y>
|
||||||
|
</hint>
|
||||||
|
<hint type="destinationlabel">
|
||||||
|
<x>215</x>
|
||||||
|
<y>221</y>
|
||||||
|
</hint>
|
||||||
|
</hints>
|
||||||
|
</connection>
|
||||||
|
</connections>
|
||||||
|
</ui>
|
||||||
@@ -86,6 +86,7 @@ WCSDataT::WCSDataT(int width, int height, const QVector<FITSRecord> &header) :
|
|||||||
for(const FITSRecord &record : header)
|
for(const FITSRecord &record : header)
|
||||||
{
|
{
|
||||||
if(record.key.startsWith("PV"))continue;
|
if(record.key.startsWith("PV"))continue;
|
||||||
|
if(record.xisf)continue;
|
||||||
|
|
||||||
QByteArray rec;
|
QByteArray rec;
|
||||||
rec.append(record.key.leftJustified(8, ' '));
|
rec.append(record.key.leftJustified(8, ' '));
|
||||||
@@ -452,7 +453,8 @@ SkyGrid WCSDataT::prepareGrid(uint32_t w, uint32_t h, Database *database)
|
|||||||
|
|
||||||
if(database)
|
if(database)
|
||||||
{
|
{
|
||||||
skyGrid.objects = database->getObjects(minRa, maxRa, minDec, maxDec);
|
double size = std::max(maxRa - minRa, maxDec - minDec);
|
||||||
|
skyGrid.objects = database->getObjects(minRa - size, maxRa + size, minDec - size, maxDec + size);
|
||||||
for(auto &object : skyGrid.objects)
|
for(auto &object : skyGrid.objects)
|
||||||
{
|
{
|
||||||
QPointF p;
|
QPointF p;
|
||||||
|
|||||||
+56
-4
@@ -241,18 +241,59 @@ bool loadXISF(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage
|
|||||||
{
|
{
|
||||||
info.fitsHeader.append(fits);
|
info.fitsHeader.append(fits);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QVector<FITSRecord> xisfWCS;
|
||||||
auto imageproperties = xisfImage.imageProperties();
|
auto imageproperties = xisfImage.imageProperties();
|
||||||
for(auto prop : imageproperties)
|
for(auto prop : imageproperties)
|
||||||
{
|
{
|
||||||
info.fitsHeader.append(prop);
|
info.fitsHeader.append(prop);
|
||||||
|
if(prop.id == "PCL:AstrometricSolution:ReferenceCelestialCoordinates" && prop.value.type() == LibXISF::Variant::Type::F64Vector)
|
||||||
|
{
|
||||||
|
auto val = prop.value.value<LibXISF::F64Vector>();
|
||||||
|
if(val.size() >= 2)
|
||||||
|
{
|
||||||
|
xisfWCS.append({"CRVAL1", val[0], "value from PCL:AstrometricSolution"});
|
||||||
|
xisfWCS.append({"CRVAL2", val[1], "value from PCL:AstrometricSolution"});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(prop.id == "PCL:AstrometricSolution:ReferenceImageCoordinates" && prop.value.type() == LibXISF::Variant::Type::F64Vector)
|
||||||
|
{
|
||||||
|
auto val = prop.value.value<LibXISF::F64Vector>();
|
||||||
|
if(val.size() >= 2)
|
||||||
|
{
|
||||||
|
xisfWCS.append({"CRPIX1", val[0], "value from PCL:AstrometricSolution"});
|
||||||
|
xisfWCS.append({"CRPIX2", val[1], "value from PCL:AstrometricSolution"});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(prop.id == "PCL:AstrometricSolution:LinearTransformationMatrix" && prop.value.type() == LibXISF::Variant::Type::F64Matrix)
|
||||||
|
{
|
||||||
|
auto val = prop.value.value<LibXISF::F64Matrix>();
|
||||||
|
if(val.cols() >= 2 && val.rows() >= 2)
|
||||||
|
{
|
||||||
|
xisfWCS.append({"CD1_1", val(0, 0), "value from PCL:AstrometricSolution"});
|
||||||
|
xisfWCS.append({"CD1_2", val(0, 1), "value from PCL:AstrometricSolution"});
|
||||||
|
xisfWCS.append({"CD2_1", val(1, 0), "value from PCL:AstrometricSolution"});
|
||||||
|
xisfWCS.append({"CD2_2", val(1, 1), "value from PCL:AstrometricSolution"});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(prop.id == "PCL:AstrometricSolution:ProjectionSystem")
|
||||||
|
{
|
||||||
|
if(prop.value.toString() == "Gnomonic")
|
||||||
|
{
|
||||||
|
xisfWCS.append({"CTYPE1", "RA---TAN", "value from PCL:AstrometricSolution"});
|
||||||
|
xisfWCS.append({"CTYPE", "DEC--TAN", "value from PCL:AstrometricSolution"});
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
info.num = xisf.imagesCount();
|
info.num = xisf.imagesCount();
|
||||||
info.index = index;
|
info.index = index;
|
||||||
info.wcs = std::make_shared<WCSDataT>(xisfImage.width(), xisfImage.height(), info.fitsHeader);
|
|
||||||
info.info.append({QObject::tr("Width"), QString::number(xisfImage.width())});
|
info.info.append({QObject::tr("Width"), QString::number(xisfImage.width())});
|
||||||
info.info.append({QObject::tr("Height"), QString::number(xisfImage.height())});
|
info.info.append({QObject::tr("Height"), QString::number(xisfImage.height())});
|
||||||
if(!info.wcs->valid())info.wcs.reset();
|
|
||||||
|
auto wcs = std::make_shared<WCSDataT>(xisfImage.width(), xisfImage.height(), info.fitsHeader);
|
||||||
|
if(!wcs->valid() && xisfWCS.size())wcs = std::make_shared<WCSDataT>(xisfImage.width(), xisfImage.height(), xisfWCS);
|
||||||
|
if(wcs->valid())info.wcs = wcs;
|
||||||
|
|
||||||
RawImage::DataType type;
|
RawImage::DataType type;
|
||||||
switch(xisfImage.sampleFormat())
|
switch(xisfImage.sampleFormat())
|
||||||
@@ -409,18 +450,19 @@ bool loadImage(const QString &path, ImageInfoData &info, std::shared_ptr<RawImag
|
|||||||
{
|
{
|
||||||
bool ret = false;
|
bool ret = false;
|
||||||
QElapsedTimer timer;
|
QElapsedTimer timer;
|
||||||
|
QFileInfo fileInfo(path);
|
||||||
timer.start();
|
timer.start();
|
||||||
if(path.endsWith(".CR2", Qt::CaseInsensitive) || path.endsWith(".CR3", Qt::CaseInsensitive) || path.endsWith(".NEF", Qt::CaseInsensitive) || path.endsWith(".DNG", Qt::CaseInsensitive))
|
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);
|
ret = loadRAW(path, info, rawImage);
|
||||||
qDebug() << "LoadRAW" << timer.elapsed();
|
qDebug() << "LoadRAW" << timer.elapsed();
|
||||||
}
|
}
|
||||||
else if(path.endsWith(".FIT", Qt::CaseInsensitive) || path.endsWith(".FITS", Qt::CaseInsensitive) || path.endsWith(".FZ", Qt::CaseInsensitive) || path.endsWith(".FTS", Qt::CaseInsensitive))
|
else if(isFITS(fileInfo.suffix()))
|
||||||
{
|
{
|
||||||
ret = loadFITS(path, info, rawImage, planar, index);
|
ret = loadFITS(path, info, rawImage, planar, index);
|
||||||
qDebug() << "LoadFITS" << timer.elapsed();
|
qDebug() << "LoadFITS" << timer.elapsed();
|
||||||
}
|
}
|
||||||
else if(path.endsWith(".XISF", Qt::CaseInsensitive))
|
else if(isXISF(fileInfo.suffix()))
|
||||||
{
|
{
|
||||||
ret = loadXISF(path, info, rawImage, planar, index);
|
ret = loadXISF(path, info, rawImage, planar, index);
|
||||||
qDebug() << "LoadXISF" << timer.elapsed();
|
qDebug() << "LoadXISF" << timer.elapsed();
|
||||||
@@ -444,3 +486,13 @@ bool loadImage(const QString &path, ImageInfoData &info, std::shared_ptr<RawImag
|
|||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool isFITS(const QString &suffix)
|
||||||
|
{
|
||||||
|
return suffix.compare("fits", Qt::CaseInsensitive) == 0 || suffix.compare("fit", Qt::CaseInsensitive) == 0 || suffix.compare("fts", Qt::CaseInsensitive) == 0 || suffix.compare("fz", Qt::CaseInsensitive) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool isXISF(const QString &suffix)
|
||||||
|
{
|
||||||
|
return suffix.compare("xisf", Qt::CaseInsensitive) == 0;
|
||||||
|
}
|
||||||
|
|||||||
@@ -10,5 +10,7 @@ QString makeUNCPath(const QString &path);
|
|||||||
bool readFITSHeader(const QString &path, ImageInfoData &info);
|
bool readFITSHeader(const QString &path, ImageInfoData &info);
|
||||||
bool readXISFHeader(const QString &path, ImageInfoData &info);
|
bool readXISFHeader(const QString &path, ImageInfoData &info);
|
||||||
bool loadImage(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage> &rawImage, int index, bool planar = false);
|
bool loadImage(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage> &rawImage, int index, bool planar = false);
|
||||||
|
bool isFITS(const QString &suffix);
|
||||||
|
bool isXISF(const QString &suffix);
|
||||||
|
|
||||||
#endif // LOADIMAGE_H
|
#endif // LOADIMAGE_H
|
||||||
|
|||||||
@@ -5,26 +5,9 @@
|
|||||||
#include <QCommandLineParser>
|
#include <QCommandLineParser>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "../thumbnailer/genthumbnail.h"
|
#include "../thumbnailer/genthumbnail.h"
|
||||||
#include <QTreeView>
|
|
||||||
#include <QFileSystemModel>
|
|
||||||
#include <QTimer>
|
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
|
|
||||||
QApplication app(argc, argv);
|
|
||||||
QFileSystemModel model;
|
|
||||||
QTreeView treeView;
|
|
||||||
|
|
||||||
|
|
||||||
QTimer::singleShot(5000, [&model,&treeView](){
|
|
||||||
treeView.setModel(&model);
|
|
||||||
model.setRootPath("/home");
|
|
||||||
});
|
|
||||||
treeView.resize(800, 600);
|
|
||||||
treeView.show();
|
|
||||||
return app.exec();
|
|
||||||
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
setenv("LC_NUMERIC", "C", 1);
|
setenv("LC_NUMERIC", "C", 1);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+25
-4
@@ -29,6 +29,7 @@
|
|||||||
#include "settingsdialog.h"
|
#include "settingsdialog.h"
|
||||||
#include "histogram.h"
|
#include "histogram.h"
|
||||||
#include "batchprocessing.h"
|
#include "batchprocessing.h"
|
||||||
|
#include "filemanager.h"
|
||||||
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
@@ -66,6 +67,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
|
|||||||
_openFilter.append(tr(";;All files (*)"));
|
_openFilter.append(tr(";;All files (*)"));
|
||||||
nameFilter.append({"fit", "fits", "fts", "fz", "xisf", "cr2", "cr3", "nef", "dng"});
|
nameFilter.append({"fit", "fits", "fts", "fz", "xisf", "cr2", "cr3", "nef", "dng"});
|
||||||
QImageReader::setAllocationLimit(0);
|
QImageReader::setAllocationLimit(0);
|
||||||
|
_openSuffix = {nameFilter.constBegin(), nameFilter.constEnd()};
|
||||||
|
|
||||||
m_info = new ImageInfo(this);
|
m_info = new ImageInfo(this);
|
||||||
QDockWidget *infoDock = new QDockWidget(tr("Image info"), this);
|
QDockWidget *infoDock = new QDockWidget(tr("Image info"), this);
|
||||||
@@ -100,11 +102,14 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
|
|||||||
connect(m_filesystem, &FilesystemWidget::sortChanged, m_ringList, &ImageRingList::setSort);
|
connect(m_filesystem, &FilesystemWidget::sortChanged, m_ringList, &ImageRingList::setSort);
|
||||||
connect(m_filesystem, &FilesystemWidget::reverseSort, m_ringList, &ImageRingList::reverseSort);
|
connect(m_filesystem, &FilesystemWidget::reverseSort, m_ringList, &ImageRingList::reverseSort);
|
||||||
|
|
||||||
|
m_filetree = nullptr;
|
||||||
|
#if !defined(FLATPAK) || !defined(__aarch64__)//bug with QTreeView and QFileSystemModel on ARM64 under flatpak
|
||||||
m_filetree = new Filetree(this);
|
m_filetree = new Filetree(this);
|
||||||
connect(m_filetree, &Filetree::fileSelected, this, static_cast<void (MainWindow::*)(const QString &)>(&MainWindow::loadFile));
|
connect(m_filetree, &Filetree::fileSelected, this, static_cast<void (MainWindow::*)(const QString &)>(&MainWindow::loadFile));
|
||||||
connect(m_filetree, &Filetree::copyFiles, [this](const QString &path){ copyOrMove(true, path); });
|
connect(m_filetree, &Filetree::copyFiles, [this](const QString &path){ copyOrMove(true, path); });
|
||||||
connect(m_filetree, &Filetree::moveFiles, [this](const QString &path){ copyOrMove(false, path); });
|
connect(m_filetree, &Filetree::moveFiles, [this](const QString &path){ copyOrMove(false, path); });
|
||||||
connect(m_filetree, &Filetree::indexDirectory, this, static_cast<void (MainWindow::*)(const QString &)>(&MainWindow::indexDir));
|
connect(m_filetree, &Filetree::indexDirectory, this, static_cast<void (MainWindow::*)(const QString &)>(&MainWindow::indexDir));
|
||||||
|
#endif
|
||||||
|
|
||||||
m_databaseView = new DataBaseView(m_database, this);
|
m_databaseView = new DataBaseView(m_database, this);
|
||||||
connect(m_databaseView, &DataBaseView::loadFile, this, static_cast<void (MainWindow::*)(const QString &)>(&MainWindow::loadFile));
|
connect(m_databaseView, &DataBaseView::loadFile, this, static_cast<void (MainWindow::*)(const QString &)>(&MainWindow::loadFile));
|
||||||
@@ -143,11 +148,14 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
|
|||||||
databaseViewDock->hide();
|
databaseViewDock->hide();
|
||||||
addDockWidget(Qt::BottomDockWidgetArea, databaseViewDock);
|
addDockWidget(Qt::BottomDockWidgetArea, databaseViewDock);
|
||||||
|
|
||||||
QDockWidget *filetreeDock = new QDockWidget(tr("File tree"), this);
|
QDockWidget *filetreeDock = nullptr;
|
||||||
|
#if !defined(FLATPAK) || !defined(__aarch64__)
|
||||||
|
filetreeDock = new QDockWidget(tr("File tree"), this);
|
||||||
filetreeDock->setWidget(m_filetree);
|
filetreeDock->setWidget(m_filetree);
|
||||||
filetreeDock->setObjectName("filetreeDock");
|
filetreeDock->setObjectName("filetreeDock");
|
||||||
databaseViewDock->hide();
|
databaseViewDock->hide();
|
||||||
addDockWidget(Qt::LeftDockWidgetArea, filetreeDock);
|
addDockWidget(Qt::LeftDockWidgetArea, filetreeDock);
|
||||||
|
#endif
|
||||||
|
|
||||||
Histogram *histogram = new Histogram(this);
|
Histogram *histogram = new Histogram(this);
|
||||||
QDockWidget *histogramDock = new QDockWidget(tr("Histogram"), this);
|
QDockWidget *histogramDock = new QDockWidget(tr("Histogram"), this);
|
||||||
@@ -176,6 +184,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
|
|||||||
fileMenu->addAction(tr("Open directory recursively"), this, &MainWindow::loadDir);
|
fileMenu->addAction(tr("Open directory recursively"), this, &MainWindow::loadDir);
|
||||||
QAction *saveAs = fileMenu->addAction(tr("Save as"), QKeySequence::Save, this, &MainWindow::saveAs);
|
QAction *saveAs = fileMenu->addAction(tr("Save as"), QKeySequence::Save, this, &MainWindow::saveAs);
|
||||||
fileMenu->addSeparator();
|
fileMenu->addSeparator();
|
||||||
|
#if !defined(FLATPAK) || !defined(__aarch64__)
|
||||||
|
fileMenu->addAction(tr("File manager"), this, &MainWindow::openFileManager);
|
||||||
|
#endif
|
||||||
fileMenu->addAction(tr("Copy marked files"), Qt::Key_F5, this, &MainWindow::copyMarked);
|
fileMenu->addAction(tr("Copy marked files"), Qt::Key_F5, this, &MainWindow::copyMarked);
|
||||||
fileMenu->addAction(tr("Move marked files"), Qt::Key_F6, this, &MainWindow::moveMarked);
|
fileMenu->addAction(tr("Move marked files"), Qt::Key_F6, this, &MainWindow::moveMarked);
|
||||||
fileMenu->addAction(tr("Move marked files to trash"), QKeySequence::Delete, this, &MainWindow::deleteMarked);
|
fileMenu->addAction(tr("Move marked files to trash"), QKeySequence::Delete, this, &MainWindow::deleteMarked);
|
||||||
@@ -191,7 +202,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
|
|||||||
fileMenu->addSeparator();
|
fileMenu->addSeparator();
|
||||||
QAction *liveModeAction = fileMenu->addAction(tr("Live mode"), this, &MainWindow::liveMode);
|
QAction *liveModeAction = fileMenu->addAction(tr("Live mode"), this, &MainWindow::liveMode);
|
||||||
liveModeAction->setCheckable(true);
|
liveModeAction->setCheckable(true);
|
||||||
QAction *exitAction = fileMenu->addAction(tr("Exit"), this, &MainWindow::close);
|
QAction *exitAction = fileMenu->addAction(tr("Exit"), QCoreApplication::instance(), &QCoreApplication::quit, Qt::QueuedConnection);
|
||||||
exitAction->setShortcut(QKeySequence::Quit);
|
exitAction->setShortcut(QKeySequence::Quit);
|
||||||
menuBar()->addMenu(fileMenu);
|
menuBar()->addMenu(fileMenu);
|
||||||
|
|
||||||
@@ -312,7 +323,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
|
|||||||
dockMenu->addAction(navigationToolbar->toggleViewAction());
|
dockMenu->addAction(navigationToolbar->toggleViewAction());
|
||||||
dockMenu->addAction(filesystemDock->toggleViewAction());
|
dockMenu->addAction(filesystemDock->toggleViewAction());
|
||||||
dockMenu->addAction(databaseViewDock->toggleViewAction());
|
dockMenu->addAction(databaseViewDock->toggleViewAction());
|
||||||
dockMenu->addAction(filetreeDock->toggleViewAction());
|
if(filetreeDock)dockMenu->addAction(filetreeDock->toggleViewAction());
|
||||||
dockMenu->addAction(histogramDock->toggleViewAction());
|
dockMenu->addAction(histogramDock->toggleViewAction());
|
||||||
#ifdef PLATESOLVER
|
#ifdef PLATESOLVER
|
||||||
dockMenu->addAction(_plateSolving->toggleViewAction());
|
dockMenu->addAction(_plateSolving->toggleViewAction());
|
||||||
@@ -363,7 +374,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
|
|||||||
infoDock->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable);
|
infoDock->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable);
|
||||||
filesystemDock->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable);
|
filesystemDock->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable);
|
||||||
databaseViewDock->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable);
|
databaseViewDock->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable);
|
||||||
filetreeDock->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable);
|
if(filetreeDock)filetreeDock->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable);
|
||||||
|
if(_plateSolving)_plateSolving->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable);
|
||||||
m_stretchPanel->setFloatable(false);
|
m_stretchPanel->setFloatable(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -808,6 +820,15 @@ void MainWindow::checkNewVersion()
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::openFileManager()
|
||||||
|
{
|
||||||
|
#if !defined(FLATPAK) || !defined(__aarch64__)
|
||||||
|
FileManager *filemanager = new FileManager(_openSuffix);
|
||||||
|
connect(filemanager, &FileManager::openFile, this, static_cast<void (MainWindow::*)(const QString&)>(&MainWindow::loadFile));
|
||||||
|
filemanager->show();
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
void MainWindow::updateWindowTitle()
|
void MainWindow::updateWindowTitle()
|
||||||
{
|
{
|
||||||
ImagePtr ptr = m_ringList->currentImage();
|
ImagePtr ptr = m_ringList->currentImage();
|
||||||
|
|||||||
+3
-1
@@ -23,13 +23,14 @@ class MainWindow : public QMainWindow
|
|||||||
FilesystemWidget *m_filesystem;
|
FilesystemWidget *m_filesystem;
|
||||||
Filetree *m_filetree;
|
Filetree *m_filetree;
|
||||||
DataBaseView *m_databaseView;
|
DataBaseView *m_databaseView;
|
||||||
PlateSolving *_plateSolving;
|
PlateSolving *_plateSolving = nullptr;
|
||||||
static int socketPair[2];
|
static int socketPair[2];
|
||||||
QSocketNotifier *socketNotifier;
|
QSocketNotifier *socketNotifier;
|
||||||
QString _lastDir;
|
QString _lastDir;
|
||||||
bool _maximized;
|
bool _maximized;
|
||||||
QString _openFilter;
|
QString _openFilter;
|
||||||
QString _saveFilter;
|
QString _saveFilter;
|
||||||
|
QSet<QString> _openSuffix;
|
||||||
public:
|
public:
|
||||||
MainWindow(QWidget *parent = 0);
|
MainWindow(QWidget *parent = 0);
|
||||||
~MainWindow() override;
|
~MainWindow() override;
|
||||||
@@ -67,6 +68,7 @@ public slots:
|
|||||||
void showSettingsDialog();
|
void showSettingsDialog();
|
||||||
void exportCSV();
|
void exportCSV();
|
||||||
void checkNewVersion();
|
void checkNewVersion();
|
||||||
|
void openFileManager();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // MAINWINDOW_H
|
#endif // MAINWINDOW_H
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
#ifndef PLATESOLVING_H
|
#ifndef PLATESOLVING_H
|
||||||
#define PLATESOLVING_H
|
#define PLATESOLVING_H
|
||||||
|
|
||||||
#include "qelapsedtimer.h"
|
#include <QElapsedTimer>
|
||||||
#include <QDockWidget>
|
#include <QDockWidget>
|
||||||
|
|
||||||
class Solver;
|
class Solver;
|
||||||
|
|||||||
+2
-2
@@ -403,9 +403,9 @@ uint32_t RawImage::norm() const
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t RawImage::widthBytes() const
|
uint64_t RawImage::widthBytes() const
|
||||||
{
|
{
|
||||||
return m_ch * m_width * typeSize(m_type);
|
return (uint64_t)m_ch * m_width * typeSize(m_type);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t RawImage::widthSamples() const
|
uint32_t RawImage::widthSamples() const
|
||||||
|
|||||||
+1
-1
@@ -97,7 +97,7 @@ public:
|
|||||||
uint64_t size() const;
|
uint64_t size() const;
|
||||||
DataType type() const;
|
DataType type() const;
|
||||||
uint32_t norm() const;
|
uint32_t norm() const;
|
||||||
uint32_t widthBytes() const;
|
uint64_t widthBytes() const;
|
||||||
uint32_t widthSamples() const;
|
uint32_t widthSamples() const;
|
||||||
void* data();
|
void* data();
|
||||||
const void* data() const;
|
const void* data() const;
|
||||||
|
|||||||
+101
-16
@@ -4,6 +4,7 @@
|
|||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QInputDialog>
|
#include <QInputDialog>
|
||||||
#include <QJsonValue>
|
#include <QJsonValue>
|
||||||
|
#include <QJSValueIterator>
|
||||||
#include "loadrunable.h"
|
#include "loadrunable.h"
|
||||||
#include "rawimage.h"
|
#include "rawimage.h"
|
||||||
#include "loadimage.h"
|
#include "loadimage.h"
|
||||||
@@ -40,7 +41,7 @@ ScriptEngine::ScriptEngine(Database *database, BatchProcessing *parent)
|
|||||||
void ScriptEngine::setParams(const QString &scriptPath, const QList<QPair<QString, QString>> &paths, const QString &outputDir)
|
void ScriptEngine::setParams(const QString &scriptPath, const QList<QPair<QString, QString>> &paths, const QString &outputDir)
|
||||||
{
|
{
|
||||||
_scriptPath = scriptPath;
|
_scriptPath = scriptPath;
|
||||||
_paths = paths;
|
setPaths(paths);
|
||||||
_outputDir = outputDir + "/";
|
_outputDir = outputDir + "/";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -417,14 +418,73 @@ QJSValue ScriptEngine::newArray(uint size)
|
|||||||
return _jsEngine->newArray(size);
|
return _jsEngine->newArray(size);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScriptEngine::run()
|
QJSValue ScriptEngine::eval(const QString &program)
|
||||||
{
|
{
|
||||||
QJSValue jsPaths = _jsEngine->newArray(_paths.size());
|
QStringList stackTrace;
|
||||||
for(qsizetype i=0; i<_paths.size(); i++)
|
QJSValue result = _jsEngine->evaluate(program, QString(), 1, &stackTrace);
|
||||||
jsPaths.setProperty(i, _jsEngine->newQObject(new File(_paths[i].first, _paths[i].second, this)));
|
|
||||||
|
if(result.isError())
|
||||||
|
{
|
||||||
|
QString error = result.property("name").toString() + " on line " + result.property("lineNumber").toString() + " : " + result.toString();
|
||||||
|
error += "\n" + result.property("stack").toString();
|
||||||
|
emit newMessage(error, true);
|
||||||
|
}
|
||||||
|
else if(!result.isUndefined())
|
||||||
|
{
|
||||||
|
emit newMessage(result.toString(), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
QStringList ScriptEngine::complete(const QString &line)
|
||||||
|
{
|
||||||
|
QStringList complete;
|
||||||
|
|
||||||
|
QJSValue globObj = _jsEngine->globalObject();
|
||||||
|
|
||||||
|
QRegularExpression reg("[a-zA-Z_][a-zA-Z0-9_]*");
|
||||||
|
auto match = reg.match(line);
|
||||||
|
if(match.hasMatch())
|
||||||
|
{
|
||||||
|
QString var = match.captured();
|
||||||
|
if(globObj.hasProperty(var))
|
||||||
|
{
|
||||||
|
complete.clear();
|
||||||
|
QJSValueIterator it(globObj.property(var));
|
||||||
|
while(it.hasNext())
|
||||||
|
{
|
||||||
|
it.next();
|
||||||
|
if(it.name() != "constructor" && it.name() != "objectNameChanged")
|
||||||
|
complete.append(var + "." + it.name());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
QJSValueIterator it(globObj);
|
||||||
|
while(it.hasNext())
|
||||||
|
{
|
||||||
|
it.next();
|
||||||
|
complete.append(it.name());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return complete;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ScriptEngine::setPaths(const QList<QPair<QString, QString> > &paths)
|
||||||
|
{
|
||||||
|
_paths = paths;
|
||||||
|
QJSValue jsPaths = _jsEngine->newArray(paths.size());
|
||||||
|
for(qsizetype i=0; i<paths.size(); i++)
|
||||||
|
jsPaths.setProperty(i, _jsEngine->newQObject(new File(paths[i].first, paths[i].second, this)));
|
||||||
|
|
||||||
_jsEngine->globalObject().setProperty("files", jsPaths);
|
_jsEngine->globalObject().setProperty("files", jsPaths);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ScriptEngine::run()
|
||||||
|
{
|
||||||
QFile scriptFile(_scriptPath);
|
QFile scriptFile(_scriptPath);
|
||||||
if(!scriptFile.open(QIODevice::ReadOnly))
|
if(!scriptFile.open(QIODevice::ReadOnly))
|
||||||
{
|
{
|
||||||
@@ -455,11 +515,11 @@ void File::loadFitsKeywords()
|
|||||||
{
|
{
|
||||||
_fitsKeywordsLoaded = true;
|
_fitsKeywordsLoaded = true;
|
||||||
ImageInfoData info;
|
ImageInfoData info;
|
||||||
if(suffix().toLower() == "xisf")
|
if(isXISF(suffix()))
|
||||||
{
|
{
|
||||||
readXISFHeader(_path, info);
|
readXISFHeader(_path, info);
|
||||||
}
|
}
|
||||||
else if(suffix().toLower() == "fits" || suffix().toLower() == "fit" || suffix().toLower() == "fz")
|
else if(isFITS(suffix()))
|
||||||
{
|
{
|
||||||
readFITSHeader(_path, info);
|
readFITSHeader(_path, info);
|
||||||
}
|
}
|
||||||
@@ -608,7 +668,7 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
|
|||||||
_fitsKeywordsLoaded = false;
|
_fitsKeywordsLoaded = false;
|
||||||
_fitsKeywords.clear();
|
_fitsKeywords.clear();
|
||||||
|
|
||||||
if(QRegularExpression("(fits?|fz|fts)", QRegularExpression::CaseInsensitiveOption).match(suffix()).hasMatch())
|
if(isFITS(suffix()))
|
||||||
{
|
{
|
||||||
fitsfile *file;
|
fitsfile *file;
|
||||||
int status = 0;
|
int status = 0;
|
||||||
@@ -625,16 +685,22 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
|
|||||||
int naxis;
|
int naxis;
|
||||||
long naxes[3] = {0};
|
long naxes[3] = {0};
|
||||||
int type = -1;
|
int type = -1;
|
||||||
|
std::vector<int> imageIdxs;
|
||||||
for(int i=1; i <= num; i++)
|
for(int i=1; i <= num; i++)
|
||||||
{
|
{
|
||||||
fits_movabs_hdu(file, i, IMAGE_HDU, &status);
|
fits_movabs_hdu(file, i, IMAGE_HDU, &status);
|
||||||
fits_get_hdu_type(file, &type, &status);
|
fits_get_hdu_type(file, &type, &status);
|
||||||
fits_get_img_param(file, 3, &imgtype, &naxis, naxes, &status);
|
if(type == IMAGE_HDU)
|
||||||
if(type == IMAGE_HDU && naxis >= 2 && naxis <= 3 && status == 0)
|
{
|
||||||
break;
|
fits_get_img_param(file, 3, &imgtype, &naxis, naxes, &status);
|
||||||
if(i == num)return false;
|
if(naxis >= 2 && naxis <= 3)imageIdxs.push_back(i);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(modify->_imageIdx >= imageIdxs.size())return false;
|
||||||
|
fits_movabs_hdu(file, imageIdxs[modify->_imageIdx], &type, &status);
|
||||||
|
fits_get_img_param(file, 3, &imgtype, &naxis, naxes, &status);
|
||||||
|
|
||||||
for(auto &remove : modify->_remove)
|
for(auto &remove : modify->_remove)
|
||||||
{
|
{
|
||||||
int status = 0;//we ignore errors from here
|
int status = 0;//we ignore errors from here
|
||||||
@@ -731,7 +797,7 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
|
|||||||
|
|
||||||
return status == 0;
|
return status == 0;
|
||||||
}
|
}
|
||||||
else if(suffix().toLower() == "xisf")
|
else if(isXISF(suffix()))
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -742,13 +808,16 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
|
|||||||
qDebug() << "modify" << in << out;
|
qDebug() << "modify" << in << out;
|
||||||
|
|
||||||
for(auto &remove : modify->_remove)
|
for(auto &remove : modify->_remove)
|
||||||
modifyXISF.removeFITSKeyword(0, remove.toStdString());
|
modifyXISF.removeFITSKeyword(modify->_imageIdx, remove.toStdString());
|
||||||
|
|
||||||
for(auto &record : modify->_update)
|
for(auto &record : modify->_update)
|
||||||
modifyXISF.updateFITSKeyword(0, {record.key.toStdString(), record.value.toString().toStdString(), record.comment.toStdString()}, true);
|
modifyXISF.updateFITSKeyword(modify->_imageIdx, {record.key.toStdString(), record.value.toString().toStdString(), record.comment.toStdString()}, true);
|
||||||
|
|
||||||
for(auto &record : modify->_add)
|
for(auto &record : modify->_add)
|
||||||
modifyXISF.addFITSKeyword(0, {record.key.toStdString(), record.value.toString().toStdString(), record.comment.toStdString()});
|
modifyXISF.addFITSKeyword(modify->_imageIdx, {record.key.toStdString(), record.value.toString().toStdString(), record.comment.toStdString()});
|
||||||
|
|
||||||
|
for(auto &property : modify->_property)
|
||||||
|
modifyXISF.updateProperty(modify->_imageIdx, property);
|
||||||
|
|
||||||
modifyXISF.save(out.toLocal8Bit().toStdString());
|
modifyXISF.save(out.toLocal8Bit().toStdString());
|
||||||
modifyXISF.close();
|
modifyXISF.close();
|
||||||
@@ -757,6 +826,7 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
|
|||||||
}
|
}
|
||||||
catch(std::filesystem::filesystem_error &err)
|
catch(std::filesystem::filesystem_error &err)
|
||||||
{
|
{
|
||||||
|
if(_engine)_engine->newMessage("Failed to modify file " + _path + " " + err.what(), true);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
catch(LibXISF::Error &err)
|
catch(LibXISF::Error &err)
|
||||||
@@ -926,6 +996,21 @@ void FITSRecordModify::addKeyword(const QString &key, const QVariant &value, con
|
|||||||
_update.append({key.toLatin1(), value, comment.toLatin1()});
|
_update.append({key.toLatin1(), value, comment.toLatin1()});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void FITSRecordModify::updateProperty(const QString &id, const LibXISF::Variant &value)
|
||||||
|
{
|
||||||
|
_property.append(LibXISF::Property(id.toStdString(), value));
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t FITSRecordModify::imageIndex() const
|
||||||
|
{
|
||||||
|
return _imageIdx;
|
||||||
|
}
|
||||||
|
|
||||||
|
void FITSRecordModify::setImageIndex(uint32_t idx)
|
||||||
|
{
|
||||||
|
_imageIdx = idx;
|
||||||
|
}
|
||||||
|
|
||||||
bool TextFile::open(const QString &path, const QString &mode)
|
bool TextFile::open(const QString &path, const QString &mode)
|
||||||
{
|
{
|
||||||
_fr.setFileName(path);
|
_fr.setFileName(path);
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
#include <QSemaphore>
|
#include <QSemaphore>
|
||||||
#include "database.h"
|
#include "database.h"
|
||||||
#include "imageinfodata.h"
|
#include "imageinfodata.h"
|
||||||
|
#include "libxisf.h"
|
||||||
|
|
||||||
class BatchProcessing;
|
class BatchProcessing;
|
||||||
class Solver;
|
class Solver;
|
||||||
@@ -63,6 +64,9 @@ public:
|
|||||||
#endif // PLATESOLVER
|
#endif // PLATESOLVER
|
||||||
QJSValue newObject();
|
QJSValue newObject();
|
||||||
QJSValue newArray(uint size);
|
QJSValue newArray(uint size);
|
||||||
|
QJSValue eval(const QString &program);
|
||||||
|
QStringList complete(const QString &line);
|
||||||
|
void setPaths(const QList<QPair<QString, QString>> &paths);
|
||||||
public slots:
|
public slots:
|
||||||
void run();
|
void run();
|
||||||
signals:
|
signals:
|
||||||
@@ -140,6 +144,8 @@ class FITSRecordModify : public QObject
|
|||||||
QStringList _remove;
|
QStringList _remove;
|
||||||
QVector<FITSRecord> _update;
|
QVector<FITSRecord> _update;
|
||||||
QVector<FITSRecord> _add;
|
QVector<FITSRecord> _add;
|
||||||
|
QVector<LibXISF::Property> _property;
|
||||||
|
uint32_t _imageIdx = 0;
|
||||||
|
|
||||||
friend class File;
|
friend class File;
|
||||||
public:
|
public:
|
||||||
@@ -147,6 +153,10 @@ public:
|
|||||||
Q_INVOKABLE void removeKeyword(const QString &key);
|
Q_INVOKABLE void removeKeyword(const QString &key);
|
||||||
Q_INVOKABLE void updateKeyword(const QString &key, const QVariant &value, const QString &comment = QString());
|
Q_INVOKABLE void updateKeyword(const QString &key, const QVariant &value, const QString &comment = QString());
|
||||||
Q_INVOKABLE void addKeyword(const QString &key, const QVariant &value, const QString &comment = QString());
|
Q_INVOKABLE void addKeyword(const QString &key, const QVariant &value, const QString &comment = QString());
|
||||||
|
Q_PROPERTY(uint32_t imageIndex READ imageIndex WRITE setImageIndex);
|
||||||
|
void updateProperty(const QString &id, const LibXISF::Variant &value);
|
||||||
|
uint32_t imageIndex() const;
|
||||||
|
void setImageIndex(uint32_t idx);
|
||||||
};
|
};
|
||||||
|
|
||||||
class TextFile : public QObject
|
class TextFile : public QObject
|
||||||
|
|||||||
@@ -186,6 +186,19 @@ bool Solver::updateHeader(QString &error)
|
|||||||
modify.updateKeyword("CTYPE2", "DEC--TAN", QByteArray("first parameter DEC, projection TANgential"));
|
modify.updateKeyword("CTYPE2", "DEC--TAN", QByteArray("first parameter DEC, projection TANgential"));
|
||||||
modify.updateKeyword("RADESYS", "ICRS", QByteArray("International Celestial Reference System"));
|
modify.updateKeyword("RADESYS", "ICRS", QByteArray("International Celestial Reference System"));
|
||||||
modify.updateKeyword("EQUINOX", 2000, QByteArray("Equinox of coordinates"));
|
modify.updateKeyword("EQUINOX", 2000, QByteArray("Equinox of coordinates"));
|
||||||
|
|
||||||
|
LibXISF::F64Matrix matrix(2, 2);
|
||||||
|
matrix(0, 0) = std::cos(rotationRad) * cdeltx;
|
||||||
|
matrix(0, 1) =-std::sin(rotationRad) * cdelty;
|
||||||
|
matrix(1, 0) = std::sin(rotationRad) * cdeltx;
|
||||||
|
matrix(1, 1) = std::cos(rotationRad) * cdelty;
|
||||||
|
|
||||||
|
modify.updateProperty("PCL:AstrometricSolution:ReferenceCelestialCoordinates", LibXISF::F64Vector({solution.ra, solution.dec}));
|
||||||
|
modify.updateProperty("PCL:AstrometricSolution:ReferenceImageCoordinates", LibXISF::F64Vector({_stats.width / 2.0, _stats.height / 2.0}));
|
||||||
|
modify.updateProperty("PCL:AstrometricSolution:LinearTransformationMatrix", LibXISF::F64Matrix(matrix));
|
||||||
|
modify.updateProperty("PCL:AstrometricSolution:ProjectionSystem", LibXISF::String("Gnomonic"));
|
||||||
|
modify.updateProperty("PCL:AstrometricSolution:ReferenceNativeCoordinates", LibXISF::F64Vector({0, 90}));
|
||||||
|
|
||||||
bool ret = file.modifyFITSRecords(&modify);
|
bool ret = file.modifyFITSRecords(&modify);
|
||||||
if(!ret)error = tr("Failed to update file header");
|
if(!ret)error = tr("Failed to update file header");
|
||||||
else emit headerUpdated(_path);
|
else emit headerUpdated(_path);
|
||||||
|
|||||||
Binary file not shown.
+428
-444
File diff suppressed because it is too large
Load Diff
Binary file not shown.
+428
-444
File diff suppressed because it is too large
Load Diff
Binary file not shown.
+428
-444
File diff suppressed because it is too large
Load Diff
Binary file not shown.
+428
-444
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user