Compare commits

..

10 Commits

Author SHA1 Message Date
nou cb1237cbc4 Fix Info.plist 2026-05-08 11:42:54 +02:00
nou dbc9baba13 Fix Info.plist icon 2026-05-08 09:09:55 +02:00
nou bd99501616 Add support for open with on MacOS 2026-05-08 08:44:46 +02:00
nou fccbf4d810 Update icons 2026-05-05 19:12:32 +02:00
nou 0a11289f34 Add automatic check for new versions 2026-04-28 17:09:49 +02:00
nou 53167e7bb5 Implement fits_memfile workaround
CFITSIO doesn't support non-ASCI characters in file paths
2026-04-27 18:40:57 +02:00
nou 1e940de31b Use std::filesystem::path for XISF files 2026-04-27 18:39:41 +02:00
nou f1b5ec81c0 Workaround for CFITSIO failing to load path containing non-ASCI chars 2026-04-19 13:25:32 +02:00
nou 8b8759facb Delay restoring state of database header 2026-04-13 13:30:54 +02:00
nou 468862ad35 Do not print debug logs by default 2026-04-13 13:29:54 +02:00
31 changed files with 385 additions and 115 deletions
+11 -1
View File
@@ -29,6 +29,7 @@ add_subdirectory(libXISF)
set(TENMON_SRC
src/about.cpp src/about.h
src/application.cpp src/application.h
src/batchprocessing.cpp src/batchprocessing.h src/batchprocessing.ui
src/chartgraph.h src/chartgraph.cpp
src/database.cpp src/database.h
@@ -39,6 +40,7 @@ set(TENMON_SRC
src/filemanager.h src/filemanager.cpp src/filemanager.ui
src/filesystemwidget.cpp src/filesystemwidget.h
src/fitskeyword.ui
src/fitswrapper.h src/fitswrapper.cpp
src/histogram.cpp src/histogram.h
src/httpdownloader.h src/httpdownloader.cpp
src/imageinfo.cpp src/imageinfo.h
@@ -73,6 +75,9 @@ elseif(APPLE)
set(tenmon_ICON ${CMAKE_CURRENT_SOURCE_DIR}/resources/tenmon.icns)
find_package(Qt6 COMPONENTS DBus REQUIRED)
set_source_files_properties(${tenmon_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
set(MACOSX_BUNDLE_ICON_FILE "tenmon.icns")
set(MACOSX_BUNDLE_BUNDLE_NAME "tenmon")
set(MACOSX_BUNDLE_GUI_IDENTIFIER "space.nouspiro.tenmon")
else()
set(tenmon_ICON "")
find_package(Qt6 COMPONENTS DBus REQUIRED)
@@ -111,6 +116,7 @@ endif(STELLARSOLVER_INCLUDE AND STELLARSOLVER_LIB)
target_link_libraries(tenmon PRIVATE Qt6::Widgets Qt6::Sql Qt6::OpenGLWidgets Qt6::Qml Qt6::Charts Qt6::Svg ${EXIF_LIB} ${FITS_LIB} ${RAW_LIB} ${WCS_LIB} ${LCMS2_LIB} XISF)
if(APPLE)
target_link_libraries(tenmon PRIVATE Qt6::DBus "-framework CoreFoundation")
set_target_properties(tenmon PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in")
elseif(UNIX)
target_link_libraries(tenmon PRIVATE Qt6::DBus)
endif(APPLE)
@@ -133,8 +139,12 @@ if(UNIX AND NOT APPLE)
install(SCRIPT install.cmake)
else()
install(FILES space.nouspiro.tenmon.desktop DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
install(FILES resources/space.nouspiro.tenmon.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps")
install(FILES resources/space.nouspiro.tenmon_16.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/16x16/apps" RENAME space.nouspiro.tenmon.png)
install(FILES resources/space.nouspiro.tenmon_32.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/32x32/apps" RENAME space.nouspiro.tenmon.png)
install(FILES resources/space.nouspiro.tenmon_64.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps" RENAME space.nouspiro.tenmon.png)
install(FILES resources/space.nouspiro.tenmon_128.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps" RENAME space.nouspiro.tenmon.png)
install(FILES resources/space.nouspiro.tenmon_256.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/256x256/apps" RENAME space.nouspiro.tenmon.png)
install(FILES resources/space.nouspiro.tenmon_512.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/512x512/apps" RENAME space.nouspiro.tenmon.png)
install(FILES space.nouspiro.tenmon.xisf.xml DESTINATION "${CMAKE_INSTALL_DATADIR}/mime/packages")
endif()
install(FILES space.nouspiro.tenmon.metainfo.xml DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo")
+50
View File
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>tenmon</string>
<key>CFBundleGetInfoString</key>
<string>${MACOSX_BUNDLE_INFO_STRING}</string>
<key>CFBundleIconFile</key>
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
<key>CFBundleIdentifier</key>
<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
<key>CFBundleName</key>
<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
<key>CFBundleVersion</key>
<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>fits</string>
<string>fit</string>
<string>xisf</string>
<string>png</string>
<string>jpg</string>
<string>jpeg</string>
<string>tiff</string>
<string>tif</string>
</array>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
</dict>
</array>
</dict>
</plist>
+1 -1
View File
@@ -1,5 +1,5 @@
<table><tr>
<td style="padding-right:10px"><img src=":/space.nouspiro.tenmon.png"></td>
<td style="padding-right:10px"><img src=":/space.nouspiro.tenmon_64.png"></td>
<td><h3>Tenmon</h3>
Tenmon is FITS/XISF image viewer and converter. It also index FITS keywords.<br>
v@GITVERSION@ Copyright © 2026 Dušan Poizl<br><br>
+5 -1
View File
@@ -2,6 +2,10 @@ find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
find_program(XDG-ICON-RESOURCE_EXECUTABLE xdg-icon-resource)
find_program(XDG-MIME xdg-mime)
execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install --novendor space.nouspiro.tenmon.desktop WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 64 resources/space.nouspiro.tenmon.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 16 resources/space.nouspiro.tenmon_16.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 32 resources/space.nouspiro.tenmon_32.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 64 resources/space.nouspiro.tenmon_64.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 128 resources/space.nouspiro.tenmon_128.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 256 resources/space.nouspiro.tenmon_256.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 512 resources/space.nouspiro.tenmon_512.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
execute_process(COMMAND ${XDG-MIME} install --novendor space.nouspiro.tenmon.xisf.xml WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+1 -1
Submodule libXISF updated: 7b70b6a081...de757840b3
Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 1.4 MiB

+1 -1
View File
@@ -15,7 +15,7 @@
<file>bggr.png</file>
<file>grbg.png</file>
<file>gbrg.png</file>
<file>space.nouspiro.tenmon.png</file>
<file>space.nouspiro.tenmon_64.png</file>
<file>../translations/tenmon_pt_BR.qm</file>
<file alias="help">../about/help_en</file>
<file>colormap.png</file>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 247 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.
+19
View File
@@ -0,0 +1,19 @@
#include "application.h"
#include <QFileOpenEvent>
Application::Application(int &argc, char **argv) : QApplication(argc, argv)
{
}
bool Application::event(QEvent *event)
{
if (event->type() == QEvent::FileOpen) {
QFileOpenEvent *openEvent = static_cast<QFileOpenEvent *>(event);
emit openFileEvent(openEvent->file());
}
return QApplication::event(event);
}
+16
View File
@@ -0,0 +1,16 @@
#ifndef APPLICATION_H
#define APPLICATION_H
#include <QApplication>
class Application : public QApplication
{
Q_OBJECT
public:
Application(int &argc, char **argv);
bool event(QEvent *event) override;
signals:
void openFileEvent(const QString &file);
};
#endif // APPLICATION_H
+1 -1
View File
@@ -337,7 +337,7 @@ void BatchProcessing::newMessageCli(const QString &message, bool error)
if(error)
qWarning() << message;
else
qDebug() << message;
qInfo() << message;
}
QJSValue BatchProcessing::getString(const QString &label, const QString &text)
+2 -2
View File
@@ -447,7 +447,7 @@ DatabaseTreeView::DatabaseTreeView(Database *database, QWidget *parent) : QWidge
,_database(database)
{
QVBoxLayout *vlayout = new QVBoxLayout(this);
QHBoxLayout *hlayout = new QHBoxLayout(this);
QHBoxLayout *hlayout = new QHBoxLayout;
_model = new DatabaseTree(database, this);
_treeView = new QTreeView(this);
@@ -473,7 +473,7 @@ DatabaseTreeView::DatabaseTreeView(Database *database, QWidget *parent) : QWidge
connect(_filters, &QComboBox::currentIndexChanged, this, &DatabaseTreeView::filterChanged);
filterChanged(_filters->currentIndex());
QStackedWidget *stackedWidget = new QStackedWidget;
QStackedWidget *stackedWidget = new QStackedWidget(this);
stackedWidget->addWidget(_treeView);
stackedWidget->addWidget(_tableView);
+22 -18
View File
@@ -1,19 +1,20 @@
#include "databaseview.h"
#include <QVBoxLayout>
#include <QPushButton>
#include <QSettings>
#include <QDialogButtonBox>
#include <QHeaderView>
#include <QSqlError>
#include <QDebug>
#include <QMenu>
#include <QContextMenuEvent>
#include <QRegularExpression>
#include <QGuiApplication>
#include <QClipboard>
#include <QMimeData>
#include <iostream>
#include "batchprocessing.h"
#include "databaseview.h"
#include <QClipboard>
#include <QContextMenuEvent>
#include <QDebug>
#include <QDialogButtonBox>
#include <QGuiApplication>
#include <QHeaderView>
#include <QMenu>
#include <QMimeData>
#include <QPushButton>
#include <QRegularExpression>
#include <QSettings>
#include <QSqlError>
#include <QTimer>
#include <QVBoxLayout>
#include <iostream>
const QStringList DEFAULT_COLUMNS = {"EXPTIME", "OBJECT", "RA", "DEC"};
@@ -248,7 +249,7 @@ void FITSFileModel::prepareQuery()
{
setHeaderData(i++, Qt::Horizontal, column);
}
std::cout << sql.toStdString() << std::endl;
qDebug() << "DB SQL" << sql;
if(lastError().type() != QSqlError::NoError)
qDebug() << "Database error" << lastError();
@@ -318,9 +319,12 @@ DataBaseView::DataBaseView(Database *database, QWidget *parent) : QWidget(parent
m_model = new FITSFileModel(m_database, this);
QSettings settings;
m_tableView->setModel(m_model);
m_model->setColumns(settings.value("databaseview/selectedColumns", DEFAULT_COLUMNS).toStringList());
m_tableView->horizontalHeader()->restoreState(settings.value("databaseview/header").toByteArray());
m_tableView->setModel(m_model);
QTimer::singleShot(200, [this](){
QSettings settings;
m_tableView->horizontalHeader()->restoreState(settings.value("databaseview/header").toByteArray());
});
QHBoxLayout *hlayout = new QHBoxLayout();
layout->addLayout(hlayout);
+89
View File
@@ -0,0 +1,89 @@
#include "fitswrapper.h"
#include <QDebug>
#include <QFile>
FITSWrapper::FITSWrapper(const QString &path, int mode, bool open)
{
_path = path;
_mode = mode;
if(open)
fits_open_diskfile(&_file, path.toLocal8Bit().data(), mode, &_status);
else
fits_create_diskfile(&_file, path.toLocal8Bit().data(), &_status);
if(_status == FILE_NOT_OPENED || _status == FILE_NOT_CREATED)
{
qWarning() << "Could not open file directly trying memfile workaround" << path;
if(open)
{
QFile fr(path);
if(fr.open(QIODevice::ReadOnly))
{
_bufferSize = fr.size();
_bufferPtr = malloc(_bufferSize);
fr.read((char*)_bufferPtr, _bufferSize);
_status = 0;
fits_open_memfile(&_file, "memfile", mode, &_bufferPtr, &_bufferSize, 0, realloc, &_status);
if(_status)
{
free(_bufferPtr);
_bufferPtr = nullptr;
_bufferSize = 0;
qWarning() << "fits_open_memfile failed";
}
}
else
{
qWarning() << "QFile failed to open file" << path;
_status = FILE_NOT_OPENED;
}
}
else
{
_bufferSize = 2880;
_bufferPtr = malloc(_bufferSize);
fits_create_memfile(&_file, &_bufferPtr, &_bufferSize, 0, realloc, &_status);
if(_status)
{
free(_bufferPtr);
_bufferPtr = nullptr;
_bufferSize = 0;
}
}
}
}
FITSWrapper::~FITSWrapper()
{
if(_file)
{
_status = 0;
fits_close_file(_file, &_status);
}
if(_mode == READWRITE && _bufferPtr)
{
qDebug() << "Writing FITS memfile" << _bufferSize;
QFile fw(_path);
if(fw.open(QIODevice::WriteOnly | QIODevice::Truncate))
{
if(fw.write((char*)_bufferPtr, _bufferSize) != (qint64)_bufferSize)
qWarning() << "Failed to write to file";
}
else
qWarning() << "Failed to open fits file for writing";
}
free(_bufferPtr);
}
int FITSWrapper::status() const
{
return _status;
}
FITSWrapper::operator fitsfile *()
{
return _file;
}
+25
View File
@@ -0,0 +1,25 @@
#ifndef FITSWRAPPER_H
#define FITSWRAPPER_H
#include <QByteArray>
#include <QString>
#include <fitsio.h>
class FITSWrapper
{
public:
explicit FITSWrapper(const QString &path, int mode, bool open);
~FITSWrapper();
FITSWrapper(FITSWrapper &other) = delete;
int status() const;
operator fitsfile*();
private:
QString _path;
int _status = 0;
int _mode = 0;
fitsfile *_file;
size_t _bufferSize = 0;
void *_bufferPtr = nullptr;
};
#endif // FITSWRAPPER_H
+19 -18
View File
@@ -1,13 +1,13 @@
#include "loadimage.h"
#include <QElapsedTimer>
#include <QDebug>
#include <QFileInfo>
#include <QDir>
#include <libraw/libraw.h>
#include <fitsio2.h>
#include "libxisf.h"
#include <libexif/exif-data.h>
#include "rawimage.h"
#include <QDebug>
#include <QDir>
#include <QElapsedTimer>
#include <QFileInfo>
#include <libexif/exif-data.h>
#include <libraw/libraw.h>
#include "fitswrapper.h"
QString makeUNCPath(const QString &path)
{
@@ -85,7 +85,6 @@ int loadFITSHeader(fitsfile *file, ImageInfoData &info)
bool loadFITS(const QString path, ImageInfoData &info, std::shared_ptr<RawImage> &image, bool planar, uint32_t index)
{
fitsfile *file;
int status = 0;
int num = 0;
long naxes[3] = {0};
@@ -99,7 +98,9 @@ bool loadFITS(const QString path, ImageInfoData &info, std::shared_ptr<RawImage>
return false;
};
fits_open_diskfile(&file, path.toLocal8Bit().data(), READONLY, &status);
FITSWrapper file(path, READONLY, true);
status = file.status();
if(status)return checkError();
fits_get_num_hdus(file, &num, &status);
if(status)return checkError();
@@ -222,7 +223,6 @@ noload:
}
}
fits_close_file(file, &status);
return true;
}
@@ -231,7 +231,8 @@ bool loadXISF(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage
try
{
LibXISF::XISFReader xisf;
xisf.open(path.toLocal8Bit().data());
QFileInfo fileInfo(path);
xisf.open(fileInfo.filesystemFilePath());
if(index >= (uint32_t)xisf.imagesCount())return false;
const LibXISF::Image &xisfImage = xisf.getImage(index);
@@ -344,15 +345,14 @@ bool loadXISF(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage
bool readFITSHeader(const QString &path, ImageInfoData &info)
{
fitsfile *fr;
int status = 0;
QString path2 = makeUNCPath(path);
fits_open_diskfile(&fr, path2.toLocal8Bit().data(), READONLY, &status);
if(fr && status == 0)
FITSWrapper file(path, READONLY, true);
int status = file.status();
if(file && status == 0)
{
status = loadFITSHeader(fr, info);
fits_close_file(fr, &status);
status = loadFITSHeader(file, info);
}
return status == 0;
}
@@ -363,7 +363,8 @@ bool readXISFHeader(const QString &path, ImageInfoData &info)
try
{
LibXISF::XISFReader xisf;
xisf.open(path2.toLocal8Bit().data());
QFileInfo fileInfo(path2);
xisf.open(fileInfo.filesystemFilePath());
const LibXISF::Image &image = xisf.getImage(0, false);
auto fitskeywords = image.fitsKeywords();
+10 -8
View File
@@ -1,13 +1,14 @@
#include "loadrunable.h"
#include "fitswrapper.h"
#include "imageringlist.h"
#include "loadimage.h"
#include "rawimage.h"
#include <QDebug>
#include <QElapsedTimer>
#include <QFileInfo>
#include <QPainter>
#include <QElapsedTimer>
#include <QDebug>
#include <algorithm>
#include <fitsio2.h>
#include "rawimage.h"
#include "loadimage.h"
#include <lcms2.h>
LoadRunable::LoadRunable(const QString &file, Image *receiver, AnalyzeLevel level, int index, bool thumbnail) :
@@ -269,7 +270,8 @@ void ConvertRunable::run()
image.setByteshuffling(true);
xisf.writeImage(image);
xisf.save(m_outfile.toLocal8Bit().data());
QFileInfo fileInfo(makeUNCPath(m_outfile));
xisf.save(fileInfo.filesystemFilePath());
}
catch(LibXISF::Error &err)
{
@@ -281,9 +283,10 @@ void ConvertRunable::run()
if(m_format == "fits")
{
int status = 0;
fitsfile *fw;
if(QFileInfo(m_outfile).exists())QFile::remove(m_outfile);
fits_create_diskfile(&fw, m_outfile.toLocal8Bit().data(), &status);
FITSWrapper fw(m_outfile, READWRITE, false);
if(fw.status())return;
if(!m_params.compressionType.isEmpty())
{
if(m_params.compressionType == "gzip")
@@ -292,7 +295,6 @@ void ConvertRunable::run()
fits_set_compression_type(fw, RICE_1, &status);
}
writeFITSImage(fw, rawimage, imageinfo);
fits_close_file(fw, &status);
return;
}
+24 -6
View File
@@ -1,15 +1,28 @@
#include "mainwindow.h"
#include <QApplication>
#include <QSurfaceFormat>
#include <QTranslator>
#include "application.h"
#include <QCommandLineParser>
#include <QSettings>
#include <QSurfaceFormat>
#include <QTranslator>
#include <stdlib.h>
#include "../thumbnailer/genthumbnail.h"
#ifdef Q_OS_WIN64
#include <windows.h>
#endif
bool DEBUG_LOG = false;
QtMessageHandler defaultHandler = nullptr;
void messageHandler(QtMsgType type, const QMessageLogContext &ctx, const QString &message)
{
if(defaultHandler)
{
if(DEBUG_LOG || type != QtMsgType::QtDebugMsg)
defaultHandler(type, ctx, message);
}
}
int main(int argc, char *argv[])
{
#ifdef __linux__
@@ -29,6 +42,7 @@ int main(int argc, char *argv[])
freopen("CONOUT$", "w", stderr);
}
#endif
defaultHandler = qInstallMessageHandler(messageHandler);
QCommandLineParser cmd;
cmd.addOption({"gl", "Use desktop OpenGL. This is default on x86 and MacOS platform."});
@@ -40,6 +54,7 @@ int main(int argc, char *argv[])
cmd.addOption({"scriptarg", "String that will be passed to script as variable \"scriparg\"", "arg"});
cmd.addOption({"outdir", "Output dir for script (default: CWD)", "dir", "."});
cmd.addOption({"noexit", "Do not exit application when script finish"});
cmd.addOption({"debug", "Print debug info"});
cmd.addHelpOption();
QStringList cmdArgs;
for(int i = 0; i < argc; i++)
@@ -51,6 +66,9 @@ int main(int argc, char *argv[])
if(cmd.isSet("gles"))
useGLES = true;
if(cmd.isSet("debug"))
DEBUG_LOG = true;
if(cmd.isSet("thumb"))
{
QCoreApplication app(argc, argv);
@@ -84,11 +102,10 @@ int main(int argc, char *argv[])
}
QSurfaceFormat::setDefaultFormat(format);
QApplication a(argc, argv);
Application a(argc, argv);
a.setOrganizationName("nou");
a.setApplicationName("Tenmon");
a.setWindowIcon(QIcon(":/space.nouspiro.tenmon.png"));
a.setWindowIcon(QIcon(":/space.nouspiro.tenmon_64.png"));
QTranslator translator;
QTranslator translator2;
@@ -109,6 +126,7 @@ int main(int argc, char *argv[])
a.installTranslator(&translator2);
MainWindow w;
QObject::connect(&a, &Application::openFileEvent, &w, static_cast<void (MainWindow::*)(const QString&)>(&MainWindow::loadFile));
w.show();
if(!cmd.positionalArguments().isEmpty() && !cmd.isSet("script"))
+61 -38
View File
@@ -1,37 +1,38 @@
#include "about.h"
#include "batchprocessing.h"
#include "filemanager.h"
#include "histogram.h"
#include "loadrunable.h"
#include "mainwindow.h"
#include <QScrollArea>
#include "markedfiles.h"
#include "settingsdialog.h"
#include "statusbar.h"
#include <QActionGroup>
#include <QDebug>
#include <QDesktopServices>
#include <QDir>
#include <QDockWidget>
#include <QFileDialog>
#include <QGuiApplication>
#include <QImageReader>
#include <QImageWriter>
#include <QJsonDocument>
#include <QKeyEvent>
#include <QMenu>
#include <QMenuBar>
#include <QFileDialog>
#include <QStandardPaths>
#include <QMessageBox>
#include <QMimeDatabase>
#include <QNetworkReply>
#include <QProgressDialog>
#include <QDebug>
#include <QDockWidget>
#include <QActionGroup>
#include <QScrollArea>
#include <QSettings>
#include <QStandardPaths>
#include <QStatusBar>
#include <QThreadPool>
#include <QSessionManager>
#include <QTimer>
#include <signal.h>
#include <unistd.h>
#include <QSettings>
#include <QGuiApplication>
#include <QThreadPool>
#include <QStatusBar>
#include <QImageReader>
#include <QImageWriter>
#include <QMimeDatabase>
#include <QDesktopServices>
#include <QJsonDocument>
#include <QNetworkReply>
#include <QTimer>
#include "loadrunable.h"
#include "markedfiles.h"
#include "about.h"
#include "statusbar.h"
#include "settingsdialog.h"
#include "histogram.h"
#include "batchprocessing.h"
#include "filemanager.h"
#ifdef __linux__
#include <sys/ioctl.h>
@@ -404,6 +405,14 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
if(_plateSolving)_plateSolving->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable);
m_stretchPanel->setFloatable(false);
}
if(settings.value("settings/checkupdate", false).toBool())
{
QDateTime lastcheck = settings.value("settings/lastcheck").toDateTime();
QDateTime weekago = QDateTime::currentDateTimeUtc().addDays(-7);
if(!lastcheck.isValid() || lastcheck < weekago)
checkNewVersion(true);
}
}
MainWindow::~MainWindow()
@@ -576,16 +585,23 @@ void MainWindow::loadFile(const QString &path)
if(!path.isEmpty())
{
QFileInfo info(path);
m_ringList->setFile(info.canonicalFilePath());
updateWindowTitle();
if(info.isDir())
_lastDir = info.absolutePath();
if(info.exists() && info.isReadable())
{
m_ringList->setFile(info.canonicalFilePath());
updateWindowTitle();
if(info.isDir())
_lastDir = info.absolutePath();
else
_lastDir = info.canonicalPath();
QSettings settings;
settings.setValue("mainwindow/lastdir", _lastDir);
if(settings.value("settings/bestfit", false).toBool())
m_image->bestFit();
}
else
_lastDir = info.canonicalPath();
QSettings settings;
settings.setValue("mainwindow/lastdir", _lastDir);
if(settings.value("settings/bestfit", false).toBool())
m_image->bestFit();
{
qWarning() << "File doesn't exist or is not readable";
}
}
}
@@ -815,21 +831,27 @@ void MainWindow::exportCSV()
m_databaseView->exportCSV(file);
}
void MainWindow::checkNewVersion()
void MainWindow::checkNewVersion(bool autocheck)
{
QNetworkAccessManager *manager = new QNetworkAccessManager(this);
QNetworkRequest request(QUrl("https://gitea.nouspiro.space/api/v1/repos/nou/tenmon/releases/latest"));
request.setRawHeader("accept", "application/json");
QNetworkReply *reply = manager->get(request);
connect(reply, &QNetworkReply::finished, [this, manager, reply](){
connect(reply, &QNetworkReply::finished, [this, manager, reply, autocheck](){
QJsonParseError error;
QJsonDocument json = QJsonDocument::fromJson(reply->readAll(), &error);
if(json.isObject() && json.object().contains("tag_name"))
{
QSettings settings;
settings.setValue("settings/lastcheck", QDateTime::currentDateTimeUtc());
QString tag = json.object().value("tag_name").toString();
QString version = getVersion();
if(version >= tag)
QMessageBox::information(this, tr("Update check"), tr("You have newest version"));
{
if(!autocheck)
QMessageBox::information(this, tr("Update check"), tr("You have newest version"));
}
else
{
if(QMessageBox::question(this, tr("Update check"), tr("New version %1 is available. Do you want to download it now?").arg(tag)) == QMessageBox::Yes)
@@ -843,7 +865,8 @@ void MainWindow::checkNewVersion()
}
else
{
QMessageBox::warning(this, tr("Update check"), tr("Failed to check version"));
if(!autocheck)
QMessageBox::warning(this, tr("Update check"), tr("Failed to check version"));
}
reply->deleteLater();
+1 -1
View File
@@ -69,7 +69,7 @@ public slots:
void showMarkFilesDialog();
void showSettingsDialog();
void exportCSV();
void checkNewVersion();
void checkNewVersion(bool autocheck = false);
void openFileManager();
void runScript(const QString &script, const QString &outdir, const QStringList &paths, const QString &arg, bool exit);
};
+19 -18
View File
@@ -1,16 +1,17 @@
#include "scriptengine.h"
#include <QDir>
#include <QFileInfo>
#include <QDebug>
#include <QInputDialog>
#include <QJsonValue>
#include <QJSValueIterator>
#include "batchprocessing.h"
#include "fitswrapper.h"
#include "libxisf.h"
#include "loadimage.h"
#include "loadrunable.h"
#include "rawimage.h"
#include "loadimage.h"
#include "batchprocessing.h"
#include <QDebug>
#include <QDir>
#include <QFileInfo>
#include <QInputDialog>
#include <QJSValueIterator>
#include <QJsonValue>
#include <fitsio2.h>
#include "libxisf.h"
#ifdef PLATESOLVER
#include "solver.h"
#endif // PLATESOLVER
@@ -672,10 +673,11 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
if(isFITS(suffix()))
{
fitsfile *file;
int status = 0;
QString path = makeUNCPath(_path);
fits_open_diskfile(&file, path.toLocal8Bit().data(), READWRITE, &status);
FITSWrapper file(path, READWRITE, true);
status = file.status();
int num = 0;
fits_get_num_hdus(file, &num, &status);
if(status)
@@ -795,8 +797,7 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
return false;
}
}
fits_close_file(file, &status);
if(status)qWarning() << "Failed to modify FITS header" << status;
return status == 0;
}
else if(isXISF(suffix()))
@@ -804,9 +805,9 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
try
{
LibXISF::XISFModify modifyXISF;
QString in = makeUNCPath(absoluteFilePath());
QString out = in + "~";
modifyXISF.open(in.toLocal8Bit().data());
QFileInfo in(makeUNCPath(absoluteFilePath()));
QFileInfo out(in.absoluteFilePath() + "~");
modifyXISF.open(in.filesystemFilePath());
qDebug() << "modify" << in << out;
for(auto &remove : modify->_remove)
@@ -821,9 +822,9 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
for(auto &property : modify->_property)
modifyXISF.updateProperty(modify->_imageIdx, property);
modifyXISF.save(out.toLocal8Bit().toStdString());
modifyXISF.save(out.filesystemFilePath());
modifyXISF.close();
std::filesystem::rename(out.toLocal8Bit().toStdString(), in.toLocal8Bit().toStdString());
std::filesystem::rename(out.filesystemFilePath(), in.filesystemFilePath());
return true;
}
catch(std::filesystem::filesystem_error &err)
+6
View File
@@ -147,6 +147,10 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
else if(lang == "sk")m_lang->setCurrentIndex(2);
else if(lang == "pt_BR")m_lang->setCurrentIndex(3);
m_checkUpdate = new QCheckBox(tr("Check for new version"), this);
m_checkUpdate->setToolTip(tr("Check for new version every week"));
m_checkUpdate->setChecked(settings.value("settings/checkupdate", false).toBool());
layout->addRow(tr("Image preload count"), m_preloadImages);
layout->addRow(tr("Thumbnails size"), m_thumSize);
layout->addRow(tr("Saturation"), m_saturation);
@@ -156,6 +160,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
layout->addRow(m_qualityThumbnail);
layout->addRow(m_useNativeDialog);
layout->addRow(m_bestFit);
layout->addRow(m_checkUpdate);
layout->addRow(new QLabel(tr("FITS header highlight"), this));
layout->addRow(m_headerHighlight);
layout->addRow(m_keyword, color);
@@ -265,4 +270,5 @@ void SettingsDialog::saveSettings()
case 3: lang = "pt_BR"; break;
}
settings.setValue("settings/lang", lang);
settings.setValue("settings/checkupdate", m_checkUpdate->isChecked());
}
+1
View File
@@ -33,6 +33,7 @@ private:
QColor m_color = Qt::yellow;
QLineEdit *m_keyword;
QComboBox *m_lang;
QCheckBox *m_checkUpdate;
};
#endif // SETTINGSDIALOG_H
+1
View File
@@ -1,6 +1,7 @@
#include <vector>
#include <string>
#include <iostream>
#include <fstream>
#include "../src/rawimage.h"
#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "stb_image_write.h"