Fix saving image

CMakeLists.txt

@@ -12,8 +12,12 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
 
-find_package(Qt5 COMPONENTS Widgets Sql OpenGL REQUIRED)
-find_package(OpenCV REQUIRED)
+option(SANITIZE_ADDRESS_LEAK "Enable -fsanitize=address -fsanitize=leak" OFF)
+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_library(GSL_LIB gsl REQUIRED)
 find_library(GSLCBLAS_LIB gslcblas REQUIRED)
 find_library(EXIF_LIB exif REQUIRED)
@@ -24,68 +28,73 @@ find_library(WCS_LIB wcs wcslib PATHS REQUIRED)
 add_subdirectory(libXISF)
 
 set(TENMON_SRC
-    about.cpp
-    database.cpp
-    databaseview.cpp
+    about.cpp about.h
+    batchprocessing.cpp batchprocessing.h batchprocessing.ui
+    database.cpp database.h
+    databaseview.cpp databaseview.h
     delete.cpp
-    filesystemwidget.cpp
-    imageinfo.cpp
-    imageringlist.cpp
+    filesystemwidget.cpp filesystemwidget.h
+    histogram.cpp histogram.h
+    imageinfo.cpp imageinfo.h
+    imageringlist.cpp imageringlist.h
     imagescrollarea.cpp
-    imagescrollareagl.cpp
-    loadrunable.cpp
+    imagescrollareagl.cpp imagescrollareagl.h
+    loadrunable.cpp loadrunable.h
     main.cpp
-    mainwindow.cpp
-    markedfiles.cpp
-    rawimage.cpp
-    settingsdialog.cpp
-    starfit.cpp
-    statusbar.cpp
-    stfslider.cpp
-    stretchtoolbar.cpp
+    mainwindow.cpp mainwindow.h
+    markedfiles.cpp markedfiles.h
+    rawimage.cpp rawimage.h
+    rawimage_sse.cpp
+    scriptengine.cpp scriptengine.h
+    settingsdialog.cpp settingsdialog.h
+    starfit.cpp starfit.h
+    statusbar.cpp statusbar.h
+    stfslider.cpp stfslider.h
+    stretchtoolbar.cpp stretchtoolbar.h
 )
 
 option(COLOR_MANAGMENT "Enable sRGB framebuffer support for gamma correct images and color profiles support" ON)
-if(${Qt5Core_VERSION_STRING} VERSION_LESS "5.14")
-    set(COLOR_MANAGMENT OFF)
-endif(${Qt5Core_VERSION_STRING} VERSION_LESS "5.14")
 
 if(COLOR_MANAGMENT)
     add_compile_definitions("COLOR_MANAGMENT")
 endif(COLOR_MANAGMENT)
 
-qt5_add_resources(TENMON_SRC resources.qrc)
+qt_add_resources(TENMON_SRC resources/resources.qrc)
+qt_add_resources(TENMON_SRC shaders/shaders.qrc)
+qt_add_resources(TENMON_SRC scripts/scripts.qrc)
 if(WIN32)
-    list(APPEND TENMON_SRC icon.rc)
+    list(APPEND TENMON_SRC resources/icon.rc)
     set(tenmon_ICON "")
 elseif(APPLE)
