Update metainfo

CMakeLists.txt

@@ -17,43 +17,50 @@ if(SANITIZE_ADDRESS_LEAK)
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address -fsanitize=leak")
 endif(SANITIZE_ADDRESS_LEAK)
 
-find_package(Qt6 COMPONENTS Widgets Sql OpenGLWidgets Qml REQUIRED)
+find_package(Qt6 COMPONENTS Widgets Sql OpenGLWidgets Qml Charts Svg REQUIRED)
 find_library(EXIF_LIB exif REQUIRED)
 find_library(FITS_LIB cfitsio REQUIRED)
 find_library(RAW_LIB NAMES raw_r REQUIRED)
 find_library(WCS_LIB wcs wcslib REQUIRED)
 find_library(LCMS2_LIB lcms2 REQUIRED)
-find_library(STELLARSOLVER_LIB stellarsolver)
+find_library(STELLARSOLVER_LIB NAMES stellarsolver stellarsolver6)
 
 add_subdirectory(libXISF)
 
 set(TENMON_SRC
-    about.cpp about.h
-    batchprocessing.cpp batchprocessing.h batchprocessing.ui
-    database.cpp database.h
-    databaseview.cpp databaseview.h
-    delete.cpp
-    filesystemwidget.cpp filesystemwidget.h
-    histogram.cpp histogram.h
-    httpdownloader.h httpdownloader.cpp
-    imageinfo.cpp imageinfo.h
-    imageinfodata.cpp imageinfodata.h
-    imageringlist.cpp imageringlist.h
-    imagescrollarea.cpp imagescrollarea.h
-    imagewidget.h imagewidget.cpp
-    loadimage.h loadimage.cpp
-    loadrunable.cpp loadrunable.h
-    main.cpp
-    mainwindow.cpp mainwindow.h
-    markedfiles.cpp markedfiles.h
-    mtfparam.h
-    rawimage.cpp rawimage.h
-    rawimage_sse.cpp
-    scriptengine.cpp scriptengine.h
-    settingsdialog.cpp settingsdialog.h
-    statusbar.cpp statusbar.h
-    stfslider.cpp stfslider.h
-    stretchtoolbar.cpp stretchtoolbar.h
+    src/about.cpp src/about.h
+    src/batchprocessing.cpp src/batchprocessing.h src/batchprocessing.ui
+    src/chartgraph.h src/chartgraph.cpp
+    src/database.cpp src/database.h
+    src/databasetree.cpp src/databasetree.h
+    src/databasetreekeys.ui
+    src/databaseview.cpp src/databaseview.h
+    src/delete.cpp
+    src/filemanager.h src/filemanager.cpp src/filemanager.ui
+    src/filesystemwidget.cpp src/filesystemwidget.h
+    src/fitskeyword.ui
+    src/histogram.cpp src/histogram.h
+    src/httpdownloader.h src/httpdownloader.cpp
+    src/imageinfo.cpp src/imageinfo.h
+    src/imageinfodata.cpp src/imageinfodata.h
+    src/imageringlist.cpp src/imageringlist.h
+    src/imagescrollarea.cpp src/imagescrollarea.h
+    src/imagewidget.h src/imagewidget.cpp
+    src/loadimage.h src/loadimage.cpp
+    src/loadrunable.cpp src/loadrunable.h
+    src/main.cpp
+    src/mainwindow.cpp src/mainwindow.h
+    src/markedfiles.cpp src/markedfiles.h
+    src/mtfparam.h
+    src/rawimage.cpp src/rawimage.h
+    src/rawimage_sse.cpp
+    src/scriptengine.cpp src/scriptengine.h
+    src/settingsdialog.cpp src/settingsdialog.h
+    src/statusbar.cpp src/statusbar.h
+    src/stfslider.cpp src/stfslider.h
+    src/stretchtoolbar.cpp src/stretchtoolbar.h
+    src/tfloat16.h
+    thumbnailer/genthumbnail.cpp thumbnailer/genthumbnail.h
 )
 
 qt_add_resources(TENMON_SRC resources/resources.qrc)
@@ -74,7 +81,7 @@ endif()
 qt_add_executable(tenmon WIN32 MACOSX_BUNDLE ${tenmon_ICON} ${TENMON_SRC})
 
 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)
 if(COLOR_MANAGMENT)
@@ -87,20 +94,21 @@ if(STELLARSOLVER_INCLUDE AND STELLARSOLVER_LIB)
     if(MXE)
         find_library(GSL_LIB gsl REQUIRED)
         find_library(GSLCBLAS_LIB gslcblas REQUIRED)
+        target_compile_definitions(tenmon PRIVATE "stellarsolver_STATIC")
         target_link_libraries(tenmon PRIVATE ${STELLARSOLVER_LIB} ${GSL_LIB} ${GSLCBLAS_LIB} boost_regex-mt-x64)
     else(MXE)
         target_link_libraries(tenmon PRIVATE ${STELLARSOLVER_LIB})
     endif(MXE)
     target_compile_definitions(tenmon PRIVATE "PLATESOLVER")
     target_sources(tenmon PRIVATE
-        solver.cpp solver.h
-        platesolving.cpp platesolving.h platesolving.ui
-        platesolvingsettings.cpp platesolvingsettings.h platesolvingsettings.ui
+        src/solver.cpp src/solver.h
+        src/platesolving.cpp src/platesolving.h src/platesolving.ui
+        src/platesolvingsettings.cpp src/platesolvingsettings.h src/platesolvingsettings.ui
     )
     message(STATUS "Found stellarsolver ${STELLARSOLVER_INCLUDE} ${STELLARSOLVER_LIB}")
 endif(STELLARSOLVER_INCLUDE AND STELLARSOLVER_LIB)
 
-target_link_libraries(tenmon PRIVATE Qt6::Widgets Qt6::Sql Qt6::OpenGLWidgets Qt6::Qml ${EXIF_LIB} ${FITS_LIB} ${RAW_LIB} ${WCS_LIB} ${LCMS2_LIB} XISF)
+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")
 elseif(UNIX)
@@ -127,6 +135,7 @@ if(UNIX AND NOT APPLE)
         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_128.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/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")
 endif(UNIX AND NOT APPLE)

README

@@ -2,7 +2,7 @@ FITS/XISF image viewer with multithreaded image loading
 
 To get all dependencies install these packages
 
-    sudo apt install qt6-base-dev qt6-declarative-dev libqt6opengl6-dev libraw-dev libexif-dev libcfitsio-dev wcslib-dev cmake libzstd-dev libqt6sql6-sqlite
+    sudo apt install qt6-base-dev qt6-declarative-dev qt6-charts-dev libqt6opengl6-dev libraw-dev libexif-dev libcfitsio-dev wcslib-dev cmake libzstd-dev libqt6sql6-sqlite
 
 on OpenSUSE
 
@@ -26,6 +26,12 @@ Then to build run standard cmake sequence
     cmake --build build
     ./build/tenmon
 
+To install it to system run this command as root
+
+    cmake --install build
+
 For working plate solving you must have compiled and installed StellarSolver https://github.com/rlancaste/stellarsolver
 It is important that you compile StellarSolver with Qt6. By default it use Qt5 but when linked with Qt6 program it will
 crash.
+
+Using OpenNGC database https://github.com/mattiaverga/OpenNGC under CC-BY-SA-4.0 https://creativecommons.org/licenses/by-sa/4.0/

about/help_en

@@ -61,7 +61,7 @@ This image should be 256 pixel wide. Each row of image will be used as separate
     <li>mid point - defines the value to be stretched to 50% intensity</li>
     <li>white point - all pixels with higher value (brighter) than this will be clipped white</li>
 </ul>
-<p>Following the slider are 7 buttons for automatic stretching:</p>
+<p>Following the slider are 8 buttons to control image display:</p>
 <ul>
     <li><i>Linked channels</i> toggle stretching each RGB channel individually.</li>
     <li><i>Auto Stretch</i> automatically apply black and mid points to render the image with optimal brightness.</li>
@@ -70,6 +70,7 @@ This image should be 256 pixel wide. Each row of image will be used as separate
     <li><i>False colors</i> show black and white in false colour palette.</li>
     <li><i>Debayer CFA</i> Demosaicing black and white image from CFA sensor to color one.</li>
     <li><i>Apply Auto stretch on load</i> toggle automatically applying Autostretch for each image when loaded.</li>
+    <li><i>Draw equatorial grid</i> toggle drawing equatorial coordinate grid and catalogue objects. Needs that file have WCS data.</li>
 </ul>
 
 <h3>Marking images</h3>
@@ -121,6 +122,13 @@ Pressing Enter or clicking on <i>Filter</i> button will filter out database reco
 This example filters for files where: "Bias" is in the file name, the OBJECT property is "M_42" (where the underscore can be any single character), and the DATE property begins with "2022".
 </p>
 
+<h3>Database tree</h3>
+<p>This is another view that show indexed database as tree. You can add or remove tree grouping that construct a tree structure from FITS keywords. Each level of tree
+will be based on this grouping. You can specify one keywords multiple times. When adding a grouping you can also specify aggregation function that is applied to last level.
+SUM will add up all numbers in that group usefull for example for EXPTIME. COUNT will show how many files are in that group. AVG will show average value, MIN,MAX,MEDIAN will calculate
+minimum, maximum and media value in that group. So if you select CCD-TEMP as last with AVG it will calculate average temperature. Double click on file in tree view will open
+that file.</p>
+
 <h3>Plate Solving</h3>
 <p>This module can plate solve images and update FITS header with solution for FITS and XISF images.
 <b>Profile</b> this set various parameters that affect star extraction and solving.
@@ -134,12 +142,43 @@ solver.
 <p>Then finally there are various action button. Settings button show dialog where you can set path to existing index files or auto download some.
 Extract button will just extract stars from image and it will show their count, HFR and eccentricity. This action doesn't need index files.
 Solve button will try to find coordinates of images. Abort button will stop extraction or solving. Update FITS header will update FITS fits keywords
-with found solution.
+with found solution.</p>
 
 <p>In settings dialog you can set path to index files which is by default custom internal one. It also try to locate commonly used path from other
 programs like KStars for astrometry.net index files.
 </p>
 
+<h3>File Manager</h3>
+<p>
+This is simple double panel file manager. It can show columns with selected FITS keywords. Each panel have tabs where it easily switch between
+multiple directories. You can copy or move files and directories either inside one panel or between two panels by selecting and then dragging.
+By default files are copies. To move then press Shift key before start dragging. Double click on file will open it in main window if it is image
+or other file it will open default program that is associated with it this file type. You can also drag file to other programs like from default
+file explorer programs that are in system or from file explorer to this program.
+</p>
+<p>
+In menu you can select which FITS keywords will be showed. Temporarilly disable loading FITS header or copy file paths of selected files as text.
+</p>
+
+<h3>Command line options</h3>
+<p>
+Tenmon can be executed from command line. It support these command line options.
+<ul>
+<li><i>--thumb, --thumbnail &lt;path&gt;</i> Generate thumbnail and save it to path. It generate it from first file provided as argument.</li>
+<li><i>-s, --size <size></i> size of generated thumbnail. Aspect ratio of input image is preserved.</li>
+<li><i>--script &lt;script&gt;</i> execute a script from file path same manner as executed from GUI.</li>
+<li><i>--scriptarg &lt;arg&gt>;</i> pass this string as variable scriptarg to a running script.</li>
+<li><i>--outdir &lt;dir&gt;</i> output dir for script execution. By default current working directory is used.</li>
+<li><i>--noexit</i> by default application exit when execution of script specified with --script ends. This prefent that.</li>
+<li><i>-h, --help</i> show help end exit.</li>
+Any other arguments are taken as input paths. If only one file path is specified then that image is open and image list is populated by directory
+containing that image. If directory is specified then it is same as selecting that directory in "Open directory recusivelly". If multiple files are
+specified then image list will contain just these speicified images.
+
+When exuecting script with --script then these paths are used as input files and directories as in "Batch processing"
+</ul>
+</p>
+
 <h3>Batch processing</h3>
 <p>This module allow to write scripts in JavaScript that process image files. Batch Processing window consist from three main parts. On top is list of input files and directories.
 You can add directories or individual files to this list. Directories are scanned recursively to find all files even non image files. This list of files is then passed to script in array named <b>files</b>.
@@ -159,7 +198,8 @@ this output directory is ignored.</p>
 <p>Bellow that is list of scripts. These scripts are located in application data directory. Select script which you want to run by clicking on it. Clicking on <i>Open scripts</i> will open directory with these scripts where you create new and edit them.
 Location of this directory is on Windows: "C:/Users/&lt;USER&gt;/AppData/Roaming/nou/Tenmon/scripts"  Linux: "~/.local/share/nou/Tenmon/scripts" MacOS: "~/Library/Application Support/nou/Tenmon/scripts"</p>
 
-<p>Next is Log windows that contain any messages that come from scripts. Mainly calls to <code>core.log()</code> At bottom there buttons that can start or stop execution of selected scripts.</p>
+<p>Next is Log windows that contain any messages that come from scripts. Mainly calls to <code>core.log()</code> At bottom there is console that enable run simple script commands and
+buttons that can start or stop execution of selected scripts.</p>
 
 <h4>core</h4>
 <p>There is global object called <b>core</b> that have these methods.</p>
@@ -184,6 +224,48 @@ Location of this directory is on Windows: "C:/Users/&lt;USER&gt;/AppData/Roaming
 core.log(JSON.stringify(profile));</pre></li>
 <li><b>setSolverProfile(index)</b> set solver profile by index. Valid values are from 1 to 8 as in GUI.</li>
 <li><b>setSolverProfile(profile)</b> set solver profile. Parameter is same as object returned by <i>getSolverProfile()</i> method</li>
+<li><b>question(question, buttons, title = "")</b> show dialog with question. First argument <i>question</i> is string. Second argument <i>buttons</i>
+    is array of following strings. "ok", "yes", "no", "yesall", "noall", "abort", "retry", "ignore", "cancel", "discard", "apply", "reset" Third argument <i>title</i> is optional string that show in title bar.
+    It return button that was clicked as a string.
+    <pre>var button = core.question("Apply to all files?", ["yes", "no"]);</pre>
+    </li>
+<li><b>plot(graph)</b> this method show graph defined by JS object.
+
+<pre>
+var chart = {
+    "title": "Chart title", // Title that will show on top of chart
+    "legend":
+    {
+        "visible": true,// default is true
+        "align": "left" // allowed values are "top", "right", "bottom", "left". default is "top"
+    },
+    "series":[ // array of data series
+        {
+            "title": "HFR",
+            "type": "bar", // type of the serie. Can be one of "line", "points", "linePoints", "bar"
+            "y":[2.5,3.1,2.6,2.2] // array of values
+        },
+        {
+            "title": "Ecc",
+            "y":[0.37, 0.4, 0.35, 0.25],
+            "color": "red" // color of serie. It can be name of color like "green" or RGB hex value "#ccddff"
+        },
+        {
+            "title": "Stars",
+            "type": "points", // type of serie. can be "line", "points", "linePoints" and "bar". Default is "line"
+            "shape": "star", // shape of markers. valid only for points
+            "x":[1, 2.5, 3.5, 6],// line, points and linePoints can also have "x" values. Otherwise it assume sequence 0,1,2 ...
+            "y":[523,412,487,510],
+            "y2": true, // if set to true this serie will use secondary Y axis
+            "bestFit": true, // show best fit line
+            "color": "#0000ff"
+        }
+    ]
+};
+
+core.plot(chart);
+</pre>
+</li>
 </ul>
 
 <h4>File</h4>

about/help_fr

@@ -102,6 +102,63 @@ En appuyant sur la touche Enter ou en cliquant sur le bouton <i>Filtre</i>, les
 Cet exemple filtre les fichiers où : "Bias" figure dans le nom de fichier, la propriété OBJECT est "M_42" (où le trait de soulignement peut être n'importe quel caractère) et la propriété DATE commence par "2022".
 </p>
 
+<h3>Database tree</h3>
+<p>This is another view that show indexed database as tree. You can add or remove tree grouping that construct a tree structure from FITS keywords. Each level of tree
+will be based on this grouping. You can specify one keywords multiple times. When adding a grouping you can also specify aggregation function that is applied to last level.
+SUM will add up all numbers in that group usefull for example for EXPTIME. COUNT will show how many files are in that group. AVG will show average value, MIN,MAX,MEDIAN will calculate
+minimum, maximum and media value in that group. So if you select CCD-TEMP as last with AVG it will calculate average temperature. Double click on file in tree view will open
+that file.</p>
+
+<h3>Plate Solving</h3>
+<p>This module can plate solve images and update FITS header with solution for FITS and XISF images.
+<b>Profile</b> this set various parameters that affect star extraction and solving.
+<b>Starting point</b> program will try to automatically determine optimal starting point which helps to speed up solving.
+You can leave one or both unchecked then it will attempt to do blind solving. If the position or scale is wrong it can actually
+fail to solve.
+<b>Solution</b> this section contain resulting solution like RA,DEC coordinates center of image, image field of view, orientation as degrees E of N,
+image scale in arcseconds per pixel, number of stars extracted and HFR fitting and eccentricity. Then there is log window for debug information from
+solver.
+</p>
+<p>Then finally there are various action button. Settings button show dialog where you can set path to existing index files or auto download some.
+Extract button will just extract stars from image and it will show their count, HFR and eccentricity. This action doesn't need index files.
+Solve button will try to find coordinates of images. Abort button will stop extraction or solving. Update FITS header will update FITS fits keywords
+with found solution.</p>
+
+<p>In settings dialog you can set path to index files which is by default custom internal one. It also try to locate commonly used path from other
+programs like KStars for astrometry.net index files.
+</p>
+
+<h3>File Manager</h3>
+<p>
+This is simple double panel file manager. It can show columns with selected FITS keywords. Each panel have tabs where it easily switch between
+multiple directories. You can copy or move files and directories either inside one panel or between two panels by selecting and then dragging.
+By default files are copies. To move then press Shift key before start dragging. Double click on file will open it in main window if it is image
+or other file it will open default program that is associated with it this file type. You can also drag file to other programs like from default
+file explorer programs that are in system or from file explorer to this program.
+</p>
+<p>
+In menu you can select which FITS keywords will be showed. Temporarilly disable loading FITS header or copy file paths of selected files as text.
+</p>
+
+<h3>Command line options</h3>
+<p>
+Tenmon can be executed from command line. It support these command line options.
+<ul>
+<li><i>--thumb, --thumbnail &lt;path&gt;</i> Generate thumbnail and save it to path. It generate it from first file provided as argument.</li>
+<li><i>-s, --size <size></i> size of generated thumbnail. Aspect ratio of input image is preserved.</li>
+<li><i>--script &lt;script&gt;</i> execute a script from file path same manner as executed from GUI.</li>
+<li><i>--scriptarg &lt;arg&gt>;</i> pass this string as variable scriptarg to a running script.</li>
+<li><i>--outdir &lt;dir&gt;</i> output dir for script execution. By default current working directory is used.</li>
+<li><i>--noexit</i> by default application exit when execution of script specified with --script ends. This prefent that.</li>
+<li><i>-h, --help</i> show help end exit.</li>
+Any other arguments are taken as input paths. If only one file path is specified then that image is open and image list is populated by directory
+containing that image. If directory is specified then it is same as selecting that directory in "Open directory recusivelly". If multiple files are
+specified then image list will contain just these speicified images.
+
+When exuecting script with --script then these paths are used as input files and directories as in "Batch processing"
+</ul>
+</p>
+
 <h3>Traitement par lot</h3>
 
 Ce module permet d'écrire des scripts en JavaScript qui traitent des fichiers images. La fenêtre de traitement par lots se compose de trois parties principales. En haut se trouve la liste des fichiers et répertoires d'entrée.
@@ -135,6 +192,54 @@ Le deuxième paramètre est la valeur par défaut dans la zone de saisie. Les tr
 <li><b>getItem(items)</b> affiche une boîte de dialogue de sélection qui permet de sélectionner un élément dans un tableau d'éléments. Lorsque vous appuyez sur Annuler, il renvoie Undefined.</li>
 <li><b>setStartingSolution(solution)</b> with this you can set starting point and image scale. It accepth object with attributes "ra", "dec", "pixscale".
         Same object as returned by <i>File.solve()</i> method. You can also call it without paramer in which case it will clear any previously set values.</li>
+<li><b>getSolverProfile()</b> return solver profile as Object.
+<pre>var profile = core.getSolverProfile();
+core.log(JSON.stringify(profile));</pre></li>
+<li><b>setSolverProfile(index)</b> set solver profile by index. Valid values are from 1 to 8 as in GUI.</li>
+<li><b>setSolverProfile(profile)</b> set solver profile. Parameter is same as object returned by <i>getSolverProfile()</i> method</li>
+<li><b>question(question, buttons, title = "")</b> show dialog with question. First argument <i>question</i> is string. Second argument <i>buttons</i>
+    is array of following strings. "ok", "yes", "no", "yesall", "noall", "abort", "retry", "ignore", "cancel", "discard", "apply", "reset" Third argument <i>title</i> is optional string that show in title bar.
+    It return button that was clicked as a string.
+    <pre>var button = core.question("Apply to all files?", ["yes", "no"]);</pre>
+    </li>
+<li><b>plot(graph)</b> this method show graph defined by JS object.
+
+<pre>
+var chart = {
+    "title": "Chart title", // Title that will show on top of chart
+    "legend":
+    {
+        "visible": true,// default is true
+        "align": "left" // allowed values are "top", "right", "bottom", "left". default is "top"
+    },
+    "series":[ // array of data series
+        {
+            "title": "HFR",
+            "type": "bar", // type of the serie. Can be one of "line", "points", "linePoints", "bar"
+            "y":[2.5,3.1,2.6,2.2] // array of values
+        },
+        {
+            "title": "Ecc",
+            "y":[0.37, 0.4, 0.35, 0.25],
+            "color": "red" // color of serie. It can be name of color like "green" or RGB hex value "#ccddff"
+        },
+        {
+            "title": "Stars",
+            "type": "points", // type of serie. can be "line", "points", "linePoints" and "bar". Default is "line"
+            "shape": "star", // shape of markers. valid only for points
+            "x":[1, 2.5, 3.5, 6],// line, points and linePoints can also have "x" values. Otherwise it assume sequence 0,1,2 ...
+            "y":[523,412,487,510],
+            "y2": true, // if set to true this serie will use secondary Y axis
+            "bestFit": true, // show best fit line
+            "color": "#0000ff"
+        }
+    ]
+};
+
+core.plot(chart);
+</pre>
+</li>
+
 </ul>
 
 <h4>File</h4>

about/help_sk

@@ -51,6 +51,17 @@ na ktorej sa dajú nastaviť tri body.
     <li>stredný bod - pixeli s touto hodnotou budú zobrazené ako 50% šedá</li>
     <li>biely bod - pixeli nad touto hodnotou budú zobrazené ako biele</li>
 </ul>
+<p>Nasleduje 8 tlačidiel pre nastavenie zobrazenie obrázka:</p>
+<ul>
+    <li><i>Prepojené kanály</i> prepína medzi nataihnutím jasových urovní pre každý RGB kanál zvlášť alebo jednotné pre všetky kanály.</li>
+    <li><i>Automatické natiahnutie</i> automaticky nastavý čierny, šedý a biely bod pre optimálne zobrazenie..</li>
+    <li><i>Resetuj funkciu prevodu na obrazovku</i> nastavý hodnoty čierneho, šedého a bieleho bodu na východzie hodnoty.</li>
+    <li><i>Invertuj farby</i> invertuje zobrazené farby a zobrazý obrázok ako negatív.</li>
+    <li><i>Falošné farby</i> pre zobrazenie čiernobielych obrázkov sa použije farebná paleta.</li>
+    <li><i>Preved CFA na farbu</i> Demosaicing black and white image from CFA sensor to color one.</li>
+    <li><i>Aplikuj automatické natiahnutie pri načítaní</i> pri zapnutí </li>
+    <li><i>Vykresli equatoriálnu mriežku</i> zapína zobrazenie equatoriálnej mriežky. Je poitrebné aby súbor obsahoval WCS dáta.</li>
+</ul>
 <p>Prvé tlačidlo prepína prepojenie nastavenia čierneho, stretdného a bieleho bodu. Po prepnutí sa dá každý farebný kanál nastaviť
 samostatne.
 Nasleduje tlačidlo ktoré nastaví hodnoty čierneho a stredného bodu tak aby bol obrázok zobrazený optimálnym jasom.
@@ -94,6 +105,60 @@ V nasledovnom príklade sa vyhľadajú súbory ktoré majú v mene súboru "Bias
 zástupný znak za hocijaký reťazec znakov aj žiadny. Znak _ je tiež zástupný znak zastupujúci práve jeden znak.
 Bez použitia zástupných znakov sa vyhľadá iba presný výskyt.</p>
 
+<h3>Database tree</h3>
+<p>This is another view that show indexed database as tree. You can add or remove tree grouping that construct a tree structure from FITS keywords. Each level of tree
+will be based on this grouping. You can specify one keywords multiple times. When adding a grouping you can also specify aggregation function that is applied to last level.
+SUM will add up all numbers in that group usefull for example for EXPTIME. COUNT will show how many files are in that group. AVG will show average value, MIN,MAX,MEDIAN will calculate
+minimum, maximum and media value in that group. So if you select CCD-TEMP as last with AVG it will calculate average temperature. Double click on file in tree view will open
+that file.</p>
+
+<h3>Plate Solving</h3>
+<p>Tento modul umožnuje vyriešiť obrázok a určiť RA, DEC koordináty a aktualizovať FITS a XISF súbory s WCS dátami.
+<b>Profil</b> toto nastavuje rôzne parametre ovplivňujúce extrahovanie hviezd a hľadanie koordinátov.
+<b>Štartovný bod</b> program sa pokúsi automaticky určiť bod začiatku hľadania koordinátov pre zrýchlenie hľadania.
+Možete nechať jednu alebo obydve voľbi nezaškrtnuté kedy sa bude hľadať riešenie naslepo. Ak je pozícia alebo škála nesprávna hľadanie môže zlyhať.
+<b>Riešenie</b> táto časť obsahuje výsledné riešenie hľadania ako sú RA,DEC koordináty stredu obrázku, veľkosť zorného poľa, uhol natočenia v stupňoch,
+škála obrázku v arcsekundách na pixel, počet nájdených hviezd a veľkosť hviezd HFR a excentricita. Potom je tu ešte okno so záznamom z riešenia.
+</p>
+<p>Pod tým je tlačidlo pre nastavenie cesty k indexovým súborom a ich stiahnutie. Je možné buď stiahnuť indexové súbory alebo použiť už existujúce súbory.
+Tlačidlo Extrahovať nájde hviezdy a zobrazý ich počet veľkosť HFR a excentricitu. Na toto nie sú potrebné indexové súbory.
+Tlačidlo Vyriešiť sa pokúsi nájsť koordináty obrázka. Zrušiť preruší hľadanie riešenia. Aktualizovať FITS hlavičku zapíše najdené riešenie do súboru.</p>
+
+<p>In settings dialog you can set path to index files which is by default custom internal one. It also try to locate commonly used path from other
+programs like KStars for astrometry.net index files.
+</p>
+
+<h3>File Manager</h3>
+<p>
+This is simple double panel file manager. It can show columns with selected FITS keywords. Each panel have tabs where it easily switch between
+multiple directories. You can copy or move files and directories either inside one panel or between two panels by selecting and then dragging.
+By default files are copies. To move then press Shift key before start dragging. Double click on file will open it in main window if it is image
+or other file it will open default program that is associated with it this file type. You can also drag file to other programs like from default
+file explorer programs that are in system or from file explorer to this program.
+</p>
+<p>
+In menu you can select which FITS keywords will be showed. Temporarilly disable loading FITS header or copy file paths of selected files as text.
+</p>
+
+<h3>Command line options</h3>
+<p>
+Tenmon can be executed from command line. It support these command line options.
+<ul>
+<li><i>--thumb, --thumbnail &lt;path&gt;</i> Generate thumbnail and save it to path. It generate it from first file provided as argument.</li>
+<li><i>-s, --size <size></i> size of generated thumbnail. Aspect ratio of input image is preserved.</li>
+<li><i>--script &lt;script&gt;</i> execute a script from file path same manner as executed from GUI.</li>
+<li><i>--scriptarg &lt;arg&gt>;</i> pass this string as variable scriptarg to a running script.</li>
+<li><i>--outdir &lt;dir&gt;</i> output dir for script execution. By default current working directory is used.</li>
+<li><i>--noexit</i> by default application exit when execution of script specified with --script ends. This prefent that.</li>
+<li><i>-h, --help</i> show help end exit.</li>
+Any other arguments are taken as input paths. If only one file path is specified then that image is open and image list is populated by directory
+containing that image. If directory is specified then it is same as selecting that directory in "Open directory recusivelly". If multiple files are
+specified then image list will contain just these speicified images.
+
+When exuecting script with --script then these paths are used as input files and directories as in "Batch processing"
+</ul>
+</p>
+
 <h3>Hromadné spracovanie</h3>
 
 Tento modul umožnuje písanie skriptov v JavaScripte ktoré spracujú súbory obrázkov. Okno Hromadného spracovanie pozostáva z troch častí. Navrchu je zoznam vstupných súborov a adresárov.
@@ -109,6 +174,12 @@ V skripte potom cez toto pole iteruje nasledovne.
 }
 </pre>
 
+<p>Pod týmto zoznamom je výstupný adresár. Všetky relatívne cesty predané do metod ako sú copy(), move() alebo convert() budú relatívne voči tomuto adresáru.
+Ak je ako argument použitá absolútna cesta tak je tento vystupný adresár ignorovaný.</p>
+
+<p>Nasleduje logovacie okno kde sú zapisováné všetký výpisy z behu scriptu. Hlavne volania z <code>core.log()</code> Na spodu je konzola kde je možné vkladať jednoduché príkazy a nakoniec ešte tlačítka
+ktoré spúštať alebo zastavovať vybraný skript.</p>
+
 <h4>core</h4>
 V skripte je dostupný globálny objekt nazvaný <b>core</b> ktorý má nasledovné metódy.
 <ul>
@@ -126,6 +197,54 @@ V skripte je dostupný globálny objekt nazvaný <b>core</b> ktorý má nasledov
 <li><b>getItem(items)</b> ukáže dialog pre výber jednej hodnoty z poľa hodnôt. Vracia vybranú hodnotu ako String alebo ak je stlačené tlačidlo zrušiť vráti Undefined.</li>
 <li><b>setStartingSolution(solution)</b> with this you can set starting point and image scale. It accepth object with attributes "ra", "dec", "pixscale".
         Same object as returned by <i>File.solve()</i> method. You can also call it without paramer in which case it will clear any previously set values.</li>
+<li><b>getSolverProfile()</b> return solver profile as Object.
+<pre>var profile = core.getSolverProfile();
+core.log(JSON.stringify(profile));</pre></li>
+<li><b>setSolverProfile(index)</b> set solver profile by index. Valid values are from 1 to 8 as in GUI.</li>
+<li><b>setSolverProfile(profile)</b> set solver profile. Parameter is same as object returned by <i>getSolverProfile()</i> method</li>
+<li><b>question(question, buttons, title = "")</b> show dialog with question. First argument <i>question</i> is string. Second argument <i>buttons</i>
+    is array of following strings. "ok", "yes", "no", "yesall", "noall", "abort", "retry", "ignore", "cancel", "discard", "apply", "reset" Third argument <i>title</i> is optional string that show in title bar.
+    It return button that was clicked as a string.
+    <pre>var button = core.question("Apply to all files?", ["yes", "no"]);</pre>
+    </li>
+<li><b>plot(graph)</b> this method show graph defined by JS object.
+
+<pre>
+var chart = {
+    "title": "Chart title", // Title that will show on top of chart
+    "legend":
+    {
+        "visible": true,// default is true
+        "align": "left" // allowed values are "top", "right", "bottom", "left". default is "top"
+    },
+    "series":[ // array of data series
+        {
+            "title": "HFR",
+            "type": "bar", // type of the serie. Can be one of "line", "points", "linePoints", "bar"
+            "y":[2.5,3.1,2.6,2.2] // array of values
+        },
+        {
+            "title": "Ecc",
+            "y":[0.37, 0.4, 0.35, 0.25],
+            "color": "red" // color of serie. It can be name of color like "green" or RGB hex value "#ccddff"
+        },
+        {
+            "title": "Stars",
+            "type": "points", // type of serie. can be "line", "points", "linePoints" and "bar". Default is "line"
+            "shape": "star", // shape of markers. valid only for points
+            "x":[1, 2.5, 3.5, 6],// line, points and linePoints can also have "x" values. Otherwise it assume sequence 0,1,2 ...
+            "y":[523,412,487,510],
+            "y2": true, // if set to true this serie will use secondary Y axis
+            "bestFit": true, // show best fit line
+            "color": "#0000ff"
+        }
+    ]
+};
+
+core.plot(chart);
+</pre>
+</li>
+
 </ul>
 
 <h4>File</h4>

about/tenmon

@@ -2,7 +2,7 @@
 <td style="padding-right:10px"><img src=":/space.nouspiro.tenmon.png"></td>
 <td><h3>Tenmon</h3>
 Tenmon is FITS/XISF image viewer and converter. It also index FITS keywords.<br>
-v@GITVERSION@ Copyright © 2022 Dušan Poizl<br><br>
+v@GITVERSION@ Copyright © 2026 Dušan Poizl<br><br>
 
 This program is free software: you can redistribute it and/or modify<br>
 it under the terms of the GNU General Public License as published by<br>

install.cmake

@@ -1,5 +1,7 @@
 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 128 resources/space.nouspiro.tenmon_128.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})

main.cpp

@@ -1,58 +0,0 @@
-#include "mainwindow.h"
-#include <QApplication>
-#include <QSurfaceFormat>
-#include <QTranslator>
-#include <stdlib.h>
-
-int main(int argc, char *argv[])
-{
-#ifdef __linux__
-    setenv("LC_NUMERIC", "C", 1);
-#endif
-
-#if defined(__i386__) || defined(__x86_64__) || defined(__APPLE__)
-    bool useGLES = false;
-#else
-    bool useGLES = true;
-#endif
-    for(int i = 0; i < argc; i++)
-    {
-        if(std::strcmp("-gl", argv[i]) == 0)
-            useGLES = false;
-        if(std::strcmp("-gles", argv[i]) == 0)
-            useGLES = true;
-    }
-
-    QSurfaceFormat format;
-    if(useGLES)
-    {
-        format.setMajorVersion(3);
-        format.setMinorVersion(0);
-        format.setRenderableType(QSurfaceFormat::OpenGLES);
-    }
-    else
-    {
-        format.setMajorVersion(3);
-        format.setMinorVersion(3);
-        //format.setOption(QSurfaceFormat::DebugContext);
-        format.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
-    }
-    QSurfaceFormat::setDefaultFormat(format);
-
-    QApplication a(argc, argv);
-    a.setOrganizationName("nou");
-    a.setApplicationName("Tenmon");
-    a.setWindowIcon(QIcon(":/space.nouspiro.tenmon.png"));
-
-    QTranslator translator;
-    QTranslator translator2;
-    if(translator.load(QLocale(), "tenmon", "_", ":/translations"))
-        a.installTranslator(&translator);
-    if(translator2.load(QLocale(), "tenmon", "_", a.applicationDirPath()))
-        a.installTranslator(&translator2);
-
-    MainWindow w;
-    w.show();
-
-    return a.exec();
-}

