Another test

CMakeLists.txt

@@ -23,38 +23,39 @@ find_library(FITS_LIB cfitsio REQUIRED)
 find_library(RAW_LIB NAMES raw_r REQUIRED)
 find_library(WCS_LIB wcs wcslib REQUIRED)
 find_library(LCMS2_LIB lcms2 REQUIRED)
-find_library(STELLARSOLVER_LIB stellarsolver)
+find_library(STELLARSOLVER_LIB NAMES stellarsolver stellarsolver6)
 
 add_subdirectory(libXISF)
 
 set(TENMON_SRC
-    about.cpp about.h
+    src/about.cpp src/about.h
-    batchprocessing.cpp batchprocessing.h batchprocessing.ui
+    src/batchprocessing.cpp src/batchprocessing.h src/batchprocessing.ui
-    database.cpp database.h
+    src/chartgraph.h src/chartgraph.cpp
-    databaseview.cpp databaseview.h
+    src/database.cpp src/database.h
-    delete.cpp
+    src/databaseview.cpp src/databaseview.h
-    filesystemwidget.cpp filesystemwidget.h
+    src/delete.cpp
-    histogram.cpp histogram.h
+    src/filesystemwidget.cpp src/filesystemwidget.h
-    httpdownloader.h httpdownloader.cpp
+    src/histogram.cpp src/histogram.h
-    imageinfo.cpp imageinfo.h
+    src/httpdownloader.h src/httpdownloader.cpp
-    imageinfodata.cpp imageinfodata.h
+    src/imageinfo.cpp src/imageinfo.h
-    imageringlist.cpp imageringlist.h
+    src/imageinfodata.cpp src/imageinfodata.h
-    imagescrollarea.cpp imagescrollarea.h
+    src/imageringlist.cpp src/imageringlist.h
-    imagewidget.h imagewidget.cpp
+    src/imagescrollarea.cpp src/imagescrollarea.h
-    loadimage.h loadimage.cpp
+    src/imagewidget.h src/imagewidget.cpp
-    loadrunable.cpp loadrunable.h
+    src/loadimage.h src/loadimage.cpp
-    main.cpp
+    src/loadrunable.cpp src/loadrunable.h
-    mainwindow.cpp mainwindow.h
+    src/main.cpp
-    markedfiles.cpp markedfiles.h
+    src/mainwindow.cpp src/mainwindow.h
-    mtfparam.h
+    src/markedfiles.cpp src/markedfiles.h
-    rawimage.cpp rawimage.h
+    src/mtfparam.h
-    rawimage_sse.cpp
+    src/rawimage.cpp src/rawimage.h
-    scriptengine.cpp scriptengine.h
+    src/rawimage_sse.cpp
-    settingsdialog.cpp settingsdialog.h
+    src/scriptengine.cpp src/scriptengine.h
-    statusbar.cpp statusbar.h
+    src/settingsdialog.cpp src/settingsdialog.h
-    stfslider.cpp stfslider.h
+    src/statusbar.cpp src/statusbar.h
-    stretchtoolbar.cpp stretchtoolbar.h
+    src/stfslider.cpp src/stfslider.h
-    tfloat16.h
+    src/stretchtoolbar.cpp src/stretchtoolbar.h
+    src/tfloat16.h
     thumbnailer/genthumbnail.cpp thumbnailer/genthumbnail.h
 )
 
@@ -95,9 +96,9 @@ if(STELLARSOLVER_INCLUDE AND STELLARSOLVER_LIB)
     endif(MXE)
     target_compile_definitions(tenmon PRIVATE "PLATESOLVER")
     target_sources(tenmon PRIVATE
-        solver.cpp solver.h
+        src/solver.cpp src/solver.h
-        platesolving.cpp platesolving.h platesolving.ui
+        src/platesolving.cpp src/platesolving.h src/platesolving.ui
-        platesolvingsettings.cpp platesolvingsettings.h platesolvingsettings.ui
+        src/platesolvingsettings.cpp src/platesolvingsettings.h src/platesolvingsettings.ui
     )
     message(STATUS "Found stellarsolver ${STELLARSOLVER_INCLUDE} ${STELLARSOLVER_LIB}")
 endif(STELLARSOLVER_INCLUDE AND STELLARSOLVER_LIB)