-    set(tenmon_ICON ${CMAKE_CURRENT_SOURCE_DIR}/tenmon.icns)
+    set(tenmon_ICON ${CMAKE_CURRENT_SOURCE_DIR}/resources/tenmon.icns)
+    find_package(Qt6 COMPONENTS DBus REQUIRED)
     set_source_files_properties(${tenmon_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 else()
     set(tenmon_ICON "")
+    find_package(Qt6 COMPONENTS DBus REQUIRED)
     find_package(PkgConfig REQUIRED)
     pkg_search_module(GIO REQUIRED gio-2.0)
 endif()
 
-add_executable(tenmon WIN32 MACOSX_BUNDLE ${tenmon_ICON} ${TENMON_SRC})
+qt_add_executable(tenmon WIN32 MACOSX_BUNDLE ${tenmon_ICON} ${TENMON_SRC})
 
 find_path(FITS_INCLUDE fitsio2.h PATH_SUFFIXES cfitsio REQUIRED)
-target_include_directories(tenmon PRIVATE ${OpenCV_INCLUDE_DIRS} ${FITS_INCLUDE} ${CMAKE_BINARY_DIR} ${libXISF_SOURCE_DIR})
+target_include_directories(tenmon PRIVATE ${FITS_INCLUDE} ${CMAKE_BINARY_DIR} ${libXISF_SOURCE_DIR})
 
 if(UNIX AND NOT APPLE)
     target_include_directories(tenmon PRIVATE ${GIO_INCLUDE_DIRS})
 endif()
 
-target_link_libraries(tenmon Qt5::Widgets Qt5::Sql ${OpenCV_LIBS} ${GSL_LIB} ${GSLCBLAS_LIB} ${EXIF_LIB} ${FITS_LIB} ${RAW_LIB} ${WCS_LIB} XISF)
+target_link_libraries(tenmon PRIVATE Qt6::Widgets Qt6::Sql Qt6::OpenGLWidgets Qt6::Qml ${GSL_LIB} ${GSLCBLAS_LIB} ${EXIF_LIB} ${FITS_LIB} ${RAW_LIB} ${WCS_LIB} XISF)
 if(APPLE)
-    target_link_libraries(tenmon "-framework CoreFoundation")
-else()
-    target_link_libraries(tenmon ${GIO_LDFLAGS})
+    target_link_libraries(tenmon PRIVATE Qt6::DBus "-framework CoreFoundation")
+elseif(UNIX)
+    target_link_libraries(tenmon PRIVATE Qt6::DBus ${GIO_LDFLAGS})
 endif(APPLE)
 
 if(LIBRAW_STATIC)
     add_compile_definitions("LIBRAW_NODLL")
-    target_link_libraries(tenmon jasper)
+    target_link_libraries(tenmon PRIVATE jasper)
 endif()
 
 install(TARGETS tenmon BUNDLE DESTINATION .)
@@ -96,8 +105,8 @@ if(UNIX AND NOT APPLE)
         install(SCRIPT install.cmake)
     else()
         install(FILES space.nouspiro.tenmon.desktop DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
-        install(FILES space.nouspiro.tenmon.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps")
-        install(FILES space.nouspiro.tenmon_128.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps" RENAME space.nouspiro.tenmon.png)
+        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)
     endif()
     install(FILES space.nouspiro.tenmon.metainfo.xml DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo")
 endif(UNIX AND NOT APPLE)

README

@@ -2,20 +2,20 @@ FITS/XISF image viewer with multithreaded image loading
 
 To get all dependencies install these packages
 
-    sudo apt install qtbase5-dev libraw-dev libexif-dev libcfitsio-dev libgsl-dev wcslib-dev libopencv-dev cmake
+    sudo apt install qt6-base-dev qt6-declarative-dev libqt6opengl6-dev libraw-dev libexif-dev libcfitsio-dev libgsl-dev wcslib-dev cmake
 
 on OpenSUSE
 
-    sudo zypper install opencv-devel gsl-devel exif-devel libraw-devel wcslib-devel libqt5-qtbase-devel
+    sudo zypper install gsl-devel exif-devel libraw-devel wcslib-devel libqt6-qtbase-devel
 
 MacOS X
 
 To compile on MacOS install XCode first. Then install homebrew in x86_64 mode
 with "arch -i x86_64". Building on native ARM is not supported.
 
-    homebrew install qt5 libraw cfitsio libexif libgsl wcslib opencv
+    homebrew install qt6 libraw cfitsio libexif libgsl wcslib
 
-You may need to set CMAKE_PREFIX_PATH for Qt5 and OpenCV so CMake can find them.
+You may need to set CMAKE_PREFIX_PATH for Qt6 so CMake can find them.
 
 Then to build run standard cmake
 

about/help_en

@@ -11,10 +11,10 @@ img { margin: 5px; }
 
 <p>Tenmon is intended primarily for viewing astro photos and images. It supports the following formats:
 <ul>
-    <li>FITS 8, 16 bit integer and 32 bit float</li>
-    <li>XISF 8, 16 bit integer and 32 bit float</li>
+    <li>FITS 8, 16, 32 bit integer and 32, 64 bit float</li>
+    <li>XISF 8, 16, 32 bit integer and 32, 64 bit float</li>
     <li>JPEG, PNG, BMP, GIF, PBM, PGM, PPM and SVG images</li>
-    <li>CR2, NEF, DNG raw images</li>
+    <li>CR2, CR3, NEF, DNG raw images</li>
 </ul>
 </p>
 
@@ -54,12 +54,14 @@ To open an image, you can also drag and drop it to main window.</p>
     <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>
-Following the slider are 5 buttons for automatic stretching:
+Following the slider are 7 buttons for automatic stretching:
 <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>
     <li><i>Reset</i> reset three values for black, mid and white point to default.</li>
     <li><i>Invert</i> invert colors to display the image as negative.</li>
-    <li><i>Super pixel CFA </i> average 2x2 pixels into one (suitable for images from colour camera).</li>
+    <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.</p>
 </ul>
 
@@ -113,6 +115,123 @@ Pressing Enter or clicking on <i>Filter</i> button will filter out database reco
 <br><img src=":/about/filter.png"><br>
 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>Batch processing</h3>
+
+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>.
+In script you can then iterate through files like this.
+<pre>for(file of files)
+{
+    if(file.suffix() == "fits")
+    {
+        core.log(file.fileName());
+        file.convert(file.relativeFilePath(), "XISF");
+    }
+}
+</pre>
+<p>Bellow this list is output directory. All relative paths passed as arguments into methods like copy(), move() or convert() will be relative to this output directory. If you pass absolute path to methods then
+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/<USER>/AppData/Roaming/nou/Tenmon"  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>
+
+<h4>core</h4>
+There is global object called <b>core</b> that have these methods.
+<ul>
+<li><b>log(message)</b> print message to log window.</li>
+<li><b>mark(file)</b> mark file same way as in GUI. Takes object of type <i>File</i> as argument.</li>
+<li><b>unmark(file)</b>  unmark file same was as in GUI. Takes object of type <i>File</i> as argument.</li>
+<li><b>isMarked(file)</b> check if file was marked.  Takes object of type <i>File</i> as argument.</li>
+<li><b>setMaxThread(maxthread)</b> set maximum number of concurrent thread when doing asynchronous task.</li>
+<li><b>sync()</b> wait until all asynchronous tasks are done.</li>
+<li><b>getString(label = "", text = "")</b> show dialog box to get string value from user. String value passed in first argument is used as description label. Second argument text is default value in text box.
+        Both parameters are optional so calling just <i>getString()</i> is valid. When cancel is pressed it return Undefined.</li>
+<li><b>getInt(label = "", value = 0)</b> show dialog box with input box to retrieve integer value. String value passed in first argument is used as description label.
+        Second parameter is default value in input box. Both parameters are optional. When cancel is pressed it return Undefined.</li>
+<li><b>getFloat(label = "", value = 0, decimals = 3)</b> show dialog box with input box to retrieve decimal value. String value passed in first argument is used as description label.
+        Second parameter is default value in input box. All three parameters are optional. When cancel is pressed it return Undefined.</li>
+<li><b>getItem(items)</b> show selection dialog which allow to select one item from array of items. It return selected item as string. When cancel is pressed it return Undefined.</li>
+</ul>
+
+<h4>File</h4>
+In <b>files</b> array there are instances of type <b>File</b> objects that have these methods.
+<ul>
+<li><b>fileName()</b> returns the name of the file, excluding the path.</li>
+<li><b>absoluteFilePath()</b> returns an absolute path including the file name.</li>
+<li><b>absolutePath()</b> returns an absolute path without the file name</li>
+<li><b>relativeFilePath()</b> return relative path including file name relative to directory that was in list of directories to be scanned. For example you add C:/images as input directory. In this directory there
+        is file <i>C:/images/lights/red/M42_001.fits</i> then this method will return <i>lights/red/M42_001.fits</i></li>
+<li><b>relativePath()</b> return same path as previous method just without file name. <i>lights/red</i></li>
+<li><b>baseName()</b> return file name up to the first dot. For example for <i>some.file.name.fits</i> it will return <i>some</i></li>
+<li><b>completeBaseName()</b> return file name up to the last dot. For example for <i>some.file.name.fits</i> it will return <i>some.file.name</i></li>
+<li><b>suffix()</b> return string after last dot in file name. For example <i>fits</i></li>
+<li><b>size()</b> return size of file in bytes.</li>
+<li><b>fitsKeywords()</b> return array of strings with every keyword that is in header. <i>SIMPLE,BITPIX,NAXIS,NAXIS1,NAXIS2,EXTEND,COMMENT</i></li>
+<li><b>fitsValue(key)</b> return value for keyword. In case that there is multiple occurrences it return last one.</li>
+<li><b>fitsValues(key)</b> return array of values for keyword.</li>
+<li><b>fitsRecords()</b> return array of objects with properties <b>key, value</b> and <b>comment</b> </li>
+<li><b>modifyFITSRecords(FITSRecordModify)</b> modify FITS header by adding, removing or updating FITS record. Return true on success. Refer to <i>FITSRecordModify</i></li>
+<li><b>isMarked()</b> return true if file is marked.</li>
+<li><b>copy(newpath)</b> copy file to new location. It return instance of new <i>File<i> object that represent this copied file. This path can be relative or absolute. In case that <i>newpath</i> parameter is relative
+        path then it "Output directory" from GUI windows is used as base directory. Parameter <i>newpath</i> can absolute path. File is then copied to this path. In case that copy fail it return null.</li>
+<li><b>move(newpath)</b> move file to new location. It return false if move failed. This can happend if destination is not writable but also if destination file already exist. This functions does not overwrite existing file.
+        This path can be relative or absolute. In case that <i>newpath</i> parameter is relative path then it "Output directory" from GUI windows is used as base directory. Parameter <i>newpath</i> can be absolute path.
+        File is then moved to this path.</li>
+<li><b>convert(outpath, format, params)</b> convert image file from any format that program is able to open into FITS, XISF, JPEG, PNG, BMP.
+        Parameters are: <i>outputpath</i> path where converted image will be saved. It automatically replace suffix according to format. <i>format</i> one of "FITS" "XISF", "JPG", "PNG" or "BMP". <i>params</i> object with attributes "compressionType" and "compressionLevel".
+        Valid values for compressionType are be "gzip" or "rice" when converting to FITS. When converting to XISF compressionType can be "zlib", "lz4", "lz4hc", "zstd", "zlib+sh", "lz4+sh", "lz4hc+sh", "zstd+sh".
+        It is recommended to use "+sh" variants of compression.
+        XISF format also accept "compressionLevel" in range 0-100 where zero is fastest compression and 100 slowest. If you omit this attribute or set it to -1 then default compression level will be used.
+        It return new instance of <i>File</i> that point to converted file.
+<pre>file.convert("converted_file.xisf", "xisf", {"compressionType": "zstd+sh", "compressionLevel": 70});
+file.convert("converted_file.fits", "fits", {"compressionType": "rice"});
+file.convert("converted_file.jpg", "png");</pre>
+</li>
+<li><b>convertAsync(outpath, format, params)</b> same as previous method but it does conversion in separated thread asynchronously and in parallel. Before calling any method on object returned by this method you must call
+        <code>core.sync();</code> to ensure that conversion is done and destination file exists.
+        <pre>let compression = {"compressionType": "zstd+sh"};
+let convertedFiles = [];
+for(file in files)
+{
+    if(file.suffix() == "fits")
+        convertedFiles.push(file.convertAsync("xisf/" + file.fileName(), "XISF", compression));
+}
+core.sync(); // ensure that files exist
+for(file of convertedFiles)// now we can iterate over the files
+{
+    core.log(file.fileName() + " " + file.size()); // let print compressed file sizes
+}</pre></li>
+<li><b>stats()</b> calculate basic images statistics and return them as object with attributes "mean", "stddev", "median", "min", "max" and "mad".
+<pre>let s = file.stats();
+core.log("Median value is " + s.median);</pre></li>
+</ul>
+
+<h4>FITSRecordModify</h4>
+This class is used to define modify operation FITS header in FITS and XISF files. It can remove update and add records. Order of operation is also remove then update and last add.
+The keyword names may be up to 8 characters long and can only contain uppercase letters, the digits 0-9, the hyphen, and the underscore character.
+<pre>let modify = new FITSRecordModify();
+modify.updateKeyword("OBJECT", "M42");
+modify.updateKeyword("MYTILE", "PART1", "adding custom keyword so WBPP can group it");
+modify.removeKeyword("OBJECT");
+// doesn't matter that it is specified as last. This will first remove
+// existing OBJECT record and then add again OBJECT=M42
+for(file in files)
+{
+    file.modifyFITSRecords(modify);
+}</pre>
+
+<ul>
+<li><b>new FITSRecordModify()</b> create new instance of object.</li>
+<li><b>removeKeyword(key);</b> specify removing of record with <i>key</i> as keyword.</li>
+<li><b>updateKeyword(key, value, comment = "")</b> specify updating existing keyword with value and comment. Comment is optional parameter. If record with keyword doesn't exist then it will add new one.
+        Unless you want to have multiple records with same keyword (for example HISTORY) always use this method and not addKeyword.</li>
+<li><b>addKeyword(key, value, comment = "")</b> specify adding new keyword</li>
+</ul>
+
 <p><small>PS: Kanji in icon means astronomy in Japanese</small></p>
 </body>
 </html>

about/help_fr

@@ -14,7 +14,7 @@ img { margin: 5px; }
     <li>FITS 8, 16 bit entier et 32 bit point flottant</li>
     <li>XISF 8, 16 bit entier et 32 bit point flottant</li>
     <li>images JPEG, PNG, BMP, GIF, PBM, PGM, PPM et SVG</li>
-    <li>images RAW CR2, NEF, DNG</li>
+    <li>images RAW CR2, CR3, NEF, DNG</li>
 </ul>
 </p>
 
@@ -101,6 +101,114 @@ En appuyant sur la touche Enter ou en cliquant sur le bouton <i>Filtre</i>, les
 <br><img src=":/about/filter.png"><br>
 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>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.
+Vous pouvez ajouter des répertoires ou des fichiers individuels à cette liste. Les répertoires sont analysés de manière récursive pour trouver tous les fichiers, même les fichiers non image. Cette liste de fichiers est ensuite transmise au script dans un tableau nommé  <b>files</b>.
+Dans le script, vous pouvez ensuite parcourir les fichiers comme ici.
+<pre>for(file of files)
+{
+    if(file.suffix() == "fits")
+    {
+        core.log(file.fileName());
+        file.convert(file.relativeFilePath(), "XISF");
+    }
+}
+</pre>
+
+<h4>core</h4>
+Il existe un objet global appelé <b>core</b> qui possède ces méthodes.
+<ul>
+<li><b>log(message)</b> afficher le message dans la fenêtre du journal.</li>
+<li><b>mark(file)</b> marquer le fichier de la même manière que dans l'interface graphique. Prend un objet de type <i>File</i> comme argument.</li>
+<li><b>unmark(file)</b>  décoche le fichier de la même manière que dans l'interface graphique. Prend un objet de type <i>File</i> comme argument.</li>
+<li><b>isMarked(file)</b> vérifie si le fichier a été marqué. Prend un objet de type <i>File</i> comme argument.</li>
+<li><b>setMaxThread(maxthread)</b> définir le nombre maximal de threads simultanés lors de l'exécution d'une tâche asynchrone.</li>
+<li><b>sync()</b> attendre que toutes les tâches asynchrones soient terminées.</li>
+<li><b>getString(label = "", text = "")</b> affiche la boîte de dialogue pour obtenir un text de l'utilisateur. La valeur text passée dans le premier argument est utilisée comme label de description. Le texte du deuxième argument est la valeur par défaut dans la zone de texte.
+        Les deux paramètres sont facultatifs, donc l'appel à <i>getString()</i> est valide. Lorsque vous appuyez sur Annuler, il renvoie Undefined</li>
+<li><b>getInt(label = "", value = 0)</b> affiche une boîte de dialogue avec une zone de saisie pour récupérer une valeur entière. Le texte passé dans le premier argument est utilisé comme label de description.
+Le deuxième paramètre est la valeur par défaut dans la zone de saisie. Les deux paramètres sont facultatifs. Lorsque vous appuyez sur Annuler, il renvoie Undefined.</li>
+<li><b>getFloat(label = "", value = 0, decimals = 3)</b> affiche une boîte de dialogue avec une zone de saisie pour récupérer une valeur décimale. Le texte passé dans le premier argument est utilisé comme label de description.
+Le deuxième paramètre est la valeur par défaut dans la zone de saisie. Les trois paramètres sont facultatifs. Lorsque vous appuyez sur Annuler, il renvoie Undefined.</li>
+<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>
+</ul>
+
+<h4>File</h4>
+Dans le tableau <b>files</b>, il y a des instances d'objets de type <b>File</b> qui ont ces méthodes.
+<ul>
+<li><b>fileName()</b> renvoie le nom du fichier, à l'exclusion du chemin.</li>
+<li><b>absoluteFilePath()</b> renvoie un chemin absolu incluant le nom du fichier.</li>
+<li><b>absolutePath()</b> renvoie un chemin absolu sans le nom du fichier</li>
+<li><b>relativeFilePath()</b> renvoie le chemin relatif incluant le nom du fichier par rapport au répertoire qui était dans la liste des répertoires à analyser. Par exemple, vous ajoutez C:/images comme répertoire d'entrée. Dans ce répertoire, il y a
+le fichier <i>C:/images/lights/red/M42_001.fits</i>, alors cette méthode renverra <i>lights/red/M42_001.fits</i></li>
+<li><b>relativePath()</b> renvoie le même chemin que la méthode précédente, mais sans le nom de fichier. <i>lights/red</i></li>
+<li><b>baseName()</b> renvoie le nom du fichier jusqu'au premier point. Par exemple, pour <i>some.file.name.fits</i>, il renverra <i>some</i></li>
+<li><b>completeBaseName()</b> renvoie le nom du fichier jusqu'au dernier point. Par exemple, pour <i>some.file.name.fits</i>, il renverra <i>some.file.name</i></li>
+<li><b>suffix()</b> renvoie la chaîne après le dernier point du nom de fichier. Par exemple <i>fits</i></li>
+<li><b>size()</b> renvoie la taille du fichier en octets.</li>
+<li><b>fitsKeywords()</b> renvoie un tableau de chaînes avec chaque mot-clé présent dans l'en-tête. <i>SIMPLE,BITPIX,NAXIS,NAXIS1,NAXIS2,EXTEND,COMMENT</i></li>
+<li><b>fitsValue(key)</b> renvoie la valeur pour le mot-clé. En cas d'occurrences multiples, la dernière est renvoyée.</li>
+<li><b>fitsValues(key)</b> renvoie un tableau de valeurs pour le mot clé.</li>
+<li><b>fitsRecords()</b> renvoie un tableau d'objets avec des propriétés <b>key, value</b> et <b>comment</b> </li>
+<li><b>modifyFITSRecords(FITSRecordModify)</b> modifier l'en-tête FITS en ajoutant, supprimant ou mettant à jour l'enregistrement FITS. Renvoie true en cas de succès. Reportez-vous à <i>FITSRecordModify</i></li>
+<li><b>isMarked()</b> renvoie true si le fichier est marqué.</li>
+<li><b>copy(newpath)</b> Copie le fichier vers un nouvel emplacement. Il renvoie une instance du nouvel objet <i>File<i> qui représente ce fichier copié. Ce chemin peut être relatif ou absolu. Dans le cas où le paramètre <i>newpath</i> est un chemin relatif, le "Répertoire de sortie" des fenêtres de l'interface graphique est utilisé comme répertoire de base. Le paramètre <i>newpath</i> peut être un chemin absolu. Le fichier est ensuite copié vers ce chemin. En cas d'échec de la copie, il renvoie null.</li>
+<li><b>move(newpath)</b> déplacer le fichier vers un nouvel emplacement. Il renvoie false si le déplacement a échoué. Cela peut se produire si la destination n'est pas accessible en écriture mais aussi si le fichier de destination existe déjà. Cette fonction n'écrase pas le fichier existant.
+Ce chemin peut être relatif ou absolu. Dans le cas où le paramètre <i>newpath</i> est un chemin relatif, le "répertoire de sortie" des fenêtres de l'interface graphique est utilisé comme répertoire de base. Le paramètre <i>newpath</i> peut être un chemin absolu.
+Le fichier est ensuite déplacé vers ce chemin.</li>
+<li><b>convert(outpath, format, params)</b> Convertir un fichier image à partir de n'importe quel format que le programme peut ouvrir en FITS, XISF, JPEG, PNG, BMP.
+Les paramètres sont : <i>outputpath</i> chemin où l'image convertie sera enregistrée. Il remplace automatiquement le suffixe en fonction du format. <i>format</i> l'un des éléments suivants : "FITS", "XISF", "JPG", "PNG" ou "BMP". <i>params</i> objet avec les attributs "compressionType" et "compressionLevel".
+Les valeurs valides pour compressionType sont "gzip" ou "rice" lors de la conversion en FITS. Lors de la conversion en XISF, compressionType peut être "zlib", "lz4", "lz4hc", "zstd", "zlib+sh", "lz4+sh", "lz4hc+sh", "zstd+sh".
+Il est recommandé d'utiliser les variantes de compression "+sh".
+Le format XISF accepte également les "compressionLevel" dans la plage 0-100, où zéro est la compression la plus rapide et 100 la plus lente. Si vous omettez cet attribut ou le définissez sur -1, le niveau de compression par défaut sera utilisé.
+Il renvoie une nouvelle instance de <i>File</i> qui pointe vers le fichier converti.
+<pre>file.convert("converted_file.xisf", "xisf", {"compressionType": "zstd+sh", "compressionLevel": 70});
+file.convert("converted_file.fits", "fits", {"compressionType": "rice"});
+file.convert("converted_file.jpg", "png");</pre>
+</li>
+<li><b>convertAsync(outpath, format, params)</b> même méthode que la précédente, mais effectue la conversion dans un thread séparé de manière asynchrone et en parallèle. Avant d'appeler une méthode sur un objet renvoyé par cette méthode, vous devez appeler
+        <code>core.sync();</code> pour s'assurer que la conversion est effectuée et que le fichier de destination existe.
+        <pre>let compression = {"compressionType": "zstd+sh"};
+let convertedFiles = [];
+for(file of files)
+{
+    if(file.suffix() == "fits")
+        convertedFiles.push(file.convertAsync("xisf/" + file.fileName(), "XISF", compression));
+}
+core.sync(); // ensure that files exist
+for(file of convertedFiles)// now we can iterate over the files
+{
+    core.log(file.fileName() + " " + file.size()); // let print compressed file sizes
+}</pre></li>
+<li><b>stats()</b> calculer les statistiques d'images de base et les renvoyer sous forme d'objet avec des attributs "mean", "stddev", "median", "min", "max" et "mad".
+<pre>let s = file.stats();
+core.log("Median value is " + s.median);</pre></li>
+</ul>
+
+<h4>FITSRecordModify</h4>
+Cette classe est utilisée pour définir l'en-tête FITS des opérations de modification dans les fichiers FITS et XISF. Elle peut supprimer, mettre à jour et ajouter des enregistrements. L'ordre des opérations est également le suivant : suppression, puis mise à jour et enfin ajout.
+Les noms des mots-clés peuvent comporter jusqu'à 8 caractères et ne peuvent contenir que des lettres majuscules, les chiffres de 0 à 9, le trait d'union et le caractère de soulignement.
+<pre>let modify = new FITSRecordModify();
+modify.updateKeyword("OBJECT", "M42");
+modify.updateKeyword("MYTILE", "PART1", "adding custom keyword so WBPP can group it");
+modify.removeKeyword("OBJECT");
+// Peu importe qu'il soit spécifié comme dernier. Cela supprimera d'abord
+// l'enregistrement OBJECT existant, puis ajoutera à nouveau OBJECT=M42
+for(file in files)
+{
+    file.modifyFITSRecords(modify);
+}</pre>
+
+<ul>
+<li><b>new FITSRecordModify()</b> créer une nouvelle instance de l'objet.</li>
+<li><b>removeKeyword(key);</b> spécifier la suppression de l'enregistrement avec <i>key</i> comme mot-clé.</li>
+<li><b>updateKeyword(key, value, comment = "")</b> spécifiez la mise à jour du mot-clé existant avec la valeur et le commentaire. Le commentaire est un paramètre facultatif. Si l'enregistrement avec le mot-clé n'existe pas, il en ajoutera un nouveau.
+À moins que vous ne souhaitiez avoir plusieurs enregistrements avec le même mot-clé (par exemple HISTORY), utilisez toujours cette méthode et non addKeyword.</li>
+<li><b>addKeyword(key, value, comment = "")</b> spécifier l'ajout d'un nouveau mot-clé</li>
+</ul>
+
 <p><small>PS: Le Kanji de icône (tenmon) signifie astronomie en japonais</small></p>
 </body>
 </html>

about/help_sk

@@ -10,10 +10,10 @@ p { padding:0px; margin:5px 5px 10px 5px; }
 
 <p>Tenmon slúži primárne na zobrazenie astronomických fotiek a obrázkov. Dokáže otvoriť nasledovné formáty:
 <ul>
-    <li>FITS 8, 16 bitové celočíselné a 32 bitové s plávajúcou čiarkou</li>
-    <li>XISF 8, 16 bitové celočíselné a 32 bitové s plávajúcou čiarkou</li>
+    <li>FITS 8, 16, 32 bitové celočíselné 32 a 64 bitové s plávajúcou čiarkou</li>
+    <li>XISF 8, 16, 32 bitové celočíselné 32 a 64 bitové s plávajúcou čiarkou</li>
     <li>JPEG, PNG, BMP, GIF, PBM, PGM, PPM a SVG obrázky</li>
-    <li>CR2, NEF, DNG raw obrázky</li>
+    <li>CR2, CR3, NEF, DNG raw obrázky</li>
 </ul>
 </p>
 
@@ -49,9 +49,12 @@ 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>
+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.
 Druhé tlačidlo resetuje hodnoty pre čierny, stredný a biely bod na východzie hodnoty. Invertovanie farieb zobrazí obrázok ako negatív.
-Super pixel CFA spriemeruje dva krát dva pixeli do jedného čo je vhodné pri prezeraní surových obrázkov z farebných kamier.
+Falošné farby zobraí čiernobiele obrázky vo farebnej škále.
+Prevoď CFA na farbu prevedie demozaikovanie čiernobieleho obrázku na farebný.
 Posledné tlačidlo zapína a vypína nastavovanie optimálnych hodnôt úrovní pre každý obrázok zvlášť.</p>
 
 <h3>Označovanie obrázkov</h3>
@@ -75,9 +78,128 @@ Pre indexovanie nových súborov je treba znova pustiť indexáciu.</p>
 kde sú jednotlivé stĺpcoch zobrazené vybrané vlastnosti. V spodnej časti panelu je tlačidlo ktoré zobrazí dialóg na výber zobrazovaných
 sĺpcov. Nasledujú tri výberové a textové polia. Tieto slúžia na vyhľadávanie v databáze. Výberové pole určuje stĺpec v ktorom sa
 má vyhľadávať a do textového poľa sa zadáva hodnota na vyhľadanie.
+
+<p>Zastupné znaky:
+<ul>
+    <li><b>%</b> (percent) je zastupný znak reprezentujúci žiadný alebo hocikoľko znakov.</li>
+    <li><b>_</b> (underscore) je zastupný znak nahrádzajúci presne jeden znak.</i>
+    <li>Bez zástupných znako sa hľadá presná zhoda.</li>
+</ul>
+</p>
+
 <br><img src=":/about/filter.png"><br>
 V nasledovnom príklade sa vyhľadajú súbory ktoré majú v mene súboru "Bias", OBJECT je M_42 a DATE začína reťazcom 2022. Znak % sa berie ako
 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>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.
+Do zoznamu môžete pridať adresáre alebo jednotlivé súbory. Adresáre sú rekurzívne prehľadané na všetky súbory. Zoznam súborov je potom predaný do skriptu ako pole nazvané <b>files</b>.
+V skripte potom cez toto pole iteruje nasledovne.
+<pre>for(file in files)
+{
+    if(file.suffix() == "fits")
+    {
+        core.log(file.fileName());
+        file.convert(file.relativeFilePath(), "XISF");
+    }
+}
+</pre>
+
+<h4>core</h4>
+V skripte je dostupný globálny objekt nazvaný <b>core</b> ktorý má nasledovné metódy.
+<ul>
+<li><b>log(message)</b> vypíše message do okna záznamu.</li>
+<li><b>mark(file)</b> označí súbor rovnako ako cez GUI. Parameter je objekt typu <i>File</i>.</li>
+<li><b>unmark(file)</b>  odznačí súbor rovnako ako cez GUI. Parameter je objekt typu <i>File</i>.</li>
+<li><b>isMarked(file)</b> overenie či je súbor označený.  Parameter je objekt typu <i>File</i>.</li>
+<li><b>setMaxThread(maxthread)</b> nastavý maximálny počet paralelných vlákien pri vykonávaní asynchrónnych úloh.</li>
+<li><b>sync()</b> počká kým sa dokončia všetky asynchrónne úlohy.</li>
+<li><b>getString(label = "", text = "")</b> ukáže dialóg pre získanie textovej hodnoty od používateľa. Prvý parameter je textový popis. Druhý parameter je východzia hodnota. Obydva parametre sú voliteľné takže aj volanie <i>getString()</i> je valdiné.
+        Metoda vracia textový retazec alebo Undefined ak bolo stlačené tlačidlo zrušiť.</li>
+<li><b>getInt(label = "", value = 0)</b> ukáže diálog pre získanie celočíselnej hodnoty. Prvý parameter je textový popis. Druhý parameter je východzia hodnota. Obydva parametre sú voliteľné. Vracia zadané číslo alebo ak je stlačené tlačidlo zrušiť vráti Undefined.</li>
+<li><b>getFloat(label = "", value = 0, decimals = 3)</b> ukáže diálog pre získanie reálneho čísla. Prvý parameter je textový popis. Druhý parameter je východzia hodnota. Tretí parameter je počet desatinných miest.
+        Obydva parametre sú voliteľné. Vracia zadané číslo alebo ak je stlačené tlačidlo zrušiť vráti Undefined.</li>
+<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>
+</ul>
+
+<h4>File</h4>
+V poli <b>files</b> sú inštancie objektu typu <b>File</b> ktorý ma nasledovné metódy.
+<ul>
+<li><b>fileName()</b> returns the name of the file, excluding the path.</li>
+<li><b>absoluteFilePath()</b> returns an absolute path including the file name.</li>
+<li><b>absolutePath()</b> returns an absolute path without the file name</li>
+<li><b>relativeFilePath()</b> return relative path including file name relative to directory that was in list of directories to be scanned. For example you add C:/images as input directory. In this directory there
+        is file <i>C:/images/lights/red/M42_001.fits</i> then this method will return <i>lights/red/M42_001.fits</i></li>
+<li><b>relativePath()</b> return same path as previous method just without file name. <i>lights/red</i></li>
+<li><b>baseName()</b> return file name up to the first dot. For example for <i>some.file.name.fits</i> it will return <i>some</i></li>
+<li><b>completeBaseName()</b> return file name up to the last dot. For example for <i>some.file.name.fits</i> it will return <i>some.file.name</i></li>
+<li><b>suffix()</b> return string after last dot in file name. For example <i>fits</i></li>
+<li><b>size()</b> return size of file in bytes.</li>
+<li><b>fitsKeywords()</b> return array of strings with every keyword that is in header. <i>SIMPLE,BITPIX,NAXIS,NAXIS1,NAXIS2,EXTEND,COMMENT</i></li>
+<li><b>fitsValue(key)</b> return value for keyword. In case that there is multiple occurrences it return last one.</li>
+<li><b>fitsValues(key)</b> return array of values for keyword.</li>
+<li><b>fitsRecords()</b> return array of objects with properties <b>key, value</b> and <b>comment</b> </li>
+<li><b>modifyFITSRecords(FITSRecordModify)</b> modify FITS header by adding, removing or updating FITS record. Return true on success. Refer to <i>FITSRecordModify</i></li>
+<li><b>isMarked()</b> return true if file is marked.</li>
+<li><b>copy(newpath)</b> copy file to new location. It return instance of new <i>File<i> object that represent this copied file. This path can be relative or absolute. In case that <i>newpath</i> parameter is relative
+        path then it "Output directory" from GUI windows is used as base directory. Parameter <i>newpath</i> can absolute path. File is then copied to this path. In case that copy fail it return null.</li>
+<li><b>move(newpath)</b> move file to new location. It return false if move failed. This can happend if destination is not writable but also if destination file already exist. This functions does not overwrite existing file.
+        This path can be relative or absolute. In case that <i>newpath</i> parameter is relative path then it "Output directory" from GUI windows is used as base directory. Parameter <i>newpath</i> can be absolute path.
+        File is then moved to this path.</li>
+<li><b>convert(outpath, format, params)</b> convert image file from any format that program is able to open into FITS, XISF, JPEG, PNG, BMP.
+        Parameters are: <i>outputpath</i> path where converted image will be saved. It automatically replace suffix according to format. <i>format</i> one of "FITS" "XISF", "JPG", "PNG" or "BMP". <i>params</i> object with attributes "compressionType" and "compressionLevel".
+        Valid values for compressionType are be "gzip" or "rice" when converting to FITS. When converting to XISF compressionType can be "zlib", "lz4", "lz4hc", "zstd", "zlib+sh", "lz4+sh", "lz4hc+sh", "zstd+sh".
+        It is recommended to use "+sh" variants of compression.
+        XISF format also accept "compressionLevel" in range 0-100 where zero is fastest compression and 100 slowest. If you omit this attribute or set it to -1 then default compression level will be used.
+        It return new instance of <i>File</i> that point to converted file.
+<pre>file.convert("converted_file.xisf", "xisf", {"compressionType": "zstd+sh", "compressionLevel": 70});
+file.convert("converted_file.fits", "fits", {"compressionType": "rice"});
+file.convert("converted_file.jpg", "png");</pre>
+</li>
+<li><b>convertAsync(outpath, format, params)</b> same as previous method but it does conversion in separated thread asynchronously and in parallel. Before calling any method on object returned by this method you must call
+        <code>core.sync();</code> to ensure that conversion is done and destination file exists.
+        <pre>let compression = {"compressionType": "zstd+sh"};
+let convertedFiles = [];
+for(file of files)
+{
+    if(file.suffix() == "fits")
+        convertedFiles.push(file.convertAsync("xisf/" + file.fileName(), "XISF", compression));
+}
+core.sync(); // ensure that files exist
+for(file of convertedFiles)// now we can iterate over the files
+{
+    core.log(file.fileName() + " " + file.size()); // let print compressed file sizes
+}</pre></li>
+<li><b>stats()</b> calculate basic images statistics and return them as object with attributes "mean", "stddev", "median", "min", "max" and "mad".
+<pre>let s = file.stats();
+core.log("Median value is " + s.median);</pre></li>
+</ul>
+
+<h4>FITSRecordModify</h4>
+This class is used to define modify operation FITS header in FITS and XISF files. It can remove update and add records. Order of operation is also remove then update and last add.
+The keyword names may be up to 8 characters long and can only contain uppercase letters, the digits 0-9, the hyphen, and the underscore character.
+<pre>let modify = new FITSRecordModify();
+modify.updateKeyword("OBJECT", "M42");
+modify.updateKeyword("MYTILE", "PART1", "adding custom keyword so WBPP can group it");
+modify.removeKeyword("OBJECT");
+// doesn't matter that it is specified as last. This will first remove
+// existing OBJECT record and then add again OBJECT=M42
+for(file in files)
+{
+    file.modifyFITSRecords(modify);
+}</pre>
+
+<ul>
+<li><b>new FITSRecordModify()</b> create new instance of object.</li>
+<li><b>removeKeyword(key);</b> specify removing of record with <i>key</i> as keyword.</li>
+<li><b>updateKeyword(key, value, comment = "")</b> specify updating existing keyword with value and comment. Comment is optional parameter. If record with keyword doesn't exist then it will add new one.
+        Unless you want to have multiple records with same keyword (for example HISTORY) always use this method and not addKeyword.</li>
+<li><b>addKeyword(key, value, comment = "")</b> specify adding new keyword</li>
+</ul>
+
+
+<p><small>PS: Kanji v ikone programu znamená "astronomia" v Japončine</small></p>
 </body>
 </html>

batchprocessing.cpp

@@ -0,0 +1,280 @@
+#include "batchprocessing.h"
+#include "ui_batchprocessing.h"
+#include <functional>
+#include <QDir>
+#include <QFileDialog>
+#include <QStandardPaths>
+#include <QProcess>
+#include <QSettings>
+#include <QCloseEvent>
+#include <QMessageBox>
+#include <QDesktopServices>
+#include <QInputDialog>
+#include "scriptengine.h"
+
+#ifdef Q_OS_LINUX
+#include <QCloseEvent>
+#include <QDBusConnection>
+#include <QDBusMessage>
+#endif
+
+QList<QPair<QString, QString>> scanDirectories(const QStringList &paths)
+{
+    QList<QPair<QString, QString>> files;
+    QStringList scannedDirs;
+
+    std::function<void(const QString &root, const QString &path)> scanDirectory = [&](const QString &root, const QString &path)
+    {
+        QFileInfo info(path);
+        if(info.isDir() && !scannedDirs.contains(info.canonicalFilePath()))
+        {
+            scannedDirs.append(info.canonicalFilePath());
+            QDir dir(path);
+            QStringList entries = dir.entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
+            for(QString &entry : entries)
+                scanDirectory(root, dir.absoluteFilePath(entry));
+        }
+        else if(info.isFile())
+        {
+            if(path == root)
+                files.append({path, info.absolutePath()});
+            else
+                files.append({path, root});
+        }
+    };
+
+    for(const QString &path : paths)
+        scanDirectory(path, path);
+
+    return files;
+}
+
+void BatchProcessing::scanScriptDir()
+{
+    QString current;
+    if(_ui->scriptsList->currentItem())
+        current = _ui->scriptsList->currentItem()->text();
+
+    _ui->scriptsList->clear();
+    QDir dir(_scriptBasePath);
+    QDir embededDir(":/scripts");
+    QStringList scripts = dir.entryList(QDir::Files | QDir::Readable);
+    scripts.append(embededDir.entryList(QDir::Files));
+    scripts.removeDuplicates();
+    _ui->scriptsList->addItems(scripts);
+
+    int idx = scripts.indexOf(current);
+    if(idx>=0)_ui->scriptsList->setCurrentRow(idx);
+}
+
+BatchProcessing::BatchProcessing(QWidget *parent) : QDialog(parent)
+{
+    _ui = new Ui::BatchProcessing;
+    _ui->setupUi(this);
+
+    QStringList scriptsPath = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
+    if(scriptsPath.size())
+    {
+        QDir dir(scriptsPath.first());
+        if(!dir.exists("scripts"))
+        {
+            if(!dir.mkpath("scripts"))
+                qWarning() << "Failed to create scripts directory";
+        }
+        dir.cd("scripts");
+
+        _scriptBasePath = dir.absolutePath() + "/";
+        scanScriptDir();
+        _fileWatcher.addPath(_scriptBasePath);
+        connect(&_fileWatcher, &QFileSystemWatcher::directoryChanged, this, &BatchProcessing::scanScriptDir);
+    }
+    else
+    {
+        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->removeButton, &QPushButton::released, this, &BatchProcessing::removePath);
+    connect(_ui->removeAllButton, &QPushButton::released, this, &BatchProcessing::removeAllPaths);
+    connect(_ui->startButton, &QPushButton::released, this, &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();
+
+    QSettings settings;
+    _ui->outputPath->setText(settings.value("batchprocessing/outputpath", QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).first()).toString());
+}
+
+BatchProcessing::~BatchProcessing()
+{
+    delete _engineThread;
+    QSettings settings;
+    settings.setValue("batchprocessing/outputpath", _ui->outputPath->text());
+    delete _ui;
+}
+
+void BatchProcessing::closeEvent(QCloseEvent *event)
+{
+    if(_engineThread)
+    {
+        QMessageBox::StandardButton ret = QMessageBox::question(this, tr("Interrupt running script?"), tr("Interrupt running script?"));
+        if(ret == QMessageBox::StandardButton::Yes)
+        {
+            _engineThread->interrupt();
+            event->accept();
+        }
+        else
+        {
+            event->ignore();
+        }
+    }
+    else
+    {
+        event->accept();
+    }
+}
+
+void BatchProcessing::addFiles()
+{
+    QSettings settings;
+    QStringList files = QFileDialog::getOpenFileNames(this, tr("Select files"), settings.value("batchprocessing/inputpath", QDir::homePath()).toString());
+    if(!files.isEmpty())
+    {
+        _ui->pathsList->addItems(files);
+        settings.setValue("batchprocessing/inputpath", QFileInfo(files.first()).absolutePath());
+    }
+}
+
+void BatchProcessing::addDir()
+{
+    QSettings settings;
+    QString dir = QFileDialog::getExistingDirectory(this, tr("Select directory"), settings.value("batchprocessing/inputpath", QDir::homePath()).toString());
+    if(!dir.isEmpty())
+    {
+        _ui->pathsList->addItem(dir);
+        settings.setValue("batchprocessing/inputpath", dir);
+    }
+}
+
+void BatchProcessing::removePath()
+{
+    for(auto &item : _ui->pathsList->selectedItems())
+        delete item;
+}
+
+void BatchProcessing::removeAllPaths()
+{
+    _ui->pathsList->clear();
+}
+
+void BatchProcessing::browse()
+{
+    QString output = QFileDialog::getExistingDirectory(this, tr("Select output directory"), "/home/nou/Obrázky");
+    if(!output.isEmpty())
+        _ui->outputPath->setText(output);
+}
+
+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
+}
+
+void BatchProcessing::runScript()
+{
+    _ui->log->clear();
+    auto selectedItems = _ui->scriptsList->selectedItems();
+    if(selectedItems.size())
+    {
+        _engineThread = new Script::ScriptEngineThread(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())
+        {
+            QString script = selectedItems.first()->text();
+            if(QDir(_scriptBasePath).exists(script))
+                script = _scriptBasePath + script;
+            else
+                script = ":/scripts/" + script;
+
+            _engineThread->setParams(script, scanDirectories(paths), _ui->outputPath->text());
+            _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"));
+        }
+    }
+}
+
+void BatchProcessing::stopScript()
+{
+    qDebug() << "Stop script";
+    if(_engineThread)
+        _engineThread->interrupt();
+}
+
+void BatchProcessing::scriptFinished()
+{
+    _ui->startButton->setEnabled(true);
+    _ui->stopButton->setEnabled(false);
+    qDebug() << "script finished";
+    _engineThread->deleteLater();
+    _engineThread = nullptr;
+}
+
+void BatchProcessing::newMessage(const QString &message, bool error)
+{
+    if(error)_ui->log->setTextColor(Qt::red);
+    else _ui->log->setTextColor(_textColor);
+    _ui->log->append(message);
+}
+
+QJSValue BatchProcessing::getString(const QString &label, const QString &text)
+{
+    bool ok = false;
+    QString ret = QInputDialog::getText(this, tr("Enter text"), label, QLineEdit::Normal, text, &ok);
+    return ok ? ret : QJSValue();
+}
+
+QJSValue BatchProcessing::getInt(const QString &label, int value)
+{
+    bool ok = false;
+    int ret = QInputDialog::getInt(this, tr("Enter integer number"), label, value, INT_MIN, INT_MAX, 1, &ok);
+    return ok ? ret : QJSValue();
+}
+
+QJSValue BatchProcessing::getFloat(const QString &label, double value, int decimals)
+{
+    bool ok = false;
+    double ret = QInputDialog::getDouble(this, tr("Enter float number"), label, value, -INFINITY, INFINITY, decimals, &ok);
+    return ok ? ret : QJSValue();
+}
+
+QJSValue BatchProcessing::getItem(const QStringList &items, const QString &label, int current)
+{
+    bool ok = false;
+    QString ret = QInputDialog::getItem(this, tr("Select item"), label, items, current, false, &ok);
+    return ok ? ret : QJSValue();
+}

batchprocessing.h

@@ -0,0 +1,43 @@
+#ifndef BATCHPROCESSING_H
+#define BATCHPROCESSING_H
+
+#include <QDialog>
+#include <QFileSystemWatcher>
+#include "scriptengine.h"
+
+namespace Ui { class BatchProcessing; }
+
+class BatchProcessing : public QDialog
+{
+    Q_OBJECT
+    Ui::BatchProcessing *_ui;
+    QString _scriptBasePath;
+    QFileSystemWatcher _fileWatcher;
+    Script::ScriptEngineThread *_engineThread = nullptr;
+    QColor _textColor;
+private slots:
+    void scanScriptDir();
+public:
+    explicit BatchProcessing(QWidget *parent = nullptr);
+    ~BatchProcessing();
+protected:
+    void closeEvent(QCloseEvent *event);
+public slots:
+    void addFiles();
+    void addDir();
+    void removePath();
+    void removeAllPaths();
+    void browse();
+    void openScriptDir();
+    void runScript();
+    void stopScript();
+    void scriptFinished();
+    void newMessage(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);
+};
+
+#endif // BATCHPROCESSING_H

batchprocessing.ui

@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>BatchProcessing</class>
+ <widget class="QDialog" name="BatchProcessing">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1024</width>
+    <height>768</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Batch Processing</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Input files and directories</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QListWidget" name="pathsList">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>1</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::MultiSelection</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QPushButton" name="addFilesButton">
+         <property name="text">
+          <string>Add files</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="addDirButton">
+         <property name="text">
+          <string>Add directories</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="removeButton">
+         <property name="text">
+          <string>Remove</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="removeAllButton">
+         <property name="text">
+          <string>Remove all</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Output directory</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="outputPath">
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="browseButton">
+       <property name="text">
+        <string>Browse</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Scripts</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="openScriptsButton">
+       <property name="text">
+        <string>Open scripts</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QListWidget" name="scriptsList">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>1</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Log</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTextEdit" name="log">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>4</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="font">
+      <font>
+       <family>FreeMono</family>
+      </font>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="startButton">
+       <property name="text">
+        <string>Start script</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="stopButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Stop script</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="closeButton">
+       <property name="text">
+        <string>Close</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <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>
+</ui>

database.cpp

@@ -10,12 +10,12 @@ Database::Database(QObject *parent) : QObject(parent)
 {
 }
 
-bool Database::init()
+bool Database::init(const QLatin1String &connectionName)
 {
     QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
     QDir dir(path);
 
-    QSqlDatabase m_database = QSqlDatabase::addDatabase("QSQLITE");
+    QSqlDatabase m_database = QSqlDatabase::addDatabase("QSQLITE", connectionName);
 
     if(!dir.mkpath("."))
         return false;
@@ -156,23 +156,29 @@ int Database::checkVersion()
 
 static QStringList nameFilters = {"*.fit", "*.fits", "*.xisf"};
 
-static int countFiles(const QDir &dir, int count = 0)
+static int countFiles(const QDir &dir, QStringList &scannedDirs)
 {
-    count += dir.entryList(nameFilters, QDir::Files).size();
+    if(scannedDirs.contains(dir.canonicalPath()))return 0;
+    scannedDirs.append(dir.canonicalPath());
+
+    int count = dir.entryList(nameFilters, QDir::Files).size();
     QStringList dirs = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
     for(const QString &d : dirs)
-        count += countFiles(dir.filePath(d));
+        count += countFiles(dir.filePath(d), scannedDirs);
     return count;
 }
 
 void Database::indexDir(const QDir &dir, QProgressDialog *progress)
 {
     m_progress = 0;
-    int count = countFiles(dir);
+    QStringList scannedDirs;
+    int count = countFiles(dir, scannedDirs);
     progress->setMaximum(count);
     QSqlDatabase database = QSqlDatabase::database();
     database.transaction();
-    if(indexDir2(dir, progress))
+
+    scannedDirs.clear();
+    if(indexDir2(dir, progress, scannedDirs))
     {
         database.commit();
         emit databaseChanged();
@@ -225,14 +231,17 @@ QStringList Database::getFitsKeywords()
     return keywords;
 }
 
-bool Database::indexDir2(const QDir &dir, QProgressDialog *progress)
+bool Database::indexDir2(const QDir &dir, QProgressDialog *progress, QStringList &scannedDirs)
 {
+    if(scannedDirs.contains(dir.canonicalPath()))return true;
+    scannedDirs.append(dir.canonicalPath());
+
     QFileInfoList files = dir.entryInfoList(nameFilters, QDir::Files);
     QStringList dirs = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
 
     for(const QString &d : dirs)
     {
-        if(!indexDir2(dir.filePath(d), progress))
+        if(!indexDir2(dir.filePath(d), progress, scannedDirs))
             return false;
     }
     for(const QFileInfo &file : files)

database.h

@@ -24,7 +24,7 @@ class Database : public QObject
     int m_progress;
 public:
     explicit Database(QObject *parent = 0);
-    bool init();
+    bool init(const QLatin1String &connectionName = QLatin1String(QSqlDatabase::defaultConnection));
     bool mark(const QString &filename);
     bool unmark(const QString &filename);
     bool mark(const QStringList &filenames);
@@ -37,7 +37,7 @@ public:
     void reindex(QProgressDialog *progress);
     QStringList getFitsKeywords();
 protected:
-    bool indexDir2(const QDir &dir, QProgressDialog *progress);
+    bool indexDir2(const QDir &dir, QProgressDialog *progress, QStringList &scannedDirs);
     bool indexFile(const QFileInfo &file);
     bool checkError(QSqlQuery &query);
     int checkVersion();

databaseview.cpp

@@ -123,6 +123,10 @@ QVariant FITSFileModel::data(const QModelIndex &index, int role) const
         font.setBold(m_markedFiles.contains(file));
         return font;
     }
+    if(role == Qt::ToolTipRole && index.column() == 0)
+    {
+        return QSqlQueryModel::data(index, Qt::DisplayRole);
+    }
     return QSqlQueryModel::data(index, role);
 }
 
@@ -197,7 +201,8 @@ void FITSFileModel::prepareQuery()
     if(lastError().type() != QSqlError::NoError)
         qDebug() << "Database error" << lastError();
 
-    m_markedFiles = m_database->getMarkedFiles().toSet();
+    QStringList list = m_database->getMarkedFiles();
+    m_markedFiles = QSet<QString>(list.begin(), list.end());
 }
 
 DatabaseTableView::DatabaseTableView(QWidget *parent) : QTableView(parent)
@@ -281,6 +286,7 @@ DataBaseView::DataBaseView(Database *database, QWidget *parent) : QWidget(parent
     for(int i=0; i<3; i++)
     {
         m_filterKeyword[i] = new QComboBox(this);
+        m_filterKeyword[i]->setMaximumWidth(300);
         addFilterItems(m_filterKeyword[i], fitsKeywords);
 
 

filesystemwidget.cpp

@@ -45,11 +45,17 @@ void FilesystemWidget::fileClicked(const QModelIndex &index, const QModelIndex &
         emit fileSelected(index.row());
 }
 
+QVariant FileSystemModel::data(const QModelIndex &index, int role) const
+{
+    if(role == Qt::ToolTipRole && index.column() == 0)role = Qt::DisplayRole;
+    return QFileSystemModel::data(index, role);
+}
+
 Filetree::Filetree(QWidget *parent) : QTreeView(parent)
 {
     QSettings settings;
     m_rootDir = settings.value("filetree/rootDir", QDir::homePath()).toString();
-    m_fileSystemModel = new QFileSystemModel(this);
+    m_fileSystemModel = new FileSystemModel(this);
     m_fileSystemModel->setRootPath(m_rootDir);
     m_fileSystemModel->setNameFilters({"*.fits", "*.fit", "*.xisf", "*.jpg", "*.jpeg", "*.png", "*.cr2", "*.nef", "*.dng"});
     m_fileSystemModel->setNameFilterDisables(false);

filesystemwidget.h

@@ -23,10 +23,17 @@ signals:
     void reverseSort();
 };
 
+class FileSystemModel : public QFileSystemModel
+{
+public:
+    explicit FileSystemModel(QObject *parent) : QFileSystemModel(parent){}
+    QVariant data(const QModelIndex &index, int role) const override;
+};
+
 class Filetree : public QTreeView
 {
     Q_OBJECT
-    QFileSystemModel *m_fileSystemModel;
+    FileSystemModel *m_fileSystemModel;
     QString m_rootDir;
 public:
     explicit Filetree(QWidget *parent = nullptr);

histogram.cpp

@@ -0,0 +1,84 @@
+#include "histogram.h"
+#include <cmath>
+#include <algorithm>
+#include <QPainter>
+#include <QDebug>
+
+Histogram::Histogram(QWidget *parent) : QWidget(parent)
+{
+    setStyleSheet("QWidget { background: white; color: black; } ");
+}
+
+void Histogram::imageLoaded(Image *img)
+{
+    if(img && img->rawImage())
+    {
+        m_histogram = img->rawImage()->imageStats().m_histogram;
+        m_points.clear();
+        update();
+    }
+}
+
+void Histogram::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    painter.fillRect(rect(), Qt::black);
+
+    uint h = height();
+    uint w = width();
+
+    if(m_histogram.size())
+    {
+        if(m_points.size() != w)
+        {
+            m_points.clear();
+            for(uint64_t i = 0; i < w; i++)
+            {
+                uint32_t sum = 0;
+                uint64_t start = i * m_histogram.size() / w;
+                uint64_t end =(i+1) * m_histogram.size() / w;
+                for(uint64_t o = start; o < end; o++)
+                    sum += m_histogram[o];
+                if(start != end)
+                    m_points.push_back(sum);
+            }
+            float scale = *std::max_element(m_points.begin(), m_points.end());
+            if(m_log)
+            {
+                scale = std::log(scale);
+                std::for_each(m_points.begin(), m_points.end(), [scale](float &x){ x = (x > 0 ? std::log(x) : 0.0f) / scale; });
+            }
+            else
+            {
+                std::for_each(m_points.begin(), m_points.end(), [scale](float &x){ x /= scale; });
+            }
+        }
+        std::vector<QPointF> points;
+        points.push_back(QPointF(0, h));
+        for(size_t i = 0; i < m_points.size(); i++)
+        {
+            points.push_back(QPointF((float)i * w / m_points.size(), h - m_points[i] * h));
+        }
+        points.push_back(QPoint(w, h));
+        painter.setBrush(Qt::gray);
+        painter.setPen(Qt::white);
+
+        painter.drawPolygon(&points[0], points.size());
+    }
+
+    QStyleOptionButton button;
+    button.initFrom(this);
+    button.state = m_log ? QStyle::State_On : QStyle::State_Off;
+    button.text = tr("Logarithmic scale");
+    button.rect = style()->subElementRect(QStyle::SE_CheckBoxClickRect, &button, this);
+    button.rect.moveTop(0);
+    button.rect.moveRight(w);
+    style()->drawControl(QStyle::CE_CheckBox, &button, &painter, this);
+}
+
+void Histogram::mouseReleaseEvent(QMouseEvent *)
+{
+    m_log = !m_log;
+    m_points.clear();
+    update();
+}

histogram.h

@@ -0,0 +1,22 @@
+#ifndef HISTOGRAM_H
+#define HISTOGRAM_H
+
+#include <QWidget>
+#include "imageringlist.h"
+
+class Histogram : public QWidget
+{
+    Q_OBJECT
+    std::vector<uint32_t> m_histogram;
+    std::vector<float> m_points;
+    bool m_log = false;
+public:
+    explicit Histogram(QWidget *parent = nullptr);
+public slots:
+    void imageLoaded(Image *img);
+protected:
+    void paintEvent(QPaintEvent *) override;
+    void mouseReleaseEvent(QMouseEvent *) override;
+};
+
+#endif // HISTOGRAM_H

imageinfo.cpp

@@ -48,6 +48,7 @@ FITSRecord::FITSRecord(const LibXISF::Property &property)
     key = property.id.c_str();
     value = QString::fromStdString(property.value.toString());
     comment = property.comment.c_str();
+    xisf = true;
 }
 
 QByteArray FITSRecord::valueToByteArray() const
@@ -81,7 +82,7 @@ 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(), record.comment});
+            new QTreeWidgetItem(fitsHeader, {record.key, record.value.toString().left(1024), record.comment});
         }
         addTopLevelItem(fitsHeader);
     }
@@ -279,7 +280,7 @@ QString SkyPoint::toString() const
     t = t.addSecs(ra * 240);
 
     double deg, min, sec;
-    min = std::modf(dec, &deg) * 60;
+    min = std::abs(std::modf(dec, &deg) * 60);
     sec = std::modf(min, &min) * 60;
     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');
 }