resources/grid.svg

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48"
+   height="48"
+   viewBox="0 0 12.699999 12.699999"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   sodipodi:docname="grid.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="9.5144352"
+     inkscape:cx="39.361243"
+     inkscape:cy="25.067174"
+     inkscape:window-width="2510"
+     inkscape:window-height="1371"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect636"
+       is_visible="true"
+       lpeversion="1"
+       pattern="M 0,4.992138 C 0,2.2364778 2.2364778,0 4.992138,0 c 2.7556601,0 4.9921379,2.2364778 4.9921379,4.992138 0,2.7556601 -2.2364778,4.9921379 -4.9921379,4.9921379 C 2.2364778,9.9842759 0,7.7477981 0,4.992138 Z"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       hide_knot="false"
+       fuse_tolerance="0" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect632"
+       is_visible="true"
+       lpeversion="1"
+       pattern="M 0,4.992138 C 0,2.2364778 2.2364778,0 4.992138,0 c 2.7556601,0 4.9921379,2.2364778 4.9921379,4.992138 0,2.7556601 -2.2364778,4.9921379 -4.9921379,4.9921379 C 2.2364778,9.9842759 0,7.7477981 0,4.992138 Z"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       hide_knot="false"
+       fuse_tolerance="0" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect628"
+       is_visible="true"
+       lpeversion="1"
+       pattern="M 0,4.992138 C 0,2.2364778 2.2364778,0 4.992138,0 c 2.7556601,0 4.9921379,2.2364778 4.9921379,4.992138 0,2.7556601 -2.2364778,4.9921379 -4.9921379,4.9921379 C 2.2364778,9.9842759 0,7.7477981 0,4.992138 Z"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       hide_knot="false"
+       fuse_tolerance="0" />
+    <inkscape:path-effect
+       effect="bspline"
+       id="path-effect624"
+       is_visible="true"
+       lpeversion="1"
+       weight="33.333333"
+       steps="2"
+       helper_size="0"
+       apply_no_weight="true"
+       apply_with_weight="true"
+       only_selected="false" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect620"
+       is_visible="true"
+       lpeversion="1" />
+  </defs>
+  <g
+     inkscape:label="Vrstva 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.503;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none"
+       d="M -5,-5 13,13"
+       id="path616"
+       sodipodi:nodetypes="cc" />
+    <circle
+       style="fill:none;stroke:#000000;stroke-width:0.503;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+       id="path643"
+       cx="-4.9824347"
+       cy="-4.9865055"
+       r="12.973718" />
+    <circle
+       style="fill:none;stroke:#000000;stroke-width:0.503;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       id="path1665"
+       cx="-4.9600825"
+       cy="-4.9741392"
+       r="17.086035" />
+    <circle
+       style="fill:none;stroke:#000000;stroke-width:0.503;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       id="path1667"
+       cx="-5.0079365"
+       cy="-5.0034046"
+       r="21.147657" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.467;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none"
+       d="M 14.371451,3.5622727 -4.9904999,-5.0054782 4.2432806,13.903978"
+       id="path1734" />
+    <circle
+       style="fill:none;stroke:#000000;stroke-width:0.503;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       id="path1736"
+       cx="-5.155458"
+       cy="-5.1256938"
+       r="9.6808758" />
+  </g>
+</svg>

resources/resources.qrc

@@ -19,14 +19,16 @@
         <file>../translations/tenmon_pt_BR.qm</file>
         <file alias="help">../about/help_en</file>
         <file>colormap.png</file>
+        <file>ngc.db</file>
+        <file>grid.svg</file>
     </qresource>
-    <qresource prefix="/" lang="en">
+    <qresource lang="en" prefix="/">
         <file alias="help">../about/help_en</file>
     </qresource>
-    <qresource prefix="/" lang="sk">
+    <qresource lang="sk" prefix="/">
         <file alias="help">../about/help_sk</file>
     </qresource>
-    <qresource prefix="/" lang="fr">
+    <qresource lang="fr" prefix="/">
         <file alias="help">../about/help_fr</file>
     </qresource>
 </RCC>

scripts/convert to XISF

@@ -1,11 +1,5 @@
 core.log("This script convert any FITS file into XISF with ZSTD compression");
 
-if(files.length == 0)
-{
-    core.log("No input files");
-    throw "";
-}
-
 let compression = {"compressionType": "zstd+sh"};
 
 for(file of files)

scripts/measure HFR

@@ -0,0 +1,49 @@
+core.log("Measure HFR and eccentricity of stars");
+
+var chart = {
+    "title": "Measure stars",
+    "legend": {"visible": true, "align": "left"},
+    "series": [
+        {
+            "title": "HFR",
+            "type": "bar",
+            "y":[]
+        },
+        {
+            "title": "Ecc",
+            "type": "bar",
+            "y":[]
+        },
+        {
+            "title": "Star count",
+            "type": "linePoints",
+            "y":[],
+            "y2": true,
+            "bestFit": true
+        }
+    ]
+};
+
+core.setSolverProfile(5);
+for(file of files)
+{
+    if(file.suffix() == "fits" || file.suffix() == "fit" || file.suffix() == "xisf")
+	{
+		var stars = file.extractStars(true);
+		var sumHFR = 0;
+		var ecc = 0; 
+		for(star of stars)
+		{
+		    sumHFR += star.HFR;
+		    ecc += Math.sqrt(1 - (star.b * star.b) / (star.a * star.a));
+		}
+		chart.series[0].y.push(sumHFR / stars.length);
+		chart.series[1].y.push(ecc / stars.length);
+		chart.series[2].y.push(stars.length);
+		
+		core.log(file.fileName() + " Stars:" + stars.length + " HFR: " + sumHFR / stars.length + " Ecc: " + ecc / stars.length);
+	}
+}
+
+core.plot(chart);
+

scripts/modify FITS header

@@ -1,3 +1,5 @@
+core.log("Script to modify FITS header in FITS and XISF files");
+
 function checkFITS(key)
 {
     const noEditableKey = ["SIMPLE", "BITPIX", "NAXIS", "NAXIS1", "NAXIS2", "NAXIS3", "EXTEND", "BZERO", "BSCALE"];
@@ -10,10 +12,12 @@ if(files.length == 0)
     throw "";
 }
 
-let action = core.getItem(["UPDATE", "ADD", "REMOVE"], "Do you want update, add or remove record?");
+let action = core.getItem(["UPDATE", "UPDATE_ADD", "ADD", "REMOVE"], "Do you want update, add or remove record?");
 
 let modify = new FITSRecordModify();
 
+let proceed = false;
+
 if(action == "UPDATE")
 {
     let keywords = files[0].fitsKeywords().filter(checkFITS);
@@ -23,28 +27,59 @@ if(action == "UPDATE")
         value = core.getString("Enter new value", value);
     else
         value = core.getFloat("Enter new value", value);
-    modify.updateKeyword(keyword, value);
+
+    if(keyword && value)
+    {
+        proceed = true;
+        modify.updateKeyword(keyword, value);
+    }
+}
+else if(action == "UPDATE_ADD")
+{
+    let keyword = core.getString("Enter keyword to update");
+    let value = core.getString("Enter new value");
+    if(keyword && value)
+    {
+        proceed = true;
+        keyword = keyword.toUpperCase();
+        modify.updateKeyword(keyword, value);
+    }
 }
 else if(action == "ADD")
 {
     let keyword = core.getString("Enter keyword to add");
     let value = core.getString("Enter new value");
-    keyword = keyword.toUpperCase();
-    modify.addKeyword(keyword, value);
+    if(keyword && value)
+    {
+        proceed = true;
+        keyword = keyword.toUpperCase();
+        modify.addKeyword(keyword, value);
+    }
 }
 else if(action == "REMOVE")
 {
     let keywords = files[0].fitsKeywords().filter(checkFITS);
     let keyword = core.getItem(keywords, "Select keyword to remove");
-    modify.removeKeyword(keyword);
-}
-
-for(file of files)
-{
-    if(file.suffix() == "fits" || file.suffix() == "fit" || file.suffix() == "xisf")
+    if(keyword)
     {
-        core.log("Modifing " + file.fileName());
-        file.modifyFITSRecords(modify);
+        proceed = true;
+        modify.removeKeyword(keyword);
     }
 }
 
+if(proceed)
+{
+    for(file of files)
+    {
+        if(file.suffix() == "fits" || file.suffix() == "fit" || file.suffix() == "xisf")
+        {
+            core.log("Modifing " + file.fileName());
+            file.modifyFITSRecords(modify);
+        }
+    }
+}
+else
+{
+    core.log("Canceled");
+}
+

scripts/plate solve

@@ -0,0 +1,20 @@
+core.log("Plate solve and update solution");
+
+var first = true;
+
+var update = core.question("Update FITS header with solution?", ["yes", "no"], "Update FITS header") == "yes";
+var blind = core.question("Do blind solve every image?", ["yes", "no"], "Blind solve?") == "yes";
+
+for(file of files)
+{
+	if(file.suffix() == "fits" || file.suffix() == "fit" || file.suffix() == "xisf")
+	{
+        var solution = file.solve(update);
+        if(first && !blind)
+		{
+			core.setStartingSolution(solution);
+			first = false;
+		}
+		core.log(file.fileName() + " " + "RA: " + (solution.ra / 15) + "h DEC: " + solution.dec + "deg");
+	}
+}

scripts/scripts.qrc

@@ -4,5 +4,7 @@
         <file>convert to XISF</file>
         <file>median</file>
         <file>modify FITS header</file>
+        <file>measure HFR</file>
+        <file>plate solve</file>
     </qresource>
 </RCC>

shaders/image.frag

@@ -1,6 +1,6 @@
 uniform sampler2D qt_Texture0;
 uniform sampler3D lut_table;
-uniform sampler1DArray colormap;
+uniform sampler2DArray colormap;
 uniform vec3 mtf_param[3];
 uniform vec2 unit_scale;
 uniform bool bw;
@@ -30,7 +30,7 @@ vec3 falsecolor(float color)
 {
     color *= 255.0 / 256.0;
     color += 0.5 / 256.0;
-    return texture(colormap, vec2(color, colormapIdx)).rgb;
+    return texture(colormap, vec3(color, 0.5, colormapIdx)).rgb;
 }
 
 vec3 checker()

space.nouspiro.tenmon.metainfo.xml

@@ -33,6 +33,7 @@
             <li>Color space aware</li>
             <li>Histogram</li>
             <li>Scripting</li>
+            <li>Plate solving</li>
         </ul>
     </description>
     <categories>
@@ -46,6 +47,7 @@
     </keywords>
     <url type="homepage">https://nouspiro.space/?page_id=206</url>
     <url type="bugtracker">https://github.com/flathub/space.nouspiro.tenmon/issues</url>
+    <url type="vcs-browser">https://gitea.nouspiro.space/nou/tenmon</url>
     <screenshots>
         <screenshot type="default">
             <caption>Main window with image</caption>
@@ -58,6 +60,64 @@
     </screenshots>
     <content_rating type="oars-1.1"/>
     <releases>
+    <release version="20260412" date="2026-04-12">
+      <description>
+        <ul>
+          <li>Add database tree to show database entries grouped in tree structure</li>
+          <li>Add database summary table. This can show total exposure time for OBJECT and FILTER for example</li>
+          <li>Copy files to clipboard from database view</li>
+          <li>Copy to clipboard text from database tables so they can be pasted to Excel</li>
+          <li>Add CLI option to run scripts and generate thumbnails</li>
+        </ul>
+      </description>
+    </release>
+    <release version="20260217" date="2026-02-17">
+      <description>
+        <ul>
+          <li>Fix potentional crash</li>
+          <li>Enable sorting of FITS info</li>
+        </ul>
+      </description>
+    </release>
+    <release version="20251101" date="2025-11-01">
+      <description>
+        <ul>
+          <li>Better image Save as</li>
+          <li>Fix xisf file corruption when platesolving</li>
+          <li>Add selecting language</li>
+        </ul>
+      </description>
+    </release>
+    <release version="20250915" date="2025-09-15">
+      <description>
+        <ul>
+          <li>Draw equatorial grid and objects overlay</li>
+          <li>File Manager</li>
+          <li>Support for PCL:AstrometricSolution</li>
+          <li>Script console</li>
+        </ul>
+      </description>
+    </release>
+    <release version="20250429" date="2025-04-29">
+      <description>
+        <ul>
+          <li>Add ability to load multiple images in single file</li>
+          <li>New plot() and question() script methods</li>
+          <li>Color highlight of FITS keywords</li>
+          <li>New scripts to batch platesolve and measure stars</li>
+          <li>Stretch toolbar can now be vertical</li>
+        </ul>
+      </description>
+    </release>
+    <release version="20250318" date="2025-03-18">
+      <description>
+        <ul>
+          <li>Fix OpenGL ES drawings</li>
+          <li>Fix mark/unmark files from script</li>
+          <li>Fix stretching of float images with values outside of 0-1 range</li>
+        </ul>
+      </description>
+    </release>
     <release version="20250302" date="2025-03-02">
       <description>
         <ul>
@@ -98,7 +158,7 @@
     </release>
     <release version="20240816" date="2024-08-16">
       <description>
-        Fix saving image
+        <p>Fix saving image</p>
       </description>
     </release>
     <release version="20240616" date="2024-06-16">

space.nouspiro.tenmon.xisf.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+   <mime-type type="image/x-xisf">
+      <comment>Extensible Image Serialization Format</comment>
+      <glob pattern="*.xisf"/>
+   </mime-type>
+</mime-info>

src/about.cpp

@@ -15,11 +15,13 @@ About::About(QWidget *parent) : QDialog(parent)
     QLabel *label = new QLabel(this);
 
     QFile tenmonText(":/about/tenmon");
-    tenmonText.open(QIODevice::ReadOnly);
-    QByteArray text = tenmonText.readAll();
-    text.replace("@GITVERSION@", GITVERSION);
-    label->setText(text);
-    label->setOpenExternalLinks(true);
+    if(tenmonText.open(QIODevice::ReadOnly))
+    {
+        QByteArray text = tenmonText.readAll();
+        text.replace("@GITVERSION@", GITVERSION);
+        label->setText(text);
+        label->setOpenExternalLinks(true);
+    }
 
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
@@ -32,6 +34,8 @@ HelpDialog::HelpDialog(QWidget *parent) : QDialog(parent)
 {
     setWindowTitle(tr("Help"));
     resize(1000, 600);
+    setModal(false);
+    setAttribute(Qt::WA_DeleteOnClose, true);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
     QTextEdit *helpText = new QTextEdit(this);
@@ -39,8 +43,8 @@ HelpDialog::HelpDialog(QWidget *parent) : QDialog(parent)
     layout->addWidget(helpText);
 
     QFile tenmonText(":/help");
-    tenmonText.open(QIODevice::ReadOnly);
-    helpText->setHtml(tenmonText.readAll());
+    if(tenmonText.open(QIODevice::ReadOnly))
+        helpText->setHtml(tenmonText.readAll());
 }
 
 QString getVersion()

src/batchprocessing.cpp

@@ -10,10 +10,14 @@
 #include <QMessageBox>
 #include <QDesktopServices>
 #include <QInputDialog>
+#include <QChart>
+#include <QChartView>
+#include <QLineSeries>
+#include <QCompleter>
 #include "scriptengine.h"
+#include "chartgraph.h"
 
 #ifdef Q_OS_LINUX
-#include <QCloseEvent>
 #include <QDBusConnection>
 #include <QDBusMessage>
 #endif
@@ -67,7 +71,8 @@ void BatchProcessing::scanScriptDir()
     if(idx>=0)_ui->scriptsList->setCurrentRow(idx);
 }
 
-BatchProcessing::BatchProcessing(QWidget *parent) : QDialog(parent)
+BatchProcessing::BatchProcessing(Database *database, QWidget *parent) : QDialog(parent)
+    , _database(database)
 {
     _ui = new Ui::BatchProcessing;
     _ui->setupUi(this);
@@ -93,17 +98,43 @@ BatchProcessing::BatchProcessing(QWidget *parent) : QDialog(parent)
         qWarning() << "Failed to get app data location";
     }
 
-    connect(_ui->addFilesButton, &QPushButton::released, this, &BatchProcessing::addFiles);
-    connect(_ui->addDirButton, &QPushButton::released, this, &BatchProcessing::addDir);
+    connect(_ui->addFilesButton, &QPushButton::released, this, static_cast<void (BatchProcessing::*)()>(&BatchProcessing::addFiles));
+    connect(_ui->addDirButton, &QPushButton::released, this, static_cast<void (BatchProcessing::*)()>(&BatchProcessing::addDir));
+    connect(_ui->addMarkedButton, &QPushButton::released, this, &BatchProcessing::addMarked);
     connect(_ui->removeButton, &QPushButton::released, this, &BatchProcessing::removePath);
     connect(_ui->removeAllButton, &QPushButton::released, this, &BatchProcessing::removeAllPaths);
-    connect(_ui->startButton, &QPushButton::released, this, &BatchProcessing::runScript);
+    connect(_ui->startButton, &QPushButton::released, this, static_cast<void (BatchProcessing::*)()>(&BatchProcessing::runScript));
     connect(_ui->stopButton, &QPushButton::released, this, &BatchProcessing::stopScript);
     connect(_ui->browseButton, &QPushButton::released, this, &BatchProcessing::browse);
     connect(_ui->openScriptsButton, &QPushButton::released, this, &BatchProcessing::openScriptDir);
 
     _textColor = _ui->log->palette().text().color();
 
+    _engine = new Script::ScriptEngine(_database, this);
+    connect(_engine, &Script::ScriptEngine::newMessage, this, &BatchProcessing::newMessage);
+
+    _completerModel = new QStringListModel(this);
+    _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;
     _ui->outputPath->setText(settings.value("batchprocessing/outputpath", QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).first()).toString());
 }
@@ -116,6 +147,17 @@ BatchProcessing::~BatchProcessing()
     delete _ui;
 }
 
+void BatchProcessing::setOutputDir(const QString &output)
+{
+    _ui->outputPath->setText(output);
+}
+
+void BatchProcessing::setPaths(const QStringList &paths)
+{
+    _ui->pathsList->addItems(paths);
+    refreshPaths();
+}
+
 void BatchProcessing::closeEvent(QCloseEvent *event)
 {
     if(_engineThread)
@@ -137,6 +179,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(), QString());
+}
+
 void BatchProcessing::addFiles()
 {
     QSettings settings;
@@ -146,6 +197,7 @@ void BatchProcessing::addFiles()
         _ui->pathsList->addItems(files);
         settings.setValue("batchprocessing/inputpath", QFileInfo(files.first()).absolutePath());
     }
+    refreshPaths();
 }
 
 void BatchProcessing::addDir()
@@ -157,17 +209,32 @@ void BatchProcessing::addDir()
         _ui->pathsList->addItem(dir);
         settings.setValue("batchprocessing/inputpath", dir);
     }
+    refreshPaths();
+}
+
+void BatchProcessing::addMarked()
+{
+    QStringList files = _database->getMarkedFiles();
+    for(const QString &file : files)
+    {
+        QFileInfo info(file);
+        if(info.exists() && info.isReadable())
+            _ui->pathsList->addItem(file);
+    };
+    refreshPaths();
 }
 
 void BatchProcessing::removePath()
 {
     for(auto &item : _ui->pathsList->selectedItems())
         delete item;
+    refreshPaths();
 }
 
 void BatchProcessing::removeAllPaths()
 {
     _ui->pathsList->clear();
+    refreshPaths();
 }
 
 void BatchProcessing::browse()
@@ -179,19 +246,7 @@ void BatchProcessing::browse()
 
 void BatchProcessing::openScriptDir()
 {
-#ifdef Q_OS_LINUX
-    QDBusConnection con = QDBusConnection::sessionBus();
-    QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.FileManager1", "/org/freedesktop/FileManager1", "org.freedesktop.FileManager1", "ShowFolders");
-    QList<QVariant> args = {QStringList(QUrl::fromLocalFile(_scriptBasePath).toString()), QString()};
-    message.setArguments(args);
-    con.call(message);
-#endif
-#ifdef Q_OS_WINDOWS
-    QProcess::startDetached("explorer.exe", {QDir::toNativeSeparators(_scriptBasePath)});
-#endif
-#ifdef Q_OS_MACOS
-    QDesktopServices::openUrl(QUrl::fromLocalFile(_scriptBasePath));
-#endif
+    openDir(_scriptBasePath);
 }
 
 void BatchProcessing::runScript()
@@ -200,12 +255,9 @@ void BatchProcessing::runScript()
     auto selectedItems = _ui->scriptsList->selectedItems();
     if(selectedItems.size())
     {
-        _engineThread = new Script::ScriptEngineThread(this);
+        _engineThread = new Script::ScriptEngineThread(_database, this);
         connect(_engineThread, &Script::ScriptEngineThread::newMessage, this, &BatchProcessing::newMessage);
         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());
         if(outDir.exists() && outDir.isWritable())
@@ -216,7 +268,7 @@ void BatchProcessing::runScript()
             else
                 script = ":/scripts/" + script;
 
-            _engineThread->setParams(script, scanDirectories(paths), _ui->outputPath->text());
+            _engineThread->setParams(script, _paths, _ui->outputPath->text(), QString());
             _engineThread->start();
             _ui->startButton->setEnabled(false);
             _ui->stopButton->setEnabled(true);
@@ -224,6 +276,35 @@ void BatchProcessing::runScript()
         else
         {
             QMessageBox::warning(this, tr("Invalid output directory"), tr("Output directory path doesn't exist or is not writable"));
+            delete _engineThread;
+            _engineThread = nullptr;
+        }
+    }
+}
+
+void BatchProcessing::runScript(const QString &script, const QString &arg, bool exit)
+{
+    _ui->log->clear();
+    {
+        _engineThread = new Script::ScriptEngineThread(_database, this);
+        connect(_engineThread, &Script::ScriptEngineThread::newMessage, this, &BatchProcessing::newMessage);
+        connect(_engineThread, &Script::ScriptEngineThread::newMessage, this, &BatchProcessing::newMessageCli);
+        connect(_engineThread, &Script::ScriptEngineThread::finished, this, &BatchProcessing::scriptFinished);
+        if(exit)connect(_engineThread, &Script::ScriptEngineThread::finished, this, &BatchProcessing::accept);
+
+        QFileInfo outDir(_ui->outputPath->text());
+        if(outDir.exists() && outDir.isWritable())
+        {
+            _engineThread->setParams(script, _paths, _ui->outputPath->text(), arg);
+            _engineThread->start();
+            _ui->startButton->setEnabled(false);
+            _ui->stopButton->setEnabled(true);
+        }
+        else
+        {
+            QMessageBox::warning(this, tr("Invalid output directory"), tr("Output directory path doesn't exist or is not writable"));
+            delete _engineThread;
+            _engineThread = nullptr;
         }
     }
 }
@@ -251,6 +332,14 @@ void BatchProcessing::newMessage(const QString &message, bool error)
     _ui->log->append(message);
 }
 
+void BatchProcessing::newMessageCli(const QString &message, bool error)
+{
+    if(error)
+        qWarning() << message;
+    else
+        qDebug() << message;
+}
+
 QJSValue BatchProcessing::getString(const QString &label, const QString &text)
 {
     bool ok = false;
@@ -278,3 +367,107 @@ QJSValue BatchProcessing::getItem(const QStringList &items, const QString &label
     QString ret = QInputDialog::getItem(this, tr("Select item"), label, items, current, false, &ok);
     return ok ? ret : QJSValue();
 }
+
+QJSValue BatchProcessing::question(const QString &question, const QStringList &buttons, const QString &title)
+{
+    QMessageBox::StandardButtons standardButtons = QMessageBox::NoButton;
+    if(buttons.contains("ok"))standardButtons |= QMessageBox::Ok;
+    if(buttons.contains("yes"))standardButtons |= QMessageBox::Yes;
+    if(buttons.contains("no"))standardButtons |= QMessageBox::No;
+    if(buttons.contains("yesall"))standardButtons |= QMessageBox::YesToAll;
+    if(buttons.contains("noall"))standardButtons |= QMessageBox::NoToAll;
+    if(buttons.contains("abort"))standardButtons |= QMessageBox::Abort;
+    if(buttons.contains("retry"))standardButtons |= QMessageBox::Retry;
+    if(buttons.contains("ignore"))standardButtons |= QMessageBox::Ignore;
+    if(buttons.contains("cancel"))standardButtons |= QMessageBox::Cancel;
+    if(buttons.contains("discard"))standardButtons |= QMessageBox::Discard;
+    if(buttons.contains("apply"))standardButtons |= QMessageBox::Apply;
+    if(buttons.contains("reset"))standardButtons |= QMessageBox::Reset;
+    if(standardButtons == QMessageBox::NoButton)standardButtons = QMessageBox::Ok;
+
+    QMessageBox::StandardButton button = QMessageBox::question(this, title, question, standardButtons);
+    QJSValue ret;
+    switch(button)
+    {
+    default:
+    case QMessageBox::Ok: ret = "ok"; break;
+    case QMessageBox::Yes: ret = "yes";  break;
+    case QMessageBox::No: ret = "no"; break;
+    case QMessageBox::YesToAll: ret = "yesall"; break;
+    case QMessageBox::NoToAll: ret = "noall"; break;
+    case QMessageBox::Abort: ret = "abort"; break;
+    case QMessageBox::Retry: ret = "retry"; break;
+    case QMessageBox::Ignore: ret = "ignore"; break;
+    case QMessageBox::Cancel: ret = "cancel"; break;
+    case QMessageBox::Discard: ret = "discard"; break;
+    case QMessageBox::Apply: ret = "apply"; break;
+    case QMessageBox::Reset: ret = "reset"; break;
+    }
+
+    return ret;
+}
+
+void BatchProcessing::plot(const QVariant &graph)
+{
+    ChartGraph *chart = new ChartGraph(this);
+    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)
+{
+#ifdef Q_OS_LINUX
+    QDBusConnection con = QDBusConnection::sessionBus();
+    QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.FileManager1", "/org/freedesktop/FileManager1", "org.freedesktop.FileManager1", "ShowFolders");
+    QList<QVariant> args = {QStringList(QUrl::fromLocalFile(path).toString()), QString()};
+    message.setArguments(args);
+    con.call(message);
+#endif
+#ifdef Q_OS_WINDOWS
+    QProcess::startDetached("explorer.exe", {QDir::toNativeSeparators(path)});
+#endif
+#ifdef Q_OS_MACOS
+    QDesktopServices::openUrl(QUrl::fromLocalFile(path));
+#endif
+}

src/batchprocessing.h

@@ -3,10 +3,15 @@
 
 #include <QDialog>
 #include <QFileSystemWatcher>
+#include <QStringListModel>
+#include <QCompleter>
+#include <QLineEdit>
 #include "scriptengine.h"
 
 namespace Ui { class BatchProcessing; }
 
+class Database;
+
 class BatchProcessing : public QDialog
 {
     Q_OBJECT
@@ -14,30 +19,58 @@ class BatchProcessing : public QDialog
     QString _scriptBasePath;
     QFileSystemWatcher _fileWatcher;
     Script::ScriptEngineThread *_engineThread = nullptr;
+    Script::ScriptEngine *_engine = nullptr;
     QColor _textColor;
+    Database *_database;
+    QStringListModel *_completerModel = nullptr;
+    QCompleter *_completer = nullptr;
+    QList<QPair<QString, QString>> _paths;
 private slots:
     void scanScriptDir();
 public:
-    explicit BatchProcessing(QWidget *parent = nullptr);
+    explicit BatchProcessing(Database *database, QWidget *parent = nullptr);
     ~BatchProcessing();
+    void setOutputDir(const QString &output);
+    void setPaths(const QStringList &paths);
 protected:
     void closeEvent(QCloseEvent *event);
+    void refreshPaths();
 public slots:
     void addFiles();
     void addDir();
+    void addMarked();
     void removePath();
     void removeAllPaths();
     void browse();
     void openScriptDir();
     void runScript();
+    void runScript(const QString &script, const QString &arg, bool exit);
     void stopScript();
     void scriptFinished();
     void newMessage(const QString &message, bool error);
+    void newMessageCli(const QString &message, bool error);
 
     QJSValue getString(const QString &label, const QString &text);
     QJSValue getInt(const QString &label, int value);
     QJSValue getFloat(const QString &label, double value, int decimals);
     QJSValue getItem(const QStringList &items, const QString &label, int current);
+    QJSValue question(const QString &question, const QStringList &buttons, const QString &title = "");
+
+    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);
+
 #endif // BATCHPROCESSING_H

src/batchprocessing.ui

@@ -43,6 +43,9 @@
          <property name="text">
           <string>Add files</string>
          </property>
+         <property name="autoDefault">
+          <bool>false</bool>
+         </property>
         </widget>
        </item>
        <item>
@@ -50,6 +53,19 @@
          <property name="text">
           <string>Add directories</string>
          </property>
+         <property name="autoDefault">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="addMarkedButton">
+         <property name="text">
+          <string>Add marked</string>
+         </property>
+         <property name="autoDefault">
+          <bool>false</bool>
+         </property>
         </widget>
        </item>
        <item>
@@ -57,6 +73,9 @@
          <property name="text">
           <string>Remove</string>
          </property>
+         <property name="autoDefault">
+          <bool>false</bool>
+         </property>
         </widget>
        </item>
        <item>
@@ -64,6 +83,9 @@
          <property name="text">
           <string>Remove all</string>
          </property>
+         <property name="autoDefault">
+          <bool>false</bool>
+         </property>
         </widget>
        </item>
       </layout>
@@ -91,6 +113,9 @@
        <property name="text">
         <string>Browse</string>
        </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
       </widget>
      </item>
     </layout>
@@ -122,6 +147,9 @@
        <property name="text">
         <string>Open scripts</string>
        </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
       </widget>
      </item>
     </layout>
@@ -164,23 +192,30 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+      <widget class="ConsoleLine" name="consoleLineEdit">
+       <property name="placeholderText">
+        <string>Console</string>
        </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="executeButton">
+       <property name="text">
+        <string>Execute</string>
        </property>
-      </spacer>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+      </widget>
      </item>
      <item>
       <widget class="QPushButton" name="startButton">
        <property name="text">
         <string>Start script</string>
        </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
       </widget>
      </item>
      <item>
@@ -191,12 +226,8 @@
        <property name="text">
         <string>Stop script</string>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closeButton">
-       <property name="text">
-        <string>Close</string>
+       <property name="autoDefault">
+        <bool>false</bool>
        </property>
       </widget>
      </item>
@@ -204,23 +235,29 @@
    </item>
   </layout>
  </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/>
- <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>
+ <connections/>
 </ui>

src/chartgraph.cpp

@@ -0,0 +1,298 @@
+#include "chartgraph.h"
+#include <QChartView>
+#include <QVBoxLayout>
+#include <QLineSeries>
+#include <QBarSeries>
+#include <QBarSet>
+#include <QBarCategoryAxis>
+#include <QScatterSeries>
+#include <QMenu>
+#include <QMenuBar>
+#include <QValueAxis>
+#include <QFileDialog>
+#include <QSettings>
+#include <QToolBar>
+#include <QStyle>
+
+class ChartView : public QChartView
+{
+    QPointF _mousePos;
+    bool _scroll = false;
+public:
+    ChartView(QWidget *parent) : QChartView(parent)
+    {
+    }
+protected:
+    void keyPressEvent(QKeyEvent *event) override
+    {
+        if(!chart()->isZoomed())chart()->zoom(0.999999);//workaround so zoomReset() reset scroll
+        switch(event->key())
+        {
+        case Qt::Key_Plus:
+            chart()->zoomIn();
+            break;
+        case Qt::Key_Minus:
+            chart()->zoomOut();
+            break;
+        case Qt::Key_Left:
+            chart()->scroll(-10, 0);
+            break;
+        case Qt::Key_Right:
+            chart()->scroll(10, 0);
+            break;
+        case Qt::Key_Up:
+            chart()->scroll(0, 10);
+            break;
+        case Qt::Key_Down:
+            chart()->scroll(0, -10);
+            break;
+        default:
+            QGraphicsView::keyPressEvent(event);
+            break;
+        }
+    }
+    void mousePressEvent(QMouseEvent *event) override
+    {
+        if(event->button() == Qt::LeftButton)
+        {
+            _scroll = true;
+            if(!chart()->isZoomed())chart()->zoom(0.999999);//workaround so zoomReset() reset scroll
+            _mousePos = event->position();
+        }
+
+        QChartView::mousePressEvent(event);
+    }
+    void mouseMoveEvent(QMouseEvent *event) override
+    {
+        if(_scroll)
+        {
+            QPointF pos = event->position();
+            chart()->scroll(_mousePos.x() - pos.x(), pos.y() - _mousePos.y());
+            _mousePos = pos;
+        }
+        QChartView::mouseMoveEvent(event);
+    }
+    void mouseReleaseEvent(QMouseEvent *event) override
+    {
+        _scroll = false;
+        QChartView::mouseReleaseEvent(event);
+    }
+    void wheelEvent(QWheelEvent *event) override
+    {
+        if(event->angleDelta().y() > 0)
+            chart()->zoomIn();
+        if(event->angleDelta().y() < 0)
+            chart()->zoomOut();
+    }
+};
+
+ChartGraph::ChartGraph(QWidget *parent) : QMainWindow(parent)
+{
+    setAttribute(Qt::WA_DeleteOnClose);
+    setWindowTitle(tr("Chart"));
+
+    _chartView = new ChartView(this);
+    setCentralWidget(_chartView);
+
+    _chart = new QChart;
+    _chartView->setChart(_chart);
+    _chartView->setRenderHint(QPainter::Antialiasing);
+    resize(1024, 768);
+
+    menuBar()->addAction(tr("Save"), this, &ChartGraph::save);
+    menuBar()->addAction(tr("Reset view"), [this](){ _chart->zoomReset(); });
+}
+
+void ChartGraph::plot(const QVariant &graph)
+{
+    QVariantMap map = graph.toMap();
+
+    _chart->setTitle(map["title"].toString());
+    if(map.contains("legend"))
+    {
+        QVariantMap legend = map["legend"].toMap();
+        if(legend.contains("visible"))
+            _chart->legend()->setVisible(legend["visible"].toBool());
+
+        QString align = legend["align"].toString();
+        if(align == "top")
+            _chart->legend()->setAlignment(Qt::AlignTop);
+        else if(align == "left")
+            _chart->legend()->setAlignment(Qt::AlignLeft);
+        else if(align == "bottom")
+            _chart->legend()->setAlignment(Qt::AlignBottom);
+        else if(align == "right")
+            _chart->legend()->setAlignment(Qt::AlignRight);
+    }
+
+    QBarSeries *barSeries = nullptr;
+
+    qreal minX = INFINITY;
+    qreal maxX = -INFINITY;
+    qreal minY = INFINITY;
+    qreal maxY = -INFINITY;
+    qreal minY2 = INFINITY;
+    qreal maxY2 = -INFINITY;
+
+    QValueAxis *xaxis = new QValueAxis(_chart);
+    QBarCategoryAxis *barxaxis = new QBarCategoryAxis(_chart);
+    QValueAxis *yaxis = new QValueAxis(_chart);
+    QValueAxis *y2axis = new QValueAxis(_chart);
+    _chart->addAxis(xaxis, Qt::AlignBottom);
+    _chart->addAxis(yaxis, Qt::AlignLeft);
+    _chart->addAxis(y2axis, Qt::AlignRight);
+    _chart->addAxis(barxaxis, Qt::AlignBottom);
+    y2axis->setGridLinePen(Qt::DashDotLine);
+
+    for(auto s : map["series"].toList())
+    {
+        QVariantMap serie = s.toMap();
+        QString type = serie["type"].toString();
+        bool y2 = serie["y2"].toBool();
+
+        if(type == "line" || type == "points" || type == "linePoints" || type.isEmpty())
+        {
+            QXYSeries *series = nullptr;
+            if(type == "points")
+            {
+                QScatterSeries *scatter = new QScatterSeries(_chart);
+                series = scatter;
+                QString shape = serie["shape"].toString();
+                if(shape == "circle")scatter->setMarkerShape(QScatterSeries::MarkerShapeCircle);
+                else if(shape == "rectangle")scatter->setMarkerShape(QScatterSeries::MarkerShapeRectangle);
+                else if(shape == "triangle")scatter->setMarkerShape(QScatterSeries::MarkerShapeTriangle);
+                else if(shape == "star")scatter->setMarkerShape(QScatterSeries::MarkerShapeStar);
+                else if(shape == "pentagon")scatter->setMarkerShape(QScatterSeries::MarkerShapePentagon);
+            }
+            else
+            {
+                series = new QLineSeries(_chart);
+            }
+
+            series->setName(serie["title"].toString());
+            QVariantList x = serie["x"].toList();
+            QVariantList y = serie["y"].toList();
+            if(x.isEmpty())
+            {
+                for(int i = 0; i < y.size(); i++)
+                {
+                    qreal val = y[i].toDouble();
+                    if(y2)
+                    {
+                        minY2 = std::min(minY2, val);
+                        maxY2 = std::max(maxY2, val);
+                    }
+                    else
+                    {
+                        minY = std::min(minY, val);
+                        maxY = std::max(maxY, val);
+                    }
+                    series->append(i, val);
+                }
+                minX = std::min(minX, 0.0);
+                maxX = std::max(maxX, y.size() - 1.0);
+            }
+            else
+            {
+                int size = std::min(x.size(), y.size());
+                for(int i = 0; i < size; i++)
+                {
+                    qreal val = y[i].toDouble();
+                    if(y2)
+                    {
+                        minY2 = std::min(minY2, val);
+                        maxY2 = std::max(maxY2, val);
+                    }
+                    else
+                    {
+                        minY = std::min(minY, val);
+                        maxY = std::max(maxY, val);
+                    }
+                    minX = std::min(minX, x[i].toDouble());
+                    maxX = std::max(maxX, x[i].toDouble());
+                    series->append(x[i].toDouble(), val);
+                }
+            }
+
+            _chart->addSeries(series);
+            series->attachAxis(xaxis);
+            series->attachAxis(y2 ? y2axis : yaxis);
+
+            if(serie.contains("color"))
+            {
+                QString color = serie["color"].toString();
+                if(QColor::isValidColorName(color))series->setColor(QColor::fromString(color));
+            }
+
+            if(serie["bestFit"].toBool())
+            {
+                series->setBestFitLineVisible(true);
+                QPen pen = series->bestFitLinePen();
+                pen.setColor(series->color());
+                pen.setStyle(Qt::DashLine);
+                series->setBestFitLinePen(pen);
+            }
+
+            if(type == "linePoints")
+                series->setPointsVisible(true);
+
+        }
+        else if(type == "bar")
+        {
+            if(!barSeries)
+            {
+                barSeries = new QBarSeries(_chart);
+                _chart->addSeries(barSeries);
+                barSeries->attachAxis(yaxis);
+                barSeries->attachAxis(barxaxis);
+            }
+            QBarSet *set = new QBarSet(serie["title"].toString());
+            QVariantList y = serie["y"].toList();
+            for(int i = 0; i < y.size(); i++)
+            {
+                qreal val = y[i].toDouble();
+                minY = std::min(minY, val);
+                maxY = std::max(maxY, val);
+                set->append(val);
+            }
+
+            barSeries->append(set);
+            for(int i = barxaxis->count() + 1; i <= y.size(); i++)
+                barxaxis->append(QString::number(i));
+
+            if(serie.contains("color"))
+            {
+                QString color = serie["color"].toString();
+                if(QColor::isValidColorName(color))set->setColor(QColor::fromString(color));
+            }
+        }
+    }
+
+    if(barSeries)
+    {
+        xaxis->setRange(std::min(minX, -0.5), std::max(maxX, barxaxis->count() - 0.5));
+        minY = std::min(minY, 0.0);
+    }
+    else
+    {
+        xaxis->setRange(minX, maxX);
+    }
+
+    yaxis->setRange(minY, maxY);
+    y2axis->setRange(minY2, maxY2);
+
+    show();
+}
+
+void ChartGraph::save()
+{
+    QSettings settings;
+    QString dir = settings.value("mainwindow/lastdir").toString();
+    QString output = QFileDialog::getSaveFileName(this, tr("Save as"), dir, "PNG (*.png)");
+
+    if(!output.isEmpty())
+    {
+        QPixmap graph = _chartView->grab();
+        graph.toImage().save(output);
+    }
+}

src/chartgraph.h

@@ -0,0 +1,22 @@
+#ifndef CHARTGRAPH_H
+#define CHARTGRAPH_H
+
+#include <QMainWindow>
+#include <QJSValue>
+#include <QChart>
+
+class ChartView;
+
+class ChartGraph : public QMainWindow
+{
+    Q_OBJECT
+    QChart *_chart;
+    ChartView *_chartView;
+public:
+    explicit ChartGraph(QWidget *parent = nullptr);
+    void plot(const QVariant &graph);
+public slots:
+    void save();
+};
+
+#endif // CHARTGRAPH_H

src/database.cpp

@@ -15,11 +15,30 @@ bool Database::init(const QLatin1String &connectionName)
     QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
     QDir dir(path);
 
-    QSqlDatabase database = QSqlDatabase::addDatabase("QSQLITE", connectionName);
+    database = QSqlDatabase::addDatabase("QSQLITE", connectionName);
+    ngc = QSqlDatabase::addDatabase("QSQLITE", connectionName + "ngc");
 
     if(!dir.mkpath("."))
         return false;
 
+    if(ngc.isValid())
+    {
+        QString ngcDb = dir.absoluteFilePath("ngc.db");
+        if(!QFile::exists(ngcDb))
+            QFile::copy(":/ngc.db", ngcDb);
+
+        ngc.setDatabaseName(ngcDb);
+        if(ngc.open())
+        {
+            m_getNgc = QSqlQuery(ngc);
+            m_getNgc.prepare("SELECT *,IIF(V_Mag IS NULL, B_Mag, V_Mag) AS mag FROM ngc WHERE RA_deg BETWEEN ? AND ? AND DEC_deg BETWEEN ? AND ?");
+        }
+        else
+        {
+            qWarning() << "Could not open NGC database";
+        }
+    }
+
     if(database.isValid())
     {
         database.setDatabaseName(dir.absoluteFilePath("database2.db"));
@@ -27,7 +46,7 @@ bool Database::init(const QLatin1String &connectionName)
         {
             QSqlQuery query(database);
             query.exec("PRAGMA foreign_keys = ON");
-            int version = checkVersion();
+            int version = checkVersion(database);
             if(version == 0)
             {
                 query.exec("PRAGMA user_version = 1");
@@ -42,10 +61,17 @@ bool Database::init(const QLatin1String &connectionName)
                 query.exec("CREATE INDEX IF NOT EXISTS maxRa_idx ON fits_files(maxRa)");
                 query.exec("CREATE INDEX IF NOT EXISTS minDec_idx ON fits_files(minDec)");
                 query.exec("CREATE INDEX IF NOT EXISTS maxDec_idx ON fits_files(maxDec)");
+                version = 1;
             }
-            else if(version > 1)
+            if(version == 1)
             {
-                qDebug() << "Database version is too new";
+                query.exec("CREATE INDEX IF NOT EXISTS id_file_key ON fits_headers(id_file, key)");
+                query.exec("PRAGMA user_version = 2");
+                version = 2;
+            }
+            if(version > 2)
+            {
+                qWarning() << "Database version is too new";
                 return false;
             }
 
@@ -74,8 +100,16 @@ bool Database::init(const QLatin1String &connectionName)
                 m_deleteFile.prepare("DELETE FROM fits_files WHERE id=?");
                 return true;
             }
-            qDebug() << error.text();
+            qWarning() << error.text();
         }
+        else
+        {
+            qWarning() << "Failed to open database" << connectionName;
+        }
+    }
+    else
+    {
+        qWarning() << "Database is invalid";
     }
     return false;
 }