@@ -129,6 +130,7 @@ if(UNIX AND NOT APPLE)
         install(FILES space.nouspiro.tenmon.desktop DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
         install(FILES resources/space.nouspiro.tenmon.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps")
         install(FILES resources/space.nouspiro.tenmon_128.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps" RENAME space.nouspiro.tenmon.png)
+        install(FILES space.nouspiro.tenmon.xisf.xml DESTINATION "${CMAKE_INSTALL_DATADIR}/mime/packages")
     endif()
     install(FILES space.nouspiro.tenmon.metainfo.xml DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo")
 endif(UNIX AND NOT APPLE)

README

@@ -29,3 +29,5 @@ Then to build run standard cmake sequence
 For working plate solving you must have compiled and installed StellarSolver https://github.com/rlancaste/stellarsolver
 It is important that you compile StellarSolver with Qt6. By default it use Qt5 but when linked with Qt6 program it will
 crash.
+
+Using OpenNGC database https://github.com/mattiaverga/OpenNGC under CC-BY-SA-4.0 https://creativecommons.org/licenses/by-sa/4.0/

about/help_en

@@ -184,6 +184,48 @@ Location of this directory is on Windows: "C:/Users/<USER>/AppData/Roaming
 core.log(JSON.stringify(profile));</pre></li>
 <li><b>setSolverProfile(index)</b> set solver profile by index. Valid values are from 1 to 8 as in GUI.</li>
 <li><b>setSolverProfile(profile)</b> set solver profile. Parameter is same as object returned by <i>getSolverProfile()</i> method</li>
+<li><b>question(question, buttons, title = "")</b> show dialog with question. First argument <i>question</i> is string. Second argument <i>buttons</i>
+    is array of following strings. "ok", "yes", "no", "yesall", "noall", "abort", "retry", "ignore", "cancel", "discard", "apply", "reset" Third argument <i>title</i> is optional string that show in title bar.
+    It return button that was clicked as a string.
+    <pre>var button = core.question("Apply to all files?", ["yes", "no"]);</pre>
+    </li>
+<li><b>plot(graph)</b> this method show graph defined by JS object.
+
+<pre>
+var chart = {
+    "title": "Chart title", // Title that will show on top of chart
+    "legend":
+    {
+        "visible": true,// default is true
+        "align": "left" // allowed values are "top", "right", "bottom", "left". default is "top"
+    },
+    "series":[ // array of data series
+        {
+            "title": "HFR",
+            "type": "bar", // type of the serie. Can be one of "line", "points", "linePoints", "bar"
+            "y":[2.5,3.1,2.6,2.2] // array of values
+        },
+        {
+            "title": "Ecc",
+            "y":[0.37, 0.4, 0.35, 0.25],
+            "color": "red" // color of serie. It can be name of color like "green" or RGB hex value "#ccddff"
+        },
+        {
+            "title": "Stars",
+            "type": "points", // type of serie. can be "line", "points", "linePoints" and "bar". Default is "line"
+            "shape": "star", // shape of markers. valid only for points
+            "x":[1, 2.5, 3.5, 6],// line, points and linePoints can also have "x" values. Otherwise it assume sequence 0,1,2 ...
+            "y":[523,412,487,510],
+            "y2": true, // if set to true this serie will use secondary Y axis
+            "bestFit": true, // show best fit line
+            "color": "#0000ff"
+        }
+    ]
+};
+
+core.plot(chart);
+</pre>
+</li>
 </ul>
 
 <h4>File</h4>

about/help_fr

@@ -135,6 +135,54 @@ Le deuxième paramètre est la valeur par défaut dans la zone de saisie. Les tr
 <li><b>getItem(items)</b> affiche une boîte de dialogue de sélection qui permet de sélectionner un élément dans un tableau d'éléments. Lorsque vous appuyez sur Annuler, il renvoie Undefined.</li>
 <li><b>setStartingSolution(solution)</b> with this you can set starting point and image scale. It accepth object with attributes "ra", "dec", "pixscale".
         Same object as returned by <i>File.solve()</i> method. You can also call it without paramer in which case it will clear any previously set values.</li>
+<li><b>getSolverProfile()</b> return solver profile as Object.
+<pre>var profile = core.getSolverProfile();
+core.log(JSON.stringify(profile));</pre></li>
+<li><b>setSolverProfile(index)</b> set solver profile by index. Valid values are from 1 to 8 as in GUI.</li>
+<li><b>setSolverProfile(profile)</b> set solver profile. Parameter is same as object returned by <i>getSolverProfile()</i> method</li>
+<li><b>question(question, buttons, title = "")</b> show dialog with question. First argument <i>question</i> is string. Second argument <i>buttons</i>
+    is array of following strings. "ok", "yes", "no", "yesall", "noall", "abort", "retry", "ignore", "cancel", "discard", "apply", "reset" Third argument <i>title</i> is optional string that show in title bar.
+    It return button that was clicked as a string.
+    <pre>var button = core.question("Apply to all files?", ["yes", "no"]);</pre>
+    </li>
+<li><b>plot(graph)</b> this method show graph defined by JS object.
+
+<pre>
+var chart = {
+    "title": "Chart title", // Title that will show on top of chart
+    "legend":
+    {
+        "visible": true,// default is true
+        "align": "left" // allowed values are "top", "right", "bottom", "left". default is "top"
+    },
+    "series":[ // array of data series
+        {
+            "title": "HFR",
+            "type": "bar", // type of the serie. Can be one of "line", "points", "linePoints", "bar"
+            "y":[2.5,3.1,2.6,2.2] // array of values
+        },
+        {
+            "title": "Ecc",
+            "y":[0.37, 0.4, 0.35, 0.25],
+            "color": "red" // color of serie. It can be name of color like "green" or RGB hex value "#ccddff"
+        },
+        {
+            "title": "Stars",
+            "type": "points", // type of serie. can be "line", "points", "linePoints" and "bar". Default is "line"
+            "shape": "star", // shape of markers. valid only for points
+            "x":[1, 2.5, 3.5, 6],// line, points and linePoints can also have "x" values. Otherwise it assume sequence 0,1,2 ...
+            "y":[523,412,487,510],
+            "y2": true, // if set to true this serie will use secondary Y axis
+            "bestFit": true, // show best fit line
+            "color": "#0000ff"
+        }
+    ]
+};
+
+core.plot(chart);
+</pre>
+</li>
+
 </ul>
 
 <h4>File</h4>

about/help_sk

@@ -126,6 +126,54 @@ V skripte je dostupný globálny objekt nazvaný <b>core</b> ktorý má nasledov
 <li><b>getItem(items)</b> ukáže dialog pre výber jednej hodnoty z poľa hodnôt. Vracia vybranú hodnotu ako String alebo ak je stlačené tlačidlo zrušiť vráti Undefined.</li>
 <li><b>setStartingSolution(solution)</b> with this you can set starting point and image scale. It accepth object with attributes "ra", "dec", "pixscale".
         Same object as returned by <i>File.solve()</i> method. You can also call it without paramer in which case it will clear any previously set values.</li>
+<li><b>getSolverProfile()</b> return solver profile as Object.
+<pre>var profile = core.getSolverProfile();
+core.log(JSON.stringify(profile));</pre></li>
+<li><b>setSolverProfile(index)</b> set solver profile by index. Valid values are from 1 to 8 as in GUI.</li>
+<li><b>setSolverProfile(profile)</b> set solver profile. Parameter is same as object returned by <i>getSolverProfile()</i> method</li>
+<li><b>question(question, buttons, title = "")</b> show dialog with question. First argument <i>question</i> is string. Second argument <i>buttons</i>
+    is array of following strings. "ok", "yes", "no", "yesall", "noall", "abort", "retry", "ignore", "cancel", "discard", "apply", "reset" Third argument <i>title</i> is optional string that show in title bar.
+    It return button that was clicked as a string.
+    <pre>var button = core.question("Apply to all files?", ["yes", "no"]);</pre>
+    </li>
+<li><b>plot(graph)</b> this method show graph defined by JS object.
+
+<pre>
+var chart = {
+    "title": "Chart title", // Title that will show on top of chart
+    "legend":
+    {
+        "visible": true,// default is true
+        "align": "left" // allowed values are "top", "right", "bottom", "left". default is "top"
+    },
+    "series":[ // array of data series
+        {
+            "title": "HFR",
+            "type": "bar", // type of the serie. Can be one of "line", "points", "linePoints", "bar"
+            "y":[2.5,3.1,2.6,2.2] // array of values
+        },
+        {
+            "title": "Ecc",
+            "y":[0.37, 0.4, 0.35, 0.25],
+            "color": "red" // color of serie. It can be name of color like "green" or RGB hex value "#ccddff"
+        },
+        {
+            "title": "Stars",
+            "type": "points", // type of serie. can be "line", "points", "linePoints" and "bar". Default is "line"
+            "shape": "star", // shape of markers. valid only for points
+            "x":[1, 2.5, 3.5, 6],// line, points and linePoints can also have "x" values. Otherwise it assume sequence 0,1,2 ...
+            "y":[523,412,487,510],
+            "y2": true, // if set to true this serie will use secondary Y axis
+            "bestFit": true, // show best fit line
+            "color": "#0000ff"
+        }
+    ]
+};
+
+core.plot(chart);
+</pre>
+</li>
+
 </ul>
 
 <h4>File</h4>

install.cmake

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

resources/grid.svg

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

resources/resources.qrc

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

scripts/convert to XISF

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

scripts/measure HFR

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

scripts/modify FITS header

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

scripts/plate solve

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

scripts/scripts.qrc

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

space.nouspiro.tenmon.metainfo.xml

@@ -58,6 +58,17 @@
     </screenshots>
     <content_rating type="oars-1.1"/>
     <releases>
+    <release version="20250429" date="2025-04-29">
+      <description>
+        <ul>
+          <li>Add ability to load multiple images in single file</li>
+          <li>New plot() and question() script methods</li>
+          <li>Color highlight of FITS keywords</li>
+          <li>New scripts to batch platesolve and measure stars</li>
+          <li>Stretch toolbar can now be vertical</li>
+        </ul>
+      </description>
+    </release>
     <release version="20250318" date="2025-03-18">
       <description>
         <ul>
@@ -107,7 +118,7 @@
     </release>
     <release version="20240816" date="2024-08-16">
       <description>
-        Fix saving image
+        <p>Fix saving image</p>
       </description>
     </release>
     <release version="20240616" date="2024-06-16">

space.nouspiro.tenmon.xisf.xml

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

src/batchprocessing.cpp

@@ -14,6 +14,7 @@
 #include <QChartView>
 #include <QLineSeries>
 #include "scriptengine.h"
+#include "chartgraph.h"
 
 #ifdef Q_OS_LINUX
 #include <QCloseEvent>
@@ -99,6 +100,7 @@ BatchProcessing::BatchProcessing(Database *database, QWidget *parent) : QDialog(
 
     connect(_ui->addFilesButton, &QPushButton::released, this, &BatchProcessing::addFiles);
     connect(_ui->addDirButton, &QPushButton::released, this, &BatchProcessing::addDir);
+    connect(_ui->addMarkedButton, &QPushButton::released, this, &BatchProcessing::addMarked);
     connect(_ui->removeButton, &QPushButton::released, this, &BatchProcessing::removePath);
     connect(_ui->removeAllButton, &QPushButton::released, this, &BatchProcessing::removeAllPaths);
     connect(_ui->startButton, &QPushButton::released, this, &BatchProcessing::runScript);
@@ -163,6 +165,17 @@ void BatchProcessing::addDir()
     }
 }
 
+void BatchProcessing::addMarked()
+{
+    QStringList files = _database->getMarkedFiles();
+    for(const QString &file : files)
+    {
+        QFileInfo info(file);
+        if(info.exists() && info.isReadable())
+            _ui->pathsList->addItem(file);
+    };
+}
+
 void BatchProcessing::removePath()
 {
     for(auto &item : _ui->pathsList->selectedItems())
@@ -271,31 +284,49 @@ QJSValue BatchProcessing::getItem(const QStringList &items, const QString &label
     return ok ? ret : QJSValue();
 }
 
-void BatchProcessing::plot(const QVector<QPointF> &points)
+QJSValue BatchProcessing::question(const QString &question, const QStringList &buttons, const QString &title)
 {
-    QDialog *diag = new QDialog(this);
+    QMessageBox::StandardButtons standardButtons = QMessageBox::NoButton;
-    diag->setAttribute(Qt::WA_DeleteOnClose);
+    if(buttons.contains("ok"))standardButtons |= QMessageBox::Ok;
-    diag->setModal(false);
+    if(buttons.contains("yes"))standardButtons |= QMessageBox::Yes;
-    diag->setWindowTitle(tr("Chart"));
+    if(buttons.contains("no"))standardButtons |= QMessageBox::No;
+    if(buttons.contains("yesall"))standardButtons |= QMessageBox::YesToAll;
+    if(buttons.contains("noall"))standardButtons |= QMessageBox::NoToAll;
+    if(buttons.contains("abort"))standardButtons |= QMessageBox::Abort;
+    if(buttons.contains("retry"))standardButtons |= QMessageBox::Retry;
+    if(buttons.contains("ignore"))standardButtons |= QMessageBox::Ignore;
+    if(buttons.contains("cancel"))standardButtons |= QMessageBox::Cancel;
+    if(buttons.contains("discard"))standardButtons |= QMessageBox::Discard;
+    if(buttons.contains("apply"))standardButtons |= QMessageBox::Apply;
+    if(buttons.contains("reset"))standardButtons |= QMessageBox::Reset;
+    if(standardButtons == QMessageBox::NoButton)standardButtons = QMessageBox::Ok;
 
-    QChartView *chartView = new QChartView(diag);
+    QMessageBox::StandardButton button = QMessageBox::question(this, title, question, standardButtons);
-    diag->setLayout(new QVBoxLayout);
+    QJSValue ret;
-    diag->layout()->addWidget(chartView);
+    switch(button)
+    {
+    default:
+    case QMessageBox::Ok: ret = "ok"; break;
+    case QMessageBox::Yes: ret = "yes";  break;
+    case QMessageBox::No: ret = "no"; break;
+    case QMessageBox::YesToAll: ret = "yesall"; break;
+    case QMessageBox::NoToAll: ret = "noall"; break;
+    case QMessageBox::Abort: ret = "abort"; break;
+    case QMessageBox::Retry: ret = "retry"; break;
+    case QMessageBox::Ignore: ret = "ignore"; break;
+    case QMessageBox::Cancel: ret = "cancel"; break;
+    case QMessageBox::Discard: ret = "discard"; break;
+    case QMessageBox::Apply: ret = "apply"; break;
+    case QMessageBox::Reset: ret = "reset"; break;
+    }
 
-    QChart *chart = new QChart;
+    return ret;
-    chart->setParent(chartView);
+}
 
-    auto series = new QLineSeries(chartView);
+void BatchProcessing::plot(const QVariant &graph)
-    series->append(points);
+{
-    chart->addSeries(series);
+    ChartGraph *chart = new ChartGraph(this);
-    chart->createDefaultAxes();
+    chart->plot(graph);
-    chart->setTitle("Simple line graph");
-    chart->legend()->hide();
-
-    chartView->setChart(chart);
-    chartView->setRenderHint(QPainter::Antialiasing);
-    diag->resize(640, 480);
-    diag->show();
 }
 
 void openDir(const QString &path)

src/batchprocessing.h

@@ -28,6 +28,7 @@ protected:
 public slots:
     void addFiles();
     void addDir();
+    void addMarked();
     void removePath();
     void removeAllPaths();
     void browse();
@@ -41,8 +42,9 @@ public slots:
     QJSValue getInt(const QString &label, int value);
     QJSValue getFloat(const QString &label, double value, int decimals);
     QJSValue getItem(const QStringList &items, const QString &label, int current);
+    QJSValue question(const QString &question, const QStringList &buttons, const QString &title = "");
 
-    void plot(const QVector<QPointF> &points);
+    void plot(const QVariant &graph);
 };
 
 void openDir(const QString &path);

src/batchprocessing.ui

@@ -52,6 +52,13 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QPushButton" name="addMarkedButton">
+         <property name="text">
+          <string>Add marked</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QPushButton" name="removeButton">
          <property name="text">

src/chartgraph.cpp

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

src/chartgraph.h

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

src/database.cpp

@@ -16,10 +16,29 @@ bool Database::init(const QLatin1String &connectionName)
     QDir dir(path);
 
     database = QSqlDatabase::addDatabase("QSQLITE", connectionName);
+    ngc = QSqlDatabase::addDatabase("QSQLITE", connectionName + "ngc");
 
     if(!dir.mkpath("."))
         return false;
 
+    if(ngc.isValid())
+    {
+        QString ngcDb = dir.absoluteFilePath("ngc.db");
+        if(!QFile::exists(ngcDb))
+            QFile::copy(":/ngc.db", ngcDb);
+
+        ngc.setDatabaseName(ngcDb);
+        if(ngc.open())
+        {
+            m_getNgc = QSqlQuery(ngc);
+            m_getNgc.prepare("SELECT *,IIF(V_Mag IS NULL, B_Mag, V_Mag) AS mag FROM ngc WHERE RA_deg BETWEEN ? AND ? AND DEC_deg BETWEEN ? AND ?");
+        }
+        else
+        {
+            qDebug() << "Could not open NGC database";
+        }
+    }
+
     if(database.isValid())
     {
         database.setDatabaseName(dir.absoluteFilePath("database2.db"));
@@ -182,7 +201,6 @@ void Database::indexDir(const QDir &dir, QProgressDialog *progress)
     QStringList scannedDirs;
     int count = countFiles(dir, scannedDirs);
     progress->setMaximum(count);
-    QSqlDatabase database = QSqlDatabase::database();
     database.transaction();
 
     scannedDirs.clear();
@@ -200,7 +218,6 @@ void Database::indexDir(const QDir &dir, QProgressDialog *progress)
 void Database::reindex(QProgressDialog *progress)
 {
     QVariantList deleteids;
-    QSqlDatabase database = QSqlDatabase::database();
     database.transaction();
     QSqlQuery size("SELECT COUNT(*) FROM fits_files", database);
     size.next();
@@ -239,6 +256,42 @@ QStringList Database::getFitsKeywords()
     return keywords;
 }
 
+QVector<SkyObject> Database::getObjects(double minRa, double maxRa, double minDec, double maxDec)
+{
+    QVector<SkyObject> objects;
+    if(!ngc.isOpen())return objects;
+
+    m_getNgc.bindValue(0, minRa);
+    m_getNgc.bindValue(1, maxRa);
+    m_getNgc.bindValue(2, minDec);
+    m_getNgc.bindValue(3, maxDec);
+
+    if(m_getNgc.exec())
+    {
+        while(m_getNgc.next())
+        {
+            QString name;
+            QString m = m_getNgc.value("M").toString();
+            QString ic = m_getNgc.value("IC").toString();
+            if(!m.isEmpty())name = "M" + m + " ";
+            if(!ic.isEmpty())name += "IC" + ic + " ";
+            name += m_getNgc.value("Name").toString();
+
+            objects.append({
+                name,
+                m_getNgc.value("Common names").toString(),
+                {m_getNgc.value("RA_deg").toDouble(), m_getNgc.value("DEC_deg").toDouble()},
+                m_getNgc.value("MajAx").toDouble(),
+                m_getNgc.value("MinAx").toDouble(),
+                m_getNgc.value("PosAng").toDouble(),
+                m_getNgc.value("mag").isNull() ? NAN : m_getNgc.value("mag").toDouble(),
+                {0, 0},
+            });
+        }
+    }
+    return objects;
+}
+
 bool Database::indexDir2(const QDir &dir, QProgressDialog *progress, QStringList &scannedDirs)
 {
     if(scannedDirs.contains(dir.canonicalPath()))return true;

src/database.h

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

src/imageinfo.cpp

@@ -2,6 +2,8 @@
 #include <QSettings>
 #include <QHeaderView>
 
+QMap<QString, QColor> headerHighlight;
+
 ImageInfo::ImageInfo(QWidget *parent) : QTreeWidget(parent)
 {
     setColumnCount(3);
@@ -25,7 +27,14 @@ void ImageInfo::setInfo(const ImageInfoData &info)
         QTreeWidgetItem *fitsHeader = new QTreeWidgetItem({tr("FITS Header")});
         for(const FITSRecord &record : info.fitsHeader)
         {
-            new QTreeWidgetItem(fitsHeader, {record.key, record.value.toString().left(1024), record.comment});
+            QTreeWidgetItem *item = new QTreeWidgetItem(fitsHeader, {record.key, record.value.toString().left(1024), record.comment});
+            if(headerHighlight.contains(record.key))
+            {
+                QColor color = headerHighlight[record.key];
+                item->setBackground(0, color);
+                item->setBackground(1, color);
+                item->setBackground(2, color);
+            }
         }
         addTopLevelItem(fitsHeader);
     }

src/imageinfodata.cpp

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

src/imageinfodata.h

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

src/imageringlist.cpp

@@ -294,6 +294,16 @@ void ImageRingList::setMarked()
     setFilesPrivate(files);
 }
 
+void ImageRingList::reloadImage()
+{
+    if(*m_currImage)
+    {
+        int index = (*m_currImage)->info().index;
+        (*m_currImage)->release();
+        (*m_currImage)->load(index, m_loadPool);
+    }
+}
+
 void ImageRingList::setLiveMode(bool live)
 {
     m_liveMode = live;

src/imageringlist.h

@@ -109,6 +109,7 @@ public slots:
     void prevSubImage();
     void nextSubImage();
     void setMarked();
+    void reloadImage();
 protected:
     void setFilesPrivate(const QStringList files, const QString &currentFile = QString());
     QList<ImagePtr>::iterator increment(QList<ImagePtr>::iterator iter);

src/imagescrollarea.cpp

@@ -142,6 +142,11 @@ void ImageScrollArea::falseColor(bool enable)
     m_imageWidget->falseColor(enable);
 }
 
+void ImageScrollArea::drawGrid(bool enable)
+{
+    m_imageWidget->drawGrid(enable);
+}
+
 QImage ImageScrollArea::renderToImage()
 {
     return m_imageWidget->renderToImage();

src/imagescrollarea.h

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

src/imagewidget.cpp

@@ -180,6 +180,10 @@ void ImageWidgetGL::setImage(std::shared_ptr<RawImage> image, int index)
 void ImageWidgetGL::setWCS(std::shared_ptr<WCSDataT> wcs)
 {
     m_wcs = wcs;
+    m_grid.clear();
+
+    if(m_drawGrid && m_wcs)
+        m_grid = m_wcs->prepareGrid(m_imgWidth, m_imgHeight, m_database);
 }
 
 void ImageWidgetGL::zoom(int zoom, const QPointF &mousePos)
@@ -496,6 +500,18 @@ void swPaint(std::shared_ptr<RawImage> &rawImage, float dx, float dy, float scal
     painter.drawImage(0, 0, img);
 }
 
+void ImageWidgetGL::drawGrid(bool enable)
+{
+    if(m_grid.empty && m_wcs)
+        m_grid = m_wcs->prepareGrid(m_imgWidth, m_imgHeight, m_database);
+
+    if(enable != m_drawGrid)
+    {
+        m_drawGrid = enable;
+        update();
+    }
+}
+
 void ImageWidgetGL::paintGL()
 {
     float dx = m_dx;
@@ -613,9 +629,43 @@ void ImageWidgetGL::paintGL()
             m_program->setUniformValue("colormapIdx", m_colormapIdx);
             f->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
             m_vao->release();
+
+            if(m_drawGrid && !m_grid.empty)
+            {
+                QPainter painter(this);
+                painter.setRenderHint(QPainter::Antialiasing);
+                painter.setRenderHint(QPainter::TextAntialiasing);
+
+                painter.setPen(QPen(Qt::yellow, 1.0 / m_scale));
+                QTransform tran;
+                tran.translate(-std::floor(dx), -std::floor(dy));
+                tran.scale(m_scale, m_scale);
+                painter.setTransform(tran);
+                painter.setClipRect(0, 0, m_imgWidth, m_imgHeight);
+                painter.drawPath(m_grid.grid);
+                painter.setPen(Qt::yellow);
+                QFont font({"Arial", "serif-sans"});
+                font.setPointSizeF(12 / m_scale);
+                painter.setFont(font);
+                for(auto &text : m_grid.text)
+                    painter.drawText(QRectF(text.first, QSizeF(4000, 4000)), text.second);
+
+                painter.setPen(QPen(Qt::green, 1.0 / m_scale));
+                QFontMetricsF fontMetric = QFontMetricsF(font);
+                for(auto &object : m_grid.objects)
+                {
+                    QRectF rect = fontMetric.boundingRect(object.name);
+                    rect.moveCenter(object.pixel);
+                    painter.setTransform(tran);
+                    painter.drawText(rect, Qt::TextDontClip, object.name);
+
+                    painter.translate(object.pixel);
+                    painter.rotate(object.pos_ang);
+                    painter.drawEllipse(QPointF(0, 0), object.maj_ax, object.maj_ax);
+                }
+            }
         }
     }
-
 }
 
 void ImageWidgetGL::resizeGL(int w, int h)

src/imagewidget.h

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

src/loadimage.cpp

@@ -248,7 +248,7 @@ bool loadXISF(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage
         }
 
         info.num = xisf.imagesCount();
-        info.index = index + 1;
+        info.index = index;
         info.wcs = std::make_shared<WCSDataT>(xisfImage.width(), xisfImage.height(), info.fitsHeader);
         info.info.append({QObject::tr("Width"), QString::number(xisfImage.width())});
         info.info.append({QObject::tr("Height"), QString::number(xisfImage.height())});

src/loadrunable.cpp

@@ -165,11 +165,12 @@ void writeFITSImage(fitsfile *fw, std::shared_ptr<RawImage> rawimage, ImageInfoD
         double vald = record.value.toDouble(&isdouble);
         int valb = record.value.toString() == "T";
         long long vall = record.value.toLongLong(&isint);
+        if(isint)isint = vall == vald;
         QByteArray str = record.value.toString().toLatin1();
-        if(isdouble)
+        if(isint)
-            fits_write_key(fw, TDOUBLE, record.key.data(), &vald, record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
-        else if(isint)
             fits_write_key(fw, TLONGLONG, record.key.data(), &vall, record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
+        else if(isdouble)
+            fits_write_key(fw, TDOUBLE, record.key.data(), &vald, record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
         else if(isbool)
             fits_write_key(fw, TLOGICAL, record.key.data(), &valb, record.comment.isEmpty() ? nullptr : record.comment.data(), &status);
         else if(record.key == "COMMENT")

src/main.cpp

@@ -4,10 +4,27 @@
 #include <QTranslator>
 #include <QCommandLineParser>
 #include <stdlib.h>
-#include "thumbnailer/genthumbnail.h"
+#include "../thumbnailer/genthumbnail.h"
+#include <QTreeView>
+#include <QFileSystemModel>
+#include <QTimer>
 
 int main(int argc, char *argv[])
 {
+
+    QApplication app(argc, argv);
+    QFileSystemModel model;
+    QTreeView treeView;
+
+
+    QTimer::singleShot(5000, [&model,&treeView](){
+        treeView.setModel(&model);
+        model.setRootPath("/home");
+    });
+    treeView.resize(800, 600);
+    treeView.show();
+    return app.exec();
+
 #ifdef __linux__
     setenv("LC_NUMERIC", "C", 1);
 #endif

src/mainwindow.cpp

@@ -92,6 +92,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     connect(m_stretchPanel, &StretchToolbar::invert, m_image, &ImageScrollArea::invert);
     connect(m_stretchPanel, &StretchToolbar::superPixel, m_image, &ImageScrollArea::superPixel);
     connect(m_stretchPanel, &StretchToolbar::falseColor, m_image, &ImageScrollArea::falseColor);
+    connect(m_stretchPanel, &StretchToolbar::drawGrid, m_image, &ImageScrollArea::drawGrid);
 
     m_ringList = new ImageRingList(m_database, nameFilter, this);
     m_filesystem = new FilesystemWidget(m_ringList, this);
@@ -166,6 +167,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     connect(m_ringList, &ImageRingList::pixmapLoaded, histogram, &Histogram::imageLoaded);
 #ifdef PLATESOLVER
     connect(m_ringList, &ImageRingList::pixmapLoaded, _plateSolving, &PlateSolving::imageLoaded);
+    connect(_plateSolving, &PlateSolving::headerUpdated, m_ringList, &ImageRingList::reloadImage);
 #endif
     connect(m_image, &ImageScrollArea::fileDropped, this, static_cast<void (MainWindow::*)(const QString &)>(&MainWindow::loadFile));
 
@@ -251,7 +253,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
         settings.setValue("mainwindow/colormap", data);
     });
 
-
     QAction *thumbnailsAction = viewMenu->addAction(tr("Thumbnails"), Qt::Key_F2, [this](bool checked){
         if(SettingsDialog::loadThumbsizes())m_ringList->clearThumbnails();
         m_image->allocateThumbnails(m_ringList->imageNames());
@@ -262,6 +263,10 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     thumbnailsAction->setCheckable(true);
     QAction *slideshowAction = viewMenu->addAction(tr("Slideshow"), Qt::Key_F3, m_ringList, &ImageRingList::toggleSlideshow);
     slideshowAction->setCheckable(true);
+    viewMenu->addSeparator();
+    auto actionList = m_stretchPanel->actions();
+    actionList.removeFirst();
+    viewMenu->addActions(actionList);
     menuBar()->addMenu(viewMenu);
 
     QMenu *selectMenu = new QMenu(tr("Select"), this);

src/platesolving.cpp

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

src/platesolving.h

@@ -32,6 +32,8 @@ public slots:
     void updateHeader();
     void imageLoaded(Image *image);
     void settings();
+signals:
+    void headerUpdated(const QString &path);
 private:
     Ui::PlateSolving *_ui;
 };

src/scriptengine.cpp

@@ -26,7 +26,9 @@ ScriptEngine::ScriptEngine(Database *database, BatchProcessing *parent)
     QJSValue core = _jsEngine->newQObject(this);
     _jsEngine->globalObject().setProperty("core", core);
     QJSValue fitsRecordObject = _jsEngine->newQMetaObject(&FITSRecordModify::staticMetaObject);
+    QJSValue textFile = _jsEngine->newQMetaObject(&TextFile::staticMetaObject);
     _jsEngine->globalObject().setProperty("FITSRecordModify", fitsRecordObject);
+    _jsEngine->globalObject().setProperty("TextFile", textFile);
     _semaphore.release(_pool->maxThreadCount());
     _pool->setThreadPriority(QThread::LowPriority);
 
@@ -90,6 +92,55 @@ bool ScriptEngine::isMarked(const File *file)
     return ret;
 }
 
+QJSValue ScriptEngine::getObjects(double ra, double dec, double distance)
+{
+    QVector<SkyObject> objects;
+    QMetaObject::invokeMethod(_database, [this, ra, dec, distance](){
+        return _database->getObjects(ra - distance, ra + distance, dec - distance, dec + distance); }, Qt::BlockingQueuedConnection, &objects);
+
+    QJSValue ret = newArray(objects.size());
+    qint32 i = 0;
+    for(auto &object : objects)
+    {
+        QJSValue jsObj = newObject();
+        jsObj.setProperty("name", object.name);
+        jsObj.setProperty("name2", object.name2);
+        jsObj.setProperty("ra", object.skyPoint.RA());
+        jsObj.setProperty("dec", object.skyPoint.DEC());
+        jsObj.setProperty("mag", object.mag);
+        ret.setProperty(i++, jsObj);
+    }
+
+    return ret;
+}
+
+QJSValue ScriptEngine::getObjects(const QJSValue &bounds)
+{
+    QVector<SkyObject> objects;
+    double minRa = bounds.property("minRA").toNumber();
+    double maxRa = bounds.property("maxRA").toNumber();
+    double minDec = bounds.property("minDEC").toNumber();
+    double maxDec = bounds.property("maxDEC").toNumber();
+
+    QMetaObject::invokeMethod(_database, [this, minRa, maxRa, minDec, maxDec](){
+        return _database->getObjects(minRa, maxRa, minDec, maxDec); }, Qt::BlockingQueuedConnection, &objects);
+
+    QJSValue ret = newArray(objects.size());
+    qint32 i = 0;
+    for(auto &object : objects)
+    {
+        QJSValue jsObj = newObject();
+        jsObj.setProperty("name", object.name);
+        jsObj.setProperty("name2", object.name2);
+        jsObj.setProperty("ra", object.skyPoint.RA());
+        jsObj.setProperty("dec", object.skyPoint.DEC());
+        jsObj.setProperty("mag", object.mag);
+        ret.setProperty(i++, jsObj);
+    }
+
+    return ret;
+}
+
 void ScriptEngine::setMaxThread(int maxthread)
 {
     int newval = std::max(std::min(QThread::idealThreadCount(), maxthread), 1);
@@ -134,18 +185,38 @@ QJSValue ScriptEngine::getItem(const QStringList &items, const QString &label, i
     return ret;
 }
 
-void ScriptEngine::plot(const QJSValue &pointsArray)
+QJSValue ScriptEngine::question(const QString &question, const QStringList &buttons, const QString &title) const
 {
-    if(pointsArray.isArray())
+    QJSValue ret;
+    QMetaObject::invokeMethod(_parent, "question", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QJSValue, ret), Q_ARG(QString, question), Q_ARG(QStringList, buttons), Q_ARG(QString, title));
+    return ret;
+}
+
+void ScriptEngine::plot(const QJSValue &graph)
+{
+    QVariant graphV = graph.toVariant(QJSValue::ConvertJSObjects);
+    if(graphV.isValid())
+        QMetaObject::invokeMethod(_parent, "plot", Qt::QueuedConnection, Q_ARG(QVariant, graphV));
+    else
+        logError("Invalid value to be plotted");
+}
+
+QJSValue ScriptEngine::openFile(const QString &fileName, const QString &mode)
+{
+    QFileInfo info(fileName);
+    if(!info.isAbsolute())
+        info = QFileInfo(outputDir() + fileName);
+
+    TextFile *textFile = new TextFile;
+    if(textFile->open(info.absoluteFilePath(), mode))
     {
-        int len = pointsArray.property("length").toInt();
+        return _jsEngine->newQObject(textFile);
-        QVector<QPointF> points;
+    }
-        for(int i = 0; i < len; i++)
+    else
-        {
+    {
-            QJSValue point = pointsArray.property(i);
+        logError("Failed to open file " + fileName);
-            points.append(QPointF(point.property("x").toNumber(), point.property("y").toNumber()));
+        delete textFile;
-        }
+        return false;
-        QMetaObject::invokeMethod(_parent, "plot", Qt::QueuedConnection, Q_ARG(QVector<QPointF>, points));
     }
 }
 
@@ -241,7 +312,7 @@ void ScriptEngine::setStartingSolution(const QJSValue &solution)
     if(solution.isObject())
     {
         if(solution.hasProperty("ra") && solution.hasProperty("dec") && solution.property("ra").isNumber() && solution.property("dec").isNumber())
-            _solver->setSearchPosition(solution.property("ra").toNumber(), solution.property("dec").toNumber());
+            _solver->setSearchPosition(solution.property("ra").toNumber() / 15.0, solution.property("dec").toNumber());
 
         if(solution.hasProperty("pixscale") && solution.property("pixscale").isNumber())
         {
@@ -388,12 +459,14 @@ void File::loadFitsKeywords()
         {
             readXISFHeader(_path, info);
         }
-        else if(suffix().toLower() == "fits" || suffix().toLower() == "fit")
+        else if(suffix().toLower() == "fits" || suffix().toLower() == "fit" || suffix().toLower() == "fz")
         {
             readFITSHeader(_path, info);
         }
         else return;
 
+        _wcs = info.wcs;
+
         for(auto &record : info.fitsHeader)
         {
             _fitsKeywords.append(record.key);
@@ -766,6 +839,24 @@ QJSValue File::stats()
     return _stats;
 }
 
+QJSValue File::calculatedBounds()
+{
+    QJSValue ret = _engine->newObject();
+    loadFitsKeywords();
+    if(_wcs)
+    {
+        double minRa, maxRa, minDec, maxDec, crVal1, crVal2;
+        _wcs->calculateBounds(minRa, maxRa, minDec, maxDec, crVal1, crVal2);
+        ret.setProperty("minRA", minRa);
+        ret.setProperty("maxRA", maxRa);
+        ret.setProperty("minDEC", minDec);
+        ret.setProperty("maxDEC", maxDec);
+        ret.setProperty("crVal1", crVal1);
+        ret.setProperty("crVal2", crVal2);
+    }
+    return ret;
+}
+
 #ifdef PLATESOLVER
 QJSValue File::solve(bool updateHeader)
 {
@@ -835,4 +926,60 @@ void FITSRecordModify::addKeyword(const QString &key, const QVariant &value, con
     _update.append({key.toLatin1(), value, comment.toLatin1()});
 }
 
+bool TextFile::open(const QString &path, const QString &mode)
+{
+    _fr.setFileName(path);
+    QIODevice::OpenMode openMode;
+    if(mode == "r")
+        openMode = QIODevice::ReadOnly;
+    else if(mode == "w")
+        openMode = QIODevice::WriteOnly;
+    else if(mode == "a")
+        openMode = QIODevice::WriteOnly | QIODevice::Append;
+    else if(mode == "r+")
+        openMode = QIODevice::ReadWrite | QIODevice::ExistingOnly;
+    else if(mode == "w+")
+        openMode = QIODevice::ReadWrite;
+    else if(mode == "a+")
+        openMode = QIODevice::ReadWrite | QIODevice::Append;
+    else
+        return false;
+
+    openMode |= QIODevice::Text;//always open as text
+    return _fr.open(openMode);
+}
+
+void TextFile::write(const QString &data)
+{
+    _fr.write(data.toUtf8());
+}
+
+QString TextFile::read(int maxlen)
+{
+    QByteArray data = _fr.read(maxlen);
+    return data;
+}
+
+QString TextFile::readLine()
+{
+    QByteArray data = _fr.readLine();
+    return QString::fromUtf8(data);
+}
+
+QString TextFile::readAll()
+{
+    QByteArray data = _fr.readAll();
+    return QString::fromUtf8(data);
+}
+
+bool TextFile::seek(qint64 offset)
+{
+    return _fr.seek(offset);
+}
+
+qint64 TextFile::pos()
+{
+    return _fr.pos();
+}
+
 }

src/scriptengine.h

@@ -8,7 +8,7 @@
 #include <QThreadPool>
 #include <QSemaphore>
 #include "database.h"
-#include "imageinfo.h"
+#include "imageinfodata.h"
 
 class BatchProcessing;
 class Solver;
@@ -41,13 +41,17 @@ public:
     Q_INVOKABLE void mark(File *file);
     Q_INVOKABLE void unmark(File *file);
     Q_INVOKABLE bool isMarked(const File *file);
+    Q_INVOKABLE QJSValue getObjects(double ra, double dec, double distance);
+    Q_INVOKABLE QJSValue getObjects(const QJSValue &bounds);
     Q_INVOKABLE void setMaxThread(int maxthread);
     Q_INVOKABLE void sync();
     Q_INVOKABLE QJSValue getString(const QString &label = QString(), const QString &text = QString()) const;
     Q_INVOKABLE QJSValue getInt(const QString &label = QString(), int value = 0);
     Q_INVOKABLE QJSValue getFloat(const QString &label = QString(), double value = 0, int decimals = 3) const;
     Q_INVOKABLE QJSValue getItem(const QStringList &items, const QString &label = "", int current = 0) const;
+    Q_INVOKABLE QJSValue question(const QString &question, const QStringList &buttons = {"ok"}, const QString &title = "") const;
     Q_INVOKABLE void plot(const QJSValue &pointsArray);
+    Q_INVOKABLE QJSValue openFile(const QString &fileName, const QString &mode = "r");
     bool convert(File *file, QString &outpath, const QString &format, const QVariantMap &params, bool async);
 #ifdef PLATESOLVER
     Q_INVOKABLE void setSolverProfile(int index);
@@ -94,6 +98,7 @@ class File : public QObject
     bool _fitsKeywordsLoaded = false;
     QStringList _fitsKeywords;
     QMultiHash<QString, FITSRecord> _fitsRecords;
+    std::shared_ptr<WCSDataT> _wcs;
     void loadFitsKeywords();
     bool mkpath(const QString &path) const;
     QJSValue _stats;
@@ -122,6 +127,7 @@ public:
     Q_INVOKABLE File* convert(const QString &outpath, const QString &format, const QVariantMap &params = QVariantMap());
     Q_INVOKABLE File* convertAsync(const QString &outpath, const QString &format, const QVariantMap &params = QVariantMap());
     Q_INVOKABLE QJSValue stats();
+    Q_INVOKABLE QJSValue calculatedBounds();
 #ifdef PLATESOLVER
     Q_INVOKABLE QJSValue solve(bool updateHeader = false);
     Q_INVOKABLE QJSValue extractStars(bool hfr);
@@ -143,6 +149,20 @@ public:
     Q_INVOKABLE void addKeyword(const QString &key, const QVariant &value, const QString &comment = QString());
 };
 
+class TextFile : public QObject
+{
+    Q_OBJECT
+    QFile _fr;
+public:
+    bool open(const QString &path, const QString &mode);
+    Q_INVOKABLE void write(const QString &data);
+    Q_INVOKABLE QString read(int maxlen);
+    Q_INVOKABLE QString readLine();
+    Q_INVOKABLE QString readAll();
+    Q_INVOKABLE bool seek(qint64 offset);
+    Q_INVOKABLE qint64 pos();
+};
+
 }
 
 #endif // SCRIPTENGINE_H

src/settingsdialog.cpp

@@ -10,12 +10,15 @@
 #include <QMessageBox>
 #include <QDir>
 #include <QPushButton>
+#include <QLineEdit>
+#include <QColorDialog>
 #include "rawimage.h"
 
 extern int DEFAULT_WIDTH;
 extern double SATURATION;
 extern int FILTERING;
 extern bool BESTFIT;
+extern QMap<QString, QColor> headerHighlight;
 
 class EvenNumber : public QSpinBox
 {
@@ -86,6 +89,45 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
     m_bestFit->setToolTip(tr("Set Best Fit zoom level when opening new image."));
     m_bestFit->setChecked(BESTFIT);
 
+    m_headerHighlight = new QListWidget(this);
+    m_headerHighlight->setToolTip(tr("List of FITS keywords that will be highlighted in Image info"));
+    for(auto i = headerHighlight.begin(); i != headerHighlight.end(); i++)
+    {
+        QListWidgetItem *item = new QListWidgetItem(m_headerHighlight);
+        item->setText(i.key());
+        item->setBackground(i.value());
+    }
+    m_keyword = new QLineEdit(this);
+    m_keyword->setPlaceholderText(tr("FITS keyword"));
+    QPushButton *color = new QPushButton(this);
+    QPixmap pix(16, 16);
+    pix.fill(m_color);
+    color->setIcon(pix);
+    connect(color, &QPushButton::clicked, [this, color](){
+        QColor rgb = QColorDialog::getColor(m_color, this);
+        if(rgb.isValid())
+        {
+            QPixmap pix(16, 16);
+            pix.fill(rgb);
+            color->setIcon(pix);
+            m_color = rgb;
+        }
+    });
+
+    QPushButton *add = new QPushButton(tr("Add keyword highlight"), this);
+    connect(add, &QPushButton::clicked, [this](){
+        auto list = m_headerHighlight->findItems(m_keyword->text(), Qt::MatchFixedString | Qt::MatchCaseSensitive);
+        if(list.size())return;
+        QListWidgetItem *item = new QListWidgetItem(m_headerHighlight);
+        item->setText(m_keyword->text());
+        item->setBackground(m_color);
+    });
+    QPushButton *remove = new QPushButton(tr("Remove keyword highlight"), this);
+    connect(remove, &QPushButton::clicked, [this](){
+        auto list = m_headerHighlight->selectedItems();
+        for(auto item : list)
+            delete item;
+    });
 
     layout->addRow(tr("Image preload count"), m_preloadImages);
     layout->addRow(tr("Thumbnails size"), m_thumSize);
@@ -95,6 +137,10 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
     layout->addRow(m_qualityThumbnail);
     layout->addRow(m_useNativeDialog);
     layout->addRow(m_bestFit);
+    layout->addRow(new QLabel(tr("FITS header highlight"), this));
+    layout->addRow(m_headerHighlight);
+    layout->addRow(m_keyword, color);
+    layout->addRow(add, remove);
 
 #ifdef Q_OS_WIN64
     QPushButton *installThumbnailer = new QPushButton(tr("Install"), this);
@@ -125,6 +171,11 @@ void SettingsDialog::loadSettings()
     FILTERING = settings.value("settings/filtering", FILTERING).toInt();
     QUALITY_RESIZE = settings.value("settings/qualitythumbnail", QUALITY_RESIZE).toBool();
     BESTFIT = settings.value("settings/bestfit", BESTFIT).toBool();
+    QStringList keywords = settings.value("settings/headerhighlightkeywords").toStringList();
+    QStringList colors = settings.value("settings/headerhighlightcolors").toStringList();
+    for(int i = 0; i < std::min(keywords.size(), colors.size()); i++)
+        headerHighlight.insert(keywords[i], QColor::fromString(colors[i]));
+
     QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, settings.value("settings/dontusenativedialogs", false).toBool());
 }
 
@@ -175,4 +226,15 @@ void SettingsDialog::saveSettings()
     QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, m_useNativeDialog->isChecked());
     if(DEFAULT_WIDTH != m_preloadImages->value())
         emit preloadChanged(m_preloadImages->value());
+
+    headerHighlight.clear();
+    QStringList colors;
+    for(int i = 0; i < m_headerHighlight->count(); i++)
+    {
+        auto item = m_headerHighlight->item(i);
+        colors.push_back(item->background().color().name());
+        headerHighlight[item->text()] = item->background().color();
+    }
+    settings.setValue("settings/headerhighlightkeywords", headerHighlight.keys());
+    settings.setValue("settings/headerhighlightcolors", colors);
 }

src/settingsdialog.h

@@ -5,6 +5,7 @@
 #include <QSpinBox>
 #include <QCheckBox>
 #include <QComboBox>
+#include <QListWidget>
 
 class SettingsDialog : public QDialog
 {
@@ -28,6 +29,9 @@ private:
     QCheckBox *m_qualityThumbnail;
     QComboBox *m_filtering;
     QCheckBox *m_bestFit;
+    QListWidget *m_headerHighlight;
+    QColor m_color = Qt::yellow;
+    QLineEdit *m_keyword;
 };
 
 #endif // SETTINGSDIALOG_H

src/solver.cpp

@@ -41,7 +41,7 @@ bool Solver::loadImage(const QString &path)
     _loaded = false;
     std::shared_ptr<RawImage> image;
     ImageInfoData info;
-    if(::loadImage(path, info, image, true))
+    if(::loadImage(path, info, image, 0, true))
     {
         return loadImage(image, path);
     }
@@ -188,6 +188,7 @@ bool Solver::updateHeader(QString &error)
     modify.updateKeyword("EQUINOX", 2000, QByteArray("Equinox of coordinates"));
     bool ret = file.modifyFITSRecords(&modify);
     if(!ret)error = tr("Failed to update file header");
+    else emit headerUpdated(_path);
     return ret;
 }
 

src/solver.h

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

src/stfslider.cpp

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

src/stfslider.h

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

src/stretchtoolbar.cpp

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

src/stretchtoolbar.h

@@ -33,6 +33,7 @@ signals:
     void invert(bool enable);
     void superPixel(bool enable);
     void falseColor(bool enable);
+    void drawGrid(bool enable);
 };
 
 #endif // STRETCHTOOLBAR_H

thumbnailer/CMakeLists.txt

@@ -6,9 +6,9 @@ if(BUILD_THUMBNAILER)
             Dll.cpp
             loadimage.cpp
             TenmonThumbnailProvider.cpp
-            ../rawimage.h
+            ../src/rawimage.h
-            ../rawimage.cpp
+            ../src/rawimage.cpp
-            ../rawimage_sse.cpp)
+            ../src/rawimage_sse.cpp)
         set_target_properties(tenmonthumbnailer PROPERTIES PREFIX "")
 
         target_compile_definitions(tenmonthumbnailer PRIVATE NO_QT)