imageinfo.h

@@ -13,6 +13,7 @@ struct FITSRecord
     QByteArray key;
     QVariant value;
     QByteArray comment;
+    bool xisf = false;
     bool editable() const;
     FITSRecord(){}
     FITSRecord(const QByteArray &key, const QVariant &value, const QByteArray &comment);

imageringlist.cpp

@@ -1,6 +1,9 @@
 #include "imageringlist.h"
+#include <functional>
 #include <QThreadPool>
 #include <QDir>
+#include <QSettings>
+#include <QTimer>
 #include "loadrunable.h"
 #include "rawimage.h"
 #include "database.h"
@@ -81,24 +84,20 @@ void Image::clearThumbnail()
     m_thumbnail.reset();
 }
 
-void Image::imageLoaded(void *rawImage, ImageInfoData info)
+void Image::imageLoaded(std::shared_ptr<RawImage> rawImage, ImageInfoData info)
 {
     m_loading = false;
     if(!m_released)
     {
-        m_rawImage.reset(static_cast<RawImage*>(rawImage));
+        m_rawImage = rawImage;
         m_info = info;
         emit pixmapLoaded(this);
     }
-    else
-    {
-        delete static_cast<RawImage*>(rawImage);
-    }
 }
 
-void Image::thumbnailLoadFinish(void *rawImage)
+void Image::thumbnailLoadFinish(std::shared_ptr<RawImage> rawImage)
 {
-    m_thumbnail.reset(static_cast<RawImage*>(rawImage));
+    m_thumbnail = rawImage;
     if(m_thumbnail)
         emit thumbnailLoaded(this);
 }
@@ -112,6 +111,9 @@ ImageRingList::ImageRingList(Database *database, const QStringList &nameFilter,
     connect(&m_fileSystemWatcher, SIGNAL(directoryChanged(QString)), this, SLOT(dirChanged(QString)));
     m_nameFilter.replaceInStrings(QRegularExpression("^"), "*.");
     m_thumbPool = new QThreadPool(this);
+
+    m_slideShowTimer = new QTimer(this);
+    connect(m_slideShowTimer, &QTimer::timeout, this, static_cast<void (ImageRingList::*)()>(&ImageRingList::increment));
 }
 
 ImageRingList::~ImageRingList()
@@ -123,21 +125,39 @@ ImageRingList::~ImageRingList()
     m_thumbPool->waitForDone();
 }
 
-bool ImageRingList::setDir(const QString path, const QString &currentFile)
+bool ImageRingList::setDir(const QString path, const QString &currentFile, bool recursive)
 {
     QDir dir(path);
 
     if(dir.exists())
     {
-        QDir::SortFlags sortFlags = m_liveMode ? QDir::Time : m_sort | QDir::IgnoreCase;
-        if(m_reversed)sortFlags |= QDir::Reversed;
-        QStringList list = dir.entryList(m_nameFilter, QDir::Files | QDir::Readable, sortFlags);
+        QStringList scannedDirs;
         QStringList absolutePaths;
-        foreach(const QString &file, list)
+        std::function<void(const QString&)> scanDir = [&](const QString &path)
         {
-            absolutePaths.append(dir.absoluteFilePath(file));
-        }
-        setFiles(absolutePaths, m_liveMode ? list.first() : currentFile);
+            QDir dir(path);
+            if(scannedDirs.contains(dir.canonicalPath()))return;
+            scannedDirs.append(dir.canonicalPath());
+            QDir::SortFlags sortFlags = m_liveMode ? QDir::Time : m_sort | QDir::IgnoreCase;
+            if(m_reversed)sortFlags |= QDir::Reversed;
+
+            if(recursive)
+            {
+                QStringList dirs = dir.entryList(QDir::Readable | QDir::Dirs | QDir::NoDotAndDotDot, sortFlags);
+                for(const QString &subdir : dirs)
+                    scanDir(dir.absoluteFilePath(subdir));
+            }
+
+            QStringList list = dir.entryList(m_nameFilter, QDir::Files | QDir::Readable, sortFlags);
+            for(const QString &file : list)
+            {
+                absolutePaths.append(dir.absoluteFilePath(file));
+            }
+        };
+
+        scanDir(path);
+        qDebug() << absolutePaths.size();
+        setFiles(absolutePaths, m_liveMode ? absolutePaths.first() : currentFile);
 
         m_fileSystemWatcher.removePaths(m_fileSystemWatcher.directories());
         m_fileSystemWatcher.addPath(path);
@@ -150,7 +170,7 @@ void ImageRingList::setFile(const QString &file)
 {
     QFileInfo info(file);
     if(info.isDir())
-        setDir(file);
+        setDir(file, QString(), true);
     else
         setDir(info.absolutePath(), file);
 }
@@ -167,6 +187,10 @@ void ImageRingList::increment()
 {
     if(m_images.size())
     {
+        //don't increment if current image was not loaded yet
+        if(!(*m_currImage)->rawImage())
+            return;
+
         (*m_firstImage)->release();
         m_firstImage = increment(m_firstImage);
         m_currImage = increment(m_currImage);
@@ -299,11 +323,13 @@ void ImageRingList::clearThumbnails()
 
 QModelIndex ImageRingList::index(int row, int column, const QModelIndex &parent) const
 {
+    Q_UNUSED(parent);
     return createIndex(row, column, m_images.at(row).get());
 }
 
 QModelIndex ImageRingList::parent(const QModelIndex &child) const
 {
+    Q_UNUSED(child);
     return QModelIndex();
 }
 
@@ -317,6 +343,7 @@ int ImageRingList::rowCount(const QModelIndex &parent) const
 
 int ImageRingList::columnCount(const QModelIndex &parent) const
 {
+    Q_UNUSED(parent);
     return 1;
 }
 
@@ -402,6 +429,20 @@ void ImageRingList::reverseSort()
     }
 }
 
+void ImageRingList::toggleSlideshow(bool start)
+{
+    if(start)
+    {
+        QSettings settings;
+        int time = settings.value("settings/slideshowtime", 1.0).toDouble() * 1000;
+        m_slideShowTimer->start(time);
+    }
+    else
+    {
+        m_slideShowTimer->stop();
+    }
+}
+
 void ImageRingList::setFiles(const QStringList files, const QString &currentFile)
 {
     QThreadPool::globalInstance()->clear();

imageringlist.h

@@ -21,7 +21,7 @@ class Image : public QObject
     bool m_current;
     int m_number;
     std::shared_ptr<RawImage> m_rawImage;
-    std::unique_ptr<RawImage> m_thumbnail;
+    std::shared_ptr<RawImage> m_thumbnail;
     QString m_name;
     ImageInfoData m_info;
     ImageRingList *m_ringList;
@@ -41,8 +41,8 @@ signals:
     void pixmapLoaded(Image *ptr);
     void thumbnailLoaded(Image *ptr);
 protected slots:
-    void imageLoaded(void *rawImage, ImageInfoData info);
-    void thumbnailLoadFinish(void *rawImage);
+    void imageLoaded(std::shared_ptr<RawImage> rawImage, ImageInfoData info);
+    void thumbnailLoadFinish(std::shared_ptr<RawImage> rawImage);
 };
 
 typedef std::shared_ptr<Image> ImagePtr;
@@ -65,14 +65,13 @@ class ImageRingList : public QAbstractItemModel
     QThreadPool *m_thumbPool;
     Database *m_database;
     QStringList m_nameFilter;
+    QTimer *m_slideShowTimer;
 public:
     explicit ImageRingList(Database *database, const QStringList &nameFilter, QObject *parent = 0);
     ~ImageRingList() override;
-    bool setDir(const QString path, const QString &currentFile = QString());
+    bool setDir(const QString path, const QString &currentFile = QString(), bool recursive = false);
     void setFile(const QString &file);
     ImagePtr currentImage();
-    void increment();
-    void decrement();
     void setLiveMode(bool live);
     void setCalculateStats(bool stats);
     void setFindPeaks(bool findPeaks);
@@ -96,6 +95,9 @@ public slots:
     void setPreload(int width);
     void setSort(QDir::SortFlag sort);
     void reverseSort();
+    void toggleSlideshow(bool start);
+    void increment();
+    void decrement();
 protected:
     void setFiles(const QStringList files, const QString &currentFile = QString());
     QList<ImagePtr>::iterator increment(QList<ImagePtr>::iterator iter);

imagescrollarea.cpp

@@ -106,7 +106,7 @@ void ImageScrollArea::wheelEvent(QWheelEvent *event)
         m_scale = (float)size().width()/m_pixmap.size().width();
 
     QPointF top(horizontalScrollBar()->value(), verticalScrollBar()->value());
-    QPointF mousePos = (top + event->posF()) / m_scale;
+    QPointF mousePos = (top + event->position()) / m_scale;
 
     QPoint delta = event->angleDelta();
     if(delta.y() > 0)
@@ -115,7 +115,7 @@ void ImageScrollArea::wheelEvent(QWheelEvent *event)
         setScale(m_scale - 0.1);
 
     mousePos *= m_scale;
-    top = mousePos - event->posF();
+    top = mousePos - event->position();
     horizontalScrollBar()->setValue(top.x());
     verticalScrollBar()->setValue(top.y());
 }

imagescrollareagl.cpp

@@ -1,5 +1,6 @@
 #include "imagescrollareagl.h"
 #include <QOpenGLFunctions>
+#include <QOpenGLVersionFunctionsFactory>
 #include <QDebug>
 #include <QKeyEvent>
 #include <QOpenGLDebugLogger>
@@ -12,70 +13,63 @@
 #include <QPainter>
 #include <QFileInfo>
 #include <cmath>
+#include <QElapsedTimer>
+
+int FILTERING = 1;
 
 struct RawImageType
 {
     QOpenGLTexture::PixelFormat pixelFormat;
     QOpenGLTexture::TextureFormat textureFormat;
     QOpenGLTexture::PixelType dataType;
-    bool bw;
 };
 
-const RawImageType rawImageTypes[] = {
-    {QOpenGLTexture::Red, QOpenGLTexture::R8_UNorm, QOpenGLTexture::UInt8, true},
-    {QOpenGLTexture::Red, QOpenGLTexture::R16_UNorm, QOpenGLTexture::UInt16, true},
-    {QOpenGLTexture::Red, QOpenGLTexture::R32F, QOpenGLTexture::Float32, true},
-#ifdef COLOR_MANAGMENT
-    {QOpenGLTexture::RGB, QOpenGLTexture::SRGB8, QOpenGLTexture::UInt8, false},
-    {QOpenGLTexture::RGBA,QOpenGLTexture::SRGB8_Alpha8, QOpenGLTexture::UInt8, false},
-#else
-    {QOpenGLTexture::RGB, QOpenGLTexture::RGB8_UNorm, QOpenGLTexture::UInt8, false},
-    {QOpenGLTexture::RGBA,QOpenGLTexture::RGBA8_UNorm, QOpenGLTexture::UInt8, false},
-#endif
-    {QOpenGLTexture::RGB, QOpenGLTexture::RGB16_UNorm, QOpenGLTexture::UInt16, false},
-    {QOpenGLTexture::RGBA, QOpenGLTexture::RGB16_UNorm, QOpenGLTexture::UInt16, false},
-    {QOpenGLTexture::RGB, QOpenGLTexture::RGB32F, QOpenGLTexture::Float32, false}
-};
-
-static bool MANUAL_MIPMAP_GEN = false;
-
-void setScrollRange(QScrollBar *scrollBar, int newRange)
+RawImageType getRawImageType(const RawImage *img)
 {
-    int page = scrollBar->pageStep();
-    int pos = scrollBar->value() + page/2;
-    int range = scrollBar->maximum() + page;
-    float relPos = (float)pos/(float)range;
+    RawImageType type;
+    switch(img->type())
+    {
+    case RawImage::UINT8:
+        if(img->channels() >= 3)
+            type.textureFormat = QOpenGLTexture::SRGB8_Alpha8;
+        else
+            type.textureFormat = QOpenGLTexture::R8_UNorm;
+        type.dataType = QOpenGLTexture::UInt8;
+        break;
+    case RawImage::UINT16:
+        if(img->channels() >= 3)
+            type.textureFormat = QOpenGLTexture::RGBA16_UNorm;
+        else
+            type.textureFormat = QOpenGLTexture::R16_UNorm;
+        type.dataType = QOpenGLTexture::UInt16;
+        break;
+    case RawImage::FLOAT32:
+        if(img->channels() >= 3)
+            type.textureFormat = QOpenGLTexture::RGBA32F;
+        else
+            type.textureFormat = QOpenGLTexture::R32F;
+        type.dataType = QOpenGLTexture::Float32;
+        break;
+    default:
+        qWarning() << "Invalid format" << img->type();
+        break;
+    }
 
-    if(page >= newRange)
-        scrollBar->hide();
+    if(img->channels() >= 3)
+        type.pixelFormat = QOpenGLTexture::RGBA;
     else
-        scrollBar->show();
+        type.pixelFormat = QOpenGLTexture::Red;
 
-    scrollBar->setRange(0, newRange - page);
-    scrollBar->setValue(relPos*newRange - page/2);
+    return type;
 }
 
 ImageWidget::ImageWidget(Database *database, QWidget *parent) : QOpenGLWidget(parent)
   , m_database(database)
 {
     setFocusPolicy(Qt::ClickFocus);
-    m_range = UINT16_MAX;
-    m_low = 0;
-    m_mid = 0.5;
-    m_high = 1;
-    m_dx = m_dy = 0;
-    m_scale = 1.0f;
-    m_blockRepaint = false;
-    m_range = UINT16_MAX;
-    m_imgWidth = m_imgHeight = -1;
-    m_superpixel = m_invert = false;
-    m_showThumbnails = false;
-    m_selecting = false;
-    m_thumbnailCount = 0;
     m_updateTimer = new QTimer(this);
     m_updateTimer->setInterval(500);
     m_updateTimer->setSingleShot(true);
-    m_sizesDirty = false;
     connect(m_updateTimer, SIGNAL(timeout()), this, SLOT(update()));
     setAcceptDrops(true);
     QTimer::singleShot(1000, [this](){
@@ -96,22 +90,36 @@ ImageWidget::~ImageWidget()
 
 void ImageWidget::setImage(std::shared_ptr<RawImage> image, int index)
 {
-    if(image == nullptr)return;
+    m_currentImg = index;
+
+    if(!image || !image->valid())
+    {
+        m_imgWidth = 0;
+        m_imgHeight = 0;
+        m_error = tr("Failed to load image");
+        m_rawImage.reset();
+        update();
+        return;
+    }
+
+    m_error.clear();
     makeCurrent();
     m_rawImage = image;
-    m_rawImage->downscaleTo(m_maxTextureSize);
+    if((int)image->width() > m_maxTextureSize || (int)image->height() > m_maxTextureSize)
+        m_rawImage->resize(std::min(m_maxTextureSize, (int)image->width()), std::min(m_maxTextureSize, (int)image->height()));
 
     m_imgWidth = image->width();
     m_imgHeight = image->height();
-    m_currentImg = index;
-    m_whiteBalance[0] = m_whiteBalance[1] = m_whiteBalance[2] = 1.0f;
+
 
     if(!m_image)return;
 
-    const RawImageType &rawImageType = rawImageTypes[image->type()];
-    m_srgb = rawImageType.textureFormat == QOpenGLTexture::SRGB8 || rawImageType.textureFormat == QOpenGLTexture::SRGB8_Alpha8;
-    m_bwImg = rawImageType.bw;
+    RawImageType rawImageType = getRawImageType(image.get());
+    m_srgb = rawImageType.textureFormat == QOpenGLTexture::SRGB8_Alpha8;
+    m_bwImg = image->channels() == 1;
 
+    QElapsedTimer timer;
+    timer.start();
     m_image->destroy();
     m_image->setAutoMipMapGenerationEnabled(false);
     m_image->setFormat(rawImageType.textureFormat);
@@ -122,40 +130,17 @@ void ImageWidget::setImage(std::shared_ptr<RawImage> image, int index)
     m_image->setWrapMode(QOpenGLTexture::ClampToEdge);
     m_image->setBorderColor(0, 0, 0, 0);
     m_image->setData(0, rawImageType.pixelFormat, rawImageType.dataType, (const void*)image->data(), m_transferOptions.get());
+    m_image->generateMipMaps();
+    qDebug() << "setImage" << timer.elapsed();
 
-    auto sRGB_linear = [](cv::Point3f &pixel, const int *pos)
+    m_unit_scale[0] = 1.0f;
+    m_unit_scale[1] = 0.0f;
+    if(image->type() == RawImage::FLOAT32)
     {
-        pixel.x = pixel.x <= 0.04045f ? pixel.x / 12.92f : std::pow((pixel.x + 0.055) / 1.055f, 2.4f);
-        pixel.y = pixel.y <= 0.04045f ? pixel.y / 12.92f : std::pow((pixel.y + 0.055) / 1.055f, 2.4f);
-        pixel.z = pixel.z <= 0.04045f ? pixel.z / 12.92f : std::pow((pixel.z + 0.055) / 1.055f, 2.4f);
-    };
-
-    auto linear_sRGB = [](cv::Point3f &pixel, const int *pos)
-    {
-        pixel.x = pixel.x <= 0.0031308f ? pixel.x * 12.92f : 1.055f * std::pow(pixel.x , 1/2.4f) - 0.055f;
-        pixel.y = pixel.y <= 0.0031308f ? pixel.y * 12.92f : 1.055f * std::pow(pixel.y , 1/2.4f) - 0.055f;
-        pixel.z = pixel.z <= 0.0031308f ? pixel.z * 12.92f : 1.055f * std::pow(pixel.z , 1/2.4f) - 0.055f;
-    };
-
-    //AMD OpenGL driver on Windows doesn't generate mipmaps for sRGB textures correctly
-    if(m_srgb && MANUAL_MIPMAP_GEN)
-    {
-        cv::Mat img = image->mat();
-        img.convertTo(img, CV_32FC3, 1/255.0);
-        img.forEach<cv::Point3f>(sRGB_linear);
-        cv::Size size(img.cols, img.rows);
-        for(int i=1; i<m_image->mipLevels(); i++)
-        {
-            cv::Mat mip;
-            size /= 2;
-            cv::resize(img, mip, size);
-            mip.copyTo(img);
-            mip.forEach<cv::Point3f>(linear_sRGB);
-            mip.convertTo(mip, CV_8UC3, 255);
-            m_image->setData(i, rawImageType.pixelFormat, rawImageType.dataType, (const void*)mip.ptr(), m_transferOptions.get());
-        }
+        auto unitScaling = image->unitScale();
+        m_unit_scale[0] = unitScaling.first;
+        m_unit_scale[1] = unitScaling.second;
     }
-    else m_image->generateMipMaps();
 
     if(m_debayerTex)
     {
@@ -203,12 +188,6 @@ void ImageWidget::bestFit()
     setOffset(0, 0);
 }
 
-void ImageWidget::blockRepaint(bool block)
-{
-    m_blockRepaint = block;
-    if(!block)update();
-}
-
 void ImageWidget::allocateThumbnails(const QStringList &paths)
 {
     makeCurrent();
@@ -226,7 +205,7 @@ void ImageWidget::allocateThumbnails(const QStringList &paths)
     m_thumbnailTexture->create();
     m_thumbnailTexture->setFormat(QOpenGLTexture::RGB16_UNorm);
     m_thumbnailTexture->setSize(THUMB_SIZE, THUMB_SIZE);
-    m_thumbnailTexture->setLayers(paths.size());
+    m_thumbnailTexture->setLayers(std::min((int)paths.size(), m_maxArrayLayers));
     m_thumbnailTexture->allocateStorage();
 }
 
@@ -243,21 +222,31 @@ QVector2D ImageWidget::getImagePixelCoord(const QVector2D &pos)
     return (pos + offset) / m_scale;
 }
 
-void ImageWidget::setMTFParams(float low, float mid, float high)
+void ImageWidget::setBayerMask(int mask)
 {
-    m_low = low;
-    m_mid = mid;
-    m_high = high;
+    m_firstRed[0] = mask & 0x1;
+    m_firstRed[1] = (mask & 0x2) >> 1;
+    if(m_debayerTex)
+    {
+        f->glDeleteTextures(1, &m_debayerTex);
+        m_debayerTex = 0;
+    }
+    update();
+}
+
+void ImageWidget::setMTFParams(const MTFParam &params)
+{
+    m_mtfParams = params;
     update();
 }
 
 void ImageWidget::setOffset(float dx, float dy)
 {
-    m_dx = std::clamp(dx, 0.0f, m_imgWidth * m_scale - m_width);
+    m_dx = std::clamp(dx, 0.0f, std::max(0.0f, m_imgWidth * m_scale - m_width));
     if(m_showThumbnails)
-        m_dy = std::clamp(dy, 0.0f, (float)((m_thumbnailCount / (m_width / THUMB_SIZE_BORDER) + 2) * THUMB_SIZE_BORDER_Y - m_height));
+        m_dy = std::clamp(dy, 0.0f, std::max(0.0f, (float)((m_thumbnailCount / (m_width / THUMB_SIZE_BORDER) + 2) * THUMB_SIZE_BORDER_Y - m_height)));
     else
-        m_dy = std::clamp(dy, 0.0f, m_imgHeight * m_scale - m_height);
+        m_dy = std::clamp(dy, 0.0f, std::max(0.0f, m_imgHeight * m_scale - m_height));
     updateScrollBars();
     update();
 }
@@ -274,6 +263,12 @@ void ImageWidget::invert(bool enable)
     update();
 }
 
+void ImageWidget::falseColor(bool enable)
+{
+    m_falseColor = enable;
+    update();
+}
+
 QImage ImageWidget::renderToImage()
 {
     if(m_imgWidth < 0)return QImage();
@@ -300,9 +295,13 @@ QImage ImageWidget::renderToImage()
 
 void ImageWidget::thumbnailLoaded(const Image *image)
 {
+    if(image->number() >= m_maxArrayLayers)
+        return;
+
     makeCurrent();
     const RawImage *raw = image->thumbnail();
-    m_thumbnailTexture->setData(0, image->number(), QOpenGLTexture::RGB, QOpenGLTexture::UInt16, raw->data(), m_transferOptions.get());
+    if(!raw || !raw->valid())return;
+    m_thumbnailTexture->setData(0, image->number(), QOpenGLTexture::RGBA, QOpenGLTexture::UInt16, raw->data(), m_transferOptions.get());
     float a = raw->thumbAspect();
     int sizes[3] = { std::max(1, a > 1.0f ? THUMB_SIZE : (int)(THUMB_SIZE * a)), std::max(1, a < 1.0f ? THUMB_SIZE : (int)(THUMB_SIZE / a)), image->number() };
     m_sizesDirty = true;
@@ -318,8 +317,6 @@ void ImageWidget::showThumbnail(bool enable)
 
 void ImageWidget::paintGL()
 {
-    if(m_blockRepaint)return;
-
     float dx = m_dx;
     float dy = m_dy;
     if(m_width > m_image->width() * m_scale)
@@ -328,6 +325,7 @@ void ImageWidget::paintGL()
         dy = -height() * 0.5f + m_image->height() * m_scale * 0.5f;
     QBrush highlight = style()->standardPalette().highlight();
 
+    f->glClear(GL_COLOR_BUFFER_BIT);
     if(m_showThumbnails)
     {
         m_vaoThumb->bind();
@@ -350,7 +348,7 @@ void ImageWidget::paintGL()
         m_thumbnailProgram->bind();
         f->glUniform3i(m_thumbnailProgram->uniformLocation("viewport_row"), width(), height(), width()/THUMB_SIZE_BORDER);
         f->glUniform3i(m_thumbnailProgram->uniformLocation("thumb_size"), THUMB_SIZE_BORDER/2, THUMB_SIZE_BORDER, THUMB_SIZE_BORDER_Y);
-        m_thumbnailProgram->setUniformValue("mtf_param", m_low, m_mid, m_high);
+        m_thumbnailProgram->setUniformValueArray("mtf_param", m_mtfParams.blackPoint, 3, 3);
         m_thumbnailProgram->setUniformValue("invert", m_invert);
         m_thumbnailProgram->setUniformValue("offset", 0, m_dy);
         QMatrix4x4 mvp;
@@ -361,7 +359,9 @@ void ImageWidget::paintGL()
         QPainter painter(this);
         const int w = width()/THUMB_SIZE_BORDER;
         const int off = (THUMB_SIZE_BORDER - THUMB_SIZE) / 2;
-        for(int i=0; i < m_thumbnailCount; i++)
+        int start = std::max((int)(m_dy / THUMB_SIZE_BORDER_Y * w - w), 0);
+        int end = std::min((int)(m_dy + m_height) / THUMB_SIZE_BORDER_Y * w + w, m_thumbnailCount);
+        for(int i=start; i < end; i++)
         {
             float x = (i % w) * THUMB_SIZE_BORDER;
             float y = i / w * THUMB_SIZE_BORDER_Y + THUMB_SIZE - m_dy + off;
@@ -386,6 +386,13 @@ void ImageWidget::paintGL()
             }
         }
     }
+    else if(!m_error.isEmpty())
+    {
+        QPainter painter(this);
+        painter.setPen(Qt::red);
+        painter.setFont(QFont("Sans", 24, QFont::Bold));
+        painter.drawText(0, 0, width(), height(), Qt::AlignCenter | Qt::AlignHCenter, m_error);
+    }
     else
     {
         debayer();
@@ -399,12 +406,13 @@ void ImageWidget::paintGL()
         m_program->bind();
         m_program->setUniformValue("viewport", (float)width(), (float)height());
         m_program->setUniformValue("offset", std::floor(dx), std::floor(dy));
-        m_program->setUniformValue("mtf_param", m_low, m_mid, m_high);
+        m_program->setUniformValueArray("mtf_param", m_mtfParams.blackPoint, 3, 3);
+        m_program->setUniformValue("unit_scale", m_unit_scale[0], m_unit_scale[1]);
         m_program->setUniformValue("zoom", 1.0f/m_scale);
         m_program->setUniformValue("bw", m_bwImg && !m_superpixel);
+        m_program->setUniformValue("false_color", m_falseColor && m_bwImg);
         m_program->setUniformValue("invert", m_invert);
-        if(m_superpixel)m_program->setUniformValue("whiteBalance", m_whiteBalance[0], m_whiteBalance[1], m_whiteBalance[2]);
-        else m_program->setUniformValue("whiteBalance", 1.0f, 1.0f, 1.0f);
+        m_program->setUniformValue("filtering", m_scale > 1.0f ? FILTERING : 1);
 #ifdef COLOR_MANAGMENT
         m_program->setUniformValue("srgb", m_srgb);
 #endif
@@ -426,7 +434,7 @@ void ImageWidget::initializeGL()
 {
     f = context()->functions();
     f->glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
-    f3 = context()->versionFunctions<QOpenGLFunctions_3_3_Core>();
+    f3 = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_3_3_Core>(context());
 
     if(f3 == nullptr)
         QMessageBox::critical(this, tr("OpenGL error"), tr("Could not initialize OpenGL 3.3 context. Ensure that proper GPU driver is installed."));
@@ -469,8 +477,8 @@ void ImageWidget::initializeGL()
     // f->glVertexAttribPointer(0, 2, GL_FLOAT, false, sizeof(float)*4, 0);
 
     m_program = std::unique_ptr<QOpenGLShaderProgram>(new QOpenGLShaderProgram);
-    m_program->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shaders/image.vert");
-    m_program->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/image.frag");
+    m_program->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/image.vert");
+    m_program->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/image.frag");
 
     if(!m_program->link())
     {
@@ -486,8 +494,8 @@ void ImageWidget::initializeGL()
     m_program->setUniformValue("scale", 1.0f, 0.0f);
 
     m_debayerProgram = std::unique_ptr<QOpenGLShaderProgram>(new QOpenGLShaderProgram);
-    m_debayerProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shaders/debayer.vert");
-    m_debayerProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/debayer.frag");
+    m_debayerProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/debayer.vert");
+    m_debayerProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/debayer.frag");
 
     m_debayerProgram->bind();
     m_debayerProgram->enableAttributeArray("qt_Vertex");
@@ -503,8 +511,8 @@ void ImageWidget::initializeGL()
     m_vaoThumb->bind();
 
     m_thumbnailProgram = std::unique_ptr<QOpenGLShaderProgram>(new QOpenGLShaderProgram);
-    m_thumbnailProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shaders/thumb.vert");
-    m_thumbnailProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/thumb.frag");
+    m_thumbnailProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/thumb.vert");
+    m_thumbnailProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/thumb.frag");
 
     m_thumbnailProgram->bind();
     m_thumbnailProgram->enableAttributeArray("qt_Vertex");
@@ -584,7 +592,7 @@ void ImageWidget::mousePressEvent(QMouseEvent *event)
     else
     {
         if(event->button() == Qt::LeftButton)
-            m_lastPos = event->localPos();
+            m_lastPos = event->position();
     }
 }
 
@@ -596,8 +604,8 @@ void ImageWidget::mouseMoveEvent(QMouseEvent *event)
     }
     else if(!m_lastPos.isNull())
     {
-        QPointF off = event->localPos() - m_lastPos;
-        m_lastPos = event->localPos();
+        QPointF off = event->position() - m_lastPos;
+        m_lastPos = event->position();
         setOffset(m_dx - off.x(), m_dy - off.y());
         return;
     }
@@ -605,7 +613,7 @@ void ImageWidget::mouseMoveEvent(QMouseEvent *event)
     if(!m_showThumbnails && m_rawImage)
     {
         QVector2D pix = getImagePixelCoord(QVector2D(event->pos()));
-        QVector3D rgb;
+        double r,g,b;
 
         SkyPoint sky;
         if(m_wcs)
@@ -613,12 +621,12 @@ void ImageWidget::mouseMoveEvent(QMouseEvent *event)
             m_wcs->pixelToWorld(QPointF(pix.x(), pix.y()), sky);
         }
 
-        if(m_rawImage->pixel(pix.x(), pix.y(), rgb))
+        if(m_rawImage->pixel(pix.x(), pix.y(), r, g, b))
         {
             if(m_bwImg)
-                emit status(tr("L:%1").arg(rgb.x()), tr("X:%3 Y:%4").arg((int)pix.x()).arg((int)pix.y()), sky.toString());
+                emit status(tr("L:%1").arg(r), tr("X:%3 Y:%4").arg((int)pix.x()).arg((int)pix.y()), sky.toString());
             else
-                emit status(tr("R:%1 G:%2 B:%3").arg(rgb.x()).arg(rgb.y()).arg(rgb.z()), tr("X:%3 Y:%4").arg((int)pix.x()).arg((int)pix.y()), sky.toString());
+                emit status(tr("R:%1 G:%2 B:%3").arg(r).arg(g).arg(b), tr("X:%3 Y:%4").arg((int)pix.x()).arg((int)pix.y()), sky.toString());
         }
     }
 }
@@ -663,7 +671,7 @@ void ImageWidget::wheelEvent(QWheelEvent *event)
     else
     {
         if(std::abs(event->angleDelta().y()) > 15)
-            zoom(event->angleDelta().y(), event->modifiers() & Qt::ShiftModifier ? QPointF() : event->posF());
+            zoom(event->angleDelta().y(), event->modifiers() & Qt::ShiftModifier ? QPointF() : event->position());
     }
 }
 
@@ -706,6 +714,7 @@ void ImageWidget::debayer()
     f->glViewport(0, 0, m_imgWidth, m_imgHeight);
 
     m_debayerProgram->bind();
+    f->glUniform2i(m_debayerProgram->uniformLocation("firstRed"), m_firstRed[0], m_firstRed[1]);
     m_image->bind(0);
     f->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 
@@ -716,19 +725,6 @@ void ImageWidget::debayer()
     f->glGenerateMipmap(GL_TEXTURE_2D);
     f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-
-    int size = std::max(m_imgWidth, m_imgHeight);
-    int level = 0;
-    while(size >>= 1)level++;
-    int w,h;
-    f3->glGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_WIDTH, &w);
-    f3->glGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_HEIGHT, &h);
-    uint16_t pixel[w*h*4];
-    f3->glGetTexImage(GL_TEXTURE_2D, level, GL_RGBA, GL_UNSIGNED_SHORT, pixel);
-    float maxRGB = std::max(std::max(pixel[0], pixel[1]), pixel[2]);
-    m_whiteBalance[0] = maxRGB / pixel[0];
-    m_whiteBalance[1] = maxRGB / pixel[1];
-    m_whiteBalance[2] = maxRGB / pixel[2];
 }
 
 void ImageWidget::updateScrollBars()