@@ -141,21 +175,20 @@ bool Database::checkError(QSqlQuery &query)
         return true;
     else
     {
-        qDebug() << error.text();
+        qWarning() << error.text();
         return false;
     }
 }
 
-int Database::checkVersion()
+int Database::checkVersion(QSqlDatabase &db)
 {
-    QSqlDatabase db = QSqlDatabase::database();
-    QSqlQuery query("PRAGMA user_version");
+    QSqlQuery query("PRAGMA user_version", db);
     if(query.next())
         return query.value(0).toInt();
     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)
 {
@@ -175,7 +208,6 @@ void Database::indexDir(const QDir &dir, QProgressDialog *progress)
     QStringList scannedDirs;
     int count = countFiles(dir, scannedDirs);
     progress->setMaximum(count);
-    QSqlDatabase database = QSqlDatabase::database();
     database.transaction();
 
     scannedDirs.clear();
@@ -193,7 +225,6 @@ void Database::indexDir(const QDir &dir, QProgressDialog *progress)
 void Database::reindex(QProgressDialog *progress)
 {
     QVariantList deleteids;
-    QSqlDatabase database = QSqlDatabase::database();
     database.transaction();
     QSqlQuery size("SELECT COUNT(*) FROM fits_files", database);
     size.next();
@@ -232,6 +263,62 @@ QStringList Database::getFitsKeywords()
     return keywords;
 }
 
+QVector<SkyObject> Database::getObjects(double minRa, double maxRa, double minDec, double maxDec)
+{
+    QVector<SkyObject> objects;
+    if(!ngc.isOpen())return objects;
+
+    m_getNgc.bindValue(0, minRa);
+    m_getNgc.bindValue(1, maxRa);
+    m_getNgc.bindValue(2, minDec);
+    m_getNgc.bindValue(3, maxDec);
+
+    if(m_getNgc.exec())
+    {
+        while(m_getNgc.next())
+        {
+            QString name;
+            QString name2;
+            QString m = m_getNgc.value("M").toString();
+            QString ic = m_getNgc.value("IC").toString();
+            if(!m.isEmpty())
+            {
+                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({
+                name,
+                name2,
+                {m_getNgc.value("RA_deg").toDouble(), m_getNgc.value("DEC_deg").toDouble()},
+                m_getNgc.value("MajAx").toDouble(),
+                m_getNgc.value("MinAx").toDouble(),
+                m_getNgc.value("PosAng").toDouble(),
+                m_getNgc.value("mag").isNull() ? NAN : m_getNgc.value("mag").toDouble(),
+                {0, 0},
+            });
+        }
+    }
+    return objects;
+}
+
+const QSqlDatabase &Database::db() const
+{
+    return database;
+}
+
 bool Database::indexDir2(const QDir &dir, QProgressDialog *progress, QStringList &scannedDirs)
 {
     if(scannedDirs.contains(dir.canonicalPath()))return true;
@@ -272,10 +359,10 @@ bool Database::indexFile(const QFileInfo &file)
         }
     }
 
-    bool ok;
-    if(filePath.endsWith(".xisf", Qt::CaseInsensitive))
+    bool ok = false;
+    if(isXISF(file.suffix()))
         ok = readXISFHeader(filePath, info);
-    else
+    else if(isFITS(file.suffix()))
         ok = readFITSHeader(filePath, info);
 
     qlonglong last_id = -1;
@@ -296,7 +383,7 @@ bool Database::indexFile(const QFileInfo &file)
             m_insertFileWcs.bindValue(7, crVal2);
             if(!m_insertFileWcs.exec())
             {
-                qDebug() << "Database error" << m_insertFileWcs.lastError();
+                qWarning() << "Database error" << m_insertFileWcs.lastError();
                 return false;
             }
             last_id = m_insertFileWcs.lastInsertId().toLongLong();
@@ -307,7 +394,7 @@ bool Database::indexFile(const QFileInfo &file)
             m_insertFile.bindValue(1, mtime);
             if(!m_insertFile.exec())
             {
-                qDebug() << "Database error" << m_insertFile.lastError();
+                qWarning() << "Database error" << m_insertFile.lastError();
                 return false;
             }
             last_id = m_insertFile.lastInsertId().toLongLong();
@@ -316,6 +403,7 @@ bool Database::indexFile(const QFileInfo &file)
         QVariantList file_id, keys, values, comments;
         for(const auto &record : info.fitsHeader)
         {
+            if(record.xisf && record.key.startsWith("PCL:"))continue;
             file_id << last_id;
             keys << QString(record.key);
             values << record.value.toString();
@@ -327,7 +415,7 @@ bool Database::indexFile(const QFileInfo &file)
         m_insertFitsHeader.bindValue(3, comments);
         if(!m_insertFitsHeader.execBatch())
         {
-            qDebug() << "Database error" << m_insertFitsHeader.lastError();
+            qWarning() << "Database error" << m_insertFitsHeader.lastError();
             return false;
         }
     }

src/database.h

@@ -6,10 +6,13 @@
 #include <QSqlQuery>
 #include <QDir>
 #include <QProgressDialog>
+#include "imageinfodata.h"
 
 class Database : public QObject
 {
     Q_OBJECT
+    QSqlDatabase database;
+    QSqlDatabase ngc;
     QSqlQuery m_markQuery;
     QSqlQuery m_unmarkQuery;
     QSqlQuery m_isMarkedQuery;
@@ -21,6 +24,8 @@ class Database : public QObject
     QSqlQuery m_headerKeywords;
     QSqlQuery m_deleteFile;
 
+    QSqlQuery m_getNgc;
+
     int m_progress;
 public:
     explicit Database(QObject *parent = 0);
@@ -36,11 +41,13 @@ public:
     void indexDir(const QDir &dir, QProgressDialog *progress);
     void reindex(QProgressDialog *progress);
     QStringList getFitsKeywords();
+    QVector<SkyObject> getObjects(double minRa, double maxRa, double minDec, double maxDec);
+    const QSqlDatabase& db() const;
 protected:
     bool indexDir2(const QDir &dir, QProgressDialog *progress, QStringList &scannedDirs);
     bool indexFile(const QFileInfo &file);
     bool checkError(QSqlQuery &query);
-    int checkVersion();
+    int checkVersion(QSqlDatabase &db);
 signals:
     void databaseChanged();
 };

src/databasetree.cpp

@@ -0,0 +1,591 @@
+#include "databasetree.h"
+
+#include "database.h"
+#include "databaseview.h"
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QPushButton>
+#include <QSettings>
+#include <QSqlError>
+#include <QStackedWidget>
+#include <QVBoxLayout>
+
+DatabaseTreeSettings::DatabaseTreeSettings(const QStringList &data, QStringList keywords, QWidget *parent) : QDialog(parent)
+{
+    setWindowTitle(tr("Add tree grouping"));
+    QVBoxLayout *vlayout = new QVBoxLayout(this);
+    setLayout(vlayout);
+
+    QStringList key = data[0].split('/');
+
+    qsizetype dateobsindex = keywords.indexOf("DATE-OBS");
+    if(dateobsindex != -1)
+    {
+        keywords.insert(dateobsindex + 1, "DATE-OBS_YEAR-MONTH-DAY");
+        keywords.insert(dateobsindex + 1, "DATE-OBS_YEAR-MONTH");
+        keywords.insert(dateobsindex + 1, "DATE-OBS_YEAR");
+    }
+
+    for(int i = 0; i < 10; i++)
+    {
+        QComboBox *comboxBox = new QComboBox(this);
+        comboxBox->addItem("");
+        comboxBox->addItems(keywords);
+        vlayout->addWidget(comboxBox);
+        _keywordsSelect.append(comboxBox);
+        if(i < key.size() && keywords.contains(key[i]))
+            comboxBox->setCurrentText(key[i]);
+    }
+
+    vlayout->addWidget(new QLabel(tr("Aggregate function"), this));
+    _aggregateFunction = new QComboBox(this);
+    _aggregateFunction->addItems({"", "SUM", "COUNT", "AVG", "MIN", "MAX", "MEDIAN"});
+    vlayout->addWidget(_aggregateFunction);
+    _aggregateFunction->setToolTip(tr("This aggregate function will be applied to last level of grouping"));
+    _aggregateFunction->setCurrentText(data[1]);
+
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &DatabaseTreeSettings::acceptButton);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &DatabaseTreeSettings::reject);
+    vlayout->addWidget(buttonBox);
+}
+
+QString DatabaseTreeSettings::keywords() const
+{
+    QStringList keywords;
+    for(QComboBox *box : _keywordsSelect)
+    {
+        if(box->currentIndex() > 0)
+            keywords.append(box->currentText());
+    }
+    return keywords.join('/');
+}
+
+QString DatabaseTreeSettings::aggregrationFunc() const
+{
+    return _aggregateFunction->currentText();
+}
+
+void DatabaseTreeSettings::acceptButton()
+{
+    for(QComboBox *box : _keywordsSelect)
+    {
+        if(box->currentIndex() > 0)
+        {
+            QDialog::accept();
+            return;
+        }
+    }
+    QDialog::reject();
+}
+
+class TreeNode
+{
+public:
+    TreeNode() = default;
+    TreeNode(TreeNode *parent, const QVariant value, int level)
+        :_parent(parent)
+        ,_value(value)
+        ,_level(level)
+    {}
+    const TreeNode* child(size_t idx) const
+    {
+        if(idx >= 0 && idx < _children.size())
+            return _children[idx].get();
+        return nullptr;
+    }
+    TreeNode* child(size_t idx)
+    {
+        if(idx >= 0 && idx < _children.size())
+            return _children[idx].get();
+        return nullptr;
+    }
+    TreeNode* parent() const
+    {
+        return _parent;
+    }
+    int row() const
+    {
+        if(_parent)
+            return _parent->indexOf(this);
+        return 0;
+    }
+    int childCount() const
+    {
+        if(!_init)return 1;
+        return _children.size();
+    }
+    const QVariant& value() const
+    {
+        return _value;
+    }
+    void fill(const QVariantList &list)
+    {
+        _init = true;
+        for(auto &item : list)
+            _children.push_back(std::make_unique<TreeNode>(this, item, _level + 1));
+    }
+    bool filled() const
+    {
+        return _init;
+    }
+    int level() const
+    {
+        return _level;
+    }
+private:
+    int indexOf(const TreeNode *child) const
+    {
+        auto f = [child](const std::unique_ptr<TreeNode> &i){ return i.get() == child; };
+        auto it = std::find_if(_children.begin(), _children.end(), f);
+        if(it != _children.end())return std::distance(_children.begin(), it);
+        return -1;
+    }
+    TreeNode *_parent = nullptr;
+    QVariant _value;
+    std::vector<std::unique_ptr<TreeNode>> _children;
+    bool _init = false;
+    int _level = 0;
+};
+
+DatabaseTree::DatabaseTree(Database *database, QObject *parent) : QAbstractItemModel(parent)
+    ,_database(database)
+{
+    _italicFont.setItalic(true);
+}
+
+void DatabaseTree::setKeys(const QStringList &keys)
+{
+    _keys = keys;
+    if(!_loaded)return;
+    beginResetModel();
+    prepareQueries();
+    _rootNode = std::make_unique<TreeNode>();
+    fillNode(_rootNode.get());
+    endResetModel();
+}
+
+QStringList DatabaseTree::keys() const
+{
+    return _keys;
+}
+
+QModelIndex DatabaseTree::index(int row, int column, const QModelIndex &parent) const
+{
+    if(!hasIndex(row, column, parent))
+        return QModelIndex();
+
+    TreeNode *node;
+
+    if(!parent.isValid())
+        node = _rootNode.get();
+    else
+        node = static_cast<TreeNode*>(parent.internalPointer());
+
+    if(node)
+    {
+        TreeNode *child = node->child(row);
+        if(child)return createIndex(row, column, child);
+    }
+
+    return QModelIndex();
+}
+
+QModelIndex DatabaseTree::parent(const QModelIndex &index) const
+{
+    if(!index.isValid())
+        return QModelIndex();
+
+    TreeNode *childNode = static_cast<TreeNode*>(index.internalPointer());
+    const TreeNode *parentNode = childNode->parent();
+
+    if (parentNode == _rootNode.get())
+        return QModelIndex();
+
+    return createIndex(parentNode->row(), 0, parentNode);
+}
+
+int DatabaseTree::rowCount(const QModelIndex &index) const
+{
+    if(index.column() > 0)return 0;
+
+    TreeNode *node;
+    if(!index.isValid())
+        node = _rootNode.get();
+    else
+        node = static_cast<TreeNode*>(index.internalPointer());
+
+    if(node && node->level() <= _keys.size())
+        return node->childCount();
+
+    return 0;
+}
+
+int DatabaseTree::columnCount(const QModelIndex &index) const
+{
+    Q_UNUSED(index);
+    return 1;
+}
+
+QVariant DatabaseTree::data(const QModelIndex &index, int role) const
+{
+    if(!index.isValid())
+        return QVariant();
+
+    TreeNode *node = static_cast<TreeNode*>(index.internalPointer());
+    if(node == nullptr)
+        return QVariant();
+
+    switch(role)
+    {
+    case Qt::FontRole:
+    {
+        if(node->value().toString().isNull())
+            return _italicFont;
+        return QVariant();
+    }
+    case Qt::DisplayRole:
+    {
+        QString str = node->value().toString();
+        if(str.isNull())return "NULL";
+        else return str;
+    }
+    default:
+        return QVariant();
+    }
+}
+
+bool DatabaseTree::canFetchMore(const QModelIndex &parent) const
+{
+    if(!parent.isValid())
+        return false;
+
+    TreeNode *node = static_cast<TreeNode*>(parent.internalPointer());
+    //qDebug() << "Can Fetch more" << node->value();
+    if(node)
+        return !node->filled();
+    return false;
+}
+
+void DatabaseTree::fetchMore(const QModelIndex &parent)
+{
+    if(!parent.isValid())
+        return;
+
+    TreeNode *node = static_cast<TreeNode*>(parent.internalPointer());
+    //qDebug() << "Fetch more" << node->value();
+    if(node)
+    {
+        fillNode(node);
+
+        if(node->childCount() > 0)
+        {
+            beginInsertRows(parent, 0, node->childCount() - 1);
+            endInsertRows();
+        }
+    }
+}
+
+QVariant DatabaseTree::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if(orientation == Qt::Horizontal && role == Qt::DisplayRole && section == 0)
+        return _keys.join('/');
+    return QVariant();
+}
+
+void DatabaseTree::load()
+{
+    if(!_loaded)
+    {
+        _loaded = true;
+        setKeys(_keys);
+    }
+}
+
+QSqlQuery DatabaseTree::getGroupQuery(const QString &aggregateFunc) const
+{
+    QStringList cols;
+    QString join;
+    QString sum;
+
+    for(int i = 0; i < _keys.size(); i++)
+    {
+        join += QString(" LEFT JOIN fits_headers AS h%1 ON f.id = h%1.id_file AND h%1.key = ?").arg(i);
+        if(_keys[i] == "DATE-OBS_YEAR")
+            cols.append(QString("STRFTIME('%Y', h%1.value)").arg(i));
+        else if(_keys[i] == "DATE-OBS_YEAR-MONTH")
+            cols.append(QString("STRFTIME('%Y-%m', h%1.value)").arg(i));
+        else if(_keys[i] == "DATE-OBS_YEAR-MONTH-DAY")
+            cols.append(QString("STRFTIME('%Y-%m-%d', h%1.value)").arg(i));
+        else
+            cols.append(QString("h%1.value").arg(i));
+
+        if(i == _keys.size() - 1)
+        {
+            QString tmp = aggregateFunc + "(" + cols.last() + ")";
+            if(aggregateFunc == "COUNT")
+                cols.append("COUNT(*)");
+            else
+                cols.last() = tmp;
+        }
+    }
+
+    QStringList group = cols;
+    group.removeLast();
+    QString sql = "SELECT " + cols.join(',') + " FROM fits_files AS f" + join + " GROUP BY " + group.join(',') + " ORDER BY " + cols.join(" NULLS LAST,") + " NULLS LAST";
+
+    QSqlQuery query(sql, _database->db());
+    for(auto &val : _keys)
+    {
+        if(val.startsWith("DATE-OBS_"))
+            query.addBindValue("DATE-OBS");
+        else
+            query.addBindValue(val);
+    }
+
+    qDebug() << "Group query" << sql;
+    if(!query.exec())
+        qWarning() << "Group query failed" << query.lastError();
+
+    return query;
+}
+
+void DatabaseTree::prepareQueries()
+{
+    if(!_loaded)return;
+
+    _queries.clear();
+
+    QString join;
+    QString where;
+
+    for(int i = 0; i < _keys.size(); i++)
+        join += QString(" LEFT JOIN fits_headers AS h%1 ON f.id = h%1.id_file AND h%1.key = ?").arg(i);
+
+    for(int i = 0; i < _keys.size(); i++)
+    {
+        QString sql;
+        QString col = QString("h%1.value").arg(i);
+        if(_keys[i] == "DATE-OBS_YEAR")
+            col = QString("STRFTIME('%Y', h%1.value)").arg(i);
+        else if(_keys[i] == "DATE-OBS_YEAR-MONTH")
+            col = QString("STRFTIME('%Y-%m', h%1.value)").arg(i);
+        else if(_keys[i] == "DATE-OBS_YEAR-MONTH-DAY")
+            col = QString("STRFTIME('%Y-%m-%d', h%1.value)").arg(i);
+
+        sql = QString("SELECT %1 FROM fits_files AS f").arg(col) + join + where + QString(" GROUP BY %1 ORDER BY %1 NULLS LAST").arg(col);
+
+        qDebug() << "Tree query for" << _keys[i] << sql;
+        QSqlQuery query(sql, _database->db());
+        for(auto &val : _keys)
+        {
+            if(val.startsWith("DATE-OBS_"))
+                query.addBindValue("DATE-OBS");
+            else
+                query.addBindValue(val);
+        }
+
+        if(where.isEmpty())
+            where += QString(" WHERE %1 IS ?").arg(col);
+        else
+            where += QString(" AND %1 IS ?").arg(col);
+        _queries.append(std::move(query));
+    }
+
+    QSqlQuery files("SELECT f.file FROM fits_files AS f" + join + where + " GROUP BY f.id ORDER BY f.file", _database->db());
+    for(auto &val : _keys)
+    {
+        if(val.startsWith("DATE-OBS_"))
+            files.addBindValue("DATE-OBS");
+        else
+            files.addBindValue(val);
+    }
+    qDebug() << files.lastQuery();
+    _queries.append(std::move(files));
+}
+
+void DatabaseTree::fillNode(TreeNode *node)
+{
+    if(node->filled())
+        return;
+
+    TreeNode *n = node;
+    QVariantList vals;
+    while(n->parent())
+    {
+        vals.prepend(n->value());
+        n = n->parent();
+    }
+
+    int level = vals.size();
+    if(level >= _queries.size())
+    {
+        qWarning() << "Level is too deep";
+        node->fill({});
+        return;
+    }
+    QSqlQuery &q = _queries[level];
+
+    for(int i = 0; i < level; i++)
+        q.bindValue(i + _keys.size(), vals[i]);
+    if(!q.exec())
+    {
+        qWarning() << "Failed to execute query" << q.lastError() << q.lastQuery() << q.boundValues();
+        node->fill({});
+        return;
+    }
+
+    QVariantList list;
+    while(q.next())
+        list.append(q.value(0));
+
+    node->fill(list);
+}
+
+DatabaseTreeView::DatabaseTreeView(Database *database, QWidget *parent) : QWidget(parent)
+    ,_database(database)
+{
+    QVBoxLayout *vlayout = new QVBoxLayout(this);
+    QHBoxLayout *hlayout = new QHBoxLayout(this);
+
+    _model = new DatabaseTree(database, this);
+    _treeView = new QTreeView(this);
+    _treeView->setModel(_model);
+    _treeView->setHeaderHidden(true);
+
+    _tableView = new CopyTableView(this);
+    _sqlModel = new QSqlQueryModel(this);
+    _tableView->setModel(_sqlModel);
+
+    QSettings settings;
+    QStringList filters = settings.value("databasetreeview/filters", QStringList{"OBJECT", "OBJECT/IMAGETYP", "OBJECT/IMAGETYP/FILTER", "OBJECT/IMAGETYP/FILTER/EXPTIME",
+                                                                                 "IMAGETYP/OBJECT/IMAGETYP/FILTER/EXPTIME", "IMAGETYP/DATE-OBS_YEAR/EXPTIME"}).toStringList();
+    QStringList aggrFuncs = settings.value("databasetreeview/aggrFuncs", QStringList{"", "", "", "SUM", "SUM", "SUM"}).toStringList();
+    int selectedFilter = settings.value("databasetreeview/selectedFilter", 2).toInt();
+
+    _filters = new QComboBox(this);
+    for(int i = 0; i < std::min(filters.size(), aggrFuncs.size()); i++)
+    {
+        _filters->addItem(filters[i] + " " + aggrFuncs[i], QStringList{filters[i], aggrFuncs[i]});
+    }
+    _filters->setCurrentIndex(selectedFilter);
+    connect(_filters, &QComboBox::currentIndexChanged, this, &DatabaseTreeView::filterChanged);
+    filterChanged(_filters->currentIndex());
+
+    QStackedWidget *stackedWidget = new QStackedWidget;
+    stackedWidget->addWidget(_treeView);
+    stackedWidget->addWidget(_tableView);
+
+    QPushButton *addButton = new QPushButton(tr("Add"), this);
+    QPushButton *removeButton = new QPushButton(tr("Remove"), this);
+    QPushButton *treeTableButton = new QPushButton(tr("Tree/Table"), this);
+    treeTableButton->setCheckable(true);
+    connect(treeTableButton, &QPushButton::clicked, [stackedWidget](bool checked){
+        stackedWidget->setCurrentIndex(checked ? 1 : 0);
+    });
+
+    hlayout->addWidget(_filters, 1);
+    hlayout->addWidget(addButton);
+    hlayout->addWidget(removeButton);
+    hlayout->addWidget(treeTableButton);
+
+    vlayout->addLayout(hlayout);
+    vlayout->addWidget(stackedWidget);
+
+    connect(_treeView, &QTreeView::activated, [this](const QModelIndex &index){
+        if(!_model->hasChildren(index))
+        {
+            QString path = _model->data(index).toString();
+            emit loadFile(path);
+        }
+    });
+
+    connect(addButton, &QPushButton::clicked, this, &DatabaseTreeView::addFilter);
+    connect(removeButton, &QPushButton::clicked, this, &DatabaseTreeView::removeFilter);
+}
+
+DatabaseTreeView::~DatabaseTreeView()
+{
+    QStringList filters;
+    QStringList aggrFuncs;
+    for(int i = 0; i < _filters->count(); i++)
+    {
+        QStringList data = _filters->itemData(i).toStringList();
+        filters.append(data[0]);
+        aggrFuncs.append(data[1]);
+    }
+
+    QSettings settings;
+    settings.setValue("databasetreeview/filters", filters);
+    settings.setValue("databasetreeview/aggrFuncs", aggrFuncs);
+    settings.setValue("databasetreeview/selectedFilter", _filters->currentIndex());
+}
+
+void DatabaseTreeView::addFilter()
+{
+    QStringList keywords = _database->getFitsKeywords();
+    QStringList data = _filters->currentData().toStringList();
+    DatabaseTreeSettings settings(data, keywords, this);
+    int result = settings.exec();
+    if(result == QDialog::Accepted)
+    {
+        QString keywords = settings.keywords();
+        QString aggrFunc = settings.aggregrationFunc();
+        QString text = keywords + " " + aggrFunc;
+        int idx = _filters->findText(text);
+        if(idx == -1)
+        {
+            _filters->addItem(text, QStringList{keywords, aggrFunc});
+            _filters->setCurrentText(text);
+        }
+        else
+        {
+            _filters->setCurrentIndex(idx);
+        }
+    }
+}
+
+void DatabaseTreeView::removeFilter()
+{
+    if(_filters->count() > 1)
+        _filters->removeItem(_filters->currentIndex());
+}
+
+void DatabaseTreeView::filterChanged(int index)
+{
+    QStringList data = _filters->itemData(index).toStringList();
+    QStringList keys = data[0].split('/');
+    _model->setKeys(keys);
+    setQuery(data[1]);
+}
+
+void DatabaseTreeView::visible(bool visible)
+{
+    if(visible && !_loaded)
+    {
+        _loaded = true;
+        _model->load();
+        QStringList data = _filters->currentData().toStringList();
+        setQuery(data[1]);
+    }
+}
+
+void DatabaseTreeView::setQuery(const QString &func)
+{
+    QStringList keys = _model->keys();
+    int i = 0;
+    _sqlModel->setQuery(_model->getGroupQuery(func));
+    if(!func.isEmpty())
+    {
+        QString tmp = func + "(" + keys.last() + ")";
+        if(func == "COUNT")
+            keys.append("COUNT");
+        else
+            keys.last() = tmp;
+    }
+    for(auto &key : keys)
+        _sqlModel->setHeaderData(i++, Qt::Horizontal, key);
+
+    _tableView->resizeColumnsToContents();
+}

src/databasetree.h

@@ -0,0 +1,83 @@
+#ifndef DATABASETREE_H
+#define DATABASETREE_H
+
+#include <QAbstractItemModel>
+#include <QComboBox>
+#include <QDialog>
+#include <QFont>
+#include <QSqlQuery>
+#include <QSqlQueryModel>
+#include <QTableView>
+#include <QTreeView>
+#include <memory>
+
+class Database;
+class TreeNode;
+
+class DatabaseTreeSettings : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit DatabaseTreeSettings(const QStringList &data, QStringList keywords, QWidget *parent = nullptr);
+    QString keywords() const;
+    QString aggregrationFunc() const;
+public slots:
+    void acceptButton();
+private:
+    QVector<QComboBox*> _keywordsSelect;
+    QComboBox *_aggregateFunction;
+};
+
+class DatabaseTree : public QAbstractItemModel
+{
+public:
+    explicit DatabaseTree(Database *database, QObject *parent = nullptr);
+    void setKeys(const QStringList &keys);
+    QStringList keys() const;
+    QModelIndex index(int row, int column, const QModelIndex &parent) const override;
+    QModelIndex parent(const QModelIndex &index) const override;
+    int rowCount(const QModelIndex &index) const override;
+    int columnCount(const QModelIndex &index) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    bool canFetchMore(const QModelIndex &parent) const override;
+    void fetchMore(const QModelIndex &parent) override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+    void load();
+    QSqlQuery getGroupQuery(const QString &aggregateFunc) const;
+private:
+    void prepareQueries();
+    void fillNode(TreeNode *node);
+    Database *_database = nullptr;
+    std::unique_ptr<TreeNode> _rootNode;
+    QVector<QSqlQuery> _queries;
+    QStringList _keys;
+    QFont _italicFont;
+    bool _loaded = false;
+};
+
+class DatabaseTreeView : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit DatabaseTreeView(Database *database, QWidget *parent = nullptr);
+    virtual ~DatabaseTreeView();
+public slots:
+    void addFilter();
+    void removeFilter();
+    void filterChanged(int index);
+    void visible(bool visible);
+private:
+    void setQuery(const QString &func);
+signals:
+    void loadFile(const QString &file);
+private:
+    QComboBox *_filters = nullptr;
+    QTreeView *_treeView = nullptr;
+    QTableView *_tableView = nullptr;
+    DatabaseTree *_model = nullptr;
+    QSqlQueryModel *_sqlModel = nullptr;
+    Database *_database = nullptr;
+    bool _loaded = false;
+};
+
+#endif // DATABASETREE_H

