summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-07-16 12:26:10 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-07-16 12:26:10 (GMT)
commit947c7416121ca454b1f8619e50c2cb73d9067f6a (patch)
treeb380c4ffd208ad674f783fad7a87d1163b5f7dc2
parent2b20c994a3ae695aadc005103b7a667d4747f931 (diff)
parent6ac389c81de73b71d3f78df47fc74816c5498e79 (diff)
Branch sync
-rw-r--r--doc/add_catalog.pngbin0 -> 78547 bytes
-rw-r--r--doc/advanced_tab.pngbin0 -> 73459 bytes
-rw-r--r--doc/colors_tab.pngbin0 -> 71060 bytes
-rw-r--r--doc/commands.docbook9
-rw-r--r--doc/config.docbook575
-rw-r--r--doc/delete_catalog.pngbin0 -> 13777 bytes
-rw-r--r--doc/ekos_tab.pngbin0 -> 40242 bytes
-rw-r--r--doc/faq.docbook4
-rw-r--r--doc/guides_tab.pngbin0 -> 62725 bytes
-rw-r--r--doc/import_catalog.pngbin0 -> 64205 bytes
-rw-r--r--doc/indi.docbook413
-rw-r--r--doc/indi_tab.pngbin0 -> 55546 bytes
-rw-r--r--doc/jmoons.docbook3
-rw-r--r--doc/load_catalog.pngbin0 -> 38864 bytes
-rw-r--r--doc/obsplanner.docbook42
-rw-r--r--doc/overwrite_catalog.pngbin0 -> 15842 bytes
-rw-r--r--doc/satellites_tab.pngbin0 -> 66369 bytes
-rw-r--r--doc/scriptbuilder.docbook6
-rw-r--r--doc/skymapdevice.pngbin40237 -> 19011 bytes
-rw-r--r--doc/solarsys.docbook3
-rw-r--r--doc/solarsystem_tab.pngbin0 -> 72163 bytes
-rw-r--r--doc/supernovae_tab.pngbin0 -> 55676 bytes
-rw-r--r--doc/wut.docbook18
-rw-r--r--kstars/ekos/focus.ui2
-rw-r--r--kstars/fitsviewer/fitsdata.cpp90
-rw-r--r--kstars/fitsviewer/fitsdata.h2
26 files changed, 955 insertions, 212 deletions
diff --git a/doc/add_catalog.png b/doc/add_catalog.png
new file mode 100644
index 0000000..56d66ec
--- /dev/null
+++ b/doc/add_catalog.png
Binary files differ
diff --git a/doc/advanced_tab.png b/doc/advanced_tab.png
new file mode 100644
index 0000000..568499b
--- /dev/null
+++ b/doc/advanced_tab.png
Binary files differ
diff --git a/doc/colors_tab.png b/doc/colors_tab.png
new file mode 100644
index 0000000..1f80d81
--- /dev/null
+++ b/doc/colors_tab.png
Binary files differ
diff --git a/doc/commands.docbook b/doc/commands.docbook
index 65d63e9..953450c 100644
--- a/doc/commands.docbook
+++ b/doc/commands.docbook
@@ -881,8 +881,7 @@ the new value. First and Last points must be on the horizon.
Polygons must be closed to be considered valid regions.
Artificial Horizon Manager provides a easy way to rename your regions. By default, regions are
named as: <quote>Region </quote> plus an index (&ie; <quote>Region 1</quote> or <quote>Region 2</quote>).
-For renaming a region, all you need
-to do is to double click on its name and then you will be invited to complete a new region name.
+For renaming a region, just double click on its name and then you will be invited to complete a new region name.
You can also control which regions are enabled or disabled for marking on the map by a simple
click on the checkbox in front of each region. After you defined your desired regions you can apply
them by pressing the <guibutton>Apply</guibutton> button.
@@ -1053,8 +1052,8 @@ window is open for a selected object, <guilabel>Right ascension</guilabel> and
<guilabel>Declination</guilabel> text boxes will be automatically filled with the coordinate values
of the selected object on the Sky Map. Besides these two text boxes, you can set the
<guilabel>Epoch</guilabel>, add a <guilabel>Label</guilabel>, set the <guilabel>Label color</guilabel>
-or even add an <guilabel>Icon</guilabel>. To add custom icons, just add images in <quote>/home/user_name/
-.local/share/kstars/</quote>. File names must begin with the <quote>flag</quote> keyword. For example,
+or even add an <guilabel>Icon</guilabel>. To add custom icons, just add images in
+<filename class="directory">`qtpaths --paths GenericDataLocation`/kstars/</filename>. File names must begin with the <quote>flag</quote> keyword. For example,
the file <quote>flagSmall_red_cross.gif</quote> will be shown as Small red cross in the combo box. After
you set up the information of the new flag, you can add it to the flags list using the
<guibutton>Add</guibutton> button. You may also change flags details (&ie; RA/Dec, label or icon) and
@@ -1083,7 +1082,7 @@ exit angular distance mode without measuring an angle.
<term>[All]</term>
<listitem><para>
<guimenuitem>Starhop from here to</guimenuitem>: will enable you to find a path between two points in
-the sky. Star hopping is a technique that uses bright stars as a quide for finding fainter objects. So if
+the sky. Star hopping is a technique that uses bright stars as a guide for finding fainter objects. So if
you have a bright star, you can use it as a reference to find a fainter object. Starting from your reference
star, &kstars; will find a route to the destination, traversing a sequence of stars/patterns of stars. The
object for which you called <guilabel>Starhop from here to</guilabel> tool will be your starting point. When
diff --git a/doc/config.docbook b/doc/config.docbook
index 031b973..0e74d84 100644
--- a/doc/config.docbook
+++ b/doc/config.docbook
@@ -141,8 +141,7 @@ The window is depicted below:
</para>
<para>
-The <guilabel>Configure &kstars;</guilabel> window is divided into ten
-pages:
+The <guilabel>Configure &kstars;</guilabel> window is divided into nine pages:
<guilabel>Catalogs</guilabel>, <guilabel>Solar System</guilabel>, <guilabel>Satellites</guilabel>,
<guilabel>Supernovae</guilabel>, <guilabel>Guides</guilabel>, <guilabel>Colors</guilabel>,
<guilabel>INDI</guilabel>, <guilabel>Ekos</guilabel> and <guilabel>Advanced</guilabel>.
@@ -152,21 +151,444 @@ pages:
<indexterm><primary>Configure &kstars; window</primary>
<secondary>Catalogs page</secondary></indexterm>
In the <guilabel>Catalogs</guilabel> page, you determine which object
-catalogs are displayed in the map. The <guilabel>Stars</guilabel> section
-also allows you to set the
-<quote>faint <link linkend="ai-magnitude">magnitude</link> limit</quote>
-for stars, and the <link linkend="ai-magnitude">magnitude</link> limit for
-displaying the names and/or magnitudes of stars. Below the stars section,
-the <guilabel>Deep-Sky Objects</guilabel> section controls the display of
-several non-stellar object catalogs. By default, the list includes the
-Messier, NGC and IC catalogs. You can add your own custom object catalogs
-by pressing the <guibutton>Import Catalog</guibutton> or <guilabel>Load Catalog</guilabel> button. For
-detailed instructions on preparing a catalog data file, see the
-<filename>README.customize</filename> file that ships with &kstars;. It is possible to define
+catalogs are displayed in the map along with several properties.
+</para>
+
+<para>
+<indexterm><primary>Configure &kstars; window</primary>
+<secondary>Solar System page</secondary></indexterm>
+In the <guilabel>Solar System</guilabel> page, you can specify whether
+the Sun, Moon, planets, comets and asteroids are displayed.
+</para>
+
+<!-- Satellites page: -->
+<para>
+<indexterm><primary>Configure &kstars; window</primary>
+<secondary>Satellites page</secondary></indexterm>
+The <guilabel>Satellites</guilabel> page allows you to set the satellites view options.
+</para>
+<!-- Supernovae page: -->
+<para>
+<indexterm><primary>Configure &kstars; window</primary>
+<secondary>Supernovae page</secondary></indexterm>
+The <guilabel>Supernovae</guilabel> page allows you to manage how supernovae are displayed by &kstars;.
+</para>
+
+<para>
+<indexterm><primary>Configure &kstars; window</primary>
+<secondary>Guides page</secondary></indexterm>
+The <guilabel>Guides</guilabel> page lets you toggle whether non-objects
+are displayed (&ie;, constellation lines, constellation names, the
+Milky Way contour).
+</para>
+
+<para>
+<indexterm><primary>Configure &kstars; window</primary>
+<secondary>Colors page</secondary></indexterm>
+<indexterm><primary>Color Schemes</primary>
+<secondary>Customizing</secondary></indexterm>
+The <guilabel>Colors</guilabel> page allows you to set the color scheme,
+and to define new custom color schemes.
+</para>
+
+<para>For detailed explanation of the options on the <guilabel>INDI</guilabel>
+page see the <link linkend="indi-configure">Configure INDI</link> section.
+</para>
+
+<para>For detailed explanation of <guilabel>Ekos</guilabel> astrophotography suite,
+see the official <ulink url="http://www.indilib.org/about/ekos.html">Ekos</ulink> page.
+</para>
+
+<para>
+<indexterm><primary>Configure &kstars; window</primary>
+<secondary>Advanced page</secondary></indexterm>
+The <guilabel>Advanced</guilabel> page provides fine-grained control
+over the more subtle behaviors of &kstars;.
+</para>
+</sect1>
+
+<sect1 id="catalogs">
+<title>Catalogs</title>
+<para>
+<screenshot>
+<screeninfo>Catalogs Window</screeninfo>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="viewops.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Catalogs Window</phrase>
+ </textobject>
+</mediaobject>
+</screenshot>
+</para>
+
+<para>
+<indexterm><primary>Catalogs page</primary>
+<secondary>Short overview</secondary></indexterm>
+In the <guilabel>Catalogs</guilabel> page, you can configure which object catalogs are
+displayed by &kstars;, as well as how much information you would like to be included on
+the Sky Map. By default, &kstars; comes with three pre-installed catalogues:
+Index Catalog (<quote>IC</quote>), New General Catalog (<quote>NGC</quote>) and Messier Catalog.
+</para>
+
+<para>
+Index Catalogue of Nebulae and Clusters of Stars (abbreviated as IC) serves as a supplement to the
+NGC, and contains an additional 5,386 objects, collectively known as the IC objects.
+</para>
+
+<para>
+New General Catalogue of Nebulae and Clusters of Stars (abbreviated as NGC) is a catalogue of 7,840
+deep-sky objects.
+</para>
+
+<para>
+Messier Catalogue is a catalogue of 110 deep-sky objects, including diffuse nebulae, planetary nebulae,
+open clusters, globular clusters and galaxies. Messier objects have names like M1, M2, up to M110. The
+maximum apparent visual magnitude of Messier Catalogue is represented by M91's value of 10,2.
+</para>
+
+<para>
+You can install new catalogues using &kstars; <quote>Add-On Installer</quote>. You can open it by opening
+the <menuchoice><guimenu>Data</guimenu><guimenuitem>Download New Data...</guimenuitem></menuchoice> submenu.
+You can choose from a list of catalogues, including:
+<itemizedlist>
+
+<listitem><para>
+Steinicke NGC/IC Catalog: is a more complete NGC/IC catalog.
+</para></listitem>
+
+<listitem><para>
+Abell Planetary Nebulae Catalog: is a catalog of 86 planetary nebulae. The
+maximum magnitude is represented by Abell 47's value of 19,5.
+</para></listitem>
+
+<listitem><para>
+Sharpless HII region Catalog: is the Sharpless (Sh2) catalog of HII regions (diffuse nebulae).
+</para></listitem>
+
+<listitem><para>
+Hickson Compact Groups: is a catalog consisting of 99 compact groups of galaxies.
+</para></listitem>
+
+<listitem><para>
+Tycho-2 Star Catalog: is a catalog of more than 2,5 million of the brightest stars. It contains
+stars with a magnitude value from 8,0 to 12,5.
+</para></listitem>
+
+<listitem><para>
+USNO NOMAD Catalog: is a catalog of about 100 million stars with magnitude from 12,5 to 16,5.
+Note that is requires Tycho-2 to be installed.
+</para></listitem>
+
+</itemizedlist>
+</para>
+
+<para>
+To summarize, you can read the following table:
+
+<table frame="top"><title>Stars Catalogues</title>
+<tgroup cols="4" colsep="1" rowsep="1">
+<thead>
+<row>
+<entry>Name</entry>
+<entry>Abbreviation</entry>
+<entry>Number of objects</entry>
+<entry>Magnitude</entry>
+<entry>Add-On</entry>
+<entry>Default</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry>Default Catalog</entry>
+<entry>Default</entry>
+<entry>126,000</entry>
+<entry>Up to 8 magnitude</entry>
+<entry>No</entry>
+<entry>Yes</entry>
+</row>
+<row>
+<entry>Tycho-2 Star</entry>
+<entry>Tycho2</entry>
+<entry>more than 2.5 million</entry>
+<entry>8.0-12.5 </entry>
+<entry>Yes</entry>
+<entry>No</entry>
+</row>
+<row>
+<entry>Naval Observatory Merged Astronomic Dataset</entry>
+<entry>USNO NOMAD</entry>
+<entry>100 million</entry>
+<entry>12.5-16.5</entry>
+<entry>Yes</entry>
+<entry>No</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+
+<table frame="top"><title>Deep-sky objects Catalogues</title>
+<tgroup cols="4" colsep="1" rowsep="1">
+<thead>
+<row>
+<entry>Name</entry>
+<entry>Abbreviation</entry>
+<entry>Number of objects</entry>
+<entry>Magnitude</entry>
+<entry>Add-On</entry>
+<entry>Default</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry>Index Catalogue of Nebulae and Clusters of Stars</entry>
+<entry>IC</entry>
+<entry>5,386</entry>
+<entry>Up to 18.3 magnitude</entry>
+<entry>No</entry>
+<entry>Yes</entry>
+</row>
+<row>
+<entry>New General Catalogue of Nebulae and Clusters of Stars</entry>
+<entry>NGC</entry>
+<entry>7,840</entry>
+<entry>-</entry>
+<entry>No</entry>
+<entry>Yes</entry>
+</row>
+<row>
+<entry>Messier Catalogue</entry>
+<entry>-</entry>
+<entry>110</entry>
+<entry>Up to 10.2 magnitude</entry>
+<entry>No</entry>
+<entry>Yes</entry>
+</row>
+<row>
+<entry>Steinicke NGC/IC</entry>
+<entry>-</entry>
+<entry>-</entry>
+<entry>-</entry>
+<entry>Yes</entry>
+<entry>No</entry>
+</row>
+
+<row>
+<entry>Abell Planetary Nebulae Catalog</entry>
+<entry>-</entry>
+<entry>86</entry>
+<entry>Up to 19.5 magnitude</entry>
+<entry>Yes</entry>
+<entry>No</entry>
+</row>
+
+<row>
+<entry>Sharpless HII region Catalog</entry>
+<entry>Sh2</entry>
+<entry>-</entry>
+<entry>-</entry>
+<entry>Yes</entry>
+<entry>No</entry>
+</row>
+
+<row>
+<entry>Hickson Compact Groups</entry>
+<entry>-</entry>
+<entry>99</entry>
+<entry>-</entry>
+<entry>Yes</entry>
+<entry>No</entry>
+</row>
+
+</tbody>
+</tgroup>
+</table>
+</para>
+
+<para>
+<indexterm><primary>Catalogs</primary>
+<secondary>Star Catalogs</secondary></indexterm>
+The <guilabel>Stars</guilabel> section allows you to manage how stars are
+displayed in &kstars;. You can choose to see the stars or not by checking the
+<guilabel>Star Catalogs</guilabel> checkbox. If you check it, then multiple
+options will be enabled. Thus, you can set how many stars are drawn on the map
+using the <guilabel>Star Density</guilabel> slider. You can also customize
+&kstars; to show or not stars' name and stars' <link linkend="ai-magnitude">magnitude</link>.
+By default, stars' label name and stars' magnitude are drawn next to the stars, with a dark
+green color. You can change this default color using the <guilabel>Colors</guilabel> tab.
+If stars' labels occupy too much space in the Sky Map, you can change their density using
+the <guilabel>Label density</guilabel> slider.
+</para>
+
+<para>
+<indexterm><primary>Catalogs</primary>
+<secondary>Deep-Sky Catalogs</secondary></indexterm>
+Below the stars section, the <guilabel>Deep-Sky Objects</guilabel> section controls
+the display of several non-stellar object catalogs. As for the stars, you can choose to see or
+not the deep-sky objects. You may also configure &kstars; to display their names and magnitude
+values. By default, the list of deep-sky objects includes the Messier, NGC and IC catalogs.
+You can add your own custom object catalogs by pressing the <guibutton>Import Catalog</guibutton>
+or <guilabel>Load Catalog</guilabel> button.
+Firstly, you need to prepare the object catalog data file. Each line in the file should contain
+the following space-separated fields:
+</para>
+
+<para>For stars: type(0 for stars), RA, Dec, mag, SpType, name(optional)</para>
+<para>For other types: type(3-8), RA, Dec, mag (optional), flux(optional), name(optional)
+</para>
+
+<para>The types are:</para>
+<itemizedlist>
+ <listitem><para>0: star</para></listitem>
+ <listitem><para>1: star (in object catalog...probably don't want to use this)</para></listitem>
+ <listitem><para>2: planet (don't use this in custom catalog)</para></listitem>
+ <listitem><para>3: open cluster</para></listitem>
+ <listitem><para>4: globular cluster</para></listitem>
+ <listitem><para>5: gaseous nebula</para></listitem>
+ <listitem><para>6: planetary nebula</para></listitem>
+ <listitem><para>7: supernova remnant</para></listitem>
+ <listitem><para>8: galaxy</para></listitem>
+ <listitem><para>18: radio source</para></listitem>
+</itemizedlist>
+
+<para>
+The SpType is a short string for the spectral type. For example, <quote>B5</quote>
+or <quote>G2</quote>. The coordinates should be given as floating-point values, in
+the J2000.0 epoch. The name can be anything you wish. If the name is more than one
+word, it must be enclosed in quotation marks.
+</para>
+
+<para>
+Once you have constructed a custom data file, open the &kstars; configuration window
+to the <guilabel>Catalogs</guilabel> tab, and press the
+<guibutton>Import Catalog...</guibutton> button. A popup window appears in which you can
+specify a name for the catalog, and the name of the file (including the path):
+</para>
+<screenshot>
+<screeninfo>Import Catalog Window</screeninfo>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="import_catalog.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Import Catalog Window</phrase>
+ </textobject>
+</mediaobject>
+</screenshot>
+
+<para>
+When you press <guibutton>Ok</guibutton> button, &kstars; will attempt to read the lines
+of your data file. It will report any problems, and if any lines at all were successfully
+parsed, you are given a choice to accept the data file (ignoring any unparsed lines),
+or to cancel the operation to attempt to resolve the problems first.
+</para>
+
+<para>
+You can load a new catalog using the <guibutton>Load Catalog...</guibutton> button.
+A new window will appear, asking you to specify the file that contains the catalog.
+</para>
+<screenshot>
+<screeninfo>Load Catalog Window</screeninfo>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="load_catalog.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Load Catalog Window</phrase>
+ </textobject>
+</mediaobject>
+</screenshot>
+
+<para>
+Once the data file has been accepted, your custom catalog will be loaded on
+startup along with the standard catalogs. In the <guilabel>Catalogs</guilabel> window
+is a checkbox for each catalog which toggles the display of catalog objects.
+</para>
+<screenshot>
+<screeninfo>Add Catalog</screeninfo>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="add_catalog.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Add Catalog</phrase>
+ </textobject>
+</mediaobject>
+</screenshot>
+
+<para>
+Note that, if you want to load a catalog that is already loaded, a warning dialog will pop-up.
+</para>
+<screenshot>
+<screeninfo>Overwrite Catalog</screeninfo>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="overwrite_catalog.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Overwrite Catalog</phrase>
+ </textobject>
+</mediaobject>
+</screenshot>
+
+<para>
+You can remove custom catalogs by highlighting its checkbox in the
+<guilabel>Catalogs</guilabel> window, and pressing the
+<guibutton>Remove Catalog...</guibutton> button (this
+button is only active if a custom catalog is highlighted in the list
+of checkboxes). Note that it can not be used for removing &kstars; default catalogs.
+</para>
+<screenshot>
+<screeninfo>Delete Catalog</screeninfo>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="delete_catalog.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Delete Catalog</phrase>
+ </textobject>
+</mediaobject>
+</screenshot>
+
+<para>For radio sources catalogs, you must include the flux frequency and units. For example:</para>
+<programlisting>
+# Flux Frequency: 1420 Mhz
+# Flux Unit: mJy
+</programlisting>
+
+<para>The following is a simple catalog file:</para>
+<programlisting>
+# Name: my_catalog
+# Prefix: et_radio
+# Color: #00ff00
+# Epoch: 2000
+# Flux Frequency: 1420 Mhz
+# Flux Unit: mJy
+# ID RA Dc Tp Mj Mn PA Nm Flux
+J0001 12:31:23.1 +11:29:34 18 180.60 360.30 45 my_radio_source 70</programlisting>
+<para>
+Using the <guilabel>Catalogs</guilabel> window, you can define
faint limits for sky objects for zoomed in and zoomed out states of the rendering. When
the <guilabel>Show objects of unknown magnitude</guilabel> item is enabled, objects whose
magnitudes are unknown, or not available to &kstars;, are drawn irrespective of the faint limits set.
</para>
+</sect1>
+
+<sect1 id="solar_system">
+<title>Solar System</title>
+<para>
+<screenshot>
+<screeninfo>Solar System Window</screeninfo>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="solarsystem_tab.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Solar System Window</phrase>
+ </textobject>
+</mediaobject>
+</screenshot>
<para>
<indexterm><primary>Configure &kstars; window</primary>
<secondary>Solar System page</secondary></indexterm>
@@ -180,8 +602,23 @@ trail</quote> whenever a solar system body is tracked, and another to
toggle whether the color of the orbit trail fades into the background
sky color.
</para>
+</para>
+</sect1>
-<!-- Satellites page: -->
+<sect1 id="satellites">
+<title>Satellites</title>
+<para>
+<screenshot>
+<screeninfo>Satellites Window</screeninfo>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="satellites_tab.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Satellites Window</phrase>
+ </textobject>
+</mediaobject>
+</screenshot>
<para>
<indexterm><primary>Configure &kstars; window</primary>
<secondary>Satellites page</secondary></indexterm>
@@ -211,7 +648,23 @@ As each line of this file is a group of satellites, you need to add a new entry
An entry should have the following format: <userinput>Group Name;local_filename;url</userinput>.
For example: <userinput>Iridium;iridium.tle;http://celestrak.com/NORAD/elements/iridium.txt</userinput>.
</para>
-<!-- Supernovae page: -->
+</para>
+</sect1>
+
+<sect1 id="supernovae">
+<title>Supernovae</title>
+<para>
+<screenshot>
+<screeninfo>Supernovae Window</screeninfo>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="supernovae_tab.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Supernovae Window</phrase>
+ </textobject>
+</mediaobject>
+</screenshot>
<para>
<indexterm><primary>Configure &kstars; window</primary>
<secondary>Supernovae page</secondary></indexterm>
@@ -228,7 +681,23 @@ The list of recent supernovae can be updated via the internet by pressing the <g
Supernovae</guibutton> button. Another way for updating the supernovae list is to use the
<menuchoice><guisubmenu>Updates</guisubmenu><guimenuitem>Update Recent Supernovae data</guimenuitem></menuchoice> item in the <guimenu>Data</guimenu> menu.
</para>
+</para>
+</sect1>
+<sect1 id="guides">
+<title>Guides</title>
+<para>
+<screenshot>
+<screeninfo>Guides Window</screeninfo>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="guides_tab.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Guides Window</phrase>
+ </textobject>
+</mediaobject>
+</screenshot>
<para>
<indexterm><primary>Configure &kstars; window</primary>
<secondary>Guides page</secondary></indexterm>
@@ -241,6 +710,23 @@ You can also choose whether you would like to see Latin constellation
names, <acronym>IAU</acronym>-standard three-letter abbreviations, or
constellation names using your local language.
</para>
+</para>
+</sect1>
+
+<sect1 id="colors">
+<title>Colors</title>
+<para>
+<screenshot>
+<screeninfo>Colors Window</screeninfo>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="colors_tab.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Colors Window</phrase>
+ </textobject>
+</mediaobject>
+</screenshot>
<para>
<indexterm><primary>Configure &kstars; window</primary>
<secondary>Colors page</secondary></indexterm>
@@ -274,14 +760,68 @@ the list in all future &kstars; sessions. To remove a custom scheme,
simply highlight it in the list, and press the <guibutton>Remove Color
Scheme</guibutton> button.
</para>
+</para>
+</sect1>
+
+<sect1 id="indi_tab">
+<title>INDI</title>
+<para>
+<screenshot>
+<screeninfo>INDI Window</screeninfo>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="indi_tab.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>INDI Window</phrase>
+ </textobject>
+</mediaobject>
+</screenshot>
<para>For detailed explanation of the options on the <guilabel>INDI</guilabel>
page see the <link linkend="indi-configure">Configure INDI</link> section.
</para>
+</para>
+</sect1>
-<para>For detailed explanation of the options on the <guilabel>Ekos</guilabel>
-page see the <link linkend="indi-configure">Configure Ekos</link> section.
+<sect1 id="ekos">
+<title>Ekos</title>
+<para>
+<screenshot>
+<screeninfo>Ekos Window</screeninfo>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="ekos_tab.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Ekos Window</phrase>
+ </textobject>
+</mediaobject>
+</screenshot>
+<para>
+Ekos is an astrophotography suite, a complete astrophotography solution that can control
+all INDI devices including numerous telescopes, CCDs, DSLRs, focusers, filters, and a lot more.
+Ekos supports highly accurate tracking using online and offline astrometry solver, autofocus
+and autoguiding capabilities, and capture of single or multiple images using the powerful
+built in sequence manager. For detailed explanation of <guilabel>Ekos</guilabel>,
+see the official <ulink url="http://www.indilib.org/about/ekos.html">Ekos</ulink> page.
</para>
+</para>
+</sect1>
+<sect1 id="advanced">
+<title>Advanced</title>
+<para>
+<screenshot>
+<screeninfo>Advanced Window</screeninfo>
+<mediaobject>
+ <imageobject>
+ <imagedata fileref="advanced_tab.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Advanced Window</phrase>
+ </textobject>
+</mediaobject>
+</screenshot>
<para>
<indexterm><primary>Configure &kstars; window</primary>
<secondary>Advanced page</secondary></indexterm>
@@ -335,6 +875,7 @@ hidden is determined by the <guilabel>Also hide if time step larger
than:</guilabel> timestep-spinbox. You can specify the objects that should
be hidden in the <guilabel>Configure Hidden Objects</guilabel> group box.
</para>
+</para>
</sect1>
<sect1 id="customize">
diff --git a/doc/delete_catalog.png b/doc/delete_catalog.png
new file mode 100644
index 0000000..81a9985
--- /dev/null
+++ b/doc/delete_catalog.png
Binary files differ
diff --git a/doc/ekos_tab.png b/doc/ekos_tab.png
new file mode 100644
index 0000000..b9c3cd6
--- /dev/null
+++ b/doc/ekos_tab.png
Binary files differ
diff --git a/doc/faq.docbook b/doc/faq.docbook
index ef19f42..1cc8d37 100644
--- a/doc/faq.docbook
+++ b/doc/faq.docbook
@@ -149,7 +149,7 @@ my system CPU clock. Is this possible?</para>
</question>
<answer>
<para>
-Yes; to start kstars with a different time/date, use the
+Yes; to start &kstars; with a different time/date, use the
<quote>--date</quote> argument, followed by a date string like
<quote>4 July 1976 12:30:00</quote>
</para>
@@ -163,7 +163,7 @@ Is this possible?</para>
</question>
<answer>
<para>
-Yes; to start kstars with the clock paused, simply add the
+Yes; to start &kstars; with the clock paused, simply add the
<quote>--paused</quote> argument to the command line.
</para>
</answer>
diff --git a/doc/guides_tab.png b/doc/guides_tab.png
new file mode 100644
index 0000000..5a43f96
--- /dev/null
+++ b/doc/guides_tab.png
Binary files differ
diff --git a/doc/import_catalog.png b/doc/import_catalog.png
new file mode 100644
index 0000000..ede7b71
--- /dev/null
+++ b/doc/import_catalog.png
Binary files differ
diff --git a/doc/indi.docbook b/doc/indi.docbook
index b8fc6f4..bfeb96d 100644
--- a/doc/indi.docbook
+++ b/doc/indi.docbook
@@ -4,9 +4,16 @@
<secondary>Overview</secondary>
</indexterm>
-<para>&kstars; provides an interface to configure and control astronomical instruments via the <acronym><link linkend="what-is-indi">INDI</link></acronym> protocol.</para>
+<para>&kstars; provides an interface to configure and control astronomical
+instruments via the <acronym><link linkend="what-is-indi">INDI</link></acronym>
+protocol.
+</para>
-<para>The <acronym>INDI</acronym> protocol supports a variety of astronomical instruments such as CCD cameras and focusers. For an up to date list of supported devices, please visit <acronym>INDI</acronym> <ulink url="http://indilib.org/index.php?title=Devices">supported devices page</ulink>.</para>
+<para>The <acronym>INDI</acronym> protocol supports a variety of astronomical
+instruments such as CCD cameras and focusers. For an up to date list of supported
+devices, please visit <acronym>INDI</acronym>
+<ulink url="http://indilib.org/index.php?title=Devices">supported devices page</ulink>.
+</para>
<sect1 id="indi-kstars-setup">
<title>INDI Setup</title>
@@ -14,18 +21,34 @@
<secondary>Setup</secondary>
</indexterm>
<para>
-&kstars; can control local and remote devices seamlessly via the <link linkend="what-is-indi">INDI</link> server/client architecture. INDI devices may be run in three different modes:</para>
+&kstars; can control local and remote devices seamlessly via the
+<link linkend="what-is-indi">INDI</link> server/client architecture. INDI devices
+may be run in three different modes:
+</para>
<orderedlist>
-<listitem><para>Local: The local mode is the most common and is used to control local device (&ie; a device attached to your machine).</para></listitem>
-<listitem><para>Server: The server mode establishes an INDI server for a particular device and waits for connections from remote clients. You cannot operate server devices, you can only start and shut them down.</para></listitem>
-<listitem><para>Client: The client mode is used to connect to remote INDI servers running INDI devices. You can control remote devices seamlessly like local devices.</para></listitem>
+<listitem><para>Local: The local mode is the most common and is used to control
+local device (&ie; a device attached to your machine).
+</para></listitem>
+
+<listitem><para>Server: The server mode establishes an INDI server for a particular
+device and waits for connections from remote clients. You cannot operate server devices,
+you can only start and shut them down.
+</para></listitem>
+
+<listitem><para>Client: The client mode is used to connect to remote INDI servers
+running INDI devices. You can control remote devices seamlessly like local devices.
+</para></listitem>
</orderedlist>
-<para>You can run local device, establish INDI servers, and connect to remote clients from the <guimenuitem>Device Manager</guimenuitem> in the <guimenu>Devices</guimenu> menu.</para>
+<para>You can run local device, establish INDI servers, and connect to remote clients
+from the <guimenuitem>Device Manager</guimenuitem> in the
+<menuchoice><guimenu>Tools</guimenu><guimenuitem>Devices</guimenuitem></menuchoice> submenu.
+</para>
<para>Here is a screenshot of the <guilabel>Device Manager</guilabel>
-window:</para>
+window:
+</para>
<screenshot>
<screeninfo>Running device drivers</screeninfo>
@@ -39,9 +62,18 @@ window:</para>
</mediaobject>
</screenshot>
-<para>You can run devices by browsing the device tree, selecting a specific device, and then clicking on the <guibutton>Run Service</guibutton> button. You can select the operation mode, either local or server as defined above. The port number is randomly generated between the range from 7624 to 10,000. To specify a port, click on the port column next to the desired driver. &kstars; allows multiple drivers to run under one INDI server, and hence one port. Select multiple drivers then press <guibutton>Run Service</guibutton> button.</para>
+<para>You can run devices by browsing the device tree, selecting a specific device,
+and then clicking on the <guibutton>Run Service</guibutton> button. You can select
+the operation mode, either local or server as defined above. The port number is
+randomly generated between the range from 7624 to 10,000. To specify a port, click
+on the port column next to the desired driver. &kstars; allows multiple drivers to
+run under one INDI server, and hence one port. Select multiple drivers then press
+<guibutton>Run Service</guibutton> button.
+</para>
-<para>To control remote devices, refer to the <link linkend="indi-remote-control">remote device control</link> section.</para>
+<para>To control remote devices, refer to the
+<link linkend="indi-remote-control">remote device control</link> section.
+</para>
</sect1>
<sect1 id="indi-telescope-setup">
@@ -56,69 +88,104 @@ computer's <hardware>Serial/USB</hardware> port. Traditionally, the RS232
connects to the serial port of your computer, but since many new laptops
abandoned the serial port in favor of <hardware>USB/FireWire</hardware>
ports, you might need to obtain a Serial to USB adaptor to use with new
-laptops.</para>
+laptops.
+</para>
<para>After connecting your telescope to the Serial/USB port, turn your
telescope on. It is <emphasis>highly</emphasis> recommended that you
download and install the latest firmware for your telescope
-controller.</para>
+controller.
+</para>
<para>The telescope needs to be aligned before it can be used properly.
Align your telescope (one or two stars alignment) as illustrated in your
-telescope manual.</para>
+telescope manual.
+</para>
-<para>&kstars; needs to verify time and location settings before connecting to the telescope. This insures proper tracking and synchronization between the telescope and &kstars;. The following steps will enable you to connect to a device that is connected to your computer. To connect and control remote devices, please refer to <link linkend="indi-remote-control">remote device control</link> section.</para>
+<para>&kstars; needs to verify time and location settings before connecting
+to the telescope. This insures proper tracking and synchronization between
+the telescope and &kstars;. The following steps will enable you to connect
+to a device that is connected to your computer. To connect and control remote
+devices, please refer to
+<link linkend="indi-remote-control">remote device control</link> section.
+</para>
-<para>You can use the Telescope Setup Wizard and it will verify all the required information in the process. It can automatically scan ports for attached telescopes. You can run the wizard by selecting <guimenuitem>Telescope Wizard</guimenuitem> from the <guimenu>Devices</guimenu> menu.</para>
+<para>You can use the Telescope Setup Wizard and it will verify all the
+required information in the process. It can automatically scan ports for
+attached telescopes. You can run the wizard by selecting
+<guimenuitem>Telescope Wizard</guimenuitem> from the <guimenu>Devices</guimenu> menu.
+</para>
-<para>Alternatively, you can connect to a local telescope by performing the following
-steps:</para>
+<para>Alternatively, you can connect to a local telescope by performing the
+following steps:
+</para>
<orderedlist>
-<listitem><para>Set your geographical location. Open the <guilabel>Set Geographic Location</guilabel> window by selecting
+<listitem><para>Set your geographical location. Open the
+<guilabel>Set Geographic Location</guilabel> window by selecting
<guimenuitem>Geographic...</guimenuitem> from the
-<guimenu>Settings</guimenu> menu, or by pressing the <guiicon>Globe</guiicon> icon in the toolbar, or by pressing <keycombo
-action="simul">&Ctrl;<keycap>G</keycap></keycombo>.</para>
+<guimenu>Settings</guimenu> menu, or by pressing the <guiicon>Globe</guiicon>
+icon in the toolbar, or by pressing <keycombo
+action="simul">&Ctrl;<keycap>G</keycap></keycombo>.
+</para>
</listitem>
+
<listitem><para>Set your local time and date. You can change to any time or
-date by selecting <guimenuitem>Set Time...</guimenuitem> from the <guimenu>Time</guimenu> menu, or by
-pressing the <guiicon>time</guiicon> icon in the toolbar. The <guilabel>Set
-Time</guilabel> window uses a standard &kde; Date Picker widget. If you ever
-need to reset the clock back to the current time, just select <guimenuitem>Set
-Time to Now</guimenuitem> from the <guimenu>Time</guimenu> menu.</para>
+date by selecting <guimenuitem>Set Time...</guimenuitem> from the
+<guimenu>Time</guimenu> menu, or by pressing the <guiicon>time</guiicon>
+icon in the toolbar. The <guilabel>Set Time</guilabel> window uses a standard
+&kde; Date Picker widget. If you ever need to reset the clock back to the current
+time, just select <guimenuitem>Set Time to Now</guimenuitem> from the <guimenu>Time</guimenu> menu.
+</para>
</listitem>
+
<listitem>
-<para>Click on the <guimenu>Devices</guimenu> menu and select the
-<guimenuitem>Device Manager</guimenuitem>.</para>
+<para>Click on the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Devices</guimenuitem></menuchoice>
+submenu and select the <guimenuitem>Device Manager</guimenuitem>.
+</para>
</listitem>
+
<listitem>
-<para>Under the <guilabel>Device</guilabel> column, select your telescope model.</para>
+<para>Under the <guilabel>Device</guilabel> column, select your telescope model.
+</para>
</listitem>
+
<listitem>
-<para>Click on the <guibutton>Run Service</guibutton> button.</para>
+<para>Click on the <guibutton>Run Service</guibutton> button.
+</para>
</listitem>
+
<listitem>
<para>Click <guibutton>Close</guibutton> to leave the Device Manager
-Dialog.</para>
+Dialog.
+</para>
</listitem>
</orderedlist>
<note id="geo-time-note">
<title>Frequent Settings</title>
-<para>You do not need to set the geographic location and time every time you connect to a telescope. Only adjust the settings as needed.</para></note>
+<para>You do not need to set the geographic location and time every time you
+connect to a telescope. Only adjust the settings as needed.
+</para></note>
-<para>You are now ready to use the device features, &kstars; conveniently provides two interchangeable GUI interfaces for controlling telescopes:</para>
+<para>You are now ready to use the device features, &kstars; conveniently provides
+two interchangeable GUI interfaces for controlling telescopes:
+</para>
<orderedlist>
<title>Controlling your telescope</title>
<listitem>
<para>
-<guilabel>Sky map Control</guilabel>: For each device you run in the <guilabel>Device Manager</guilabel>, a corresponding entry will show up in popup menu that allows you to control the properties of the device. You can
+<guilabel>Sky map Control</guilabel>: For each device you run in the
+<guilabel>Device Manager</guilabel>, a corresponding entry will show up in popup menu
+that allows you to control the properties of the device. You can
issue commands like <command>Slew, Sync,</command> and
<command>Track</command> directly from the sky map.
</para>
-<para>Here is a screenshot of the popup menu with an active LX200 Classic
-device:</para>
+
+<para>Here is a screenshot of the popup menu with an active LX200 Classic device:
+</para>
+
<screenshot>
<screeninfo>Controlling devices from sky map</screeninfo>
<mediaobject>
@@ -135,7 +202,9 @@ device:</para>
features supported by a device.
</para>
-<para>The panel is divided into three main sections:</para>
+<para>The panel is divided into three main sections:
+</para>
+
<itemizedlist>
<listitem>
<para>
@@ -144,24 +213,26 @@ tab in the INDI panel. Multiple devices can run simultaneously without
affecting the operation of other devices.
</para>
</listitem>
+
<listitem>
<para>
Property views on the <guilabel>Main Control</guilabel> and <guilabel>Options</guilabel>
-tabs: Properties are the key element in INDI
-architecture. Each device defines a set of properties to communicate with
-the client. The current position of the telescope is an example of a
-property. Semantically similar properties are usually contained in logical
-blocks or groupings.
+tabs: Properties are the key element in INDI architecture. Each device defines a
+set of properties to communicate with the client. The current position of the
+telescope is an example of a property. Semantically similar properties are usually
+contained in logical blocks or groupings.
</para>
</listitem>
+
<listitem>
<para>
<guilabel>Log viewer</guilabel>: Devices report their status and acknowledge commands
-by sending INDI messages. Each device has its own log view. A device usually sends
-messages to its device driver only, but a device is permitted to send a generic message when appropriate.
+by sending INDI messages. Each device has its own log view. A device usually sends messages
+to its device driver only, but a device is permitted to send a generic message when appropriate.
</para>
</listitem>
</itemizedlist>
+
<screenshot>
<screeninfo>INDI Control Panel</screeninfo>
<mediaobject>
@@ -173,35 +244,58 @@ messages to its device driver only, but a device is permitted to send a generic
</listitem>
</orderedlist>
-<para>You are not restricted on using one interface over another as they can be both used simultaneously. Actions from the <guilabel>Sky map</guilabel> are automatically reflected in the <guilabel>INDI Control Panel</guilabel>
-and vice versa.</para>
+<para>You are not restricted on using one interface over another as they can be both
+used simultaneously. Actions from the <guilabel>Sky map</guilabel> are automatically
+reflected in the <guilabel>INDI Control Panel</guilabel> and vice versa.
+</para>
-<para>To connect to your telescope, you can either select <guimenuitem>Connect</guimenuitem> from your device popup menu or
-alternatively, you can press <guibutton>Connect</guibutton> under your device tab in the <guilabel>INDI Control Panel</guilabel>.</para>
+<para>To connect to your telescope, you can either select <guimenuitem>Connect</guimenuitem>
+from your device popup menu or alternatively, you can press <guibutton>Connect</guibutton>
+under your device tab in the <guilabel>INDI Control Panel</guilabel>.
+</para>
<important><para>By default, &kstars; will try to connect to the <constant>/dev/ttyS0</constant>
-port. To change the connection port, select <guilabel>INDI Control Panel</guilabel> from the <guimenu>Devices</guimenu> menu and change the port under your device tab.</para></important>
+port. To change the connection port, select <guilabel>INDI Control Panel</guilabel> from the
+<menuchoice><guimenu>Tools</guimenu><guimenuitem>Devices</guimenuitem></menuchoice> submenu and
+change the port under your device tab.
+</para></important>
<para>&kstars; automatically updates the telescope's longitude, latitude, and
time based on current settings in &kstars;. You can enable/disable these
-updates from <guimenuitem>Configure INDI</guimenuitem> dialog under the
-<guimenu>Devices</guimenu> menu.
+using the <guimenuitem>INDI</guimenuitem> tab from
+<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kstars;...</guimenuitem></menuchoice>
+submenu. Using the <guimenuitem>INDI</guimenuitem> tab you can configure &kstars; to display or not
+INDI status messages in the status bar. By default INDI server port numbers have values between
+the range from 7624 to 9000, but you can easily change the range using the <guilabel>From</guilabel>
+and <guilabel>To</guilabel> text boxes from the <guilabel>Server Port</guilabel> section.
</para>
-<para>If &kstars; communicates successfully with the telescope, it will retrieve the current <abbrev>RA</abbrev> and <abbrev>DEC</abbrev> from the telescope and will display a crosshair on the sky map indicating the telescope position.</para>
+<para>If &kstars; communicates successfully with the telescope, it will retrieve the
+current <abbrev>RA</abbrev> and <abbrev>DEC</abbrev> from the telescope and will display a
+crosshair on the sky map indicating the telescope position. You can hide the crosshair that marks telescope
+position using <guimenuitem>INDI</guimenuitem> tab from
+<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kstars;...</guimenuitem></menuchoice> submenu.
+</para>
<note id="indi-sync">
<title>Synchronizing your telescope</title>
-<para>If you aligned your telescope and the last alignment star was, for example, Vega, then the crosshair should be centered around Vega. If the crosshair was off target, then you can <mousebutton>right</mousebutton>-click Vega from the sky map and select
-<command>Sync</command> from your telescope menu. This action will instruct the telescope to synchronize its internal coordinates to match those of Vega, and the telescope's crosshair should now be centered around Vega.
+<para>If you aligned your telescope and the last alignment star was, for example, Vega,
+then the crosshair should be centered around Vega. If the crosshair was off target, then
+you can <mousebutton>right</mousebutton>-click Vega from the sky map and select
+<command>Sync</command> from your telescope menu. This action will instruct the telescope
+to synchronize its internal coordinates to match those of Vega, and the telescope's crosshair
+should now be centered around Vega.
</para>
</note>
-<para>This is it: your telescope is ready to explore the heavens!</para>
+<para>This is it: your telescope is ready to explore the heavens!
+</para>
<warning>
<title>WARNING</title>
-<para>Never use the telescope to look at the sun. Looking at the sun might cause irreversible damage to your eyes and your equipment.</para>
+<para>Never use the telescope to look at the sun. Looking at the sun might cause irreversible
+damage to your eyes and your equipment.
+</para>
</warning>
</sect1>
@@ -211,9 +305,15 @@ updates from <guimenuitem>Configure INDI</guimenuitem> dialog under the
<secondary>Setup</secondary>
</indexterm>
-<para>You can run CCD and Video Capture devices from the <guimenuitem>Device Manager</guimenuitem> in the <guimenu>Devices</guimenu> menu. Like all INDI devices, some of the device controls will be accessible from the skymap. The device can be controlled fully from the <guimenuitem>INDI Control Panel.</guimenuitem></para>
+<para>You can run CCD and Video Capture devices from the <guimenuitem>Device Manager</guimenuitem>
+in the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Devices</guimenuitem></menuchoice> submenu.
+Like all INDI devices, some of the device controls will be accessible from the skymap.
+The device can be controlled fully from the <guimenuitem>INDI Control Panel</guimenuitem>.
+</para>
-<para>The standard format for image capture is FITS. Once an image is captured and downloaded, it will be automatically displayed in the &kstars; <link linkend="tool-fitsviewer">FITS Viewer</link>.</para>
+<para>The standard format for image capture is FITS. Once an image is captured and downloaded,
+it will be automatically displayed in the &kstars; <link linkend="tool-fitsviewer">FITS Viewer</link>.
+</para>
</sect1>
<sect1 id="indi-configure">
@@ -222,35 +322,69 @@ updates from <guimenuitem>Configure INDI</guimenuitem> dialog under the
<secondary>INDI</secondary>
</indexterm>
-<para>The INDI page allows you to modify <emphasis>Client side</emphasis> INDI specific options. The window is divided into several main categories: General, Automatic device updates, Display, Update Source, Filter Wheel and Server Port:</para>
+<para>The INDI page allows you to modify <emphasis>Client side</emphasis> INDI
+specific options. To access it, select the <guimenuitem>INDI</guimenuitem> tab from
+<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kstars;...</guimenuitem></menuchoice>
+submenu.
+The window is divided into several main categories: General, Device Updates, Display and Server Port:
+</para>
<itemizedlist>
<listitem><para>General</para>
<itemizedlist>
- <listitem><para><option>Default FITS directory:</option> Specify the directory where all captured FITS images will be saved to. If no directory is specified, images will be stored in $HOME.</para></listitem>
+ <listitem><para><option>INDI Server:</option> Specify the directory where INDI server
+is located in your system. By default, &kstars; uses <quote>/usr/bin/indiserver</quote> directory.
+ </para></listitem>
+ <listitem><para><option>INDI Drivers Directory:</option> Specify the directory where INDI
+drivers are located in your system. By default, &kstars; uses <quote>/usr/share/indi</quote> directory.
+ </para></listitem>
+ <listitem><para><option>Default FITS directory:</option> Specify the directory where all
+captured FITS images will be saved to. If no directory is specified, images will be stored in $HOME.
+ </para></listitem>
+ <!-- Telescope port & Video port:
<listitem><para><option>Telescope port:</option> The default telescope port. When you connect to a local or remote telescope service, &kstars; will automatically fill the telescope's device port with the specified default port.</para></listitem>
- <listitem><para><option>Video port:</option> The default video port. When you connect to a local or remote video service, &kstars; will automatically fill the webcam's device port with the specified default port.</para></listitem>
- <!-- INDI Server + INDI Drivers Directory-->
+ <listitem><para><option>Video port:</option> The default video port. When you connect to a local or remote video service, &kstars; will automatically fill the webcam's device port with the specified default port.</para></listitem>
+ -->
</itemizedlist>
</listitem>
- <listitem><para>Automatic device updates</para>
+ <listitem><para>Device Updates</para>
<itemizedlist>
- <listitem><para><option>Time:</option> Update the telescope's date and time, if supported, upon connection.</para></listitem>
- <listitem><para><option>Geographic location:</option> Update the telescope's geographical location information (current longitude and latitude), if supported, upon connection.</para></listitem>
+ <listitem><para><option>Computer:</option> Sync the device to the computer's time and
+location settings.
+ </para></listitem>
+ <listitem><para><option>Device:</option> Sync the computer to the device's time and
+location settings.
+ </para></listitem>
+ <listitem><para><option>Time:</option> Update the telescope's date and time, if supported,
+upon connection.
+ </para></listitem>
+ <listitem><para><option>Geographic location:</option> Update the telescope's geographical
+location information (current longitude and latitude), if supported, upon connection.
+ </para></listitem>
</itemizedlist>
</listitem>
<listitem><para>Display</para>
<itemizedlist>
- <listitem><para><option>Device target crosshair:</option> When checked, &kstars; displays the telescope's target crosshair on the sky map. The crosshair is displayed upon a successful connection to the telescope and its location is updated periodically. The telescope's name is displayed next to the crosshair. &kstars; displays one crosshair per each connected telescope. To change the color of the telescope's crosshair, open the <link linkend="viewops">Configure &kstars;</link> window. Select the <guilabel>Colors</guilabel> tab, and then change the color of the <emphasis>Target Indicator</emphasis> item to the desired color.</para></listitem>
- <listitem><para><option>INDI messages in status bar:</option> When checked, &kstars; displays INDI status messages in the &kstars; status bar.</para></listitem>
- <listitem><para><option>Automatic Display of FITS upon capture:</option> When checked, &kstars; will display captured FITS in &kstars; <link linkend="tool-fitsviewer">FITS Viewer</link> tool.</para></listitem>
+ <listitem><para><option>Telescope crosshair:</option> When checked, &kstars; displays the
+telescope's target crosshair on the sky map. The crosshair is displayed upon a successful connection
+to the telescope and its location is updated periodically. The telescope's name is displayed next
+to the crosshair. &kstars; displays one crosshair per each connected telescope. To change the color
+of the telescope's crosshair, open the <link linkend="viewops">Configure &kstars;</link> window.
+Select the <guilabel>Colors</guilabel> tab, and then change the color of the
+<emphasis>Target Indicator</emphasis> item to the desired color.
+ </para></listitem>
+ <listitem><para><option>INDI messages in status bar:</option> When checked, &kstars; displays
+INDI status messages in the &kstars; status bar.
+ </para></listitem>
</itemizedlist>
</listitem>
+<!--
<listitem><para>Update Source: Synchronize &kstars; according to either the
computer or device time and location settings.</para>
</listitem>
<listitem><para>Filter Wheel: Assign color codes to the filter wheel slots (e.g. Slot #0 Red, Slot #1 Blue..etc). You can assign color codes for up to 10 filter slots (0 to 9). To assign a color code, select a slot number from the drop down combo box, and then type the corresponding color code in the edit field. Repeat the process for all desired slots and then press OK.</para>
</listitem>
+-->
<listitem><para>Server Port: Specify range of ports that INDI Server
will bind to when starting new drivers.</para>
</listitem>
@@ -265,7 +399,13 @@ updates from <guimenuitem>Configure INDI</guimenuitem> dialog under the
</indexterm>
<para>
-The main key concept in INDI is that devices have the ability to describe themselves. This is accomplished by using XML to describe a generic hierarchy that can represent both canonical and non-canonical devices. In INDI, all <emphasis>devices</emphasis> may contain one or more <emphasis>properties</emphasis>. Any <emphasis>property</emphasis> may contain one or more <emphasis>elements</emphasis>. There are four types of INDI properties:</para>
+The main key concept in INDI is that devices have the ability to describe themselves.
+This is accomplished by using XML to describe a generic hierarchy that can represent
+both canonical and non-canonical devices. In INDI, all <emphasis>devices</emphasis>
+may contain one or more <emphasis>properties</emphasis>. Any <emphasis>property</emphasis>
+may contain one or more <emphasis>elements</emphasis>.
+There are four types of INDI properties:
+</para>
<itemizedlist>
<listitem><para>Text property.</para></listitem>
<listitem><para>Number property.</para></listitem>
@@ -273,9 +413,15 @@ The main key concept in INDI is that devices have the ability to describe themse
<listitem><para>Light property (Represented in GUI by colored LEDs).</para></listitem>
</itemizedlist>
-<para>For example, all INDI devices share the CONNECTION standard switch <emphasis>property</emphasis>. The CONNECTION property has two elements: CONNECT and DISCONNECT switches. &kstars; parses the generic XML description of properties and builds a GUI representation suitable for direct human interaction.</para>
+<para>For example, all INDI devices share the CONNECTION standard switch <emphasis>property</emphasis>.
+The CONNECTION property has two elements: CONNECT and DISCONNECT switches. &kstars; parses the generic
+XML description of properties and builds a GUI representation suitable for direct human interaction.
+</para>
-<para>The INDI control panel offers many device properties not accessible from the sky map. The properties offered differ from one device to another. Nevertheless, all properties share common features that constrains how they are displayed and used:</para>
+<para>The INDI control panel offers many device properties not accessible from the sky map.
+The properties offered differ from one device to another. Nevertheless, all properties share
+common features that constrains how they are displayed and used:
+</para>
<itemizedlist>
<listitem>
@@ -285,11 +431,13 @@ write enabled. An example of a read-write property is the telescope's Right
Ascension. You can enter a new Right Ascension and the telescope, based on
current settings, will either slew or sync to the new input. Furthermore,
when the telescope slews, its Right Ascension gets updated and sent back to
-the client.</para>
+the client.
+</para>
</listitem>
<listitem>
<para>State: Prefixed to each property is a state indicator (round LED).
-Each property has a state and an associated color code:</para>
+Each property has a state and an associated color code:
+</para>
<table frame="top"><title>INDI State color code</title>
<tgroup cols="3" colsep="1" rowsep="1">
<thead>
@@ -330,15 +478,16 @@ attention</entry>
necessary. For example, if the telescope is in the process of slewing to a
target, then the RA/DEC properties will be signaled as
<guilabel>Busy</guilabel>. When the slew process is completed successfully,
-the properties will be signaled as
-<guilabel>Ok</guilabel>.</para>
+the properties will be signaled as <guilabel>Ok</guilabel>.
+</para>
</listitem>
<listitem>
<para>
Context: Numerical properties can accept and process numbers in two formats:
decimal and sexagesimal. The sexagesimal format is convenient when expressing
time or equatorial/geographical coordinates. You can use any format at your
-convenience. For example, all the following numbers are equal:</para>
+convenience. For example, all the following numbers are equal:
+</para>
<itemizedlist>
<listitem><para>-156.40</para></listitem>
<listitem><para>-156:24:00</para></listitem>
@@ -347,7 +496,10 @@ convenience. For example, all the following numbers are equal:</para>
</listitem>
<listitem>
<para>
-Time: The standard time for all INDI-related communications is Universal Time UTC specified as YYYY-MM-DDTHH:MM:SS in accord with ISO 8601. &kstars; communicates the correct UTC time with device drivers automatically. You can enable/disable automatic time updates from the <guimenuitem>INDI</guimenuitem> page in the settings dialog.
+Time: The standard time for all INDI-related communications is Universal Time UTC
+specified as YYYY-MM-DDTHH:MM:SS in accord with ISO 8601. &kstars; communicates the
+correct UTC time with device drivers automatically. You can enable/disable automatic
+time updates from the <guimenuitem>INDI</guimenuitem> page in the settings dialog.
</para>
</listitem>
</itemizedlist>
@@ -361,20 +513,29 @@ Time: The standard time for all INDI-related communications is Universal Time UT
<para>&kstars; provides a simple yet powerful layer for remote device control.
A detailed description of the layer is described in the INDI <ulink
-url="http://www.clearskyinstitute.com/INDI/INDI.pdf">white
-paper</ulink>.</para>
+url="http://www.clearskyinstitute.com/INDI/INDI.pdf">white paper</ulink>.
+</para>
-<para>You need to configure both the server and client machines for remote
-control:</para>
+<para>You need to configure both the server and client machines for remote control:
+</para>
<orderedlist>
<listitem>
-<para>Server: To prepare a device for remote control, follow the same steps in the <link linkend="indi-kstars-setup">local/server</link> setup. When you start a device service in the <guimenu>Device Manager</guimenu>, a port number is displayed under the <guilabel>Listening port</guilabel> column. In addition to the port number, you also need the hostname or IP address of your server.
+<para>Server: To prepare a device for remote control, follow the same steps in the
+<link linkend="indi-kstars-setup">local/server</link> setup. When you start a device
+service in the <guimenu>Device Manager</guimenu>, a port number is displayed under
+the <guilabel>Port</guilabel> column. In addition to the port number, you
+also need the hostname or IP address of your server.
</para>
</listitem>
<listitem>
-<para>Client: Select the <guimenuitem>Device Manager</guimenuitem> from the <guimenu>Device</guimenu> menu and click on the <guilabel>Client</guilabel> tab. You can add, modify, or delete hosts under the <guilabel>Client</guilabel> tab. Add a host by clicking on the <guibutton>Add</guibutton> button. Enter the hostname/IP address of the server in the <guilabel>Host</guilabel> field, and enter the port number obtained from the <emphasis>server</emphasis> machine in step 1.
+<para>Client: Select the <guimenuitem>Device Manager</guimenuitem> from the
+<menuchoice><guimenu>Tools</guimenu><guimenuitem>Devices</guimenuitem></menuchoice> submenu
+and click on the <guilabel>Client</guilabel> tab. You can add, modify, or delete hosts under
+the <guilabel>Client</guilabel> tab. Add a host by clicking on the <guibutton>Add</guibutton> button.
+Enter the hostname/IP address of the server in the <guilabel>Host</guilabel> field, and enter the port
+number obtained from the <emphasis>server</emphasis> machine in step 1.
</para>
</listitem>
</orderedlist>
@@ -397,15 +558,20 @@ exactly as described in the <link linkend="indi-kstars-setup">local/server</link
<sect2 id="indi-commandline">
<title>Running an INDI server from the command line</title>
-<para>While &kstars; allows you to easily deploy an INDI server; you can launch an INDI server from the command line.
+<para>While &kstars; allows you to easily deploy an INDI server; you can launch
+an INDI server from the command line.
</para>
<para>
-Since INDI is an independent backend component, you can run an INDI server on a host without &kstars;. INDI can be compiled separately to run on remote hosts. Furthermore, device drivers log messages to <constant>stderr</constant> and that can be helpful in a debugging situation. The syntax for INDI server is
-as following:</para>
+Since INDI is an independent backend component, you can run an INDI server on a host
+without &kstars;. INDI can be compiled separately to run on remote hosts.
+Furthermore, device drivers log messages to <constant>stderr</constant> and that can
+be helpful in a debugging situation. The syntax for INDI server is as following:
+</para>
<para>$ <command>indiserver</command> [options] [<filename>driver</filename>
-...]</para>
+...]
+</para>
<para>Options:</para>
<para> -l d : log driver messages to d/YYYY-MM-DD.islog</para>
@@ -419,7 +585,8 @@ as following:</para>
<para>For example, if you want to start an INDI server running an LX200 GPS
driver and listening to connections on port 8000, you would run the
-following command:</para>
+following command:
+</para>
<para>$ <command>indiserver</command> -p 8000 <filename>lx200gps</filename></para>
</sect2>
@@ -428,17 +595,28 @@ following command:</para>
<title>Secure Remote Operation</title>
<para>Suppose we want to run an indiserver with INDI drivers on a remote host,
-<constant>remote_host</constant>, and connect them to &kstars; running on the local machine.</para>
+<constant>remote_host</constant>, and connect them to &kstars; running on the local machine.
+</para>
-<para>From the local machine log onto the remote host, <constant>remote_host</constant>, by typing:</para>
+<para>From the local machine log onto the remote host, <constant>remote_host</constant>,
+by typing:
+</para>
<para>$ <command>ssh</command> -L <varname>local_port</varname>:<constant>remote_host</constant>:<varname>remote_port</varname></para>
-<para>This binds the <varname>local_port</varname> on the local machine to the <varname>remote_port</varname> on the <constant>remote_host</constant>. After logging in, run indiserver on the remote host:</para>
+<para>This binds the <varname>local_port</varname> on the local machine to the
+<varname>remote_port</varname> on the <constant>remote_host</constant>. After logging in,
+run indiserver on the remote host:
+</para>
<para>$ <command>indiserver</command> -p <varname>remote_port</varname> [<filename>driver</filename>...]</para>
-<para>Back on the local machine, start &kstars; then open the <guimenuitem>Device Manager</guimenuitem> and add a host under the <guilabel>Client</guilabel> tab. The host should be the local host (usually 127.0.0.1) and the port number should be the <varname>local_port</varname> used in the steps above. <mousebutton>Right</mousebutton>-click on the host and select <guimenuitem>Connect</guimenuitem> from the popup menu. &kstars; will connect to the remote INDI server securely. The host information will be saved for future sessions.</para>
+<para>Back on the local machine, start &kstars; then open the <guimenuitem>Device Manager</guimenuitem>
+and add a host under the <guilabel>Client</guilabel> tab. The host should be the local host
+(usually 127.0.0.1) and the port number should be the <varname>local_port</varname> used in the steps above.
+<mousebutton>Right</mousebutton>-click on the host and select <guimenuitem>Connect</guimenuitem> from
+the popup menu. &kstars; will connect to the remote INDI server securely. The host information will be saved
+for future sessions.</para>
</sect2>
</sect1>
@@ -454,9 +632,17 @@ following command:</para>
<para>What is INDI?</para>
</question>
<answer>
-<para> <acronym>INDI</acronym> is the <ulink url="http://indi.sourceforge.net"> Instrument-Neutral-Distributed-Interface</ulink> control protocol developed by <author><firstname>Elwood</firstname><surname>C.
-Downey</surname></author> of <ulink url="http://www.clearskyinstitute.com/">ClearSky Institute</ulink>. &kstars; employs device drivers that are compatible with the INDI protocol. INDI has many advantages including loose coupling between hardware devices and
-software drivers. Clients that use the device drivers (like &kstars;) are completely unaware of the device capabilities. In run time, &kstars; communicates with the device drivers and builds a completely dynamical GUI based on services provided by the device. Therefore, new device drivers can be written or updated and &kstars; can take full advantage of them without any changes on the client side.</para>
+<para> <acronym>INDI</acronym> is the
+<ulink url="http://indi.sourceforge.net"> Instrument-Neutral-Distributed-Interface</ulink> control
+protocol developed by <author><firstname>Elwood</firstname><surname>C. Downey</surname></author> of
+<ulink url="http://www.clearskyinstitute.com/">ClearSky Institute</ulink>. &kstars; employs device
+drivers that are compatible with the INDI protocol. INDI has many advantages including loose coupling
+between hardware devices and software drivers. Clients that use the device drivers (like &kstars;)
+are completely unaware of the device capabilities. In run time, &kstars; communicates with the device
+drivers and builds a completely dynamical GUI based on services provided by the device. Therefore, new
+device drivers can be written or updated and &kstars; can take full advantage of them without any changes
+on the client side.
+</para>
</answer>
</qandaentry>
@@ -483,7 +669,12 @@ What operations does &kstars; provide to control the telescope?
</question>
<answer>
<para>
-It depends on the particular telescope you're running, but the minimum three operations are <command>Slew</command>, <command>Track</command>, and <command>Sync</command>, which you can issue directly from the sky map. Your telescope must be aligned for those operations to perform correctly. Some telescopes offer you more operations like site management, slew modes, focusing, parking, and more. You can access the telescopes extended features from the INDI Control Panel in the Devices Menu.
+It depends on the particular telescope you're running, but the minimum three operations are
+<command>Slew</command>, <command>Track</command>, and <command>Sync</command>, which you can
+issue directly from the sky map. Your telescope must be aligned for those operations to perform
+correctly. Some telescopes offer you more operations like site management, slew modes, focusing,
+parking, and more. You can access the telescopes extended features from the INDI Control Panel
+in the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Devices</guimenuitem></menuchoice> submenu.
</para>
</answer>
</qandaentry>
@@ -496,10 +687,16 @@ What's the difference between <command>Slew</command>, <command>Track</command>,
</question>
<answer>
<para>
-The command <command>Slew</command> orders the telescope to move to a particular target, and once the telescope reaches its target, the telescope keeps tracking that target at a <emphasis>sidereal</emphasis> rate (i.e. the rate at which stars move across the sky). This works well for stars, Messier objects, and about everything outside our solar system. But solar system objects travel differently across the sky and so the telescope must <command>Track</command> the objects as they move.
+The command <command>Slew</command> orders the telescope to move to a particular target, and once
+the telescope reaches its target, the telescope keeps tracking that target at a
+<emphasis>sidereal</emphasis> rate (i.e. the rate at which stars move across the sky). This works well
+for stars, Messier objects, and about everything outside our solar system. But solar system objects
+travel differently across the sky and so the telescope must <command>Track</command> the objects as they move.
</para>
<para>
-Therefore, you need to issue a track command if you want to track an object with non-sidereal motion. On the other hand, <command>Sync</command> is used to synchronize the telescope's internal coordinates with that of an object you select.
+Therefore, you need to issue a track command if you want to track an object with non-sidereal motion.
+On the other hand, <command>Sync</command> is used to synchronize the telescope's internal coordinates
+with that of an object you select.
</para>
</answer>
</qandaentry>
@@ -512,7 +709,10 @@ Can I control my telescope remotely?
</question>
<answer>
<para>
-Yes. You can start an INDI server on the machine connected to your telescope and the server will listen to requests from &kstars; clients. Once you're connected, you can control your telescope directly from the sky map. This procedure is described in detail in the <link linkend="indi-remote-control">Remote device control</link> section.
+Yes. You can start an INDI server on the machine connected to your telescope and the server will listen
+to requests from &kstars; clients. Once you're connected, you can control your telescope directly from
+the sky map. This procedure is described in detail in the
+<link linkend="indi-remote-control">Remote device control</link> section.
</para>
</answer>
</qandaentry>
@@ -554,7 +754,13 @@ under the <guimenu>Devices</guimenu> menu. The default device is
<para>&kstars; reports that the telescope is online and ready, but I cannot find the telescope's crosshair, where is it?</para>
</question>
<answer>
-<para>&kstars; retrieves the telescopes RA and DEC coordinates upon connection. If your alignment was performed correctly, then you should see the crosshair around your target in the Sky Map. However, the RA and DEC coordinates provided by the telescope may be incorrect (even below the horizon) and you need to <link linkend="indi-sync">Sync</link> your telescope to your current target. You can use the right-click menu to center and track the telescope crosshair in the sky map.</para>
+<para>&kstars; retrieves the telescopes RA and DEC coordinates upon connection. If your
+alignment was performed correctly, then you should see the crosshair around your target
+in the Sky Map. However, the RA and DEC coordinates provided by the telescope may be
+incorrect (even below the horizon) and you need to <link linkend="indi-sync">Sync</link>
+your telescope to your current target. You can use the right-click menu to center and track
+the telescope crosshair in the sky map.
+</para>
</answer>
</qandaentry>
@@ -569,7 +775,9 @@ under the <guimenu>Devices</guimenu> menu. The default device is
<para>Is the telescope aligned?</para>
</listitem>
<listitem>
-<para>Is the telescope alignment mode correct? Use <guilabel>INDI Control Panel</guilabel> to check and change these settings (<constant>Alt/Az,Polar, Land</constant>).</para>
+<para>Is the telescope alignment mode correct? Use <guilabel>INDI Control Panel</guilabel> to check
+and change these settings (<constant>Alt/Az,Polar, Land</constant>).
+</para>
</listitem>
<listitem>
<para>Are the telescope's time and date settings correct?</para>
@@ -591,8 +799,9 @@ under the <guimenu>Devices</guimenu> menu. The default device is
</listitem>
</orderedlist>
-<para>If you think all settings are correct but the telescope still moves erratically or not at all, then please send a report to
-<email>indi-devel@lists.sourceforge.net</email></para>
+<para>If you think all settings are correct but the telescope still moves erratically or not at all,
+then please send a report to <email>indi-devel@lists.sourceforge.net</email>.
+</para>
</answer>
</qandaentry>
</qandaset>
diff --git a/doc/indi_tab.png b/doc/indi_tab.png
new file mode 100644
index 0000000..658d286
--- /dev/null
+++ b/doc/indi_tab.png
Binary files differ
diff --git a/doc/jmoons.docbook b/doc/jmoons.docbook
index 40a7d7b..be11ea9 100644
--- a/doc/jmoons.docbook
+++ b/doc/jmoons.docbook
@@ -28,7 +28,8 @@ in arcminutes. The offset is measured along the direction of Jupiter's
equator. Each moon's position as a function of time traces a sinusoidal
path in the plot, as the moon orbits around Jupiter. Each track is
assigned a different color to distinguish it from the others; the name
-labels at the top of the window indicate the color used by each moon.
+labels at the top of the window indicate the color used by each moon
+(&ie; red for Io, yellow for Europa, green for Callisto and blue for Ganymede).
</para><para>
The plot can be manipulated with the keyboard. The time axis can be
expanded or compressed using the <keycap>+</keycap> and
diff --git a/doc/load_catalog.png b/doc/load_catalog.png
new file mode 100644
index 0000000..0e9e598
--- /dev/null
+++ b/doc/load_catalog.png
Binary files differ
diff --git a/doc/obsplanner.docbook b/doc/obsplanner.docbook
index e3bc3ea..a4606b6 100644
--- a/doc/obsplanner.docbook
+++ b/doc/obsplanner.docbook
@@ -10,8 +10,16 @@
<indexterm>
<primary>Planner</primary>
</indexterm>
- <para>Since &kde; SC 4.4, Prakash Mohan&apos;s GSoC work has been released in &kstars;. &kstars; now has an awesome observation planner to plan your observation sessions. The execute session option allows you to log information about objects as you observe them. Alternately, you may also write a short log in the session planner itself. We wish you a lot of fun planning your observations with &kstars;!</para>
- <para>You can even add some pictures to the objects. The image list is a Google image search list. To add image to an object all you need to do is press <guibutton>Find Image</guibutton> button on the right and then find an image that you like. If you do not have an Internet connection you can open an image from your hard drive. Note that images that will be used are going to be cropped to 600x600 pixels.</para>
+ <para>Since &kde; SC 4.4, Prakash Mohan&apos;s GSoC work has been released in &kstars;. &kstars; now
+has an awesome observation planner to plan your observation sessions. The execute session option allows
+you to log information about objects as you observe them. Alternately, you may also write a short log
+in the session planner itself. We wish you a lot of fun planning your observations with &kstars;!
+ </para>
+ <para>You can even add some pictures to the objects. The image list is a Google image search list.
+To add image to an object just press <guibutton>Find Image</guibutton> button on the right and then
+find an image that you like. If you do not have an Internet connection you can open an image from
+your hard drive. Note that images that will be used are going to be cropped to 600x600 pixels.
+ </para>
<para>The first way of doing this is by pressing <keycombo action="simul">&Ctrl;<keycap>2</keycap></keycombo> or <keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo> to open the Observation List, then press the <guibutton>Add Object</guibutton> button.</para>
<mediaobject>
<imageobject>
@@ -23,7 +31,7 @@
</para>
</caption>
</mediaobject>
- <para>The <guibutton>Save all Images</guibutton> button does a search for the SDSS images and displays the DSS image if the requested RA/Dec is out of the SDSS footprint.</para>
+ <para>The <guibutton>Download all Images</guibutton> button does a search for the SDSS images and displays the DSS image if the requested RA/Dec is out of the SDSS footprint.</para>
<mediaobject>
<imageobject>
<imagedata fileref="sds.png" format="PNG"/>
@@ -55,10 +63,23 @@
</para>
</caption>
</mediaobject>
- <para>You can add more objects by pressing the <guibutton>Add Object</guibutton> button. It has quite accurate method for sorting out items, depending on what options you have given to him. They are: Any, Stars, Solar System, Clusters (Globular and Open), Nebula (Gaseous and Planetary), Galaxies, Comets, Asteroids and Constellations + the name filter.</para>
- <para>Here you can see the object visibility based on the time and date. The leader line shows the time right now.</para>
- <para>And below this you can add notes about observing this object.</para>
- <para>Do note that the Wish List is not the Session Plan. In the Wish List you can add objects that you wish to observer at some point. From there you can add them to the Session Plan.</para>
+ <para>You can add more objects by pressing the <guibutton>Find Object</guibutton> button. It will open
+the <guilabel>Find Object</guilabel> tool which provides two accurate methods for sorting out the items,
+depending on what criteria you want to use.
+You can filter the list by objects type: Any, Stars, Solar System, Clusters (Globular and Open),
+Nebulae (Gaseous and Planetary), Galaxies, Comets, Asteroids, Constellations, Supernovae or Satellites.
+You can also filter the objects list by name. Enter the name of desired object
+in the <guilabel>Filter by name</guilabel> text box.
+ </para>
+
+ <para>Inside Observation Planner window you can see the <quote>Altitude vs Time</quote> widget (AltvsTime),
+which shows you how the altitude of a selected object varies over time.
+ </para>
+ <para>Below the AltvsTime widget, there is a text box in that you can add observing notes for current sky object.
+ </para>
+ <para>Note that the Wish List is not the Session Plan. In the Wish List you can add objects
+that you wish to observe at some point. From there you can add them to the Session Plan.
+ </para>
<para>You can see the pop-up window that comes after right-clicking on an object.</para>
<mediaobject>
<imageobject>
@@ -70,8 +91,11 @@
</para>
</caption>
</mediaobject>
- <para> Here is the second way of adding objects in your Observation Plan and using you Observation Plan. To use this way you just need to press the 4-th icon on the top-left corner of the Observation Planner Wizard (which is highlighted with yellow).</para>
- <para>Despite looking differently this way is basically the same as the first one. Although that it could be a bit more detailed. Here you can see the same categories of objects.</para>
+ <para> Here is the second way of adding objects in your Observation Plan, using the Observing List Wizard. You
+just need to press the fourth button on the top-left corner of the Observation Planner window.</para>
+ <para>Despite looking differently this way is basically the same as the first one. Although that
+it could be a bit more detailed. Here you can see the same categories of objects.
+ </para>
<mediaobject>
<imageobject>
<imagedata fileref="Another_way_to_add.png" format="PNG"/>
diff --git a/doc/overwrite_catalog.png b/doc/overwrite_catalog.png
new file mode 100644
index 0000000..4d69112
--- /dev/null
+++ b/doc/overwrite_catalog.png
Binary files differ
diff --git a/doc/satellites_tab.png b/doc/satellites_tab.png
new file mode 100644
index 0000000..fac975e
--- /dev/null
+++ b/doc/satellites_tab.png
Binary files differ
diff --git a/doc/scriptbuilder.docbook b/doc/scriptbuilder.docbook
index b121128..4611a59 100644
--- a/doc/scriptbuilder.docbook
+++ b/doc/scriptbuilder.docbook
@@ -94,7 +94,7 @@ is used to do this. Highlight this function in the Function Browser,
and note the documentation displayed in the panel below the Browser.
Press the <guibutton>Add Function</guibutton> button to add this
function to the Current Script box. The Function Arguments panel
-will now contain a combobox labeled <quote>dir</quote>, short for
+will now contain a combobox labeled <quote>Dir</quote>, short for
direction. This is the direction in which the display should
be pointed. The combobox contains only the cardinal compass points,
not the Moon or any other objects. You can either enter
@@ -141,7 +141,7 @@ press the <guibutton>Browse Tree</guibutton> button, which will open
a window containing a tree view of the available options, organized by
topic. In addition, each item has a short explanation of what the
option does, and the data type of the option's value. We find
-UseAltAz under the <guilabel>Skymap options</guilabel> category.
+UseAltAz under the <guilabel>Skymap Options</guilabel> category.
Just highlight this item and press <guibutton>OK</guibutton>, and it
will be selected in the combobox of the Function Arguments panel.
Finally, make its value <quote>false</quote> or <quote>0</quote>.
@@ -168,7 +168,7 @@ Now that we have a completed script, we can run it in a couple of ways.
From a console prompt, you can simply execute the script as long as an
instance of &kstars; is currently running. Alternatively, you can execute
the script from within &kstars; using the <guimenuitem>Run
-Script</guimenuitem> item in the <guimenu>File</guimenu> menu.
+Script...</guimenuitem> item in the <guimenu>File</guimenu> menu.
</para>
</sect2>
</sect1>
diff --git a/doc/skymapdevice.png b/doc/skymapdevice.png
index 15512cc..cf2ea75 100644
--- a/doc/skymapdevice.png
+++ b/doc/skymapdevice.png
Binary files differ
diff --git a/doc/solarsys.docbook b/doc/solarsys.docbook
index b3a5a07..da6e0af 100644
--- a/doc/solarsys.docbook
+++ b/doc/solarsys.docbook
@@ -39,7 +39,8 @@ clock in the main &kstars; window. There is a timestep control
widget here, similar to the one in the main window's toolbar.
However, this control defaults to a timestep of 1 day (so that
the motions of the planets can be seen), and it starts out with
-the clock paused when the tool is opened.
+the clock paused when the tool is opened. You may set the date to now
+by pressing the <guibutton>Today</guibutton> button.
</para>
<note>
<para>
diff --git a/doc/solarsystem_tab.png b/doc/solarsystem_tab.png
new file mode 100644
index 0000000..ecd98b3
--- /dev/null
+++ b/doc/solarsystem_tab.png
Binary files differ
diff --git a/doc/supernovae_tab.png b/doc/supernovae_tab.png
new file mode 100644
index 0000000..91b7d29
--- /dev/null
+++ b/doc/supernovae_tab.png
Binary files differ
diff --git a/doc/wut.docbook b/doc/wut.docbook
index 6f41ccf..1d0874d 100644
--- a/doc/wut.docbook
+++ b/doc/wut.docbook
@@ -38,21 +38,27 @@ in the box labeled <guilabel>Select a Category</guilabel>, and all
objects of that type which are above the horizon on the selected
night will be displayed in the box labeled <guilabel>Matching
Objects</guilabel>. For example, in the screenshot, the
-<guilabel>Planets</guilabel> category has been selected, and four
-planets which are up on the selected night are displayed (Mars,
-Neptune, Pluto, and Uranus). When an object in the list is selected,
+<guilabel>Planets</guilabel> category has been selected, and three
+planets which are up on the selected night are displayed (Mars,
+Jupiter and Saturn). When an object in the list is selected,
its rise, set and transit times are displayed in the lower-right
-panel. In addition, you can press the <guibutton>Object
+panel (&ie; Mars rises at 17:13, transits at 21:46 and sets at 02:16).
+In addition, you can press the <guibutton>Object
Details...</guibutton> button to open the <link
linkend="tool-details">Object Details window</link> for that
object.
</para>
<para>
By default, the WUT will display objects which are above the horizon
-between sunset and midnight (i.e., <quote>in the evening</quote>).
+between sunset and midnight (&ie; <quote>in the evening</quote>).
You can choose to show objects which are up between midnight and dawn
(<quote>in the morning</quote>), or between dusk and dawn (<quote>any
-time tonight</quote>) using the combobox near the top of the window.
+time tonight</quote>) using the combobox near the top of the window.
+You can also choose to see only those objects that are brighter than a
+magnitude by setting a minimum magnitude using the <guilabel>Show objects
+brighter than magnitude</guilabel> spinbox. You may center the selected object
+in the Sky Map or add it to Wish List by pressing the
+<guibutton>Center Object</guibutton> or <guibutton>Add to List</guibutton> button.
</para>
</sect1>
diff --git a/kstars/ekos/focus.ui b/kstars/ekos/focus.ui
index 7a50c30..c6d5978 100644
--- a/kstars/ekos/focus.ui
+++ b/kstars/ekos/focus.ui
@@ -489,7 +489,7 @@ Otherwise, the autofocus process will utilize whatever filter currently set by t
</sizepolicy>
</property>
<property name="title">
- <string>Profile</string>
+ <string>Relative Profile</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
diff --git a/kstars/fitsviewer/fitsdata.cpp b/kstars/fitsviewer/fitsdata.cpp
index a3f50b3..85e2f2d 100644
--- a/kstars/fitsviewer/fitsdata.cpp
+++ b/kstars/fitsviewer/fitsdata.cpp
@@ -558,18 +558,13 @@ bool FITSData::checkCollision(Edge* s1, Edge*s2)
/*** Find center of stars and calculate Half Flux Radius */
void FITSData::findCentroid(int initStdDev, int minEdgeWidth)
{
- double threshold=0;
- double avg = 0;
- double sum=0;
- double min=0;
- double noiseAvg=0,noiseSum=0;
- int starDiameter =0, noisePixelRadius=0;
+ double threshold=0,sum=0,avg=0,min=0;
+ int starDiameter=0;
int pixVal=0;
- int noisePix=0, totalNoisePix=0;
int minimumEdgeCount = MINIMUM_EDGE_LIMIT;
- int noisePixLimit=0;
double JMIndex = histogram->getJMIndex();
+ float dispersion_ratio=1.5;
QList<Edge*> edges;
@@ -594,32 +589,33 @@ void FITSData::findCentroid(int initStdDev, int minEdgeWidth)
if (JMIndex < DIFFUSE_THRESHOLD)
{
- //threshold = stats.max[0] - stats.stddev[0]* (MINIMUM_STDVAR - initStdDev +1);
// Taking the average out seems to have better result for noisy images
threshold = stats.max[0] - stats.mean[0] * ( (MINIMUM_STDVAR - initStdDev)*0.5 +1);
min =stats.min[0];
+ if (threshold-min < 0)
+ {
+ threshold=stats.mean[0]* ( (MINIMUM_STDVAR - initStdDev)*0.5 +1);
+ min=0;
+ }
- // noisePixLimit=minEdgeWidth*0.5;
+ dispersion_ratio=1.4 - (MINIMUM_STDVAR - initStdDev)*0.08;
}
else
{
- //threshold = (stats.max[0] - stats.min[0])/2.0 + stats.min[0] + stats.stddev[0]* (MINIMUM_STDVAR - initStdDev);
- //if ( (stats.max[0] - stats.min[0])/2.0 > (stats.mean[0]+stats.stddev[0]*5))
- //threshold = stats.mean[0]+stats.stddev[0]*initStdDev*(0.95 - (MINIMUM_STDVAR - initStdDev) * 0.05);
- threshold = stats.mean[0]+stats.stddev[0]*initStdDev*(0.1 - (MINIMUM_STDVAR - initStdDev) * 0.05);
+ threshold = stats.mean[0]+stats.stddev[0]*initStdDev*(0.3 - (MINIMUM_STDVAR - initStdDev) * 0.05);
min = stats.min[0];
- //noisePixLimit =2;
- // noisePixLimit= 0;//floor(qBound(1.0, minEdgeWidth*0.1, 5.0));
+ // Ratio between centeroid center and edge
+ dispersion_ratio=1.8 - (MINIMUM_STDVAR - initStdDev)*0.2;
}
if (Options::fITSLogging())
{
qDebug() << "SNR: " << stats.SNR;
- qDebug() << "The threshold level is " << threshold << " minimum edge width" << minEdgeWidth << " minimum edge limit " << minimumEdgeCount;
+ qDebug() << "The threshold level is " << threshold << "(actual " << threshold-min << ") minimum edge width" << minEdgeWidth << " minimum edge limit " << minimumEdgeCount;
}
- threshold = qMax(stats.min[0], threshold-stats.min[0]);
+ threshold -= min;
int subX, subY, subW, subH;
@@ -638,36 +634,18 @@ void FITSData::findCentroid(int initStdDev, int minEdgeWidth)
subH = stats.height;
}
- // Detect "edges" that are above threshold
+ // Detect "edges" that are above threshold
for (int i=subY; i < subH; i++)
{
starDiameter = 0;
- totalNoisePix=0;
for(int j=subX; j < subW; j++)
{
pixVal = image_buffer[j+(i*stats.width)] - min;
// If pixel value > threshold, let's get its weighted average
- if ( pixVal >= threshold ) // || (sum > 0 && noisePix < noisePixLimit))
+ if ( pixVal >= threshold )
{
- /*if (pixVal < threshold)
- {
- noisePix++;
- noiseAvg += j * pixVal;
- noiseSum += pixVal;
- noisePixelRadius++;
- continue;
- }
- else if (noisePix)
- {
- avg += noiseAvg;
- sum += noiseSum;
- starDiameter += noisePixelRadius;
- totalNoisePix += noisePixelRadius;
- noisePix=noiseAvg=noiseSum=noisePixelRadius=0;
- }*/
-
avg += j * pixVal;
sum += pixVal;
starDiameter++;
@@ -675,28 +653,24 @@ void FITSData::findCentroid(int initStdDev, int minEdgeWidth)
// Value < threshold but avg exists
else if (sum > 0)
{
-
// We found a potential centroid edge
- if (starDiameter >= (minEdgeWidth - (MINIMUM_STDVAR - initStdDev)))
+ if (starDiameter >= minEdgeWidth)
{
float center = avg/sum + 0.5;
if (center > 0)
{
int i_center = floor(center);
- for (int k=starDiameter/2; k >= -(starDiameter) ; k--)
- {
- qDebug() << image_buffer[ (i_center-k+(i*stats.width)) ] - min;
- }
-
// Check if center is 10% or more brighter than edge, if not skip
- if ( ((image_buffer[i_center+(i*stats.width)]-min) / (image_buffer[i_center+(i*stats.width)-starDiameter/2]-min) >= 1.7) &&
- ((image_buffer[i_center+(i*stats.width)]-min) / (image_buffer[i_center+(i*stats.width)+starDiameter/2]-min) >= 1.7))// &&
- //((double) totalNoisePix / starDiameter) < 0.1)
+ if ( ((image_buffer[i_center+(i*stats.width)]-min) / (image_buffer[i_center+(i*stats.width)-starDiameter/2]-min) >= dispersion_ratio) &&
+ ((image_buffer[i_center+(i*stats.width)]-min) / (image_buffer[i_center+(i*stats.width)+starDiameter/2]-min) >= dispersion_ratio))
{
-
- qDebug() << "Center is " << image_buffer[i_center+(i*stats.width)]-min << " Edge is " << image_buffer[i_center+(i*stats.width)-starDiameter/2]-min
- << " and ratio is " << ((image_buffer[i_center+(i*stats.width)]-min) / (image_buffer[i_center+(i*stats.width)-starDiameter/2]-min));
+ if (Options::fITSLogging())
+ {
+ qDebug() << "Edge center is " << image_buffer[i_center+(i*stats.width)]-min << " Edge is " << image_buffer[i_center+(i*stats.width)-starDiameter/2]-min
+ << " and ratio is " << ((image_buffer[i_center+(i*stats.width)]-min) / (image_buffer[i_center+(i*stats.width)-starDiameter/2]-min))
+ << " located at X: " << center << " Y: " << i+0.5;
+ }
Edge *newEdge = new Edge();
@@ -716,7 +690,6 @@ void FITSData::findCentroid(int initStdDev, int minEdgeWidth)
// Reset
avg= sum = starDiameter=0;
- noisePix = noiseAvg = noiseSum = noisePixelRadius = totalNoisePix = 0;
}
}
}
@@ -865,15 +838,7 @@ void FITSData::findCentroid(int initStdDev, int minEdgeWidth)
{
FSum += image_buffer[cen_x-k+(cen_y*stats.width)] - min;
qDebug() << image_buffer[cen_x-k+(cen_y*stats.width)] - min;
- }
-
- rCenter->mean = FSum/rCenter->width;
- float variance=0;
- for (int k=rCenter->width/2; k >= -(rCenter->width/2) ; k--)
- variance += (image_buffer[cen_x-k+(cen_y*stats.width)] - min - rCenter->mean) * (image_buffer[cen_x-k+(cen_y*stats.width)] - min - rCenter->mean);
-
- variance /= (rCenter->width-1);
- rCenter->stddev = sqrt(variance);
+ }
// Half flux
HF = FSum / 2.0;
@@ -905,10 +870,9 @@ void FITSData::findCentroid(int initStdDev, int minEdgeWidth)
rCenter->val = FSum;
if (Options::fITSLogging())
- qDebug() << "HFR for this center is " << rCenter->HFR << " pixels and the total flux is " << FSum << " Mean is " << rCenter->mean << " Stddev: " << rCenter->stddev;
+ qDebug() << "HFR for this center is " << rCenter->HFR << " pixels and the total flux is " << FSum;
starCenters.append(rCenter);
-
}
}
diff --git a/kstars/fitsviewer/fitsdata.h b/kstars/fitsviewer/fitsdata.h
index 127d1ce..cd6dee3 100644
--- a/kstars/fitsviewer/fitsdata.h
+++ b/kstars/fitsviewer/fitsdata.h
@@ -68,8 +68,6 @@ public:
float width;
float HFR;
float sum;
- float mean;
- float stddev;
};
class FITSData