imagescrollareagl.h

@@ -14,6 +14,7 @@
 #include "rawimage.h"
 #include "imageringlist.h"
 #include "database.h"
+#include "stretchtoolbar.h"
 
 struct ImageThumb
 {
@@ -27,9 +28,9 @@ struct ImageThumb
 class ImageWidget : public QOpenGLWidget
 {
     Q_OBJECT
-    QOpenGLFunctions *f;
-    QOpenGLFunctions_3_3_Core *f3;
-    QTimer *m_updateTimer;
+    QOpenGLFunctions *f = nullptr;
+    QOpenGLFunctions_3_3_Core *f3 = nullptr;
+    QTimer *m_updateTimer = nullptr;
     std::unique_ptr<QOpenGLShaderProgram> m_program;
     std::unique_ptr<QOpenGLShaderProgram> m_thumbnailProgram;
     std::unique_ptr<QOpenGLShaderProgram> m_debayerProgram;
@@ -44,31 +45,30 @@ class ImageWidget : public QOpenGLWidget
     std::shared_ptr<RawImage> m_rawImage;
     std::shared_ptr<WCSData> m_wcs;
     int m_width, m_height;
-    int m_imgWidth, m_imgHeight;
-    int m_currentImg;
-    float m_low;
-    float m_mid;
-    float m_high;
-    float m_range;
-    float m_dx, m_dy;
-    float m_scale;
+    int m_imgWidth = -1, m_imgHeight = -1;
+    int m_currentImg = 0;
+    MTFParam m_mtfParams;
+    float m_unit_scale[2] = {1.0f, 0.0f}; // scale and offset
+    float m_dx = 0, m_dy = 0;
+    float m_scale = 1.0f;
     int m_scaleStop = 0;
     bool m_bestFit = false;
-    float m_whiteBalance[3] = {1.0f, 1.0f, 1.0f};
-    bool m_blockRepaint;
-    bool m_bwImg;
-    bool m_invert;
-    bool m_superpixel;
-    bool m_showThumbnails;
-    bool m_selecting;
-    bool m_sizesDirty;
-    bool m_srgb;
-    int m_thumbnailCount;
-    int m_maxTextureSize;
-    int m_maxArrayLayers;
+    bool m_bwImg = false;
+    bool m_falseColor = false;
+    bool m_invert = false;
+    bool m_superpixel = false;
+    bool m_showThumbnails = false;
+    bool m_selecting = false;
+    bool m_sizesDirty = false;
+    bool m_srgb = false;
+    int m_thumbnailCount = 0;
+    int m_maxTextureSize = 0;
+    int m_maxArrayLayers = 0;
+    int m_firstRed[2] = {0, 0};
     QVector<ImageThumb> m_thumnails;
-    Database *m_database;
+    Database *m_database = nullptr;
     QPointF m_lastPos;
+    QString m_error;
 public:
     explicit ImageWidget(Database *database, QWidget *parent = nullptr);
     ~ImageWidget() override;
@@ -77,14 +77,15 @@ public:
     void setWCS(std::shared_ptr<WCSData> wcs);
     void zoom(int zoom, const QPointF &mousePos = QPointF());
     void bestFit();
-    void blockRepaint(bool block);
     void allocateThumbnails(const QStringList &paths);
     QVector2D getImagePixelCoord(const QVector2D &pos);
+    void setBayerMask(int mask);
 public slots:
-    void setMTFParams(float low, float mid, float high);
+    void setMTFParams(const MTFParam &params);
     void setOffset(float dx, float dy);
     void superPixel(bool enable);
     void invert(bool enable);
+    void falseColor(bool enable);
     QImage renderToImage();
     void thumbnailLoaded(const Image *image);
     void showThumbnail(bool enable);

install.cmake

@@ -1,5 +1,5 @@
 find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
 find_program(XDG-ICON-RESOURCE_EXECUTABLE xdg-icon-resource)
 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 space.nouspiro.tenmon.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
-execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 128 space.nouspiro.tenmon_128.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 64 resources/space.nouspiro.tenmon.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})

loadrunable.cpp

@@ -7,6 +7,7 @@
 #include <QElapsedTimer>
 #include <QDebug>
 #include <iostream>
+#include <algorithm>
 #include <libexif/exif-data.h>
 #include <fitsio2.h>
 #include <libxisf.h>
@@ -82,11 +83,8 @@ void printStarModel(int radius, const std::vector<double> &data, const Star &sta
     std::cout << m.toStdString() << std::endl << std::endl;
 }
 
-bool loadRAW(const QString path, ImageInfoData &info, RawImage **image)
+bool loadRAW(const QString path, ImageInfoData &info, std::shared_ptr<RawImage> &image)
 {
-    if(!image)
-        return false;
-
     std::unique_ptr<LibRaw> raw = std::make_unique<LibRaw>();
     raw->open_file(path.toLocal8Bit().data());
     raw->imgdata.params.half_size = true;
@@ -95,37 +93,35 @@ bool loadRAW(const QString path, ImageInfoData &info, RawImage **image)
     if(raw->unpack())
         return false;
 
-    if(image)
+
+    libraw_rawdata_t rawdata = raw->imgdata.rawdata;
+    size_t size = rawdata.sizes.width*rawdata.sizes.height;
+
+    std::vector<uint16_t> out;
+    out.resize(size);
+    size_t d = 0;
+    uint h=rawdata.sizes.top_margin+rawdata.sizes.height;
+    uint w=rawdata.sizes.left_margin+rawdata.sizes.width;
+    size_t pitch = rawdata.sizes.raw_pitch/sizeof(uint16_t);
+
+    for(size_t i=rawdata.sizes.top_margin;i<h;i++)
     {
-        libraw_rawdata_t rawdata = raw->imgdata.rawdata;
-        size_t size = rawdata.sizes.width*rawdata.sizes.height;
-
-        std::vector<uint16_t> out;
-        out.resize(size);
-        size_t d = 0;
-        uint h=rawdata.sizes.top_margin+rawdata.sizes.height;
-        uint w=rawdata.sizes.left_margin+rawdata.sizes.width;
-        size_t pitch = rawdata.sizes.raw_pitch/sizeof(uint16_t);
-
-        for(size_t i=rawdata.sizes.top_margin;i<h;i++)
+        for(size_t o=rawdata.sizes.left_margin;o<w;o++)
         {
-            for(size_t o=rawdata.sizes.left_margin;o<w;o++)
-            {
-                uint16_t p = rawdata.raw_image[i*pitch+o];
-                out[d++] = p;
-            }
+            uint16_t p = rawdata.raw_image[i*pitch+o];
+            out[d++] = p;
         }
-        *image = new RawImage(rawdata.sizes.width, rawdata.sizes.height, RawImage::UINT16);
-        memcpy((*image)->data(), &out[0], sizeof(uint16_t)*d);
     }
+    image = std::make_shared<RawImage>(rawdata.sizes.width, rawdata.sizes.height, 1, RawImage::UINT16);
+    memcpy(image->data(), &out[0], sizeof(uint16_t)*d);
 
     QString shutterSpeed = QString::number(raw->imgdata.other.shutter);
     if(raw->imgdata.other.shutter < 1)
     {
         shutterSpeed = QString("1/%1s").arg(1.0f/raw->imgdata.other.shutter);
     }
-    //info.append(StringPair(QObject::tr("Width"), QString::number(rawImg->width)));
-    //info.append(StringPair(QObject::tr("Height"), QString::number(rawImg->height)));
+    info.info.append({QObject::tr("Width"), QString::number(raw->imgdata.sizes.width)});
+    info.info.append({QObject::tr("Height"), QString::number(raw->imgdata.sizes.height)});
     info.info.append({QObject::tr("ISO"), QString::number(raw->imgdata.other.iso_speed)});
     info.info.append({QObject::tr("Shutter speed"), shutterSpeed});
 #if LIBRAW_MINOR_VERSION>=19
@@ -191,49 +187,56 @@ int loadFITSHeader(fitsfile *file, ImageInfoData &info)
     return status;
 }
 