src/databasetreekeys.ui

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>511</width>
+    <height>487</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <widget class="QDialogButtonBox" name="buttonBox">
+   <property name="geometry">
+    <rect>
+     <x>120</x>
+     <y>390</y>
+     <width>341</width>
+     <height>32</height>
+    </rect>
+   </property>
+   <property name="orientation">
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <property name="standardButtons">
+    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+   </property>
+  </widget>
+  <widget class="QComboBox" name="comboBox">
+   <property name="geometry">
+    <rect>
+     <x>60</x>
+     <y>30</y>
+     <width>86</width>
+     <height>26</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="lineEdit">
+   <property name="geometry">
+    <rect>
+     <x>180</x>
+     <y>30</y>
+     <width>113</width>
+     <height>26</height>
+    </rect>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

src/databaseview.cpp

@@ -9,7 +9,11 @@
 #include <QMenu>
 #include <QContextMenuEvent>
 #include <QRegularExpression>
+#include <QGuiApplication>
+#include <QClipboard>
+#include <QMimeData>
 #include <iostream>
+#include "batchprocessing.h"
 
 const QStringList DEFAULT_COLUMNS = {"EXPTIME", "OBJECT", "RA", "DEC"};
 
@@ -156,32 +160,67 @@ void FITSFileModel::filesUnmarked(const QModelIndexList &indexes)
     }
 }
 
+void FITSFileModel::load()
+{
+    if(!m_loaded)
+    {
+        m_loaded = true;
+        prepareQuery();
+    }
+}
+
 void FITSFileModel::prepareQuery()
 {
+    if(!m_loaded)return;
+
     QString cols;
     QString join;
     QStringList where;
     QString sql = m_columns.size() ? "SELECT f.file," : "SELECT f.file";
+    QVariantList bindValues;
+    QVariantList bindValuesJoin;
     for(int i=0; i<m_value.size(); i++)
     {
         if(m_key[i] == "file")
-            where.append(QString(" f.file LIKE '%1' ").arg(m_value[i]));
+        {
+            where.append(" f.file LIKE ? ");
+            bindValues.append(m_value[i]);
+        }
         else if(m_key[i] == "RA pos")
-            where.append(QString(" %1 BETWEEN f.minRa AND f.maxRa ").arg(RA(m_value[i])));
+        {
+            where.append(" ? BETWEEN f.minRa AND f.maxRa ");
+            bindValues.append(RA(m_value[i]));
+        }
         else if(m_key[i] == "DEC pos")
-            where.append(QString(" %1 BETWEEN f.minDec AND f.maxDec ").arg(DEC(m_value[i])));
+        {
+            where.append(" ? BETWEEN f.minDec AND f.maxDec ");
+            bindValues.append(DEC(m_value[i]));
+        }
         else if(m_key[i] == "RA range")
-            where.append(QString(" crVal1 BETWEEN %1 AND %2 ").arg(RA(m_value[i])).arg(RA(m_limit[i])));
+        {
+            where.append(" crVal1 BETWEEN ? AND ? ");
+            bindValues.append(RA(m_value[i]));
+            bindValues.append(RA(m_limit[i]));
+        }
         else if(m_key[i] == "DEC range")
-            where.append(QString(" crVal2 BETWEEN %1 AND %2 ").arg(DEC(m_value[i])).arg(DEC(m_limit[i])));
+        {
+            where.append(" crVal2 BETWEEN ? AND ? ");
+            bindValues.append(DEC(m_value[i]));
+            bindValues.append(DEC(m_limit[i]));
+        }
         else
-            join += QString(" JOIN fits_headers AS s%1 ON f.id=s%1.id_file AND s%1.key='%2' AND s%1.value LIKE '%3'").arg(i).arg(m_key[i]).arg(m_value[i]);
+        {
+            join += QString(" JOIN fits_headers AS s%1 ON f.id=s%1.id_file AND s%1.key=? AND s%1.value LIKE ? ").arg(i);
+            bindValuesJoin.append(m_key[i]);
+            bindValuesJoin.append(m_value[i]);
+        }
     }
     int i=0;
     for(auto &column : m_columns)
     {
         cols += QString("GROUP_CONCAT(h%1.value) AS h%1_value,").arg(i);
-        join += QString(" LEFT JOIN fits_headers AS h%1 ON f.id=h%1.id_file AND h%1.key='%2'").arg(i).arg(column);
+        join += QString(" LEFT JOIN fits_headers AS h%1 ON f.id=h%1.id_file AND h%1.key=?").arg(i);
+        bindValuesJoin.append(column);
         i++;
     }
     cols.chop(1);
@@ -190,7 +229,19 @@ void FITSFileModel::prepareQuery()
     sql += join;
     if(!where.isEmpty())sql += " WHERE " + where.join("AND");
     sql += " GROUP BY f.id" + m_sort;
-    setQuery(sql);
+
+    QSqlQuery query(m_database->db());
+    query.prepare(sql);
+    for(auto &val : bindValuesJoin)
+        query.addBindValue(val);
+    for(auto &val : bindValues)
+        query.addBindValue(val);
+
+    if(!query.exec())
+        qWarning() << "Failed to exectute query" << query.lastQuery() << bindValuesJoin << bindValues;
+    else
+        setQuery(std::move(query));
+
     setHeaderData(0, Qt::Horizontal, tr("File name"));
     i = 1;
     for(auto &column : m_columns)
@@ -205,7 +256,7 @@ void FITSFileModel::prepareQuery()
     m_markedFiles = QSet<QString>(list.begin(), list.end());
 }
 
-DatabaseTableView::DatabaseTableView(QWidget *parent) : QTableView(parent)
+DatabaseTableView::DatabaseTableView(QWidget *parent) : CopyTableView(parent)
 {
 }
 
@@ -214,6 +265,9 @@ void DatabaseTableView::contextMenuEvent(QContextMenuEvent *event)
     QMenu menu;
     QAction *mark = menu.addAction(tr("Mark"));
     QAction *unmark = menu.addAction(tr("Unmark"));
+    QAction *open = menu.addAction(tr("Open"));
+    QAction *openDirAction = menu.addAction(tr("Open file location"));
+    QAction *copyPath = menu.addAction(tr("Copy files"));
 
     QAction *a = menu.exec(event->globalPos());
     if(a == nullptr)
@@ -225,7 +279,26 @@ void DatabaseTableView::contextMenuEvent(QContextMenuEvent *event)
         emit filesMarked(indexes);
     else if(a == unmark)
         emit filesUnmarked(indexes);
-
+    else if(a == open)
+        emit openFile(indexes);
+    else if(a == openDirAction)
+        emit openDir(indexes);
+    else if(a == copyPath)
+    {
+        QStringList paths;
+        QList<QUrl> urls;
+        for(auto &index : indexes)
+        {
+            QString path = index.siblingAtColumn(0).data().toString();
+            paths.append(path);
+            urls.append(QUrl::fromLocalFile(path));
+        }
+        QMimeData *data = new QMimeData;
+        data->setUrls(urls);
+        data->setText(paths.join('\n'));
+        QClipboard *clipboard = QGuiApplication::clipboard();
+        clipboard->setMimeData(data);
+    }
 }
 
 DataBaseView::DataBaseView(Database *database, QWidget *parent) : QWidget(parent)
@@ -270,6 +343,17 @@ DataBaseView::DataBaseView(Database *database, QWidget *parent) : QWidget(parent
         m_database->unmark(files);
         m_model->filesUnmarked(indexes);
     });
+    connect(m_tableView, &DatabaseTableView::openFile, [this](QModelIndexList indexes){
+        if(indexes.size())
+            emit loadFile(m_model->data(indexes.front().siblingAtColumn(0)).toString());
+    });
+    connect(m_tableView, &DatabaseTableView::openDir, [this](QModelIndexList indexes){
+        if(indexes.size())
+        {
+            QFileInfo info(m_model->data(indexes.front().siblingAtColumn(0)).toString());
+            openDir(info.absolutePath());
+        }
+    });
 
     auto addFilterItems = [](QComboBox *combobox, const QStringList &fitsKeywords)
     {
@@ -283,12 +367,13 @@ DataBaseView::DataBaseView(Database *database, QWidget *parent) : QWidget(parent
     };
 
     QStringList fitsKeywords = m_database->getFitsKeywords();
+    QStringList filterKey = settings.value("databaseview/filterKey", QStringList{"file", "file", "file"}).toStringList();
     for(int i=0; i<3; i++)
     {
         m_filterKeyword[i] = new QComboBox(this);
         m_filterKeyword[i]->setMaximumWidth(300);
         addFilterItems(m_filterKeyword[i], fitsKeywords);
-
+        m_filterKeyword[i]->setCurrentText(filterKey[i]);
 
         m_search[i] = new QLineEdit(this);
         m_search[i]->setPlaceholderText(tr("Text to search, you can % as wildcard"));
@@ -308,7 +393,7 @@ DataBaseView::DataBaseView(Database *database, QWidget *parent) : QWidget(parent
     }
 
     QPushButton *filterButton = new QPushButton(tr("Filter"), this);
-    connect(filterButton, SIGNAL(pressed()), this, SLOT(applyFilter()));
+    connect(filterButton, &QPushButton::pressed, this, &DataBaseView::applyFilter);
     hlayout->addWidget(filterButton);
 
     connect(m_database, &Database::databaseChanged, [this, &addFilterItems](){
@@ -322,8 +407,13 @@ DataBaseView::DataBaseView(Database *database, QWidget *parent) : QWidget(parent
 
 DataBaseView::~DataBaseView()
 {
+    QStringList filterKey;
+    for(int i = 0; i < 3; i++)
+        filterKey.append(m_filterKeyword[i]->currentText());
+
     QSettings settings;
     settings.setValue("databaseview/header", m_tableView->horizontalHeader()->saveState());
+    settings.setValue("databaseview/filterKey", filterKey);
 }
 
 void DataBaseView::selectColumns()
@@ -375,6 +465,7 @@ bool DataBaseView::exportCSV(const QString &path)
     if(!csv.open(QIODevice::WriteOnly | QIODevice::Text))
         return false;
 
+    m_model->load();
     QSqlQuery sql(m_model->query().lastQuery());
     int colCount = m_model->columnCount();
     QStringList header;
@@ -403,3 +494,42 @@ bool DataBaseView::exportCSV(const QString &path)
     }
     return true;
 }
+
+void DataBaseView::visible(bool visible)
+{
+    if(visible)m_model->load();
+}
+
+CopyTableView::CopyTableView(QWidget *parent) : QTableView(parent)
+{
+}
+
+void CopyTableView::keyPressEvent(QKeyEvent *event)
+{
+    if(event->matches(QKeySequence::Copy))
+    {
+        QModelIndexList list = selectedIndexes();
+        QString table;
+        if(list.size() == 0)return;
+
+        int row = list.first().row();
+        int col = list.first().column();
+        for(auto &index : list)
+        {
+            if(row != index.row())
+                table.append('\n');
+            else if(col != index.column())
+                table.append('\t');
+
+            table.append(index.data().toString());
+            row = index.row();
+            col = index.column();
+        }
+        qApp->clipboard()->setText(table);
+        event->accept();
+    }
+    else
+    {
+        QTableView::keyPressEvent(event);
+    }
+}

src/databaseview.h

@@ -30,6 +30,7 @@ class FITSFileModel : public QSqlQueryModel
     QStringList m_limit;
     QSet<QString> m_markedFiles;
     Database *m_database;
+    bool m_loaded = false;
 public:
     explicit FITSFileModel(Database *database, QObject *parent = nullptr);
     void sort(int column, Qt::SortOrder order) override;
@@ -38,11 +39,20 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     void filesMarked(const QModelIndexList &indexes);
     void filesUnmarked(const QModelIndexList &indexes);
+    void load();
 protected:
     void prepareQuery();
 };
 
-class DatabaseTableView : public QTableView
+class CopyTableView : public QTableView
+{
+    Q_OBJECT
+public:
+    explicit CopyTableView(QWidget *parent = nullptr);
+    void keyPressEvent(QKeyEvent *event);
+};
+
+class DatabaseTableView : public CopyTableView
 {
     Q_OBJECT
 public:
@@ -52,6 +62,8 @@ protected:
 signals:
     void filesMarked(QModelIndexList indexes);
     void filesUnmarked(QModelIndexList indexes);
+    void openFile(QModelIndexList indexes);
+    void openDir(QModelIndexList indexes);
 };
 
 class DataBaseView : public QWidget
@@ -72,6 +84,7 @@ public slots:
     void itemActivated(const QModelIndex &index);
     void applyFilter();
     bool exportCSV(const QString &path);
+    void visible(bool visible);
 signals:
     void loadFile(QString file);
 };

src/filemanager.cpp

@@ -0,0 +1,766 @@
+#include "filemanager.h"
+#include "ui_filemanager.h"
+#include "ui_fitskeyword.h"
+
+#include <QSettings>
+#include <QStandardPaths>
+#include <QDesktopServices>
+#include <QMimeData>
+#include <QClipboard>
+#include <QThread>
+#include <QDirIterator>
+#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));
+
+    QString newPath = path;
+    if(!QFileInfo::exists(path))
+    {
+        QDir dir(path);
+        do
+        {
+            dir.setPath(QDir::cleanPath(dir.filePath("..")));
+        }while(!dir.exists() && !dir.isRoot());
+        newPath = dir.path();
+    }
+
+    _dirFileSystemModel->setDir(newPath);
+    setRootIndex(_dirFileSystemModel->index(newPath, 0));
+    clearSelection();
+    if(oldPath != newPath)emit dirChanged(newPath);
+}
+
+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);
+}

src/filemanager.h

@@ -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

src/filemanager.ui

@@ -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>

src/filesystemwidget.cpp

@@ -5,6 +5,7 @@
 #include <QMenu>
 #include <QSettings>
 #include <QHeaderView>
+#include <QMimeDatabase>
 
 FilesystemWidget::FilesystemWidget(QAbstractItemModel *model, QWidget *parent) : QWidget(parent)
   , m_model(model)
@@ -117,6 +118,7 @@ void Filetree::contextMenuEvent(QContextMenuEvent *event)
     {
         setRootIndex(index);
         m_rootDir = m_fileSystemModel->filePath(index);
+        m_fileSystemModel->setRootPath(m_rootDir);
     }
     else if(a == resetRoot)
     {
@@ -127,6 +129,7 @@ void Filetree::contextMenuEvent(QContextMenuEvent *event)
     {
         setRootIndex(rootIndex().parent());
         m_rootDir = m_fileSystemModel->filePath(rootIndex().parent());
+        m_fileSystemModel->setRootPath(m_rootDir);
     }
     else if(a == copy)
     {

src/filesystemwidget.h

@@ -3,6 +3,7 @@
 
 #include <QWidget>
 #include <QFileSystemModel>
+#include <QIdentityProxyModel>
 #include <QListView>
 #include <QTreeView>
 

src/fitskeyword.ui

@@ -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>

src/httpdownloader.cpp

@@ -345,18 +345,22 @@ Download::Download(QNetworkReply *reply, const QString indexPath, QObject *paren
     filename.remove(QRegularExpression("\\.zst$"));
 
     _fw.setFileName(indexPath + "/" + filename);
-    _fw.open(QIODevice::WriteOnly | QIODevice::Truncate);
-    if(_fw.isOpen())
+    if(_fw.open(QIODevice::WriteOnly | QIODevice::Truncate))
     {
         qDebug() << "open file" << _fw.fileName();
+        _dstream = ZSTD_createDStream();
+    }
+    else
+    {
+        qWarning() << "Failed to open file" << _fw.fileName();
+        abort();
     }
-
-    _dstream = ZSTD_createDStream();
 }
 
 Download::~Download()
 {
-    ZSTD_freeDStream(_dstream);
+    if(_dstream)
+        ZSTD_freeDStream(_dstream);
 }
 
 void Download::abort()
@@ -402,7 +406,7 @@ void Download::finished()
 
 void Download::decompress(QByteArray &data)
 {
-    if(data.isEmpty())return;
+    if(data.isEmpty() || _dstream == nullptr)return;
 
     _hash.addData(data);
 

src/httpdownloader.h

@@ -11,8 +11,8 @@
 class Download : public QObject
 {
     Q_OBJECT
-    QNetworkReply *_reply;
-    ZSTD_DStream *_dstream;
+    QNetworkReply *_reply = nullptr;
+    ZSTD_DStream *_dstream = nullptr;
     QFile _fw;
     QCryptographicHash _hash;
 public:

src/imageinfo.cpp

@@ -2,6 +2,8 @@
 #include <QSettings>
 #include <QHeaderView>
 
+QMap<QString, QColor> headerHighlight;
+
 ImageInfo::ImageInfo(QWidget *parent) : QTreeWidget(parent)
 {
     setColumnCount(3);
@@ -9,6 +11,8 @@ ImageInfo::ImageInfo(QWidget *parent) : QTreeWidget(parent)
     setIndentation(5);
     QSettings settings;
     header()->restoreState(settings.value("imageinfo/headerstate").toByteArray());
+    setSortingEnabled(true);
+    header()->setSortIndicatorClearable(true);
 }
 
 ImageInfo::~ImageInfo()
@@ -25,7 +29,14 @@ void ImageInfo::setInfo(const ImageInfoData &info)
         QTreeWidgetItem *fitsHeader = new QTreeWidgetItem({tr("FITS Header")});
         for(const FITSRecord &record : info.fitsHeader)
         {
-            new QTreeWidgetItem(fitsHeader, {record.key, record.value.toString().left(1024), record.comment});
+            QTreeWidgetItem *item = new QTreeWidgetItem(fitsHeader, {record.key, record.value.toString().left(1024), record.comment});
+            if(headerHighlight.contains(record.key))
+            {
+                QColor color = headerHighlight[record.key];
+                item->setBackground(0, color);
+                item->setBackground(1, color);
+                item->setBackground(2, color);
+            }
         }
         addTopLevelItem(fitsHeader);
     }

src/imageinfodata.cpp

@@ -4,6 +4,7 @@
 #include <QRegularExpression>
 #include <wcslib/wcshdr.h>
 #include <wcslib/wcsfix.h>
+#include "database.h"
 #include "libxisf.h"
 
 static const QVector<QByteArray> noEditableKey = {"SIMPLE", "BITPIX", "NAXIS", "NAXIS1", "NAXIS2", "NAXIS3", "EXTEND", "BZERO", "BSCALE"};
@@ -29,6 +30,7 @@ FITSRecord::FITSRecord(const LibXISF::FITSKeyword &record)
         string.chop(1);
         string.remove(0, 1);
     }
+    string = string.trimmed();
     bool isint;
     bool isdouble;
     double vald = string.toDouble(&isdouble);
@@ -85,6 +87,7 @@ WCSDataT::WCSDataT(int width, int height, const QVector<FITSRecord> &header) :
     for(const FITSRecord &record : header)
     {
         if(record.key.startsWith("PV"))continue;
+        if(record.xisf)continue;
 
         QByteArray rec;
         rec.append(record.key.leftJustified(8, ' '));
@@ -153,9 +156,9 @@ bool WCSDataT::worldToPixel(const SkyPoint &point, QPointF &pixel) const
     return false;
 }
 
-void WCSDataT::calculateBounds(double &minRa, double &maxRa, double &minDec, double &maxDec, double &crVal1, double &crVal2) const
+bool WCSDataT::calculateBounds(double &minRa, double &maxRa, double &minDec, double &maxDec, double &crVal1, double &crVal2) const
 {
-    if(wcs == nullptr)return;
+    if(wcs == nullptr)return false;
 
     minRa = 1000;
     maxRa = -1000;
@@ -208,6 +211,7 @@ void WCSDataT::calculateBounds(double &minRa, double &maxRa, double &minDec, dou
         if(s.contains(scp))
             minDec = -90;
     }
+    return true;
 }
 
 double hav(double x)
@@ -266,6 +270,16 @@ QString SkyPoint::toString() const
     return QString("RA: %1 DEC: %2° %3' %4\"").arg(t.toString("HH'h' mm'm' ss's'")).arg(deg, 2, 'f', 0, '0').arg(min, 2, 'f', 0, '0').arg(sec, 2, 'f', 0, '0');
 }
 
+QString SkyPoint::RAString() const
+{
+    return toHMS(ra / 15);
+}
+
+QString SkyPoint::DECString() const
+{
+    return toDMS(dec);
+}
+
 double SkyPoint::fromHMS(const QString &hms)
 {
     double deg = fromDMS(hms);
@@ -308,11 +322,21 @@ QString SkyPoint::toHMS(double decHour)
 
 QString SkyPoint::toDMS(double deg)
 {
+    int sign = deg < 0.0 ? -1 : 1;
+    deg *= sign;
     double d,m,s,md;
     md = std::modf(deg, &d) * 60.0;
     s = std::modf(md, &m) * 60.0;
 
-    return QString("%1˚ %2' %3\"").arg((int)d, 2, 10, QChar('0')).arg((int)m, 2, 10, QChar('0')).arg((int)s, 2, 10, QChar('0'));
+    return QString("%1˚ %2' %3\"").arg((int)d * sign, 2, 10, QChar('0')).arg((int)m, 2, 10, QChar('0')).arg((int)s, 2, 10, QChar('0'));
+}
+
+SkyPoint SkyPoint::operator+(const SkyPoint &p)
+{
+    SkyPoint ret;
+    ret.ra = ra + p.ra;
+    ret.dec = dec + p.dec;
+    return ret;
 }
 
 SkyPointScale ImageInfoData::getCenterRaDec() const
@@ -403,3 +427,149 @@ SkyPointScale ImageInfoData::getCenterRaDec() const
     }
     return ret;
 }
+
+SkyPoint greatCircle(SkyPoint &p, double dist, double azm)
+{
+    dist = dist * M_PI / 180;
+    azm = azm * M_PI / 180;
+    double dec0 = p.DEC() * M_PI / 180;
+    double ra0 = p.RA() * M_PI / 180;
+    double dec1 = std::asin(std::sin(dec0) * std::cos(dist) + std::cos(dec0) * std::sin(dist) * std::cos(azm));
+    double ra1 = ra0 + std::atan2(std::sin(azm) * std::sin(dist) * std::cos(dec0), std::cos(dist) - std::sin(dec0) * std::sin(dec1));
+    return SkyPoint(ra1 * 180 / M_PI, dec1 * 180 / M_PI);
+}
+
+SkyGrid WCSDataT::prepareGrid(uint32_t w, uint32_t h, Database *database)
+{
+    SkyGrid skyGrid;
+    if(!wcs)return skyGrid;
+
+    double minRa, maxRa, minDec, maxDec, crVal1, crVal2;
+    calculateBounds(minRa, maxRa, minDec, maxDec, crVal1, crVal2);
+
+    QPointF a,b;
+    worldToPixel(SkyPoint(crVal1, crVal2), a);
+    worldToPixel(SkyPoint(crVal1 + 0.01, crVal2), b);
+    skyGrid.rot_ang = std::atan2(b.y() - a.y(), b.x() - a.x()) / M_PI * -180.0;
+
+    if(database)
+    {
+        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)
+        {
+            QPointF p;
+            if(worldToPixel(object.skyPoint, p))
+                object.pixel = p;
+
+            QPointF majax;
+            worldToPixel(greatCircle(object.skyPoint, (object.min_ax + object.maj_ax) / 120.0, object.pos_ang), majax);
+            majax -= p;
+            object.maj_ax = std::sqrt(QPointF::dotProduct(majax, majax));
+        }
+    }
+
+    double raStep = 15;
+    double decStep = 15;
+    double raRange = maxRa - minRa;
+    double decRange = maxDec - minDec;
+    const QVector<double> raSteps = {15, 5, 2.5, 1.25, 0.25, 20/240.0, 10/240.0, 5/240.0, 1/240.0};
+    const QVector<double> decSteps = {20, 10, 5, 2, 1, 20/60.0, 10/60.0, 5/60.0, 2/60.0, 1/60.0, 20/3600.0, 10/3600.0, 5/3600.0, 2/3600.0, 1/3600.0};
+
+    for(double ra : raSteps)
+    {
+        if(ra * 5 <= raRange)
+        {
+            raStep = ra;
+            break;
+        }
+    }
+
+    for(double dec : decSteps)
+    {
+        if(dec * 5 <= decRange)
+        {
+            decStep = dec;
+            break;
+        }
+    }
+
+    minRa -= std::fmod(minRa, raStep);
+    minDec -= std::fmod(minDec, decStep);
+    if(minRa < 0)minRa -= raStep;
+    if(minDec < 0)minDec -= decStep;
+
+    QRectF clip(0, 0, w, h);
+    const double step = 0.2;
+
+    maxRa += raStep;
+    maxDec += decStep;
+    for(double ra = minRa; ra <= maxRa; ra += raStep)
+    {
+        QPointF p;
+        worldToPixel(SkyPoint(ra, minDec), p);
+        skyGrid.grid.moveTo(p);
+        for(double dec = minDec + decStep * step; dec <= maxDec; dec += decStep * step)
+        {
+            worldToPixel(SkyPoint(ra, dec), p);
+            skyGrid.grid.lineTo(p);
+        }
+    }
+
+    for(double dec = minDec; dec <= maxDec; dec += decStep)
+    {
+        QPointF p;
+        worldToPixel(SkyPoint(minRa, dec), p);
+        skyGrid.grid.moveTo(p);
+        for(double ra = minRa + raStep * step; ra <= maxRa; ra += raStep * step)
+        {
+            worldToPixel(SkyPoint(ra, dec), p);
+            skyGrid.grid.lineTo(p);
+        }
+    }
+
+    SkyPoint sp1, sp2,orig;
+    pixelToWorld(QPointF(-1, -1), orig);
+    sp1 = orig;
+    for(uint32_t x = 0; x < w; x++)
+    {
+        QPointF p(x, 0);
+        if(!pixelToWorld(p, sp2))
+            break;
+
+        if(static_cast<int>(sp1.RA() / raStep) != static_cast<int>(sp2.RA() / raStep))
+            skyGrid.text.append({p, std::abs(sp1.RA()) > std::abs(sp2.RA()) ? sp1.RAString() : sp2.RAString()});
+
+        if(static_cast<int>(sp1.DEC() / decStep) != static_cast<int>(sp2.DEC() / decStep))
+            skyGrid.text.append({p, std::abs(sp1.DEC()) > std::abs(sp2.DEC()) ? sp1.DECString() : sp2.DECString()});
+
+        sp1 = sp2;
+    }
+
+    sp1 = orig;
+    for(uint32_t y = 0; y < h; y++)
+    {
+        QPointF p(0, y);
+        if(!pixelToWorld(p, sp2))
+            break;
+
+        if(static_cast<int>(sp1.RA() / raStep) != static_cast<int>(sp2.RA() / raStep))
+            skyGrid.text.append({p, std::abs(sp1.RA()) > std::abs(sp2.RA()) ? sp1.RAString() : sp2.RAString()});
+
+        if(static_cast<int>(sp1.DEC() / decStep) != static_cast<int>(sp2.DEC() / decStep))
+            skyGrid.text.append({p, std::abs(sp1.DEC()) > std::abs(sp2.DEC()) ? sp1.DECString() : sp2.DECString()});
+
+        sp1 = sp2;
+    }
+
+    skyGrid.empty = false;
+    return skyGrid;
+}
+
+void SkyGrid::clear()
+{
+    empty = true;
+    grid.clear();
+    text.clear();
+    objects.clear();
+}

src/imageinfodata.h

@@ -5,12 +5,15 @@
 #include <QPointF>
 #include <QVector>
 #include <QVariant>
+#include <QPainterPath>
 #include <wcslib/wcs.h>
 #include <cmath>
 #include <memory>
 
 namespace LibXISF { struct FITSKeyword; struct Property; }
 
+class Database;
+
 struct FITSRecord
 {
     QByteArray key;
@@ -36,10 +39,13 @@ public:
     double RAHour() const { return ra / 15.0; }
     double DEC() const { return dec; }
     QString toString() const;
+    QString RAString() const;
+    QString DECString() const;
     static double fromHMS(const QString &hms);
     static double fromDMS(const QString &dms);
     static QString toHMS(double decHour);
     static QString toDMS(double deg);
+    SkyPoint operator+(const SkyPoint &p);
 };
 
 struct SkyPointScale
@@ -51,6 +57,28 @@ struct SkyPointScale
     double scaleHigh = 10000.0;
 };
 
+struct SkyObject
+{
+    QString name;
+    QString name2;
+    SkyPoint skyPoint;
+    double maj_ax;
+    double min_ax;
+    double pos_ang;
+    double mag;
+    QPointF pixel;
+};
+
+struct SkyGrid
+{
+    bool empty = true;
+    QPainterPath grid;
+    QVector<QPair<QPointF, QString>> text;
+    QVector<SkyObject> objects;
+    double rot_ang = 0;
+    void clear();
+};
+
 class WCSDataT
 {
     int nwcs = 0;
@@ -65,9 +93,10 @@ public:
     ~WCSDataT();
     bool pixelToWorld(const QPointF &pixel, SkyPoint &point) const;
     bool worldToPixel(const SkyPoint &point, QPointF &pixel) const;
-    void calculateBounds(double &minRa, double &maxRa, double &minDec, double &maxDec, double &crVal1, double &crVal2) const;
+    bool calculateBounds(double &minRa, double &maxRa, double &minDec, double &maxDec, double &crVal1, double &crVal2) const;
     bool valid() const { return wcs; };
     SkyPointScale getRaDecScale() const;
+    SkyGrid prepareGrid(uint32_t w, uint32_t h, Database *database);
 };
 
 struct ImageInfoData
@@ -76,6 +105,8 @@ struct ImageInfoData
     QVector<QPair<QString, QString>> info;
     std::shared_ptr<WCSDataT> wcs;
     SkyPointScale getCenterRaDec() const;
+    int index = 0;
+    int num = 1;
 };
 
 typedef enum

src/imageringlist.cpp

@@ -23,13 +23,16 @@ Image::Image(const QString name, int number, ImageRingList *ringList) :
 {
 }
 
-void Image::load(QThreadPool *pool)
+void Image::load(int index, QThreadPool *pool)
 {
+    if(index != m_info.index && !m_loading)
+        m_rawImage.reset();
+
     if(!m_rawImage && !m_loading)
     {
         m_loading = true;
         m_released = false;
-        pool->start(new LoadRunable(m_name, this, m_ringList->analyzeLevel()));
+        pool->start(new LoadRunable(m_name, this, m_ringList->analyzeLevel(), index));
     }
     if(!m_loading && m_rawImage)
         emit pixmapLoaded(this);
@@ -38,7 +41,7 @@ void Image::load(QThreadPool *pool)
 void Image::loadThumbnail(QThreadPool *pool)
 {
     if(!m_thumbnail)
-        pool->start(new LoadRunable(m_name, this, AnalyzeLevel::None, true));
+        pool->start(new LoadRunable(m_name, this, AnalyzeLevel::None, 0, true));
     else
         emit thumbnailLoaded(this);
 }
@@ -108,13 +111,14 @@ void Image::thumbnailLoadFinish(std::shared_ptr<RawImage> rawImage)
         emit thumbnailLoaded(this);
 }
 
-ImageRingList::ImageRingList(Database *database, const QStringList &nameFilter, QObject *parent) : QAbstractItemModel(parent)
+ImageRingList::ImageRingList(Database *database, const QStringList &nameFilter, QObject *parent) : QAbstractListModel(parent)
   , m_liveMode(false)
   , m_analyzeLevel(None)
   , m_database(database)
   , m_nameFilter(nameFilter)
+  , m_fileSuffix(nameFilter)
 {
-    connect(&m_fileSystemWatcher, SIGNAL(directoryChanged(QString)), this, SLOT(dirChanged(QString)));
+    connect(&m_fileSystemWatcher, &QFileSystemWatcher::directoryChanged, this, &ImageRingList::dirChanged);
     m_nameFilter.replaceInStrings(QRegularExpression("^"), "*.");
     m_loadPool = new QThreadPool(this);
     m_loadPool->setThreadPriority(QThread::LowPriority);
@@ -145,6 +149,7 @@ bool ImageRingList::setDir(const QString path, const QString &currentFile, bool
 
     if(dir.exists())
     {
+        m_currentDir = path;
         QStringList scannedDirs;
         QStringList absolutePaths;
         std::function<void(const QString&)> scanDir = [&](const QString &path)
@@ -170,10 +175,11 @@ bool ImageRingList::setDir(const QString path, const QString &currentFile, bool
         };
 
         scanDir(path);
-        qDebug() << absolutePaths.size();
-        setFiles(absolutePaths, m_liveMode ? absolutePaths.first() : currentFile);
+        //qDebug() << absolutePaths.size();
+        setFilesPrivate(absolutePaths, m_liveMode ? absolutePaths.first() : currentFile);
 
-        m_fileSystemWatcher.removePaths(m_fileSystemWatcher.directories());
+        if(m_fileSystemWatcher.directories().size())
+            m_fileSystemWatcher.removePaths(m_fileSystemWatcher.directories());
         m_fileSystemWatcher.addPath(path);
         return true;
     }
@@ -192,6 +198,17 @@ void ImageRingList::setFile(const QString &file)
     }
 }
 
+void ImageRingList::setFiles(QStringList files)
+{
+    QRegularExpression reg("(" + m_fileSuffix.join("|") + ")");
+    files.removeIf([&reg](const QString &file){
+        QFileInfo info(file);
+        auto match = reg.match(info.suffix());
+        return !match.hasMatch() || !info.exists() || !info.isReadable() || !info.isFile();
+    });
+    setFilesPrivate(files);
+}
+
 ImagePtr ImageRingList::currentImage()
 {
     if(m_images.size())
@@ -200,6 +217,11 @@ ImagePtr ImageRingList::currentImage()
         return 0;
 }
 
+QString ImageRingList::currentDir() const
+{
+    return m_currentDir;
+}
+
 void ImageRingList::increment()
 {
     if(m_images.size())
@@ -211,9 +233,9 @@ void ImageRingList::increment()
         (*m_firstImage)->release();
         m_firstImage = increment(m_firstImage);
         m_currImage = increment(m_currImage);
-        (*m_currImage)->load(m_loadPool);
+        (*m_currImage)->load(0, m_loadPool);
         m_lastImage = increment(m_lastImage);
-        (*m_lastImage)->load(m_loadPool);
+        (*m_lastImage)->load(0, m_loadPool);
     }
 }
 
@@ -228,20 +250,58 @@ void ImageRingList::decrement()
         (*m_lastImage)->release();
         m_firstImage = decrement(m_firstImage);
         m_currImage = decrement(m_currImage);