@@ -19,8 +19,8 @@ if(BUILD_THUMBNAILER)
         qt_add_executable(tenmonthumbnailer
             main.cpp
             loadimage.cpp
-            ../rawimage.cpp
+            ../src/rawimage.cpp
-            ../rawimage_sse.cpp)
+            ../src/rawimage_sse.cpp)
 
         target_link_libraries(tenmonthumbnailer PRIVATE ${FITS_LIB} XISF)
 

thumbnailer/TenmonThumbnailProvider.cpp

@@ -2,7 +2,7 @@
 #include <thumbcache.h> // For IThumbnailProvider.
 #include <new>
 #include "libxisf.h"
-#include "../rawimage.h"
+#include "../src/rawimage.h"
 
 bool loadXISF(const LibXISF::ByteArray &data, std::shared_ptr<RawImage> &rawImage);
 bool loadFITS(const LibXISF::ByteArray &data, std::shared_ptr<RawImage> &rawImage);

thumbnailer/genthumbnail.cpp

@@ -1,7 +1,6 @@
 #include "genthumbnail.h"
-#include "../rawimage.h"
+#include "../src/rawimage.h"
-#include "../loadimage.h"
+#include "../src/loadimage.h"
-
 
 int generateThumbnail(const QString &input, const QString &output, uint32_t size)
 {

thumbnailer/loadimage.cpp

@@ -1,5 +1,5 @@
 #include "libxisf.h"
-#include "../rawimage.h"
+#include "../src/rawimage.h"
 #ifdef WIN32
 #include <windows.h>
 #endif

thumbnailer/main.cpp

@@ -1,7 +1,7 @@
 #include <vector>
 #include <string>
 #include <iostream>
-#include "../rawimage.h"
+#include "../src/rawimage.h"
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #include "stb_image_write.h"