-bool loadFITS(const QString path, ImageInfoData &info, RawImage **image)
+bool loadFITS(const QString path, ImageInfoData &info, std::shared_ptr<RawImage> &image)
 {
-    if(!image)
-        return false;
-
     fitsfile *file;
     int status = 0;
-    int type;
-    fits_open_image(&file, path.toLocal8Bit().data(), READONLY, &status);
-    fits_get_hdu_type(file, &type, &status);
+    int type = -1;
+    fits_open_diskfile(&file, path.toLocal8Bit().data(), READONLY, &status);
+    int num = 0;
+    fits_get_num_hdus(file, &num, &status);
 
-    if(type == IMAGE_HDU)
+    int imgtype;
+    int naxis;
+    long naxes[3] = {0};
+    for(int i=1; i <= num; i++)
     {
-        int imgtype;
-        int naxis;
-        long naxes[3] = {0};
+        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);
         fits_get_img_equivtype(file, &imgtype, &status);
 
-        if(naxis >= 2 && naxis <= 3 && status == 0)
+        if(type == IMAGE_HDU && naxis >= 2 && naxis <= 3 && status == 0)
         {
-            int cvtype;
+            RawImage::DataType type;
             int fitstype;
-            std::vector<cv::Mat> cvimg;
             long fpixel[3] = {1,1,1};
             switch(imgtype)
             {
             case BYTE_IMG:
-                cvtype = CV_8U;
+                type = RawImage::UINT8;
                 fitstype = TBYTE;
                 break;
             case SHORT_IMG:
-                cvtype = CV_16S;
+                type = RawImage::UINT16;
                 fitstype = TSHORT;
                 break;
             case USHORT_IMG:
-                cvtype = CV_16U;
+                type = RawImage::UINT16;
                 fitstype = TUSHORT;
                 break;
+            case ULONG_IMG:
+                type = RawImage::UINT32;
+                fitstype = TUINT;
+                break;
             case FLOAT_IMG:
-                cvtype = CV_32F;
+                type = RawImage::FLOAT32;
                 fitstype = TFLOAT;
                 break;
+            case DOUBLE_IMG:
+                type = RawImage::FLOAT64;
+                fitstype = TDOUBLE;
+                break;
             default:
                 info.info.append({QObject::tr("Error"), QObject::tr("Unsupported sample format")});
                 goto noload;
@@ -247,32 +250,45 @@ bool loadFITS(const QString path, ImageInfoData &info, RawImage **image)
             info.info.append({QObject::tr("Width"), QString::number(naxes[0])});
             info.info.append({QObject::tr("Height"), QString::number(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++)
             {
-                cv::Mat tmp(h, w, cvtype);
                 fpixel[2] = i;
-                fits_read_pix(file, fitstype, fpixel, size, NULL, tmp.ptr(), NULL, &status);
-                if(cvtype == CV_16S)
-                    tmp.convertTo(tmp, CV_16U, 1, 32767);
-                cvimg.push_back(tmp);
+                fits_read_pix(file, fitstype, fpixel, size, NULL, data + img.size() * RawImage::typeSize(type) * (i-1), NULL, &status);
+            }
+            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(cvimg.size() == 1)
-            {
-                *image = new RawImage(cvimg[0]);
-            }
-            if(cvimg.size() == 3)
-            {
-                cv::Mat rgb;
-                cv::merge(cvimg, rgb);
-                *image = new RawImage(rgb);
-            }
+            if(img.channels() == 1)
+                image = std::make_shared<RawImage>(std::move(img));
+            else
+                image = RawImage::fromPlanar(img);
+
+            if(image)
+                image->convertToGLFormat();
+
+            break;
         }
     }
     noload:
     if(file)
         loadFITSHeader(file, info);
 
+    if(image)
+    {
+        for(auto fits : info.fitsHeader)
+        {
+            if(fits.key == "ROWORDER" && fits.value == "BOTTOM-UP")
+                image->flip();
+        }
+    }
+
     fits_close_file(file, &status);
     if(status)
     {
@@ -285,7 +301,7 @@ bool loadFITS(const QString path, ImageInfoData &info, RawImage **image)
     return true;
 }
 
-bool loadXISF(const QString &path, ImageInfoData &info, RawImage **image)
+bool loadXISF(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage> &image)
 {
     try
     {
@@ -310,51 +326,33 @@ bool loadXISF(const QString &path, ImageInfoData &info, RawImage **image)
         info.info.append({QObject::tr("Height"), QString::number(xisfImage.height())});
         if(!info.wcs->valid())info.wcs.reset();
 
-        if(xisfImage.channelCount() == 1)
+        RawImage::DataType type;
+        switch(xisfImage.sampleFormat())
         {
-            switch(xisfImage.sampleFormat())
-            {
-            case LibXISF::Image::UInt8:
-                *image = new RawImage(xisfImage.width(), xisfImage.height(), RawImage::UINT8);
-                std::memcpy((*image)->data(), xisfImage.imageData(), xisfImage.imageDataSize());
-                break;
-            case LibXISF::Image::UInt16:
-                *image = new RawImage(xisfImage.width(), xisfImage.height(), RawImage::UINT16);
-                std::memcpy((*image)->data(), xisfImage.imageData(), xisfImage.imageDataSize());
-                break;
-            case LibXISF::Image::Float32:
-                *image = new RawImage(xisfImage.width(), xisfImage.height(), RawImage::FLOAT32);
-                std::memcpy((*image)->data(), xisfImage.imageData(), xisfImage.imageDataSize());
-                break;
-            default:
-                break;
-            }
+            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: break;
         }
-        else if(xisfImage.channelCount() == 3)
-        {
-            LibXISF::Image tmpImage = xisfImage;
-            tmpImage.convertPixelStorageTo(LibXISF::Image::Normal);
 
-            switch(tmpImage.sampleFormat())
-            {
-            case LibXISF::Image::UInt8:
-                *image = new RawImage(tmpImage.width(), tmpImage.height(), RawImage::UINT8C3);
-                std::memcpy((*image)->data(), tmpImage.imageData(), tmpImage.imageDataSize());
-                break;
-            case LibXISF::Image::UInt16:
-                *image = new RawImage(tmpImage.width(), tmpImage.height(), RawImage::UINT16C3);
-                std::memcpy((*image)->data(), tmpImage.imageData(), tmpImage.imageDataSize());
-                break;
-            case LibXISF::Image::Float32:
-                *image = new RawImage(tmpImage.width(), tmpImage.height(), RawImage::FLOAT32C3);
-                std::memcpy((*image)->data(), tmpImage.imageData(), tmpImage.imageDataSize());
-                break;
-            default:
-                break;
-            }
+        LibXISF::Image tmpImage = xisfImage;
+        tmpImage.convertPixelStorageTo(LibXISF::Image::Planar);
+        if(tmpImage.colorSpace() == LibXISF::Image::ColorSpace::Gray)
+        {
+            image = std::make_shared<RawImage>(tmpImage.width(), tmpImage.height(), 1, type);
+            std::memcpy(image->data(), tmpImage.imageData(), tmpImage.imageDataSize() / tmpImage.channelCount());
         }
-        if(*image)
+        else if(tmpImage.channelCount() == 3 || tmpImage.channelCount() == 4)
+        {
+            image = RawImage::fromPlanar(tmpImage.imageData(), tmpImage.width(), tmpImage.height(), tmpImage.channelCount(), type);
+        }
+        if(image)
+        {
+            image->convertToGLFormat();
             return true;
+        }
     }
     catch (LibXISF::Error &err)
     {
@@ -370,7 +368,6 @@ void LoadRunable::run()
 {
     try
     {
-
         if(!m_thumbnail && !m_receiver->isCurrent())
         {
             return;
@@ -380,131 +377,59 @@ void LoadRunable::run()
         QFileInfo finfo(m_file);
         info.info.append({QObject::tr("Filename"), finfo.fileName()});
 
-        RawImage *rawImage = nullptr;
-        bool raw = false;
-        timer.start();
-        if(m_file.endsWith(".CR2", Qt::CaseInsensitive) || m_file.endsWith(".NEF", Qt::CaseInsensitive) || m_file.endsWith(".DNG", Qt::CaseInsensitive))
-        {
-            loadRAW(m_file, info, &rawImage);
-            raw = true;
-            qDebug() << "LoadRAW" << timer.elapsed();
-        }
-        else if(m_file.endsWith(".FIT", Qt::CaseInsensitive) || m_file.endsWith(".FITS", Qt::CaseInsensitive))
-        {
-            loadFITS(m_file, info, &rawImage);
-            qDebug() << "LoadFITS" << timer.elapsed();
-        }
-        else if(m_file.endsWith(".XISF", Qt::CaseInsensitive))
-        {
-            loadXISF(m_file, info, &rawImage);
-            qDebug() << "LoadXISF" << timer.elapsed();
-        }
-        else
-        {
-            QImage img(m_file);
-    #ifdef COLOR_MANAGMENT
-            if(img.colorSpace().isValid() && img.colorSpace() != QColorSpace::SRgb)
-                img.convertToColorSpace(QColorSpace::SRgb);
-    #endif
+        std::shared_ptr<RawImage> rawImage;
+        if(!loadImage(m_file, info, rawImage))
+            info.info.append({QObject::tr("Error"), QObject::tr("Failed to load image")});
 
-            ExifData *exif = exif_data_new_from_file(m_file.toLocal8Bit().constData());
-            info.info.append({QObject::tr("Width"), QString::number(img.width())});
-            info.info.append({QObject::tr("Height"), QString::number(img.height())});
-            if(exif)
-            {
-                loadExifEntry(info, exif->ifd[EXIF_IFD_EXIF], EXIF_TAG_ISO_SPEED_RATINGS);
-                loadExifEntry(info, exif->ifd[EXIF_IFD_EXIF], EXIF_TAG_SHUTTER_SPEED_VALUE);
-                exif_data_free(exif);
-            }
-            rawImage = new RawImage(img);
-            qDebug() << "LoadQImage" << timer.elapsed();
-        }
-
-        if(rawImage && m_analyzeLevel >= Statistics && !m_thumbnail)
+        if(rawImage && !m_thumbnail)
         {
-            double mean, median, min, max, mad;
-            double stdDev;
-            uint32_t saturated;
             timer.start();
-            rawImage->imageStats(&mean, &stdDev, &median, &min, &max, &mad, &saturated);
+            rawImage->calcStats();
+            const RawImage::Stats &stats = rawImage->imageStats();
             qDebug() << "image stats" << timer.restart();
-            info.info.append({QObject::tr("Mean"), QString::number(mean)});
-            info.info.append({QObject::tr("Standart deviation"), QString::number(stdDev)});
-            info.info.append({QObject::tr("Median"), QString::number(median)});
-            info.info.append({QObject::tr("Minimum"), QString::number(min)});
-            info.info.append({QObject::tr("Maximum"), QString::number(max)});
-            info.info.append({QObject::tr("MAD"), QString::number(mad)});
-            info.info.append({QObject::tr("Saturated"), QString::number(100.0 * saturated / rawImage->size()) + "%"});
-
-            if(m_analyzeLevel >= Peaks)
+            if(rawImage->channels() == 1)
             {
-                std::vector<Peak> peaks;
-                if(raw) {
-                    rawImage->quarter();
-                    qDebug() << "quarter" << timer.restart();
-                }
-                RawImage *medianImage = rawImage->medianFilter();
-                qDebug() << "median" << timer.restart();
-                int numPeaks = medianImage->findPeaks(median+stdDev*2, 20, peaks);
-                delete medianImage;
-                qDebug() << "peaks" << timer.restart();
-                //if(m_analyzeLevel == Peaks)
-                //    drawPeaks(img, peaks);
-                qDebug() << "draw peaks" << timer.restart();
-                info.info.append({QObject::tr("Peaks"), QString::number(numPeaks)});
-                //info.info.append({QObject::tr("Peaks draw"), QString::number(peaks.size())});
-
-                if(m_analyzeLevel>= Stars)
-                {
-                    double fwhmX = 0;
-                    double fwhmY = 0;
-                    const int radius = 13;
-                    StarFit starFit(radius);
-                    std::vector<Star> stars;
-                    for(uint i=0; i<peaks.size(); i++)
-                    {
-                        Peak p = peaks[i];
-                        std::vector<double> r;
-                        int x = p.x();
-                        int y = p.y();
-                        rawImage->rect(x, y, radius, radius, r);
-                        Star star = starFit.fitStar(r, false);
-                        if(star.valid())
-                        {
-                            //printStarModel(radius, r, star);
-                            star.m_x += x;
-                            star.m_y += y;
-                            fwhmX += star.fwhmX();
-                            fwhmY += star.fwhmY();
-                            stars.push_back(star);
-                        }
-                    }
-                    //drawStars(img, stars);
-                    info.info.append({QObject::tr("FWHM X"), QString::number(fwhmX/stars.size())});
-                    info.info.append({QObject::tr("FWHM Y"), QString::number(fwhmY/stars.size())});
-                }
-                qDebug() << "Star fit" << timer.restart();
+                info.info.append({QObject::tr("Mean"), QString::number(stats.m_mean[0])});
+                info.info.append({QObject::tr("Standart deviation"), QString::number(stats.m_stdDev[0])});
+                info.info.append({QObject::tr("Median"), QString::number(stats.m_median[0])});
+                info.info.append({QObject::tr("Minimum"), QString::number(stats.m_min[0])});
+                info.info.append({QObject::tr("Maximum"), QString::number(stats.m_max[0])});
+                info.info.append({QObject::tr("MAD"), QString::number(stats.m_mad[0])});
+                info.info.append({QObject::tr("Saturated"), QString::number(100.0 * stats.m_saturated[0] / rawImage->size()) + "%"});
+            }
+            else
+            {
+                info.info.append({QObject::tr("Mean"), QString("%1 %2 %3").arg(stats.m_mean[0]).arg(stats.m_mean[1]).arg(stats.m_mean[2])});
+                info.info.append({QObject::tr("Standart deviation"), QString("%1 %2 %3").arg(stats.m_stdDev[0]).arg(stats.m_stdDev[1]).arg(stats.m_stdDev[2])});
+                info.info.append({QObject::tr("Median"), QString("%1 %2 %3").arg(stats.m_median[0]).arg(stats.m_median[1]).arg(stats.m_median[2])});
+                info.info.append({QObject::tr("Minimum"), QString("%1 %2 %3").arg(stats.m_min[0]).arg(stats.m_min[1]).arg(stats.m_min[2])});
+                info.info.append({QObject::tr("Maximum"), QString("%1 %2 %3").arg(stats.m_max[0]).arg(stats.m_max[1]).arg(stats.m_max[2])});
+                info.info.append({QObject::tr("MAD"), QString("%1 %2 %3").arg(stats.m_mad[0]).arg(stats.m_mad[1]).arg(stats.m_mad[2])});
+                info.info.append({QObject::tr("Saturated"), QString("%1 %2 %3%").arg(100.0 * stats.m_saturated[0] / rawImage->size())
+                                  .arg(100.0 * stats.m_saturated[1] / rawImage->size())
+                                  .arg(100.0 * stats.m_saturated[2] / rawImage->size())});
             }
         }
 
         if(m_thumbnail)
         {
-            if(rawImage)
+            if(rawImage && rawImage->valid())
             {
+                if(QUALITY_RESIZE)
+                    rawImage->resize(THUMB_SIZE, THUMB_SIZE);
+
                 rawImage->convertToThumbnail();
-                QMetaObject::invokeMethod(m_receiver, "thumbnailLoadFinish", Qt::QueuedConnection, Q_ARG(void*, rawImage));
             }
+            QMetaObject::invokeMethod(m_receiver, "thumbnailLoadFinish", Qt::QueuedConnection, Q_ARG(std::shared_ptr<RawImage>, rawImage));
         }
         else
-            QMetaObject::invokeMethod(m_receiver, "imageLoaded", Qt::QueuedConnection, Q_ARG(void*, rawImage), Q_ARG(ImageInfoData, info));
-    }
-    catch(cv::Exception e)
-    {
-        qDebug() << e.what();
+        {
+            QMetaObject::invokeMethod(m_receiver, "imageLoaded", Qt::QueuedConnection, Q_ARG(std::shared_ptr<RawImage>, rawImage), Q_ARG(ImageInfoData, info));
+        }
     }
     catch(std::exception e)
     {
-       qDebug() << e.what();
+       qDebug() << m_file << e.what();
     }
 }
 
@@ -552,60 +477,108 @@ bool readXISFHeader(const QString &path, ImageInfoData &info)
     return true;
 }
 
-ConvertRunable::ConvertRunable(const QString &in, const QString &out, const QString &format) :
+bool loadImage(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage> &rawImage)
+{
+    bool ret = false;
+    QElapsedTimer timer;
+    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();
+    }
+    else if(path.endsWith(".FIT", Qt::CaseInsensitive) || path.endsWith(".FITS", Qt::CaseInsensitive))
+    {
+        ret = loadFITS(path, info, rawImage);
+        qDebug() << "LoadFITS" << timer.elapsed();
+    }
+    else if(path.endsWith(".XISF", Qt::CaseInsensitive))
+    {
+        ret = loadXISF(path, info, rawImage);
+        qDebug() << "LoadXISF" << timer.elapsed();
+    }
+    else
+    {
+        QImage img(path);
+#ifdef COLOR_MANAGMENT
+        if(img.colorSpace().isValid() && img.colorSpace() != QColorSpace::SRgb)
+            img.convertToColorSpace(QColorSpace::SRgb);
+#endif
+
+        ExifData *exif = exif_data_new_from_file(path.toLocal8Bit().constData());
+        info.info.append({QObject::tr("Width"), QString::number(img.width())});
+        info.info.append({QObject::tr("Height"), QString::number(img.height())});
+        if(exif)
+        {
+            loadExifEntry(info, exif->ifd[EXIF_IFD_EXIF], EXIF_TAG_ISO_SPEED_RATINGS);
+            loadExifEntry(info, exif->ifd[EXIF_IFD_EXIF], EXIF_TAG_SHUTTER_SPEED_VALUE);
+            exif_data_free(exif);
+        }
+        rawImage = std::make_shared<RawImage>(img);
+        qDebug() << "LoadQImage" << timer.elapsed();
+        ret = !img.isNull();
+    }
+    return ret;
+}
+
+ConvertRunable::ConvertRunable(const QString &in, const QString &out, const QString &format, const ConvertParams &params, QSemaphore *semaphore) :
     m_infile(in),
     m_outfile(out),
-    m_format(format)
+    m_format(format),
+    m_params(params),
+    m_semaphore(semaphore)
 {
 }
 
-void writeFITSImage(fitsfile *fw, RawImage *rawimage, ImageInfoData &imageinfo)
+void writeFITSImage(fitsfile *fw, std::shared_ptr<RawImage> rawimage, ImageInfoData &imageinfo)
 {
     static QStringList skipKeys = {"SIMPLE", "BITPIX", "NAXIS", "NAXIS1", "NAXIS2", "NAXIS3", "BZERO", "BSCALE", "EXTEND"};
 
     int status = 0;
     long firstpix[3] = {1,1,1};
 
-    int channels = rawimage->mat().channels();
+    int channels = rawimage->channels();
     int naxis = channels == 1 ? 2 : 3;
-    long naxes[3] = {(int)rawimage->width(), (int)rawimage->height(), rawimage->mat().channels()};
+    long naxes[3] = {(int)rawimage->width(), (int)rawimage->height(), rawimage->channels()};
 
-    std::vector<cv::Mat> mat;
+    std::vector<RawImage> planes;
     if(channels == 1)
-        mat.push_back(rawimage->mat());
+        planes.push_back(*rawimage);
     else
-        cv::split(rawimage->mat(), mat);
+        planes = rawimage->split();
 
-    switch(CV_MAT_DEPTH(rawimage->dataType()))
+    switch(rawimage->type())
     {
-    case CV_8U:
+    case RawImage::UINT8:
         fits_create_img(fw, BYTE_IMG, naxis, naxes, &status);
         for(int i=0; i<channels; i++)
         {
             firstpix[2] = i+1;
-            fits_write_pix(fw, TBYTE, firstpix, rawimage->size(), mat[i].data, &status);
+            fits_write_pix(fw, TBYTE, firstpix, rawimage->size(), planes[i].data(), &status);
         }
         break;
-    case CV_16U:
+    case RawImage::UINT16:
         fits_create_img(fw, USHORT_IMG, naxis, naxes, &status);
         for(int i=0; i<channels; i++)
         {
             firstpix[2] = i+1;
-            fits_write_pix(fw, TUSHORT, firstpix, rawimage->size(), mat[i].data, &status);
+            fits_write_pix(fw, TUSHORT, firstpix, rawimage->size(), planes[i].data(), &status);
         }
         break;
-    case CV_32F:
+    case RawImage::FLOAT32:
         fits_create_img(fw, FLOAT_IMG, naxis, naxes, &status);
         for(int i=0; i<channels; i++)
         {
             firstpix[2] = i+1;
-            fits_write_pix(fw, TFLOAT, firstpix, rawimage->size(), mat[i].data, &status);
+            fits_write_pix(fw, TFLOAT, firstpix, rawimage->size(), planes[i].data(), &status);
         }
         break;
+    default:
+        return;
     }
     for(const FITSRecord &record : imageinfo.fitsHeader)
     {
-        if(skipKeys.contains(record.key))continue;
+        if(skipKeys.contains(record.key) || record.xisf)continue;
 
         bool isdouble;
         bool isint;
@@ -631,59 +604,135 @@ void writeFITSImage(fitsfile *fw, RawImage *rawimage, ImageInfoData &imageinfo)
 
 void ConvertRunable::run()
 {
+    QSemaphoreReleaser release;
+    if(m_semaphore)release = QSemaphoreReleaser(m_semaphore);
+
     ImageInfoData imageinfo;
-    RawImage *rawimage = nullptr;
-    if(m_infile.endsWith(".FITS", Qt::CaseInsensitive) || m_infile.endsWith(".FIT", Qt::CaseInsensitive))
-        loadFITS(m_infile, imageinfo, &rawimage);
-    if(m_infile.endsWith(".XISF", Qt::CaseInsensitive))
-        loadXISF(m_infile, imageinfo, &rawimage);
+    std::shared_ptr<RawImage> rawimage;
+    loadImage(m_infile, imageinfo, rawimage);
+    QFileInfo info(m_outfile);
+    info.dir().mkpath(".");
 
     if(rawimage)
     {
-        if(m_format == "XISF")
+        if(m_format == "xisf")
         {
             try
             {
                 LibXISF::XISFWriter xisf;
-                int channelCount = rawimage->mat().channels();
+                int channelCount = rawimage->channels();
                 LibXISF::Image::SampleFormat sampleFormat;
-                switch(CV_MAT_DEPTH(rawimage->dataType()))
+                switch(rawimage->type())
                 {
-                case CV_8U: sampleFormat = LibXISF::Image::UInt8; break;
-                case CV_16U: sampleFormat = LibXISF::Image::UInt16; break;
-                case CV_32F: sampleFormat = LibXISF::Image::Float32; break;
+                case RawImage::UINT8: sampleFormat = LibXISF::Image::UInt8; break;
+                case RawImage::UINT16: sampleFormat = LibXISF::Image::UInt16; break;
+                case RawImage::FLOAT32: sampleFormat = LibXISF::Image::Float32; break;
                 default: return;
                 }
 
-                LibXISF::Image image(rawimage->width(), rawimage->height(), channelCount, sampleFormat, channelCount == 1 ? LibXISF::Image::Gray : LibXISF::Image::RGB, LibXISF::Image::Normal);
-                std::memcpy(image.imageData(), rawimage->data(), image.imageDataSize());
+                LibXISF::Image image(rawimage->width(), rawimage->height(), channelCount, sampleFormat, channelCount == 1 ? LibXISF::Image::Gray : LibXISF::Image::RGB, LibXISF::Image::Planar);
+                if(channelCount == 1)
+                {
+                    std::memcpy(image.imageData(), rawimage->data(), image.imageDataSize());
+                }
+                else
+                {
+                    size_t off = 0;
+                    std::vector<RawImage> planes = rawimage->split();
+                    for(const auto &plane : planes)
+                    {
+                        std::memcpy(image.imageData<uint8_t>() + off, plane.data(), plane.size() * RawImage::typeSize(plane.type()));
+                        off += plane.size() * RawImage::typeSize(plane.type());
+                    }
+                }
                 for(auto &record : imageinfo.fitsHeader)
                 {
-                    if(record.value.type() == QVariant::Bool)
+                    if(record.xisf)continue;
+
+                    if(record.value.typeId() == QMetaType::Bool)
                         image.addFITSKeyword({record.key.toStdString(), record.value.toBool() ? "T" : "F", record.comment.toStdString()});
                     else
                         image.addFITSKeyword({record.key.toStdString(), record.value.toString().toStdString(), record.comment.toStdString()});
                 }
 
+                if(m_params.compressionType.startsWith("zstd") && LibXISF::DataBlock::CompressionCodecSupported(LibXISF::DataBlock::ZSTD))
+                    image.setCompression(LibXISF::DataBlock::ZSTD, m_params.compressionLevel);
+                else if(m_params.compressionType.startsWith("lz4hc"))
+                    image.setCompression(LibXISF::DataBlock::LZ4HC, m_params.compressionLevel);
+                else if(m_params.compressionType.startsWith("lz4"))
+                    image.setCompression(LibXISF::DataBlock::LZ4, m_params.compressionLevel);
+                else if(m_params.compressionType.startsWith("zlib"))
+                    image.setCompression(LibXISF::DataBlock::Zlib, m_params.compressionLevel);
+
+                if(m_params.compressionType.endsWith("+sh"))
+                    image.setByteshuffling(true);
+
                 xisf.writeImage(image);
                 xisf.save(m_outfile.toLocal8Bit().data());
             }
             catch(LibXISF::Error &err)
             {
                 qDebug() << "Failed to save XISF image" <<  err.what();
-                delete rawimage;
             }
+            return;
         }
 
-        if(m_format == "FITS")
+        if(m_format == "fits")
         {
             int status = 0;
             fitsfile *fw;
             if(QFileInfo(m_outfile).exists())QFile::remove(m_outfile);
             fits_create_diskfile(&fw, m_outfile.toLocal8Bit().data(), &status);
+            if(!m_params.compressionType.isEmpty())
+            {
+                if(m_params.compressionType == "gzip")
+                    fits_set_compression_type(fw, GZIP_1, &status);
+                else if(m_params.compressionType == "rice")
+                    fits_set_compression_type(fw, RICE_1, &status);
+            }
             writeFITSImage(fw, rawimage, imageinfo);
             fits_close_file(fw, &status);
+            return;
+        }
+
+        // if nothing else try QImage
+        {
+            QImage::Format format = QImage::Format_Invalid;
+            int width = rawimage->widthBytes();
+            switch(rawimage->type())
+            {
+            case RawImage::UINT8:
+                if(rawimage->channels() == 1)format = QImage::Format_Grayscale8;
+                else if(rawimage->channels() == 3)format = QImage::Format_RGBX8888;
+                else if(rawimage->channels() == 4)format = QImage::Format_RGBA8888;
+                break;
+            case RawImage::UINT16:
+                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;
+            default:
+                return;
+            }
+            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.save(m_outfile);
         }
-        delete rawimage;
     }
 }
+
+ConvertRunable::ConvertParams::ConvertParams(const QVariantMap &map)
+{
+    bool ok = false;
+    if(map.contains("compressionLevel"))
+        compressionLevel = std::clamp(map["compressionLevel"].toInt(&ok), -1, 100);
+
+    if(!ok)compressionLevel = -1;
+
+    if(map.contains("compressionType"))
+        compressionType = map["compressionType"].toString();
+}

loadrunable.h

@@ -3,10 +3,14 @@
 
 #include <QRunnable>
 #include <QString>
+#include <QSemaphore>
 #include "imageinfo.h"
 
+class RawImage;
+
 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);
 
 class Image;
 
@@ -21,14 +25,25 @@ public:
     void run() override;
 };
 
+
 class ConvertRunable : public QRunnable
 {
+public:
+    struct ConvertParams
+    {
+        int compressionLevel = -1;
+        QString compressionType;
+        ConvertParams(){}
+        ConvertParams(const QVariantMap &map);
+    };
+    ConvertRunable(const QString &in, const QString &out, const QString &format, const ConvertParams &params = ConvertParams(), QSemaphore *semaphore = nullptr);
+    void run() override;
+private:
     QString m_infile;
     QString m_outfile;
     QString m_format;
-public:
-    ConvertRunable(const QString &in, const QString &out, const QString &format);
-    void run() override;
+    ConvertParams m_params;
+    QSemaphore *m_semaphore;
 };
 
 #endif // LOADRUNABLE_H

mainwindow.cpp

@@ -10,6 +10,7 @@
 #include <QProgressDialog>
 #include <QDebug>
 #include <QDockWidget>
+#include <QActionGroup>
 #include <signal.h>
 #include <unistd.h>
 #include <QSettings>
@@ -23,6 +24,8 @@
 #include "about.h"
 #include "statusbar.h"
 #include "settingsdialog.h"
+#include "histogram.h"
+#include "batchprocessing.h"
 
 #ifdef __linux__
 #include <sys/ioctl.h>
@@ -37,7 +40,7 @@ int MainWindow::socketPair[2] = {0, 0};
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 {
     qRegisterMetaType<ImageInfoData>("ImageInfoData");
-    qRegisterMetaType<RawImage*>("RawImage");
+    qRegisterMetaType<std::shared_ptr<RawImage>>("std::shared_ptr<RawImage>");
 
     SettingsDialog::loadSettings();
 
@@ -56,9 +59,10 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
         _openFilter.append(" ");
         nameFilter.append(mimeType.suffixes());
     }
-    _openFilter.append("*.fit *.fits *.xisf *.cr2 *.nef *.dng)");
+    _openFilter.append("*.fit *.fits *.xisf *.cr2 *.cr3 *.nef *.dng)");
     _openFilter.append(tr(";;All files (*)"));
-    nameFilter.append({"fit", "fits", "xisf", "cr2", "nef", "dng"});
+    nameFilter.append({"fit", "fits", "xisf", "cr2", "cr3", "nef", "dng"});
+    QImageReader::setAllocationLimit(0);
 
     m_info = new ImageInfo(this);
     QDockWidget *infoDock = new QDockWidget(tr("Image info"), this);
@@ -80,10 +84,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     connect(m_imageGL->imageWidget(), &ImageWidget::status, statusBar, &StatusBar::newStatus);
 
     m_stretchPanel = new StretchToolbar(this);
-    connect(m_stretchPanel, SIGNAL(paramChanged(float,float,float)), m_imageGL->imageWidget(), SLOT(setMTFParams(float,float,float)));
+    connect(m_stretchPanel, &StretchToolbar::paramChanged, m_imageGL->imageWidget(), &ImageWidget::setMTFParams);
     connect(m_stretchPanel, &StretchToolbar::autoStretch, [&](){ m_stretchPanel->stretchImage(m_ringList->currentImage().get()); });
     connect(m_stretchPanel, &StretchToolbar::invert, m_imageGL->imageWidget(), &ImageWidget::invert);
     connect(m_stretchPanel, &StretchToolbar::superPixel, m_imageGL->imageWidget(), &ImageWidget::superPixel);
+    connect(m_stretchPanel, &StretchToolbar::falseColor, m_imageGL->imageWidget(), &ImageWidget::falseColor);
 
     m_ringList = new ImageRingList(m_database, nameFilter, this);
     m_filesystem = new FilesystemWidget(m_ringList, this);
@@ -119,6 +124,13 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     databaseViewDock->hide();
     addDockWidget(Qt::LeftDockWidgetArea, filetreeDock);
 
+    Histogram *histogram = new Histogram(this);
+    QDockWidget *histogramDock = new QDockWidget(tr("Histogram"), this);
+    histogramDock->setWidget(histogram);
+    histogramDock->setObjectName("histogramDock");
+    histogramDock->hide();
+    addDockWidget(Qt::LeftDockWidgetArea, histogramDock);
+
     setWindowTitle(tr("Tenmon"));
 
     connect(m_ringList, SIGNAL(pixmapLoaded(Image*)), this, SLOT(pixmapLoaded(Image*)));
@@ -127,19 +139,26 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     connect(m_ringList, SIGNAL(currentImageChanged(int)), m_filesystem, SLOT(selectFile(int)));
     connect(m_ringList, &ImageRingList::thumbnailLoaded, m_imageGL->imageWidget(), &ImageWidget::thumbnailLoaded);
     connect(m_ringList, &ImageRingList::pixmapLoaded, m_stretchPanel, &StretchToolbar::imageLoaded);
+    connect(m_ringList, &ImageRingList::pixmapLoaded, histogram, &Histogram::imageLoaded);
     connect(m_imageGL->imageWidget(), &ImageWidget::fileDropped, this, static_cast<void (MainWindow::*)(const QString &)>(&MainWindow::loadFile));
 
     QMenu *fileMenu = new QMenu(tr("File"), this);
-    fileMenu->addAction(tr("Open"), this, SLOT(loadFile()), QKeySequence::Open);
-    fileMenu->addAction(tr("Save as"), this, SLOT(saveAs()), QKeySequence::Save);
+    fileMenu->addAction(tr("Open"), QKeySequence::Open, this, SLOT(loadFile()));
+    fileMenu->addAction(tr("Open directory recursively"), this, &MainWindow::loadDir);
+    fileMenu->addAction(tr("Save as"), QKeySequence::Save, this, SLOT(saveAs()));
     fileMenu->addSeparator();
-    fileMenu->addAction(tr("Copy marked files"), this, SLOT(copyMarked()), Qt::Key_F5);
-    fileMenu->addAction(tr("Move marked files"), this, SLOT(moveMarked()), Qt::Key_F6);
-    fileMenu->addAction(tr("Move marked files to trash"), this, &MainWindow::deleteMarked, QKeySequence::Delete);
+    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);
     fileMenu->addSeparator();
     fileMenu->addAction(tr("Index directory"), this, SLOT(indexDir()));
     fileMenu->addAction(tr("Reindex files"), this, SLOT(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->exec();
+        delete batchProcessing;
+    });
     fileMenu->addSeparator();
     QAction *liveModeAction = fileMenu->addAction(tr("Live mode"), this, SLOT(liveMode(bool)));
     liveModeAction->setCheckable(true);
@@ -152,30 +171,52 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     menuBar()->addMenu(editMenu);
 
     QMenu *viewMenu = new QMenu(tr("View"), this);
-    viewMenu->addAction(tr("Zoom In"), m_imageGL, SLOT(zoomIn()), QKeySequence::ZoomIn);
-    viewMenu->addAction(tr("Zoom Out"), m_imageGL, SLOT(zoomOut()), QKeySequence::ZoomOut);
-    viewMenu->addAction(tr("Best Fit"), m_imageGL, SLOT(bestFit()), QKeySequence("Ctrl+1"));
+    viewMenu->addAction(tr("Zoom In"), QKeySequence::ZoomIn, m_imageGL, SLOT(zoomIn()));
+    viewMenu->addAction(tr("Zoom Out"), QKeySequence::ZoomOut, m_imageGL, SLOT(zoomOut()));
+    viewMenu->addAction(tr("Best Fit"), QKeySequence("Ctrl+1"), m_imageGL, SLOT(bestFit()));
     viewMenu->addAction(tr("100%"), m_imageGL, SLOT(oneToOne()));
-    QAction *thumbnailsAction = viewMenu->addAction(tr("Thumbnails"), [this](bool checked){
+    viewMenu->addSeparator();
+    QMenu *bayerMenu = viewMenu->addMenu(tr("Bayer mask"));
+    QActionGroup *bayerActionGroup = new QActionGroup(this);
+    QAction *rggbAction = bayerActionGroup->addAction(tr("RGGB"));//0 0
+    QAction *grbgAction = bayerActionGroup->addAction(tr("GRBG"));//1 0
+    QAction *gbrgAction = bayerActionGroup->addAction(tr("GBRG"));//0 1
+    QAction *bggrAction = bayerActionGroup->addAction(tr("BGGR"));//1 1
+    rggbAction->setCheckable(true); rggbAction->setData(0); rggbAction->setIcon(QIcon(":/bayer.png"));
+    grbgAction->setCheckable(true); grbgAction->setData(1); grbgAction->setIcon(QIcon(":/grbg.png"));
+    gbrgAction->setCheckable(true); gbrgAction->setData(2); gbrgAction->setIcon(QIcon(":/gbrg.png"));
+    bggrAction->setCheckable(true); bggrAction->setData(3); bggrAction->setIcon(QIcon(":/bggr.png"));
+    bayerMenu->addActions({rggbAction, grbgAction, gbrgAction, bggrAction});
+    viewMenu->addMenu(bayerMenu);
+    connect(bayerActionGroup, &QActionGroup::triggered, [this](QAction *action){
+        int data = action->data().toInt();
+        m_imageGL->imageWidget()->setBayerMask(data);
+        QSettings settings;
+        settings.setValue("mainwindow/bayermask", data);
+    });
+
+    QAction *thumbnailsAction = viewMenu->addAction(tr("Thumbnails"), Qt::Key_F2, [this](bool checked){
         if(SettingsDialog::loadThumbsizes())m_ringList->clearThumbnails();
         m_imageGL->imageWidget()->allocateThumbnails(m_ringList->imageNames());
         m_imageGL->imageWidget()->showThumbnail(checked);
         if(checked)m_ringList->loadThumbnails();
         else m_ringList->stopLoading();
-    }, Qt::Key_F2);
+    });
     thumbnailsAction->setCheckable(true);
+    QAction *slideshowAction = viewMenu->addAction(tr("Slideshow"), Qt::Key_F3, m_ringList, &ImageRingList::toggleSlideshow);
+    slideshowAction->setCheckable(true);
     menuBar()->addMenu(viewMenu);
 
     QMenu *selectMenu = new QMenu(tr("Select"), this);
-    selectMenu->addAction(tr("Mark"), this, SLOT(markImage()), Qt::Key_F7);
-    selectMenu->addAction(tr("Unmark"), this, SLOT(unmarkImage()), Qt::Key_F8);
+    selectMenu->addAction(tr("Mark"), Qt::Key_F7, this, SLOT(markImage()));
+    selectMenu->addAction(tr("Unmark"), Qt::Key_F8, this, SLOT(unmarkImage()));
     selectMenu->addSeparator();
-    selectMenu->addAction(tr("Mark and next"), this, SLOT(markAndNext()), Qt::Key_M);
-    selectMenu->addAction(tr("Unmark and next"), this, SLOT(unmarkAndNext()), Qt::Key_X);
+    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("Show marked"), this, &MainWindow::showMarkFilesDialog);
     menuBar()->addMenu(selectMenu);
 
-    QMenu *analyzeMenu = new QMenu(tr("Analyze"), this);
+    /*QMenu *analyzeMenu = new QMenu(tr("Analyze"), this);
     QActionGroup *analyzeGroup = new QActionGroup(this);
     connect(analyzeGroup, &QActionGroup::triggered, [](QAction* action) {
         static QAction* lastAction = nullptr;
@@ -198,7 +239,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     connect(peakAction, SIGNAL(toggled(bool)), this, SLOT(peakFinder(bool)));
     connect(starAction, SIGNAL(toggled(bool)), this, SLOT(starFinder(bool)));
     analyzeMenu->addActions({statsAction, peakAction, starAction});
-    menuBar()->addMenu(analyzeMenu);
+    menuBar()->addMenu(analyzeMenu);*/
 
     QMenu *dockMenu = new QMenu(tr("Docks"), this);
     dockMenu->addAction(infoDock->toggleViewAction());
@@ -206,10 +247,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     dockMenu->addAction(filesystemDock->toggleViewAction());
     dockMenu->addAction(databaseViewDock->toggleViewAction());
     dockMenu->addAction(filetreeDock->toggleViewAction());
+    dockMenu->addAction(histogramDock->toggleViewAction());
     menuBar()->addMenu(dockMenu);
 
     QMenu *helpMenu = menuBar()->addMenu(tr("Help"));
-    helpMenu->addAction(tr("Help"), [this]{ HelpDialog help(this); help.exec(); }, QKeySequence::HelpContents);
+    helpMenu->addAction(tr("Help"), QKeySequence::HelpContents, [this]{ HelpDialog help(this); help.exec(); });
     helpMenu->addAction(tr("About Tenmon"), [this]{ About about(this); about.exec(); });
     helpMenu->addAction(tr("About Qt"), [this](){ QMessageBox::aboutQt(this); });
 
@@ -217,6 +259,19 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     QSettings settings;
     restoreGeometry(settings.value("mainwindow/geometry").toByteArray());
     restoreState(settings.value("mainwindow/state").toByteArray());
+    int bayermask = settings.value("mainwindow/bayermask", 0).toInt();
+    switch(bayermask)
+    {
+    default:
+    case 0:
+        rggbAction->setChecked(true); break;
+    case 1:
+        grbgAction->setChecked(true); break;
+    case 2:
+        gbrgAction->setChecked(true); break;
+    case 3:
+        bggrAction->setChecked(true); break;
+    }
 
     QStringList standardLocations = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation);
     if(standardLocations.size())
@@ -433,6 +488,20 @@ void MainWindow::loadFile(int row)
     m_ringList->loadFile(row);
 }
 
+void MainWindow::loadDir()
+{
+    QString dir = QFileDialog::getExistingDirectory(this,
+                                                tr("Open directory recursively"),
+                                                _lastDir);
+    if(!dir.isEmpty())
+    {
+        _lastDir = dir;
+        m_ringList->setDir(dir, QString(), true);
+        QSettings settings;
+        settings.setValue("mainwindow/lastdir", _lastDir);
+    }
+}
+
 void MainWindow::indexDir()
 {
     QString dir = QFileDialog::getExistingDirectory(this, tr("Index directory"), _lastDir, QFileDialog::ShowDirsOnly);
@@ -467,21 +536,21 @@ void MainWindow::saveAs()
     auto filterToFormat = [](const QString &file, const QString &filter) -> const char*
     {
         QString suffix = QFileInfo(file).suffix();
-        if(!suffix.compare("jpg", Qt::CaseInsensitive) || !suffix.compare("jpeg", Qt::CaseInsensitive))return "JPEG";
-        if(!suffix.compare("png", Qt::CaseInsensitive))return "PNG";
-        if(!suffix.compare("fits", Qt::CaseInsensitive) || !suffix.compare("fit", Qt::CaseInsensitive))return "FITS";
-        if(!suffix.compare("xisf", Qt::CaseInsensitive))return "XISF";
-        if(filter.contains("png"))return "PNG";
-        if(filter.contains("fits"))return "FITS";
-        if(filter.contains("xisf"))return "XISF";
-        return "JPEG";
+        if(!suffix.compare("jpg", Qt::CaseInsensitive) || !suffix.compare("jpeg", Qt::CaseInsensitive))return "jpeg";
+        if(!suffix.compare("png", Qt::CaseInsensitive))return "png";
+        if(!suffix.compare("fits", Qt::CaseInsensitive) || !suffix.compare("fit", Qt::CaseInsensitive))return "fits";
+        if(!suffix.compare("xisf", Qt::CaseInsensitive))return "xisf";
+        if(filter.contains("png"))return "png";
+        if(filter.contains("fits"))return "fits";
+        if(filter.contains("xisf"))return "xisf";
+        return "jpeg";
     };
 
     if(!file.isEmpty())
     {
         QString format = filterToFormat(file, selectedFilter);
 
-        if(format == "FITS" || format == "XISF")
+        if(format == "fits" || format == "xisf")
         {
             convert(file, format);
         }

mainwindow.h

@@ -48,6 +48,7 @@ protected slots:
     void loadFile();
     void loadFile(const QString &path);
     void loadFile(int row);
+    void loadDir();
     void indexDir();
     void indexDir(const QString &dir);
     void reindex();

rawimage.h

@@ -3,16 +3,16 @@
 
 #include <vector>
 #include <algorithm>
+#include <memory>
 #include <stdint.h>
 #include <math.h>
 #include <memory.h>
-#include <opencv2/imgproc.hpp>
 #include <QImage>
-#include <QVector3D>
 
 extern int THUMB_SIZE;
 extern int THUMB_SIZE_BORDER;
 extern int THUMB_SIZE_BORDER_Y;
+extern bool QUALITY_RESIZE;
 
 class Peak
 {
@@ -38,55 +38,82 @@ public:
 
 class RawImage
 {
-protected:
-    cv::Mat m_img;
-    bool m_stats;
-    double m_mean;
-    double m_stdDev;
-    double m_median;
-    double m_min;
-    double m_max;
-    double m_mad;
-    float m_thumbAspect;
-    uint32_t m_saturated;
+    using PixelType = uint8_t;
 public:
-    enum ImgType
+    enum DataType
     {
         UINT8,
         UINT16,
+        UINT32,
         FLOAT32,
-        UINT8C3,
-        UINT8C4,
-        UINT16C3,
-        UINT16C4,
-        FLOAT32C3,
-        UNKNOWN,
+        FLOAT64,
     };
+    struct Stats
+    {
+        bool m_stats = false;
+        double m_mean[4] = {0.0};
+        double m_stdDev[4] = {0.0};
+        double m_median[4] = {0.0};
+        double m_min[4] = {0.0};
+        double m_max[4] = {0.0};
+        double m_mad[4] = {0.0};
+        uint32_t m_saturated[4] = {0};
+        std::vector<uint32_t> m_histogram;
+    };
+protected:
+    std::unique_ptr<PixelType[]> m_pixels;
+    std::unique_ptr<PixelType[]> m_original;
+    uint32_t m_width = 0;
+    uint32_t m_height = 0;
+    uint32_t m_channels = 0;
+    uint32_t m_ch = 0;
+    DataType m_type = UINT8;
+    DataType m_origType = UINT8;
+    float m_thumbAspect = 0.0;
+    Stats m_stats;
+    bool m_planar = false;
+    void allocate(uint32_t w, uint32_t h, uint32_t ch, DataType type);
+public:
     RawImage();
-    RawImage(int w, int h, ImgType type);
-    RawImage(cv::Mat &img);
+    RawImage(uint32_t w, uint32_t h, uint32_t ch, DataType type);
     RawImage(const RawImage &d);
+    RawImage(RawImage &&d);
     RawImage(const QImage &img);
-    bool imageStats(double *mean, double *stdDev, double *median, double *min, double *max, double *mad, uint32_t *saturated);
+    const RawImage::Stats& imageStats() const;
     void calcStats();
     void rect(int &x, int &y, int w, int h, std::vector<double> &r) const;
     int findPeaks(double background, double distance, std::vector<Peak> &peaks) const;
-    RawImage* medianFilter() const;
-    void quarter();
     uint32_t width() const;
     uint32_t height() const;
+    uint32_t channels() const;
     uint32_t size() const;
-    ImgType type() const;
-    int dataType() const;
+    DataType type() const;
     uint32_t norm() const;
+    uint32_t widthBytes() const;
     void* data();
     const void* data() const;
+    void* data(uint32_t row, uint32_t col = 0);
+    const void* data(uint32_t row, uint32_t col = 0) const;
+    const void *origData() const;
+    const void *origData(uint32_t row, uint32_t col = 0) const;
+    bool planar() const;
+    void setPlanar();
     void convertToThumbnail();
+    void convertToGLFormat();
     float thumbAspect() const;
-    const cv::Mat& mat() const;
-    bool pixel(int x, int y, QVector3D &rgb) const;
-    void scaleToUnit();
-    void downscaleTo(uint32_t size);
+    bool pixel(int x, int y, double &r, double &g, double &b) const;
+    void resize(uint32_t w, uint32_t h);
+    std::pair<float, float> unitScale() const;
+    void flip();
+
+    static std::shared_ptr<RawImage> fromPlanar(const RawImage &img);
+    static std::shared_ptr<RawImage> fromPlanar(const void *pixels, uint32_t w, uint32_t h, uint32_t ch, DataType type);
+    static size_t typeSize(DataType type);
+    std::vector<RawImage> split() const;
+    bool valid() const;
 };
 
+//Q_DECLARE_SMART_POINTER_METATYPE(std::shared_ptr);
+//Q_DECLARE_METATYPE(std::shared_ptr<RawImage>);
+
 #endif // RAWIMAGE_H

rawimage_sse.cpp

@@ -0,0 +1,115 @@
+#include "rawimage.h"
+
+#ifdef __SSE2__
+#include <x86intrin.h>
+
+template<typename T, int ch>
+void fromPlanarSSE(const void *in, void *out, size_t count)
+{
+    const __m128i *_in[4] = {(const __m128i*) static_cast<const T*>(in),
+                             (const __m128i*)(static_cast<const T*>(in) + count),
+                             (const __m128i*)(static_cast<const T*>(in) + count*2),
+                             (const __m128i*)(static_cast<const T*>(in) + count*3)};
+    __m128i *_out = (__m128i*)out;
+    size_t s2 = count;
+    if constexpr(sizeof(T) == 1)
+    {
+        count /= 16;
+        __m128i a = _mm_set1_epi8(-1);
+        for(size_t i = 0; i < count; i++)
+        {
+            __m128i r = _mm_loadu_si128(_in[0] + i);
+            __m128i g = _mm_loadu_si128(_in[1] + i);
+            __m128i b = _mm_loadu_si128(_in[2] + i);
+            if constexpr(ch==4)a = _mm_loadu_si128(_in[3]);
+
+            __m128i d1 = _mm_unpacklo_epi8(r, b);
+            __m128i d2 = _mm_unpacklo_epi8(g, a);
+            _mm_storeu_si128(_out + i*4, _mm_unpacklo_epi8(d1, d2));
+            _mm_storeu_si128(_out + i*4 + 1, _mm_unpackhi_epi8(d1, d2));
+            d1 = _mm_unpackhi_epi8(r, b);
+            d2 = _mm_unpackhi_epi8(g, a);
+            _mm_storeu_si128(_out + i*4 + 2, _mm_unpacklo_epi8(d1, d2));
+            _mm_storeu_si128(_out + i*4 + 3, _mm_unpackhi_epi8(d1, d2));
+        }
+        count *= 16;
+    }
+    if constexpr(sizeof(T) == 2)
+    {
+        count /= 8;
+        __m128i a = _mm_set1_epi16(-1);
+        for(size_t i = 0; i < count; i++)
+        {
+            __m128i r = _mm_loadu_si128(_in[0] + i);
+            __m128i g = _mm_loadu_si128(_in[1] + i);
+            __m128i b = _mm_loadu_si128(_in[2] + i);
+            if constexpr(ch==4)a = _mm_loadu_si128(_in[3]);
+
+            __m128i d1 = _mm_unpacklo_epi16(r, b);
+            __m128i d2 = _mm_unpacklo_epi16(g, a);
+            _mm_storeu_si128(_out + i*4, _mm_unpacklo_epi16(d1, d2));
+            _mm_storeu_si128(_out + i*4 + 1, _mm_unpackhi_epi16(d1, d2));
+            d1 = _mm_unpackhi_epi16(r, b);
+            d2 = _mm_unpackhi_epi16(g, a);
+            _mm_storeu_si128(_out + i*4 + 2, _mm_unpacklo_epi16(d1, d2));
+            _mm_storeu_si128(_out + i*4 + 3, _mm_unpackhi_epi16(d1, d2));
+        }
+        count *= 8;
+    }
+    if constexpr(sizeof(T) == 4)
+    {
+        count /= 4;
+        __m128i a = _mm_set1_epi32(-1);
+        if constexpr(!std::numeric_limits<T>::is_integer)a = _mm_castps_si128(_mm_set1_ps(1.0));
+        for(size_t i = 0; i < count; i++)
+        {
+            __m128i r = _mm_loadu_si128(_in[0] + i);
+            __m128i g = _mm_loadu_si128(_in[1] + i);
+            __m128i b = _mm_loadu_si128(_in[2] + i);
+            if constexpr(ch==4)a = _mm_loadu_si128(_in[3]);
+
+            __m128i d1 = _mm_unpacklo_epi32(r, b);
+            __m128i d2 = _mm_unpacklo_epi32(g, a);
+            _mm_storeu_si128(_out + i*4, _mm_unpacklo_epi32(d1, d2));
+            _mm_storeu_si128(_out + i*4 + 1, _mm_unpackhi_epi32(d1, d2));
+            d1 = _mm_unpackhi_epi32(r, b);
+            d2 = _mm_unpackhi_epi32(g, a);
+            _mm_storeu_si128(_out + i*4 + 2, _mm_unpacklo_epi32(d1, d2));
+            _mm_storeu_si128(_out + i*4 + 3, _mm_unpackhi_epi32(d1, d2));
+        }
+        count *= 4;
+    }
+    for(size_t i = count; i < s2; i++)
+    {
+        switch(sizeof(T))
+        {
+        case 1:
+            for(uint32_t o=0; o<ch; o++)static_cast<uint8_t*>(out)[i + o] = static_cast<const uint8_t*>(in)[i + o + s2];
+            if(ch==3)static_cast<uint8_t*>(out)[i*4 + 3] = 0xff;
+            break;
+        case 2:
+            for(uint32_t o=0; o<ch; o++)static_cast<uint16_t*>(out)[i + o] = static_cast<const uint16_t*>(in)[i + o + s2];
+            if(ch==3)static_cast<uint16_t*>(out)[i*4 + 3] = 0xffff;
+            break;
+        case 4:
+            for(uint32_t o=0; o<ch; o++)static_cast<uint32_t*>(out)[i + o] = static_cast<const uint32_t*>(in)[i + o + s2];
+            if(ch==3)
+            {
+                if(!std::numeric_limits<T>::is_integer)static_cast<float*>(out)[i*4 + 3] = 1.0;
+                else static_cast<uint32_t*>(out)[i*4 + 3] = 0xffffffff;
+            }
+            break;
+        }
+    }
+}
+
+template void fromPlanarSSE<uint8_t, 3>(const void *in, void *out, size_t count);
+template void fromPlanarSSE<uint8_t, 4>(const void *in, void *out, size_t count);
+template void fromPlanarSSE<uint16_t, 3>(const void *in, void *out, size_t count);
+template void fromPlanarSSE<uint16_t, 4>(const void *in, void *out, size_t count);
+template void fromPlanarSSE<uint32_t, 3>(const void *in, void *out, size_t count);
+template void fromPlanarSSE<uint32_t, 4>(const void *in, void *out, size_t count);
+template void fromPlanarSSE<float, 3>(const void *in, void *out, size_t count);
+template void fromPlanarSSE<float, 4>(const void *in, void *out, size_t count);
+
+#endif

resources.qrc

@@ -1,30 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>invert.png</file>
-        <file>nuke.png</file>
-        <file>bayer.png</file>
-        <file>space.nouspiro.tenmon.png</file>
-        <file>nuke_a.png</file>
-        <file>about/tenmon</file>
-        <file>translations/tenmon_en.qm</file>
-        <file>translations/tenmon_sk.qm</file>
-        <file>about/filter.png</file>
-        <file>about/stretch-panel.png</file>
-        <file>translations/tenmon_fr.qm</file>
-        <file>shaders/image.frag</file>
-        <file>shaders/image.vert</file>
-        <file>shaders/thumb.frag</file>
-        <file>shaders/thumb.vert</file>
-        <file>shaders/debayer.frag</file>
-        <file>shaders/debayer.vert</file>
-    </qresource>
-    <qresource lang="en" prefix="/">
-        <file alias="help">about/help_en</file>
-    </qresource>
-    <qresource lang="sk" prefix="/">
-        <file alias="help">about/help_sk</file>
-    </qresource>
-    <qresource lang="fr" prefix="/">
-        <file alias="help">about/help_fr</file>
-    </qresource>
-</RCC>

resources/resources.qrc

@@ -0,0 +1,29 @@
+<RCC>
+    <qresource prefix="/">
+        <file>invert.png</file>
+        <file>nuke.png</file>
+        <file>bayer.png</file>
+        <file>space.nouspiro.tenmon.png</file>
+        <file>nuke_a.png</file>
+        <file>../about/tenmon</file>
+        <file>../translations/tenmon_en.qm</file>
+        <file>../translations/tenmon_sk.qm</file>
+        <file>../about/filter.png</file>
+        <file>../about/stretch-panel.png</file>
+        <file>../translations/tenmon_fr.qm</file>
+        <file>falsecolor.png</file>
+        <file>link.png</file>
+        <file>bggr.png</file>
+        <file>grbg.png</file>
+        <file>gbrg.png</file>
+    </qresource>
+    <qresource lang="en" prefix="/">
+        <file alias="help">../about/help_en</file>
+    </qresource>
+    <qresource lang="sk" prefix="/">
+        <file alias="help">../about/help_sk</file>
+    </qresource>
+    <qresource lang="fr" prefix="/">
+        <file alias="help">../about/help_fr</file>
+    </qresource>
+</RCC>

scriptengine.cpp

@@ -0,0 +1,628 @@
+#include "scriptengine.h"
+#include <QDir>
+#include <QFileInfo>
+#include <QDebug>
+#include <QInputDialog>
+#include "loadrunable.h"
+#include "rawimage.h"
+#include "loadrunable.h"
+#include "batchprocessing.h"
+#include <fitsio2.h>
+#include "libXISF/libxisf.h"
+
+namespace Script
+{
+
+ScriptEngine::ScriptEngine(BatchProcessing *parent)
+  : _jsEngine(new QJSEngine(this))
+  , _database(new Database(this))
+  , _parent(parent)
+  , _pool(new QThreadPool(this))
+{
+    QJSValue core = _jsEngine->newQObject(this);
+    _jsEngine->globalObject().setProperty("core", core);
+    QJSValue fitsRecordObject = _jsEngine->newQMetaObject(&FITSRecordModify::staticMetaObject);
+    _jsEngine->globalObject().setProperty("FITSRecordModify", fitsRecordObject);
+    _database->init(QLatin1String("scriptengine"));
+    _semaphore.release(_pool->maxThreadCount());
+}
+
+void ScriptEngine::setParams(const QString &scriptPath, const QList<QPair<QString, QString>> &paths, const QString &outputDir)
+{
+    _scriptPath = scriptPath;
+    _paths = paths;
+    _outputDir = outputDir + "/";
+}
+
+void ScriptEngine::reportError(const QString &message)
+{
+    _jsEngine->throwError(message);
+}
+
+const QString &ScriptEngine::outputDir() const
+{
+    return _outputDir;
+}
+
+void ScriptEngine::interrupt()
+{
+    _jsEngine->setInterrupted(true);
+}
+
+void ScriptEngine::logError(const QString &message)
+{
+    emit newMessage(message, true);
+}
+
+void ScriptEngine::log(const QString &message)
+{
+    emit newMessage(message, false);
+}
+
+void ScriptEngine::mark(File *file)
+{
+    _database->mark(file->absoluteFilePath());
+}
+
+void ScriptEngine::unmark(File *file)
+{
+    _database->unmark(file->absoluteFilePath());
+}
+
+bool ScriptEngine::isMarked(const File *file) const
+{
+    return _database->isMarked(file->absoluteFilePath());
+}
+
+void ScriptEngine::setMaxThread(int maxthread)
+{
+    int newval = std::max(std::min(QThread::idealThreadCount(), maxthread), 1);
+    int oldval = _pool->maxThreadCount();
+    if(newval > oldval)
+        _semaphore.release(newval - oldval);
+    else if(newval < oldval)
+        _semaphore.acquire(oldval - newval);
+    _pool->setMaxThreadCount(newval);
+}
+
+void ScriptEngine::sync()
+{
+    _pool->waitForDone();
+}
+
+QJSValue ScriptEngine::getString(const QString &label, const QString &text) const
+{
+    QJSValue ret;
+    QMetaObject::invokeMethod(_parent, "getString", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QJSValue, ret), Q_ARG(QString, label), Q_ARG(QString, text));
+    return ret;
+}
+
+QJSValue ScriptEngine::getInt(const QString &label, int value)
+{
+    QJSValue ret;
+    QMetaObject::invokeMethod(_parent, "getInt", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QJSValue, ret), Q_ARG(QString, label), Q_ARG(int, value));
+    return ret;
+}
+
+QJSValue ScriptEngine::getFloat(const QString &label, double value, int decimals) const
+{
+    QJSValue ret;
+    QMetaObject::invokeMethod(_parent, "getFloat", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QJSValue, ret), Q_ARG(QString, label), Q_ARG(double, value), Q_ARG(int, decimals));
+    return ret;
+}
+
+QJSValue ScriptEngine::getItem(const QStringList &items, const QString &label, int current) const
+{
+    QJSValue ret;
+    QMetaObject::invokeMethod(_parent, "getItem", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QJSValue, ret), Q_ARG(QStringList, items), Q_ARG(QString, label), Q_ARG(int, current));
+    return ret;
+}
+
+bool ScriptEngine::convert(File *file, QString &outpath, const QString &format, const QVariantMap &params, bool async)
+{
+    QString path;
+    QDir dir(_outputDir);
+    QFileInfo info(outpath);
+    QString suffix = info.suffix();
+    if(info.isAbsolute())
+        path = info.absolutePath();
+    else
+        path = dir.absoluteFilePath(outpath);
+
+    QString f = format.toLower();
+    if(f != "xisf" && f != "fits" && f != "png" && f != "bmp" && f != "jpg")
+    {
+        logError("Output format must be one of xisf fits jpg png bmp");
+        return false;
+    }
+
+    info.setFile(path);
+    outpath = info.absolutePath() + "/" + info.completeBaseName() + "." + f;
+    if(async)
+    {
+        _semaphore.acquire();
+        _pool->start(new ConvertRunable(file->absoluteFilePath(), outpath, f, params, &_semaphore));
+    }
+    else
+    {
+        ConvertRunable crun(file->absoluteFilePath(), outpath, f, params, nullptr);
+        crun.run();
+    }
+    return true;
+}
+
+QJSValue ScriptEngine::newObject()
+{
+    return _jsEngine->newObject();
+}
+
+QJSValue ScriptEngine::newArray(uint size)
+{
+    return _jsEngine->newArray(size);
+}
+
+void ScriptEngine::run()
+{
+    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);
+
+    QFile scriptFile(_scriptPath);
+    if(!scriptFile.open(QIODevice::ReadOnly))
+    {
+        emit newMessage("Failed to open " + _scriptPath, true);
+        emit finished();
+        return;
+    }
+
+    QTextStream stream(&scriptFile);
+    QString contents = stream.readAll();
+    scriptFile.close();
+    QJSValue result = _jsEngine->evaluate(contents, _scriptPath);
+    qDebug() << result.isError() << result.toString();
+    _pool->waitForDone();
+    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);
+    }
+
+    emit finished();
+}
+
+void File::loadFitsKeywords()
+{
+    if(!_fitsKeywordsLoaded)
+    {
+        _fitsKeywordsLoaded = true;
+        ImageInfoData info;
+        if(suffix().toLower() == "xisf")
+        {
+            readXISFHeader(_path, info);
+        }
+        else if(suffix().toLower() == "fits" || suffix().toLower() == "fit")
+        {
+            readFITSHeader(_path, info);
+        }
+        else return;
+
+        for(auto &record : info.fitsHeader)
+        {
+            _fitsKeywords.append(record.key);
+            _fitsRecords.insert(record.key, record);
+        }
+    }
+}
+
+bool File::mkpath(const QString &path) const
+{
+    QFileInfo info(path);
+    if(!info.isRelative())
+    {
+        _engine->logError("Destination path is not relative");
+        return false;
+    }
+    QDir dir(_engine->outputDir());
+    if(dir.mkpath(info.path()))
+    {
+        return true;
+    }
+    else
+    {
+        _engine->logError("Failed to create dir " + info.path());
+        return false;
+    }
+}
+
+File::File(const QString &path, Script::ScriptEngine *engine) : File(path, QString(), engine)
+{
+}
+
+File::File(const QString &path, const QString &root, ScriptEngine *engine) :
+    _engine(engine),
+    _path(path),
+    _root(root),
+    _info(path)
+{
+}
+
+QString File::fileName() const
+{
+    return _info.fileName();
+}
+
+QString File::absoluteFilePath() const
+{
+    return _info.absoluteFilePath();
+}
+
+QString File::absolutePath() const
+{
+    return _info.absolutePath();
+}
+
+QString File::relativeFilePath() const
+{
+    QDir dir(_root);
+    return dir.relativeFilePath(_info.absoluteFilePath());
+}
+
+QString File::relativePath() const
+{
+    QDir dir(_root);
+    return dir.relativeFilePath(_info.absolutePath());
+}
+
+QString File::baseName() const
+{
+    return _info.baseName();
+}
+
+QString File::completeBaseName() const
+{
+    return _info.completeBaseName();
+}
+
+QString File::suffix() const
+{
+    return _info.suffix();
+}
+
+qint64 File::size() const
+{
+    return _info.size();
+}
+
+QStringList File::fitsKeywords()
+{
+    loadFitsKeywords();
+    return _fitsKeywords;
+}
+
+QString File::fitsValue(const QString &key)
+{
+    loadFitsKeywords();
+    if(_fitsRecords.contains(key))
+        return _fitsRecords[key].value.toString();
+    else
+        return QString();
+}
+
+QJSValue File::fitsValues(const QString &key)
+{
+    loadFitsKeywords();
+    if(_fitsRecords.contains(key))
+    {
+        QList<FITSRecord> values =  _fitsRecords.values(key);
+        QJSValue array = _engine->newArray(values.size());
+        for(qsizetype i=0; i<values.size(); i++)
+            array.setProperty(i, values[i].value.toString());
+        return array;
+    }
+    else
+        return QString();
+}
+
+QJSValue File::fitsRecords()
+{
+    loadFitsKeywords();
+
+    QJSValue array = _engine->newArray(_fitsRecords.size());
+    uint i = 0;
+    for(auto &record : _fitsRecords)
+    {
+        QJSValue item = _engine->newObject();
+        item.setProperty("key", QString::fromUtf8(record.key));
+        item.setProperty("value", record.value.toString());
+        item.setProperty("comment", QString::fromUtf8(record.comment));
+        item.setProperty("xisf", record.xisf);
+        array.setProperty(i++, item);
+    }
+
+    return array;
+}
+
+bool File::modifyFITSRecords(const FITSRecordModify *modify)
+{
+    _fitsKeywordsLoaded = false;
+    _fitsKeywords.clear();
+
+    if(QRegularExpression("fits?", QRegularExpression::CaseInsensitiveOption).match(suffix()).hasMatch())
+    {
+        fitsfile *file;
+        int status = 0;
+        fits_open_diskfile(&file, _path.toLocal8Bit().data(), READWRITE, &status);
+        int num = 0;
+        fits_get_num_hdus(file, &num, &status);
+        if(status)
+        {
+            _engine->newMessage("Failed to open FITS file", true);
+            return false;
+        }
+        int imgtype;
+        int naxis;
+        long naxes[3] = {0};
+        int type = -1;
+        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;
+        }
+
+        for(auto &remove : modify->_remove)
+        {
+            int status = 0;//we ignore errors from here
+            fits_delete_key(file, remove.toLatin1().data(), &status);
+        }
+        for(auto &record : modify->_update)
+        {
+            switch(record.value.typeId())
+            {
+            case QMetaType::Bool:
+            {
+                int val = record.value.toBool();
+                fits_update_key(file, TLOGICAL, record.key.data(), &val, record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
+                break;
+            }
+            case QMetaType::Int:
+            case QMetaType::UInt:
+            {
+                long long val = record.value.toLongLong();
+                fits_update_key(file, TLONGLONG, record.key.data(), &val, record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
+                break;
+            }
+            case QMetaType::QString:
+            {
+                QByteArray val = record.value.toString().toLatin1();
+                fits_update_key(file, TSTRING, record.key.data(), val.isEmpty() ? nullptr : val.data(), record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
+                break;
+            }
+            case QMetaType::Float:
+            case QMetaType::Double:
+            {
+                double val = record.value.toDouble();
+                fits_update_key(file, TDOUBLE, record.key.data(), &val, record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
+                break;
+            }
+            default:
+                _engine->newMessage("Unknown type for KEY " + record.key, true);
+                return false;
+                break;
+            }
+            if(status)
+            {
+                char error[100];
+                fits_get_errstatus(status, error);
+                _engine->newMessage(QString("Error when updating KEY %1 %2").arg(record.key).arg(error), true);
+                return false;
+            }
+        }
+
+        for(auto &record : modify->_add)
+        {
+            switch(record.value.typeId())
+            {
+            case QMetaType::Bool:
+            {
+                int val = record.value.toBool();
+                fits_write_key(file, TLOGICAL, record.key.data(), &val, record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
+                break;
+            }
+            case QMetaType::Int:
+            case QMetaType::UInt:
+            {
+                long long val = record.value.toLongLong();
+                fits_write_key(file, TLONGLONG, record.key.data(), &val, record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
+                break;
+            }
+            case QMetaType::QString:
+            {
+                QByteArray val = record.value.toString().toLatin1();
+                fits_write_key(file, TSTRING, record.key.data(), val.isEmpty() ? nullptr : val.data(), record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
+                break;
+            }
+            case QMetaType::Float:
+            case QMetaType::Double:
+            {
+                double val = record.value.toDouble();
+                fits_write_key(file, TDOUBLE, record.key.data(), &val, record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
+                break;
+            }
+            default:
+                _engine->newMessage("Unknown type for KEY " + record.key, true);
+                return false;
+                break;
+            }
+            if(status)
+            {
+                char error[100];
+                fits_get_errstatus(status, error);
+                _engine->newMessage(QString("Error when adding KEY {} {}").arg(record.key).arg(error), true);
+                return false;
+            }
+        }
+        fits_close_file(file, &status);
+
+        return status == 0;
+    }
+    else if(suffix() == "xisf")
+    {
+        try
+        {
+            LibXISF::XISFModify modifyXISF;
+            modifyXISF.open(_path.toLocal8Bit().data());
+            QFileInfo in(_path);
+            QFileInfo out(_path + "~");
+
+            for(auto &remove : modify->_remove)
+                modifyXISF.removeFITSKeyword(0, remove.toStdString());
+
+            for(auto &record : modify->_update)
+                modifyXISF.updateFITSKeyword(0, {record.key.toStdString(), record.value.toString().toStdString(), record.value.toString().toStdString()}, true);
+
+            for(auto &record : modify->_add)
+                modifyXISF.addFITSKeyword(0, {record.key.toStdString(), record.value.toString().toStdString(), record.value.toString().toStdString()});
+
+            modifyXISF.save(out.absoluteFilePath().toLocal8Bit().toStdString());
+            modifyXISF.close();
+            std::filesystem::rename(out.filesystemAbsoluteFilePath(), in.filesystemAbsoluteFilePath());
+        }
+        catch(LibXISF::Error &err)
+        {
+            _engine->newMessage("Failed to modify file " + _path + " " + err.what(), true);
+            return false;
+        }
+    }
+
+    return false;
+}
+
+bool File::isMarked() const
+{
+    return _engine->isMarked(this);
+}
+
+File* File::copy(const QString &newpath) const
+{
+    if(mkpath(newpath))
+    {
+        if(QFile::copy(_path, _engine->outputDir() + newpath))
+            return new File(_engine->outputDir() + newpath, _engine);
+        _engine->logError("Failed copy to " + newpath);
+        return nullptr;
+    }
+    return nullptr;
+}
+
+bool File::move(const QString &newpath)
+{
+    if(mkpath(newpath))
+    {
+        if(QFile::rename(_path, _engine->outputDir() + newpath))
+        {
+            _path = _engine->outputDir() + newpath;
+            return true;
+        }
+        _engine->logError("Failed move to " + newpath);
+        return false;
+    }
+    return false;
+}
+
+File* File::convert(const QString &outpath, const QString &format, const QVariantMap &params)
+{
+    QString path = outpath;
+    if(_engine->convert(this, path, format, params, false))
+        return new File(path, _engine);
+    else
+        return nullptr;
+}
+
+File* File::convertAsync(const QString &outpath, const QString &format, const QVariantMap &params)
+{
+    QString path = outpath;
+    if(_engine->convert(this, path, format, params, true))
+        return new File(path, _engine);
+    else
+        return nullptr;
+}
+
+QJSValue File::stats()
+{
+    if(_stats.isUndefined())
+    {
+        ImageInfoData info;
+        std::shared_ptr<RawImage> rawImage;
+        loadImage(_path, info, rawImage);
+        rawImage->calcStats();
+        RawImage::Stats stats = rawImage->imageStats();
+        _stats = _engine->newObject();
+        _stats.setProperty("mean", stats.m_mean[0]);
+        _stats.setProperty("stddev", stats.m_stdDev[0]);
+        _stats.setProperty("median", stats.m_median[0]);
+        _stats.setProperty("min", stats.m_min[0]);
+        _stats.setProperty("max", stats.m_max[0]);
+        _stats.setProperty("mad", stats.m_mean[0]);
+    }
+    return _stats;
+}
+
+ScriptEngineThread::ScriptEngineThread(BatchProcessing *parent) : QObject(parent)
+{
+    _thread = new QThread();
+    _thread->setObjectName("ScriptEngine");
+    _engine = new ScriptEngine(parent);
+    _engine->moveToThread(_thread);
+    connect(_engine, &ScriptEngine::finished, _thread, &QThread::quit);
+    connect(_engine, &ScriptEngine::newMessage, this, &ScriptEngineThread::newMessage);
+    connect(_thread, &QThread::started, _engine, &ScriptEngine::run);
+    connect(_thread, &QThread::finished, _engine, &ScriptEngine::deleteLater);
+    connect(_engine, &ScriptEngine::destroyed, [this](){ _engine = nullptr; });
+    connect(_thread, &QThread::finished, _thread, &QThread::deleteLater);
+    connect(_thread, &QThread::finished, this, &ScriptEngineThread::finished);
+}
+
+ScriptEngineThread::~ScriptEngineThread()
+{
+    if(_engine)_engine->interrupt();
+}
+
+void ScriptEngineThread::setParams(const QString &scriptPath, const QList<QPair<QString, QString>> &paths, const QString &outputDir)
+{
+    _engine->setParams(scriptPath, paths, outputDir);
+}
+
+void ScriptEngineThread::start()
+{
+    _thread->start();
+}
+
+void ScriptEngineThread::interrupt()
+{
+    if(_engine)_engine->interrupt();
+}
+
+void FITSRecordModify::removeKeyword(const QString &key)
+{
+    if(!_remove.contains(key))
+        _remove.append(key);
+}
+
+void FITSRecordModify::updateKeyword(const QString &key, const QVariant &value, const QString &comment)
+{
+    _update.append({key.toLatin1(), value, comment.toLatin1()});
+}
+
+void FITSRecordModify::addKeyword(const QString &key, const QVariant &value, const QString &comment)
+{
+    _update.append({key.toLatin1(), value, comment.toLatin1()});
+}
+
+}

scriptengine.h

@@ -0,0 +1,131 @@
+#ifndef SCRIPTENGINE_H
+#define SCRIPTENGINE_H
+
+#include <QObject>
+#include <QJSEngine>
+#include <QFileInfo>
+#include <QThread>
+#include <QThreadPool>
+#include <QSemaphore>
+#include "database.h"
+#include "imageinfo.h"
+
+class BatchProcessing;
+
+namespace Script
+{
+
+class File;
+
+class ScriptEngine : public QObject
+{
+    Q_OBJECT
+    QJSEngine *_jsEngine;
+    Database *_database;
+    BatchProcessing *_parent;
+    QThreadPool *_pool;
+    QSemaphore _semaphore;
+    QString _scriptPath;
+    QString _outputDir;
+    QList<QPair<QString, QString>> _paths;
+public:
+    explicit ScriptEngine(BatchProcessing *parent = nullptr);
+    void setParams(const QString &scriptPath, const QList<QPair<QString, QString>> &paths, const QString &outputDir);
+    void reportError(const QString &message);
+    const QString& outputDir() const;
+    void interrupt();
+    void logError(const QString &message);
+    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 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;
+    bool convert(File *file, QString &outpath, const QString &format, const QVariantMap &params, bool async);
+    QJSValue newObject();
+    QJSValue newArray(uint size);
+public slots:
+    void run();
+signals:
+    void newMessage(const QString &message, bool error);
+    void finished();
+};
+
+class ScriptEngineThread : public QObject
+{
+    Q_OBJECT
+    QThread *_thread;
+    ScriptEngine *_engine;
+public:
+    ScriptEngineThread(BatchProcessing *parent = nullptr);
+    ~ScriptEngineThread();
+    void setParams(const QString &scriptPath, const QList<QPair<QString, QString>> &paths, const QString &outputDir);
+    void start();
+    void interrupt();
+signals:
+    void newMessage(const QString &message, bool error);
+    void finished();
+};
+
+class FITSRecordModify;
+
+class File : public QObject
+{
+    Q_OBJECT
+    ScriptEngine *_engine;
+    QString _path;
+    QString _root;
+    QFileInfo _info;
+    bool _fitsKeywordsLoaded = false;
+    QStringList _fitsKeywords;
+    QMultiHash<QString, FITSRecord> _fitsRecords;
+    void loadFitsKeywords();
+    bool mkpath(const QString &path) const;
+    QJSValue _stats;
+public:
+    explicit File(const QString &path, ScriptEngine *engine);
+    explicit File(const QString &path, const QString &root, ScriptEngine *engine);
+    Q_INVOKABLE QString fileName() const;
+    Q_INVOKABLE QString absoluteFilePath() const;
+    Q_INVOKABLE QString absolutePath() const;
+    Q_INVOKABLE QString relativeFilePath() const;
+    Q_INVOKABLE QString relativePath() const;
+    Q_INVOKABLE QString baseName() const;
+    Q_INVOKABLE QString completeBaseName() const;
+    Q_INVOKABLE QString suffix() const;
+    Q_INVOKABLE qint64 size() const;
+    Q_INVOKABLE QStringList fitsKeywords();
+    Q_INVOKABLE QString fitsValue(const QString &key);
+    Q_INVOKABLE QJSValue fitsValues(const QString &key);
+    Q_INVOKABLE QJSValue fitsRecords();
+    Q_INVOKABLE bool modifyFITSRecords(const FITSRecordModify *modify);
+    Q_INVOKABLE bool isMarked() const;
+    Q_INVOKABLE File* copy(const QString &newpath) const;
+    Q_INVOKABLE bool move(const QString &newpath);
+    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();
+};
+
+class FITSRecordModify : public QObject
+{
+    Q_OBJECT
+    QStringList _remove;
+    QVector<FITSRecord> _update;
+    QVector<FITSRecord> _add;
+
+    friend class File;
+public:
+    Q_INVOKABLE FITSRecordModify(){};
+    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());
+};
+
+}
+
+#endif // SCRIPTENGINE_H

scripts/convert to XISF

@@ -0,0 +1,18 @@
+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)
+{
+    if(file.suffix() == "fits" || file.suffix() == "fit")
+    {
+        core.log("Converting " + file.fileName());
+        file.convertAsync(file.relativeFilePath(), "XISF", compression);
+    }
+}

scripts/example script

@@ -0,0 +1,36 @@
+// how to get input from user
+let d = core.getFloat("Getting float value");
+let i = core.getInt("Getting integer value");
+let s = core.getString("Getting string value");
+
+// print user input
+core.log("Your input " + d + " " + i + " " + s);
+
+for(file of files)
+{
+  if(file.suffix() == "fits" || file.suffix() == "fit" || file.suffix() == "xisf")
+  {
+    let keywords = file.fitsKeywords();
+    let item = core.getItem(keywords, "Select keyword");
+    core.log("You selected keyword " + item);    core.log(file.fitsKeywords());
+
+    core.log("fileName() " + file.fileName());
+    core.log("absoluteFilePath() " + file.absoluteFilePath());
+    core.log("absolutePath() " + file.absolutePath());
+    core.log("relativeFilePath() " + file.relativeFilePath());
+    core.log("relativePath() " + file.relativePath());
+    core.log("baseName() " + file.baseName());
+    core.log("completeBase() " + file.completeBaseName());
+    core.log("suffix() " + file.suffix());
+    core.log("size() " + file.size());
+    let stats = file.stats();
+    core.log("Image statistics");
+    core.log("\tMinimum: " + stats.min);
+    core.log("\tMaximum: " + stats.max);
+    core.log("\tMedian:" + stats.median);
+    core.log("\tStandard deviation:" + stats.stddev);
+    core.log("\tMedian Absolute Deviation:" + stats.mad);
+
+    break;
+  }
+}

scripts/median

@@ -0,0 +1,8 @@
+for(file of files)
+{
+    if(file.suffix() == "fits" || file.suffix() == "fit" || file.suffix() == "xisf")
+    {
+        let stats = file.stats();
+        core.log("File: \"" + file.fileName() + "\" - median: " + stats.median);
+    }
+}

scripts/modify FITS header

@@ -0,0 +1,50 @@
+function checkFITS(key)
+{
+    const noEditableKey = ["SIMPLE", "BITPIX", "NAXIS", "NAXIS1", "NAXIS2", "NAXIS3", "EXTEND", "BZERO", "BSCALE"];
+    return noEditableKey.indexOf(key) < 0;
+}
+
+if(files.length == 0)
+{
+    core.log("No input files");
+    throw "";
+}
+
+let action = core.getItem(["UPDATE", "ADD", "REMOVE"], "Do you want update, add or remove record?");
+
+let modify = new FITSRecordModify();
+
+if(action == "UPDATE")
+{
+    let keywords = files[0].fitsKeywords().filter(checkFITS);
+    let keyword = core.getItem(keywords, "Select keyword to update");
+    let value = files[0].fitsValue(keyword);
+    if(isNaN(value))
+        value = core.getString("Enter new value", value);
+    else
+        value = core.getFloat("Enter new value", value);
+    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);
+}
+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")
+    {
+        core.log("Modifing " + file.fileName());
+        file.modifyFITSRecords(modify);
+    }
+}
+

scripts/scripts.qrc

@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/scripts">
+        <file>example script</file>
+        <file>convert to XISF</file>
+        <file>median</file>
+        <file>modify FITS header</file>
+    </qresource>
+</RCC>

settingsdialog.cpp

@@ -8,6 +8,7 @@
 
 extern int DEFAULT_WIDTH;
 extern double SATURATION;
+extern int FILTERING;
 
 class EvenNumber : public QSpinBox
 {
@@ -39,7 +40,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
     QSettings settings;
 
     m_preloadImages = new QSpinBox(this);
-    m_preloadImages->setRange(0, 8);
+    m_preloadImages->setRange(0, 32);
     m_preloadImages->setValue(settings.value("settings/preloadimagecount", DEFAULT_WIDTH).toInt());
     m_preloadImages->setToolTip(tr("How many images are preloaded before and after current image."));
 
@@ -56,12 +57,30 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
     m_saturation->setValue(settings.value("settings/saturation", SATURATION * 100.0).toDouble());
     m_saturation->setToolTip(tr("Set threshold value that is considered saturated when showing statistics.\nFor RAW files you may set 22%"));
 
+    m_slideShowTime = new QDoubleSpinBox(this);
+    m_slideShowTime->setMinimum(0.01);
+    m_slideShowTime->setMaximum(10);
+    m_slideShowTime->setSuffix(" s");
+    m_slideShowTime->setValue(settings.value("settings/slideshowtime", 1.0).toDouble());
+    m_slideShowTime->setSingleStep(0.1);
+
     m_useNativeDialog = new QCheckBox(tr("Don't use native file dialog"), this);
     m_useNativeDialog->setChecked(QApplication::testAttribute(Qt::AA_DontUseNativeDialogs));
 
+    m_filtering = new QComboBox(this);
+    m_filtering->addItems({tr("Nearest"), tr("Linear"), tr("Cubic")});
+    m_filtering->setCurrentIndex(FILTERING);
+
+    m_qualityThumbnail = new QCheckBox(tr("Smooth thumbnails"), this);
+    m_qualityThumbnail->setChecked(QUALITY_RESIZE);
+    m_qualityThumbnail->setToolTip(tr("Use box filter when downsampling thumbnails instead of nearest. Slightly slower."));
+
     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(m_qualityThumbnail);
     layout->addRow(m_useNativeDialog);
     //layout->addRow(new QLabel(tr("Changes in settings will take effect after program restart.")));
 
@@ -82,6 +101,8 @@ void SettingsDialog::loadSettings()
     THUMB_SIZE_BORDER_Y = THUMB_SIZE + 30;
     DEFAULT_WIDTH = settings.value("settings/preloadimagecount", DEFAULT_WIDTH).toInt();
     SATURATION = settings.value("settings/saturation", 95.0).toDouble() / 100.0;
+    FILTERING = settings.value("settings/filtering", FILTERING).toInt();
+    QUALITY_RESIZE = settings.value("settings/qualitythumbnail", QUALITY_RESIZE).toBool();
     QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, settings.value("settings/dontusenativedialogs", false).toBool());
 }
 
@@ -102,6 +123,11 @@ void SettingsDialog::saveSettings()
     settings.setValue("settings/preloadimagecount", m_preloadImages->value());
     settings.setValue("settings/dontusenativedialogs", m_useNativeDialog->isChecked());
     settings.setValue("settings/saturation", m_saturation->value());
+    settings.setValue("settings/slideshowtime", m_slideShowTime->value());
+    settings.setValue("settings/qualitythumbnail", m_qualityThumbnail->isChecked());
+    QUALITY_RESIZE = m_qualityThumbnail->isChecked();
+    FILTERING = m_filtering->currentIndex();
+    settings.setValue("settings/filtering", FILTERING);
     SATURATION = m_saturation->value() / 100.0;
     QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, m_useNativeDialog->isChecked());
     if(DEFAULT_WIDTH != m_preloadImages->value())

