Compare commits
13 Commits
32f91d7b2f
...
20251101
| Author | SHA1 | Date | |
|---|---|---|---|
| 9e79133464 | |||
| e08107aa13 | |||
| 6eda2c4e48 | |||
| b16ae3a9ee | |||
| 56bba27ae3 | |||
| 1070dc32c1 | |||
| f61cf12f0a | |||
| 530b0c62c3 | |||
| 7e95440dd6 | |||
| 03492972cb | |||
| 9cca183677 | |||
| afd059b36b | |||
| 1b9f218acb |
+17
-3
@@ -61,7 +61,7 @@ This image should be 256 pixel wide. Each row of image will be used as separate
|
||||
<li>mid point - defines the value to be stretched to 50% intensity</li>
|
||||
<li>white point - all pixels with higher value (brighter) than this will be clipped white</li>
|
||||
</ul>
|
||||
<p>Following the slider are 7 buttons for automatic stretching:</p>
|
||||
<p>Following the slider are 8 buttons to control image display:</p>
|
||||
<ul>
|
||||
<li><i>Linked channels</i> toggle stretching each RGB channel individually.</li>
|
||||
<li><i>Auto Stretch</i> automatically apply black and mid points to render the image with optimal brightness.</li>
|
||||
@@ -70,6 +70,7 @@ This image should be 256 pixel wide. Each row of image will be used as separate
|
||||
<li><i>False colors</i> show black and white in false colour palette.</li>
|
||||
<li><i>Debayer CFA</i> Demosaicing black and white image from CFA sensor to color one.</li>
|
||||
<li><i>Apply Auto stretch on load</i> toggle automatically applying Autostretch for each image when loaded.</li>
|
||||
<li><i>Draw equatorial grid</i> toggle drawing equatorial coordinate grid and catalogue objects. Needs that file have WCS data.</li>
|
||||
</ul>
|
||||
|
||||
<h3>Marking images</h3>
|
||||
@@ -134,12 +135,24 @@ solver.
|
||||
<p>Then finally there are various action button. Settings button show dialog where you can set path to existing index files or auto download some.
|
||||
Extract button will just extract stars from image and it will show their count, HFR and eccentricity. This action doesn't need index files.
|
||||
Solve button will try to find coordinates of images. Abort button will stop extraction or solving. Update FITS header will update FITS fits keywords
|
||||
with found solution.
|
||||
with found solution.</p>
|
||||
|
||||
<p>In settings dialog you can set path to index files which is by default custom internal one. It also try to locate commonly used path from other
|
||||
programs like KStars for astrometry.net index files.
|
||||
</p>
|
||||
|
||||
<h3>File Manager</h3>
|
||||
<p>
|
||||
This is simple double panel file manager. It can show columns with selected FITS keywords. Each panel have tabs where it easily switch between
|
||||
multiple directories. You can copy or move files and directories either inside one panel or between two panels by selecting and then dragging.
|
||||
By default files are copies. To move then press Shift key before start dragging. Double click on file will open it in main window if it is image
|
||||
or other file it will open default program that is associated with it this file type. You can also drag file to other programs like from default
|
||||
file explorer programs that are in system or from file explorer to this program.
|
||||
</p>
|
||||
<p>
|
||||
In menu you can select which FITS keywords will be showed. Temporarilly disable loading FITS header or copy file paths of selected files as text.
|
||||
</p>
|
||||
|
||||
<h3>Batch processing</h3>
|
||||
<p>This module allow to write scripts in JavaScript that process image files. Batch Processing window consist from three main parts. On top is list of input files and directories.
|
||||
You can add directories or individual files to this list. Directories are scanned recursively to find all files even non image files. This list of files is then passed to script in array named <b>files</b>.
|
||||
@@ -159,7 +172,8 @@ this output directory is ignored.</p>
|
||||
<p>Bellow that is list of scripts. These scripts are located in application data directory. Select script which you want to run by clicking on it. Clicking on <i>Open scripts</i> will open directory with these scripts where you create new and edit them.
|
||||
Location of this directory is on Windows: "C:/Users/<USER>/AppData/Roaming/nou/Tenmon/scripts" Linux: "~/.local/share/nou/Tenmon/scripts" MacOS: "~/Library/Application Support/nou/Tenmon/scripts"</p>
|
||||
|
||||
<p>Next is Log windows that contain any messages that come from scripts. Mainly calls to <code>core.log()</code> At bottom there buttons that can start or stop execution of selected scripts.</p>
|
||||
<p>Next is Log windows that contain any messages that come from scripts. Mainly calls to <code>core.log()</code> At bottom there is console that enable run simple script commands and
|
||||
buttons that can start or stop execution of selected scripts.</p>
|
||||
|
||||
<h4>core</h4>
|
||||
<p>There is global object called <b>core</b> that have these methods.</p>
|
||||
|
||||
@@ -51,6 +51,17 @@ na ktorej sa dajú nastaviť tri body.
|
||||
<li>stredný bod - pixeli s touto hodnotou budú zobrazené ako 50% šedá</li>
|
||||
<li>biely bod - pixeli nad touto hodnotou budú zobrazené ako biele</li>
|
||||
</ul>
|
||||
<p>Nasleduje 8 tlačidiel pre nastavenie zobrazenie obrázka:</p>
|
||||
<ul>
|
||||
<li><i>Prepojené kanály</i> prepína medzi nataihnutím jasových urovní pre každý RGB kanál zvlášť alebo jednotné pre všetky kanály.</li>
|
||||
<li><i>Automatické natiahnutie</i> automaticky nastavý čierny, šedý a biely bod pre optimálne zobrazenie..</li>
|
||||
<li><i>Resetuj funkciu prevodu na obrazovku</i> nastavý hodnoty čierneho, šedého a bieleho bodu na východzie hodnoty.</li>
|
||||
<li><i>Invertuj farby</i> invertuje zobrazené farby a zobrazý obrázok ako negatív.</li>
|
||||
<li><i>Falošné farby</i> pre zobrazenie čiernobielych obrázkov sa použije farebná paleta.</li>
|
||||
<li><i>Preved CFA na farbu</i> Demosaicing black and white image from CFA sensor to color one.</li>
|
||||
<li><i>Aplikuj automatické natiahnutie pri načítaní</i> pri zapnutí </li>
|
||||
<li><i>Vykresli equatoriálnu mriežku</i> zapína zobrazenie equatoriálnej mriežky. Je poitrebné aby súbor obsahoval WCS dáta.</li>
|
||||
</ul>
|
||||
<p>Prvé tlačidlo prepína prepojenie nastavenia čierneho, stretdného a bieleho bodu. Po prepnutí sa dá každý farebný kanál nastaviť
|
||||
samostatne.
|
||||
Nasleduje tlačidlo ktoré nastaví hodnoty čierneho a stredného bodu tak aby bol obrázok zobrazený optimálnym jasom.
|
||||
@@ -94,6 +105,34 @@ V nasledovnom príklade sa vyhľadajú súbory ktoré majú v mene súboru "Bias
|
||||
zástupný znak za hocijaký reťazec znakov aj žiadny. Znak _ je tiež zástupný znak zastupujúci práve jeden znak.
|
||||
Bez použitia zástupných znakov sa vyhľadá iba presný výskyt.</p>
|
||||
|
||||
<h3>Plate Solving</h3>
|
||||
<p>Tento modul umožnuje vyriešiť obrázok a určiť RA, DEC koordináty a aktualizovať FITS a XISF súbory s WCS dátami.
|
||||
<b>Profil</b> toto nastavuje rôzne parametre ovplivňujúce extrahovanie hviezd a hľadanie koordinátov.
|
||||
<b>Štartovný bod</b> program sa pokúsi automaticky určiť bod začiatku hľadania koordinátov pre zrýchlenie hľadania.
|
||||
Možete nechať jednu alebo obydve voľbi nezaškrtnuté kedy sa bude hľadať riešenie naslepo. Ak je pozícia alebo škála nesprávna hľadanie môže zlyhať.
|
||||
<b>Riešenie</b> táto časť obsahuje výsledné riešenie hľadania ako sú RA,DEC koordináty stredu obrázku, veľkosť zorného poľa, uhol natočenia v stupňoch,
|
||||
škála obrázku v arcsekundách na pixel, počet nájdených hviezd a veľkosť hviezd HFR a excentricita. Potom je tu ešte okno so záznamom z riešenia.
|
||||
</p>
|
||||
<p>Pod tým je tlačidlo pre nastavenie cesty k indexovým súborom a ich stiahnutie. Je možné buď stiahnuť indexové súbory alebo použiť už existujúce súbory.
|
||||
Tlačidlo Extrahovať nájde hviezdy a zobrazý ich počet veľkosť HFR a excentricitu. Na toto nie sú potrebné indexové súbory.
|
||||
Tlačidlo Vyriešiť sa pokúsi nájsť koordináty obrázka. Zrušiť preruší hľadanie riešenia. Aktualizovať FITS hlavičku zapíše najdené riešenie do súboru.</p>
|
||||
|
||||
<p>In settings dialog you can set path to index files which is by default custom internal one. It also try to locate commonly used path from other
|
||||
programs like KStars for astrometry.net index files.
|
||||
</p>
|
||||
|
||||
<h3>File Manager</h3>
|
||||
<p>
|
||||
This is simple double panel file manager. It can show columns with selected FITS keywords. Each panel have tabs where it easily switch between
|
||||
multiple directories. You can copy or move files and directories either inside one panel or between two panels by selecting and then dragging.
|
||||
By default files are copies. To move then press Shift key before start dragging. Double click on file will open it in main window if it is image
|
||||
or other file it will open default program that is associated with it this file type. You can also drag file to other programs like from default
|
||||
file explorer programs that are in system or from file explorer to this program.
|
||||
</p>
|
||||
<p>
|
||||
In menu you can select which FITS keywords will be showed. Temporarilly disable loading FITS header or copy file paths of selected files as text.
|
||||
</p>
|
||||
|
||||
<h3>Hromadné spracovanie</h3>
|
||||
|
||||
Tento modul umožnuje písanie skriptov v JavaScripte ktoré spracujú súbory obrázkov. Okno Hromadného spracovanie pozostáva z troch častí. Navrchu je zoznam vstupných súborov a adresárov.
|
||||
@@ -109,6 +148,12 @@ V skripte potom cez toto pole iteruje nasledovne.
|
||||
}
|
||||
</pre>
|
||||
|
||||
<p>Pod týmto zoznamom je výstupný adresár. Všetky relatívne cesty predané do metod ako sú copy(), move() alebo convert() budú relatívne voči tomuto adresáru.
|
||||
Ak je ako argument použitá absolútna cesta tak je tento vystupný adresár ignorovaný.</p>
|
||||
|
||||
<p>Nasleduje logovacie okno kde sú zapisováné všetký výpisy z behu scriptu. Hlavne volania z <code>core.log()</code> Na spodu je konzola kde je možné vkladať jednoduché príkazy a nakoniec ešte tlačítka
|
||||
ktoré spúštať alebo zastavovať vybraný skript.</p>
|
||||
|
||||
<h4>core</h4>
|
||||
V skripte je dostupný globálny objekt nazvaný <b>core</b> ktorý má nasledovné metódy.
|
||||
<ul>
|
||||
|
||||
+1
-1
Submodule libXISF updated: c6581e1122...2e74d94641
@@ -33,6 +33,7 @@
|
||||
<li>Color space aware</li>
|
||||
<li>Histogram</li>
|
||||
<li>Scripting</li>
|
||||
<li>Plate solving</li>
|
||||
</ul>
|
||||
</description>
|
||||
<categories>
|
||||
@@ -58,6 +59,25 @@
|
||||
</screenshots>
|
||||
<content_rating type="oars-1.1"/>
|
||||
<releases>
|
||||
<release version="20251101" date="2025-11-01">
|
||||
<description>
|
||||
<ul>
|
||||
<li>Better image Save as</li>
|
||||
<li>Fix xisf file corruption when platesolving</li>
|
||||
<li>Add selecting language</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release version="20250915" date="2025-09-15">
|
||||
<description>
|
||||
<ul>
|
||||
<li>Draw equatorial grid and objects overlay</li>
|
||||
<li>File Manager</li>
|
||||
<li>Support for PCL:AstrometricSolution</li>
|
||||
<li>Script console</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release version="20250429" date="2025-04-29">
|
||||
<description>
|
||||
<ul>
|
||||
|
||||
+83
-4
@@ -13,6 +13,7 @@
|
||||
#include <QChart>
|
||||
#include <QChartView>
|
||||
#include <QLineSeries>
|
||||
#include <QCompleter>
|
||||
#include "scriptengine.h"
|
||||
#include "chartgraph.h"
|
||||
|
||||
@@ -110,6 +111,31 @@ BatchProcessing::BatchProcessing(Database *database, QWidget *parent) : QDialog(
|
||||
|
||||
_textColor = _ui->log->palette().text().color();
|
||||
|
||||
_engine = new Script::ScriptEngine(_database, this);
|
||||
connect(_engine, &Script::ScriptEngine::newMessage, this, &BatchProcessing::newMessage);
|
||||
|
||||
_completerModel = new QStringListModel(this);
|
||||
_completer = new QCompleter(_completerModel, this);
|
||||
_ui->consoleLineEdit->setCompleter(_completer);
|
||||
connect(_ui->executeButton, &QPushButton::clicked, _ui->consoleLineEdit, &QLineEdit::returnPressed);
|
||||
connect(_ui->consoleLineEdit, &QLineEdit::returnPressed, [this](){
|
||||
if(!_completer->popup()->isVisible())
|
||||
{
|
||||
QString program = _ui->consoleLineEdit->text();
|
||||
QJSValue val = _engine->eval(program);
|
||||
_ui->consoleLineEdit->addLine();
|
||||
//qDebug() << val.toString();
|
||||
}
|
||||
});
|
||||
|
||||
connect(_ui->consoleLineEdit, &QLineEdit::textEdited, [this](const QString &text){
|
||||
QStringList comp = _engine->complete(text);
|
||||
//qDebug() << comp;
|
||||
_completerModel->setStringList(comp);
|
||||
});
|
||||
|
||||
_ui->addFilesButton->setAutoDefault(false);
|
||||
|
||||
QSettings settings;
|
||||
_ui->outputPath->setText(settings.value("batchprocessing/outputpath", QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).first()).toString());
|
||||
}
|
||||
@@ -143,6 +169,15 @@ void BatchProcessing::closeEvent(QCloseEvent *event)
|
||||
}
|
||||
}
|
||||
|
||||
void BatchProcessing::refreshPaths()
|
||||
{
|
||||
QStringList paths;
|
||||
for(int i=0; i<_ui->pathsList->count(); i++)
|
||||
paths.append(_ui->pathsList->item(i)->text());
|
||||
_paths = scanDirectories(paths);
|
||||
_engine->setParams("", _paths, _ui->outputPath->text());
|
||||
}
|
||||
|
||||
void BatchProcessing::addFiles()
|
||||
{
|
||||
QSettings settings;
|
||||
@@ -152,6 +187,7 @@ void BatchProcessing::addFiles()
|
||||
_ui->pathsList->addItems(files);
|
||||
settings.setValue("batchprocessing/inputpath", QFileInfo(files.first()).absolutePath());
|
||||
}
|
||||
refreshPaths();
|
||||
}
|
||||
|
||||
void BatchProcessing::addDir()
|
||||
@@ -163,6 +199,7 @@ void BatchProcessing::addDir()
|
||||
_ui->pathsList->addItem(dir);
|
||||
settings.setValue("batchprocessing/inputpath", dir);
|
||||
}
|
||||
refreshPaths();
|
||||
}
|
||||
|
||||
void BatchProcessing::addMarked()
|
||||
@@ -174,17 +211,20 @@ void BatchProcessing::addMarked()
|
||||
if(info.exists() && info.isReadable())
|
||||
_ui->pathsList->addItem(file);
|
||||
};
|
||||
refreshPaths();
|
||||
}
|
||||
|
||||
void BatchProcessing::removePath()
|
||||
{
|
||||
for(auto &item : _ui->pathsList->selectedItems())
|
||||
delete item;
|
||||
refreshPaths();
|
||||
}
|
||||
|
||||
void BatchProcessing::removeAllPaths()
|
||||
{
|
||||
_ui->pathsList->clear();
|
||||
refreshPaths();
|
||||
}
|
||||
|
||||
void BatchProcessing::browse()
|
||||
@@ -208,9 +248,6 @@ void BatchProcessing::runScript()
|
||||
_engineThread = new Script::ScriptEngineThread(_database, this);
|
||||
connect(_engineThread, &Script::ScriptEngineThread::newMessage, this, &BatchProcessing::newMessage);
|
||||
connect(_engineThread, &Script::ScriptEngineThread::finished, this, &BatchProcessing::scriptFinished);
|
||||
QStringList paths;
|
||||
for(int i=0; i<_ui->pathsList->count(); i++)
|
||||
paths.append(_ui->pathsList->item(i)->text());
|
||||
|
||||
QFileInfo outDir(_ui->outputPath->text());
|
||||
if(outDir.exists() && outDir.isWritable())
|
||||
@@ -221,7 +258,7 @@ void BatchProcessing::runScript()
|
||||
else
|
||||
script = ":/scripts/" + script;
|
||||
|
||||
_engineThread->setParams(script, scanDirectories(paths), _ui->outputPath->text());
|
||||
_engineThread->setParams(script, _paths, _ui->outputPath->text());
|
||||
_engineThread->start();
|
||||
_ui->startButton->setEnabled(false);
|
||||
_ui->stopButton->setEnabled(true);
|
||||
@@ -329,6 +366,48 @@ void BatchProcessing::plot(const QVariant &graph)
|
||||
chart->plot(graph);
|
||||
}
|
||||
|
||||
ConsoleLine::ConsoleLine(QWidget *parent) : QLineEdit(parent)
|
||||
{
|
||||
}
|
||||
|
||||
void ConsoleLine::addLine()
|
||||
{
|
||||
QString line = text();
|
||||
clear();
|
||||
if(_history.size() && _history.last() == line)return;
|
||||
|
||||
_history.append(line);
|
||||
if(_history.size() > 100)_history.removeFirst();
|
||||
_currentLine = _history.size();
|
||||
}
|
||||
|
||||
void ConsoleLine::keyReleaseEvent(QKeyEvent *event)
|
||||
{
|
||||
if(event->key() == Qt::Key_Up)
|
||||
{
|
||||
_currentLine--;
|
||||
if(_currentLine < 0)
|
||||
{
|
||||
_currentLine = -1;
|
||||
clear();
|
||||
return;
|
||||
}
|
||||
setText(_history.at(_currentLine));
|
||||
}
|
||||
else if(event->key() == Qt::Key_Down)
|
||||
{
|
||||
_currentLine++;
|
||||
if(_currentLine >= _history.size())
|
||||
{
|
||||
_currentLine = _history.size();
|
||||
clear();
|
||||
return;
|
||||
}
|
||||
setText(_history.at(_currentLine));
|
||||
}
|
||||
else QLineEdit::keyReleaseEvent(event);
|
||||
}
|
||||
|
||||
void openDir(const QString &path)
|
||||
{
|
||||
#ifdef Q_OS_LINUX
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
|
||||
#include <QDialog>
|
||||
#include <QFileSystemWatcher>
|
||||
#include <QStringListModel>
|
||||
#include <QCompleter>
|
||||
#include <QLineEdit>
|
||||
#include "scriptengine.h"
|
||||
|
||||
namespace Ui { class BatchProcessing; }
|
||||
@@ -16,8 +19,12 @@ class BatchProcessing : public QDialog
|
||||
QString _scriptBasePath;
|
||||
QFileSystemWatcher _fileWatcher;
|
||||
Script::ScriptEngineThread *_engineThread = nullptr;
|
||||
Script::ScriptEngine *_engine = nullptr;
|
||||
QColor _textColor;
|
||||
Database *_database;
|
||||
QStringListModel *_completerModel = nullptr;
|
||||
QCompleter *_completer = nullptr;
|
||||
QList<QPair<QString, QString>> _paths;
|
||||
private slots:
|
||||
void scanScriptDir();
|
||||
public:
|
||||
@@ -25,6 +32,7 @@ public:
|
||||
~BatchProcessing();
|
||||
protected:
|
||||
void closeEvent(QCloseEvent *event);
|
||||
void refreshPaths();
|
||||
public slots:
|
||||
void addFiles();
|
||||
void addDir();
|
||||
@@ -47,6 +55,18 @@ public slots:
|
||||
void plot(const QVariant &graph);
|
||||
};
|
||||
|
||||
class ConsoleLine : public QLineEdit
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit ConsoleLine(QWidget *parent = nullptr);
|
||||
void addLine();
|
||||
void keyReleaseEvent(QKeyEvent *event) override;
|
||||
private:
|
||||
int _currentLine = 0;
|
||||
QStringList _history;
|
||||
};
|
||||
|
||||
void openDir(const QString &path);
|
||||
|
||||
#endif // BATCHPROCESSING_H
|
||||
|
||||
+63
-33
@@ -43,6 +43,9 @@
|
||||
<property name="text">
|
||||
<string>Add files</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
@@ -50,6 +53,9 @@
|
||||
<property name="text">
|
||||
<string>Add directories</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
@@ -57,6 +63,9 @@
|
||||
<property name="text">
|
||||
<string>Add marked</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
@@ -64,6 +73,9 @@
|
||||
<property name="text">
|
||||
<string>Remove</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
@@ -71,6 +83,9 @@
|
||||
<property name="text">
|
||||
<string>Remove all</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
@@ -98,6 +113,9 @@
|
||||
<property name="text">
|
||||
<string>Browse</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
@@ -129,6 +147,9 @@
|
||||
<property name="text">
|
||||
<string>Open scripts</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
@@ -171,23 +192,30 @@
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
<widget class="ConsoleLine" name="consoleLineEdit">
|
||||
<property name="placeholderText">
|
||||
<string>Console</string>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="executeButton">
|
||||
<property name="text">
|
||||
<string>Execute</string>
|
||||
</property>
|
||||
</spacer>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="startButton">
|
||||
<property name="text">
|
||||
<string>Start script</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
@@ -198,12 +226,8 @@
|
||||
<property name="text">
|
||||
<string>Stop script</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="closeButton">
|
||||
<property name="text">
|
||||
<string>Close</string>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -211,23 +235,29 @@
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>ConsoleLine</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>batchprocessing.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<tabstops>
|
||||
<tabstop>pathsList</tabstop>
|
||||
<tabstop>addFilesButton</tabstop>
|
||||
<tabstop>addDirButton</tabstop>
|
||||
<tabstop>addMarkedButton</tabstop>
|
||||
<tabstop>removeButton</tabstop>
|
||||
<tabstop>removeAllButton</tabstop>
|
||||
<tabstop>browseButton</tabstop>
|
||||
<tabstop>openScriptsButton</tabstop>
|
||||
<tabstop>scriptsList</tabstop>
|
||||
<tabstop>consoleLineEdit</tabstop>
|
||||
<tabstop>startButton</tabstop>
|
||||
<tabstop>stopButton</tabstop>
|
||||
<tabstop>outputPath</tabstop>
|
||||
<tabstop>log</tabstop>
|
||||
</tabstops>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>closeButton</sender>
|
||||
<signal>released()</signal>
|
||||
<receiver>BatchProcessing</receiver>
|
||||
<slot>close()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>973</x>
|
||||
<y>745</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>511</x>
|
||||
<y>383</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
||||
+334
-5
@@ -5,8 +5,214 @@
|
||||
#include <QSettings>
|
||||
#include <QStandardPaths>
|
||||
#include <QDesktopServices>
|
||||
#include <QMimeData>
|
||||
#include <QClipboard>
|
||||
#include <QThread>
|
||||
#include <QDirIterator>
|
||||
#include "loadimage.h"
|
||||
|
||||
class FileTimes
|
||||
{
|
||||
public:
|
||||
explicit FileTimes(const QString &path)
|
||||
{
|
||||
QFile file(path);
|
||||
#ifndef Q_OS_WIN
|
||||
birthTime = file.fileTime(QFileDevice::FileBirthTime);
|
||||
#endif
|
||||
modificationTime = file.fileTime(QFileDevice::FileModificationTime);
|
||||
accessTime = file.fileTime(QFileDevice::FileAccessTime);
|
||||
}
|
||||
void apply(const QString &path)
|
||||
{
|
||||
QFile file(path);
|
||||
if(file.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::ExistingOnly))
|
||||
{
|
||||
#ifndef Q_OS_WIN // Only windows allow changing birth time
|
||||
file.setFileTime(birthTime, QFileDevice::FileBirthTime);
|
||||
#endif
|
||||
file.setFileTime(accessTime, QFileDevice::FileAccessTime);
|
||||
file.setFileTime(modificationTime, QFileDevice::FileModificationTime);
|
||||
}
|
||||
}
|
||||
private:
|
||||
QDateTime birthTime;
|
||||
QDateTime modificationTime;
|
||||
QDateTime accessTime;
|
||||
};
|
||||
|
||||
FileTransfer::FileTransfer(FileManager *fm) :
|
||||
_fm(fm)
|
||||
{
|
||||
}
|
||||
|
||||
FileTransfer::~FileTransfer()
|
||||
{
|
||||
_run = false;
|
||||
}
|
||||
|
||||
void FileTransfer::copy(const QStringList &src, const QString &dst)
|
||||
{
|
||||
_run = true;
|
||||
perform(src, dst, true);
|
||||
emit finished();
|
||||
}
|
||||
|
||||
void FileTransfer::move(const QStringList &src, const QString &dst)
|
||||
{
|
||||
_run = true;
|
||||
perform(src, dst, false);
|
||||
emit finished();
|
||||
}
|
||||
|
||||
void FileTransfer::cancel()
|
||||
{
|
||||
_run = false;
|
||||
}
|
||||
|
||||
void FileTransfer::perform(const QStringList &src, const QString &dst, bool copy)
|
||||
{
|
||||
QDir dstDir(dst);
|
||||
if(!dstDir.exists())
|
||||
{
|
||||
emit error(tr("Error"), tr("Destination directory %1 doesn't exists").arg(dstDir.absolutePath()));
|
||||
return;
|
||||
}
|
||||
|
||||
QList<Action> actions;
|
||||
QStringList dirs;
|
||||
|
||||
emit progress(0);
|
||||
|
||||
for(const QString &i : src)
|
||||
{
|
||||
QFileInfo srcInfo(i);
|
||||
if(srcInfo.absolutePath() == dst || dst.startsWith(srcInfo.absoluteFilePath()))
|
||||
return;
|
||||
|
||||
if(srcInfo.isDir())
|
||||
{
|
||||
QDir srcDir(i);
|
||||
//qDebug() << "dir" << srcInfo.absoluteFilePath() << srcInfo.fileName();
|
||||
if(!copy && !dstDir.exists(srcInfo.fileName()))
|
||||
{
|
||||
if(QFile::rename(srcInfo.absoluteFilePath(), dstDir.absoluteFilePath(srcInfo.fileName())))
|
||||
continue;
|
||||
}
|
||||
actions.append({srcInfo.absoluteFilePath(), srcInfo.fileName(), true});
|
||||
if(!copy)dirs.prepend(srcInfo.absoluteFilePath());
|
||||
QDirIterator it(i, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
|
||||
while(it.hasNext())
|
||||
{
|
||||
QFileInfo info = it.nextFileInfo();
|
||||
if(info.fileName() == "." || info.fileName() == "..")
|
||||
continue;
|
||||
|
||||
QString relativePath = srcDir.dirName() + "/" + srcDir.relativeFilePath(info.absoluteFilePath());
|
||||
if(info.isDir())
|
||||
{
|
||||
actions.append({"", relativePath, true});
|
||||
if(!copy)dirs.prepend(info.absoluteFilePath());
|
||||
//qDebug() << "dir" << info.absoluteFilePath() << relativePath;
|
||||
}
|
||||
else
|
||||
{
|
||||
actions.append({info.absoluteFilePath(), dstDir.absoluteFilePath(relativePath), false});
|
||||
//qDebug() << "file" << info.absoluteFilePath() << dstDir.absoluteFilePath(relativePath);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
actions.append({srcInfo.absoluteFilePath(), dstDir.absoluteFilePath(srcInfo.fileName())});
|
||||
//qDebug() << "file" << srcInfo.absoluteFilePath() << dstDir.absoluteFilePath(srcInfo.fileName());
|
||||
}
|
||||
}
|
||||
|
||||
bool overwriteAll = false;
|
||||
bool skipAll = false;
|
||||
int total = actions.size();
|
||||
int i = 0;
|
||||
for(auto &a : actions)
|
||||
{
|
||||
if(!_run)
|
||||
return;
|
||||
|
||||
if(a.dir)
|
||||
{
|
||||
dstDir.mkpath(a.dst);
|
||||
}
|
||||
else
|
||||
{
|
||||
QFileInfo dstInfo(a.dst);
|
||||
if(dstInfo.exists())
|
||||
{
|
||||
if(overwriteAll)
|
||||
{
|
||||
QFile::remove(dstInfo.absoluteFilePath());
|
||||
}
|
||||
else if(skipAll)
|
||||
{
|
||||
emit progress(i++ * 100 / total);
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
QMessageBox::StandardButton ret;
|
||||
QMetaObject::invokeMethod(_fm, "overwrite", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QMessageBox::StandardButton, ret), Q_ARG(QString, dstInfo.fileName()));
|
||||
switch(ret)
|
||||
{
|
||||
case QMessageBox::YesToAll:
|
||||
overwriteAll = true;//break; is intentionally missing
|
||||
case QMessageBox::Yes:
|
||||
QFile::remove(dstInfo.absoluteFilePath());
|
||||
break;
|
||||
case QMessageBox::NoToAll:
|
||||
skipAll = true;//break; is intentionally missing
|
||||
case QMessageBox::No:
|
||||
emit progress(i++ * 100 / total);
|
||||
continue;
|
||||
break;
|
||||
case QMessageBox::Cancel:
|
||||
return;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
FileTimes t(a.src);
|
||||
if(copy)
|
||||
{
|
||||
if(!QFile::copy(a.src, a.dst))
|
||||
{
|
||||
emit error(tr("Copy failed"), tr("Failed to copy file %1 to %2").arg(a.src).arg(a.dst));
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(!QFile::rename(a.src, a.dst))
|
||||
{
|
||||
emit error(tr("Move failed"), tr("Failed to move file %1 to %2").arg(a.src).arg(a.dst));
|
||||
return;
|
||||
}
|
||||
}
|
||||
t.apply(a.dst);
|
||||
}
|
||||
emit progress(i++ * 100 / total);
|
||||
}
|
||||
|
||||
if(!copy)
|
||||
{
|
||||
for(const QString &d : dirs)
|
||||
{
|
||||
QDir dir(d);
|
||||
if(dir.isEmpty())
|
||||
dir.removeRecursively();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
PathTabBar::PathTabBar(const QStringList &tabs) :
|
||||
_tabs(tabs)
|
||||
{
|
||||
@@ -147,6 +353,8 @@ FileManager::FileManager(const QSet<QString> &openFilter, QWidget *parent) : QMa
|
||||
connect(ui->rightTab, &DirView::dirChanged, _rightTabBar, &PathTabBar::pathChanged);
|
||||
connect(ui->leftTab, &DirView::openFile, this, &FileManager::openFile);
|
||||
connect(ui->rightTab, &DirView::openFile, this, &FileManager::openFile);
|
||||
connect(ui->leftTab, &DirView::filesAction, this, &FileManager::copyMoveFiles, Qt::QueuedConnection);
|
||||
connect(ui->rightTab, &DirView::filesAction, this, &FileManager::copyMoveFiles, Qt::QueuedConnection);
|
||||
connect(ui->actionLoad_FITS_keywordsLeft, &QAction::toggled, ui->leftTab, &DirView::loadFitsKeywords);
|
||||
connect(ui->actionLoad_FITS_keywordsRight, &QAction::toggled, ui->rightTab, &DirView::loadFitsKeywords);
|
||||
|
||||
@@ -165,6 +373,8 @@ FileManager::FileManager(const QSet<QString> &openFilter, QWidget *parent) : QMa
|
||||
|
||||
connect(ui->actionSelect_columnsLeft, &QAction::triggered, this, &FileManager::selectFITSKeywords);
|
||||
connect(ui->actionSelect_columnsRight, &QAction::triggered, this, &FileManager::selectFITSKeywords);
|
||||
connect(ui->actionCopySelectedFilesPathsLeft, &QAction::triggered, this, &FileManager::copySelectedFilesPaths);
|
||||
connect(ui->actionCopySelectedFilesPathsRight, &QAction::triggered, this, &FileManager::copySelectedFilesPaths);
|
||||
connect(ui->leftPath, &QLineEdit::returnPressed, this, &FileManager::pathEdited);
|
||||
connect(ui->rightPath, &QLineEdit::returnPressed, this, &FileManager::pathEdited);
|
||||
|
||||
@@ -175,6 +385,25 @@ FileManager::FileManager(const QSet<QString> &openFilter, QWidget *parent) : QMa
|
||||
ui->menuLeft_Tab->addAction(drive.absoluteFilePath(), [path, this](){ ui->leftTab->setDir(path); });
|
||||
ui->menuRight_Tab->addAction(drive.absoluteFilePath(), [path, this](){ ui->rightTab->setDir(path); });
|
||||
}
|
||||
|
||||
ui->progressBar->hide();
|
||||
ui->cancelButton->hide();
|
||||
|
||||
_thread = new QThread(this);
|
||||
_thread->start();
|
||||
_fileTransfer = new FileTransfer(this);
|
||||
_fileTransfer->moveToThread(_thread);
|
||||
connect(_fileTransfer, &FileTransfer::progress, ui->progressBar, &QProgressBar::setValue);
|
||||
connect(_fileTransfer, &FileTransfer::error, this, &FileManager::errorMessage);
|
||||
connect(_fileTransfer, &FileTransfer::finished, [this](){
|
||||
ui->leftTab->setDragEnabled(true);
|
||||
ui->rightTab->setDragEnabled(true);
|
||||
ui->progressBar->hide();
|
||||
ui->cancelButton->hide();
|
||||
});
|
||||
connect(this, &FileManager::copy, _fileTransfer, &FileTransfer::copy);
|
||||
connect(this, &FileManager::move, _fileTransfer, &FileTransfer::move);
|
||||
connect(ui->cancelButton, &QPushButton::clicked, [this](){ _fileTransfer->cancel(); });
|
||||
}
|
||||
|
||||
FileManager::~FileManager()
|
||||
@@ -190,6 +419,12 @@ FileManager::~FileManager()
|
||||
settings.setValue("filemanager/rightLoadFitsKeywords", ui->actionLoad_FITS_keywordsRight->isChecked());
|
||||
settings.setValue("filemanager/geometry", saveGeometry());
|
||||
delete ui;
|
||||
|
||||
_fileTransfer->cancel();
|
||||
_thread->quit();
|
||||
_thread->wait();
|
||||
|
||||
delete _fileTransfer;
|
||||
}
|
||||
|
||||
void FileManager::selectFITSKeywords()
|
||||
@@ -213,6 +448,14 @@ void FileManager::selectFITSKeywords()
|
||||
}
|
||||
}
|
||||
|
||||
void FileManager::copySelectedFilesPaths()
|
||||
{
|
||||
if(sender() == ui->actionCopySelectedFilesPathsLeft)
|
||||
ui->leftTab->copySelectedFilesPathsToClipboard();
|
||||
if(sender() == ui->actionCopySelectedFilesPathsRight)
|
||||
ui->rightTab->copySelectedFilesPathsToClipboard();
|
||||
}
|
||||
|
||||
void FileManager::pathEdited()
|
||||
{
|
||||
if(sender() == ui->leftPath)
|
||||
@@ -229,6 +472,40 @@ void FileManager::pathEdited()
|
||||
}
|
||||
}
|
||||
|
||||
void FileManager::copyMoveFiles(Qt::DropAction action, const QStringList &src, const QString &dst)
|
||||
{
|
||||
ui->leftTab->setDragEnabled(false);
|
||||
ui->rightTab->setDragEnabled(false);
|
||||
ui->progressBar->show();
|
||||
ui->cancelButton->show();
|
||||
|
||||
switch(action)
|
||||
{
|
||||
case Qt::CopyAction:
|
||||
emit copy(src, dst);
|
||||
break;
|
||||
case Qt::MoveAction:
|
||||
emit move(src, dst);
|
||||
break;
|
||||
case Qt::LinkAction:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
QMessageBox::StandardButton FileManager::overwrite(const QString &dst)
|
||||
{
|
||||
QMessageBox::StandardButton button = QMessageBox::question(this, tr("Overwrite file?"), tr("Destination file %1 already exists. Overwrite?").arg(dst),
|
||||
QMessageBox::Yes | QMessageBox::YesToAll | QMessageBox::No | QMessageBox::NoToAll | QMessageBox::Cancel);
|
||||
|
||||
return button;
|
||||
}
|
||||
|
||||
void FileManager::errorMessage(const QString &title, const QString &text)
|
||||
{
|
||||
QMessageBox::critical(this, title, text);
|
||||
}
|
||||
|
||||
QCache<QString, ImageInfoData>* DirFileSystemModel::getCacheInstance()
|
||||
{
|
||||
static bool init = true;
|
||||
@@ -241,7 +518,8 @@ QCache<QString, ImageInfoData>* DirFileSystemModel::getCacheInstance()
|
||||
return &cache;
|
||||
}
|
||||
|
||||
DirFileSystemModel::DirFileSystemModel(QObject *parent) : QFileSystemModel(parent)
|
||||
DirFileSystemModel::DirFileSystemModel(QWidget *parentWidget) : QFileSystemModel(parentWidget)
|
||||
,_parentWidget(parentWidget)
|
||||
{
|
||||
_cache = getCacheInstance();
|
||||
setFilter(QDir::AllEntries | QDir::NoDot);
|
||||
@@ -272,7 +550,9 @@ const QStringList &DirFileSystemModel::FITSKeywords() const
|
||||
|
||||
Qt::ItemFlags DirFileSystemModel::flags(const QModelIndex &index) const
|
||||
{
|
||||
return QFileSystemModel::flags(index) & ~Qt::ItemIsEditable;
|
||||
Qt::ItemFlags ret = QFileSystemModel::flags(index) & ~Qt::ItemIsEditable;
|
||||
if(index.row() == 0)ret &= ~Qt::ItemIsDragEnabled;
|
||||
return ret;
|
||||
}
|
||||
|
||||
int DirFileSystemModel::columnCount(const QModelIndex &parent) const
|
||||
@@ -335,6 +615,21 @@ bool DirFileSystemModel::hasChildren(const QModelIndex &parent) const
|
||||
return QFileSystemModel::hasChildren(parent);
|
||||
}
|
||||
|
||||
bool DirFileSystemModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
|
||||
{
|
||||
Q_UNUSED(row);
|
||||
Q_UNUSED(column);
|
||||
if(data->hasUrls())
|
||||
{
|
||||
QStringList srcPaths;
|
||||
for(auto &url : data->urls())
|
||||
srcPaths.append(url.toLocalFile());
|
||||
emit filesAction(action, srcPaths, filePath(parent));
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
void DirFileSystemModel::loadFitsKeywords(bool enable)
|
||||
{
|
||||
_loadFitsKeywords = enable;
|
||||
@@ -348,6 +643,8 @@ DirView::DirView(QWidget *parent) : QTreeView(parent)
|
||||
setDragEnabled(true);
|
||||
setAcceptDrops(true);
|
||||
|
||||
connect(_dirFileSystemModel, &DirFileSystemModel::filesAction, this, &DirView::filesAction);
|
||||
|
||||
setModel(_dirFileSystemModel);
|
||||
setSelectionMode(QAbstractItemView::ExtendedSelection);
|
||||
|
||||
@@ -382,10 +679,21 @@ void DirView::setDir(const QString &path)
|
||||
if(oldPath.left(ROOT_LEN) != path.left(ROOT_LEN))
|
||||
_dirFileSystemModel->setRootPath(path.left(ROOT_LEN));
|
||||
|
||||
_dirFileSystemModel->setDir(path);
|
||||
setRootIndex(_dirFileSystemModel->index(path, 0));
|
||||
QString newPath = path;
|
||||
if(!QFileInfo::exists(path))
|
||||
{
|
||||
QDir dir(path);
|
||||
do
|
||||
{
|
||||
dir.setPath(QDir::cleanPath(dir.filePath("..")));
|
||||
}while(!dir.exists() && !dir.isRoot());
|
||||
newPath = dir.path();
|
||||
}
|
||||
|
||||
_dirFileSystemModel->setDir(newPath);
|
||||
setRootIndex(_dirFileSystemModel->index(newPath, 0));
|
||||
clearSelection();
|
||||
if(oldPath != path)emit dirChanged(path);
|
||||
if(oldPath != newPath)emit dirChanged(newPath);
|
||||
}
|
||||
|
||||
QString DirView::dir() const
|
||||
@@ -435,3 +743,24 @@ void DirView::loadFitsKeywords(bool enable)
|
||||
{
|
||||
_dirFileSystemModel->loadFitsKeywords(enable);
|
||||
}
|
||||
|
||||
void DirView::copySelectedFilesPathsToClipboard() const
|
||||
{
|
||||
QList<QUrl> urls;
|
||||
QString text;
|
||||
auto selected = selectionModel()->selectedRows();
|
||||
for(auto &item : selected)
|
||||
{
|
||||
if(item.column() == 0)
|
||||
{
|
||||
QString path = _dirFileSystemModel->filePath(item);
|
||||
text.append(path); text.append('\n');
|
||||
urls.append(QUrl::fromLocalFile(path));
|
||||
}
|
||||
}
|
||||
QClipboard *clipboard = QApplication::clipboard();
|
||||
QMimeData *mimeData = new QMimeData();
|
||||
mimeData->setUrls(urls);
|
||||
mimeData->setText(text);
|
||||
clipboard->setMimeData(mimeData);
|
||||
}
|
||||
|
||||
+50
-6
@@ -8,6 +8,7 @@
|
||||
#include <QDialog>
|
||||
#include <QTabBar>
|
||||
#include <QHBoxLayout>
|
||||
#include <QMessageBox>
|
||||
#include "imageinfodata.h"
|
||||
|
||||
namespace Ui {
|
||||
@@ -15,6 +16,34 @@ class FileManager;
|
||||
class FITSKeyword;
|
||||
}
|
||||
|
||||
class FileManager;
|
||||
|
||||
class FileTransfer: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit FileTransfer(FileManager *fm);
|
||||
~FileTransfer();
|
||||
public slots:
|
||||
void copy(const QStringList &src, const QString &dst);
|
||||
void move(const QStringList &src, const QString &dst);
|
||||
void cancel();
|
||||
signals:
|
||||
void progress(int percent);
|
||||
void finished();
|
||||
void error(const QString &title, const QString &text);
|
||||
private:
|
||||
void perform(const QStringList &src, const QString &dst, bool copy);
|
||||
struct Action
|
||||
{
|
||||
QString src;
|
||||
QString dst;
|
||||
bool dir = false;
|
||||
};
|
||||
FileManager *_fm;
|
||||
bool _run = true;
|
||||
};
|
||||
|
||||
class PathTabBar : public QTabBar
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -51,25 +80,28 @@ public:
|
||||
~FileManager();
|
||||
public slots:
|
||||
void selectFITSKeywords();
|
||||
void copySelectedFilesPaths();
|
||||
void pathEdited();
|
||||
void copyMoveFiles(Qt::DropAction action, const QStringList &src, const QString &dst);
|
||||
QMessageBox::StandardButton overwrite(const QString &dst);
|
||||
void errorMessage(const QString &title, const QString &text);
|
||||
signals:
|
||||
void openFile(const QString &path);
|
||||
void copy(const QStringList &src, const QString &dst);
|
||||
void move(const QStringList &src, const QString &dst);
|
||||
private:
|
||||
Ui::FileManager *ui;
|
||||
PathTabBar *_leftTabBar;
|
||||
PathTabBar *_rightTabBar;
|
||||
QThread *_thread;
|
||||
FileTransfer *_fileTransfer;
|
||||
};
|
||||
|
||||
class DirFileSystemModel : public QFileSystemModel
|
||||
{
|
||||
Q_OBJECT
|
||||
mutable QCache<QString, ImageInfoData> *_cache = nullptr;
|
||||
static QCache<QString, ImageInfoData>* getCacheInstance();
|
||||
QModelIndex _dir;
|
||||
QStringList _fitsKeywords;
|
||||
bool _loadFitsKeywords = true;
|
||||
public:
|
||||
explicit DirFileSystemModel(QObject *parent = nullptr);
|
||||
explicit DirFileSystemModel(QWidget *parentWidget);
|
||||
void setDir(const QString &path);
|
||||
QString dir() const;
|
||||
void setFITSKeywords(const QStringList &keywords);
|
||||
@@ -79,8 +111,18 @@ public:
|
||||
QVariant data(const QModelIndex &index, int role) const override;
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
|
||||
bool hasChildren(const QModelIndex &parent) const override;
|
||||
bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
|
||||
public slots:
|
||||
void loadFitsKeywords(bool enable);
|
||||
signals:
|
||||
void filesAction(Qt::DropAction action, const QStringList &src, const QString &dst);
|
||||
private:
|
||||
mutable QCache<QString, ImageInfoData> *_cache = nullptr;
|
||||
static QCache<QString, ImageInfoData>* getCacheInstance();
|
||||
QModelIndex _dir;
|
||||
QStringList _fitsKeywords;
|
||||
bool _loadFitsKeywords = true;
|
||||
QWidget *_parentWidget = nullptr;
|
||||
};
|
||||
|
||||
class DirView : public QTreeView
|
||||
@@ -98,9 +140,11 @@ public:
|
||||
public slots:
|
||||
void headerContextMenu(const QPoint &pos);
|
||||
void loadFitsKeywords(bool enable);
|
||||
void copySelectedFilesPathsToClipboard() const;
|
||||
signals:
|
||||
void dirChanged(const QString &path);
|
||||
void openFile(const QString &path);
|
||||
void filesAction(Qt::DropAction action, const QStringList &src, const QString &dst);
|
||||
};
|
||||
|
||||
#endif // FILEMANAGER_H
|
||||
|
||||
+47
-7
@@ -14,24 +14,52 @@
|
||||
<string>File Manager</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="centralwidget">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="leftLayout">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLineEdit" name="leftPath"/>
|
||||
<layout class="QVBoxLayout" name="leftLayout">
|
||||
<item>
|
||||
<widget class="QLineEdit" name="leftPath"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="DirView" name="leftTab"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="DirView" name="leftTab"/>
|
||||
<layout class="QVBoxLayout" name="rightLayout">
|
||||
<item>
|
||||
<widget class="QLineEdit" name="rightPath"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="DirView" name="rightTab"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="rightLayout">
|
||||
<layout class="QHBoxLayout" name="progressLayout">
|
||||
<item>
|
||||
<widget class="QLineEdit" name="rightPath"/>
|
||||
<widget class="QProgressBar" name="progressBar">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||
<horstretch>1</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="DirView" name="rightTab"/>
|
||||
<widget class="QPushButton" name="cancelButton">
|
||||
<property name="text">
|
||||
<string>Cancel</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
@@ -52,6 +80,7 @@
|
||||
</property>
|
||||
<addaction name="actionLoad_FITS_keywordsLeft"/>
|
||||
<addaction name="actionSelect_columnsLeft"/>
|
||||
<addaction name="actionCopySelectedFilesPathsLeft"/>
|
||||
<addaction name="separator"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuRight_Tab">
|
||||
@@ -60,6 +89,7 @@
|
||||
</property>
|
||||
<addaction name="actionLoad_FITS_keywordsRight"/>
|
||||
<addaction name="actionSelect_columnsRight"/>
|
||||
<addaction name="actionCopySelectedFilesPathsRight"/>
|
||||
<addaction name="separator"/>
|
||||
</widget>
|
||||
<addaction name="menuLeft_Tab"/>
|
||||
@@ -97,6 +127,16 @@
|
||||
<string>Select columns</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionCopySelectedFilesPathsLeft">
|
||||
<property name="text">
|
||||
<string>Copy selected files paths</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionCopySelectedFilesPathsRight">
|
||||
<property name="text">
|
||||
<string>Copy selected files paths</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
|
||||
@@ -453,7 +453,8 @@ SkyGrid WCSDataT::prepareGrid(uint32_t w, uint32_t h, Database *database)
|
||||
|
||||
if(database)
|
||||
{
|
||||
skyGrid.objects = database->getObjects(minRa, maxRa, minDec, maxDec);
|
||||
double size = std::max(maxRa - minRa, maxDec - minDec);
|
||||
skyGrid.objects = database->getObjects(minRa - size, maxRa + size, minDec - size, maxDec + size);
|
||||
for(auto &object : skyGrid.objects)
|
||||
{
|
||||
QPointF p;
|
||||
|
||||
+5
-1
@@ -193,7 +193,11 @@ void ConvertRunable::run()
|
||||
QFileInfo info(m_outfile);
|
||||
info.dir().mkpath(".");
|
||||
|
||||
if(m_params.autostretch)
|
||||
if(m_params.stretch)
|
||||
{
|
||||
rawimage->applySTF(m_params.mtf);
|
||||
}
|
||||
else if(m_params.autostretch)
|
||||
{
|
||||
rawimage->calcStats();
|
||||
MTFParam mtfParam = rawimage->calcMTFParams();
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
#include <QSemaphore>
|
||||
#include <QSize>
|
||||
#include "imageinfodata.h"
|
||||
#include "mtfparam.h"
|
||||
|
||||
class Image;
|
||||
|
||||
@@ -33,6 +34,8 @@ public:
|
||||
QSize resize;
|
||||
Qt::AspectRatioMode aspect = Qt::KeepAspectRatio;
|
||||
bool autostretch = false;
|
||||
bool stretch = false;
|
||||
MTFParam mtf;
|
||||
ConvertParams(){}
|
||||
ConvertParams(const QVariantMap &map);
|
||||
};
|
||||
|
||||
+14
-2
@@ -3,6 +3,7 @@
|
||||
#include <QSurfaceFormat>
|
||||
#include <QTranslator>
|
||||
#include <QCommandLineParser>
|
||||
#include <QSettings>
|
||||
#include <stdlib.h>
|
||||
#include "../thumbnailer/genthumbnail.h"
|
||||
|
||||
@@ -76,8 +77,19 @@ int main(int argc, char *argv[])
|
||||
|
||||
QTranslator translator;
|
||||
QTranslator translator2;
|
||||
if(translator.load(QLocale(), "tenmon", "_", ":/translations"))
|
||||
a.installTranslator(&translator);
|
||||
QSettings settings;
|
||||
QString lang = settings.value("settings/lang").toString();
|
||||
if(lang.isEmpty())
|
||||
{
|
||||
if(translator.load(QLocale(), "tenmon", "_", ":/translations"))
|
||||
a.installTranslator(&translator);
|
||||
}
|
||||
else
|
||||
{
|
||||
if(translator.load("tenmon_" + lang, ":/translations"))
|
||||
a.installTranslator(&translator);
|
||||
}
|
||||
|
||||
if(translator2.load(QLocale(), "tenmon", "_", a.applicationDirPath()))
|
||||
a.installTranslator(&translator2);
|
||||
|
||||
|
||||
+27
-15
@@ -18,6 +18,7 @@
|
||||
#include <QThreadPool>
|
||||
#include <QStatusBar>
|
||||
#include <QImageReader>
|
||||
#include <QImageWriter>
|
||||
#include <QMimeDatabase>
|
||||
#include <QDesktopServices>
|
||||
#include <QJsonDocument>
|
||||
@@ -57,12 +58,18 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
|
||||
for(auto format : supportedFormats)
|
||||
{
|
||||
QMimeType mimeType = db.mimeTypeForName(format);
|
||||
_saveFilter.append(mimeType.filterString() + ";;");
|
||||
_openFilter.append("*.");
|
||||
_openFilter.append(mimeType.suffixes().join(" *."));
|
||||
_openFilter.append(" ");
|
||||
nameFilter.append(mimeType.suffixes());
|
||||
}
|
||||
auto supportedWrite = QImageWriter::supportedMimeTypes();
|
||||
for(auto format : supportedWrite)
|
||||
{
|
||||
QMimeType mimeType = db.mimeTypeForName(format);
|
||||
_saveFilter.append(mimeType.filterString() + ";;");
|
||||
}
|
||||
|
||||
_openFilter.append("*.fit *.fits *.fts *.fz *.xisf *.cr2 *.cr3 *.nef *.dng)");
|
||||
_openFilter.append(tr(";;All files (*)"));
|
||||
nameFilter.append({"fit", "fits", "fts", "fz", "xisf", "cr2", "cr3", "nef", "dng"});
|
||||
@@ -613,12 +620,16 @@ void MainWindow::reindex()
|
||||
void MainWindow::saveAs()
|
||||
{
|
||||
QString selectedFilter;
|
||||
ImagePtr ptr = m_ringList->currentImage();
|
||||
if(!ptr)return;
|
||||
|
||||
QFileInfo srcFile(ptr->name());
|
||||
QString file = QFileDialog::getSaveFileName(this,
|
||||
tr("Save as"),
|
||||
_lastDir,
|
||||
_lastDir + "/" + srcFile.baseName(),
|
||||
_saveFilter,
|
||||
&selectedFilter);
|
||||
auto filterToFormat = [](const QString &file, const QString &filter) -> const char*
|
||||
auto filterToFormat = [](const QString &file, const QString &filter) -> const QString
|
||||
{
|
||||
QString suffix = QFileInfo(file).suffix();
|
||||
if(!suffix.compare("jpg", Qt::CaseInsensitive) || !suffix.compare("jpeg", Qt::CaseInsensitive))return "jpeg";
|
||||
@@ -628,30 +639,31 @@ void MainWindow::saveAs()
|
||||
if(filter.contains("png"))return "png";
|
||||
if(filter.contains("fits"))return "fits";
|
||||
if(filter.contains("xisf"))return "xisf";
|
||||
QRegularExpression suf("\\(\\*\\.([a-zA-Z]+).*\\)");
|
||||
auto match = suf.match(filter);
|
||||
if(match.hasMatch())
|
||||
return match.captured(1);
|
||||
return "jpeg";
|
||||
};
|
||||
|
||||
if(!file.isEmpty())
|
||||
{
|
||||
auto button = QMessageBox::question(this, tr("Apply stretch?"), tr("Apply current stretch function to image?"));
|
||||
|
||||
QString format = filterToFormat(file, selectedFilter);
|
||||
|
||||
if(format == "fits" || format == "xisf")
|
||||
{
|
||||
convert(file, format);
|
||||
}
|
||||
else
|
||||
{
|
||||
QImage img = m_image->renderToImage();
|
||||
if(!img.isNull())
|
||||
img.save(file, filterToFormat(file, selectedFilter));
|
||||
}
|
||||
convert(file, format, button == QMessageBox::Yes);
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::convert(const QString &outfile, const QString &format)
|
||||
void MainWindow::convert(const QString &outfile, const QString &format, bool stretch)
|
||||
{
|
||||
QString file = m_ringList->currentImage()->name();
|
||||
QThreadPool::globalInstance()->start(new ConvertRunable(file, outfile, format));
|
||||
ConvertRunable::ConvertParams param;
|
||||
param.stretch = stretch;
|
||||
param.mtf = m_stretchPanel->params();
|
||||
|
||||
QThreadPool::globalInstance()->start(new ConvertRunable(file, outfile, format, param));
|
||||
}
|
||||
|
||||
void MainWindow::markImage()
|
||||
|
||||
+1
-1
@@ -52,7 +52,7 @@ public slots:
|
||||
void indexDir(const QString &dir);
|
||||
void reindex();
|
||||
void saveAs();
|
||||
void convert(const QString &outfile, const QString &format);
|
||||
void convert(const QString &outfile, const QString &format, bool stretch);
|
||||
void markImage();
|
||||
void unmarkImage();
|
||||
void markAndNext();
|
||||
|
||||
+22
-6
@@ -1195,12 +1195,28 @@ void RawImage::applySTF(const MTFParam &mtfParams)
|
||||
for(size_t i = 0; i < len; i++)
|
||||
{
|
||||
float x;
|
||||
if constexpr(std::numeric_limits<std::remove_reference_t<decltype(*src)>>::is_integer)x = src[i] * iscale;
|
||||
else x = src[i] * unit.first + unit.second;
|
||||
x = (x - mtfParams.blackPoint[0]) / (mtfParams.whitePoint[0] - mtfParams.blackPoint[0]);
|
||||
x = std::clamp(x, 0.0f, 1.0f);
|
||||
x = ((mtfParams.midPoint[0] - 1.0f) * x) / ((2.0f * mtfParams.midPoint[0] - 1.0f) * x - mtfParams.midPoint[0]);
|
||||
src[i] = x * s;
|
||||
if(m_ch == 4)
|
||||
{
|
||||
size_t c = i & 0x3;
|
||||
if(c < 3)
|
||||
{
|
||||
if constexpr(std::numeric_limits<std::remove_reference_t<decltype(*src)>>::is_integer)x = src[i] * iscale;
|
||||
else x = src[i] * unit.first + unit.second;
|
||||
x = (x - mtfParams.blackPoint[c]) / (mtfParams.whitePoint[c] - mtfParams.blackPoint[c]);
|
||||
x = std::clamp(x, 0.0f, 1.0f);
|
||||
x = ((mtfParams.midPoint[c] - 1.0f) * x) / ((2.0f * mtfParams.midPoint[c] - 1.0f) * x - mtfParams.midPoint[c]);
|
||||
src[i] = x * s;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if constexpr(std::numeric_limits<std::remove_reference_t<decltype(*src)>>::is_integer)x = src[i] * iscale;
|
||||
else x = src[i] * unit.first + unit.second;
|
||||
x = (x - mtfParams.blackPoint[0]) / (mtfParams.whitePoint[0] - mtfParams.blackPoint[0]);
|
||||
x = std::clamp(x, 0.0f, 1.0f);
|
||||
x = ((mtfParams.midPoint[0] - 1.0f) * x) / ((2.0f * mtfParams.midPoint[0] - 1.0f) * x - mtfParams.midPoint[0]);
|
||||
src[i] = x * s;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
+65
-5
@@ -4,6 +4,7 @@
|
||||
#include <QDebug>
|
||||
#include <QInputDialog>
|
||||
#include <QJsonValue>
|
||||
#include <QJSValueIterator>
|
||||
#include "loadrunable.h"
|
||||
#include "rawimage.h"
|
||||
#include "loadimage.h"
|
||||
@@ -40,7 +41,7 @@ ScriptEngine::ScriptEngine(Database *database, BatchProcessing *parent)
|
||||
void ScriptEngine::setParams(const QString &scriptPath, const QList<QPair<QString, QString>> &paths, const QString &outputDir)
|
||||
{
|
||||
_scriptPath = scriptPath;
|
||||
_paths = paths;
|
||||
setPaths(paths);
|
||||
_outputDir = outputDir + "/";
|
||||
}
|
||||
|
||||
@@ -417,14 +418,73 @@ QJSValue ScriptEngine::newArray(uint size)
|
||||
return _jsEngine->newArray(size);
|
||||
}
|
||||
|
||||
void ScriptEngine::run()
|
||||
QJSValue ScriptEngine::eval(const QString &program)
|
||||
{
|
||||
QJSValue jsPaths = _jsEngine->newArray(_paths.size());
|
||||
for(qsizetype i=0; i<_paths.size(); i++)
|
||||
jsPaths.setProperty(i, _jsEngine->newQObject(new File(_paths[i].first, _paths[i].second, this)));
|
||||
QStringList stackTrace;
|
||||
QJSValue result = _jsEngine->evaluate(program, QString(), 1, &stackTrace);
|
||||
|
||||
if(result.isError())
|
||||
{
|
||||
QString error = result.property("name").toString() + " on line " + result.property("lineNumber").toString() + " : " + result.toString();
|
||||
error += "\n" + result.property("stack").toString();
|
||||
emit newMessage(error, true);
|
||||
}
|
||||
else if(!result.isUndefined())
|
||||
{
|
||||
emit newMessage(result.toString(), false);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
QStringList ScriptEngine::complete(const QString &line)
|
||||
{
|
||||
QStringList complete;
|
||||
|
||||
QJSValue globObj = _jsEngine->globalObject();
|
||||
|
||||
QRegularExpression reg("[a-zA-Z_][a-zA-Z0-9_]*");
|
||||
auto match = reg.match(line);
|
||||
if(match.hasMatch())
|
||||
{
|
||||
QString var = match.captured();
|
||||
if(globObj.hasProperty(var))
|
||||
{
|
||||
complete.clear();
|
||||
QJSValueIterator it(globObj.property(var));
|
||||
while(it.hasNext())
|
||||
{
|
||||
it.next();
|
||||
if(it.name() != "constructor" && it.name() != "objectNameChanged")
|
||||
complete.append(var + "." + it.name());
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
QJSValueIterator it(globObj);
|
||||
while(it.hasNext())
|
||||
{
|
||||
it.next();
|
||||
complete.append(it.name());
|
||||
}
|
||||
}
|
||||
|
||||
return complete;
|
||||
}
|
||||
|
||||
void ScriptEngine::setPaths(const QList<QPair<QString, QString> > &paths)
|
||||
{
|
||||
_paths = paths;
|
||||
QJSValue jsPaths = _jsEngine->newArray(paths.size());
|
||||
for(qsizetype i=0; i<paths.size(); i++)
|
||||
jsPaths.setProperty(i, _jsEngine->newQObject(new File(paths[i].first, paths[i].second, this)));
|
||||
|
||||
_jsEngine->globalObject().setProperty("files", jsPaths);
|
||||
}
|
||||
|
||||
void ScriptEngine::run()
|
||||
{
|
||||
QFile scriptFile(_scriptPath);
|
||||
if(!scriptFile.open(QIODevice::ReadOnly))
|
||||
{
|
||||
|
||||
@@ -64,6 +64,9 @@ public:
|
||||
#endif // PLATESOLVER
|
||||
QJSValue newObject();
|
||||
QJSValue newArray(uint size);
|
||||
QJSValue eval(const QString &program);
|
||||
QStringList complete(const QString &line);
|
||||
void setPaths(const QList<QPair<QString, QString>> &paths);
|
||||
public slots:
|
||||
void run();
|
||||
signals:
|
||||
|
||||
+29
-1
@@ -129,11 +129,30 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
|
||||
delete item;
|
||||
});
|
||||
|
||||
m_lang = new QComboBox(this);
|
||||
m_lang->addItems({"English", "Français", "Slovenčina", "Português"});
|
||||
QString lang;
|
||||
switch(QLocale().language())
|
||||
{
|
||||
default:
|
||||
case QLocale::English: lang = "en"; break;
|
||||
case QLocale::French: lang = "fr"; break;
|
||||
case QLocale::Slovak: lang = "sk"; break;
|
||||
case QLocale::Portuguese: lang = "pt_BR"; break;
|
||||
}
|
||||
|
||||
lang = settings.value("settings/lang", lang).toString();
|
||||
if(lang == "en")m_lang->setCurrentIndex(0);
|
||||
else if(lang == "fr")m_lang->setCurrentIndex(1);
|
||||
else if(lang == "sk")m_lang->setCurrentIndex(2);
|
||||
else if(lang == "pt_BR")m_lang->setCurrentIndex(3);
|
||||
|
||||
layout->addRow(tr("Image preload count"), m_preloadImages);
|
||||
layout->addRow(tr("Thumbnails size"), m_thumSize);
|
||||
layout->addRow(tr("Saturation"), m_saturation);
|
||||
layout->addRow(tr("Slideshow interval"), m_slideShowTime);
|
||||
layout->addRow(tr("Image interpolation"), m_filtering);
|
||||
layout->addRow(tr("Language"), m_lang);
|
||||
layout->addRow(m_qualityThumbnail);
|
||||
layout->addRow(m_useNativeDialog);
|
||||
layout->addRow(m_bestFit);
|
||||
@@ -150,7 +169,6 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
|
||||
#endif
|
||||
//layout->addRow(new QLabel(tr("Changes in settings will take effect after program restart.")));
|
||||
|
||||
|
||||
QDialogButtonBox *buttonBox = new QDialogButtonBox(this);
|
||||
buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
|
||||
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
|
||||
@@ -237,4 +255,14 @@ void SettingsDialog::saveSettings()
|
||||
}
|
||||
settings.setValue("settings/headerhighlightkeywords", headerHighlight.keys());
|
||||
settings.setValue("settings/headerhighlightcolors", colors);
|
||||
QString lang;
|
||||
int langIdx = m_lang->currentIndex();
|
||||
switch(langIdx)
|
||||
{
|
||||
case 0: lang = "en"; break;
|
||||
case 1: lang = "fr"; break;
|
||||
case 2: lang = "sk"; break;
|
||||
case 3: lang = "pt_BR"; break;
|
||||
}
|
||||
settings.setValue("settings/lang", lang);
|
||||
}
|
||||
|
||||
@@ -32,6 +32,7 @@ private:
|
||||
QListWidget *m_headerHighlight;
|
||||
QColor m_color = Qt::yellow;
|
||||
QLineEdit *m_keyword;
|
||||
QComboBox *m_lang;
|
||||
};
|
||||
|
||||
#endif // SETTINGSDIALOG_H
|
||||
|
||||
@@ -104,6 +104,11 @@ StretchToolbar::~StretchToolbar()
|
||||
settings.setValue("stretchtoolbar/autostretch", m_autoStretchOnLoad->isChecked());
|
||||
}
|
||||
|
||||
const MTFParam &StretchToolbar::params() const
|
||||
{
|
||||
return m_mtfParam;
|
||||
}
|
||||
|
||||
void StretchToolbar::stretchImage(Image *img)
|
||||
{
|
||||
if(img && img->rawImage())
|
||||
|
||||
@@ -22,6 +22,7 @@ class StretchToolbar : public QToolBar
|
||||
public:
|
||||
explicit StretchToolbar(QWidget *parent = nullptr);
|
||||
~StretchToolbar();
|
||||
const MTFParam& params() const;
|
||||
public slots:
|
||||
void stretchImage(Image *img);
|
||||
void resetMTF();
|
||||
|
||||
Binary file not shown.
+428
-444
File diff suppressed because it is too large
Load Diff
Binary file not shown.
+428
-444
File diff suppressed because it is too large
Load Diff
Binary file not shown.
+428
-444
File diff suppressed because it is too large
Load Diff
Binary file not shown.
+428
-444
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user