-        (*m_currImage)->load(m_loadPool);
+        (*m_currImage)->load(0, m_loadPool);
         m_lastImage = decrement(m_lastImage);
-        (*m_firstImage)->load(m_loadPool);
+        (*m_firstImage)->load(0, m_loadPool);
+    }
+}
+
+void ImageRingList::prevSubImage()
+{
+    if(m_images.size())
+    {
+        if((*m_currImage)->isLoading())
+            return;
+
+        int index = (*m_currImage)->info().index;
+        int num = (*m_currImage)->info().num;
+        if(num > 1)
+            (*m_currImage)->load(index == 0 ? num - 1 : index - 1, m_loadPool);
+    }
+}
+
+void ImageRingList::nextSubImage()
+{
+    if(m_images.size())
+    {
+        if((*m_currImage)->isLoading())
+            return;
+
+        int index = (*m_currImage)->info().index;
+        int num = (*m_currImage)->info().num;
+        if(num > 1)
+            (*m_currImage)->load((index + 1) % num, m_loadPool);
     }
 }
 
 void ImageRingList::setMarked()
 {
     QStringList files = m_database->getMarkedFiles();
-    std::remove_if(files.begin(), files.end(), [](const QString &file){
+    files.removeIf([](const QString &file){
         QFileInfo info(file);
         return !info.exists() || !info.isReadable();
     });
-    setFiles(files);
+    setFilesPrivate(files);
+}
+
+void ImageRingList::reloadImage()
+{
+    if(*m_currImage)
+    {
+        int index = (*m_currImage)->info().index;
+        (*m_currImage)->release();
+        (*m_currImage)->load(index, m_loadPool);
+    }
 }
 
 void ImageRingList::setLiveMode(bool live)
@@ -284,7 +344,7 @@ void ImageRingList::loadFile(int row)
             if(m_images.empty())
                 return;
 
-            (*m_currImage)->load(m_loadPool);
+            (*m_currImage)->load(0, m_loadPool);
 
             m_width = DEFAULT_WIDTH<m_images.size()/2 ? DEFAULT_WIDTH : m_images.size()/2;
             if(m_liveMode)
@@ -293,9 +353,9 @@ void ImageRingList::loadFile(int row)
             for(int i=0; i<m_width; i++)
             {
                 m_firstImage = decrement(m_firstImage);
-                (*m_firstImage)->load(m_loadPool);
+                (*m_firstImage)->load(0, m_loadPool);
                 m_lastImage = increment(m_lastImage);
-                (*m_lastImage)->load(m_loadPool);
+                (*m_lastImage)->load(0, m_loadPool);
             }
             if(m_lastImage != m_firstImage)
             {
@@ -352,7 +412,7 @@ void ImageRingList::clearThumbnails()
         img->clearThumbnail();
 }
 
-QModelIndex ImageRingList::index(int row, int column, const QModelIndex &parent) const
+/*QModelIndex ImageRingList::index(int row, int column, const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
     return createIndex(row, column, m_images.at(row).get());
@@ -362,7 +422,7 @@ QModelIndex ImageRingList::parent(const QModelIndex &child) const
 {
     Q_UNUSED(child);
     return QModelIndex();
-}
+}*/
 
 int ImageRingList::rowCount(const QModelIndex &parent) const
 {
@@ -372,31 +432,35 @@ int ImageRingList::rowCount(const QModelIndex &parent) const
         return 0;
 }
 
-int ImageRingList::columnCount(const QModelIndex &parent) const
+/*int ImageRingList::columnCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
     return 1;
-}
+}*/
 
 QVariant ImageRingList::data(const QModelIndex &index, int role) const
 {
-    switch(role)
+    if(index.isValid() && index.row() >= 0 && index.row() < m_images.size())
     {
-    case Qt::DisplayRole:
-    {
-        QFileInfo info(m_images.at(index.row())->name());
-        return info.fileName();
-    }
-    case Qt::FontRole:
-    {
-        bool marked = m_database->isMarked(m_images.at(index.row())->name());
-        QFont font;
-        font.setBold(marked);
-        return font;
-    }
-    default:
-        return QVariant();
+        switch(role)
+        {
+        case Qt::DisplayRole:
+        {
+            QFileInfo info(m_images.at(index.row())->name());
+            return info.fileName();
+        }
+        case Qt::FontRole:
+        {
+            bool marked = m_database->isMarked(m_images.at(index.row())->name());
+            QFont font;
+            font.setBold(marked);
+            return font;
+        }
+        default:
+            return QVariant();
+        }
     }
+    return QVariant();
 }
 
 QVariant ImageRingList::headerData(int section, Qt::Orientation orientation, int role) const
@@ -419,9 +483,9 @@ void ImageRingList::setPreload(int width)
         for(int i = newWidth - m_width; i>0; i--)
         {
             m_firstImage = decrement(m_firstImage);
-            (*m_firstImage)->load(m_loadPool);
+            (*m_firstImage)->load(0, m_loadPool);
             m_lastImage = increment(m_lastImage);
-            (*m_lastImage)->load(m_loadPool);
+            (*m_lastImage)->load(0, m_loadPool);
         }
     }
     if(newWidth < m_width)
@@ -474,7 +538,7 @@ void ImageRingList::toggleSlideshow(bool start)
     }
 }
 
-void ImageRingList::setFiles(const QStringList files, const QString &currentFile)
+void ImageRingList::setFilesPrivate(const QStringList files, const QString &currentFile)
 {
     m_loadPool->clear();
     m_thumbPool->clear();
@@ -486,8 +550,8 @@ void ImageRingList::setFiles(const QStringList files, const QString &currentFile
     for(const QString &file : files)
     {
         ImagePtr ptr = make_shared<Image>(file, i++, this);
-        connect(ptr.get(), SIGNAL(pixmapLoaded(Image*)), this, SLOT(imageLoaded(Image*)));
-        connect(ptr.get(), SIGNAL(thumbnailLoaded(Image*)), this, SIGNAL(thumbnailLoaded(Image*)));
+        connect(ptr.get(), &Image::pixmapLoaded, this, &ImageRingList::imageLoaded);
+        connect(ptr.get(), &Image::thumbnailLoaded, this, &ImageRingList::thumbnailLoaded);
         m_images.append(ptr);
     }
 
@@ -526,9 +590,8 @@ void ImageRingList::imageLoaded(Image *image)
     }
 }
 
-void ImageRingList::dirChanged(QString dir)
+void ImageRingList::dirChanged(QString)
 {
-    m_currentDir = dir;
     if(m_liveMode)
         reloadDir();
     else

src/imageringlist.h

@@ -28,7 +28,7 @@ class Image : public QObject
     ImageRingList *m_ringList;
 public:
     explicit Image(const QString name, int number, ImageRingList *ringList);
-    void load(QThreadPool *pool);
+    void load(int index, QThreadPool *pool);
     void loadThumbnail(QThreadPool *pool);
     void release();
     QString name() const;
@@ -51,7 +51,7 @@ typedef std::shared_ptr<Image> ImagePtr;
 
 class Database;
 
-class ImageRingList : public QAbstractItemModel
+class ImageRingList : public QAbstractListModel
 {
     Q_OBJECT
     int m_width;
@@ -68,6 +68,7 @@ class ImageRingList : public QAbstractItemModel
     QThreadPool *m_thumbPool;
     Database *m_database;
     QStringList m_nameFilter;
+    QStringList m_fileSuffix;
     QTimer *m_slideShowTimer;
     QTimer *m_dirChangeDelay;
     QString m_currentDir;
@@ -76,7 +77,9 @@ public:
     ~ImageRingList() override;
     bool setDir(const QString path, const QString &currentFile = QString(), bool recursive = false);
     void setFile(const QString &file);
+    void setFiles(QStringList files);
     ImagePtr currentImage();
+    QString currentDir() const;
     void setLiveMode(bool live);
     void setCalculateStats(bool stats);
     void setFindPeaks(bool findPeaks);
@@ -90,10 +93,10 @@ public:
     void updateMark();
     void clearThumbnails();
 
-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
-    QModelIndex parent(const QModelIndex &child) const override;
+    //QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+    //QModelIndex parent(const QModelIndex &child) const override;
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    //int columnCount(const QModelIndex &parent = QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
 public slots:
@@ -103,9 +106,12 @@ public slots:
     void toggleSlideshow(bool start);
     void increment();
     void decrement();
+    void prevSubImage();
+    void nextSubImage();
     void setMarked();
+    void reloadImage();
 protected:
-    void setFiles(const QStringList files, const QString &currentFile = QString());
+    void setFilesPrivate(const QStringList files, const QString &currentFile = QString());
     QList<ImagePtr>::iterator increment(QList<ImagePtr>::iterator iter);
     QList<ImagePtr>::iterator decrement(QList<ImagePtr>::iterator iter);
 signals:
@@ -115,7 +121,7 @@ signals:
     void currentImageChanged(int index);
 protected slots:
     void imageLoaded(Image *image);
-    void dirChanged(QString dir);
+    void dirChanged(QString);
     void reloadDir();
 };
 

src/imagescrollarea.cpp

@@ -27,8 +27,8 @@ ImageScrollArea::ImageScrollArea(Database *database, QWidget *parent) : QWidget(
     layout->addWidget(m_verticalScrollBar, 0, 1);
     layout->addWidget(m_horizontalScrollBar, 1, 0);
 
-    connect(m_verticalScrollBar, SIGNAL(valueChanged(int)), this, SLOT(scrollEvent()));
-    connect(m_horizontalScrollBar, SIGNAL(valueChanged(int)), this, SLOT(scrollEvent()));
+    connect(m_verticalScrollBar, &QScrollBar::valueChanged, this, &ImageScrollArea::scrollEvent);
+    connect(m_horizontalScrollBar, &QScrollBar::valueChanged, this, &ImageScrollArea::scrollEvent);
 
     if(imageWidgetGL)
     {
@@ -142,6 +142,11 @@ void ImageScrollArea::falseColor(bool enable)
     m_imageWidget->falseColor(enable);
 }
 
+void ImageScrollArea::drawGrid(bool enable)
+{
+    m_imageWidget->drawGrid(enable);
+}
+
 QImage ImageScrollArea::renderToImage()
 {
     return m_imageWidget->renderToImage();

src/imagescrollarea.h

@@ -31,6 +31,7 @@ public slots:
     void invert(bool enable);
     void superPixel(bool enable);
     void falseColor(bool enable);
+    void drawGrid(bool enable);
     QImage renderToImage();
 protected slots:
     void scrollEvent();

src/imagewidget.cpp

@@ -79,7 +79,7 @@ ImageWidgetGL::ImageWidgetGL(Database *database, QWidget *parent) : QOpenGLWidge
     m_updateTimer = new QTimer(this);
     m_updateTimer->setInterval(500);
     m_updateTimer->setSingleShot(true);
-    connect(m_updateTimer, SIGNAL(timeout()), this, SLOT(update()));
+    connect(m_updateTimer, &QTimer::timeout, this, static_cast<void (QOpenGLWidget::*)()>(&ImageWidgetGL::update));
     setAcceptDrops(true);
     QTimer::singleShot(1000, [this](){
         if(!isValid())
@@ -154,7 +154,7 @@ void ImageWidgetGL::setImage(std::shared_ptr<RawImage> image, int index)
         m_image->bind();
         f->glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
         f->glGenerateMipmap(GL_TEXTURE_2D);
-        qDebug() << "setImage" << timer.elapsed();
+        qDebug() << "ImageWidgetGL::setImage" << timer.elapsed() << "ms";
         m_swPaint = f->glGetError() != GL_NO_ERROR;
     }
 
@@ -180,6 +180,10 @@ void ImageWidgetGL::setImage(std::shared_ptr<RawImage> image, int index)
 void ImageWidgetGL::setWCS(std::shared_ptr<WCSDataT> wcs)
 {
     m_wcs = wcs;
+    m_grid.clear();
+
+    if(m_drawGrid && m_wcs)
+        m_grid = m_wcs->prepareGrid(m_imgWidth, m_imgHeight, m_database);
 }
 
 void ImageWidgetGL::zoom(int zoom, const QPointF &mousePos)
@@ -392,9 +396,9 @@ void swPaint(std::shared_ptr<RawImage> &rawImage, float dx, float dy, float scal
             float iptr;
             float fy = std::modf((y + oy) * iscale, &iptr);
             int64_t py = iptr;
-            int64_t w = py * rawImage->widthBytes();
+            int64_t w = py * rawImage->widthSamples();
             int64_t w2 = w;
-            if(py+1 < imgHeight)w2 += rawImage->widthBytes();
+            if(py+1 < imgHeight)w2 += rawImage->widthSamples();
             if(py >= imgHeight)break;
 
             for(int64_t x = std::max((int64_t)0, -ox); x < width; x++)
@@ -496,6 +500,18 @@ void swPaint(std::shared_ptr<RawImage> &rawImage, float dx, float dy, float scal
     painter.drawImage(0, 0, img);
 }
 
+void ImageWidgetGL::drawGrid(bool enable)
+{
+    if(m_grid.empty && m_wcs)
+        m_grid = m_wcs->prepareGrid(m_imgWidth, m_imgHeight, m_database);
+
+    if(enable != m_drawGrid)
+    {
+        m_drawGrid = enable;
+        update();
+    }
+}
+
 void ImageWidgetGL::paintGL()
 {
     float dx = m_dx;
@@ -613,9 +629,43 @@ void ImageWidgetGL::paintGL()
             m_program->setUniformValue("colormapIdx", m_colormapIdx);
             f->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
             m_vao->release();
+
+            if(m_drawGrid && !m_grid.empty)
+            {
+                QPainter painter(this);
+                painter.setRenderHint(QPainter::Antialiasing);
+                painter.setRenderHint(QPainter::TextAntialiasing);
+
+                painter.setPen(QPen(Qt::yellow, 1.0 / m_scale));
+                QTransform tran;
+                tran.translate(-std::floor(dx), -std::floor(dy));
+                tran.scale(m_scale, m_scale);
+                painter.setTransform(tran);
+                painter.setClipRect(0, 0, m_imgWidth, m_imgHeight);
+                painter.drawPath(m_grid.grid);
+                painter.setPen(Qt::yellow);
+                QFont font({"Arial", "serif-sans"});
+                font.setPointSizeF(12 / m_scale);
+                painter.setFont(font);
+                for(auto &text : m_grid.text)
+                    painter.drawText(QRectF(text.first, QSizeF(4000, 4000)), text.second);
+
+                painter.setPen(QPen(Qt::green, 1.0 / m_scale));
+                QFontMetricsF fontMetric = QFontMetricsF(font);
+                for(auto &object : m_grid.objects)
+                {
+                    QRectF rect = fontMetric.boundingRect(object.name);
+                    rect.moveCenter(object.pixel);
+                    painter.setTransform(tran);
+                    painter.drawText(rect, Qt::TextDontClip, object.name);
+
+                    painter.translate(object.pixel);
+                    painter.rotate(object.pos_ang);
+                    painter.drawEllipse(QPointF(0, 0), object.maj_ax, object.maj_ax);
+                }
+            }
         }
     }
-
 }
 
 void ImageWidgetGL::resizeGL(int w, int h)
@@ -671,19 +721,19 @@ void ImageWidgetGL::initializeGL()
     logger->startLogging();
     connect(logger, &QOpenGLDebugLogger::messageLogged, [](const QOpenGLDebugMessage &message)
             {
-                qDebug() << message;
+                qDebug() << "OpenGL debug" << message;
             });
 
-    qDebug() << "Vendor:"   << (char*)f->glGetString(GL_VENDOR);
-    qDebug() << "Renderer:" << (char*)f->glGetString(GL_RENDERER);
-    qDebug() << "Version:"  << (char*)f->glGetString(GL_VERSION);
+    qDebug() << "OpenGL Vendor:"   << (char*)f->glGetString(GL_VENDOR);
+    qDebug() << "OpenGL Renderer:" << (char*)f->glGetString(GL_RENDERER);
+    qDebug() << "OpenGL Version:"  << (char*)f->glGetString(GL_VERSION);
     f->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &m_maxTextureSize);
     f->glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &m_maxArrayLayers);
     qDebug() << "Max texture size:" << m_maxTextureSize << "max layers:" << m_maxArrayLayers;
 
     //MANUAL_MIPMAP_GEN = QString((const char*)f->glGetString(GL_VENDOR)).startsWith("ATI Technologies Inc", Qt::CaseInsensitive);
 
-    qDebug() << context()->format();
+    qDebug() << "OpenGL context format" << context()->format();
 
     // each vertex is  x,y 2D position and s,t texture coordinates
     float vertexs[] = {-1.0f, -1.0f, 0.0f, 1.0f,
@@ -777,7 +827,7 @@ void ImageWidgetGL::initializeGL()
     m_lut->bind(2);
 
     QImage colormap = loadColormap();
-    m_colormap = std::make_unique<QOpenGLTexture>(QOpenGLTexture::Target1DArray);
+    m_colormap = std::make_unique<QOpenGLTexture>(QOpenGLTexture::Target2DArray);
     m_colormap->setSize(colormap.width());
     m_colormap->setLayers(colormap.height());
     m_colormap->setFormat(QOpenGLTexture::RGBA8_UNorm);

src/imagewidget.h

@@ -8,6 +8,7 @@
 #include <QOpenGLTexture>
 #include <QOpenGLVertexArrayObject>
 #include <QOpenGLFunctions>
+#include <QPainterPath>
 #include "database.h"
 #include "rawimage.h"
 #include "imageinfodata.h"
@@ -37,6 +38,7 @@ public:
     virtual QImage renderToImage() = 0;
     virtual void thumbnailLoaded(const Image *image) = 0;
     virtual void showThumbnail(bool enable) = 0;
+    virtual void drawGrid(bool enable) = 0;
 
     static QImage loadColormap();
 };
@@ -70,6 +72,7 @@ class ImageWidgetGL : public QOpenGLWidget, public ImageWidget
     GLuint m_debayerTex = 0;
     std::shared_ptr<RawImage> m_rawImage;
     std::shared_ptr<WCSDataT> m_wcs;
+    SkyGrid m_grid;
     int m_width, m_height;
     int m_imgWidth = -1, m_imgHeight = -1;
     int m_currentImg = 0;
@@ -87,6 +90,7 @@ class ImageWidgetGL : public QOpenGLWidget, public ImageWidget
     bool m_selecting = false;
     bool m_sizesDirty = false;
     bool m_srgb = false;
+    bool m_drawGrid = false;
     int m_thumbnailCount = 0;
     int m_maxTextureSize = 0;
     int m_maxArrayLayers = 0;
@@ -116,6 +120,7 @@ public:
     QImage renderToImage() override;
     void thumbnailLoaded(const Image *image) override;
     void showThumbnail(bool enable) override;
+    void drawGrid(bool enable) override;
 protected:
     void paintGL() override;
     void resizeGL(int w, int h) override;

src/loadimage.cpp

@@ -83,11 +83,10 @@ int loadFITSHeader(fitsfile *file, ImageInfoData &info)
     return status;
 }
 