settingsdialog.h

@@ -4,6 +4,7 @@
 #include <QDialog>
 #include <QSpinBox>
 #include <QCheckBox>
+#include <QComboBox>
 
 class SettingsDialog : public QDialog
 {
@@ -19,8 +20,11 @@ private:
 
     QSpinBox *m_preloadImages;
     QSpinBox *m_thumSize;
+    QDoubleSpinBox *m_slideShowTime;
     QDoubleSpinBox *m_saturation;
     QCheckBox *m_useNativeDialog;
+    QCheckBox *m_qualityThumbnail;
+    QComboBox *m_filtering;
 };
 
 #endif // SETTINGSDIALOG_H

shaders/debayer.frag

@@ -1,6 +1,7 @@
 #version 330
 
 uniform sampler2D qt_Texture0;
+uniform ivec2 firstRed;
 in vec2 qt_TexCoord0;
 in vec2 center;
 layout(location = 0) out vec4 color;
@@ -11,7 +12,7 @@ void main(void)
 {
     ivec2 texSize = textureSize(qt_Texture0, 0);
     ivec2 icenter = ivec2(center);
-    ivec2 alternate = icenter % 2;
+    ivec2 alternate = (icenter + firstRed) % 2;
 
     // cross, checker, theta, phi
     const vec4 kA = vec4(-1.0, -1.5,  0.5, -1.0) / 8.0;

shaders/image.frag

@@ -1,11 +1,13 @@
 #version 330
 
 uniform sampler2D qt_Texture0;
-uniform vec3 mtf_param;
+uniform vec3 mtf_param[3];
+uniform vec2 unit_scale;
 uniform bool bw;
 uniform bool invert;
 uniform bool srgb;
-uniform vec3 whiteBalance;
+uniform bool false_color;
+uniform int filtering;
 in vec2 qt_TexCoord0;
 layout(location = 0) out vec4 color;
 
@@ -16,11 +18,26 @@ vec3 Linear2sRGB(vec3 color)
                greaterThan(color, vec3(0.0031308)));
 }
 
