summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-11-04 09:18:25 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-11-04 09:18:25 (GMT)
commit3b5c56479078084c7f949a6e5245fb8164c48167 (patch)
treeecb30f557c6a7035fb52c7f386a3a859e18c014c
parenta7603e2120a56cb10e1e3057c780e84b69fb47d4 (diff)
Make auto debayering as an option so that it can be disabled if not desired
-rw-r--r--kstars/fitsviewer/fitsdata.cpp5
-rw-r--r--kstars/kstars.kcfg24
-rw-r--r--kstars/options/opsadvanced.ui148
3 files changed, 106 insertions, 71 deletions
diff --git a/kstars/fitsviewer/fitsdata.cpp b/kstars/fitsviewer/fitsdata.cpp
index 60d9e9f..12c80f1 100644
--- a/kstars/fitsviewer/fitsdata.cpp
+++ b/kstars/fitsviewer/fitsdata.cpp
@@ -252,10 +252,7 @@ bool FITSData::loadFITS (const QString &inFilename, bool silent)
calculateStats();
- //if (mode == FITS_NORMAL)
- //checkWCS();
-
- if (checkDebayer())
+ if (Options::autoDebayerFITS() && checkDebayer())
debayer();
starsSearched = false;
diff --git a/kstars/kstars.kcfg b/kstars/kstars.kcfg
index b8bb54c..b53d586 100644
--- a/kstars/kstars.kcfg
+++ b/kstars/kstars.kcfg
@@ -184,10 +184,18 @@
<whatsthis>PATH to indiserver binary</whatsthis>
<default>/usr/bin/indiserver</default>
</entry>
+ <entry name="indiServerIsInternal" type="Bool">
+ <label>Internal or External INDI Server?</label>
+ <default>false</default>
+ </entry>
<entry name="indiDriversDir" type="String">
<label>PATH to indi drivers directory</label>
<whatsthis>PATH to indi drivers directory</whatsthis>
</entry>
+ <entry name="indiDriversAreInternal" type="Bool">
+ <label>Internal or External Astrometry Solver?</label>
+ <default>false</default>
+ </entry>
</group>
<group name="Location">
@@ -1276,6 +1284,10 @@
<label>Make FITS Viewer window independent of KStars main window</label>
<default>false</default>
</entry>
+ <entry name="autoDebayerFITS" type="Bool">
+ <label>Automatically debayer a FITS image if it is contains a bayer pattern</label>
+ <default>true</default>
+ </entry>
</group>
<group name="WISettings">
<entry name="BortleClass" type="UInt">
@@ -1325,16 +1337,28 @@
<whatsthis>Path to astrometry.net solver location.</whatsthis>
<default>/usr/bin/solve-field</default>
</entry>
+ <entry name="astrometrySolverIsInternal" type="Bool">
+ <label>Internal or External Astrometry Solver?</label>
+ <default>false</default>
+ </entry>
<entry name="astrometryWCSInfo" type="String">
<label>astrometry.net wcsinfo binary</label>
<whatsthis>Path to astrometry.net wcsinfo location.</whatsthis>
<default>/usr/bin/wcsinfo</default>
</entry>
+ <entry name="wcsIsInternal" type="Bool">
+ <label>Internal or External wcsinfo?</label>
+ <default>false</default>
+ </entry>
<entry name="astrometryConfFile" type="String">
<label>astrometry.net configuration file</label>
<whatsthis>Path to astrometry.net file location.</whatsthis>
<default>/etc/astrometry.cfg</default>
</entry>
+ <entry name="astrometryConfFileIsInternal" type="Bool">
+ <label>Internal or External Astrometry.net Conf File?</label>
+ <default>false</default>
+ </entry>
<entry name="astrometryAPIKey" type="String">
<label>astrometry.net API Key</label>
<whatsthis>Key to access astrometry.net online web services. You must register with astrometry.net to obtain a key.</whatsthis>
diff --git a/kstars/options/opsadvanced.ui b/kstars/options/opsadvanced.ui
index a0d8a41..cd77bec 100644
--- a/kstars/options/opsadvanced.ui
+++ b/kstars/options/opsadvanced.ui
@@ -170,81 +170,95 @@
<property name="title">
<string>FITS Viewer</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <layout class="QVBoxLayout" name="verticalLayout_7">
<item>
- <widget class="QCheckBox" name="kcfg_singlePreviewFITS">
- <property name="toolTip">
- <string>Display all captured FITS images in a single tab instead of multiple tabs per image.</string>
- </property>
- <property name="statusTip">
- <string/>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>Preview Mode</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="kcfg_singleWindowCapturedFITS">
- <property name="toolTip">
- <string>Display captured FITS images from all cameras in a single FITS Viewer window instead of a dedicated window to each camera.</string>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>Single Window Capture</string>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QCheckBox" name="kcfg_singlePreviewFITS">
+ <property name="toolTip">
+ <string>Display all captured FITS images in a single tab instead of multiple tabs per image.</string>
+ </property>
+ <property name="statusTip">
+ <string/>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Preview Mode</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="kcfg_singleWindowCapturedFITS">
+ <property name="toolTip">
+ <string>Display captured FITS images from all cameras in a single FITS Viewer window instead of a dedicated window to each camera.</string>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Single Window Capture</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="kcfg_singleWindowOpenedFITS">
+ <property name="toolTip">
+ <string>Display opened FITS images in a single FITS Viewer window instead of a dedicated window to each file.</string>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Single Window Open</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="kcfg_independentWindowFITS">
+ <property name="toolTip">
+ <string>Make FITS Viewer window independent from KStars</string>
+ </property>
+ <property name="text">
+ <string>Independent Window</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
<item>
- <widget class="QCheckBox" name="kcfg_singleWindowOpenedFITS">
- <property name="toolTip">
- <string>Display opened FITS images in a single FITS Viewer window instead of a dedicated window to each file.</string>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
+ <widget class="QCheckBox" name="kcfg_autoDebayerFITS">
<property name="text">
- <string>Single Window Open</string>
+ <string>Auto Debayer</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
- <item>
- <widget class="QCheckBox" name="kcfg_independentWindowFITS">
- <property name="toolTip">
- <string>Make FITS Viewer window independent from KStars</string>
- </property>
- <property name="text">
- <string>Independent Window</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
</item>
@@ -1064,12 +1078,12 @@
<resources/>
<connections/>
<buttongroups>
- <buttongroup name="logbuttonGroup"/>
- <buttongroup name="verbosityButtonGroup"/>
<buttongroup name="modulesGroup">
<property name="exclusive">
<bool>false</bool>
</property>
</buttongroup>
+ <buttongroup name="logbuttonGroup"/>
+ <buttongroup name="verbosityButtonGroup"/>
</buttongroups>
</ui>