-bool loadFITS(const QString path, ImageInfoData &info, std::shared_ptr<RawImage> &image, bool planar)
+bool loadFITS(const QString path, ImageInfoData &info, std::shared_ptr<RawImage> &image, bool planar, uint32_t index)
 {
     fitsfile *file;
     int status = 0;
-    int type = -1;
     int num = 0;
     long naxes[3] = {0};
 
@@ -96,7 +95,7 @@ bool loadFITS(const QString path, ImageInfoData &info, std::shared_ptr<RawImage>
         char err[100];
         fits_get_errstatus(status, err);
         info.info.append({QObject::tr("Error"), QString(err)});
-        qDebug() << "Failed to load FITS file" << err;
+        qWarning() << "Failed to load FITS file" << err;
         return false;
     };
 
@@ -105,16 +104,32 @@ bool loadFITS(const QString path, ImageInfoData &info, std::shared_ptr<RawImage>
     fits_get_num_hdus(file, &num, &status);
     if(status)return checkError();
 
+    int hdutype;
     int imgtype;
     int naxis;
-    for(int i=1; i <= num; i++)
+    std::vector<int> imageIdxs;
+    for(int i = 1; i <= num; i++)
     {
-        fits_movabs_hdu(file, i, IMAGE_HDU, &status);if(status)return checkError();
-        fits_get_hdu_type(file, &type, &status);if(status)return checkError();
+        fits_movabs_hdu(file, i, &hdutype, &status);if(status)return checkError();
+        if(hdutype == IMAGE_HDU)
+        {
+            fits_get_img_param(file, 3, &imgtype, &naxis, naxes, &status);if(status)return checkError();
+            if(naxis >= 2 && naxis <= 3)imageIdxs.push_back(i);
+        }
+    }
+    info.num = imageIdxs.size();
+    info.index = index;
+
+    if(index >= imageIdxs.size())return false;
+
+    fits_movabs_hdu(file, imageIdxs[index], &hdutype, &status);if(status)return checkError();
+    if(hdutype == IMAGE_HDU)
+    {
+        naxes[0] = naxes[1] = naxes[2] = 0;
         fits_get_img_param(file, 3, &imgtype, &naxis, naxes, &status);if(status)return checkError();
         fits_get_img_equivtype(file, &imgtype, &status);if(status)return checkError();
 
-        if(type == IMAGE_HDU && naxis >= 2 && naxis <= 3 && status == 0)
+        if(hdutype == IMAGE_HDU && naxis >= 2 && naxis <= 3 && status == 0)
         {
             RawImage::DataType type;
             int fitstype;
@@ -133,6 +148,10 @@ bool loadFITS(const QString path, ImageInfoData &info, std::shared_ptr<RawImage>
                 type = RawImage::UINT16;
                 fitstype = TUSHORT;
                 break;
+            case LONG_IMG:
+                type = RawImage::UINT32;
+                fitstype = TINT;
+                break;
             case ULONG_IMG:
                 type = RawImage::UINT32;
                 fitstype = TUINT;
@@ -173,13 +192,18 @@ bool loadFITS(const QString path, ImageInfoData &info, std::shared_ptr<RawImage>
                 for(size_t i=0; i<size; i++)
                     s[i] -= INT16_MIN;
             }
+            else if(fitstype == TINT)
+            {
+                uint32_t *s = static_cast<uint32_t*>(img.data());
+                size_t size = img.size() * img.channels();
+                for(size_t i=0; i<size; i++)
+                    s[i] -= INT32_MIN;
+            }
 
             if(img.channels() == 1 || planar)
                 image = std::make_shared<RawImage>(std::move(img));
             else
                 image = RawImage::fromPlanar(img);
-
-            break;
         }
     }
 noload:
@@ -202,30 +226,74 @@ noload:
     return true;
 }
 
-bool loadXISF(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage> &image, bool planar)
+bool loadXISF(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage> &image, bool planar, uint32_t index)
 {
     try
     {
         LibXISF::XISFReader xisf;
         xisf.open(path.toLocal8Bit().data());
 
-        const LibXISF::Image &xisfImage = xisf.getImage(0);
+        if(index >= (uint32_t)xisf.imagesCount())return false;
+        const LibXISF::Image &xisfImage = xisf.getImage(index);
 
         auto fitskeywords = xisfImage.fitsKeywords();
         for(auto fits : fitskeywords)
         {
             info.fitsHeader.append(fits);
         }
+
+        QVector<FITSRecord> xisfWCS;
         auto imageproperties = xisfImage.imageProperties();
         for(auto prop : imageproperties)
         {
             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.wcs = std::make_shared<WCSDataT>(xisfImage.width(), xisfImage.height(), info.fitsHeader);
+        info.num = xisf.imagesCount();
+        info.index = index;
         info.info.append({QObject::tr("Width"), QString::number(xisfImage.width())});
         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;
         switch(xisfImage.sampleFormat())
@@ -267,7 +335,7 @@ bool loadXISF(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage
     catch (LibXISF::Error &err)
     {
         info.info.append(QPair<QString, QString>("Error", err.what()));
-        qDebug() << "Failed to load XISF" << err.what();
+        qWarning() << "Failed to load XISF" << err.what();
         return false;
     }
     info.info.append({QObject::tr("Error"), QObject::tr("Unsupported sample format")});
@@ -314,7 +382,7 @@ bool readXISFHeader(const QString &path, ImageInfoData &info)
     }
     catch (LibXISF::Error &err)
     {
-        qDebug() << err.what();
+        qWarning() << "LibXISF error" << err.what();
         return false;
     }
     return true;
@@ -378,25 +446,26 @@ bool loadRAW(const QString path, ImageInfoData &info, std::shared_ptr<RawImage>
     return true;
 }
 
-bool loadImage(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage> &rawImage, bool planar)
+bool loadImage(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage> &rawImage, int index, bool planar)
 {
     bool ret = false;
     QElapsedTimer timer;
+    QFileInfo fileInfo(path);
     timer.start();
     if(path.endsWith(".CR2", Qt::CaseInsensitive) || path.endsWith(".CR3", Qt::CaseInsensitive) || path.endsWith(".NEF", Qt::CaseInsensitive) || path.endsWith(".DNG", Qt::CaseInsensitive))
     {
         ret = loadRAW(path, info, rawImage);
-        qDebug() << "LoadRAW" << timer.elapsed();
+        qDebug() << "LoadRAW" << timer.elapsed() << "ms";
     }
-    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);
-        qDebug() << "LoadFITS" << timer.elapsed();
+        ret = loadFITS(path, info, rawImage, planar, index);
+        qDebug() << "LoadFITS" << timer.elapsed() << "ms";
     }
-    else if(path.endsWith(".XISF", Qt::CaseInsensitive))
+    else if(isXISF(fileInfo.suffix()))
     {
-        ret = loadXISF(path, info, rawImage, planar);
-        qDebug() << "LoadXISF" << timer.elapsed();
+        ret = loadXISF(path, info, rawImage, planar, index);
+        qDebug() << "LoadXISF" << timer.elapsed() << "ms";
     }
     else
     {
@@ -412,8 +481,18 @@ bool loadImage(const QString &path, ImageInfoData &info, std::shared_ptr<RawImag
             exif_data_free(exif);
         }
         rawImage = std::make_shared<RawImage>(img);
-        qDebug() << "LoadQImage" << timer.elapsed();
+        qDebug() << "LoadQImage" << timer.elapsed() << "ms";
         ret = !img.isNull();
     }
     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;
+}

src/loadimage.h

@@ -9,6 +9,8 @@ class RawImage;
 QString makeUNCPath(const QString &path);
 bool readFITSHeader(const QString &path, ImageInfoData &info);
 bool readXISFHeader(const QString &path, ImageInfoData &info);
-bool loadImage(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage> &rawImage, bool planar = false);
+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

src/loadrunable.cpp

@@ -10,11 +10,12 @@
 #include "loadimage.h"
 #include <lcms2.h>
 
-LoadRunable::LoadRunable(const QString &file, Image *receiver, AnalyzeLevel level, bool thumbnail) :
+LoadRunable::LoadRunable(const QString &file, Image *receiver, AnalyzeLevel level, int index, bool thumbnail) :
     m_file(makeUNCPath(file)),
     m_receiver(receiver),
     m_analyzeLevel(level),
-    m_thumbnail(thumbnail)
+    m_thumbnail(thumbnail),
+    m_index(index)
 {
 }
 
@@ -32,7 +33,7 @@ void LoadRunable::run()
         info.info.append({QObject::tr("Filename"), finfo.fileName()});
 
         std::shared_ptr<RawImage> rawImage;
-        if(!loadImage(m_file, info, rawImage))
+        if(!loadImage(m_file, info, rawImage, m_index))
             info.info.append({QObject::tr("Error"), QObject::tr("Failed to load image")});
 
 
@@ -164,11 +165,12 @@ void writeFITSImage(fitsfile *fw, std::shared_ptr<RawImage> rawimage, ImageInfoD
         double vald = record.value.toDouble(&isdouble);
         int valb = record.value.toString() == "T";
         long long vall = record.value.toLongLong(&isint);
+        if(isint)isint = vall == vald;
         QByteArray str = record.value.toString().toLatin1();
-        if(isdouble)
-            fits_write_key(fw, TDOUBLE, record.key.data(), &vald, record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
-        else if(isint)
+        if(isint)
             fits_write_key(fw, TLONGLONG, record.key.data(), &vall, record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
+        else if(isdouble)
+            fits_write_key(fw, TDOUBLE, record.key.data(), &vald, record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
         else if(isbool)
             fits_write_key(fw, TLOGICAL, record.key.data(), &valb, record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
         else if(record.key == "COMMENT")
@@ -187,11 +189,15 @@ void ConvertRunable::run()
 
     ImageInfoData imageinfo;
     std::shared_ptr<RawImage> rawimage;
-    loadImage(m_infile, imageinfo, rawimage);
+    loadImage(m_infile, imageinfo, rawimage, 0);
     QFileInfo info(m_outfile);
     info.dir().mkpath(".");
 
-    if(m_params.autostretch)
+    if(m_params.stretch)
+    {
+        rawimage->applySTF(m_params.mtf);
+    }
+    else if(m_params.autostretch)
     {
         rawimage->calcStats();
         MTFParam mtfParam = rawimage->calcMTFParams();
@@ -293,7 +299,6 @@ void ConvertRunable::run()
         // if nothing else try QImage
         {
             QImage::Format format = QImage::Format_Invalid;
-            int width = rawimage->widthBytes();
 
             switch(rawimage->type())
             {
@@ -306,7 +311,6 @@ void ConvertRunable::run()
                 if(rawimage->channels() == 1)format = QImage::Format_Grayscale16;
                 else if(rawimage->channels() == 3)format = QImage::Format_RGBX64;
                 else if(rawimage->channels() == 4)format = QImage::Format_RGBA64;
-                width *= 2;
                 break;
             case RawImage::FLOAT16:
             case RawImage::FLOAT32:
@@ -316,15 +320,12 @@ void ConvertRunable::run()
                 if(rawimage->channels() == 1)format = QImage::Format_Grayscale16;
                 else if(rawimage->channels() == 3)format = QImage::Format_RGBX64;
                 else if(rawimage->channels() == 4)format = QImage::Format_RGBA64;
-                width *= 2;
                 break;
             }
 
             if(format == QImage::Format_Invalid)return;
 
-            QImage qimage(rawimage->width(), rawimage->height(), format);
-            for(uint32_t i=0; i < rawimage->height(); i++)
-                std::memcpy(qimage.scanLine(i), rawimage->data(i), width);
+            QImage qimage((const uchar*)rawimage->data(), rawimage->width(), rawimage->height(), rawimage->widthBytes(), format);
             qimage.save(m_outfile);
         }
     }

src/loadrunable.h

@@ -6,6 +6,7 @@
 #include <QSemaphore>
 #include <QSize>
 #include "imageinfodata.h"
+#include "mtfparam.h"
 
 class Image;
 
@@ -15,8 +16,9 @@ class LoadRunable : public QRunnable
     Image *m_receiver;
     AnalyzeLevel m_analyzeLevel;
     bool m_thumbnail;
+    int m_index = 0;
 public:
-    LoadRunable(const QString &file, Image *receiver, AnalyzeLevel level, bool thumbnail = false);
+    LoadRunable(const QString &file, Image *receiver, AnalyzeLevel level, int index, bool thumbnail = false);
     void run() override;
 };
 
@@ -32,6 +34,8 @@ public:
         QSize resize;
         Qt::AspectRatioMode aspect = Qt::KeepAspectRatio;
         bool autostretch = false;
+        bool stretch = false;
+        MTFParam mtf;
         ConvertParams(){}
         ConvertParams(const QVariantMap &map);
     };

src/main.cpp

@@ -0,0 +1,145 @@
+#include "mainwindow.h"
+#include <QApplication>
+#include <QSurfaceFormat>
+#include <QTranslator>
+#include <QCommandLineParser>
+#include <QSettings>
+#include <stdlib.h>
+#include "../thumbnailer/genthumbnail.h"
+#ifdef Q_OS_WIN64
+#include <windows.h>
+#endif
+
+int main(int argc, char *argv[])
+{
+#ifdef __linux__
+    setenv("LC_NUMERIC", "C", 1);
+#endif
+
+#if defined(__i386__) || defined(__x86_64__) || defined(__APPLE__)
+    bool useGLES = false;
+#else
+    bool useGLES = true;
+#endif
+
+#ifdef Q_OS_WIN64
+    if(AttachConsole(ATTACH_PARENT_PROCESS))
+    {
+        freopen("CONOUT$", "w", stdout);
+        freopen("CONOUT$", "w", stderr);
+    }
+#endif
+
+    QCommandLineParser cmd;
+    cmd.addOption({"gl", "Use desktop OpenGL. This is default on x86 and MacOS platform."});
+    cmd.addOption({"gles", "Use OpenGL ES. This is default on ARM platform."});
+    cmd.addOption({{"thumb", "thumbnail"}, "Generate thumbnail and save it to path.", "path"});
+    cmd.addOption({{"s", "size"}, "Size of the thumbnails in pixels (default: 128)", "size", "128"});
+    cmd.addPositionalArgument("file", "Files or paths to open");
+    cmd.addOption({"script", "Execute script", "script"});
+    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.addHelpOption();
+    QStringList cmdArgs;
+    for(int i = 0; i < argc; i++)
+        cmdArgs.append(argv[i]);
+
+    cmd.process(cmdArgs);
+    if(cmd.isSet("gl"))
+        useGLES = false;
+    if(cmd.isSet("gles"))
+        useGLES = true;
+
+    if(cmd.isSet("thumb"))
+    {
+        QCoreApplication app(argc, argv);
+        QStringList files = cmd.positionalArguments();
+        if(files.size() == 0)
+            return 1;
+
+        QString thumb = cmd.value("thumb");
+        int size = 128;
+        bool ok;
+        int size2 = cmd.value("s").toInt(&ok);
+        if(ok)
+            size = size2;
+
+        return generateThumbnail(files.front(), thumb, size);
+    }
+
+    QSurfaceFormat format;
+    if(useGLES)
+    {
+        format.setMajorVersion(3);
+        format.setMinorVersion(0);
+        format.setRenderableType(QSurfaceFormat::OpenGLES);
+    }
+    else
+    {
+        format.setMajorVersion(3);
+        format.setMinorVersion(3);
+        //format.setOption(QSurfaceFormat::DebugContext);
+        format.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
+    }
+    QSurfaceFormat::setDefaultFormat(format);
+
+
+    QApplication a(argc, argv);
+    a.setOrganizationName("nou");
+    a.setApplicationName("Tenmon");
+    a.setWindowIcon(QIcon(":/space.nouspiro.tenmon.png"));
+
+    QTranslator translator;
+    QTranslator translator2;
+    QSettings settings;
+    QString lang = settings.value("settings/lang").toString();
+    if(lang.isEmpty())
+    {
+        if(translator.load(QLocale(), "tenmon", "_", ":/translations"))
+            a.installTranslator(&translator);
+    }
+    else
+    {
+        if(translator.load("tenmon_" + lang, ":/translations"))
+            a.installTranslator(&translator);
+    }
+
+    if(translator2.load(QLocale(), "tenmon", "_", a.applicationDirPath()))
+        a.installTranslator(&translator2);
+
+    MainWindow w;
+    w.show();
+
+    if(!cmd.positionalArguments().isEmpty() && !cmd.isSet("script"))
+    {
+        QStringList files = cmd.positionalArguments();
+        QStringList paths;
+        for(auto &arg : files)
+        {
+            QUrl url(arg);
+            QFileInfo info(url.isLocalFile() ? url.toLocalFile() : arg);
+            if(info.exists())
+                paths.append(info.canonicalFilePath());
+        }
+        if(paths.size() == 1)
+            w.loadFile(paths.front());
+        else if(paths.size() > 1)
+            w.loadFiles(paths);
+    }
+
+    if(cmd.isSet("script"))
+    {
+        QStringList paths = cmd.positionalArguments();
+        QString script = cmd.value("script");
+        QString outdir = cmd.value("outdir");
+        QString arg = cmd.value("scriptarg");
+        if(!QDir::isAbsolutePath(script))script = QDir::currentPath() + "/" + script;
+        if(!QDir::isAbsolutePath(outdir))outdir = QDir::currentPath() + "/" + outdir;
+        bool noexit = cmd.isSet("noexit");
+        if(!noexit)w.hide();
+        w.runScript(script, outdir, paths, arg, !noexit);
+    }
+
+    return a.exec();
+}

src/mainwindow.cpp

@@ -18,10 +18,12 @@
 #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"
@@ -29,6 +31,7 @@
 #include "settingsdialog.h"
 #include "histogram.h"
 #include "batchprocessing.h"
+#include "filemanager.h"
 
 #ifdef __linux__
 #include <sys/ioctl.h>
@@ -56,16 +59,23 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     for(auto format : supportedFormats)
     {
         QMimeType mimeType = db.mimeTypeForName(format);
-        _saveFilter.append(mimeType.filterString() + ";;");
         _openFilter.append("*.");
         _openFilter.append(mimeType.suffixes().join(" *."));
         _openFilter.append(" ");
         nameFilter.append(mimeType.suffixes());
     }
+    auto supportedWrite = QImageWriter::supportedMimeTypes();
+    for(auto format : supportedWrite)
+    {
+        QMimeType mimeType = db.mimeTypeForName(format);
+        _saveFilter.append(mimeType.filterString() + ";;");
+    }
+
     _openFilter.append("*.fit *.fits *.fts *.fz *.xisf *.cr2 *.cr3 *.nef *.dng)");
     _openFilter.append(tr(";;All files (*)"));
     nameFilter.append({"fit", "fits", "fts", "fz", "xisf", "cr2", "cr3", "nef", "dng"});
     QImageReader::setAllocationLimit(0);
+    _openSuffix = {nameFilter.constBegin(), nameFilter.constEnd()};
 
     m_info = new ImageInfo(this);
     QDockWidget *infoDock = new QDockWidget(tr("Image info"), this);
@@ -92,21 +102,25 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     connect(m_stretchPanel, &StretchToolbar::invert, m_image, &ImageScrollArea::invert);
     connect(m_stretchPanel, &StretchToolbar::superPixel, m_image, &ImageScrollArea::superPixel);
     connect(m_stretchPanel, &StretchToolbar::falseColor, m_image, &ImageScrollArea::falseColor);
+    connect(m_stretchPanel, &StretchToolbar::drawGrid, m_image, &ImageScrollArea::drawGrid);
 
     m_ringList = new ImageRingList(m_database, nameFilter, this);
     m_filesystem = new FilesystemWidget(m_ringList, this);
-    connect(m_filesystem, SIGNAL(fileSelected(int)), this, SLOT(loadFile(int)));
+    connect(m_filesystem, &FilesystemWidget::fileSelected, this, static_cast<void (MainWindow::*)(int)>(&MainWindow::loadFile));
     connect(m_filesystem, &FilesystemWidget::sortChanged, m_ringList, &ImageRingList::setSort);
     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);
     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::moveFiles, [this](const QString &path){ copyOrMove(false, path); });
     connect(m_filetree, &Filetree::indexDirectory, this, static_cast<void (MainWindow::*)(const QString &)>(&MainWindow::indexDir));
+#endif
 
     m_databaseView = new DataBaseView(m_database, this);
-    connect(m_databaseView, SIGNAL(loadFile(QString)), this, SLOT(loadFile(QString)));
+    connect(m_databaseView, &DataBaseView::loadFile, this, static_cast<void (MainWindow::*)(const QString &)>(&MainWindow::loadFile));
 
 #ifdef PLATESOLVER
     _plateSolving = new PlateSolving(this);
@@ -114,6 +128,23 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     _plateSolving->hide();
 #endif
 
+    _databaseTree = new DatabaseTree(m_database, this);
+
+    QToolBar *navigationToolbar = new QToolBar(tr("Navigation toolbar"), this);
+    navigationToolbar->setObjectName("navigationtoolbar");
+    navigationToolbar->hide();
+    QAction *prevAction = navigationToolbar->addAction(style()->standardIcon(QStyle::SP_ArrowLeft), tr("Previous image"));
+    prevAction->setShortcuts({Qt::Key_Left, Qt::Key_Up});
+    QAction *nextAction = navigationToolbar->addAction(style()->standardIcon(QStyle::SP_ArrowRight), tr("Next image"));
+    nextAction->setShortcuts({Qt::Key_Right, Qt::Key_Down});
+    QAction *prevSubAction = navigationToolbar->addAction(style()->standardIcon(QStyle::SP_ArrowUp), tr("Prev sub image"), Qt::Key_PageUp);
+    QAction *nextSubAction = navigationToolbar->addAction(style()->standardIcon(QStyle::SP_ArrowDown), tr("Next sub image"), Qt::Key_PageDown);
+    connect(prevAction, &QAction::triggered, m_ringList, static_cast<void (ImageRingList::*)()>(&ImageRingList::decrement));
+    connect(nextAction, &QAction::triggered, m_ringList, static_cast<void (ImageRingList::*)()>(&ImageRingList::increment));
+    connect(prevSubAction, &QAction::triggered, m_ringList, static_cast<void (ImageRingList::*)()>(&ImageRingList::prevSubImage));
+    connect(nextSubAction, &QAction::triggered, m_ringList, static_cast<void (ImageRingList::*)()>(&ImageRingList::nextSubImage));
+
+    addToolBar(Qt::TopToolBarArea, navigationToolbar);
     addToolBar(Qt::TopToolBarArea, m_stretchPanel);
 
     QDockWidget *filesystemDock = new QDockWidget(tr("Filesystem"), this);
@@ -125,13 +156,17 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     databaseViewDock->setWidget(m_databaseView);
     databaseViewDock->setObjectName("databaseViewDock");
     databaseViewDock->hide();
+    connect(databaseViewDock, &QDockWidget::visibilityChanged, m_databaseView, &DataBaseView::visible);
     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->setObjectName("filetreeDock");
     databaseViewDock->hide();
     addDockWidget(Qt::LeftDockWidgetArea, filetreeDock);
+#endif
 
     Histogram *histogram = new Histogram(this);
     QDockWidget *histogramDock = new QDockWidget(tr("Histogram"), this);
@@ -140,6 +175,15 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     histogramDock->hide();
     addDockWidget(Qt::LeftDockWidgetArea, histogramDock);
 
+    DatabaseTreeView *databaseTreeView = new DatabaseTreeView(m_database, this);
+    QDockWidget *databaseTreeDock = new QDockWidget(tr("Database Tree"), this);
+    databaseTreeDock->setObjectName("databasetreeDock");
+    databaseTreeDock->setWidget(databaseTreeView);
+    databaseTreeDock->hide();
+    connect(databaseTreeDock, &QDockWidget::visibilityChanged, databaseTreeView, &DatabaseTreeView::visible);
+    connect(databaseTreeView, &DatabaseTreeView::loadFile, this, static_cast<void (MainWindow::*)(const QString &)>(&MainWindow::loadFile));
+    addDockWidget(Qt::BottomDockWidgetArea, databaseTreeDock);
+
     setWindowTitle(tr("Tenmon"));
 
     connect(m_ringList, &ImageRingList::pixmapLoaded, m_image, &ImageScrollArea::imageLoaded);
@@ -151,30 +195,39 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     connect(m_ringList, &ImageRingList::pixmapLoaded, histogram, &Histogram::imageLoaded);
 #ifdef PLATESOLVER
     connect(m_ringList, &ImageRingList::pixmapLoaded, _plateSolving, &PlateSolving::imageLoaded);
+    connect(_plateSolving, &PlateSolving::headerUpdated, m_ringList, &ImageRingList::reloadImage);
 #endif
     connect(m_image, &ImageScrollArea::fileDropped, this, static_cast<void (MainWindow::*)(const QString &)>(&MainWindow::loadFile));
 
     QMenu *fileMenu = new QMenu(tr("File"), this);
-    fileMenu->addAction(tr("Open"), QKeySequence::Open, this, SLOT(loadFile()));
+    fileMenu->addAction(tr("Open"), QKeySequence::Open, this, static_cast<void (MainWindow::*)()>(&MainWindow::loadFile));
     fileMenu->addAction(tr("Open directory recursively"), this, &MainWindow::loadDir);
-    QAction *saveAs = fileMenu->addAction(tr("Save as"), QKeySequence::Save, this, SLOT(saveAs()));
+    QAction *saveAs = fileMenu->addAction(tr("Save as"), QKeySequence::Save, this, &MainWindow::saveAs);
     fileMenu->addSeparator();
-    fileMenu->addAction(tr("Copy marked files"), Qt::Key_F5, this, SLOT(copyMarked()));
-    fileMenu->addAction(tr("Move marked files"), Qt::Key_F6, this, SLOT(moveMarked()));
-    fileMenu->addAction(tr("Move marked files to trash"), QKeySequence::Delete, this, &MainWindow::deleteMarked);
+#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("Move marked files"), Qt::Key_F6, this, &MainWindow::moveMarked);
+    QAction *deleteAction = fileMenu->addAction(tr("Move marked files to trash"), QKeySequence::Delete, this, &MainWindow::deleteMarked);
+#ifdef Q_OS_MACOS
+    deleteAction->setShortcuts(QList<QKeySequence>({Qt::Key_Backspace, QKeySequence::Delete}));
+#else
+    deleteAction->setShortcuts(QKeySequence::Delete);
+#endif
     fileMenu->addSeparator();
-    fileMenu->addAction(tr("Index directory"), this, SLOT(indexDir()));
-    fileMenu->addAction(tr("Reindex files"), this, SLOT(reindex()));
+    fileMenu->addAction(tr("Index directory"), this, static_cast<void (MainWindow::*)()>(&MainWindow::indexDir));
+    fileMenu->addAction(tr("Reindex files"), this, &MainWindow::reindex);
     fileMenu->addAction(tr("Export database to CSV"), this, &MainWindow::exportCSV);
     fileMenu->addAction(tr("Batch processing"), Qt::Key_B | Qt::CTRL, [this](){
-        BatchProcessing *batchProcessing = new BatchProcessing(this);
+        BatchProcessing *batchProcessing = new BatchProcessing(m_database, this);
         batchProcessing->exec();
         delete batchProcessing;
     });
     fileMenu->addSeparator();
-    QAction *liveModeAction = fileMenu->addAction(tr("Live mode"), this, SLOT(liveMode(bool)));
+    QAction *liveModeAction = fileMenu->addAction(tr("Live mode"), this, &MainWindow::liveMode);
     liveModeAction->setCheckable(true);
-    QAction *exitAction = fileMenu->addAction(tr("Exit"), this, SLOT(close()));
+    QAction *exitAction = fileMenu->addAction(tr("Exit"), QCoreApplication::instance(), &QCoreApplication::quit, Qt::QueuedConnection);
     exitAction->setShortcut(QKeySequence::Quit);
     menuBar()->addMenu(fileMenu);
 
@@ -182,6 +235,13 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     editMenu->addAction(tr("Settings"), this, &MainWindow::showSettingsDialog);
     menuBar()->addMenu(editMenu);
 
+    QMenu *navigationMenu = new QMenu(tr("Navigation"), this);
+    navigationMenu->addAction(prevAction);
+    navigationMenu->addAction(nextAction);
+    navigationMenu->addAction(prevSubAction);
+    navigationMenu->addAction(nextSubAction);
+    menuBar()->addMenu(navigationMenu);
+
     QMenu *viewMenu = new QMenu(tr("View"), this);
     viewMenu->addAction(tr("Zoom In"), QKeySequence::ZoomIn, m_image, &ImageScrollArea::zoomIn);
     viewMenu->addAction(tr("Zoom Out"), QKeySequence::ZoomOut, m_image, &ImageScrollArea::zoomOut);
@@ -229,7 +289,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
         settings.setValue("mainwindow/colormap", data);
     });
 
-
     QAction *thumbnailsAction = viewMenu->addAction(tr("Thumbnails"), Qt::Key_F2, [this](bool checked){
         if(SettingsDialog::loadThumbsizes())m_ringList->clearThumbnails();
         m_image->allocateThumbnails(m_ringList->imageNames());
@@ -240,14 +299,18 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     thumbnailsAction->setCheckable(true);
     QAction *slideshowAction = viewMenu->addAction(tr("Slideshow"), Qt::Key_F3, m_ringList, &ImageRingList::toggleSlideshow);
     slideshowAction->setCheckable(true);
+    viewMenu->addSeparator();
+    auto actionList = m_stretchPanel->actions();
+    actionList.removeFirst();
+    viewMenu->addActions(actionList);
     menuBar()->addMenu(viewMenu);
 
     QMenu *selectMenu = new QMenu(tr("Select"), this);
-    selectMenu->addAction(tr("Mark"), Qt::Key_F7, this, SLOT(markImage()));
-    selectMenu->addAction(tr("Unmark"), Qt::Key_F8, this, SLOT(unmarkImage()));
+    selectMenu->addAction(tr("Mark"), Qt::Key_F7, this, &MainWindow::markImage);
+    selectMenu->addAction(tr("Unmark"), Qt::Key_F8, this, &MainWindow::unmarkImage);
     selectMenu->addSeparator();
-    selectMenu->addAction(tr("Mark and next"), Qt::Key_M, this, SLOT(markAndNext()));
-    selectMenu->addAction(tr("Unmark and next"), Qt::Key_X, this, SLOT(unmarkAndNext()));
+    selectMenu->addAction(tr("Mark and next"), Qt::Key_M, this, &MainWindow::markAndNext);
+    selectMenu->addAction(tr("Unmark and next"), Qt::Key_X, this, &MainWindow::unmarkAndNext);
     selectMenu->addSeparator();
     selectMenu->addAction(tr("Show marked list"), this, &MainWindow::showMarkFilesDialog);
     QAction *openMarked = selectMenu->addAction(tr("Open marked"), m_ringList, &ImageRingList::setMarked);
@@ -282,9 +345,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     QMenu *dockMenu = new QMenu(tr("Docks"), this);
     dockMenu->addAction(infoDock->toggleViewAction());
     dockMenu->addAction(m_stretchPanel->toggleViewAction());
+    dockMenu->addAction(navigationToolbar->toggleViewAction());
     dockMenu->addAction(filesystemDock->toggleViewAction());
     dockMenu->addAction(databaseViewDock->toggleViewAction());
-    dockMenu->addAction(filetreeDock->toggleViewAction());
+    dockMenu->addAction(databaseTreeDock->toggleViewAction());
+    if(filetreeDock)dockMenu->addAction(filetreeDock->toggleViewAction());
     dockMenu->addAction(histogramDock->toggleViewAction());
 #ifdef PLATESOLVER
     dockMenu->addAction(_plateSolving->toggleViewAction());
@@ -292,7 +357,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     menuBar()->addMenu(dockMenu);
 
     QMenu *helpMenu = menuBar()->addMenu(tr("Help"));
-    helpMenu->addAction(tr("Help"), QKeySequence::HelpContents, [this]{ HelpDialog help(this); help.exec(); });
+    helpMenu->addAction(tr("Help"), QKeySequence::HelpContents, [this]{ HelpDialog *help = new HelpDialog(this); help->show(); });
     helpMenu->addAction(tr("About Tenmon"), [this]{ About about(this); about.exec(); });
     helpMenu->addAction(tr("About Qt"), [this](){ QMessageBox::aboutQt(this); });
     helpMenu->addAction(tr("Check for update"), this, &MainWindow::checkNewVersion);
@@ -327,22 +392,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 
     _lastDir = settings.value("mainwindow/lastdir", _lastDir).toString();
 
-    QStringList args = QCoreApplication::arguments();
-    args.removeFirst();
-    for(auto &arg : args)
-    {
-        QUrl url(arg);
-        QFileInfo info(url.isLocalFile() ? url.toLocalFile() : arg);
-        if(info.exists())
-        {
-            m_ringList->setFile(info.canonicalFilePath());
-            updateWindowTitle();
-            _lastDir = info.absoluteDir().absolutePath();
-            settings.setValue("mainwindow/lastdir", _lastDir);
-            break;
-        }
-    }
-
     m_image->setFocus();
 
     // workaround for nasty wayland backend bug https://bugreports.qt.io/browse/QTBUG-87332
@@ -351,7 +400,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
         infoDock->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable);
         filesystemDock->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);
     }
 }
@@ -361,32 +411,6 @@ MainWindow::~MainWindow()
     delete m_database;
 }
 
-void MainWindow::keyPressEvent(QKeyEvent *event)
-{
-    switch (event->key())
-    {
-    case Qt::Key_Left:
-    case Qt::Key_Up:
-        m_ringList->decrement();
-        break;
-    case Qt::Key_Right:
-    case Qt::Key_Down:
-        m_ringList->increment();
-        break;
-    default:
-        event->ignore();
-        break;
-    }
-
-    if(event->isAccepted())
-        updateWindowTitle();
-}
-
-void MainWindow::keyReleaseEvent(QKeyEvent *event)
-{
-    event->ignore();
-}
-
 void MainWindow::setupSigterm()
 {
 #ifdef __linux__
@@ -403,7 +427,7 @@ void MainWindow::setupSigterm()
 
     ::socketpair(AF_UNIX, SOCK_STREAM, 0, socketPair);
     socketNotifier = new QSocketNotifier(socketPair[1], QSocketNotifier::Read, this);
-    connect(socketNotifier, SIGNAL(activated(int)), this, SLOT(socketNotify()));
+    connect(socketNotifier, &QSocketNotifier::activated, this, &MainWindow::socketNotify);
 #endif
 }
 
@@ -565,6 +589,11 @@ void MainWindow::loadFile(const QString &path)
     }
 }
 
+void MainWindow::loadFiles(const QStringList &paths)
+{
+    m_ringList->setFiles(paths);
+}
+
 void MainWindow::loadFile(int row)
 {
     m_ringList->loadFile(row);
@@ -610,12 +639,16 @@ void MainWindow::reindex()
 void MainWindow::saveAs()
 {
     QString selectedFilter;
+    ImagePtr ptr = m_ringList->currentImage();
+    if(!ptr)return;
+
+    QFileInfo srcFile(ptr->name());
     QString file = QFileDialog::getSaveFileName(this,
                                  tr("Save as"),
-                                 _lastDir,
+                                 _lastDir + "/" + srcFile.baseName(),
                                  _saveFilter,
                                  &selectedFilter);
-    auto filterToFormat = [](const QString &file, const QString &filter) -> const char*
+    auto filterToFormat = [](const QString &file, const QString &filter) -> const QString
     {
         QString suffix = QFileInfo(file).suffix();
         if(!suffix.compare("jpg", Qt::CaseInsensitive) || !suffix.compare("jpeg", Qt::CaseInsensitive))return "jpeg";
@@ -625,30 +658,31 @@ void MainWindow::saveAs()
         if(filter.contains("png"))return "png";
         if(filter.contains("fits"))return "fits";
         if(filter.contains("xisf"))return "xisf";
+        QRegularExpression suf("\\(\\*\\.([a-zA-Z]+).*\\)");
+        auto match = suf.match(filter);
+        if(match.hasMatch())
+            return match.captured(1);
         return "jpeg";
     };
 
     if(!file.isEmpty())
     {
+        auto button = QMessageBox::question(this, tr("Apply stretch?"), tr("Apply current stretch function to image?"));
+
         QString format = filterToFormat(file, selectedFilter);
 
-        if(format == "fits" || format == "xisf")
-        {
-            convert(file, format);
-        }
-        else
-        {
-            QImage img = m_image->renderToImage();
-            if(!img.isNull())
-                img.save(file, filterToFormat(file, selectedFilter));
-        }
+        convert(file, format, button == QMessageBox::Yes);
     }
 }
 
-void MainWindow::convert(const QString &outfile, const QString &format)
+void MainWindow::convert(const QString &outfile, const QString &format, bool stretch)
 {
     QString file = m_ringList->currentImage()->name();
-    QThreadPool::globalInstance()->start(new ConvertRunable(file, outfile, format));
+    ConvertRunable::ConvertParams param;
+    param.stretch = stretch;
+    param.mtf = m_stretchPanel->params();
+
+    QThreadPool::globalInstance()->start(new ConvertRunable(file, outfile, format, param));
 }
 
 void MainWindow::markImage()
@@ -801,7 +835,7 @@ void MainWindow::checkNewVersion()
                 if(QMessageBox::question(this, tr("Update check"), tr("New version %1 is available. Do you want to download it now?").arg(tag)) == QMessageBox::Yes)
                 {
                     QUrl url(json.object().value("html_url").toString());
-                    qDebug() << url;
+                    qDebug() << "Opening url" << url;
                     if(url.host() == "gitea.nouspiro.space")
                         QDesktopServices::openUrl(url);
                 }
@@ -817,13 +851,38 @@ 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::runScript(const QString &script, const QString &outdir, const QStringList &paths, const QString &arg, bool exit)
+{
+    BatchProcessing *batchProcessing = new BatchProcessing(m_database, this);
+    batchProcessing->setOutputDir(outdir);
+    batchProcessing->setPaths(paths);
+    if(exit)batchProcessing->hide();
+    QTimer::singleShot(500, [batchProcessing, script, exit, arg](){
+        batchProcessing->runScript(script, arg, exit);
+        batchProcessing->exec();
+        delete batchProcessing;
+        if(exit)QCoreApplication::exit();
+    });
+}
+
 void MainWindow::updateWindowTitle()
 {
     ImagePtr ptr = m_ringList->currentImage();
     if(ptr)
     {
-        QFileInfo info(ptr->name());
-        QString title = info.fileName();
+        QDir dir(m_ringList->currentDir());
+        QString title = dir.relativeFilePath(ptr->name());
+        if(ptr->info().num > 1)
+            title += QString(" [%1/%2]").arg(ptr->info().index + 1).arg(ptr->info().num);
         if(m_database->isMarked(ptr->name()))
                 title += " *";
         setWindowTitle(title);

src/mainwindow.h

@@ -11,6 +11,7 @@
 #include "stretchtoolbar.h"
 #include "databaseview.h"
 #include "platesolving.h"
+#include "databasetree.h"
 
 class MainWindow : public QMainWindow
 {
@@ -23,36 +24,37 @@ class MainWindow : public QMainWindow
     FilesystemWidget *m_filesystem;
     Filetree *m_filetree;
     DataBaseView *m_databaseView;
-    PlateSolving *_plateSolving;
+    PlateSolving *_plateSolving = nullptr;
+    DatabaseTree *_databaseTree = nullptr;
     static int socketPair[2];
     QSocketNotifier *socketNotifier;
     QString _lastDir;
     bool _maximized;
     QString _openFilter;
     QString _saveFilter;
+    QSet<QString> _openSuffix;
 public:
     MainWindow(QWidget *parent = 0);
     ~MainWindow() override;
 protected:
-    void keyPressEvent(QKeyEvent *event) override;
-    void keyReleaseEvent(QKeyEvent *event) override;
     void setupSigterm();
     static void signalHandler(int);
     void closeEvent(QCloseEvent *event) override;
     void copyOrMove(bool copy);
     void copyOrMove(bool copy, const QString &dest);
-protected slots:
+public slots:
     void socketNotify();
     void updateWindowTitle();
     void loadFile();
     void loadFile(const QString &path);
+    void loadFiles(const QStringList &paths);
     void loadFile(int row);
     void loadDir();
     void indexDir();
     void indexDir(const QString &dir);
     void reindex();
     void saveAs();
-    void convert(const QString &outfile, const QString &format);
+    void convert(const QString &outfile, const QString &format, bool stretch);
     void markImage();
     void unmarkImage();
     void markAndNext();
@@ -68,6 +70,8 @@ protected slots:
     void showSettingsDialog();
     void exportCSV();
     void checkNewVersion();
+    void openFileManager();
+    void runScript(const QString &script, const QString &outdir, const QStringList &paths, const QString &arg, bool exit);
 };
 
 #endif // MAINWINDOW_H

src/platesolving.cpp

@@ -44,6 +44,7 @@ PlateSolving::PlateSolving(QWidget *parent)
     connect(_solver, &Solver::solvingDone, this, &PlateSolving::solvingDone);
     connect(_solver, &Solver::extractionDone, this, &PlateSolving::extractionDone);
     connect(_solver, &Solver::logOutput, [this](const QString &log){ _ui->log->appendPlainText(log); });
+    connect(_solver, &Solver::headerUpdated, this, &PlateSolving::headerUpdated);
 }
 
 PlateSolving::~PlateSolving()

src/platesolving.h

@@ -1,7 +1,7 @@
 #ifndef PLATESOLVING_H
 #define PLATESOLVING_H
 
-#include "qelapsedtimer.h"
+#include <QElapsedTimer>
 #include <QDockWidget>
 
 class Solver;
@@ -32,6 +32,8 @@ public slots:
     void updateHeader();
     void imageLoaded(Image *image);
     void settings();
+signals:
+    void headerUpdated(const QString &path);
 private:
     Ui::PlateSolving *_ui;
 };

src/rawimage.cpp

@@ -1,16 +1,24 @@
 #include "rawimage.h"
 #include <cstring>
-#include <lcms2.h>
+#include <algorithm>
 #ifndef NO_QT
+#include <lcms2.h>
 #include <QDebug>
 #include <QElapsedTimer>
 #include <QFloat16>
 #include <QColorSpace>
 using F16 = qfloat16;
 #else
-#include <algorithm>
+#define __STDC_WANT_IEC_60559_TYPES_EXT__
+#include <float.h>
+#ifdef FLT16_MAX
 using F16 = _Float16;
-#endif
+#else
+#include "tfloat16.h"
+using F16 = TFloat16;// this is only for MXE
+#endif // FLT16_MAX
+
+#endif // NO_QT
 
 int THUMB_SIZE = 128;
 int THUMB_SIZE_BORDER = 138;
@@ -47,7 +55,7 @@ void RawImage::allocate(uint32_t w, uint32_t h, uint32_t ch, DataType type)
     m_width = w;
     m_height = h;
     m_channels = ch;
-    m_ch = ch == 3 ? 4 : ch;
+    m_ch = ch > 1 ? 4 : ch;
     m_origType = m_type = type;
     m_pixels = std::make_unique<PixelType[]>((size_t)m_width * m_height * m_ch * typeSize(type));
 }
@@ -190,7 +198,7 @@ void calcStats(const T *data, size_t n, size_t w, RawImage::Stats &stats)
     auto findMedian = [histSize](std::vector<uint32_t> &histogram, size_t n) -> size_t
     {
         size_t histSum = 0;
-        for(size_t o=0; o < histSize; o++)
+        for(size_t o=1; o < histSize; o++)
         {
             histSum += histogram[o];
             if(histSum >= n/2)
@@ -231,6 +239,57 @@ void calcStats(const T *data, size_t n, size_t w, RawImage::Stats &stats)
         }
     }
 
+    if constexpr(std::is_floating_point_v<T>)
+    {
+        T mmin = *std::min_element(min, min + 4);
+        T mmax = *std::max_element(max, max + 4);
+
+        T a = 1.0 / (mmax - mmin);
+        T b = -mmin / (mmax - mmin);
+
+        auto histFunc = [&](T d, int x)
+        {
+            uint16_t idx = std::clamp((T)(d * a + b) * histSize, (T)0.0, (T)65535.0);
+            histogram[x][idx]++;
+        };
+
+        // calculate histogram again
+        if(mmin < 0.0 || mmax > 1.0)
+        {
+            for(int i=0; i<4; i++)
+            {
+                histogram[i].clear();
+                histogram[i].resize(histSize, 0);
+            }
+
+            for(size_t i = 0; i < n; i++)
+            {
+                histFunc(data[i*ch], 0);
+                if constexpr(ch >= 3)
+                {
+                    histFunc(data[i*ch + 1], 1);
+                    histFunc(data[i*ch + 2], 2);
+                }
+            }
+
+            if constexpr(ch == 1)
+            {
+                size_t h = (n / w) & (SIZE_MAX-1);
+                w &= (SIZE_MAX-1);
+                for(size_t y=0; y<h; y+=2)
+                {
+                    for(size_t x=0; x<w; x+=2)
+                    {
+                        histFunc(data[y*w+x], 1);
+                        histFunc(data[y*w+x+1], 2);
+                        histFunc(data[(y+1)*w+x], 2);
+                        histFunc(data[(y+1)*w+x+1], 3);
+                    }
+                }
+            }
+        }
+    }
+
     for(int i = 0; i < 4; i++)
     {
         stats.m_min[i] = min[i];
@@ -240,7 +299,8 @@ void calcStats(const T *data, size_t n, size_t w, RawImage::Stats &stats)
         double sum2 = (double)sum[i] * sum[i];
         stats.m_stdDev[i] = std::sqrt((sumSq[i] - sum2 / na[i]) / (na[i] - 1));
 
-        uint32_t median = findMedian(histogram[i], na[i]);
+        size_t naclip = na[i] - histogram[i][0];
+        uint32_t median = findMedian(histogram[i], naclip);
         stats.m_median[i] = median;
         std::vector<uint32_t> madHist(histSize, 0);
         madHist[0] = histogram[i][median];
@@ -249,7 +309,7 @@ void calcStats(const T *data, size_t n, size_t w, RawImage::Stats &stats)
             if(median + o < histSize)madHist[o] += histogram[i][median + o];
             if(o <= median)madHist[o] += histogram[i][median - o];
         }
-        stats.m_mad[i] = findMedian(madHist, na[i]);
+        stats.m_mad[i] = findMedian(madHist, naclip);
         if constexpr(!std::numeric_limits<T>::is_integer)
         {
             stats.m_median[i] /= 65535.0;
@@ -343,7 +403,12 @@ uint32_t RawImage::norm() const
     }
 }
 
-uint32_t RawImage::widthBytes() const
+uint64_t RawImage::widthBytes() const
+{
+    return (uint64_t)m_ch * m_width * typeSize(m_type);
+}
+
+uint32_t RawImage::widthSamples() const
 {
     return m_ch * m_width;
 }
@@ -414,13 +479,25 @@ void RawImage::convertToThumbnail()
 
                 if(m_channels == 1)
                 {
-                    out[idx] = out[idx + 1] = out[idx + 2] = (F16)(in[idx2] * scale);
+                    if(scale == 1.0f)
+                        out[idx] = out[idx + 1] = out[idx + 2] = (F16)(in[idx2]);
+                    else
+                        out[idx] = out[idx + 1] = out[idx + 2] = (F16)(in[idx2] * scale);
                 }
                 else
                 {
-                    out[idx]     = (F16)(in[idx2] * scale);
-                    out[idx + 1] = (F16)(in[idx2 + 1] * scale);
-                    out[idx + 2] = (F16)(in[idx2 + 2] * scale);
+                    if(scale == 1.0f)
+                    {
+                        out[idx]     = (F16)(in[idx2]);
+                        out[idx + 1] = (F16)(in[idx2 + 1]);
+                        out[idx + 2] = (F16)(in[idx2 + 2]);
+                    }
+                    else
+                    {
+                        out[idx]     = (F16)(in[idx2] * scale);
+                        out[idx + 1] = (F16)(in[idx2 + 1] * scale);
+                        out[idx + 2] = (F16)(in[idx2 + 2] * scale);
+                    }
                 }
                 out[idx + 3] = (F16)1.0f;
             }
@@ -496,9 +573,9 @@ void convertType2(size_t size, const T *src, U *dst)
 
     if constexpr(std::is_integral_v<T> && (std::is_floating_point_v<U> || std::is_same_v<U, F16>))
     {
-        U scale = (U)(1.0 / (double)std::numeric_limits<T>::max());
+        float scale = (float)(1.0 / (double)std::numeric_limits<T>::max());
         for(size_t i = 0; i < size; i++)
-            dst[i] = (U)src[i] * scale;
+            dst[i] = (U)(src[i] * scale);
     }
 }
 
@@ -824,7 +901,7 @@ std::pair<float, float> RawImage::unitScale() const
     }
 
     if(min < 0.0f || max > 1.0f)
-        return {1.0f / (max - min), min / (max - min)};
+        return {1.0f / (max - min), -min / (max - min)};
     else
         return {1.0f, 0.0f};
 }
@@ -994,7 +1071,6 @@ void RawImage::setICCProfile(const QByteArray &icc)
     if(icc.size())
         m_iccProfile = std::vector<uint8_t>(icc.begin(), icc.end());
 }
-#endif
 
 void RawImage::setICCProfile(const LibXISF::ByteArray &icc)
 {
@@ -1103,6 +1179,7 @@ void RawImage::generateLUT()
     cmsCloseProfile(inProfile);
     cmsCloseProfile(outProfile);
 }
+#endif
 
 void RawImage::applySTF(const MTFParam &mtfParams)
 {
@@ -1112,15 +1189,34 @@ void RawImage::applySTF(const MTFParam &mtfParams)
         if constexpr(std::numeric_limits<std::remove_reference_t<decltype(*src)>>::is_integer)
             s = (float)std::numeric_limits<std::remove_reference_t<decltype(*src)>>::max();
 
+        auto unit = unitScale();
         float iscale = 1.0f / s;
         size_t len = size() * m_ch;
         for(size_t i = 0; i < len; i++)
         {
-            float x = src[i] * iscale;
-            x = (x - mtfParams.blackPoint[0]) / (mtfParams.whitePoint[0] - mtfParams.blackPoint[0]);
-            x = std::clamp(x, 0.0f, 1.0f);
-            x = ((mtfParams.midPoint[0] - 1.0f) * x) / ((2.0f * mtfParams.midPoint[0] - 1.0f) * x - mtfParams.midPoint[0]);
-            src[i] = x * s;
+            float x;
+            if(m_ch == 4)
+            {
+                size_t c = i & 0x3;
+                if(c < 3)
+                {
+                    if constexpr(std::numeric_limits<std::remove_reference_t<decltype(*src)>>::is_integer)x = src[i] * iscale;
+                    else x = src[i] * unit.first + unit.second;
+                    x = (x - mtfParams.blackPoint[c]) / (mtfParams.whitePoint[c] - mtfParams.blackPoint[c]);
+                    x = std::clamp(x, 0.0f, 1.0f);
+                    x = ((mtfParams.midPoint[c] - 1.0f) * x) / ((2.0f * mtfParams.midPoint[c] - 1.0f) * x - mtfParams.midPoint[c]);
+                    src[i] = x * s;
+                }
+            }
+            else
+            {
+                if constexpr(std::numeric_limits<std::remove_reference_t<decltype(*src)>>::is_integer)x = src[i] * iscale;
+                else x = src[i] * unit.first + unit.second;
+                x = (x - mtfParams.blackPoint[0]) / (mtfParams.whitePoint[0] - mtfParams.blackPoint[0]);
+                x = std::clamp(x, 0.0f, 1.0f);
+                x = ((mtfParams.midPoint[0] - 1.0f) * x) / ((2.0f * mtfParams.midPoint[0] - 1.0f) * x - mtfParams.midPoint[0]);
+                src[i] = x * s;
+            }
         }
     };
 