-vec4 MTF(vec4 x, vec3 m)
+vec4 MTF(vec4 x, vec4 low, vec4 mid, vec4 high)
 {
-    x = (x - m.x) / (m.z - m.x);
+    x = (x - low) / (high - low);
     x = clamp(x, vec4(0.0), vec4(1.0));
-    return ((m.y - 1) * x) / ((2 * m.y - 1) * x - m.y);
+    return ((mid - 1) * x) / ((2 * mid - 1) * x - mid);
+}
+
+vec3 falsecolor(float color)
+{
+    const vec3 pallete[] = vec3[](
+            vec3(1.0, 0.0, 1.0), //magneta
+            vec3(0.0, 0.0, 1.0), //blue
+            vec3(0.0, 1.0, 1.0), //cyan
+            vec3(0.0, 1.0, 0.0), //green
+            vec3(1.0, 1.0, 0.0), //yellow
+            vec3(1.0, 0.0, 0.0), vec3(1.0, 0.0, 0.0));//red
+    color *= 5.0;
+    int i = int(color);
+    float f = fract(color);
+    return mix(pallete[i], pallete[i+1], f);// * (f * 0.5 + 0.5);
 }
 
 vec3 checker()
@@ -29,11 +46,108 @@ vec3 checker()
     return vec3(step(pattern.x * pattern.y, 0.0) * 0.25 + 0.25);
 }
 
+vec4 cubic(float v)
+{
+    vec4 n = vec4(1.0, 2.0, 3.0, 4.0) - v;
+    vec4 s = n * n * n;
+    float x = s.x;
+    float y = s.y - 4.0 * s.x;
+    float z = s.z - 4.0 * s.y + 6.0 * s.x;
+    float w = 6.0 - x - y - z;
+    return vec4(x, y, z, w) * (1.0/6.0);
+}
+
+vec4 textureBicubic(sampler2D sampler, vec2 texCoords)
+{
+    vec2 texSize = textureSize(sampler, 0);
+    vec2 invTexSize = 1.0 / texSize;
+
+    texCoords = texCoords * texSize - 0.5;
+
+    vec2 fxy = fract(texCoords);
+    texCoords -= fxy;
+
+    vec4 xcubic = cubic(fxy.x);
+    vec4 ycubic = cubic(fxy.y);
+
+    vec4 c = texCoords.xxyy + vec2 (-0.5, +1.5).xyxy;
+
+    vec4 s = vec4(xcubic.xz + xcubic.yw, ycubic.xz + ycubic.yw);
+    vec4 offset = c + vec4 (xcubic.yw, ycubic.yw) / s;
+
+    offset *= invTexSize.xxyy;
+
+    vec4 sample0 = texture(sampler, offset.xz);
+    vec4 sample1 = texture(sampler, offset.yz);
+    vec4 sample2 = texture(sampler, offset.xw);
+    vec4 sample3 = texture(sampler, offset.yw);
+
+    float sx = s.x / (s.x + s.y);
+    float sy = s.z / (s.z + s.w);
+
+    return mix(mix(sample3, sample2, sx), mix(sample1, sample0, sx), sy);
+}
+
+vec4 textureCatmul(sampler2D sampler, vec2 texCoords)
+{
+   ivec2 texSize = textureSize(sampler, 0);
+
+   texCoords = texCoords * vec2(texSize) - 0.5;
+
+   ivec2 texel = ivec2(floor(texCoords));
+   vec2 fra = fract(texCoords);
+   texSize -= 1;
+
+   const mat4 CatMul = mat4(0, 1, 0, 0, -0.5, 0, 0.5, 0, 1, -2.5, 2, -0.5, -0.5, 1.5, -1.5, 0.5);
+   vec4 xx = CatMul * vec4(1.0, fra.x, fra.x*fra.x, fra.x*fra.x*fra.x);
+   vec4 yy = CatMul * vec4(1.0, fra.y, fra.y*fra.y, fra.y*fra.y*fra.y);
+
+   vec4 a00 = texelFetch(sampler, clamp(texel + ivec2(-1, -1), ivec2(0, 0), texSize), 0) * xx.x;
+   vec4 a01 = texelFetch(sampler, clamp(texel + ivec2( 0, -1), ivec2(0, 0), texSize), 0) * xx.y;
+   vec4 a02 = texelFetch(sampler, clamp(texel + ivec2( 1, -1), ivec2(0, 0), texSize), 0) * xx.z;
+   vec4 a03 = texelFetch(sampler, clamp(texel + ivec2( 2, -1), ivec2(0, 0), texSize), 0) * xx.w;
+   vec4 a10 = texelFetch(sampler, clamp(texel + ivec2(-1,  0), ivec2(0, 0), texSize), 0) * xx.x;
+   vec4 a11 = texelFetch(sampler, clamp(texel + ivec2( 0,  0), ivec2(0, 0), texSize), 0) * xx.y;
+   vec4 a12 = texelFetch(sampler, clamp(texel + ivec2( 1,  0), ivec2(0, 0), texSize), 0) * xx.z;
+   vec4 a13 = texelFetch(sampler, clamp(texel + ivec2( 2,  0), ivec2(0, 0), texSize), 0) * xx.w;
+   vec4 a20 = texelFetch(sampler, clamp(texel + ivec2(-1,  1), ivec2(0, 0), texSize), 0) * xx.x;
+   vec4 a21 = texelFetch(sampler, clamp(texel + ivec2( 0,  1), ivec2(0, 0), texSize), 0) * xx.y;
+   vec4 a22 = texelFetch(sampler, clamp(texel + ivec2( 1,  1), ivec2(0, 0), texSize), 0) * xx.z;
+   vec4 a23 = texelFetch(sampler, clamp(texel + ivec2( 2,  1), ivec2(0, 0), texSize), 0) * xx.w;
+   vec4 a30 = texelFetch(sampler, clamp(texel + ivec2(-1,  2), ivec2(0, 0), texSize), 0) * xx.x;
+   vec4 a31 = texelFetch(sampler, clamp(texel + ivec2( 0,  2), ivec2(0, 0), texSize), 0) * xx.y;
+   vec4 a32 = texelFetch(sampler, clamp(texel + ivec2( 1,  2), ivec2(0, 0), texSize), 0) * xx.z;
+   vec4 a33 = texelFetch(sampler, clamp(texel + ivec2( 2,  2), ivec2(0, 0), texSize), 0) * xx.w;
+
+   vec4 c = vec4(0.0);
+   c += (a00 + a01 + a02 + a03) * yy.x;
+   c += (a10 + a11 + a12 + a13) * yy.y;
+   c += (a20 + a21 + a22 + a23) * yy.z;
+   c += (a30 + a31 + a32 + a33) * yy.w;
+
+   return c;
+}
+
 void main(void)
 {
-    color = texture(qt_Texture0, qt_TexCoord0);
+    switch(filtering)
+    {
+    case 0://nearest
+        color = texelFetch(qt_Texture0, ivec2(qt_TexCoord0 * textureSize(qt_Texture0, 0)), 0);
+        break;
+    default:
+    case 1://bilinear
+        color = texture(qt_Texture0, qt_TexCoord0);
+        break;
+    case 2://catmul bicubic
+        color = textureCatmul(qt_Texture0, qt_TexCoord0);
+        break;
+    }
+
+    color.rgb = color.rgb * unit_scale.x + unit_scale.y;
     if(bw)color = color.rrra;
-    color = MTF(color, mtf_param);
+    color = MTF(color, vec4(mtf_param[0], 0.0), vec4(mtf_param[1], 0.5), vec4(mtf_param[2], 1.0));
+    if(false_color)color.rgb = falsecolor(color.r);
 
     if(invert)color.rgb = vec3(1.0) - color.rgb;
 
@@ -41,8 +155,6 @@ void main(void)
 
     if(srgb)color.rgb = Linear2sRGB(color.rgb);
 
-    color.rgb *= whiteBalance;
-
     if(any(lessThan(qt_TexCoord0, vec2(0.0))) || any(greaterThan(qt_TexCoord0, vec2(1.0))))
         color = vec4(0.0, 0.0, 0.0, 1.0);
 

shaders/shaders.qrc

@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/">
+        <file>debayer.frag</file>
+        <file>debayer.vert</file>
+        <file>image.frag</file>
+        <file>image.vert</file>
+        <file>thumb.frag</file>
+        <file>thumb.vert</file>
+    </qresource>
+</RCC>

shaders/thumb.frag

@@ -1,22 +1,22 @@
 #version 330
 
 uniform sampler2DArray qt_Texture0;
-uniform vec3 mtf_param;
+uniform vec3 mtf_param[3];
 uniform bool invert;
 in vec3 qt_TexCoord0;
 layout(location = 0) out vec4 color;
 
-vec4 MTF(vec4 x, vec3 m)
+vec4 MTF(vec4 x, vec4 low, vec4 mid, vec4 high)
 {
-    x = (x - m.x) / (m.z - m.x);
+    x = (x - low) / (high - low);
     x = clamp(x, vec4(0.0), vec4(1.0));
-    return ((m.y - 1) * x) / ((2 * m.y - 1) * x - m.y);
+    return ((mid - 1) * x) / ((2 * mid - 1) * x - mid);
 }
 
 void main(void)
 {
     color = texture(qt_Texture0, qt_TexCoord0);
-    color = MTF(color, mtf_param);
+    color = MTF(color, vec4(mtf_param[0], 0.0), vec4(mtf_param[1], 0.5), vec4(mtf_param[2], 1.0));
     if(invert)color = vec4(1.0) - color;
     color.a = 1.0;
 }

space.nouspiro.tenmon.metainfo.xml

@@ -4,14 +4,18 @@
     <launchable type="desktop-id">space.nouspiro.tenmon.desktop</launchable>
     <name>Tenmon</name>
     <summary>FITS/XISF image viewer, converter, index and search</summary>
+    <developer id="nouspiro.space">
+    	<name>Dušan Poizl</name>
+    </developer>
+    <developer_name>Dušan Poizl</developer_name>
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>GPL-3.0</project_license>
     <description>
         <p>It is intended primarily for viewing astro photos and images. It supports the following formats:</p>
         <ul>
-            <li>FITS 8, 16 bit integer and 32 bit float</li>
-            <li>XISF 8, 16 bit integer and 32 bit float</li>
-            <li>RAW CR2, DNG, NEF</li>
+            <li>FITS 8, 16, 32 bit integer and 32, 64 bit float</li>
+            <li>XISF 8, 16, 32 bit integer and 32, 64 bit float</li>
+            <li>RAW CR2/CR3, DNG, NEF</li>
             <li>JPEG, PNG, BMP, GIF, PBM, PGM, PPM and SVG images</li>
         </ul>
         <p>Features of application:</p>
@@ -27,6 +31,7 @@
             <li>Thumbnails</li>
             <li>Convert CFA images to colour - debayer</li>
             <li>Color space aware</li>
+            <li>Histogram</li>
         </ul>
     </description>
     <categories>
@@ -42,12 +47,69 @@
     <url type="bugtracker">https://github.com/flathub/space.nouspiro.tenmon/issues</url>
     <screenshots>
         <screenshot type="default">
+            <caption>Main window with image</caption>
             <image>https://nouspiro.space/wp-content/uploads/2022/04/tenmon-1024x579.png</image>
+        </screenshot>
+        <screenshot type="default">
+            <caption>Thumnail view</caption>
             <image>https://nouspiro.space/wp-content/uploads/2022/12/tenmon2-1024x645.png</image>
         </screenshot>
     </screenshots>
     <content_rating type="oars-1.1"/>
     <releases>
+    <release version="20240816" date="2024-08-16">
+      <description>
+        Fix saving image
+      </description>
+    </release>
+    <release version="20240616" date="2024-06-16">
+      <description>
+        <ul>
+          <li>Batch processing with JavaScript</li>
+          <li>Opening directory recursively</li>
+        </ul>
+      </description>
+    </release>
+    <release version="20240201" date="2024-02-01">
+            <description>
+                  <ul>
+                      <li>Smooth thumbnails</li>
+                      <li>Respect ROWORDER</li>
+                      <li>Bugfixes</li>
+                  </ul>
+            </description>
+        </release>
+    	<release version="20240108" date="2024-01-08">
+            <description>
+                  <ul>
+                      <li>Update to Qt6</li>
+                      <li>Add support for CR3 RAW files</li>
+                      <li>Slideshow</li>
+                      <li>Improved rapid image view</li>
+                  </ul>
+            </description>
+        </release>
+    	<release version="20231116" date="2023-11-16">
+            <description>
+                  <ul>
+                      <li>Histogram</li>
+                      <li>False colors</li>
+                      <li>Strech each RGB channel individually</li>
+                      <li>Better white balancing</li>
+                  </ul>
+            </description>
+        </release>
+        <release version="20230419" date="2023-04-19">
+            <description>
+                  <ul>
+                      <li>Add file sorting</li>
+                      <li>Improved zoom and scrolling.</li>
+                      <li>Shift modify if zoom on mouse position or center</li>
+                      <li>Fix issue with XISF from NINA</li>
+                      <li>Fix crash in flatpak version</li>
+                  </ul>
+            </description>
+        </release>
         <release version="20230212" date="2023-02-12">
             <description>
                   <ul>

stfslider.cpp

@@ -10,18 +10,34 @@ static float clamp(float x)
     return std::min(std::max(x, 0.0f), 1.0f);
 }
 
-STFSlider::STFSlider(QWidget *parent) : QWidget(parent)
+STFSlider::STFSlider(const QColor &color, QWidget *parent) : QWidget(parent)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     setMinimumWidth(100);
-    setMinimumHeight(15);
-    setMaximumHeight(15);
     setMouseTracking(true);
+
+    if(color == Qt::white)
+    {
+        setMaximumHeight(16);
+        setMinimumHeight(16);
+    }
+    else
+    {
+        setMaximumHeight(10);
+        setMinimumHeight(10);
+    }
     m_blackPoint = 0;
     m_midPoint = 0.5;
     m_whitePoint = 1;
     m_grabbed = -1;
     m_fineTune = false;
+    m_color = color;
+    if(color == Qt::blue || color == Qt::red)
+        m_threshold = 1.1f;
+    else if(color == Qt::green)
+        m_threshold = 0.8f;
+    else
+        m_threshold = 0.4f;
     setToolTip(tr("Press Shift for fine tuning"));
 }
 
@@ -60,7 +76,7 @@ void STFSlider::paintEvent(QPaintEvent *event)
     {
         qreal p = i/32.0f;
         qreal c = std::pow(p, 1.0/2.2)*255;
-        gradient.setColorAt(p, QColor(c, c, c));
+        gradient.setColorAt(p, QColor(m_color.redF()*c, m_color.greenF()*c, m_color.blueF()*c));
     }
 
     QPainterPath tick(QPointF(0, 0));
@@ -75,7 +91,7 @@ void STFSlider::paintEvent(QPaintEvent *event)
 
     auto drawTick = [&](qreal p)
     {
-        painter.setPen(p < 0.4 ? Qt::white : Qt::black);
+        painter.setPen(p < m_threshold ? Qt::white : Qt::black);
         painter.resetTransform();
         painter.translate(w*p, 0);
         painter.drawPath(tick);
@@ -89,43 +105,44 @@ void STFSlider::paintEvent(QPaintEvent *event)
 
 void STFSlider::mouseMoveEvent(QMouseEvent *event)
 {
-    if(std::abs(m_blackPoint*width() - event->x()) < 5 ||
-            std::abs((m_blackPoint + (m_whitePoint - m_blackPoint) * m_midPoint)*width() - event->x()) < 5 ||
-            std::abs(m_whitePoint*width() - event->x()) < 5)
+    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);
     else
         unsetCursor();
 
-    qreal x = (qreal)event->x()/width();
+    qreal xw = x/width();
     if(event->modifiers() & Qt::ShiftModifier && !m_fineTune)
     {
         m_fineTune = true;
-        m_fineTuneX = x;
+        m_fineTuneX = xw;
     }
     if(!(event->modifiers() & Qt::ShiftModifier) && m_fineTune)
         m_fineTune = false;
 
     if(m_fineTune)
     {
-        x = m_fineTuneX + (x - m_fineTuneX) * 0.2;
+        xw = m_fineTuneX + (xw - m_fineTuneX) * 0.2;
     }
 
     switch(m_grabbed)
     {
     case 0:
-        m_blackPoint = clamp(x);
+        m_blackPoint = clamp(xw);
         m_whitePoint = std::max(m_whitePoint, m_blackPoint);
-        QToolTip::showText(event->globalPos(), QString::number(m_blackPoint), this);
+        QToolTip::showText(event->globalPosition().toPoint(), QString::number(m_blackPoint), this);
         break;
     case 1:
-        m_midPoint = (x - m_blackPoint) / (m_whitePoint - m_blackPoint);
+        m_midPoint = (xw - m_blackPoint) / (m_whitePoint - m_blackPoint);
         m_midPoint = clamp(m_midPoint);
-        QToolTip::showText(event->globalPos(), QString::number(m_midPoint), this);
+        QToolTip::showText(event->globalPosition().toPoint(), QString::number(m_midPoint), this);
         break;
     case 2:
-        m_whitePoint = clamp(x);
+        m_whitePoint = clamp(xw);
         m_blackPoint = std::min(m_blackPoint, m_whitePoint);
-        QToolTip::showText(event->globalPos(), QString::number(m_whitePoint), this);
+        QToolTip::showText(event->globalPosition().toPoint(), QString::number(m_whitePoint), this);
         break;
     }
     if(m_grabbed >= 0)
@@ -137,17 +154,18 @@ void STFSlider::mouseMoveEvent(QMouseEvent *event)
 
 void STFSlider::mousePressEvent(QMouseEvent *event)
 {
+    const qreal x = event->position().x();
     if(event->modifiers() & Qt::ShiftModifier)
     {
         m_fineTune = true;
-        m_fineTuneX = (qreal)event->x()/width();
+        m_fineTuneX = x/width();
     }
 
-    if(std::abs((m_blackPoint + (m_whitePoint - m_blackPoint) * m_midPoint)*width() - event->x()) < 5)
+    if(std::abs((m_blackPoint + (m_whitePoint - m_blackPoint) * m_midPoint)*width() - x) < 5)
         m_grabbed = 1;
-    else if(std::abs(m_blackPoint*width() - event->x()) < 5)
+    else if(std::abs(m_blackPoint*width() - x) < 5)
         m_grabbed = 0;
-    else if(std::abs(m_whitePoint*width() - event->x()) < 5)
+    else if(std::abs(m_whitePoint*width() - x) < 5)
         m_grabbed = 2;
     else
         m_grabbed = -1;

stfslider.h

@@ -13,8 +13,10 @@ class STFSlider : public QWidget
     int m_grabbed;
     bool m_fineTune;
     float m_fineTuneX;
+    QColor m_color;
+    float m_threshold;
 public:
-    explicit STFSlider(QWidget *parent = nullptr);
+    explicit STFSlider(const QColor &color = Qt::white, QWidget *parent = nullptr);
     float blackPoint() const;
     float midPoint() const;
     float whitePoint() const;

stretchtoolbar.cpp

@@ -18,13 +18,60 @@ float MTF(float x, float m)
 StretchToolbar::StretchToolbar(QWidget *parent) : QToolBar(tr("Stretch toolbar"), parent)
 {
     setObjectName("stretchtoolbar");
-    m_stfSlider = new STFSlider(this);
-    addWidget(m_stfSlider);
-    connect(m_stfSlider, SIGNAL(paramChanged(float, float, float)), this, SIGNAL(paramChanged(float,float,float)));
+    QWidget *lum = new QWidget(this);
+    QVBoxLayout *vbox1 = new QVBoxLayout(lum);
+    m_stfSlider = new STFSlider(Qt::white, this);
+    vbox1->addWidget(m_stfSlider);
+
+    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);
+
+    m_stack = new QStackedWidget(this);
+    m_stack->addWidget(lum);
+    m_stack->addWidget(rgb);
+    m_stack->setCurrentIndex(0);
+    addWidget(m_stack);
+
+    connect(m_stfSlider, &STFSlider::paramChanged, [this](float blackPoint, float midPoint, float whitePoint){
+        m_mtfParam.blackPoint[0] = m_mtfParam.blackPoint[1] = m_mtfParam.blackPoint[2] = blackPoint;
+        m_mtfParam.midPoint[0] = m_mtfParam.midPoint[1] = m_mtfParam.midPoint[2] = midPoint;
+        m_mtfParam.whitePoint[0] = m_mtfParam.whitePoint[1] = m_mtfParam.whitePoint[2] = whitePoint;
+        emit paramChanged(m_mtfParam);
+    });
+    connect(m_stfSliderR, &STFSlider::paramChanged, [this](float blackPoint, float midPoint, float whitePoint){
+        m_mtfParam.blackPoint[0] = blackPoint;
+        m_mtfParam.midPoint[0] = midPoint;
+        m_mtfParam.whitePoint[0] = whitePoint;
+        emit paramChanged(m_mtfParam);
+    });
+    connect(m_stfSliderG, &STFSlider::paramChanged, [this](float blackPoint, float midPoint, float whitePoint){
+        m_mtfParam.blackPoint[1] = blackPoint;
+        m_mtfParam.midPoint[1] = midPoint;
+        m_mtfParam.whitePoint[1] = whitePoint;
+        emit paramChanged(m_mtfParam);
+    });
+    connect(m_stfSliderB, &STFSlider::paramChanged, [this](float blackPoint, float midPoint, float whitePoint){
+        m_mtfParam.blackPoint[2] = blackPoint;
+        m_mtfParam.midPoint[2] = midPoint;
+        m_mtfParam.whitePoint[2] = whitePoint;
+        emit paramChanged(m_mtfParam);
+    });
+
+    QAction *rgbStretch = addAction(QIcon(":/link.png"), tr("Linked channels"));
+    rgbStretch->setCheckable(true);
+    rgbStretch->setChecked(true);
+    connect(rgbStretch, &QAction::toggled, this, &StretchToolbar::unlinkStretch);
 
     QAction *autoStretchButton = addAction(QIcon(":/nuke.png"), tr("Auto Stretch F12"));
     autoStretchButton->setShortcut(Qt::Key_F12);
-    connect(autoStretchButton, SIGNAL(triggered()), this, SIGNAL(autoStretch()));
+    connect(autoStretchButton, &QAction::triggered, this, &StretchToolbar::autoStretch);
 
     QAction *resetButton = addAction(style()->standardIcon(QStyle::SP_DialogResetButton), tr("Reset Screen Transfer Function F11"));
     resetButton->setShortcut(Qt::Key_F11);
@@ -32,11 +79,15 @@ StretchToolbar::StretchToolbar(QWidget *parent) : QToolBar(tr("Stretch toolbar")
 
     QAction *invertButton = addAction(QIcon(":/invert.png"), tr("Invert colors"));
     invertButton->setCheckable(true);
-    connect(invertButton, SIGNAL(toggled(bool)), this, SIGNAL(invert(bool)));
+    connect(invertButton, &QAction::toggled, this, &StretchToolbar::invert);
 
-    QAction *superPixelButton = addAction(QIcon(":/bayer.png"), tr("Debayer CFA"));
-    superPixelButton->setCheckable(true);
-    connect(superPixelButton, SIGNAL(toggled(bool)), this, SIGNAL(superPixel(bool)));
+    QAction *falseColorButton = addAction(QIcon(":/falsecolor.png"), tr("False colors"));
+    falseColorButton->setCheckable(true);
+    connect(falseColorButton, &QAction::toggled, this, &StretchToolbar::falseColor);
+
+    m_debayer = addAction(QIcon(":/bayer.png"), tr("Debayer CFA"));
+    m_debayer->setCheckable(true);
+    connect(m_debayer, &QAction::toggled, this, &StretchToolbar::superPixel);
 
     m_autoStretchOnLoad = addAction(QIcon(":/nuke_a.png"), tr("Apply auto stretch on load"));
     m_autoStretchOnLoad->setCheckable(true);
@@ -44,28 +95,83 @@ StretchToolbar::StretchToolbar(QWidget *parent) : QToolBar(tr("Stretch toolbar")
 
 void StretchToolbar::stretchImage(Image *img)
 {
-    if(img)
+    if(img && img->rawImage())
     {
-        if(img->rawImage())
+        const RawImage::Stats &stats = img->rawImage()->imageStats();
+        int i = 0;
+        int ch = 1;
+        int o = 0;
+        if(m_stack->currentIndex() == 1 && img->rawImage()->channels() == 1 && m_debayer->isChecked())
+        {
+            i = 1;
+            ch = 4;
+            o = 1;
+        }
+        if(img->rawImage()->channels() >= 3)
+            ch = 3;
+
+        float bp2 = 0;
+        float mid2 = 0;
+        float max2 = 0;
+        for(; i < ch; i++)
         {
             double median, mad, max;
-            img->rawImage()->imageStats(nullptr, nullptr, &median, nullptr, &max, &mad, nullptr);
+            median = stats.m_median[i];
+            mad = stats.m_mad[i];
+            max = stats.m_max[i];
             median /= img->rawImage()->norm();
+            bool a = median > 0.5 ? true : false;
             mad /= img->rawImage()->norm();
-            max /= img->rawImage()->norm();
-            if(max>1.0f)max = 1.0f;
-            float bp = median + mad * BLACK_POINT_SIGMA * MAD_TO_SIGMA;
-            float mid = MTF(median - bp, TARGET_BACKGROUND);
-            m_stfSlider->setMTFParams(bp, mid, max);
-            emit paramChanged(m_stfSlider->blackPoint(), m_stfSlider->midPoint(), max);
+            max = 1.0f;// /= img->rawImage()->norm();
+            float bp = a || mad == 0.0f ? 0.0f : std::clamp(median + mad * BLACK_POINT_SIGMA * MAD_TO_SIGMA, 0.0, 1.0);
+            if(a && mad != 0.0f)
+                max = std::clamp(median - mad * BLACK_POINT_SIGMA * MAD_TO_SIGMA, 0.0, 1.0);
+            float mid = !a ? MTF(median - bp, TARGET_BACKGROUND) : MTF(TARGET_BACKGROUND, max - median);
+            m_mtfParam.blackPoint[i-o] = bp;
+            m_mtfParam.midPoint[i-o] = mid;// / max;
+            m_mtfParam.whitePoint[i-o] = max;
+            bp2 += bp;
+            mid2 += mid;
+            max2 = max > max2 ? max : max2;
         }
+        if(ch == 1)
+        {
+            m_mtfParam.blackPoint[1] = m_mtfParam.blackPoint[2] = m_mtfParam.blackPoint[0];
+            m_mtfParam.midPoint[1] = m_mtfParam.midPoint[2] = m_mtfParam.midPoint[0];
+            m_mtfParam.whitePoint[1] = m_mtfParam.whitePoint[2] = m_mtfParam.whitePoint[0];
+        }
+        if(m_stack->currentIndex() == 0)
+        {
+            m_mtfParam.blackPoint[0] = m_mtfParam.blackPoint[1] = m_mtfParam.blackPoint[2] = bp2 / ch;
+            m_mtfParam.midPoint[0] = m_mtfParam.midPoint[1] = m_mtfParam.midPoint[2] = mid2 / ch;
+            m_mtfParam.whitePoint[0] = m_mtfParam.whitePoint[1] = m_mtfParam.whitePoint[2] = max2;
+            m_stfSlider->setMTFParams(m_mtfParam.blackPoint[0], m_mtfParam.midPoint[0], m_mtfParam.whitePoint[0]);
+        }
+        else
+        {
+            m_stfSliderR->setMTFParams(m_mtfParam.blackPoint[0], m_mtfParam.midPoint[0], m_mtfParam.whitePoint[0]);
+            m_stfSliderG->setMTFParams(m_mtfParam.blackPoint[1], m_mtfParam.midPoint[1], m_mtfParam.whitePoint[1]);
+            m_stfSliderB->setMTFParams(m_mtfParam.blackPoint[2], m_mtfParam.midPoint[2], m_mtfParam.whitePoint[2]);
+        }
+        emit paramChanged(m_mtfParam);
     }
 }
 
 void StretchToolbar::resetMTF()
 {
-    m_stfSlider->setMTFParams(0, 0.5, 1);
-    emit paramChanged(0, 0.5, 1);
+    MTFParam params;
+    m_mtfParam = params;
+    if(m_stack->currentIndex() == 0)
+    {
+        m_stfSlider->setMTFParams(0, 0.5, 1);
+    }
+    else
+    {
+        m_stfSliderR->setMTFParams(0, 0.5, 1);
+        m_stfSliderG->setMTFParams(0, 0.5, 1);
+        m_stfSliderB->setMTFParams(0, 0.5, 1);
+    }
+    emit paramChanged(params);
 }
 
 void StretchToolbar::imageLoaded(Image *img)
@@ -74,4 +180,21 @@ void StretchToolbar::imageLoaded(Image *img)
         stretchImage(img);
 }
 
-
+void StretchToolbar::unlinkStretch(bool enable)
+{
+    if(!enable)
+    {
+        m_stack->setCurrentIndex(1);
+        m_mtfParam.blackPoint[0] = m_stfSliderR->blackPoint(); m_mtfParam.midPoint[0] = m_stfSliderR->midPoint(); m_mtfParam.whitePoint[0] = m_stfSliderR->whitePoint();
+        m_mtfParam.blackPoint[1] = m_stfSliderG->blackPoint(); m_mtfParam.midPoint[1] = m_stfSliderG->midPoint(); m_mtfParam.whitePoint[1] = m_stfSliderG->whitePoint();
+        m_mtfParam.blackPoint[2] = m_stfSliderB->blackPoint(); m_mtfParam.midPoint[2] = m_stfSliderB->midPoint(); m_mtfParam.whitePoint[2] = m_stfSliderB->whitePoint();
+    }
+    else
+    {
+        m_stack->setCurrentIndex(0);
+        m_mtfParam.blackPoint[0] = m_mtfParam.blackPoint[1] = m_mtfParam.blackPoint[2] = m_stfSlider->blackPoint();
+        m_mtfParam.midPoint[0] = m_mtfParam.midPoint[1] = m_mtfParam.midPoint[2] = m_stfSlider->midPoint();
+        m_mtfParam.whitePoint[0] = m_mtfParam.whitePoint[1] = m_mtfParam.whitePoint[2] = m_mtfParam.whitePoint[2] = m_stfSlider->whitePoint();
+    }
+    emit paramChanged(m_mtfParam);
+}

stretchtoolbar.h

@@ -2,26 +2,42 @@
 #define STRETCHTOOLBAR_H
 
 #include <QToolBar>
+#include <QStackedWidget>
 #include "stfslider.h"
 
 class Image;
 
+struct MTFParam
+{
+    float blackPoint[3] = {0.0f, 0.0f, 0.0f};
+    float midPoint[3] = {0.5f, 0.5f, 0.5f};
+    float whitePoint[3] = {1.0f, 1.0f, 1.0f};
+};
+
 class StretchToolbar : public QToolBar
 {
     Q_OBJECT
     STFSlider *m_stfSlider;
+    STFSlider *m_stfSliderR;
+    STFSlider *m_stfSliderG;
+    STFSlider *m_stfSliderB;
     QAction *m_autoStretchOnLoad;
+    QAction *m_debayer;
+    QStackedWidget *m_stack;
+    MTFParam m_mtfParam;
 public:
     explicit StretchToolbar(QWidget *parent = nullptr);
 public slots:
     void stretchImage(Image *img);
     void resetMTF();
     void imageLoaded(Image *img);
+    void unlinkStretch(bool enable);
 signals:
-    void paramChanged(float low, float mid, float high);
+    void paramChanged(const MTFParam &params);
     void autoStretch();
     void invert(bool enable);
     void superPixel(bool enable);
+    void falseColor(bool enable);
 };
 
 #endif // STRETCHTOOLBAR_H