src/rawimage.h

@@ -97,7 +97,8 @@ public:
     uint64_t size() const;
     DataType type() const;
     uint32_t norm() const;
-    uint32_t widthBytes() const;
+    uint64_t widthBytes() const;
+    uint32_t widthSamples() const;
     void* data();
     const void* data() const;
     void* data(uint32_t row, uint32_t col = 0);
@@ -124,10 +125,10 @@ public:
     bool valid() const;
 #ifndef NO_QT
     void setICCProfile(const QByteArray &icc);
-#endif
     void setICCProfile(const LibXISF::ByteArray &icc);
     void convertTosRGB();
     void generateLUT();
+#endif
     void applySTF(const MTFParam &mtfParams);
     MTFParam calcMTFParams(bool linked = false, bool debayer = false) const;
     const std::vector<uint16_t>& getLUT() const;

src/scriptengine.cpp

@@ -4,6 +4,7 @@
 #include <QDebug>
 #include <QInputDialog>
 #include <QJsonValue>
+#include <QJSValueIterator>
 #include "loadrunable.h"
 #include "rawimage.h"
 #include "loadimage.h"
@@ -17,17 +18,18 @@
 namespace Script
 {
 
-ScriptEngine::ScriptEngine(BatchProcessing *parent)
+ScriptEngine::ScriptEngine(Database *database, BatchProcessing *parent)
   : _jsEngine(new QJSEngine(this))
-  , _database(new Database(this))
+  , _database(database)
   , _parent(parent)
   , _pool(new QThreadPool(this))
 {
     QJSValue core = _jsEngine->newQObject(this);
     _jsEngine->globalObject().setProperty("core", core);
     QJSValue fitsRecordObject = _jsEngine->newQMetaObject(&FITSRecordModify::staticMetaObject);
+    QJSValue textFile = _jsEngine->newQMetaObject(&TextFile::staticMetaObject);
     _jsEngine->globalObject().setProperty("FITSRecordModify", fitsRecordObject);
-    _database->init(QLatin1String("scriptengine"));
+    _jsEngine->globalObject().setProperty("TextFile", textFile);
     _semaphore.release(_pool->maxThreadCount());
     _pool->setThreadPriority(QThread::LowPriority);
 
@@ -36,10 +38,12 @@ ScriptEngine::ScriptEngine(BatchProcessing *parent)
 #endif // PLATESOLVER
 }
 
-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, const QString &arg)
 {
     _scriptPath = scriptPath;
-    _paths = paths;
+    if(!arg.isNull())
+        _jsEngine->globalObject().setProperty("scriptarg", arg);
+    setPaths(paths);
     _outputDir = outputDir + "/";
 }
 
@@ -73,17 +77,71 @@ void ScriptEngine::log(const QString &message)
 
 void ScriptEngine::mark(File *file)
 {
-    _database->mark(file->absoluteFilePath());
+    QString path = file->absoluteFilePath();
+    QMetaObject::invokeMethod(_database, [this, path](){ _database->mark(path); }, Qt::QueuedConnection);
 }
 
 void ScriptEngine::unmark(File *file)
 {
-    _database->unmark(file->absoluteFilePath());
+    QString path = file->absoluteFilePath();
+    QMetaObject::invokeMethod(_database, [this, path](){ _database->unmark(path); }, Qt::QueuedConnection);
 }
 
-bool ScriptEngine::isMarked(const File *file) const
+bool ScriptEngine::isMarked(const File *file)
 {
-    return _database->isMarked(file->absoluteFilePath());
+    bool ret;
+    QString path = file->absoluteFilePath();
+    QMetaObject::invokeMethod(_database, [this, path](){ return _database->isMarked(path); }, Qt::BlockingQueuedConnection, &ret);
+    return ret;
+}
+
+QJSValue ScriptEngine::getObjects(double ra, double dec, double distance)
+{
+    QVector<SkyObject> objects;
+    QMetaObject::invokeMethod(_database, [this, ra, dec, distance](){
+        return _database->getObjects(ra - distance, ra + distance, dec - distance, dec + distance); }, Qt::BlockingQueuedConnection, &objects);
+
+    QJSValue ret = newArray(objects.size());
+    qint32 i = 0;
+    for(auto &object : objects)
+    {
+        QJSValue jsObj = newObject();
+        jsObj.setProperty("name", object.name);
+        jsObj.setProperty("name2", object.name2);
+        jsObj.setProperty("ra", object.skyPoint.RA());
+        jsObj.setProperty("dec", object.skyPoint.DEC());
+        jsObj.setProperty("mag", object.mag);
+        ret.setProperty(i++, jsObj);
+    }
+
+    return ret;
+}
+
+QJSValue ScriptEngine::getObjects(const QJSValue &bounds)
+{
+    QVector<SkyObject> objects;
+    double minRa = bounds.property("minRA").toNumber();
+    double maxRa = bounds.property("maxRA").toNumber();
+    double minDec = bounds.property("minDEC").toNumber();
+    double maxDec = bounds.property("maxDEC").toNumber();
+
+    QMetaObject::invokeMethod(_database, [this, minRa, maxRa, minDec, maxDec](){
+        return _database->getObjects(minRa, maxRa, minDec, maxDec); }, Qt::BlockingQueuedConnection, &objects);
+
+    QJSValue ret = newArray(objects.size());
+    qint32 i = 0;
+    for(auto &object : objects)
+    {
+        QJSValue jsObj = newObject();
+        jsObj.setProperty("name", object.name);
+        jsObj.setProperty("name2", object.name2);
+        jsObj.setProperty("ra", object.skyPoint.RA());
+        jsObj.setProperty("dec", object.skyPoint.DEC());
+        jsObj.setProperty("mag", object.mag);
+        ret.setProperty(i++, jsObj);
+    }
+
+    return ret;
 }
 
 void ScriptEngine::setMaxThread(int maxthread)
@@ -130,6 +188,41 @@ QJSValue ScriptEngine::getItem(const QStringList &items, const QString &label, i
     return ret;
 }
 
+QJSValue ScriptEngine::question(const QString &question, const QStringList &buttons, const QString &title) const
+{
+    QJSValue ret;
+    QMetaObject::invokeMethod(_parent, "question", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QJSValue, ret), Q_ARG(QString, question), Q_ARG(QStringList, buttons), Q_ARG(QString, title));
+    return ret;
+}
+
+void ScriptEngine::plot(const QJSValue &graph)
+{
+    QVariant graphV = graph.toVariant(QJSValue::ConvertJSObjects);
+    if(graphV.isValid())
+        QMetaObject::invokeMethod(_parent, "plot", Qt::QueuedConnection, Q_ARG(QVariant, graphV));
+    else
+        logError("Invalid value to be plotted");
+}
+
+QJSValue ScriptEngine::openFile(const QString &fileName, const QString &mode)
+{
+    QFileInfo info(fileName);
+    if(!info.isAbsolute())
+        info = QFileInfo(outputDir() + fileName);
+
+    TextFile *textFile = new TextFile;
+    if(textFile->open(info.absoluteFilePath(), mode))
+    {
+        return _jsEngine->newQObject(textFile);
+    }
+    else
+    {
+        logError("Failed to open file " + fileName);
+        delete textFile;
+        return false;
+    }
+}
+
 bool ScriptEngine::convert(File *file, QString &outpath, const QString &format, const QVariantMap &params, bool async)
 {
     QString path;
@@ -222,7 +315,7 @@ void ScriptEngine::setStartingSolution(const QJSValue &solution)
     if(solution.isObject())
     {
         if(solution.hasProperty("ra") && solution.hasProperty("dec") && solution.property("ra").isNumber() && solution.property("dec").isNumber())
-            _solver->setSearchPosition(solution.property("ra").toNumber(), solution.property("dec").toNumber());
+            _solver->setSearchPosition(solution.property("ra").toNumber() / 15.0, solution.property("dec").toNumber());
 
         if(solution.hasProperty("pixscale") && solution.property("pixscale").isNumber())
         {
@@ -327,14 +420,73 @@ QJSValue ScriptEngine::newArray(uint size)
     return _jsEngine->newArray(size);
 }
 
-void ScriptEngine::run()
+QJSValue ScriptEngine::eval(const QString &program)
 {
-    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)));
+    QStringList stackTrace;
+    QJSValue result = _jsEngine->evaluate(program, QString(), 1, &stackTrace);
+
+    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);
+}
 
+void ScriptEngine::run()
+{
     QFile scriptFile(_scriptPath);
     if(!scriptFile.open(QIODevice::ReadOnly))
     {
@@ -365,16 +517,18 @@ void File::loadFitsKeywords()
     {
         _fitsKeywordsLoaded = true;
         ImageInfoData info;
-        if(suffix().toLower() == "xisf")
+        if(isXISF(suffix()))
         {
             readXISFHeader(_path, info);
         }
-        else if(suffix().toLower() == "fits" || suffix().toLower() == "fit")
+        else if(isFITS(suffix()))
         {
             readFITSHeader(_path, info);
         }
         else return;
 
+        _wcs = info.wcs;
+
         for(auto &record : info.fitsHeader)
         {
             _fitsKeywords.append(record.key);
@@ -516,7 +670,7 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
     _fitsKeywordsLoaded = false;
     _fitsKeywords.clear();
 
-    if(QRegularExpression("(fits?|fz|fts)", QRegularExpression::CaseInsensitiveOption).match(suffix()).hasMatch())
+    if(isFITS(suffix()))
     {
         fitsfile *file;
         int status = 0;
@@ -533,16 +687,22 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
         int naxis;
         long naxes[3] = {0};
         int type = -1;
+        std::vector<int> imageIdxs;
         for(int i=1; i <= num; i++)
         {
             fits_movabs_hdu(file, i, IMAGE_HDU, &status);
             fits_get_hdu_type(file, &type, &status);
-            fits_get_img_param(file, 3, &imgtype, &naxis, naxes, &status);
-            if(type == IMAGE_HDU && naxis >= 2 && naxis <= 3 && status == 0)
-                break;
-            if(i == num)return false;
+            if(type == IMAGE_HDU)
+            {
+                fits_get_img_param(file, 3, &imgtype, &naxis, naxes, &status);
+                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)
         {
             int status = 0;//we ignore errors from here
@@ -639,7 +799,7 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
 
         return status == 0;
     }
-    else if(suffix().toLower() == "xisf")
+    else if(isXISF(suffix()))
     {
         try
         {
@@ -650,13 +810,16 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
             qDebug() << "modify" << in << out;
 
             for(auto &remove : modify->_remove)
-                modifyXISF.removeFITSKeyword(0, remove.toStdString());
+                modifyXISF.removeFITSKeyword(modify->_imageIdx, remove.toStdString());
 
             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)
-                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.close();
@@ -665,6 +828,7 @@ bool File::modifyFITSRecords(const FITSRecordModify *modify)
         }
         catch(std::filesystem::filesystem_error &err)
         {
+            if(_engine)_engine->newMessage("Failed to modify file " + _path + " " + err.what(), true);
             return false;
         }
         catch(LibXISF::Error &err)
@@ -733,7 +897,7 @@ QJSValue File::stats()
     {
         ImageInfoData info;
         std::shared_ptr<RawImage> rawImage;
-        loadImage(_path, info, rawImage);
+        loadImage(_path, info, rawImage, 0);
         rawImage->calcStats();
         RawImage::Stats stats = rawImage->imageStats();
         _stats = _engine->newObject();
@@ -747,6 +911,24 @@ QJSValue File::stats()
     return _stats;
 }
 
+QJSValue File::calculatedBounds()
+{
+    QJSValue ret = _engine->newObject();
+    loadFitsKeywords();
+    if(_wcs)
+    {
+        double minRa, maxRa, minDec, maxDec, crVal1, crVal2;
+        _wcs->calculateBounds(minRa, maxRa, minDec, maxDec, crVal1, crVal2);
+        ret.setProperty("minRA", minRa);
+        ret.setProperty("maxRA", maxRa);
+        ret.setProperty("minDEC", minDec);
+        ret.setProperty("maxDEC", maxDec);
+        ret.setProperty("crVal1", crVal1);
+        ret.setProperty("crVal2", crVal2);
+    }
+    return ret;
+}
+
 #ifdef PLATESOLVER
 QJSValue File::solve(bool updateHeader)
 {
@@ -765,11 +947,11 @@ QJSValue File::extractStars(bool hfr)
 }
 #endif // PLATESOLVER
 
-ScriptEngineThread::ScriptEngineThread(BatchProcessing *parent) : QObject(parent)
+ScriptEngineThread::ScriptEngineThread(Database *database, BatchProcessing *parent) : QObject(parent)
 {
     _thread = new QThread();
     _thread->setObjectName("ScriptEngine");
-    _engine = new ScriptEngine(parent);
+    _engine = new ScriptEngine(database, parent);
     _engine->moveToThread(_thread);
     connect(_engine, &ScriptEngine::finished, _thread, &QThread::quit);
     connect(_engine, &ScriptEngine::newMessage, this, &ScriptEngineThread::newMessage);
@@ -785,9 +967,9 @@ ScriptEngineThread::~ScriptEngineThread()
     if(_engine)_engine->interrupt();
 }
 
-void ScriptEngineThread::setParams(const QString &scriptPath, const QList<QPair<QString, QString>> &paths, const QString &outputDir)
+void ScriptEngineThread::setParams(const QString &scriptPath, const QList<QPair<QString, QString>> &paths, const QString &outputDir, const QString &arg)
 {
-    _engine->setParams(scriptPath, paths, outputDir);
+    _engine->setParams(scriptPath, paths, outputDir, arg);
 }
 
 void ScriptEngineThread::start()
@@ -816,4 +998,75 @@ void FITSRecordModify::addKeyword(const QString &key, const QVariant &value, con
     _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)
+{
+    _fr.setFileName(path);
+    QIODevice::OpenMode openMode;
+    if(mode == "r")
+        openMode = QIODevice::ReadOnly;
+    else if(mode == "w")
+        openMode = QIODevice::WriteOnly;
+    else if(mode == "a")
+        openMode = QIODevice::WriteOnly | QIODevice::Append;
+    else if(mode == "r+")
+        openMode = QIODevice::ReadWrite | QIODevice::ExistingOnly;
+    else if(mode == "w+")
+        openMode = QIODevice::ReadWrite;
+    else if(mode == "a+")
+        openMode = QIODevice::ReadWrite | QIODevice::Append;
+    else
+        return false;
+
+    openMode |= QIODevice::Text;//always open as text
+    return _fr.open(openMode);
+}
+
+void TextFile::write(const QString &data)
+{
+    _fr.write(data.toUtf8());
+}
+
+QString TextFile::read(int maxlen)
+{
+    QByteArray data = _fr.read(maxlen);
+    return data;
+}
+
+QString TextFile::readLine()
+{
+    QByteArray data = _fr.readLine();
+    return QString::fromUtf8(data);
+}
+
+QString TextFile::readAll()
+{
+    QByteArray data = _fr.readAll();
+    return QString::fromUtf8(data);
+}
+
+bool TextFile::seek(qint64 offset)
+{
+    return _fr.seek(offset);
+}
+
+qint64 TextFile::pos()
+{
+    return _fr.pos();
+}
+
 }

src/scriptengine.h

@@ -8,7 +8,8 @@
 #include <QThreadPool>
 #include <QSemaphore>
 #include "database.h"
-#include "imageinfo.h"
+#include "imageinfodata.h"
+#include "libxisf.h"
 
 class BatchProcessing;
 class Solver;
@@ -31,8 +32,8 @@ class ScriptEngine : public QObject
     QList<QPair<QString, QString>> _paths;
     Solver *_solver = nullptr;
 public:
-    explicit ScriptEngine(BatchProcessing *parent = nullptr);
-    void setParams(const QString &scriptPath, const QList<QPair<QString, QString>> &paths, const QString &outputDir);
+    explicit ScriptEngine(Database *database, BatchProcessing *parent = nullptr);
+    void setParams(const QString &scriptPath, const QList<QPair<QString, QString>> &paths, const QString &outputDir, const QString &arg);
     void reportError(const QString &message);
     const QString& outputDir() const;
     void interrupt();
@@ -40,13 +41,18 @@ public:
     Q_INVOKABLE void log(const QString &message);
     Q_INVOKABLE void mark(File *file);
     Q_INVOKABLE void unmark(File *file);
-    Q_INVOKABLE bool isMarked(const File *file) const;
+    Q_INVOKABLE bool isMarked(const File *file);
+    Q_INVOKABLE QJSValue getObjects(double ra, double dec, double distance);
+    Q_INVOKABLE QJSValue getObjects(const QJSValue &bounds);
     Q_INVOKABLE void setMaxThread(int maxthread);
     Q_INVOKABLE void sync();
     Q_INVOKABLE QJSValue getString(const QString &label = QString(), const QString &text = QString()) const;
     Q_INVOKABLE QJSValue getInt(const QString &label = QString(), int value = 0);
     Q_INVOKABLE QJSValue getFloat(const QString &label = QString(), double value = 0, int decimals = 3) const;
     Q_INVOKABLE QJSValue getItem(const QStringList &items, const QString &label = "", int current = 0) const;
+    Q_INVOKABLE QJSValue question(const QString &question, const QStringList &buttons = {"ok"}, const QString &title = "") const;
+    Q_INVOKABLE void plot(const QJSValue &pointsArray);
+    Q_INVOKABLE QJSValue openFile(const QString &fileName, const QString &mode = "r");
     bool convert(File *file, QString &outpath, const QString &format, const QVariantMap &params, bool async);
 #ifdef PLATESOLVER
     Q_INVOKABLE void setSolverProfile(int index);
@@ -58,6 +64,9 @@ public:
 #endif // PLATESOLVER
     QJSValue newObject();
     QJSValue newArray(uint size);
+    QJSValue eval(const QString &program);
+    QStringList complete(const QString &line);
+    void setPaths(const QList<QPair<QString, QString>> &paths);
 public slots:
     void run();
 signals:
@@ -71,9 +80,9 @@ class ScriptEngineThread : public QObject
     QThread *_thread;
     ScriptEngine *_engine;
 public:
-    ScriptEngineThread(BatchProcessing *parent = nullptr);
+    ScriptEngineThread(Database *database, BatchProcessing *parent = nullptr);
     ~ScriptEngineThread();
-    void setParams(const QString &scriptPath, const QList<QPair<QString, QString>> &paths, const QString &outputDir);
+    void setParams(const QString &scriptPath, const QList<QPair<QString, QString>> &paths, const QString &outputDir, const QString &arg);
     void start();
     void interrupt();
 signals:
@@ -93,6 +102,7 @@ class File : public QObject
     bool _fitsKeywordsLoaded = false;
     QStringList _fitsKeywords;
     QMultiHash<QString, FITSRecord> _fitsRecords;
+    std::shared_ptr<WCSDataT> _wcs;
     void loadFitsKeywords();
     bool mkpath(const QString &path) const;
     QJSValue _stats;
@@ -121,6 +131,7 @@ public:
     Q_INVOKABLE File* convert(const QString &outpath, const QString &format, const QVariantMap &params = QVariantMap());
     Q_INVOKABLE File* convertAsync(const QString &outpath, const QString &format, const QVariantMap &params = QVariantMap());
     Q_INVOKABLE QJSValue stats();
+    Q_INVOKABLE QJSValue calculatedBounds();
 #ifdef PLATESOLVER
     Q_INVOKABLE QJSValue solve(bool updateHeader = false);
     Q_INVOKABLE QJSValue extractStars(bool hfr);
@@ -133,6 +144,8 @@ class FITSRecordModify : public QObject
     QStringList _remove;
     QVector<FITSRecord> _update;
     QVector<FITSRecord> _add;
+    QVector<LibXISF::Property> _property;
+    uint32_t _imageIdx = 0;
 
     friend class File;
 public:
@@ -140,6 +153,24 @@ public:
     Q_INVOKABLE void removeKeyword(const QString &key);
     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_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
+{
+    Q_OBJECT
+    QFile _fr;
+public:
+    bool open(const QString &path, const QString &mode);
+    Q_INVOKABLE void write(const QString &data);
+    Q_INVOKABLE QString read(int maxlen);
+    Q_INVOKABLE QString readLine();
+    Q_INVOKABLE QString readAll();
+    Q_INVOKABLE bool seek(qint64 offset);
+    Q_INVOKABLE qint64 pos();
 };
 
 }

src/settingsdialog.cpp

@@ -4,12 +4,21 @@
 #include <QLabel>
 #include <QSettings>
 #include <QApplication>
+#include <QProcess>
+#include <QCoreApplication>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QDir>
+#include <QPushButton>
+#include <QLineEdit>
+#include <QColorDialog>
 #include "rawimage.h"
 
 extern int DEFAULT_WIDTH;
 extern double SATURATION;
 extern int FILTERING;
 extern bool BESTFIT;
+extern QMap<QString, QColor> headerHighlight;
 
 class EvenNumber : public QSpinBox
 {
@@ -80,14 +89,84 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
     m_bestFit->setToolTip(tr("Set Best Fit zoom level when opening new image."));
     m_bestFit->setChecked(BESTFIT);
 
+    m_headerHighlight = new QListWidget(this);
+    m_headerHighlight->setToolTip(tr("List of FITS keywords that will be highlighted in Image info"));
+    for(auto i = headerHighlight.begin(); i != headerHighlight.end(); i++)
+    {
+        QListWidgetItem *item = new QListWidgetItem(m_headerHighlight);
+        item->setText(i.key());
+        item->setBackground(i.value());
+    }
+    m_keyword = new QLineEdit(this);
+    m_keyword->setPlaceholderText(tr("FITS keyword"));
+    QPushButton *color = new QPushButton(this);
+    QPixmap pix(16, 16);
+    pix.fill(m_color);
+    color->setIcon(pix);
+    connect(color, &QPushButton::clicked, [this, color](){
+        QColor rgb = QColorDialog::getColor(m_color, this);
+        if(rgb.isValid())
+        {
+            QPixmap pix(16, 16);
+            pix.fill(rgb);
+            color->setIcon(pix);
+            m_color = rgb;
+        }
+    });
+
+    QPushButton *add = new QPushButton(tr("Add keyword highlight"), this);
+    connect(add, &QPushButton::clicked, [this](){
+        auto list = m_headerHighlight->findItems(m_keyword->text(), Qt::MatchFixedString | Qt::MatchCaseSensitive);
+        if(list.size())return;
+        QListWidgetItem *item = new QListWidgetItem(m_headerHighlight);
+        item->setText(m_keyword->text());
+        item->setBackground(m_color);
+    });
+    QPushButton *remove = new QPushButton(tr("Remove keyword highlight"), this);
+    connect(remove, &QPushButton::clicked, [this](){
+        auto list = m_headerHighlight->selectedItems();
+        for(auto item : list)
+            delete item;
+    });
+
+    m_lang = new QComboBox(this);
+    m_lang->addItems({"English", "Français", "Slovenčina", "Português"});
+    QString lang;
+    switch(QLocale().language())
+    {
+    default:
+    case QLocale::English: lang = "en"; break;
+    case QLocale::French: lang = "fr"; break;
+    case QLocale::Slovak: lang = "sk"; break;
+    case QLocale::Portuguese: lang = "pt_BR"; break;
+    }
+
+    lang = settings.value("settings/lang", lang).toString();
+    if(lang == "en")m_lang->setCurrentIndex(0);
+    else if(lang == "fr")m_lang->setCurrentIndex(1);
+    else if(lang == "sk")m_lang->setCurrentIndex(2);
+    else if(lang == "pt_BR")m_lang->setCurrentIndex(3);
+
     layout->addRow(tr("Image preload count"), m_preloadImages);
     layout->addRow(tr("Thumbnails size"), m_thumSize);
     layout->addRow(tr("Saturation"), m_saturation);
     layout->addRow(tr("Slideshow interval"), m_slideShowTime);
     layout->addRow(tr("Image interpolation"), m_filtering);
+    layout->addRow(tr("Language"), m_lang);
     layout->addRow(m_qualityThumbnail);
     layout->addRow(m_useNativeDialog);
     layout->addRow(m_bestFit);
+    layout->addRow(new QLabel(tr("FITS header highlight"), this));
+    layout->addRow(m_headerHighlight);
+    layout->addRow(m_keyword, color);
+    layout->addRow(add, remove);
+
+#ifdef Q_OS_WIN64
+    QPushButton *installThumbnailer = new QPushButton(tr("Install"), this);
+    installThumbnailer->setToolTip(tr("This will install thumnail generation for FITS and XISF files in File Explorer"));
+    connect(installThumbnailer, &QPushButton::clicked, this, &SettingsDialog::installThumbnailer);
+    layout->addRow(tr("Install thumbnailer"), installThumbnailer);
+#endif
     //layout->addRow(new QLabel(tr("Changes in settings will take effect after program restart.")));
 
     QDialogButtonBox *buttonBox = new QDialogButtonBox(this);
@@ -110,6 +189,11 @@ void SettingsDialog::loadSettings()
     FILTERING = settings.value("settings/filtering", FILTERING).toInt();
     QUALITY_RESIZE = settings.value("settings/qualitythumbnail", QUALITY_RESIZE).toBool();
     BESTFIT = settings.value("settings/bestfit", BESTFIT).toBool();
+    QStringList keywords = settings.value("settings/headerhighlightkeywords").toStringList();
+    QStringList colors = settings.value("settings/headerhighlightcolors").toStringList();
+    for(int i = 0; i < std::min(keywords.size(), colors.size()); i++)
+        headerHighlight.insert(keywords[i], QColor::fromString(colors[i]));
+
     QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, settings.value("settings/dontusenativedialogs", false).toBool());
 }
 
@@ -123,6 +207,25 @@ bool SettingsDialog::loadThumbsizes()
     return OLD_THUMB_SIZE != THUMB_SIZE;
 }
 
+void SettingsDialog::installThumbnailer()
+{
+#ifdef Q_OS_WIN64
+    QString path = QCoreApplication::instance()->applicationDirPath() + "/tenmonthumbnailer.dll";
+    if(!QFileInfo::exists(path))
+    {
+        QMessageBox::critical(this, tr("Missing dll"), tr("Can't find ") + path);
+        return;
+    }
+
+    QProcess regsvr;
+    int ret = regsvr.execute("regsvr32.exe", {"/s", path});
+    if(ret == 0)
+        QMessageBox::information(this, tr("Thumbnail support"), tr("Thumbnail generation support sucessufully installed."));
+    else
+        QMessageBox::critical(this, tr("Error"), tr("Failed to register thumbnailer. %1").arg(ret));
+#endif
+}
+
 void SettingsDialog::saveSettings()
 {
     QSettings settings;
@@ -141,4 +244,25 @@ void SettingsDialog::saveSettings()
     QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, m_useNativeDialog->isChecked());
     if(DEFAULT_WIDTH != m_preloadImages->value())
         emit preloadChanged(m_preloadImages->value());
+
+    headerHighlight.clear();
+    QStringList colors;
+    for(int i = 0; i < m_headerHighlight->count(); i++)
+    {
+        auto item = m_headerHighlight->item(i);
+        colors.push_back(item->background().color().name());
+        headerHighlight[item->text()] = item->background().color();
+    }
+    settings.setValue("settings/headerhighlightkeywords", headerHighlight.keys());
+    settings.setValue("settings/headerhighlightcolors", colors);
+    QString lang;
+    int langIdx = m_lang->currentIndex();
+    switch(langIdx)
+    {
+    case 0: lang = "en"; break;
+    case 1: lang = "fr"; break;
+    case 2: lang = "sk"; break;
+    case 3: lang = "pt_BR"; break;
+    }
+    settings.setValue("settings/lang", lang);
 }

src/settingsdialog.h

@@ -5,6 +5,7 @@
 #include <QSpinBox>
 #include <QCheckBox>
 #include <QComboBox>
+#include <QListWidget>
 
 class SettingsDialog : public QDialog
 {
@@ -13,6 +14,8 @@ public:
     explicit SettingsDialog(QWidget *parent = nullptr);
     static void loadSettings();
     static bool loadThumbsizes();
+public slots:
+    void installThumbnailer();
 signals:
     void preloadChanged(int witdth);
 private:
@@ -26,6 +29,10 @@ private:
     QCheckBox *m_qualityThumbnail;
     QComboBox *m_filtering;
     QCheckBox *m_bestFit;
+    QListWidget *m_headerHighlight;
+    QColor m_color = Qt::yellow;
+    QLineEdit *m_keyword;
+    QComboBox *m_lang;
 };
 
 #endif // SETTINGSDIALOG_H

src/solver.cpp

@@ -41,7 +41,7 @@ bool Solver::loadImage(const QString &path)
     _loaded = false;
     std::shared_ptr<RawImage> image;
     ImageInfoData info;
-    if(::loadImage(path, info, image, true))
+    if(::loadImage(path, info, image, 0, true))
     {
         return loadImage(image, path);
     }
@@ -186,8 +186,22 @@ bool Solver::updateHeader(QString &error)
     modify.updateKeyword("CTYPE2", "DEC--TAN", QByteArray("first parameter DEC, projection TANgential"));
     modify.updateKeyword("RADESYS", "ICRS", QByteArray("International Celestial Reference System"));
     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);
     if(!ret)error = tr("Failed to update file header");
+    else emit headerUpdated(_path);
     return ret;
 }
 

src/solver.h

@@ -46,6 +46,7 @@ public slots:
 signals:
     void solvingDone();
     void extractionDone();
+    void headerUpdated(const QString &path);
     void logOutput(const QString &log);
 };
 

src/stfslider.cpp

@@ -12,7 +12,7 @@ static float clamp(float x)
 
 STFSlider::STFSlider(const QColor &color, QWidget *parent) : QWidget(parent)
 {
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     setMinimumWidth(100);
     setMouseTracking(true);
 
@@ -64,12 +64,51 @@ void STFSlider::setMTFParams(float low, float mid, float high)
     update();
 }
 
+void STFSlider::orientationChanged(Qt::Orientations orientation)
+{
+    m_orientation = orientation;
+    if(m_orientation == Qt::Horizontal)
+    {
+        if(m_color == Qt::white)
+        {
+            setMaximumSize(QWIDGETSIZE_MAX, 16);
+            setMinimumSize(16, 16);
+        }
+        else
+        {
+            setMaximumSize(QWIDGETSIZE_MAX, 10);
+            setMinimumSize(10, 10);
+        }
+    }
+    else
+    {
+        if(m_color == Qt::white)
+        {
+            setMaximumSize(16, QWIDGETSIZE_MAX);
+            setMinimumSize(16, 16);
+        }
+        else
+        {
+            setMaximumSize(10, QWIDGETSIZE_MAX);
+            setMinimumSize(10, 10);
+        }
+    }
+}
+
 void STFSlider::paintEvent(QPaintEvent *event)
 {
     QPainter painter(this);
     QRect rect = event->rect();
     qreal w = rect.width() - 1;
     qreal h = rect.height();
+    if(m_orientation == Qt::Vertical)
+    {
+        rect = rect.transposed();
+        painter.rotate(90);
+        w = rect.width() - 1;
+        h = rect.height();
+        painter.translate(0, -h);
+    }
     QLinearGradient gradient(rect.topLeft(), rect.topRight());
     gradient.setColorAt(0, Qt::black);
     for(int i=1; i<=32; i++)
@@ -93,6 +132,11 @@ void STFSlider::paintEvent(QPaintEvent *event)
     {
         painter.setPen(p < m_threshold ? Qt::white : Qt::black);
         painter.resetTransform();
+        if(m_orientation == Qt::Vertical)
+        {
+            painter.rotate(90);
+            painter.translate(0, -h);
+        }
         painter.translate(w*p, 0);
         painter.drawPath(tick);
     };
@@ -105,15 +149,26 @@ void STFSlider::paintEvent(QPaintEvent *event)
 
 void STFSlider::mouseMoveEvent(QMouseEvent *event)
 {
-    const qreal x = event->position().x();
-    if(std::abs(m_blackPoint*width() - x) < 5 ||
-            std::abs((m_blackPoint + (m_whitePoint - m_blackPoint) * m_midPoint)*width() - x) < 5 ||
-            std::abs(m_whitePoint*width() - x) < 5)
-        setCursor(Qt::SplitHCursor);
+    qreal x,w;
+    if(m_orientation == Qt::Horizontal)
+    {
+        x = event->position().x();
+        w = width();
+    }
+    else
+    {
+        x = event->position().y();
+        w = height();
+    }
+
+    if(std::abs(m_blackPoint*w - x) < 5 ||
+            std::abs((m_blackPoint + (m_whitePoint - m_blackPoint) * m_midPoint)*w - x) < 5 ||
+            std::abs(m_whitePoint*w - x) < 5)
+        setCursor(m_orientation == Qt::Horizontal ? Qt::SplitHCursor : Qt::SplitVCursor);
     else
         unsetCursor();
 
-    qreal xw = x/width();
+    qreal xw = x/w;
     if(event->modifiers() & Qt::ShiftModifier && !m_fineTune)
     {
         m_fineTune = true;
@@ -154,18 +209,29 @@ void STFSlider::mouseMoveEvent(QMouseEvent *event)
 
 void STFSlider::mousePressEvent(QMouseEvent *event)
 {
-    const qreal x = event->position().x();
+    qreal x,w;
+    if(m_orientation == Qt::Horizontal)
+    {
+        x = event->position().x();
+        w = width();
+    }
+    else
+    {
+        x = event->position().y();
+        w = height();
+    }
+
     if(event->modifiers() & Qt::ShiftModifier)
     {
         m_fineTune = true;
-        m_fineTuneX = x/width();
+        m_fineTuneX = x/w;
     }
 
-    if(std::abs((m_blackPoint + (m_whitePoint - m_blackPoint) * m_midPoint)*width() - x) < 5)
+    if(std::abs((m_blackPoint + (m_whitePoint - m_blackPoint) * m_midPoint)*w - x) < 5)
         m_grabbed = 1;
-    else if(std::abs(m_blackPoint*width() - x) < 5)
+    else if(std::abs(m_blackPoint*w - x) < 5)
         m_grabbed = 0;
-    else if(std::abs(m_whitePoint*width() - x) < 5)
+    else if(std::abs(m_whitePoint*w - x) < 5)
         m_grabbed = 2;
     else
         m_grabbed = -1;

src/stfslider.h

@@ -15,12 +15,15 @@ class STFSlider : public QWidget
     float m_fineTuneX;
     QColor m_color;
     float m_threshold;
+    Qt::Orientations m_orientation = Qt::Horizontal;
 public:
     explicit STFSlider(const QColor &color = Qt::white, QWidget *parent = nullptr);
     float blackPoint() const;
     float midPoint() const;
     float whitePoint() const;
     void setMTFParams(float low, float mid, float high);
+public slots:
+    void orientationChanged(Qt::Orientations orientation);
 signals:
     void paramChanged(float blackPoint, float midPoint, float whitePoint);
 protected:

src/stretchtoolbar.cpp

@@ -6,17 +6,6 @@
 #include <QStyle>
 #include "imageringlist.h"
 
-const float BLACK_POINT_SIGMA = -2.8f;
-const float MAD_TO_SIGMA = 1.4826f;
-const float TARGET_BACKGROUND = 0.25f;
-
-float MTF(float x, float m)
-{
-    if(x < 0)return 0;
-    if(x > 1)return 1;
-    return ((m - 1) * x) / ((2 * m - 1) * x - m);
-}
-
 StretchToolbar::StretchToolbar(QWidget *parent) : QToolBar(tr("Stretch toolbar"), parent)
 {
     setObjectName("stretchtoolbar");
@@ -24,16 +13,23 @@ StretchToolbar::StretchToolbar(QWidget *parent) : QToolBar(tr("Stretch toolbar")
     QVBoxLayout *vbox1 = new QVBoxLayout(lum);
     m_stfSlider = new STFSlider(Qt::white, this);
     vbox1->addWidget(m_stfSlider);
+    connect(this, &StretchToolbar::orientationChanged, m_stfSlider, &STFSlider::orientationChanged);
 
     m_stfSliderR = new STFSlider(Qt::red, this);
     m_stfSliderG = new STFSlider(Qt::green, this);
     m_stfSliderB = new STFSlider(Qt::blue, this);
     QWidget *rgb = new QWidget(this);
-    QVBoxLayout *vbox2 = new QVBoxLayout(rgb);
-    vbox2->setSpacing(0);
-    vbox2->addWidget(m_stfSliderR);
-    vbox2->addWidget(m_stfSliderG);
-    vbox2->addWidget(m_stfSliderB);
+    QBoxLayout *box2 = new QBoxLayout(orientation() == Qt::Horizontal ? QBoxLayout::TopToBottom : QBoxLayout::LeftToRight, rgb);
+    box2->setSpacing(0);
+    box2->addWidget(m_stfSliderR);
+    box2->addWidget(m_stfSliderG);
+    box2->addWidget(m_stfSliderB);
+    connect(this, &StretchToolbar::orientationChanged, m_stfSliderR, &STFSlider::orientationChanged);
+    connect(this, &StretchToolbar::orientationChanged, m_stfSliderG, &STFSlider::orientationChanged);
+    connect(this, &StretchToolbar::orientationChanged, m_stfSliderB, &STFSlider::orientationChanged);
+    connect(this, &StretchToolbar::orientationChanged, [box2](Qt::Orientations orientation){
+        box2->setDirection(orientation == Qt::Horizontal ? QBoxLayout::TopToBottom : QBoxLayout::LeftToRight);
+    });
 
     m_stack = new QStackedWidget(this);
     m_stack->addWidget(lum);
@@ -93,6 +89,11 @@ StretchToolbar::StretchToolbar(QWidget *parent) : QToolBar(tr("Stretch toolbar")
 
     m_autoStretchOnLoad = addAction(QIcon(":/nuke_a.png"), tr("Apply auto stretch on load"));
     m_autoStretchOnLoad->setCheckable(true);
+
+    QAction *showGridButton = addAction(QIcon(":/grid.svg"), tr("Draw equatorial grid"));
+    showGridButton->setCheckable(true);
+    connect(showGridButton, &QAction::toggled, this, &StretchToolbar::drawGrid);
+
     QSettings settings;
     m_autoStretchOnLoad->setChecked(settings.value("stretchtoolbar/autostretch", false).toBool());
 }
@@ -103,6 +104,11 @@ StretchToolbar::~StretchToolbar()
     settings.setValue("stretchtoolbar/autostretch", m_autoStretchOnLoad->isChecked());
 }
 
+const MTFParam &StretchToolbar::params() const
+{
+    return m_mtfParam;
+}
+
 void StretchToolbar::stretchImage(Image *img)
 {
     if(img && img->rawImage())

src/stretchtoolbar.h

@@ -22,6 +22,7 @@ class StretchToolbar : public QToolBar
 public:
     explicit StretchToolbar(QWidget *parent = nullptr);
     ~StretchToolbar();
+    const MTFParam& params() const;
 public slots:
     void stretchImage(Image *img);
     void resetMTF();
@@ -33,6 +34,7 @@ signals:
     void invert(bool enable);
     void superPixel(bool enable);
     void falseColor(bool enable);
+    void drawGrid(bool enable);
 };
 
 #endif // STRETCHTOOLBAR_H

src/tfloat16.h

@@ -0,0 +1,68 @@
+#ifndef TFLOAT16_H
+#define TFLOAT16_H
+
+// crude implementation of float16 for platforms that do not support _Float16
+
+#include <stdint.h>
+
+class TFloat16
+{
+    uint16_t b16;
+public:
+    TFloat16(){ b16 = 0; }
+    explicit inline TFloat16(float f)
+    {
+        uint32_t i = *reinterpret_cast<uint32_t*>(&f);
+        uint32_t sign = (i >> 16) & 0x8000;
+        uint32_t exp = (i >> 23) & 0xff;
+        uint32_t mantisa = (i & 0x7fffff) >> 13;
+
+        b16 = 0;
+        if(exp < 111)
+        {
+            // do nothing it map to 0
+        }
+        else if(exp == 111)
+        {
+            b16 |= sign;
+            b16 |= mantisa;
+        }
+        else if(exp == 255)//inf or nan
+        {
+            b16 = 0x7c00;
+            b16 |= sign;
+            b16 |= mantisa;
+        }
+        else if(exp > 142)
+        {
+            b16 = 0x7c00;// inf
+            b16 |= sign;
+        }
+        else
+        {
+            b16 |= sign;
+            b16 |= (exp - 112) << 10;
+            b16 |= mantisa;
+        }
+    }
+    friend TFloat16 operator*(TFloat16 a, TFloat16 b)
+    {
+        return TFloat16(static_cast<float>(a) * static_cast<float>(b));
+    }
+    operator float() const
+    {
+        uint32_t i = 0;
+        uint32_t sign = b16 & 0x8000;
+        uint32_t exp = (b16 & 0x7c00) >> 10;
+        if(b16)
+        {
+            i |= sign << 16;
+            if(exp==31)i |= 0x7f800000;
+            else i |= (exp + 112) << 23;
+            i |= (b16 & 0x3ff) << 13;
+        }
+        return *reinterpret_cast<float*>(&i);
+    }
+};
+
+#endif // TFLOAT16_H

thumbnailer/CMakeLists.txt

@@ -3,24 +3,29 @@ option(BUILD_THUMBNAILER "Build generator of thumbnails" OFF)
 if(BUILD_THUMBNAILER)
     if(WIN32)
         add_library(tenmonthumbnailer SHARED
-            winmain.cpp
-            ../rawimage.cpp
-            ../rawimage_sse.cpp)
+            Dll.cpp
+            loadimage.cpp
+            TenmonThumbnailProvider.cpp
+            ../src/rawimage.h
+            ../src/rawimage.cpp
+            ../src/rawimage_sse.cpp)
+        set_target_properties(tenmonthumbnailer PROPERTIES PREFIX "")
 
         target_compile_definitions(tenmonthumbnailer PRIVATE NO_QT)
         target_include_directories(tenmonthumbnailer PRIVATE ../libXISF)
-        target_link_libraries(tenmonthumbnailer PRIVATE ${LCMS2_LIB} XISF)
+        target_link_libraries(tenmonthumbnailer PRIVATE shlwapi ${FITS_LIB} XISF)
+        target_link_options(tenmonthumbnailer PRIVATE "-static")
     else(WIN32)
         qt_add_executable(tenmonthumbnailer
             main.cpp
-            ../rawimage.cpp
-            ../rawimage_sse.cpp
-            ../loadimage.cpp
-            ../imageinfodata.cpp)
+            loadimage.cpp
+            ../src/rawimage.cpp
+            ../src/rawimage_sse.cpp)
 
-        target_link_libraries(tenmonthumbnailer PRIVATE Qt6::Core Qt6::Gui ${EXIF_LIB} ${FITS_LIB} ${RAW_LIB} ${WCS_LIB} ${LCMS2_LIB} XISF)
+        target_link_libraries(tenmonthumbnailer PRIVATE ${FITS_LIB} XISF)
 
         target_include_directories(tenmonthumbnailer PRIVATE ../libXISF)
+        target_compile_definitions(tenmonthumbnailer PRIVATE NO_QT)
     endif(WIN32)
 endif(BUILD_THUMBNAILER)
 

thumbnailer/Dll.cpp

@@ -0,0 +1,244 @@
+#include <objbase.h>
+#include <shlwapi.h>
+#include <thumbcache.h> // For IThumbnailProvider.
+#include <shlobj.h>     // For SHChangeNotify
+#include <new>
+
+extern HRESULT TenmonThumbnailer_CreateInstance(REFIID riid, void **ppv);
+
+#define SZ_CLSID_TENMONTHUMBHANDLER     L"{0f3881d7-c9f0-45cb-aadb-40192aead2b4}"
+#define SZ_TENMONTHUMBHANDLER           L"Tenmon Thumbnail Handler"
+
+const CLSID CLSID_TenmonThumbHandler    = {0x0f3881d7, 0xc9f0, 0x45cb, {0xaa, 0xdb, 0x40, 0x19, 0x2a, 0xea, 0xd2, 0xb4}};
+
+typedef HRESULT (*PFNCREATEINSTANCE)(REFIID riid, void **ppvObject);
+struct CLASS_OBJECT_INIT
+{
+    const CLSID *pClsid;
+    PFNCREATEINSTANCE pfnCreate;
+};
+
+// add classes supported by this module here
+const CLASS_OBJECT_INIT c_rgClassObjectInit[] =
+{
+    { &CLSID_TenmonThumbHandler, TenmonThumbnailer_CreateInstance }
+};
+
+
+long g_cRefModule = 0;
+
+// Handle the the DLL's module
+HINSTANCE g_hInst = NULL;
+
+// Standard DLL functions
+STDAPI_(BOOL) DllMain(HINSTANCE hInstance, DWORD dwReason, void *)
+{
+    if (dwReason == DLL_PROCESS_ATTACH)
+    {
+        g_hInst = hInstance;
+        DisableThreadLibraryCalls(hInstance);
+    }
+    return TRUE;
+}
+
+STDAPI DllCanUnloadNow()
+{
+    // Only allow the DLL to be unloaded after all outstanding references have been released
+    return (g_cRefModule == 0) ? S_OK : S_FALSE;
+}
+
+void DllAddRef()
+{
+    InterlockedIncrement(&g_cRefModule);
+}
+
+void DllRelease()
+{
+    InterlockedDecrement(&g_cRefModule);
+}
+
+class CClassFactory : public IClassFactory
+{
+public:
+    static HRESULT CreateInstance(REFCLSID clsid, const CLASS_OBJECT_INIT *pClassObjectInits, size_t cClassObjectInits, REFIID riid, void **ppv)
+    {
+        *ppv = NULL;
+        HRESULT hr = CLASS_E_CLASSNOTAVAILABLE;
+        for (size_t i = 0; i < cClassObjectInits; i++)
+        {
+            if (clsid == *pClassObjectInits[i].pClsid)
+            {
+                IClassFactory *pClassFactory = new (std::nothrow) CClassFactory(pClassObjectInits[i].pfnCreate);
+                hr = pClassFactory ? S_OK : E_OUTOFMEMORY;
+                if (SUCCEEDED(hr))
+                {
+                    hr = pClassFactory->QueryInterface(riid, ppv);
+                    pClassFactory->Release();
+                }
+                break; // match found
+            }
+        }
+        return hr;
+    }
+
+    CClassFactory(PFNCREATEINSTANCE pfnCreate) : _cRef(1), _pfnCreate(pfnCreate)
+    {
+        DllAddRef();
+    }
+
+    // IUnknown
+    IFACEMETHODIMP QueryInterface(REFIID riid, void ** ppv)
+    {
+        static const QITAB qit[] =
+        {
+            QITABENT(CClassFactory, IClassFactory),
+            { 0 }
+        };
+        return QISearch(this, qit, riid, ppv);
+    }
+
+    IFACEMETHODIMP_(ULONG) AddRef()
+    {
+        return InterlockedIncrement(&_cRef);
+    }
+
+    IFACEMETHODIMP_(ULONG) Release()
+    {
+        long cRef = InterlockedDecrement(&_cRef);
+        if (cRef == 0)
+        {
+            delete this;
+        }
+        return cRef;
+    }
+
+    // IClassFactory
+    IFACEMETHODIMP CreateInstance(IUnknown *punkOuter, REFIID riid, void **ppv)
+    {
+        return punkOuter ? CLASS_E_NOAGGREGATION : _pfnCreate(riid, ppv);
+    }
+
+    IFACEMETHODIMP LockServer(BOOL fLock)
+    {
+        if (fLock)
+        {
+            DllAddRef();
+        }
+        else
+        {
+            DllRelease();
+        }
+        return S_OK;
+    }
+
+private:
+    ~CClassFactory()
+    {
+        DllRelease();
+    }
+
+    long _cRef;
+    PFNCREATEINSTANCE _pfnCreate;
+};
+
+STDAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **ppv)
+{
+    return CClassFactory::CreateInstance(clsid, c_rgClassObjectInit, ARRAYSIZE(c_rgClassObjectInit), riid, ppv);
+}
+
+// A struct to hold the information required for a registry entry
+
+struct REGISTRY_ENTRY
+{
+    HKEY   hkeyRoot;
+    PCWSTR pszKeyName;
+    PCWSTR pszValueName;
+    PCWSTR pszData;
+};
+
+// Creates a registry key (if needed) and sets the default value of the key
+
+HRESULT CreateRegKeyAndSetValue(const REGISTRY_ENTRY *pRegistryEntry)
+{
+    HKEY hKey;
+    HRESULT hr = HRESULT_FROM_WIN32(RegCreateKeyExW(pRegistryEntry->hkeyRoot, pRegistryEntry->pszKeyName,
+                                0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL));
+    if (SUCCEEDED(hr))
+    {
+        hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, pRegistryEntry->pszValueName, 0, REG_SZ,
+                            (LPBYTE) pRegistryEntry->pszData,
+                            ((DWORD) wcslen(pRegistryEntry->pszData) + 1) * sizeof(WCHAR)));
+        RegCloseKey(hKey);
+    }
+    return hr;
+}
+
+//
+// Registers this COM server
+//
+STDAPI DllRegisterServer()
+{
+    HRESULT hr;
+
+    WCHAR szModuleName[MAX_PATH];
+
+    if (!GetModuleFileNameW(g_hInst, szModuleName, ARRAYSIZE(szModuleName)))
+    {
+        hr = HRESULT_FROM_WIN32(GetLastError());
+    }
+    else
+    {
+        // List of registry entries we want to create
+        const REGISTRY_ENTRY rgRegistryEntries[] =
+        {
+            // RootKey            KeyName                                                                                    ValueName                       Data
+            {HKEY_CURRENT_USER,   L"Software\\Classes\\CLSID\\" SZ_CLSID_TENMONTHUMBHANDLER,                                 NULL,                           SZ_TENMONTHUMBHANDLER},
+            {HKEY_CURRENT_USER,   L"Software\\Classes\\CLSID\\" SZ_CLSID_TENMONTHUMBHANDLER L"\\InProcServer32",             NULL,                           szModuleName},
+            {HKEY_CURRENT_USER,   L"Software\\Classes\\CLSID\\" SZ_CLSID_TENMONTHUMBHANDLER L"\\InProcServer32",             L"ThreadingModel",              L"Apartment"},
+            {HKEY_CURRENT_USER,   L"Software\\Classes\\.xisf\\ShellEx\\{e357fccd-a995-4576-b01f-234630154e96}",              NULL,                           SZ_CLSID_TENMONTHUMBHANDLER},
+            {HKEY_CURRENT_USER,   L"Software\\Classes\\.fits\\ShellEx\\{e357fccd-a995-4576-b01f-234630154e96}",              NULL,                           SZ_CLSID_TENMONTHUMBHANDLER},
+            {HKEY_CURRENT_USER,   L"Software\\Classes\\.fit\\ShellEx\\{e357fccd-a995-4576-b01f-234630154e96}",               NULL,                           SZ_CLSID_TENMONTHUMBHANDLER},
+        };
+
+        hr = S_OK;
+        for (int i = 0; i < ARRAYSIZE(rgRegistryEntries) && SUCCEEDED(hr); i++)
+        {
+            hr = CreateRegKeyAndSetValue(&rgRegistryEntries[i]);
+        }
+    }
+    if (SUCCEEDED(hr))
+    {
+        // This tells the shell to invalidate the thumbnail cache.  This is important because any .xisf files
+        // viewed before registering this handler would otherwise show cached blank thumbnails.
+        SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, NULL, NULL);
+    }
+    return hr;
+}
+
+//
+// Unregisters this COM server
+//
+STDAPI DllUnregisterServer()
+{
+    HRESULT hr = S_OK;
+
+    const PCWSTR rgpszKeys[] =
+    {
+        L"Software\\Classes\\CLSID\\" SZ_CLSID_TENMONTHUMBHANDLER,
+        L"Software\\Classes\\.xisf\\ShellEx\\{e357fccd-a995-4576-b01f-234630154e96}"
+        L"Software\\Classes\\.fits\\ShellEx\\{e357fccd-a995-4576-b01f-234630154e96}"
+        L"Software\\Classes\\.fit\\ShellEx\\{e357fccd-a995-4576-b01f-234630154e96}"
+    };
+
+    // Delete the registry entries
+    for (int i = 0; i < ARRAYSIZE(rgpszKeys) && SUCCEEDED(hr); i++)
+    {
+        hr = HRESULT_FROM_WIN32(RegDeleteTreeW(HKEY_CURRENT_USER, rgpszKeys[i]));
+        if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND))
+        {
+            // If the registry entry has already been deleted, say S_OK.
+            hr = S_OK;
+        }
+    }
+    return hr;
+}

thumbnailer/TenmonThumbnailProvider.cpp

@@ -0,0 +1,199 @@
+#include <shlwapi.h>
+#include <thumbcache.h> // For IThumbnailProvider.
+#include <new>
+#include "libxisf.h"
+#include "../src/rawimage.h"
+
+bool loadXISF(const LibXISF::ByteArray &data, std::shared_ptr<RawImage> &rawImage);
+bool loadFITS(const LibXISF::ByteArray &data, std::shared_ptr<RawImage> &rawImage);
+
+void RawImageToHTBITMAP(std::shared_ptr<RawImage> &rawImage, HBITMAP *hbmp, UINT thumbSize)
+{
+    rawImage->calcStats();
+
+    DWORD thre = 20;
+    DWORD dataSize = 4;
+    HRESULT hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_CURRENT_USER, L"SOFTWARE\\nou\\Tenmon\\settings", L"thumbnailstretchthreshold", RRF_RT_DWORD, NULL, &thre, &dataSize));
+
+    float thref = 0.1f;
+    if(hr == S_OK)
+        thref = thre / 100.0f;
+
+    if(rawImage->imageStats().m_median[0] < rawImage->norm() * thref)
+    {
+        //OutputDebugStringA("Stretch image");
+        MTFParam params = rawImage->calcMTFParams();
+        rawImage->applySTF(params);
+    }
+
+    UINT w = rawImage->width();
+    UINT h = rawImage->height();
+
+    UINT cw = thumbSize;
+    UINT ch = thumbSize;
+    if (w > h)
+        ch = h * thumbSize / w;
+    else
+        cw = w * thumbSize / h;
+
+
+    rawImage->resize(cw, ch);
+    rawImage->convertToType(RawImage::UINT8);
+
+    BITMAPINFO bmi = {};
+    bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader);
+    bmi.bmiHeader.biWidth = cw;
+    bmi.bmiHeader.biHeight = -static_cast<LONG>(ch);
+    bmi.bmiHeader.biPlanes = 1;
+    bmi.bmiHeader.biBitCount = 32;
+    bmi.bmiHeader.biCompression = BI_RGB;
+    UINT lw = cw * 4;
+
+    BYTE *pBits;
+    HBITMAP bmp = CreateDIBSection(NULL, &bmi, DIB_RGB_COLORS, reinterpret_cast<void **>(&pBits), NULL, 0);
+
+    const unsigned char *p = (const unsigned char*)rawImage->data();
+    const unsigned short *ps = (const unsigned short*)rawImage->data();
+    if(rawImage->channels() == 1)
+    {
+        for(UINT y = 0; y < ch; y++)
+        {
+            for(UINT x = 0; x < cw; x++)
+            {
+                pBits[(y * lw) + x * 4 + 0] = p[y * cw + x];
+                pBits[(y * lw) + x * 4 + 1] = p[y * cw + x];
+                pBits[(y * lw) + x * 4 + 2] = p[y * cw + x];
+                pBits[(y * lw) + x * 4 + 3] = 255;
+            }
+        }
+    }
+    else
+    {
+        for(UINT y = 0; y < ch; y++)
+        {
+            for(UINT x = 0; x < cw; x++)
+            {
+                pBits[(y * lw) + x * 4 + 0] = p[y * cw * 4 + x * 4 + 2];
+                pBits[(y * lw) + x * 4 + 1] = p[y * cw * 4 + x * 4 + 1];
+                pBits[(y * lw) + x * 4 + 2] = p[y * cw * 4 + x * 4 + 0];
+                pBits[(y * lw) + x * 4 + 3] = 255;
+            }
+        }
+    }
+
+    *hbmp = bmp;
+}
+
+class TenmonThumbProvider : public IInitializeWithStream,
+                             public IThumbnailProvider
+{
+public:
+    TenmonThumbProvider() : _cRef(1), _pStream(NULL)
+    {
+    }
+
+    virtual ~TenmonThumbProvider()
+    {
+        if (_pStream)
+        {
+            _pStream->Release();
+        }
+    }
+
+    // IUnknown
+    IFACEMETHODIMP QueryInterface(REFIID riid, void **ppv)
+    {
+        static const QITAB qit[] =
+        {
+            QITABENT(TenmonThumbProvider, IInitializeWithStream),
+            QITABENT(TenmonThumbProvider, IThumbnailProvider),
+            { 0 },
+        };
+        return QISearch(this, qit, riid, ppv);
+    }
+
+    IFACEMETHODIMP_(ULONG) AddRef()
+    {
+        return InterlockedIncrement(&_cRef);
+    }
+
+    IFACEMETHODIMP_(ULONG) Release()
+    {
+        ULONG cRef = InterlockedDecrement(&_cRef);
+        if (!cRef)
+        {
+            delete this;
+        }
+        return cRef;
+    }
+
+    // IInitializeWithStream
+    IFACEMETHODIMP Initialize(IStream *pStream, DWORD grfMode);
+
+    // IThumbnailProvider
+    IFACEMETHODIMP GetThumbnail(UINT cx, HBITMAP *phbmp, WTS_ALPHATYPE *pdwAlpha);
+
+private:
+
+    long _cRef;
+    IStream *_pStream;     // provided during initialization.
+};
+
+HRESULT TenmonThumbnailer_CreateInstance(REFIID riid, void **ppv)
+{
+    TenmonThumbProvider *pNew = new (std::nothrow) TenmonThumbProvider();
+    HRESULT hr = pNew ? S_OK : E_OUTOFMEMORY;
+    if (SUCCEEDED(hr))
+    {
+        hr = pNew->QueryInterface(riid, ppv);
+        pNew->Release();
+    }
+    return hr;
+}
+
+// IInitializeWithStream
+IFACEMETHODIMP TenmonThumbProvider::Initialize(IStream *pStream, DWORD)
+{
+    HRESULT hr = E_UNEXPECTED;  // can only be inited once
+    if (_pStream == NULL)
+    {
+        // take a reference to the stream if we have not been inited yet
+        hr = pStream->QueryInterface(&_pStream);
+    }
+    return hr;
+}
+
+// IThumbnailProvider
+IFACEMETHODIMP TenmonThumbProvider::GetThumbnail(UINT cx, HBITMAP *phbmp, WTS_ALPHATYPE *pdwAlpha)
+{
+    LibXISF::ByteArray data;
+    ULONG readSize = 0;
+    ULONG read;
+    data.resize(1024*1024);
+
+    while(_pStream->Read(data.data() + readSize, data.size() - readSize, &read) == S_OK)
+    {
+        readSize += read;
+        data.resize(data.size() + 1024*1024);
+    }
+    readSize += read;
+
+    *pdwAlpha = WTSAT_RGB;
+
+    data.resize(readSize);
+
+    std::shared_ptr<RawImage> rawImage;
+    if(data[0] == 'X' && data[1] == 'I' && data[2] == 'S' && data[3] == 'F')
+    {
+        if(!loadXISF(data, rawImage))
+            return E_FAIL;
+    }
+    else
+    {
+        if(!loadFITS(data, rawImage))
+            return E_FAIL;
+    }
+
+    RawImageToHTBITMAP(rawImage, phbmp, cx);
+    return S_OK;
+}

thumbnailer/genthumbnail.cpp

@@ -0,0 +1,36 @@
+#include "genthumbnail.h"
+#include "../src/rawimage.h"
+#include "../src/loadimage.h"
+
+int generateThumbnail(const QString &input, const QString &output, uint32_t size)
+{
+    ImageInfoData info;
+    std::shared_ptr<RawImage> rawImage;
+    if(!loadImage(input, info, rawImage, 0))
+        return 2;
+
+    if(!rawImage)
+        return 3;
+
+    QSize rect(rawImage->width(), rawImage->height());
+    rect.scale(size, size, Qt::KeepAspectRatio);
+    rawImage->calcStats();
+    rawImage->resize(rect.width(), rect.height());
+    if(rawImage->imageStats().m_median[0] < rawImage->norm() * 0.2f)
+    {
+        MTFParam mtfParams = rawImage->calcMTFParams(true);
+        rawImage->applySTF(mtfParams);
+    }
+    rawImage->convertToType(RawImage::UINT8);
+
+    QImage img;
+    if(rawImage->channels() == 1)
+        img = QImage((const uchar*)rawImage->data(), rawImage->width(), rawImage->height(), rawImage->widthBytes(), QImage::Format_Grayscale8);
+    else
+        img = QImage((const uchar*)rawImage->data(), rawImage->width(), rawImage->height(), rawImage->widthBytes(), QImage::Format_RGBA8888);
+
+    if(!img.save(output, "png"))
+        return 4;
+
+    return 0;
+}

thumbnailer/genthumbnail.h

@@ -0,0 +1,8 @@
+#ifndef GENTHUMBNAIL_H
+#define GENTHUMBNAIL_H
+
+#include <QString>
+
+int generateThumbnail(const QString &input, const QString &output, uint32_t size);
+
+#endif // GENTHUMBNAIL_H

thumbnailer/loadimage.cpp

@@ -0,0 +1,163 @@
+#include "libxisf.h"
+#include "../src/rawimage.h"
+#ifdef WIN32
+#include <windows.h>
+#endif
+#include <fitsio2.h>
+
+bool OpenGLES = false;
+
+bool loadXISF(const LibXISF::ByteArray &data, std::shared_ptr<RawImage> &rawImage)
+{
+    try
+    {
+        LibXISF::XISFReader xisf;
+        xisf.open(data);
+
+        const LibXISF::Image &xisfImage = xisf.getImage(0);
+
+        RawImage::DataType type;
+        switch(xisfImage.sampleFormat())
+        {
+        case LibXISF::Image::UInt8: type = RawImage::UINT8; break;
+        case LibXISF::Image::UInt16: type = RawImage::UINT16; break;
+        case LibXISF::Image::UInt32: type = RawImage::UINT32; break;
+        case LibXISF::Image::Float32: type = RawImage::FLOAT32; break;
+        case LibXISF::Image::Float64: type = RawImage::FLOAT64; break;
+        default: return false;
+        }
+
+        LibXISF::Image tmpImage = xisfImage;
+        tmpImage.convertPixelStorageTo(LibXISF::Image::Planar);
+
+        if(tmpImage.colorSpace() == LibXISF::Image::ColorSpace::Gray)
+        {
+            rawImage = std::make_shared<RawImage>(tmpImage.width(), tmpImage.height(), 1, type);
+            std::memcpy(rawImage->data(), tmpImage.imageData(), tmpImage.imageDataSize() / tmpImage.channelCount());
+        }
+        else if(tmpImage.channelCount() == 3 || tmpImage.channelCount() == 4)
+        {
+            rawImage = RawImage::fromPlanar(tmpImage.imageData(), tmpImage.width(), tmpImage.height(), tmpImage.channelCount(), type);
+        }
+        return true;
+    }
+    catch (LibXISF::Error &err)
+    {
+#ifdef WIN32
+        char text[1024];
+        sprintf_s(text, 1000, "Failed to open XISF image %s", err.what());
+        OutputDebugStringA(text);
+#endif
+        return false;
+    }
+    return false;
+}
+
+bool loadFITS(const LibXISF::ByteArray &data, std::shared_ptr<RawImage> &rawImage)
+{
+    fitsfile *file;
+
+    int status = 0;
+    int hdutype = -1;
+    int num = 0;
+    long naxes[3] = {0};
+
+    auto checkError = [&status]()
+    {
+        char err[100];
+        fits_get_errstatus(status, err);
+#ifdef WIN32
+        char text[1000];
+        sprintf_s(text, 1000, "Failed to load FITS file %s", err);
+        OutputDebugStringA(text);
+#endif
+        return false;
+    };
+
+    const void *dataPtr = data.data();
+    size_t size = data.size();
+    fits_open_memfile(&file, "file.fits", READONLY, (void**)&dataPtr, &size, 0, nullptr, &status);
+    if(status)return checkError();
+    fits_get_num_hdus(file, &num, &status);
+    if(status)return checkError();
+
+    int imgtype;
+    int naxis;
+    for(int i=1; i <= num; i++)
+    {
+        fits_movabs_hdu(file, i, &hdutype, &status);if(status)return checkError();
+        if(hdutype == IMAGE_HDU)
+        {
+            naxes[0] = naxes[1] = naxes[2] = 0;
+            fits_get_img_param(file, 3, &imgtype, &naxis, naxes, &status);if(status)return checkError();
+            fits_get_img_equivtype(file, &imgtype, &status);if(status)return checkError();
+
+            if(hdutype == IMAGE_HDU && naxis >= 2 && naxis <= 3 && status == 0)
+            {
+                RawImage::DataType type;
+                int fitstype;
+                long fpixel[3] = {1,1,1};
+                switch(imgtype)
+                {
+                case BYTE_IMG:
+                    type = RawImage::UINT8;
+                    fitstype = TBYTE;
+                    break;
+                case SHORT_IMG:
+                    type = RawImage::UINT16;
+                    fitstype = TSHORT;
+                    break;
+                case USHORT_IMG:
+                    type = RawImage::UINT16;
+                    fitstype = TUSHORT;
+                    break;
+                case ULONG_IMG:
+                    type = RawImage::UINT32;
+                    fitstype = TUINT;
+                    break;
+                case FLOAT_IMG:
+                    type = RawImage::FLOAT32;
+                    fitstype = TFLOAT;
+                    break;
+                case DOUBLE_IMG:
+                    type = RawImage::FLOAT64;
+                    fitstype = TDOUBLE;
+                    break;
+                default:
+                    return false;
+                    break;
+                }
+
+                size_t size = naxes[0]*naxes[1];
+                size_t w = naxes[0];
+                size_t h = naxes[1];
+
+                RawImage img(w, h, naxis == 2 ? 1 : naxes[2], type);
+                uint8_t *data = static_cast<uint8_t*>(img.data());
+                for (int i=1; i==1 || i<=naxes[2]; i++)
+                {
+                    fpixel[2] = i;
+                    fits_read_pix(file, fitstype, fpixel, size, NULL, data + img.size() * RawImage::typeSize(type) * (i-1), NULL, &status);
+                    if(status)return checkError();
+                }
+                if(fitstype == TSHORT)
+                {
+                    uint16_t *s = static_cast<uint16_t*>(img.data());
+                    size_t size = img.size() * img.channels();
+                    for(size_t i=0; i<size; i++)
+                        s[i] -= INT16_MIN;
+                }
+
+                if(img.channels() == 1)
+                    rawImage = std::make_shared<RawImage>(std::move(img));
+                else
+                    rawImage = RawImage::fromPlanar(img);
+
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+

thumbnailer/main.cpp

@@ -1,48 +1,80 @@
-#include <QCoreApplication>
-#include <QCommandLineParser>
-#include "../rawimage.h"
-#include "../loadimage.h"
+#include <vector>
+#include <string>
+#include <iostream>
+#include "../src/rawimage.h"
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#include "stb_image_write.h"
 
-bool OpenGLES = false;
+bool loadXISF(const LibXISF::ByteArray &data, std::shared_ptr<RawImage> &rawImage);
+bool loadFITS(const LibXISF::ByteArray &data, std::shared_ptr<RawImage> &rawImage);
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication a(argc, argv);
+    std::vector<std::string> args;
+    for(int i=0; i<argc; i++)
+        args.push_back(argv[i]);
 
-    QCommandLineParser parser;
-    parser.addOption({{"s", "size"}, "Size of the thumbnail in pixels (default: 128)", "size", "128"});
-    parser.addPositionalArgument("input", "Input image file");
-    parser.addPositionalArgument("output", "Output image file");
-    parser.addHelpOption();
-
-    parser.process(a);
-
-    QStringList args = parser.positionalArguments();
-
-    if(args.size() < 2)
+    if(args.size() < 3)
         return 1;
 
-    QString input = args[0];
-    QString output = args[1];
+    std::string input = args[1];
+    std::string output = args[2];
 
-    ImageInfoData info;
     std::shared_ptr<RawImage> rawImage;
-    if(!loadImage(input, info, rawImage))
-        return 1;
 
-    if(!rawImage)
+    LibXISF::ByteArray data;
+    std::ifstream fr;
+    fr.open(input, std::ios_base::in | std::ios_base::binary);
+    if(!fr.is_open())
         return 2;
 
+    fr.seekg(0, std::ios_base::end);
+    size_t len = fr.tellg();
+    fr.seekg(0, std::ios_base::beg);
+    data.resize(len);
+    fr.read(data.data(), len);
+    if(fr.bad())
+        return 3;
+
+    if(input.find(".xisf") != std::string::npos)
+    {
+        if(!loadXISF(data, rawImage))
+            return 4;
+    }
+    else
+    {
+        if(!loadFITS(data, rawImage))
+            return 4;
+    }
+
+    if(!rawImage)
+        return 5;
+
+    uint32_t thumbSize = 256;
+
+    uint32_t w = rawImage->width();
+    uint32_t h = rawImage->height();
+
+    uint32_t cw = thumbSize;
+    uint32_t ch = thumbSize;
+    if (w > h)
+        ch = h * thumbSize / w;
+    else
+        cw = w * thumbSize / h;
+
+    rawImage->calcStats();
+    rawImage->resize(cw, ch);
+    if(rawImage->imageStats().m_median[0] < rawImage->norm() * 0.1f)
+    {
+        MTFParam mtfParams = rawImage->calcMTFParams(true);
+        rawImage->applySTF(mtfParams);
+    }
     rawImage->convertToType(RawImage::UINT8);
 
-    QImage img((const uchar*)rawImage->data(), rawImage->width(), rawImage->height(), QImage::Format_RGBA8888);
-    bool ok = false;
-    int size = parser.value("s").toInt(&ok);
-    if(!ok)size = 128;
-    img = img.scaled(size, size, Qt::KeepAspectRatio);
-    img.save(output, "png");
-
-    //rawImage->convertTosRGB();
+    if(rawImage->channels() == 1)
+        stbi_write_png(output.c_str(), cw, ch, 1, rawImage->data(), rawImage->widthBytes());
+    else
+        stbi_write_png(output.c_str(), cw, ch, 4, rawImage->data(), rawImage->widthBytes());
 
     return 0;
 }

thumbnailer/winmain.cpp

@@ -1 +0,0 @@
-bool OpenGLES = false;