Merge lp:~daggerstab/stellarium/observability-cleanup into lp:stellarium

[Bogdan Marinov]

This is my unfinished cleanup of the Observability plugin. I don't have time to finish it right now because of other Stellarium work, but the more time it sits as a separate branch, the more painful is synchronizing it with the trunk.

I had plans for this, but they'll have to stay on the backburner. I underestimated how much of a mess is the code and how hard it is to read unfamiliar mathematics from code.

Please test - I haven't had the time to do much testing. There's a number of TODOs left which I probably shouldn't have ignored.

[Alexander Wolf (alexwolf)]

This branch has errors in time calculation of rise and set for objects.

review: Needs Fixing

[Bogdan Marinov (daggerstab)]

Question: How should I test for that? Is this a difference between the cleaned-up and the trunk version of the plug-in, or a difference between the cleaned-up version and some other source?

[Bogdan Marinov (daggerstab)]

I can confirm a disparity between the trunk branch and this version: it looks like something is wrong with the rise/set times for planets (but not stars). Not only the ones in the cleanup version don't match the ones from the trunk, they also seem to be a function of the current time. That is, if you stop the time, open the observability report for a given object and then advance the time with hours/minutes, you'll notice that the rise/set time changes accordingly.

I'll try to fix this and resubmit the proposal.

[Bogdan Marinov (daggerstab)]

The problem seems to be fixed. I've also taken the chance to simplify the StelButton code.

[Alexander Wolf (alexwolf)]

OK. It works predictable now and we can improve current TODO list in trunk later.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2013-12-22 09:33:49 +0000
+++ .bzrignore	2014-04-04 19:38:38 +0000
@@ -12,3 +12,4 @@
 ./util/locations-editor/locations-editor.pro.user
 ./util/copy-translations.bat
 build
+./plugins/Observability/doc
 
=== modified file 'plugins/Observability/CMakeLists.txt'
--- plugins/Observability/CMakeLists.txt	2013-07-23 20:06:05 +0000
+++ plugins/Observability/CMakeLists.txt	2014-04-04 19:38:38 +0000
@@ -1,4 +1,4 @@
-SET(OBSERVABILITY_VERSION "1.1.1")
+SET(OBSERVABILITY_VERSION "1.2.0")
 
 IF(APPLE)
    SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
 
=== added file 'plugins/Observability/Doxyfile'
--- plugins/Observability/Doxyfile	1970-01-01 00:00:00 +0000
+++ plugins/Observability/Doxyfile	2014-04-04 19:38:38 +0000
@@ -0,0 +1,1902 @@
+# Doxyfile 1.8.3.1
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file 
+# that follow. The default is UTF-8 which is also the encoding used for all 
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+# iconv built into libc) for the transcoding. See 
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or sequence of words) that should 
+# identify the project. Note that if you do not use Doxywizard you need 
+# to put quotes around the project name if it contains spaces.
+
+PROJECT_NAME           = "Observability Analysis plug-in"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = 
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description 
+# for a project that appears at the top of each page and should give viewer 
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = 
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is 
+# included in the documentation. The maximum height of the logo should not 
+# exceed 55 pixels and the maximum width should not exceed 200 pixels. 
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = doc
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, 
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English 
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, 
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, 
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip. Note that you specify absolute paths here, but also 
+# relative paths, which will be relative from the directory where doxygen is 
+# started.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful if your file system 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only). 
+# A mapping has the form "name=value". For example adding 
+# "class=itcl::class" will allow you to use the command class in the 
+# itcl::class meaning.
+
+TCL_SUBST              = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Java. For instance, namespaces will be presented as packages, qualified 
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+# sources. Doxygen will then generate output that is tailored for 
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it 
+# parses. With this tag you can assign which parser to use for a given 
+# extension. Doxygen has a built-in mapping, but you can override or extend it 
+# using this tag. The format is ext=language, where ext is a file extension, 
+# and language is one of the parsers supported by doxygen: IDL, Java, 
+# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, 
+# C++. For instance to make doxygen treat .inc files as Fortran files (default 
+# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note 
+# that for custom extensions you also need to set FILE_PATTERNS otherwise the 
+# files are not read by doxygen.
+
+EXTENSION_MAPPING      = 
+
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all 
+# comments according to the Markdown format, which allows for more readable 
+# documentation. See http://daringfireball.net/projects/markdown/ for details. 
+# The output of markdown processing is further processed by doxygen, so you 
+# can mix doxygen, HTML, and XML commands with Markdown formatting. 
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented classes, 
+# or namespaces to their corresponding documentation. Such a link can be 
+# prevented in individual cases by by putting a % sign in front of the word or 
+# globally by setting AUTOLINK_SUPPORT to NO.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+# to include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also makes the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to 
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate 
+# getter and setter methods for a property. Setting this option to YES (the 
+# default) will make doxygen replace the get and set methods by a property in 
+# the documentation. This will only work if the methods are indeed getting or 
+# setting a simple type. If this is not the case, or you want to show the 
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and 
+# unions are shown inside the group in which they are included (e.g. using 
+# @ingroup) instead of on a separate page (for HTML and Man pages) or 
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and 
+# unions with only public data fields will be shown inline in the documentation 
+# of the scope in which they are defined (i.e. file, namespace, or group 
+# documentation), provided this scope is documented. If set to NO (the default), 
+# structs, classes, and unions are shown on a separate page (for HTML and Man 
+# pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+# is documented as struct, union, or enum with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code in case the coding convention dictates that all compound 
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
+# determine which symbols to keep in memory and which to flush to disk. 
+# When the cache is full, less often used symbols will be written to disk. 
+# For small to medium size projects (<1000 input files) the default value is 
+# probably good enough. For larger projects a too small cache size can cause 
+# doxygen to be busy swapping symbols to and from disk most of the time 
+# causing a significant performance penalty. 
+# If the system has enough physical memory increasing the cache will improve the 
+# performance by keeping more symbols in memory. Note that the value works on 
+# a logarithmic scale so increasing the size by one will roughly double the 
+# memory usage. The cache size is given by this formula: 
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+SYMBOL_CACHE_SIZE      = 0
+
+# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be 
+# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given 
+# their name and scope. Since this can be an expensive process and often the 
+# same symbol appear multiple times in the code, doxygen keeps a cache of 
+# pre-resolved symbols. If the cache is too small doxygen will become slower. 
+# If the cache is too large, memory is wasted. The cache size is given by this 
+# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0, 
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal 
+# scope will be included in the documentation.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be 
+# extracted and appear in the documentation as a namespace called 
+# 'anonymous_namespace{file}', where file will be replaced with the base 
+# name of the file that contains the anonymous namespace. By default 
+# anonymous namespaces are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen 
+# will list include files with double quotes in the documentation 
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen 
+# will sort the (brief and detailed) documentation of class members so that 
+# constructors and destructors are listed first. If set to NO (the default) 
+# the constructors will appear in the respective orders defined by 
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. 
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO 
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+# hierarchy of group names into alphabetical order. If set to NO (the default) 
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to 
+# do proper type resolution of all parameters of a function it will reject a 
+# match between the prototype and the implementation of a member function even 
+# if there is only one candidate or it is obvious which candidate to choose 
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen 
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if section-label ... \endif 
+# and \cond section-label ... \endcond blocks.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or macro consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and macros in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
+# This will remove the Files entry from the Quick Index and from the 
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
+# Namespaces page.  This will remove the Namespaces entry from the Quick Index 
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from 
+# the version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed 
+# by doxygen. The layout file controls the global structure of the generated 
+# output files in an output format independent way. To create the layout file 
+# that represents doxygen's defaults, run doxygen with the -l option. 
+# You can optionally specify a file name after the option, if omitted 
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE            = 
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files 
+# containing the references data. This must be a list of .bib files. The 
+# .bib extension is automatically appended if omitted. Using this command 
+# requires the bibtex tool to be installed. See also 
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style 
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this 
+# feature you need bibtex and perl available in the search path. Do not use 
+# file names with spaces, bibtex cannot handle them.
+
+CITE_BIB_FILES         = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                  = ./src
+
+# This tag can be used to specify the character encoding of the source files 
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+# also the default input encoding. Doxygen uses libiconv (or the iconv built 
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh 
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py 
+# *.f90 *.f *.for *.vhd *.vhdl
+
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.d \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.idl \
+                         *.odl \
+                         *.cs \
+                         *.php \
+                         *.php3 \
+                         *.inc \
+                         *.m \
+                         *.markdown \
+                         *.md \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.f90 \
+                         *.f \
+                         *.for \
+                         *.vhd \
+                         *.vhdl
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag. 
+# Note that relative paths are relative to the directory from which doxygen is 
+# run.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or 
+# directories that are symbolic links (a Unix file system feature) are excluded 
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = 
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the 
+# output. The symbol name can be a fully qualified name, a word, or if the 
+# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty or if 
+# non of the patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file 
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) 
+# and it is also possible to disable source filtering for a specific pattern 
+# using *.ext= (so without naming a filter). This option only has effect when 
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS = 
+
+# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that 
+# is part of the input, its contents will be placed on the main page (index.html). 
+# This can be useful if you have a project on for instance GitHub and want reuse 
+# the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE = 
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C, C++ and Fortran comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
+# link to the source code.  Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header. Note that when using a custom header you are responsible  
+# for the proper inclusion of any scripts and style sheets that doxygen 
+# needs, which is dependent on the configuration options used. 
+# It is advised to generate a default header using "doxygen -w html 
+# header.html footer.html stylesheet.css YourConfigFile" and then modify 
+# that header. Note that the header is subject to change so you typically 
+# have to redo this when upgrading to a newer version of doxygen or when 
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If left blank doxygen will 
+# generate a default style sheet. Note that it is recommended to use 
+# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this 
+# tag will in the future become obsolete.
+
+HTML_STYLESHEET        = 
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional 
+# user-defined cascading style sheet that is included after the standard 
+# style sheets created by doxygen. Using this option one can overrule 
+# certain style aspects. This is preferred over using HTML_STYLESHEET 
+# since it does not replace the standard style sheet and is therefor more 
+# robust against future updates. Doxygen will copy the style sheet file to 
+# the output directory.
+
+HTML_EXTRA_STYLESHEET  = 
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or 
+# other source files which should be copied to the HTML output directory. Note 
+# that these files will be copied to the base HTML output directory. Use the 
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these 
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that 
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES       = 
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. 
+# Doxygen will adjust the colors in the style sheet and background images 
+# according to this color. Hue is specified as an angle on a colorwheel, 
+# see http://en.wikipedia.org/wiki/Hue for more information. 
+# For instance the value 0 represents red, 60 is yellow, 120 is green, 
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. 
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of 
+# the colors in the HTML output. For a value of 0 the output will use 
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to 
+# the luminance component of the colors in the HTML output. Values below 
+# 100 gradually make the output lighter, whereas values above 100 make 
+# the output darker. The value divided by 100 is the actual gamma applied, 
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, 
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML 
+# page will contain the date and time when the page was generated. Setting 
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of 
+# entries shown in the various tree structured indices initially; the user 
+# can expand and collapse entries dynamically later on. Doxygen will expand 
+# the tree to such a level that at most the specified number of entries are 
+# visible (unless a fully collapsed tree already exceeds this amount). 
+# So setting the number of entries 1 will produce a full collapsed tree by 
+# default. 0 is a special value representing an infinite number of entries 
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files 
+# will be generated that can be used as input for Apple's Xcode 3 
+# integrated development environment, introduced with OSX 10.5 (Leopard). 
+# To create a documentation set, doxygen will generate a Makefile in the 
+# HTML output directory. Running make will produce the docset in that 
+# directory and running "make install" will install the docset in 
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+# it at startup. 
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html 
+# for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+# feed. A documentation feed provides an umbrella under which multiple 
+# documentation sets from a single provider (such as a company or product suite) 
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+# should uniquely identify the documentation set bundle. This should be a 
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely 
+# identify the documentation publisher. This should be a reverse domain-name 
+# style string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
+# content.
+
+CHM_INDEX_ENCODING     = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and 
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated 
+# that can be used as input for Qt's qhelpgenerator to generate a 
+# Qt Compressed Help (.qch) of the generated HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
+# be used to specify the file name of the resulting .qch file. 
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to 
+# add. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   = 
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the 
+# custom filter to add. For more information please see 
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters"> 
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this 
+# project's 
+# filter section matches. 
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes"> 
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  = 
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
+# be used to specify the location of Qt's qhelpgenerator. 
+# If non-empty doxygen will try to run qhelpgenerator on the generated 
+# .qhp file.
+
+QHG_LOCATION           = 
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files  
+# will be generated, which together with the HTML files, form an Eclipse help 
+# plugin. To install this plugin and make it available under the help contents 
+# menu in Eclipse, the contents of the directory containing the HTML and XML 
+# files needs to be copied into the plugins directory of eclipse. The name of 
+# the directory within the plugins directory should be the same as 
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before 
+# the help appears.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin 
+# the directory name containing the HTML and XML files should also have 
+# this name.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) 
+# at top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it. Since the tabs have the same information as the 
+# navigation tree you can set this option to NO if you already set 
+# GENERATE_TREEVIEW to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
+# structure should be generated to display hierarchical information. 
+# If the tag value is set to YES, a side panel will be generated 
+# containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). 
+# Windows users are probably better off using the HTML help feature. 
+# Since the tree basically has the same information as the tab index you 
+# could consider to set DISABLE_INDEX to NO when enabling this option.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values 
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML 
+# documentation. Note that a value of 0 will completely suppress the enum 
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open 
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of Latex formulas included 
+# as images in the HTML documentation. The default is 10. Note that 
+# when you change the font size after a successful doxygen run you need 
+# to manually remove any form_*.png images from the HTML output directory 
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images 
+# generated for formulas are transparent PNGs. Transparent PNGs are 
+# not supported properly for IE 6.0, but are supported on all modern browsers. 
+# Note that when changing this option you need to delete any form_*.png files 
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax 
+# (see http://www.mathjax.org) which uses client side Javascript for the 
+# rendering instead of using prerendered bitmaps. Use this if you do not 
+# have LaTeX installed or if you want to formulas look prettier in the HTML 
+# output. When enabled you may also need to install MathJax separately and 
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for 
+# thA MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and 
+# SVG. The default value is HTML-CSS, which is slower, but has the best 
+# compatibility.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the 
+# HTML output directory using the MATHJAX_RELPATH option. The destination 
+# directory should contain the MathJax.js script. For instance, if the mathjax 
+# directory is located at the same level as the HTML output directory, then 
+# MATHJAX_RELPATH should be ../mathjax. The default value points to 
+# the MathJax Content Delivery Network so you can quickly see the result without 
+# installing MathJax.  However, it is strongly recommended to install a local 
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension 
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS     = 
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box 
+# for the HTML output. The underlying search engine uses javascript 
+# and DHTML and should work on any modern browser. Note that when using 
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets 
+# (GENERATE_DOCSET) there is already a search function so this one should 
+# typically be disabled. For large projects the javascript based search engine 
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be 
+# implemented using a web server instead of a web client using Javascript. 
+# There are two flavours of web server based search depending on the 
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for 
+# searching and an index file used by the script. When EXTERNAL_SEARCH is 
+# enabled the indexing and searching needs to be provided by external tools. 
+# See the manual for details.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP 
+# script for searching. Instead the search results are written to an XML file 
+# which needs to be processed by an external indexer. Doxygen will invoke an 
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain 
+# the search results. Doxygen ships with an example indexer (doxyindexer) and 
+# search engine (doxysearch.cgi) which are based on the open source search engine 
+# library Xapian. See the manual for configuration details.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server 
+# which will returned the search results when EXTERNAL_SEARCH is enabled. 
+# Doxygen ships with an example search engine (doxysearch) which is based on 
+# the open source search engine library Xapian. See the manual for configuration 
+# details.
+
+SEARCHENGINE_URL       = 
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed 
+# search data is written to a file for indexing by an external tool. With the 
+# SEARCHDATA_FILE tag the name of this file can be specified.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the 
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is 
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple 
+# projects and redirect the results back to the right project.
+
+EXTERNAL_SEARCH_ID     = 
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen 
+# projects other than the one defined by this configuration file, but that are 
+# all added to the same external search index. Each project needs to have a 
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id 
+# of to a relative location where the documentation can be found. 
+# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
+
+EXTRA_SEARCH_MAPPINGS  = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name. 
+# Note that when enabling USE_PDFLATEX this option is only used for 
+# generating bitmaps for formulas in the HTML output, but not in the 
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for 
+# the generated latex document. The footer should contain everything after 
+# the last chapter. If it is left blank doxygen will generate a 
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include 
+# source code with syntax highlighting in the LaTeX output. 
+# Note that which sources are shown also depends on other settings 
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the 
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See 
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load style sheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED             = 
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition that 
+# overrules the definition found in the source code.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all references to function-like macros 
+# that are alone on a line, have an all uppercase name, and do not end with a 
+# semicolon, because these will confuse the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. For each 
+# tag file the location of the external documentation should be added. The 
+# format of a tag file without this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths 
+# or URLs. Note that each tag file must have a unique name (where the name does 
+# NOT include the path). If a tag file is not located in the directory in which 
+# doxygen is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option also works with HAVE_DOT disabled, but it is recommended to 
+# install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see 
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
+# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# default search path.
+
+MSCGEN_PATH            = 
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is 
+# allowed to run in parallel. When set to 0 (the default) doxygen will 
+# base this on the number of processors available in the system. You can set it 
+# explicitly to a value larger than 0 to get control over the balance 
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS        = 0
+
+# By default doxygen will use the Helvetica font for all dot files that 
+# doxygen generates. When you want a differently looking font you can specify 
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find 
+# the font, which can be done by putting it in a standard location or by setting 
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the 
+# directory containing the font.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the Helvetica font. 
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to 
+# set the path where dot can find it.
+
+DOT_FONTPATH           = 
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside 
+# the class node. If there are many fields or methods and many nodes the 
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS 
+# threshold limits the number of items for each type to make the size more 
+# managable. Set this to 0 for no limit. Note that the threshold may be 
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
+# doxygen will generate a call dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable call graphs 
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
+# doxygen will generate a caller dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable caller 
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include 
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are svg, png, jpg, or gif. 
+# If left blank png will be used. If you choose svg you need to set 
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files 
+# visible in IE 9+ (other browsers do not have this requirement).
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to 
+# enable generation of interactive SVG images that allow zooming and panning. 
+# Note that this requires a modern browser other than Internet Explorer. 
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you 
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files 
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG        = NO
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that 
+# contain msc files that are included in the documentation (see the 
+# \mscfile command).
+
+MSCFILE_DIRS           = 
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen if the 
+# number of direct children of the root node in a graph is already larger than 
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that the size of a graph can be further restricted by 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, because dot on Windows does not 
+# seem to support this out of the box. Warning: Depending on the platform used, 
+# enabling this option may lead to badly anti-aliased labels on the edges of 
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
 
=== modified file 'plugins/Observability/src/Observability.cpp'
--- plugins/Observability/src/Observability.cpp	2014-03-01 09:50:05 +0000
+++ plugins/Observability/src/Observability.cpp	2014-04-04 19:38:38 +0000
@@ -16,40 +16,41 @@
  * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
  */
 
+#include <QDebug>
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QPixmap>
 #include <QSettings>
-#include <QPixmap>
+#include <QString>
 #include <QTimer>
-#include <QString>
-#include <QDebug>
-#include <QKeyEvent>
-#include <QtNetwork>
-#include <QKeyEvent>
-#include <QMouseEvent>
-
-#include "StelIniParser.hpp"
-#include "StelProjector.hpp"
+
+//#include <QtNetwork> // Why do we need a full part of the framwork again?
+
+#include "Observability.hpp"
+#include "ObservabilityDialog.hpp"
+
+#include "Planet.hpp"
+#include "SolarSystem.hpp"
 #include "StarMgr.hpp"
-#include "StelObject.hpp"
-#include "StelObserver.hpp"
-#include "StelUtils.hpp"
+#include "StelActionMgr.hpp"
 #include "StelApp.hpp"
-#include "StelObjectMgr.hpp"
+#include "StelCore.hpp"
+#include "StelFader.hpp"
+#include "StelFileMgr.hpp"
+#include "StelGui.hpp"
+#include "StelGuiItems.hpp"
+#include "StelIniParser.hpp"
 #include "StelLocaleMgr.hpp"
 #include "StelModuleMgr.hpp"
-#include "StelGui.hpp"
-#include "StelGuiItems.hpp"
 #include "StelMovementMgr.hpp"
-#include "StelFileMgr.hpp"
-#include "StelVertexArray.hpp"
-#include "StelCore.hpp"
-#include "StelPainter.hpp"
+#include "StelObject.hpp"
+#include "StelObjectMgr.hpp"
+#include "StelObserver.hpp"
+#include "StelProjector.hpp"
 #include "StelSkyDrawer.hpp"
-#include "Observability.hpp"
-#include "ObservabilityDialog.hpp"
+#include "StelUtils.hpp"
+#include "ZoneArray.hpp"
 
-#include "SolarSystem.hpp"
-#include "Planet.hpp"
-#include "StelFader.hpp"
 
 StelModule* ObservabilityStelPluginInterface::getStelModule() const
 {
@@ -70,13 +71,15 @@
 	return info;
 }
 
+
+
 Observability::Observability()
-	: flagShowObservability(false), OnIcon(NULL), OffIcon(NULL), GlowIcon(NULL),toolbarButton(NULL)
+	: ObserverLoc(0.), flagShowReport(false), button(NULL)
 {
 	setObjectName("Observability");
 	configDialog = new ObservabilityDialog();
 
-
+	// TODO: Migrate to static const? --BM
 	// Some useful constants:
 	Rad2Deg = 180./3.1415927; // Convert degrees into radians
 	Rad2Hr = 12./3.1415927;  // Convert hours into radians
@@ -86,107 +89,37 @@
 	halfpi = 1.57079632675; // pi/2
 	MoonT = 29.530588; // Moon synodic period (used as first estimate of Full Moon).
 	RefFullMoon = 2451564.696; // Reference Julian date of a Full Moon.
-	MoonPerilune = 0.0024236308; // Smallest Earth-Moon distance (in AU). 
+	MoonPerilune = 0.0024236308; // Smallest Earth-Moon distance (in AU).
+	
 	nextFullMoon = 0.0;
 	prevFullMoon = 0.0;
-	RefracHoriz = 0.0;   // Geometric altitude at refraction-corrected horizon. 
+	refractedHorizonAlt = 0.0;
 	selName = "";
 
-
-
-////////////////////////////
-// Read configuration:
-
-	QSettings* conf = StelApp::getInstance().getSettings();
-	// Setup defaults if not present
-	conf->beginGroup("Observability");
-	if (!conf->contains("font_size"))
-		conf->setValue("font_size", 15);
-
-	if (!conf->contains("font_color"))
-		conf->setValue("font_color", "0,0.5,1");
-
-	if (!conf->contains("show_AcroCos"))
-		conf->setValue("show_AcroCos", true);
-
-	if (!conf->contains("show_Good_Nights"))
-		conf->setValue("show_Good_Nights", true);
-
-	if (!conf->contains("show_Best_Night"))
-		conf->setValue("show_Best_Night", true);
-
-	if (!conf->contains("show_Today"))
-		conf->setValue("show_Today", true);
-
-	if (!conf->contains("Sun_Altitude"))
-		conf->setValue("Sun_Altitude", 12);
-
-	if (!conf->contains("Horizon_Altitude"))
-		conf->setValue("Horizon_Altitude", 0);
-
-	if (!conf->contains("show_FullMoon"))
-		conf->setValue("show_FullMoon", true);
-
-//	if (!conf->contains("show_Crescent"))
-//		conf->setValue("show_Crescent", true);
-
-//	if (!conf->contains("show_SuperMoon"))
-//		conf->setValue("show_SuperMoon", true);
-
-
-	// Load settings from main config file
-	fontSize = conf->value("font_size",15).toInt();
-	iAltitude = conf->value("Sun_Altitude",12).toInt();
-	iHorizAltitude = conf->value("Horizon_Altitude",0).toInt();
-	AstroTwiAlti = -((double) iAltitude)/Rad2Deg ;
-	HorizAlti = ((double) iHorizAltitude)/Rad2Deg ;
-	font.setPixelSize(fontSize);
-	QString fontColorStr = conf->value("font_color", "0,0.5,1").toString();
-	fontColor = StelUtils::strToVec3f(fontColorStr);
-	show_AcroCos = conf->value("show_AcroCos", true).toBool();
-	show_Good_Nights = conf->value("show_Good_Nights", true).toBool();
-	show_Best_Night = conf->value("show_Best_Night", true).toBool();
-	show_Today = conf->value("show_Today", true).toBool();
-	show_FullMoon = conf->value("show_FullMoon", true).toBool();
-//	show_Crescent = conf->value("show_Crescent", true).toBool();
-//	show_SuperMoon = conf->value("show_SuperMoon", true).toBool();
-
-	conf->endGroup();
-/////////////////////////////////
-
-	// Apply format for date from main settings
-	if (conf->value("localization/date_display_format", "system_default").toString() == "ddmmyyyy")
-		setDateFormat(true);
-	else
-		setDateFormat(false);
-
 	// Dummy initial values for parameters and data vectors:
 	mylat = 1000.; mylon = 1000.;
 	myJD = 0.0;
-	currYear = 0;
+	curYear = 0;
 	isStar = true;
 	isMoon = false;
 	isSun = false;
 	isScreen = true;
-	raised=false;
-
-	ObserverLoc[0]=0.0;ObserverLoc[1]=0.0;ObserverLoc[2]=0.0;
-
-//Get pointer to the Earth:
+
+	//Get pointer to the Earth:
 	PlanetP Earth = GETSTELMODULE(SolarSystem)->getEarth();
 	myEarth = Earth.data();
 
-// Get pointer to the Moon/Sun:
+	// Get pointer to the Moon/Sun:
 	PlanetP Moon = GETSTELMODULE(SolarSystem)->getMoon();
 	myMoon = Moon.data();
 
-
+	// I think this can be done in a more simple way...--BM
 	for (int i=0;i<366;i++) {
-		SunRA[i] = 0.0; SunDec[i] = 0.0;
-		ObjectRA[i] = 0.0; ObjectDec[i]=0.0;
-		SunSidT[0][i]=0.0; SunSidT[1][i]=0.0;
-		ObjectSidT[0][i]=0.0; ObjectSidT[1][i]=0.0;
-		ObjectH0[i] = 0.0;
+		sunRA[i] = 0.0; sunDec[i] = 0.0;
+		objectRA[i] = 0.0; objectDec[i]=0.0;
+		sunSidT[0][i]=0.0; sunSidT[1][i]=0.0;
+		objectSidT[0][i]=0.0; objectSidT[1][i]=0.0;
+		objectH0[i] = 0.0;
 		yearJD[i] = 0.0;
 	};
 
@@ -194,26 +127,33 @@
 
 Observability::~Observability()
 {
-	if (GlowIcon!=NULL)
-		delete GlowIcon;
-	if (OnIcon!=NULL)
-		delete OnIcon;
-	if (OffIcon!=NULL)
-		delete OffIcon;
-	delete configDialog;
+	// Shouldn't this be in the deinit()? --BM
+	if (configDialog != NULL)
+		delete configDialog;
 }
 
 void Observability::updateMessageText()
 {
 	// Set names of the months:
-	QString mons[12]={qc_("Jan", "short month name"), qc_("Feb", "short month name"), qc_("Mar", "short month name"), qc_("Apr", "short month name"), qc_("May", "short month name"), qc_("Jun", "short month name"), qc_("Jul", "short month name"), qc_("Aug", "short month name"), qc_("Sep", "short month name"), qc_("Oct", "short month name"), qc_("Nov", "short month name"), qc_("Dec", "short month name")};
-
-	for (int i=0;i<12;i++) {
-		months[i]=mons[i];
-	};
-
+	monthNames.clear();
+	monthNames << qc_("Jan", "short month name")
+	           << qc_("Feb", "short month name")
+	           << qc_("Mar", "short month name")
+	           << qc_("Apr", "short month name")
+	           << qc_("May", "short month name")
+	           << qc_("Jun", "short month name")
+	           << qc_("Jul", "short month name")
+	           << qc_("Aug", "short month name")
+	           << qc_("Sep", "short month name")
+	           << qc_("Oct", "short month name")
+	           << qc_("Nov", "short month name")
+	           << qc_("Dec", "short month name");
+
+	// TRANSLATORS: Short for "hours".
 	msgH		= q_("h");
+	// TRANSLATORS: Short for "minutes".
 	msgM		= q_("m");
+	// TRANSLATORS: Short for "seconds".
 	msgS		= q_("s");
 	msgSetsAt	= q_("Sets at %1 (in %2)");
 	msgRoseAt	= q_("Rose at %1 (%2 ago)");
@@ -224,79 +164,82 @@
 	msgCulminatesAt	= q_("Culminates at %1 (in %2) at %3 deg.");
 	msgCulminatedAt	= q_("Culminated at %1 (%2 ago) at %3 deg.");
 	msgSrcNotObs	= q_("Source is not observable.");
-	msgNoACRise	= q_("No Acronychal nor Cosmical rise/set.");
-	msgGreatElong	= q_("Greatest elongation: ");
-	msgLargSSep	= q_("Largest Sun separation: ");
-	msgAtDeg	= q_(" (at %1 deg.)");
+	msgNoACRise	= q_("No acronychal nor cosmical rise/set.");
+	msgGreatElong	= q_("Greatest elongation: %1 (at %2 deg.)");
+	msgLargSSep	= q_("Largest Sun separation: %1 (at %2 deg.)");
 	msgNone		= q_("None");
-	msgAcroRise	= q_("Acronychal rise/set");
-	msgNoAcroRise	= q_("No Acronychal rise/set.");
-	msgCosmRise	= q_("Cosmical rise/set");
-	msgNoCosmRise	= q_("No Cosmical rise/set.");
+	// TRANSLATORS: The space at the end is significant - another sentence may follow.
+	msgAcroRise	= q_("Acronychal rise/set: %1/%2. ");
+	// TRANSLATORS: The space at the end is significant - another sentence may follow.
+	msgNoAcroRise	= q_("No acronychal rise/set. ");
+	msgCosmRise	= q_("Cosmical rise/set: %1/%2.");
+	msgNoCosmRise	= q_("No cosmical rise/set.");
 	msgWholeYear	= q_("Observable during the whole year.");
 	msgNotObs	= q_("Not observable at dark night.");
-	msgAboveHoriz	= q_("Nights above horizon: ");
+	msgAboveHoriz	= q_("Nights above horizon: %1");
 	msgToday	= q_("TODAY:");
 	msgThisYear	= q_("THIS YEAR:");
+	// TRANSLATORS: The space at the end is significant - another sentence may follow.
 	msgPrevFullMoon	= q_("Previous Full Moon: %1 %2 at %3:%4. ");
 	msgNextFullMoon	= q_("Next Full Moon: %1 %2 at %3:%4. ");
 }
 
 double Observability::getCallOrder(StelModuleActionName actionName) const
 {
-       if (actionName==StelModule::ActionDraw)
-               return StelApp::getInstance().getModuleMgr().getModule("LandscapeMgr")->getCallOrder(actionName)+10.;
-       return 0;
+	if (actionName==StelModule::ActionDraw)
+		return StelApp::getInstance().getModuleMgr().getModule("LandscapeMgr")->getCallOrder(actionName)+10.;
+	return 0;
 }
 
 void Observability::init()
 {
-       qDebug() << "init called for Observability";
-
-	try 
-	{
-		StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
-		GlowIcon = new QPixmap(":/graphicGui/glow32x32.png");
-		OnIcon = new QPixmap(":/observability/bt_observab_on.png");
-		OffIcon = new QPixmap(":/observability/bt_observab_off.png");
-
-		addAction("actionShow_Observability", N_("Observability"), N_("Observability"), "enabled");
-		addAction("actionShow_Observability_ConfigDialog", N_("Observability"), N_("Observability configuration window"), configDialog, "visible");
-		toolbarButton = new StelButton(NULL, *OnIcon, *OffIcon, *GlowIcon, "actionShow_Observability");
-		gui->getButtonBar()->addButton(toolbarButton, "065-pluginsGroup");
-	}
-	catch (std::exception &e)
-	{
-		qWarning() << "WARNING: unable create toolbar button for Observability plugin (or load gonfig GUI). " << e.what();
-	};
-
-       updateMessageText();
-       connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(updateMessageText()));
+	loadConfiguration();
+	
+	StelAction* actionShow = addAction("actionShow_Observability",
+	                                   N_("Observability"),
+	                                   N_("Observability"),
+	                                   "flagShowReport");
+	// actionShow->setChecked(flagShowReport); //Unnecessary?
+	addAction("actionShow_Observability_ConfigDialog",
+	          N_("Observability"),
+	          N_("Observability configuration window"),
+	          configDialog, "visible");
+
+	StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
+	button = new StelButton(NULL,
+	                        QPixmap(":/observability/bt_observab_on.png"),
+	                        QPixmap(":/observability/bt_observab_off.png"),
+	                        QPixmap(":/graphicGui/glow32x32.png"),
+	                        actionShow);
+	gui->getButtonBar()->addButton(button, "065-pluginsGroup");
+	
+	updateMessageText();
+	connect(&StelApp::getInstance(), SIGNAL(languageChanged()),
+	        this, SLOT(updateMessageText()));
 }
 
 /////////////////////////////////////////////
 // MAIN CODE:
 void Observability::draw(StelCore* core)
 {
-
-	if (!flagShowObservability) return; // Button is off.
+	if (!flagShowReport)
+		return; // Button is off.
 
 /////////////////////////////////////////////////////////////////
 // PRELIMINARS:
 	bool locChanged, yearChanged;
 	StelObjectP selectedObject;
-	Planet* currPlanet;
-	PlanetP Object, parent;
+	PlanetP ssObject, parentPlanet;
 
 // Only execute plugin if we are on Earth.
-	if (core->getCurrentLocation().planetName != "Earth") {return;};
+	if (core->getCurrentLocation().planetName != "Earth")
+		return;
 
 // Set the painter:
-	StelPainter paintresult(core->getProjection2d());
-	paintresult.setColor(fontColor[0],fontColor[1],fontColor[2],1);
+	StelPainter painter(core->getProjection2d());
+	painter.setColor(fontColor[0],fontColor[1],fontColor[2],1);
 	font.setPixelSize(fontSize);
-	paintresult.setFont(font);
-
+	painter.setFont(font);
 
 // Get current date, location, and check if there is something selected.
 	double currlat = (core->getCurrentLocation().latitude)/Rad2Deg;
@@ -312,7 +255,7 @@
 	double currLocalT = 24.*modf(currJD + GMTShift,&currJDint);
 
 	int auxm, auxd, auxy;
-	StelUtils::getDateFromJulianDay(currJD,&auxy,&auxm,&auxd);
+	StelUtils::getDateFromJulianDay(currJD, &auxy, &auxm, &auxd);
 	bool isSource = StelApp::getInstance().getStelObjectMgr().getWasSelected();
 	bool show_Year = show_Best_Night || show_Good_Nights || show_AcroCos; 
 
@@ -325,19 +268,25 @@
 // Update JD.
 	myJD = currJD;
 
-// If we have changed the year, we must recompute the Sun's position for each new day:
-	if (auxy != currYear) {
+// If the year changed, we must recompute the Sun's position for each new day:
+	if (auxy != curYear)
+	{
 		yearChanged = true;
-		currYear = auxy;
-		SunRADec(core);}
-	else {
+		curYear = auxy;
+		updateSunData(core);
+	}
+	else
+	{
 		yearChanged = false;
 	};
 
 // Have we changed the latitude or longitude?
-	if (currlat == mylat && currlon == mylon) {
-		locChanged = false;}
-	else {
+	if (currlat == mylat && currlon == mylon)
+	{
+		locChanged = false;
+	}
+	else
+	{
 		locChanged = true;
 		mylat = currlat; mylon = currlon;
 		double temp1 = currheight*std::cos(currlat);
@@ -350,16 +299,18 @@
 
 // Add refraction, if necessary:
 	Vec3d TempRefr;	
-	TempRefr[0] = std::cos(HorizAlti);  
+	TempRefr[0] = std::cos(horizonAltitude);  
 	TempRefr[1] = 0.0; 
-	TempRefr[2] = std::sin(HorizAlti);  
+	TempRefr[2] = std::sin(horizonAltitude);  
 	Vec3d CorrRefr = core->altAzToEquinoxEqu(TempRefr,StelCore::RefractionAuto);
 	TempRefr = core->equinoxEquToAltAz(CorrRefr,StelCore::RefractionOff);
 	double RefracAlt = std::asin(TempRefr[2]);
 
-	if (std::abs(RefracHoriz-RefracAlt)>2.91e-4)  // Diference larger than 1 arcminute.
-	{   // Configuration for refraction changed notably:
-		RefracHoriz = RefracAlt;
+	// If the diference is larger than 1 arcminute...
+	if (std::abs(refractedHorizonAlt-RefracAlt)>2.91e-4)
+	{
+		//... configuration for refraction changed notably.
+		refractedHorizonAlt = RefracAlt;
 		configChanged = true;
 		souChanged = true;
 	};
@@ -372,7 +323,7 @@
 // angles at twilight, and re-compute Sun/Moon ephemeris (if selected):
 	if (locChanged || yearChanged || configChanged) 
 	{
-		SunHTwi();
+		updateSunH();
 		lastJDMoon = 0.0;
 	};
 
@@ -382,42 +333,48 @@
 //////////////////////////////////////////////////////////////////
 // NOW WE DEAL WITH THE SOURCE (OR SCREEN-CENTER) POSITION:
 
-	if (isScreen) souChanged=true; // Always re-compute everything for the screen center.
+	if (isScreen) // Always re-compute everything for the screen center.
+		souChanged = true; 
 
-	if (isSource) { // There is something selected!
+	if (isSource) // There is something selected!
+	{ 
 
 // Get the selected source and its name:
 		selectedObject = StelApp::getInstance().getStelObjectMgr().getSelectedObject()[0]; 
 
 // Don't do anything for satellites:
-		if(selectedObject->getType()== "Satellite") return;
-
-		QString tempName = selectedObject->getEnglishName();
-
-// Check if the source is Sun or Moon (i.e., it changes quite a bit during one day):
-		isMoon = ("Moon" == tempName)?true:false;
-		isSun = ("Sun" == tempName)?true:false;
+		if(selectedObject->getType() == "Satellite")
+			return;
+
+		QString name = selectedObject->getEnglishName();
+		isMoon = ("Moon" == name);
+		isSun = ("Sun" == name);
 
 // If Moon is not selected (or was unselected), force re-compute of Full Moon next time it is selected:
-		if (!isMoon) {prevFullMoon=0.0; nextFullMoon=0.0;};
+		if (!isMoon)
+		{
+			prevFullMoon = 0.0;
+			nextFullMoon = 0.0;
+		};
 
 //Update position:
 		EquPos = selectedObject->getEquinoxEquatorialPos(core);
 		EquPos.normalize();
-		LocPos = core->equinoxEquToAltAz(EquPos,StelCore::RefractionOff);
+		LocPos = core->equinoxEquToAltAz(EquPos, StelCore::RefractionOff);
 
 // Check if the user has changed the source (or if the source is Sun/Moon). 
-		if (tempName == selName) 
+		if (name == selName) 
 		{
-			souChanged = false;}
+			souChanged = false;
+		}
 		else 
 		{ // Check also if the (new) source belongs to the Solar System:
 
 			souChanged = true;
-			selName = tempName;
+			selName = name;
 
-			currPlanet = dynamic_cast<Planet*>(selectedObject.data());
-			isStar = (currPlanet)?false:true;
+			Planet* planet = dynamic_cast<Planet*>(selectedObject.data());
+			isStar = (planet == NULL);
 
 			if (!isStar && !isMoon && !isSun)  // Object in the Solar System, but is not Sun nor Moon.
 			{ 
@@ -425,39 +382,45 @@
 				int gene = -1;
 
 			// If object is a planet's moon, we get its parent planet:
-				Object = GETSTELMODULE(SolarSystem)->searchByEnglishName(selName);
-
-				parent = Object->getParent();
-
-				if (parent) 
-				{
-					while (parent) {
-					gene += 1;
-					parent = parent->getParent();}
-					};
-					for (int g=0; g<gene;g++) {
-					Object = Object->getParent();
-				};
-		
+				ssObject = GETSTELMODULE(SolarSystem)->searchByEnglishName(selName);
+				// TODO: Isn't it easier just to use the planet object we just cast? --BM
+
+				parentPlanet = ssObject->getParent();
+				if (parentPlanet) 
+				{
+					while (parentPlanet)
+					{
+						gene += 1;
+						parentPlanet = parentPlanet->getParent();
+					}
+				}
+				for (int g=0; g<gene; g++)
+				{
+					ssObject = ssObject->getParent();
+				}
+				
 			// Now get a pointer to the planet's instance:
-				myPlanet = Object.data();
-			};
-
-		};
+				myPlanet = ssObject.data();
+			}
+		}
 	}
-	else { // There is no source selected!
-
-// If no source is selected, get the position vector of the screen center:
-		selName = ""; isStar=true; isMoon = false; isSun = false; isScreen=true;
+	else // There is no source selected!
+	{
+	// If no source is selected, get the position vector of the screen center:
+		selName.clear();
+		isStar = true;
+		isMoon = false;
+		isSun = false;
+		isScreen = true;
 		Vec3d currentPos = GETSTELMODULE(StelMovementMgr)->getViewDirectionJ2000();
 		currentPos.normalize();
 		EquPos = core->j2000ToEquinoxEqu(currentPos);
-		LocPos = core->j2000ToAltAz(currentPos,StelCore::RefractionOff);
+		LocPos = core->j2000ToAltAz(currentPos, StelCore::RefractionOff);
 	}
 
 
 // Convert EquPos to RA/Dec:
-	toRADec(EquPos,selRA,selDec);
+	toRADec(EquPos, selRA, selDec);
 
 // Compute source's altitude (in radians):
 	alti = std::asin(LocPos[2]);
@@ -474,72 +437,92 @@
 
 /////////////////////////////////////////////////////////////////
 // NOW WE COMPUTE RISE/SET/TRANSIT TIMES FOR THE CURRENT DAY:
-	double currH = HourAngle(mylat,alti,selDec);
-	horizH = HourAngle(mylat,RefracHoriz,selDec);
+	double currH = calculateHourAngle(mylat,alti,selDec);
+	horizH = calculateHourAngle(mylat,refractedHorizonAlt,selDec);
 	QString RS1, RS2, Cul; // strings with Rise/Set/Culmination times
-	double Rise=0, Set=0; // Actual Rise/Set times (in GMT).
+	double risingTime = 0, settingTime = 0; // Actual Rise/Set times (in GMT).
 	int d1,m1,s1,d2,m2,s2,dc,mc,sc; // Integers for the time spans in hh:mm:ss.
 	bool solvedMoon = false; // Check if solutions were found for Sun, Moon, or planet.
 	bool transit = false; // Is the source above the horizon? Did it culminate?
 
 	int ephHour, ephMinute, ephSecond;  // Local time for selected ephemeris
 
-	if (show_Today) {  // We show ephemeris for today (i.e., rise, set, and transit times).
-
-
+	if (show_Today)
+	{
+		// Today's ephemeris (rise, set, and transit times)
 		if (!isStar) 
 		{
-			int Kind = (isSun)?1:0;  // Set "Kind" according to the selected object.
-			Kind += (isMoon)?2:0; Kind += (!isSun && !isMoon)?3:0;
-
-			solvedMoon = SolarSystemSolve(core, Kind);  // False if fails; True otherwise.
+			int type = (isSun) ? 1:0;
+			type += (isMoon) ? 2:0;
+			type += (!isSun && !isMoon) ? 3:0;
+			
+			// Returns false if the calculation fails...
+			solvedMoon = calculateSolarSystemEvents(core, type);
 			currH = std::abs(24.*(MoonCulm-myJD)/TFrac);
 			transit = MoonCulm-myJD<0.0;
-			if (solvedMoon) {  // If failed, Set and Rise will be dummy.
-				Set = std::abs(24.*(MoonSet-myJD)/TFrac);
-				Rise = std::abs(24.*(MoonRise-myJD)/TFrac);
-			};
-		} else if (horizH>0.0) { // The source is not circumpolar and can be seen from this latitude.
-
-			if ( LocPos[1]>0.0 ) {  // The source is at the eastern side...
-				if ( currH>horizH ) {  // ... and below the horizon.
-					Set = 24.-currH-horizH;
-					Rise = currH-horizH;
-					raised = false;}
-				else { // ... and above the horizon.
-					Rise = horizH-currH;
-					Set = 2.*horizH-Rise;
-					raised = true;};
-			} 
-			else { // The source is at the western side...
-				if ( currH>horizH ) { // ... and below the horizon. 
-					Set = currH-horizH;
-					Rise = 24.-currH-horizH;
-					raised = false;}
-				else { // ... and above the horizon.
-					Rise = horizH+currH;
-					Set = horizH-currH;
-					raised = true;};
-			};
-	
-		};
-
+			if (solvedMoon)
+			{  // If failed, Set and Rise will be dummy.
+				settingTime = std::abs(24.*(MoonSet-myJD)/TFrac);
+				risingTime = std::abs(24.*(MoonRise-myJD)/TFrac);
+			}
+		}
+		else if (horizH>0.0)
+		{ // The source is not circumpolar and can be seen from this latitude.
+			
+			if ( LocPos[1]>0.0 ) // The source is at the eastern side...
+			{
+				if ( currH>horizH ) // ... and below the horizon.
+				{
+					settingTime = 24.-currH-horizH;
+					risingTime = currH-horizH;
+					hasRisen = false;
+				}
+				else  // ... and above the horizon.
+				{
+					risingTime = horizH-currH;
+					settingTime = 2.*horizH-risingTime;
+					hasRisen = true;
+				}
+			}
+			else // The source is at the western side...
+			{
+				if ( currH>horizH ) // ... and below the horizon. 
+				{
+					settingTime = currH-horizH;
+					risingTime = 24.-currH-horizH;
+					hasRisen = false;
+				}
+				else // ... and above the horizon.
+				{
+					risingTime = horizH+currH;
+					settingTime = horizH-currH;
+					hasRisen = true;
+				}
+			}
+		}
+		
 		if ((solvedMoon && MoonRise>0.0) || (!isSun && !isMoon && horizH>0.0))
 		{
-			double2hms(TFrac*Set,d1,m1,s1);
-			double2hms(TFrac*Rise,d2,m2,s2);
-
-//		Strings with time spans for rise/set/transit:
-			RS1 = (d1==0)?"":QString("%1%2 ").arg(d1).arg(msgH); RS1 += (m1==0)?"":QString("%1%2 ").arg(m1).arg(msgM); RS1 += QString("%1%2").arg(s1).arg(msgS);
-			RS2 = (d2==0)?"":QString("%1%2 ").arg(d2).arg(msgH); RS2 += (m2==0)?"":QString("%1%2 ").arg(m2).arg(msgM); RS2 += QString("%1%2").arg(s2).arg(msgS);
-			if (raised) 
+			double2hms(TFrac*settingTime, d1, m1, s1);
+			double2hms(TFrac*risingTime, d2, m2, s2);
+			
+			//		Strings with time spans for rise/set/transit:
+			RS1 = (d1==0)?"":QString("%1%2 ").arg(d1).arg(msgH);
+			RS1 += (m1==0)?"":QString("%1%2 ").arg(m1).arg(msgM);
+			RS1 += QString("%1%2").arg(s1).arg(msgS);
+			RS2 = (d2==0)?"":QString("%1%2 ").arg(d2).arg(msgH);
+			RS2 += (m2==0)?"":QString("%1%2 ").arg(m2).arg(msgM);
+			RS2 += QString("%1%2").arg(s2).arg(msgS);
+			if (hasRisen) 
 			{
-                                double2hms(toUnsignedRA(currLocalT+TFrac*Set+12.),ephHour,ephMinute,ephSecond);
-				SetTime = QString("%1:%2").arg(ephHour).arg(ephMinute,2,10,QLatin1Char('0')); // Local time for set.
+				double2hms(toUnsignedRA(currLocalT+TFrac*settingTime+12.),
+				           ephHour, ephMinute, ephSecond);
+				SetTime = QString("%1:%2").arg(ephHour).arg(ephMinute,2,10,QChar('0')); // Local time for set.
 
-                                double2hms(toUnsignedRA(currLocalT-TFrac*Rise+12.),ephHour,ephMinute,ephSecond); // Local time for rise.
+				double2hms(toUnsignedRA(currLocalT-TFrac*risingTime+12.),
+				           ephHour, ephMinute, ephSecond); // Local time for rise.
 				RiseTime = QString("%1:%2").arg(ephHour).arg(ephMinute,2,10,QLatin1Char('0'));
-
+				
 				//RS1 = q_("Sets at %1 (in %2)").arg(SetTime).arg(RS1);
 				//RS2 = q_("Rose at %1 (%2 ago)").arg(RiseTime).arg(RS2);
 				RS1 = msgSetsAt.arg(SetTime).arg(RS1);
@@ -547,54 +530,61 @@
 			}
 			else 
 			{
-                                double2hms(toUnsignedRA(currLocalT-TFrac*Set+12.),ephHour,ephMinute,ephSecond);
+				double2hms(toUnsignedRA(currLocalT-TFrac*settingTime+12.),
+				           ephHour, ephMinute, ephSecond);
 				SetTime = QString("%1:%2").arg(ephHour).arg(ephMinute,2,10,QLatin1Char('0'));
-
-                                double2hms(toUnsignedRA(currLocalT+TFrac*Rise+12.),ephHour,ephMinute,ephSecond);
+				
+				double2hms(toUnsignedRA(currLocalT+TFrac*risingTime+12.),
+				           ephHour, ephMinute, ephSecond);
 				RiseTime = QString("%1:%2").arg(ephHour).arg(ephMinute,2,10,QLatin1Char('0'));
-
+				
 				//RS1 = q_("Set at %1 (%2 ago)").arg(SetTime).arg(RS1);
 				//RS2 = q_("Rises at %1 (in %2)").arg(RiseTime).arg(RS2);
 				RS1 = msgSetAt.arg(SetTime).arg(RS1);
 				RS2 = msgRisesAt.arg(RiseTime).arg(RS2);
-			};				
+			}
 		}
-		else { // The source is either circumpolar or never rises:
-			(alti>RefracHoriz)? RS1 = msgCircumpolar: RS1 = msgNoRise;
+		else // The source is either circumpolar or never rises:
+		{
+			(alti>refractedHorizonAlt)? RS1 = msgCircumpolar: RS1 = msgNoRise;
 			RS2 = "";
 		};
-
-// 	Culmination:
-
-	if (isStar)
-	{
-		culmAlt = std::abs(mylat-selDec); // 90.-altitude at transit.
-		transit = LocPos[1]<0.0;
-	};
-
-	if (culmAlt<halfpi-RefracHoriz) { // Source can be observed.
-		double altiAtCulmi = Rad2Deg*(halfpi-culmAlt-RefracHoriz);
-		double2hms(TFrac*currH,dc,mc,sc);
-
-//		String with the time span for culmination:	
-		Cul = (dc==0)?"":QString("%1%2 ").arg(dc).arg(msgH); Cul += (mc==0)?"":QString("%1%2 ").arg(mc).arg(msgM); Cul += QString("%1%2").arg(sc).arg(msgS);
-		if (transit==false) { 
-
-                        double2hms(toUnsignedRA(currLocalT+TFrac*currH+12.),ephHour,ephMinute,ephSecond); // Local time at transit.
-			CulmTime = QString("%1:%2").arg(ephHour).arg(ephMinute,2,10,QLatin1Char('0'));
-			//Cul = q_("Culminates at %1 (in %2) at %3 deg.").arg(CulmTime).arg(Cul).arg(altiAtCulmi,0,'f',1);
-			Cul = msgCulminatesAt.arg(CulmTime).arg(Cul).arg(altiAtCulmi,0,'f',1);
+		
+		// 	Culmination:
+		
+		if (isStar)
+		{
+			culmAlt = std::abs(mylat-selDec); // 90.-altitude at transit.
+			transit = LocPos[1]<0.0;
+		};
+		
+		if (culmAlt < (halfpi - refractedHorizonAlt)) // Source can be observed.
+		{
+			double altiAtCulmi = Rad2Deg*(halfpi-culmAlt-refractedHorizonAlt);
+			double2hms(TFrac*currH,dc,mc,sc);
+			
+			//String with the time span for culmination:
+			Cul = (dc==0)?"":QString("%1%2 ").arg(dc).arg(msgH);
+			Cul += (mc==0)?"":QString("%1%2 ").arg(mc).arg(msgM);
+			Cul += QString("%1%2").arg(sc).arg(msgS);
+			if (!transit)
+			{ 
+				double2hms(toUnsignedRA(currLocalT + TFrac*currH + 12.),
+				           ephHour, ephMinute, ephSecond); // Local time at transit.
+				CulmTime = QString("%1:%2").arg(ephHour).arg(ephMinute,2,10,QLatin1Char('0'));
+				//Cul = q_("Culminates at %1 (in %2) at %3 deg.").arg(CulmTime).arg(Cul).arg(altiAtCulmi,0,'f',1);
+				Cul = msgCulminatesAt.arg(CulmTime).arg(Cul).arg(altiAtCulmi,0,'f',1);
+			}
+			else
+			{
+				double2hms(toUnsignedRA(currLocalT - TFrac*currH + 12.),
+				           ephHour, ephMinute, ephSecond);
+				CulmTime = QString("%1:%2").arg(ephHour).arg(ephMinute,2,10,QLatin1Char('0'));
+				//Cul = q_("Culminated at %1 (%2 ago) at %3 deg.").arg(CulmTime).arg(Cul).arg(altiAtCulmi,0,'f',1);
+				Cul = msgCulminatedAt.arg(CulmTime).arg(Cul).arg(altiAtCulmi,0,'f',1);
+			}
 		}
-		else
-		{
-                        double2hms(toUnsignedRA(currLocalT-TFrac*currH+12.),ephHour,ephMinute,ephSecond);
-			CulmTime = QString("%1:%2").arg(ephHour).arg(ephMinute,2,10,QLatin1Char('0'));
-			//Cul = q_("Culminated at %1 (%2 ago) at %3 deg.").arg(CulmTime).arg(Cul).arg(altiAtCulmi,0,'f',1);
-			Cul = msgCulminatedAt.arg(CulmTime).arg(Cul).arg(altiAtCulmi,0,'f',1);
-		};
-	};
-
-	}; // This comes from show_Today==True
+	} // This comes from show_Today==True
 ////////////////////////////////////////////////////////////
 
 
@@ -606,140 +596,175 @@
 
 	if (isSun) 
 	{
-		bestNight=""; ObsRange = "";
+		lineBestNight.clear();
+		lineObservableRange.clear();
 	}
-	else if (!isMoon && show_Year) {
-
-		if (isStar==false && (souChanged || yearChanged)) { // Object moves.
-			PlanetRADec(core);} // Re-compute ephemeris.
-
-		else { // Object is fixed on the sky.
-			double auxH = HourAngle(mylat,RefracHoriz,selDec);
+	else if (!isMoon && show_Year)
+	{
+
+		if (!isStar && (souChanged || yearChanged)) // Object moves.
+			updatePlanetData(core); // Re-compute ephemeris.
+		else
+		{ // Object is fixed on the sky.
+			double auxH = calculateHourAngle(mylat,refractedHorizonAlt,selDec);
 			double auxSidT1 = toUnsignedRA(selRA - auxH); 
 			double auxSidT2 = toUnsignedRA(selRA + auxH); 
 			for (int i=0;i<nDays;i++) {
-				ObjectH0[i] = auxH;
-				ObjectRA[i] = selRA;
-				ObjectDec[i] = selDec;
-				ObjectSidT[0][i] = auxSidT1;
-				ObjectSidT[1][i] = auxSidT2;
+				objectH0[i] = auxH;
+				objectRA[i] = selRA;
+				objectDec[i] = selDec;
+				objectSidT[0][i] = auxSidT1;
+				objectSidT[1][i] = auxSidT2;
 			};
 		};
 
 // Determine source observability (only if something changed):
-		if ((souChanged || locChanged || yearChanged)) {
-			bestNight=""; ObsRange = "";
+		if ((souChanged || locChanged || yearChanged))
+		{
+			lineBestNight.clear();
+			lineObservableRange.clear();
 
-			if (culmAlt>=halfpi-RefracHoriz) { // Source cannot be seen.
+			// Check if the target cannot be seen.
+			if (culmAlt >= (halfpi - refractedHorizonAlt))
+			{
 				//ObsRange = q_("Source is not observable.");
 				//AcroCos = q_("No Acronychal nor Cosmical rise/set.");
-				ObsRange = msgSrcNotObs;
-				AcroCos = msgNoACRise;
+				lineObservableRange = msgSrcNotObs;
+				lineAcroCos = msgNoACRise;
 			}
-			else { // Source can be seen.
+			else
+			{ // Source can be seen.
 
 ///////////////////////////
 // - Part 1. Determine the best observing night (i.e., opposition to the Sun):
-				if (show_Best_Night) {
+				if (show_Best_Night)
+				{
 					int selday = 0;
 					double deltaPhs = -1.0; // Initial dummy value
 					double tempPhs; 	
-					for (int i=0;i<nDays;i++) { // Maximize the Sun-object separation.
-						tempPhs = Lambda(ObjectRA[i],ObjectDec[i],SunRA[i],SunDec[i]);
-						if (tempPhs>deltaPhs) {selday=i;deltaPhs=tempPhs;};
-					};
+					for (int i=0; i<nDays; i++) // Maximize the Sun-object separation.
+					{
+						tempPhs = Lambda(objectRA[i], objectDec[i],
+						                 sunRA[i], sunDec[i]);
+						if (tempPhs > deltaPhs)
+						{
+							selday = i;
+							deltaPhs = tempPhs;
+						}
+					}
 
 					if (selName=="Mercury" || selName=="Venus")
 					{
-						//bestNight = q_("Greatest elongation: ");
-						bestNight = msgGreatElong;
-					} else 
+						lineBestNight = msgGreatElong;
+					}
+					else 
 					{
-						//bestNight = q_("Largest Sun separation: ");
-						bestNight = msgLargSSep;
-					};
-
-					//bestNight = bestNight + CalenDate(selday) + q_(" (at %1 deg.)").arg(deltaPhs*Rad2Deg,0,'f',1);
-					bestNight = bestNight + CalenDate(selday) + msgAtDeg.arg(deltaPhs*Rad2Deg,0,'f',1);
-				};
+						lineBestNight = msgLargSSep;
+					}
+					
+					lineBestNight = lineBestNight
+					                .arg(formatAsDate(selday))
+					                .arg(deltaPhs*Rad2Deg, 0, 'f', 1);
+				}
 
 ///////////////////////////////
 // - Part 2. Determine Acronychal and Cosmical rise and set:
 
-				if (show_AcroCos) {
-					int selRise, selSet, selRise2, selSet2; // days of year for Acronical and Cosmical rise/set.
-					int Acro = CheckAcro(selRise,selSet,selRise2,selSet2);
-					QString AcroRiseStr, AcroSetStr;
-					QString CosmRiseStr, CosmSetStr;
-
-					AcroRiseStr = (selRise>0)?CalenDate(selRise):msgNone;
-					AcroSetStr = (selSet>0)?CalenDate(selSet):msgNone;
-
-					CosmRiseStr = (selRise2>0)?CalenDate(selRise2):msgNone;
-					CosmSetStr = (selSet2>0)?CalenDate(selSet2):msgNone;
-
-					//AcroCos = (Acro==3 || Acro==1)?QString("%1: %2/%3.").arg(q_("Acronychal rise/set")).arg(AcroRiseStr).arg(AcroSetStr):q_("No Acronychal rise/set.");
-					//AcroCos += (Acro==3 || Acro==2)?QString(" %1: %2/%3.").arg(q_("Cosmical rise/set")).arg(CosmRiseStr).arg(CosmSetStr):QString(" %1").arg(q_("No Cosmical rise/set."));
-					AcroCos = (Acro==3 || Acro==1)?QString("%1: %2/%3.").arg(msgAcroRise).arg(AcroRiseStr).arg(AcroSetStr):msgNoAcroRise;
-					AcroCos += (Acro==3 || Acro==2)?QString(" %1: %2/%3.").arg(msgCosmRise).arg(CosmRiseStr).arg(CosmSetStr):QString(" %1").arg(msgNoCosmRise);
-
-				};
+				if (show_AcroCos)
+				{
+					int acroRise, acroSet, cosRise, cosSet;
+					int result = calculateAcroCos(acroRise, acroSet,
+					                              cosRise, cosSet);
+					QString acroRiseStr, acroSetStr;
+					QString cosRiseStr, cosSetStr;
+					// TODO: Possible error? Day 0 is 1 Jan.
+					acroRiseStr = (acroRise>0)?formatAsDate(acroRise):msgNone;
+					acroSetStr = (acroSet>0)?formatAsDate(acroSet):msgNone;
+					cosRiseStr = (cosRise>0)?formatAsDate(cosRise):msgNone;
+					cosSetStr = (cosSet>0)?formatAsDate(cosSet):msgNone;
+
+					if (result==3 || result==1)
+						lineAcroCos =  msgAcroRise
+						               .arg(acroRiseStr)
+						               .arg(acroSetStr);
+					else
+						lineAcroCos =  msgNoAcroRise;
+					
+					if (result==3 || result==2)
+						lineAcroCos += msgCosmRise
+						               .arg(cosRiseStr)
+						               .arg(cosSetStr);
+					else
+						lineAcroCos += msgNoCosmRise;
+				}
 
 
 ////////////////////////////
 // - Part 3. Determine range of good nights 
 // (i.e., above horizon before/after twilight):
 
-				if (show_Good_Nights) {
+				if (show_Good_Nights)
+				{
 					int selday = 0;
 					int selday2 = 0;
 					bool bestBegun = false; // Are we inside a good time range?
 					bool atLeastOne = false;
-					QString dateRange = "";
-					bool PoleNight, twiGood;
-
-					for (int i=0;i<nDays;i++) {
-
-						PoleNight = SunSidT[0][i]<0.0 && std::abs(SunDec[i]-mylat)>=halfpi; // Is it night during 24h?
-						twiGood = (PoleNight && std::abs(ObjectDec[i]-mylat)<halfpi)?true:CheckRise(i);
-						if (twiGood && bestBegun == false) {
+					QString dateRange;
+					bool poleNight, twiGood;
+
+					for (int i=0; i<nDays; i++)
+					{
+
+						poleNight = sunSidT[0][i]<0.0 && std::abs(sunDec[i]-mylat)>=halfpi; // Is it night during 24h?
+						twiGood = (poleNight && std::abs(objectDec[i]-mylat)<halfpi)?true:CheckRise(i);
+						
+						if (twiGood && bestBegun == false)
+						{
 							selday = i;
 							bestBegun = true;
 							atLeastOne = true;
 						};
 
-						if (!twiGood && bestBegun == true) {
+						if (!twiGood && bestBegun == true)
+						{
 							selday2 = i;
 							bestBegun = false;
-							if (selday2 > selday) {
-								if (dateRange!="") { dateRange += ", ";};
-								dateRange += QString("%1").arg(RangeCalenDates(selday, selday2));
+							if (selday2 > selday)
+							{
+								// FIXME: This kind of concatenation is bad for i18n.
+								if (!dateRange.isEmpty())
+									dateRange += ", ";
+								dateRange += QString("%1").arg(formatAsDateRange(selday, selday2));
 							};
 						};
 					};
 
-					if (bestBegun) { // There were good dates till the end of the year.
-						 if (dateRange!="") { dateRange += ", ";};
-						dateRange += RangeCalenDates(selday, 0);
+					// Check if there were good dates till the end of the year.
+					if (bestBegun)
+					{
+						// FIXME: This kind of concatenation is bad for i18n.
+						 if (!dateRange.isEmpty())
+							 dateRange += ", ";
+						dateRange += formatAsDateRange(selday, 0);
 					};
 					
-					if (dateRange == "") 
+					if (dateRange.isEmpty()) 
 					{ 
 						if (atLeastOne) 
-						{ // The whole year is good.
+						{
 							//ObsRange = q_("Observable during the whole year.");
-							ObsRange = msgWholeYear;
+							lineObservableRange = msgWholeYear;
 						}
 						else
 						{
 							//ObsRange = q_("Not observable at dark night.");
-							ObsRange = msgNotObs;
+							lineObservableRange = msgNotObs;
 						};
 					}
 					else
 					{
-						//ObsRange = QString("%1 %2").arg(q_("Nights above horizon: ")).arg(dateRange);
-						ObsRange = QString("%1 %2").arg(msgAboveHoriz).arg(dateRange);
+						// Nights when the target is above the horizon
+						lineObservableRange = msgAboveHoriz.arg(dateRange);
 					};
 
 				}; // Comes from show_Good_Nights==True"
@@ -749,41 +774,40 @@
 
 // Print all results:
 
-	int spacing = (int) (1.3* ( (double) fontSize));  // between lines
-	int spacing2 = 6*fontSize;  // between daily and yearly results
+	int lineSpacing = (int) (1.3* ( (double) fontSize));  // between lines
+	int groupSpacing = 6*fontSize;  // between daily and yearly results
 	int yLine = 8*fontSize+110;
 	int xLine = 80;
 
 	if (show_Today) 
 	{
-		paintresult.drawText(xLine, yLine,q_("TODAY:"));
-		paintresult.drawText(xLine+fontSize, yLine-spacing, RS2);
-		paintresult.drawText(xLine+fontSize, yLine-spacing*2, RS1);
-		paintresult.drawText(xLine+fontSize, yLine-spacing*3, Cul);
-		yLine -= spacing2;
-	};
+		//renderer->drawText(TextParams(xLine, yLine,q_("TODAY:")));
+		painter.drawText(xLine, yLine, msgToday);
+		painter.drawText(xLine + fontSize, yLine - lineSpacing, RS2);
+		painter.drawText(xLine + fontSize, yLine - lineSpacing*2, RS1);
+		painter.drawText(xLine + fontSize, yLine - lineSpacing*3, Cul);
+		yLine -= groupSpacing;
+	}
 	
 	if ((isMoon && show_FullMoon) || (!isSun && !isMoon && show_Year)) 
 	{
-		paintresult.drawText(xLine,yLine,q_("THIS YEAR:"));
+		painter.drawText(xLine, yLine, msgThisYear);
 		if (show_Best_Night || show_FullMoon)
 		{
-			yLine -= spacing;
-			paintresult.drawText(xLine+fontSize, yLine, bestNight);
-		};
-		if (show_Good_Nights) 
-		{
-			yLine -= spacing;
-			paintresult.drawText(xLine+fontSize, yLine, ObsRange);
-		};
-		if (show_AcroCos) 
-		{
-			yLine -= spacing;
-			paintresult.drawText(xLine+fontSize, yLine, AcroCos);
-		};
-
-	};
-
+			yLine -= lineSpacing;
+			painter.drawText(xLine + fontSize, yLine, lineBestNight);
+		}
+		if (show_Good_Nights)
+		{
+			yLine -= lineSpacing;
+			painter.drawText(xLine + fontSize, yLine, lineObservableRange);
+		}
+		if (show_AcroCos)
+		{
+			yLine -= lineSpacing;
+			painter.drawText(xLine + fontSize, yLine, lineAcroCos);
+		}
+	}
 }
 
 // END OF MAIN CODE
@@ -795,16 +819,21 @@
 
 ////////////////////////////////////
 // Returns the hour angle for a given altitude:
-double Observability::HourAngle(double lat, double h, double Dec)
+double Observability::calculateHourAngle(double latitude,
+                                         double elevation,
+                                         double declination)
 {
-	double Denom = std::cos(lat)*std::cos(Dec);
-	double Numer = (std::sin(h)-std::sin(lat)*std::sin(Dec));
-
-	if ( std::abs(Numer)>std::abs(Denom) ) 
-		{return -0.5/86400.;} // Source doesn't reach that altitude. 
-	else 
-	{return Rad2Hr*std::acos(Numer/Denom);}
-
+	double denom = std::cos(latitude)*std::cos(declination);
+	double numer = (std::sin(elevation)-std::sin(latitude)*std::sin(declination));
+
+	if ( std::abs(numer) > std::abs(denom) ) 
+	{
+		return -0.5/86400.; // Source doesn't reach that altitude.
+	}
+	else
+	{
+		return Rad2Hr * std::acos(numer/denom);
+	}
 }
 ////////////////////////////////////
 
@@ -823,9 +852,9 @@
 // Returns the hour angle for a given a Sid. Time:
 double Observability::HourAngle2(double RA, double ST)
 {
-	double Htemp = toUnsignedRA(RA-ST/15.);
-	Htemp -= (Htemp>12.)?24.0:0.0;
-	return Htemp;
+	double result = toUnsignedRA(RA-ST/15.);
+	result -= (result > 12.) ? 24.0 : 0.0;
+	return result;
 
 }
 ////////////////////////////////////
@@ -859,91 +888,78 @@
 ////////////////////////////////////
 
 
-///////////////////////////////////////////////
-// Returns the day and month of year (to put it in format '25 Apr')
-QString Observability::CalenDate(int selday)
+QString Observability::formatAsDate(int dayNumber)
 {
-	int day,month,year;
-	StelUtils::getDateFromJulianDay(yearJD[selday],&year,&month,&day);
-
-	QString r;
-	if (getDateFormat())
-		r = QString("%1 %2").arg(day).arg(months[month-1]);
-	else
-		r = QString("%1 %2").arg(months[month-1]).arg(day);
-
-	return r;
+	int day, month, year;
+	StelUtils::getDateFromJulianDay(yearJD[dayNumber], &year, &month, &day);
+
+	QString formatString = (getDateFormat()) ? "%1 %2" : "%2 %1";
+	QString result = formatString.arg(day).arg(monthNames[month-1]);
+	return result;
 }
-//////////////////////////////////////////////
 
 ///////////////////////////////////////////////
 // Returns the day and month of year (to put it in format '25 Apr')
-QString Observability::RangeCalenDates(int fDoY, int sDoY)
+QString Observability::formatAsDateRange(int startDay, int endDay)
 {
-	int day1,month1,year1,day2,month2,year2;
+	int sDay, sMonth, sYear, eDay, eMonth, eYear;
 	QString range;
-	StelUtils::getDateFromJulianDay(yearJD[fDoY],&year1,&month1,&day1);
-	StelUtils::getDateFromJulianDay(yearJD[sDoY],&year2,&month2,&day2);
-	if (sDoY==0)
-	{
-		day2 = 31;
-		month2 = 12;
-	}
-	if (fDoY==0)
-	{
-		day1 = 1;
-		month1 = 1;
-	}
-	if (month1==month2)
-	{
-		if (getDateFormat())
-			range = QString("%1 - %2 %3").arg(day1).arg(day2).arg(months[month1-1]);
-		else
-			range = QString("%3 %1 - %2").arg(day1).arg(day2).arg(months[month1-1]);
+	StelUtils::getDateFromJulianDay(yearJD[startDay], &sYear, &sMonth, &sDay);
+	StelUtils::getDateFromJulianDay(yearJD[endDay], &eYear, &eMonth, &eDay);
+	if (endDay == 0)
+	{
+		eDay = 31;
+		eMonth = 12;
+	}
+	if (startDay == 0)
+	{
+		sDay = 1;
+		sMonth = 1;
+	}
+	
+	// If it's the same month, display "X-Y Month" or "Month X-Y"
+	if (sMonth == eMonth)
+	{
+		QString formatString = (getDateFormat()) ? "%1 - %2 %3" : "%3 %1 - %2";
+		range = formatString.arg(sDay).arg(eDay).arg(monthNames[sMonth-1]);;
 	}
 	else
 	{
-		if (getDateFormat())
-			range = QString("%1 %2 - %3 %4").arg(day1).arg(months[month1-1]).arg(day2).arg(months[month2-1]);
-		else
-			range = QString("%1 %2 - %3 %4").arg(months[month1-1]).arg(day1).arg(months[month2-1]).arg(day2);
+		QString formatString = (getDateFormat()) ? "%1 %2 - %3 %4" 
+		                                         : "%2 %1 - %4 %3";
+		range = formatString.arg(sDay)
+		                    .arg(monthNames[sMonth-1])
+		                    .arg(eDay)
+		                    .arg(monthNames[eMonth-1]);
 	}
 
 	return range;
 }
 //////////////////////////////////////////////
 
-
-//////////////////////////////////////////////////
-// Returns the RA and Dec of the selected planet 
-//for each day of the current year:
-void Observability::PlanetRADec(StelCore *core)
-{
-	double TempH;
-
 // Compute planet's position for each day of the current year:
-
-	for (int i=0;i<nDays;i++) {
-		getPlanetCoords(core,yearJD[i],ObjectRA[i],ObjectDec[i],false);
-		TempH = HourAngle(mylat,RefracHoriz,ObjectDec[i]);
-		ObjectH0[i] = TempH;
-		ObjectSidT[0][i] = toUnsignedRA(ObjectRA[i]-TempH);
-		ObjectSidT[1][i] = toUnsignedRA(ObjectRA[i]+TempH);
+void Observability::updatePlanetData(StelCore *core)
+{
+	double tempH;
+	for (int i=0; i<nDays; i++)
+	{
+		getPlanetCoords(core, yearJD[i], objectRA[i], objectDec[i], false);
+		tempH = calculateHourAngle(mylat, refractedHorizonAlt, objectDec[i]);
+		objectH0[i] = tempH;
+		objectSidT[0][i] = toUnsignedRA(objectRA[i]-tempH);
+		objectSidT[1][i] = toUnsignedRA(objectRA[i]+tempH);
 	}
 
 // Return the planet to its current time:
-	getPlanetCoords(core,myJD,ObjectRA[0],ObjectDec[0],true);
-
-
+	getPlanetCoords(core, myJD, objectRA[0], objectDec[0], true);
 }
 
 /////////////////////////////////////////////////
 // Computes the Sun's RA and Dec (and the JD) for 
 // each day of the current year.
-void Observability::SunRADec(StelCore* core) 
+void Observability::updateSunData(StelCore* core) 
 {
-	int day,month,year,year2;
-
+	int day, month, year, sameYear;
 // Get current date:
 	StelUtils::getDateFromJulianDay(myJD,&year,&month,&day);
 
@@ -951,18 +967,20 @@
 	StelUtils::getJDFromDate(&Jan1stJD,year,1,1,0,0,0);
 
 // Check if we are on a leap year:
-	StelUtils::getDateFromJulianDay(Jan1stJD+365.,&year2,&month,&day);
-	nDays = (year==year2)?366:365;
+	StelUtils::getDateFromJulianDay(Jan1stJD+365., &sameYear, &month, &day);
+	nDays = (year==sameYear)?366:365;
 	
 // Compute Earth's position throughout the year:
-	for (int i=0;i<nDays;i++) {
-		yearJD[i] = Jan1stJD+(double)i;
+	Vec3d pos, sunPos;
+	for (int i=0; i<nDays; i++)
+	{
+		yearJD[i] = Jan1stJD + (double)i;
 		myEarth->computePosition(yearJD[i]);
 		myEarth->computeTransMatrix(yearJD[i]);
-		Pos1 = myEarth->getHeliocentricEclipticPos();
-		Pos2 = core->j2000ToEquinoxEqu((core->matVsop87ToJ2000)*(-Pos1));
-		EarthPos[i] = -Pos1;
-		toRADec(Pos2,SunRA[i],SunDec[i]);
+		pos = myEarth->getHeliocentricEclipticPos();
+		sunPos = core->j2000ToEquinoxEqu((core->matVsop87ToJ2000)*(-pos));
+		EarthPos[i] = -pos;
+		toRADec(sunPos,sunRA[i],sunDec[i]);
 	};
 
 //Return the Earth to its current time:
@@ -974,53 +992,63 @@
 
 ////////////////////////////////////////////
 // Computes Sun's Sidereal Times at twilight and culmination:
-void Observability::SunHTwi()
+void Observability::updateSunH()
 {
-	double TempH, TempH00;
-
-	for (int i=0; i<nDays; i++) {
-		TempH = HourAngle(mylat,AstroTwiAlti,SunDec[i]);
-		TempH00 = HourAngle(mylat,RefracHoriz,SunDec[i]);
-		if (TempH>0.0) {
-			SunSidT[0][i] = toUnsignedRA(SunRA[i]-TempH*(1.00278));
-			SunSidT[1][i] = toUnsignedRA(SunRA[i]+TempH*(1.00278));}
-		else {
-			SunSidT[0][i] = -1000.0;
-			SunSidT[1][i] = -1000.0;};
-		if (TempH00>0.0) {
-			SunSidT[2][i] = toUnsignedRA(SunRA[i]+TempH00);
-			SunSidT[3][i] = toUnsignedRA(SunRA[i]-TempH00);}
-		else {
-			SunSidT[2][i] = -1000.0;
-			SunSidT[3][i] = -1000.0;};
-
-
-	};
+	double tempH, tempH00;
+
+	for (int i=0; i<nDays; i++)
+	{
+		tempH = calculateHourAngle(mylat, twilightAltRad, sunDec[i]);
+		tempH00 = calculateHourAngle(mylat, refractedHorizonAlt, sunDec[i]);
+		if (tempH > 0.0)
+		{
+			sunSidT[0][i] = toUnsignedRA(sunRA[i]-tempH*(1.00278));
+			sunSidT[1][i] = toUnsignedRA(sunRA[i]+tempH*(1.00278));
+		}
+		else
+		{
+			sunSidT[0][i] = -1000.0;
+			sunSidT[1][i] = -1000.0;
+		}
+		
+		if (tempH00>0.0)
+		{
+			sunSidT[2][i] = toUnsignedRA(sunRA[i]+tempH00);
+			sunSidT[3][i] = toUnsignedRA(sunRA[i]-tempH00);
+		}
+		else
+		{
+			sunSidT[2][i] = -1000.0;
+			sunSidT[3][i] = -1000.0;
+		}
+	}
 }
 ////////////////////////////////////////////
 
 
 ///////////////////////////////////////////
 // Checks if a source can be observed with the Sun below the twilight altitude.
-bool Observability::CheckRise(int i)
+bool Observability::CheckRise(int day)
 {
 
-	// If Sun can't reach twilight elevation, return false:
-	if (SunSidT[0][i]<0.0 || SunSidT[1][i]<0.0) { return false;};
+	// If Sun can't reach twilight elevation, the target is not visible.
+	if (sunSidT[0][day]<0.0 || sunSidT[1][day]<0.0)
+		return false;
 
 	// Iterate over the whole year:
 	int nBin = 1000;
-	double auxSid1 = SunSidT[0][i];
-	auxSid1 += (SunSidT[0][i] < SunSidT[1][i])?24.0:0.0;
-	double deltaT = (auxSid1-SunSidT[1][i])/((double)nBin);
-
-	double Hour; 
-	for (int j=0;j<nBin;j++) {
-		Hour = toUnsignedRA(SunSidT[1][i]+deltaT*(double)j - ObjectRA[i]);
-		Hour -= (Hour>12.)?24.0:0.0;
-		if (std::abs(Hour)<ObjectH0[i] || (ObjectH0[i] < 0.0 && alti>0.0)) {return true;};
-	};	
-
+	double auxSid1 = sunSidT[0][day];
+	auxSid1 += (sunSidT[0][day] < sunSidT[1][day]) ? 24.0 : 0.0;
+	double deltaT = (auxSid1-sunSidT[1][day]) / ((double)nBin);
+
+	double hour; 
+	for (int j=0; j<nBin; j++)
+	{
+		hour = toUnsignedRA(sunSidT[1][day]+deltaT*(double)j - objectRA[day]);
+		hour -= (hour>12.) ? 24.0 : 0.0;
+		if (std::abs(hour)<objectH0[day] || (objectH0[day] < 0.0 && alti>0.0))
+			return true;
+	}
 
 	return false;
 }
@@ -1029,81 +1057,79 @@
 
 ///////////////////////////////////////////
 // Finds the dates of Acronichal (Rise, Set) and Cosmical (Rise2, Set2) dates.
-// Returns 0 if no dates found, 1 if Acro exists, 2 if Cosm exists, and 3 if both are found.
-int Observability::CheckAcro(int &Rise, int &Set, int &Rise2, int &Set2)
+int Observability::calculateAcroCos(int &acroRise, int &acroSet,
+                                    int &cosRise, int &cosSet)
 {
-
-	Rise = -1;
-	Set = -1;
-	Rise2 = -1;
-	Set2 = -1;
-
-	double BestDiffRise = 12.0;
-	double BestDiffSet = 12.0;
-	double BestDiffRise2 = 12.0;
-	double BestDiffSet2 = 12.0;
-
-	double HourDiffRise, HourDiffSet, HourDiffRise2, HourDiffSet2;
+	acroRise = -1;
+	acroSet = -1;
+	cosRise = -1;
+	cosSet = -1;
+
+	double bestDiffAcroRise = 12.0;
+	double bestDiffAcroSet = 12.0;
+	double bestDiffCosRise = 12.0;
+	double bestDiffCosSet = 12.0;
+
+	double hourDiffAcroRise, hourDiffAcroSet, hourDiffCosRise, hourCosDiffSet;
 	bool success = false;
 
- 	for (int i=0;i<366;i++)
+	for (int i=0; i<366; i++)
 	{
-		if (ObjectH0[i]>0.0 && SunSidT[2][i]>0.0 && SunSidT[3][i]>0.0) {
+		if (objectH0[i]>0.0 && sunSidT[2][i]>0.0 && sunSidT[3][i]>0.0)
+		{
 			success = true;
-			HourDiffRise = toUnsignedRA(ObjectRA[i] - ObjectH0[i]);
-			HourDiffRise2 = HourDiffRise-SunSidT[3][i];
-			HourDiffRise -= SunSidT[2][i];
-
-			HourDiffSet = toUnsignedRA(ObjectRA[i] + ObjectH0[i]);
-			HourDiffSet2 = HourDiffSet - SunSidT[2][i];
-			HourDiffSet -= SunSidT[3][i];
-
-		// Acronychal Rise/Set:
-			if (std::abs(HourDiffRise)<BestDiffRise) 
-			{
-				BestDiffRise = std::abs(HourDiffRise);
-				Rise = i;
-			};
-			if (std::abs(HourDiffSet)<BestDiffSet) 
-			{
-				BestDiffSet = std::abs(HourDiffSet);
-				Set = i;
-			};
-
-		// Cosmical Rise/Set:
-			if (std::abs(HourDiffRise2)<BestDiffRise2) 
-			{
-				BestDiffRise2 = std::abs(HourDiffRise2);
-				Rise2 = i;
-			};
-			if (std::abs(HourDiffSet2)<BestDiffSet2) 
-			{
-				BestDiffSet2 = std::abs(HourDiffSet2);
-				Set2 = i;
-			};
-
-
+			hourDiffAcroRise = toUnsignedRA(objectRA[i] - objectH0[i]);
+			hourDiffCosRise = hourDiffAcroRise-sunSidT[3][i];
+			hourDiffAcroRise -= sunSidT[2][i];
+			
+			hourDiffAcroSet = toUnsignedRA(objectRA[i] + objectH0[i]);
+			hourCosDiffSet = hourDiffAcroSet - sunSidT[2][i];
+			hourDiffAcroSet -= sunSidT[3][i];
+			
+			// Acronychal rise/set:
+			if (std::abs(hourDiffAcroRise) < bestDiffAcroRise) 
+			{
+				bestDiffAcroRise = std::abs(hourDiffAcroRise);
+				acroRise = i;
+			};
+			if (std::abs(hourDiffAcroSet) < bestDiffAcroSet) 
+			{
+				bestDiffAcroSet = std::abs(hourDiffAcroSet);
+				acroSet = i;
+			};
+			
+			// Cosmical Rise/Set:
+			if (std::abs(hourDiffCosRise) < bestDiffCosRise) 
+			{
+				bestDiffCosRise = std::abs(hourDiffCosRise);
+				cosRise = i;
+			};
+			if (std::abs(hourCosDiffSet) < bestDiffCosSet) 
+			{
+				bestDiffCosSet = std::abs(hourCosDiffSet);
+				cosSet = i;
+			};
 		};
 	};
 
-	Rise *= (BestDiffRise > 0.083)?-1:1; // Check that difference is lower than 5 minutes.
-	Set *= (BestDiffSet > 0.083)?-1:1; // Check that difference is lower than 5 minutes.
-	Rise2 *= (BestDiffRise2 > 0.083)?-1:1; // Check that difference is lower than 5 minutes.
-	Set2 *= (BestDiffSet2 > 0.083)?-1:1; // Check that difference is lower than 5 minutes.
-	int Result = (Rise>0 || Set>0)?1:0;
-	Result += (Rise2>0 || Set2>0)?2:0;
-	return (success)?Result:0;
+	acroRise *= (bestDiffAcroRise > 0.083)?-1:1; // Check that difference is lower than 5 minutes.
+	acroSet *= (bestDiffAcroSet > 0.083)?-1:1; // Check that difference is lower than 5 minutes.
+	cosRise *= (bestDiffCosRise > 0.083)?-1:1; // Check that difference is lower than 5 minutes.
+	cosSet *= (bestDiffCosSet > 0.083)?-1:1; // Check that difference is lower than 5 minutes.
+	int result = (acroRise>0 || acroSet>0) ? 1 : 0;
+	result += (cosRise>0 || cosSet>0) ? 2 : 0;
+	return (success) ? result : 0;
 }
 ///////////////////////////////////////////
 
 
 ////////////////////////////////////////////
 // Convert an Equatorial Vec3d into RA and Dec:
-void Observability::toRADec(Vec3d TempLoc, double &RA, double &Dec)
+void Observability::toRADec(Vec3d vec3d, double& ra, double &dec)
 {
-	TempLoc.normalize();
-	Dec = std::asin(TempLoc[2]); // in radians
-	RA = toUnsignedRA(std::atan2(TempLoc[1],TempLoc[0])*Rad2Hr); // in hours.
+	vec3d.normalize();
+	dec = std::asin(vec3d[2]); // in radians
+	ra = toUnsignedRA(std::atan2(vec3d[1],vec3d[0])*Rad2Hr); // in hours.
 }
 ////////////////////////////////////////////
 
@@ -1122,39 +1148,43 @@
 //////////////////////////
 // Get the coordinates of Sun or Moon for a given JD:
 // getBack controls whether Earth and Moon must be returned to their original positions after computation.
-void Observability::getSunMoonCoords(StelCore *core, double JD, double &RASun, double &DecSun, double &RAMoon, double &DecMoon, double &EclLon, bool getBack) //, Vec3d &AltAzVector)
+void Observability::getSunMoonCoords(StelCore *core, double jd,
+                                     double &raSun, double &decSun,
+                                     double &raMoon, double &decMoon,
+                                     double &eclLon, bool getBack) 
+                                     //, Vec3d &AltAzVector)
 {
 
 	if (getBack) // Return the Moon and Earth to their current position:
 	{
-		myEarth->computePosition(JD);
-		myEarth->computeTransMatrix(JD);
-		myMoon->computePosition(JD);
-		myMoon->computeTransMatrix(JD);
+		myEarth->computePosition(jd);
+		myEarth->computeTransMatrix(jd);
+		myMoon->computePosition(jd);
+		myMoon->computeTransMatrix(jd);
 	} 
-	else
-	{	// Compute coordinates:
-		myEarth->computePosition(JD);
-		myEarth->computeTransMatrix(JD);
-		Pos0 = myEarth->getHeliocentricEclipticPos();
-		double currSidT;
+	else // Compute coordinates:
+	{
+		myEarth->computePosition(jd);
+		myEarth->computeTransMatrix(jd);
+		Vec3d earthPos = myEarth->getHeliocentricEclipticPos();
+		double curSidT;
 
 // Sun coordinates:
-		Pos2 = core->j2000ToEquinoxEqu((core->matVsop87ToJ2000)*(-Pos0));
-		toRADec(Pos2,RASun,DecSun);
+		Vec3d sunPos = core->j2000ToEquinoxEqu((core->matVsop87ToJ2000)*(-earthPos));
+		toRADec(sunPos, raSun, decSun);
 
 // Moon coordinates:
-		currSidT = myEarth->getSiderealTime(JD)/Rad2Deg;
-		RotObserver = (Mat4d::zrotation(currSidT))*ObserverLoc;
-		LocTrans = (core->matVsop87ToJ2000)*(Mat4d::translation(-Pos0));
-		myMoon->computePosition(JD);
-		myMoon->computeTransMatrix(JD);
-		Pos1 = myMoon->getHeliocentricEclipticPos();
-		Pos2 = (core->j2000ToEquinoxEqu(LocTrans*Pos1))-RotObserver;
-
-                EclLon = Pos1[0]*Pos0[1] - Pos1[1]*Pos0[0];
-
-		toRADec(Pos2,RAMoon,DecMoon);
+		curSidT = myEarth->getSiderealTime(jd)/Rad2Deg;
+		RotObserver = (Mat4d::zrotation(curSidT))*ObserverLoc;
+		LocTrans = (core->matVsop87ToJ2000)*(Mat4d::translation(-earthPos));
+		myMoon->computePosition(jd);
+		myMoon->computeTransMatrix(jd);
+		Vec3d moonPos = myMoon->getHeliocentricEclipticPos();
+		sunPos = (core->j2000ToEquinoxEqu(LocTrans*moonPos))-RotObserver;
+		
+		eclLon = moonPos[0]*earthPos[1] - moonPos[1]*earthPos[0];
+
+		toRADec(sunPos,raMoon,decMoon);
 	};
 }
 //////////////////////////////////////////////
@@ -1164,37 +1194,37 @@
 //////////////////////////
 // Get the Observer-to-Moon distance JD:
 // getBack controls whether Earth and Moon must be returned to their original positions after computation.
-void Observability::getMoonDistance(StelCore *core, double JD, double &Distance, bool getBack)
+void Observability::getMoonDistance(StelCore *core, double jd, double &distance, bool getBack)
 {
 
 	if (getBack) // Return the Moon and Earth to their current position:
 	{
-		myEarth->computePosition(JD);
-		myEarth->computeTransMatrix(JD);
-		myMoon->computePosition(JD);
-		myMoon->computeTransMatrix(JD);
+		myEarth->computePosition(jd);
+		myEarth->computeTransMatrix(jd);
+		myMoon->computePosition(jd);
+		myMoon->computeTransMatrix(jd);
 	} 
 	else
 	{	// Compute coordinates:
-		myEarth->computePosition(JD);
-		myEarth->computeTransMatrix(JD);
-		Pos0 = myEarth->getHeliocentricEclipticPos();
-//		double currSidT;
+		myEarth->computePosition(jd);
+		myEarth->computeTransMatrix(jd);
+		Vec3d earthPos = myEarth->getHeliocentricEclipticPos();
+//		double curSidT;
 
 // Sun coordinates:
 //		Pos2 = core->j2000ToEquinoxEqu((core->matVsop87ToJ2000)*(-Pos0));
 //		toRADec(Pos2,RASun,DecSun);
 
 // Moon coordinates:
-//		currSidT = myEarth->getSiderealTime(JD)/Rad2Deg;
-//		RotObserver = (Mat4d::zrotation(currSidT))*ObserverLoc;
-		LocTrans = (core->matVsop87ToJ2000)*(Mat4d::translation(-Pos0));
-		myMoon->computePosition(JD);
-		myMoon->computeTransMatrix(JD);
+//		curSidT = myEarth->getSiderealTime(JD)/Rad2Deg;
+//		RotObserver = (Mat4d::zrotation(curSidT))*ObserverLoc;
+		LocTrans = (core->matVsop87ToJ2000)*(Mat4d::translation(-earthPos));
+		myMoon->computePosition(jd);
+		myMoon->computeTransMatrix(jd);
 		Pos1 = myMoon->getHeliocentricEclipticPos();
 		Pos2 = (core->j2000ToEquinoxEqu(LocTrans*Pos1)); //-RotObserver;
 
-		Distance = std::sqrt(Pos2*Pos2);
+		distance = std::sqrt(Pos2*Pos2);
 
 //		toRADec(Pos2,RAMoon,DecMoon);
 	};
@@ -1236,180 +1266,190 @@
 
 
 //////////////////////////////////////////////
-// Solves Moon's, Sun's, or Planet's ephemeris by bissection. Returns JD:
-bool Observability::SolarSystemSolve(StelCore* core, int Kind)
+// Solves Moon's, Sun's, or Planet's ephemeris by bissection.
+bool Observability::calculateSolarSystemEvents(StelCore* core, int bodyType)
 {
 
-	int Niter = 100;
+	const int NUM_ITER = 100;
 	int i;
-	double Hhoriz, RA, Dec, RAS, DecS, TempH, jd1, tempEphH, currSidT, EclLon;
-	Vec3d Observer;
+	double hHoriz, ra, dec, raSun, decSun, tempH, tempJd, tempEphH, curSidT, eclLon;
+	//Vec3d Observer;
 
-	Hhoriz = HourAngle(mylat,RefracHoriz,selDec);
-	bool raises = Hhoriz > 0.0;
+	hHoriz = calculateHourAngle(mylat, refractedHorizonAlt, selDec);
+	bool raises = hHoriz > 0.0;
 
 
 // Only recompute ephemeris from second to second (at least)
 // or if the source has changed (i.e., Sun <-> Moon). This saves resources:
-	if (std::abs(myJD-lastJDMoon)>JDsec || LastObject!=Kind || souChanged)
+	if (std::abs(myJD-lastJDMoon)>JDsec || lastType!=bodyType || souChanged)
 	{
 
 //		qDebug() << q_("%1  %2   %3   %4").arg(Kind).arg(LastObject).arg(myJD,0,'f',5).arg(lastJDMoon,0,'f',5);
 
-		LastObject = Kind;
+		lastType = bodyType;
 
 		myEarth->computePosition(myJD);
 		myEarth->computeTransMatrix(myJD);
-		Pos0 = myEarth->getHeliocentricEclipticPos();
+		Vec3d earthPos = myEarth->getHeliocentricEclipticPos();
 
-		if (Kind==1)
-		{   // Sun position:
-			Pos2 = core->j2000ToEquinoxEqu((core->matVsop87ToJ2000)*(-Pos0));
-		} else if (Kind==2)
-		{   // Moon position:
-			currSidT = myEarth->getSiderealTime(myJD)/Rad2Deg;
-			RotObserver = (Mat4d::zrotation(currSidT))*ObserverLoc;
-			LocTrans = (core->matVsop87ToJ2000)*(Mat4d::translation(-Pos0));
+		if (bodyType == 1) // Sun position
+		{
+			Pos2 = core->j2000ToEquinoxEqu((core->matVsop87ToJ2000)*(-earthPos));
+		}
+		else if (bodyType==2) // Moon position
+		{
+			curSidT = myEarth->getSiderealTime(myJD)/Rad2Deg;
+			RotObserver = (Mat4d::zrotation(curSidT))*ObserverLoc;
+			LocTrans = (core->matVsop87ToJ2000)*(Mat4d::translation(-earthPos));
 			myMoon->computePosition(myJD);
 			myMoon->computeTransMatrix(myJD);
 			Pos1 = myMoon->getHeliocentricEclipticPos();
 			Pos2 = (core->j2000ToEquinoxEqu(LocTrans*Pos1))-RotObserver;
-		} else 
-		{   // Planet position:
-       	        	myPlanet->computePosition(myJD);
-       	        	myPlanet->computeTransMatrix(myJD);
-       	        	Pos1 = myPlanet->getHeliocentricEclipticPos();
-       		        LocTrans = (core->matVsop87ToJ2000)*(Mat4d::translation(-Pos0));
-	                Pos2 = core->j2000ToEquinoxEqu(LocTrans*Pos1);
+		}
+		else // Planet position
+		{
+			myPlanet->computePosition(myJD);
+			myPlanet->computeTransMatrix(myJD);
+			Pos1 = myPlanet->getHeliocentricEclipticPos();
+			LocTrans = (core->matVsop87ToJ2000)*(Mat4d::translation(-earthPos));
+			Pos2 = core->j2000ToEquinoxEqu(LocTrans*Pos1);
 		};
 
-		toRADec(Pos2,RA,Dec);
-		Vec3d MoonAltAz = core->equinoxEquToAltAz(Pos2,StelCore::RefractionOff);
-		raised = MoonAltAz[2] > RefracHoriz;
+		toRADec(Pos2,ra,dec);
+		Vec3d moonAltAz = core->equinoxEquToAltAz(Pos2, StelCore::RefractionOff);
+		hasRisen = moonAltAz[2] > refractedHorizonAlt;
 
 // Initial guesses of rise/set/transit times.
 // They are called 'Moon', but are also used for the Sun or planet:
 
-		double Hcurr = -HourAngle(mylat,alti,selDec)*sign(LocPos[1]);
+		double Hcurr = -calculateHourAngle(mylat,alti,selDec)*sign(LocPos[1]);
 		double SidT = toUnsignedRA(selRA + Hcurr);
 
 		MoonCulm = -Hcurr; 
-		MoonRise = (-Hhoriz-Hcurr);
-		MoonSet = (Hhoriz-Hcurr);
+		MoonRise = (-hHoriz-Hcurr);
+		MoonSet = (hHoriz-Hcurr);
 
-		if (raises) {
-			if (raised==false) {
+		if (raises)
+		{
+			if (!hasRisen)
+			{
 				MoonRise += (MoonRise<0.0)?24.0:0.0;
 				MoonSet -= (MoonSet>0.0)?24.0:0.0;
-			};
+			}
 
 // Rise time:
 			tempEphH = MoonRise*TFrac;
 			MoonRise = myJD + (MoonRise/24.);
-			for (i=0; i<Niter; i++)
+			for (i=0; i<NUM_ITER; i++)
 			{
 	// Get modified coordinates:
-				jd1 = MoonRise;
+				tempJd = MoonRise;
 	
-				if (Kind<3)
+				if (bodyType<3)
 				{
-					getSunMoonCoords(core,jd1,RAS,DecS,RA,Dec,EclLon,false);
+					getSunMoonCoords(core, tempJd,
+					                 raSun, decSun,
+					                 ra, dec,
+					                 eclLon, false);
 				} else
 				{
-					getPlanetCoords(core,jd1,RA,Dec,false);
+					getPlanetCoords(core, tempJd, ra, dec, false);
 				};
 
-				if (Kind==1) {RA = RAS; Dec = DecS;};
+				if (bodyType==1) {ra = raSun; dec = decSun;};
 
 	// Current hour angle at mod. coordinates:
-				Hcurr = toUnsignedRA(SidT-RA);
-				Hcurr -= (raised)?0.0:24.;
+				Hcurr = toUnsignedRA(SidT-ra);
+				Hcurr -= (hasRisen)?0.0:24.;
 				Hcurr -= (Hcurr>12.)?24.0:0.0;
 
 	// H at horizon for mod. coordinates:
-				Hhoriz = HourAngle(mylat,RefracHoriz,Dec);
+				hHoriz = calculateHourAngle(mylat,refractedHorizonAlt,dec);
 	// Compute eph. times for mod. coordinates:
-				TempH = (-Hhoriz-Hcurr)*TFrac;
-				if (raised==false) TempH += (TempH<0.0)?24.0:0.0;
+				tempH = (-hHoriz-Hcurr)*TFrac;
+				if (hasRisen==false) tempH += (tempH<0.0)?24.0:0.0;
 			// Check convergence:
-				if (std::abs(TempH-tempEphH)<JDsec) break;
+				if (std::abs(tempH-tempEphH)<JDsec) break;
 			// Update rise-time estimate:
-				tempEphH = TempH;
+				tempEphH = tempH;
 				MoonRise = myJD + (tempEphH/24.);
 			};
 
 // Set time:  
 			tempEphH = MoonSet;
 			MoonSet = myJD + (MoonSet/24.);
-			for (i=0; i<Niter; i++)
+			for (i=0; i<NUM_ITER; i++)
 			{
 	// Get modified coordinates:
-				jd1 = MoonSet;
-
-                	        if (Kind<3)
-				{
-                                	getSunMoonCoords(core,jd1,RAS,DecS,RA,Dec,EclLon,false);
-                        	} else
-                        	{
-                                	getPlanetCoords(core,jd1,RA,Dec,false);
-                        	};
-
-				if (Kind==1) {RA = RAS; Dec = DecS;};
-
+				tempJd = MoonSet;
+				
+				if (bodyType < 3)
+					getSunMoonCoords(core, tempJd,
+					                 raSun, decSun,
+					                 ra, dec,
+					                 eclLon, false);
+				else
+					getPlanetCoords(core, tempJd, ra, dec, false);
+				
+				if (bodyType==1) {ra = raSun; dec = decSun;};
+				
 	// Current hour angle at mod. coordinates:
-				Hcurr = toUnsignedRA(SidT-RA);
-				Hcurr -= (raised)?24.:0.;
+				Hcurr = toUnsignedRA(SidT-ra);
+				Hcurr -= (hasRisen)?24.:0.;
 				Hcurr += (Hcurr<-12.)?24.0:0.0;
 	// H at horizon for mod. coordinates:
-				Hhoriz = HourAngle(mylat,RefracHoriz,Dec);
+				hHoriz = calculateHourAngle(mylat, refractedHorizonAlt, dec);
 	// Compute eph. times for mod. coordinates:
-				TempH = (Hhoriz-Hcurr)*TFrac;
-				if (raised==false) TempH -= (TempH>0.0)?24.0:0.0;
+				tempH = (hHoriz-Hcurr)*TFrac;
+				if (!hasRisen)
+					tempH -= (tempH>0.0)?24.0:0.0;
 		// Check convergence:
-				if (std::abs(TempH-tempEphH)<JDsec) break;
+				if (std::abs(tempH-tempEphH)<JDsec)
+					break;
 		// Update set-time estimate:
-				tempEphH = TempH;
+				tempEphH = tempH;
 				MoonSet = myJD + (tempEphH/24.);
 			};
 		} 
 		else // Comes from if(raises)
 		{
-			MoonSet = -1.0; MoonRise = -1.0;
+			MoonSet = -1.0;
+			MoonRise = -1.0;
 		};
 
 // Culmination time:
 		tempEphH = MoonCulm;
 		MoonCulm = myJD + (MoonCulm/24.);
 
-		for (i=0; i<Niter; i++)
+		for (i=0; i<NUM_ITER; i++)
 		{
-	// Get modified coordinates:
-			jd1 = MoonCulm;
-
-                	        if (Kind<3)
-                       		{
-                                	getSunMoonCoords(core,jd1,RAS,DecS,RA,Dec,EclLon,false);
-                        	} else
-                        	{
-                                	getPlanetCoords(core,jd1,RA,Dec,false);
-                        	};
-
-
-			if (Kind==1) {RA = RAS; Dec = DecS;};
+			// Get modified coordinates:
+			tempJd = MoonCulm;
+
+			if (bodyType<3)
+			{
+				getSunMoonCoords(core,tempJd,raSun,decSun,ra,dec,eclLon,false);
+			} else
+			{
+				getPlanetCoords(core,tempJd,ra,dec,false);
+			};
+
+
+			if (bodyType==1) {ra = raSun; dec = decSun;};
 
 
 	// Current hour angle at mod. coordinates:
-			Hcurr = toUnsignedRA(SidT-RA);
+			Hcurr = toUnsignedRA(SidT-ra);
 			Hcurr += (LocPos[1]<0.0)?24.0:-24.0;
 			Hcurr -= (Hcurr>12.)?24.0:0.0;
 
 	// Compute eph. times for mod. coordinates:
-			TempH = -Hcurr*TFrac;
+			tempH = -Hcurr*TFrac;
 	// Check convergence:
-			if (std::abs(TempH-tempEphH)<JDsec) break;
-			tempEphH = TempH;
+			if (std::abs(tempH-tempEphH)<JDsec) break;
+			tempEphH = tempH;
 			MoonCulm = myJD + (tempEphH/24.);
-			culmAlt = std::abs(mylat-Dec); // 90 - altitude at transit. 
+			culmAlt = std::abs(mylat-dec); // 90 - altitude at transit. 
 		};
 
 //		qDebug() << q_("%1").arg(MoonCulm,0,'f',5);
@@ -1423,7 +1463,7 @@
 
 
 // Find out the days of Full Moon:
-	if (Kind==2 && show_FullMoon) // || show_SuperMoon))
+	if (bodyType==2 && show_FullMoon) // || show_SuperMoon))
 	{
 
 	// Only estimate date of Full Moon if we have changed Lunar month:
@@ -1456,24 +1496,24 @@
 				Sec1 = iniEst1; // TempFullMoon - 0.05*MoonT; // Initial estimates of Full-Moon dates
 				Sec2 = iniEst2; // TempFullMoon + 0.05*MoonT; 
 
-				getSunMoonCoords(core,Sec1,RAS,DecS,RA,Dec,EclLon,false);
-				Temp1 = EclLon; //Lambda(RA,Dec,RAS,DecS);
-				getSunMoonCoords(core,Sec2,RAS,DecS,RA,Dec,EclLon,false);
-				Temp2 = EclLon; //Lambda(RA,Dec,RAS,DecS);
+				getSunMoonCoords(core,Sec1,raSun,decSun,ra,dec,eclLon,false);
+				Temp1 = eclLon; //Lambda(RA,Dec,RAS,DecS);
+				getSunMoonCoords(core,Sec2,raSun,decSun,ra,dec,eclLon,false);
+				Temp2 = eclLon; //Lambda(RA,Dec,RAS,DecS);
 
 
 				for (int i=0; i<100; i++) // A limit of 100 iterations.
 				{
-                                        Phase1 = (Sec2-Sec1)/(Temp1-Temp2)*Temp1+Sec1;
-					getSunMoonCoords(core,Phase1,RAS,DecS,RA,Dec,EclLon,false);
-
-                                        if (Temp1*EclLon < 0.0) 
+					Phase1 = (Sec2-Sec1)/(Temp1-Temp2)*Temp1+Sec1;
+					getSunMoonCoords(core,Phase1,raSun,decSun,ra,dec,eclLon,false);
+					
+					if (Temp1*eclLon < 0.0) 
 					{
 						Sec2 = Phase1;
-						Temp2 = EclLon;
+						Temp2 = eclLon;
 					} else {
 						Sec1 = Phase1;
-						Temp1 = EclLon;
+						Temp1 = eclLon;
 
 					};
 
@@ -1509,23 +1549,23 @@
 			double LocalNext = nextFullMoon+GMTShift+0.5;
 			double intMoon;
 			double LocalTMoon = 24.*modf(LocalPrev,&intMoon);
-			StelUtils::getDateFromJulianDay(intMoon,&fullYear,&fullMonth,&fullDay);
+			StelUtils::getDateFromJulianDay(intMoon, &fullYear, &fullMonth, &fullDay);
 			double2hms(toUnsignedRA(LocalTMoon),fullHour,fullMinute,fullSecond);
 			if (getDateFormat())
-				bestNight = msgPrevFullMoon.arg(fullDay).arg(months[fullMonth-1]).arg(fullHour).arg(fullMinute,2,10,QLatin1Char('0'));
+				lineBestNight = msgPrevFullMoon.arg(fullDay).arg(monthNames[fullMonth-1]).arg(fullHour).arg(fullMinute,2,10,QLatin1Char('0'));
 			else
-				bestNight = msgPrevFullMoon.arg(months[fullMonth-1]).arg(fullDay).arg(fullHour).arg(fullMinute,2,10,QLatin1Char('0'));
+				lineBestNight = msgPrevFullMoon.arg(monthNames[fullMonth-1]).arg(fullDay).arg(fullHour).arg(fullMinute,2,10,QLatin1Char('0'));
 
 			LocalTMoon = 24.*modf(LocalNext,&intMoon);
 			StelUtils::getDateFromJulianDay(intMoon,&fullYear,&fullMonth,&fullDay);
 			double2hms(toUnsignedRA(LocalTMoon),fullHour,fullMinute,fullSecond);			
 			if (getDateFormat())
-				bestNight += msgNextFullMoon.arg(fullDay).arg(months[fullMonth-1]).arg(fullHour).arg(fullMinute,2,10,QLatin1Char('0'));
+				lineBestNight += msgNextFullMoon.arg(fullDay).arg(monthNames[fullMonth-1]).arg(fullHour).arg(fullMinute,2,10,QLatin1Char('0'));
 			else
-				bestNight += msgNextFullMoon.arg(months[fullMonth-1]).arg(fullDay).arg(fullHour).arg(fullMinute,2,10,QLatin1Char('0'));
+				lineBestNight += msgNextFullMoon.arg(monthNames[fullMonth-1]).arg(fullDay).arg(fullHour).arg(fullMinute,2,10,QLatin1Char('0'));
 
-			ObsRange = ""; 
-			AcroCos = "";
+			lineObservableRange.clear(); 
+			lineAcroCos.clear();
 
 
 	// Now, compute the days of all the Full Moons of the current year, and get the Earth/Moon distance:
@@ -1553,22 +1593,22 @@
 //			ObsRange = q_("Greatest Full Moon: %1 "+months[fullMonth-1]+" (%2% of Moon at Perilune)").arg(fullDay).arg(MoonSize,0,'f',2);
 		};
 	} 
-	else if (Kind <3)
+	else if (bodyType <3)
 	{
-		bestNight = "";
-		ObsRange = ""; 
-		AcroCos = "";
-
+		lineBestNight.clear();
+		lineObservableRange.clear(); 
+		lineAcroCos.clear();
 	}; 
 
 
 // Return the Moon and Earth to its current position:
-	if (Kind<3)
-	{
-		getSunMoonCoords(core,myJD,RAS,DecS,RA,Dec,EclLon,true);
-	} else
-	{
-                getPlanetCoords(core,myJD,RA,Dec,true);
+	if (bodyType<3)
+	{
+		getSunMoonCoords(core, myJD, raSun, decSun, ra, dec, eclLon, true);
+	}
+	else
+	{
+		getPlanetCoords(core, myJD, ra, dec, true);
 	};
 
 
@@ -1588,38 +1628,17 @@
 	return true;
 }
 
-void Observability::restoreDefaults(void)
-{
-	restoreDefaultConfigIni();
-	readSettingsFromConfig();
-}
-
-void Observability::restoreDefaultConfigIni(void)
-{
+void Observability::resetConfiguration()
+{
+	// Remove the plug-in's group from the configuration,
+	// after that it will be loaded with default values.
 	QSettings* conf = StelApp::getInstance().getSettings();
-
-	conf->beginGroup("Observability");
-
-	// delete all existing settings...
-	conf->remove("");
-
-	// Set defaults
-	conf->setValue("font_size", 15);
-	conf->setValue("Sun_Altitude", 12);
-	conf->setValue("Horizon_Altitude", 0);
-	conf->setValue("font_color", "0,0.5,1");
-	conf->setValue("show_AcroCos", true);
-	conf->setValue("show_Good_Nights", true);
-	conf->setValue("show_Best_Night", true);
-	conf->setValue("show_Today", true);
-	conf->setValue("show_FullMoon", true);
-//	conf->setValue("show_Crescent", true);
-//	conf->setValue("show_SuperMoon", true);
-
-	conf->endGroup();
+	Q_ASSERT(conf);
+	conf->remove("Observability");
+	loadConfiguration();
 }
 
-void Observability::readSettingsFromConfig(void)
+void Observability::loadConfiguration()
 {
 	QSettings* conf = StelApp::getInstance().getSettings();
 
@@ -1637,25 +1656,37 @@
 //	show_Crescent = conf->value("show_Crescent", true).toBool();
 //	show_SuperMoon = conf->value("show_SuperMoon", true).toBool();
 
-	iAltitude = conf->value("Sun_Altitude", 12).toInt();
-	AstroTwiAlti  = -((double)iAltitude)/Rad2Deg ;
+	// For backwards compatibility, the value of this key is stored with
+	// inverted sign.
+	// TODO: Skip the sign inversion when the key is changed.
+	int altitude = -(conf->value("Sun_Altitude", 12).toInt());
+	setTwilightAltitude(altitude); 
 
-	iHorizAltitude = conf->value("Horizon_Altitude", 0).toInt();
-	HorizAlti = ((double)iHorizAltitude)/Rad2Deg ;
+	altitude = conf->value("Horizon_Altitude", 0).toInt();
+	setHorizonAltitude(altitude);
 	
-
 	conf->endGroup();
+	
+	// Load date format from main settings.
+	// TODO: Handle date format properly.
+	if (conf->value("localization/date_display_format", "system_default").toString() == "ddmmyyyy")
+		setDateFormat(true);
+	else
+		setDateFormat(false);
 }
 
-void Observability::saveSettingsToConfig(void)
+void Observability::saveConfiguration()
 {
 	QSettings* conf = StelApp::getInstance().getSettings();
 	QString fontColorStr = QString("%1,%2,%3").arg(fontColor[0],0,'f',2).arg(fontColor[1],0,'f',2).arg(fontColor[2],0,'f',2);
 	// Set updated values
 	conf->beginGroup("Observability");
 	conf->setValue("font_size", fontSize);
-	conf->setValue("Sun_Altitude", iAltitude);
-	conf->setValue("Horizon_Altitude", iHorizAltitude);
+	// For backwards compatibility, the value of this key is stored with
+	// inverted sign.
+	// TODO: Skip the sign inversion when the key is changed.
+	conf->setValue("Sun_Altitude", -twilightAltDeg);
+	conf->setValue("Horizon_Altitude", horizonAltDeg);
 	conf->setValue("font_color", fontColorStr);
 	conf->setValue("show_AcroCos", show_AcroCos);
 	conf->setValue("show_Good_Nights", show_Good_Nights);
@@ -1667,20 +1698,33 @@
 	conf->endGroup();
 }
 
-
-
-void Observability::setShow(int output, bool setVal)
-{
-	switch(output)
-	{
-		case 1: {show_Today = setVal; break;}
-		case 2: {show_AcroCos = setVal; break;}
-		case 3: {show_Good_Nights = setVal; break;}
-		case 4: {show_Best_Night = setVal; break;}
-		case 5: {show_FullMoon = setVal; nextFullMoon=0.0; prevFullMoon=0.0; break;}
-//		case 6: {show_Crescent = setVal; break;}
-//		case 7: {show_SuperMoon = setVal; break;}
-	};
+void Observability::enableTodayField(bool enabled)
+{
+	show_Today = enabled;
+	configChanged = true;
+}
+
+void Observability::enableAcroCosField(bool enabled)
+{
+	show_AcroCos = enabled;
+	configChanged = true;
+}
+
+void Observability::enableGoodNightsField(bool enabled)
+{
+	show_Good_Nights = enabled;
+	configChanged = true;
+}
+
+void Observability::enableOppositionField(bool enabled)
+{
+	show_Best_Night = enabled;
+	configChanged = true;
+}
+
+void Observability::enableFullMoonField(bool enabled)
+{
+	show_FullMoon = enabled;
 	configChanged = true;
 }
 
@@ -1710,52 +1754,44 @@
 	return fontSize;
 }
 
-int Observability::getSunAltitude(void)
-{
-	return iAltitude;
-}
-
-int Observability::getHorizAltitude(void)
-{
-	return iHorizAltitude;
-}
-
-
-void Observability::setFontColor(int color, int value)
-{
-	float fValue = (float)(value) / 100.; 
-	fontColor[color] = fValue;
-}
-
-void Observability::setFontSize(int value)
-{
-	fontSize = value;
-}
-
-void Observability::setSunAltitude(int value)
-{
-	AstroTwiAlti  = -((double) value)/Rad2Deg ;
-	iAltitude = value;
-	configChanged = true;
-}
-
-void Observability::setHorizAltitude(int value)
-{
-	HorizAlti = ((double) value)/Rad2Deg ;
-	iHorizAltitude = value;
-	configChanged = true;
-}
-
-
-///  END OF STUFF FOR THE GUI CONFIG.
-///////////////////////////////
-
-
-
-
-// Enable the Observability:
-void Observability::enableObservability(bool b)
-{
-	flagShowObservability = b;
+int Observability::getTwilightAltitude()
+{
+	return twilightAltDeg;
+}
+
+int Observability::getHorizonAltitude()
+{
+	return horizonAltDeg;
+}
+
+
+void Observability::setFontColor(const Vec3f& color)
+{
+	fontColor = color; // Vector3::operator =() is overloaded. :)
+}
+
+void Observability::setFontSize(int size)
+{
+	fontSize = size;
+}
+
+void Observability::setTwilightAltitude(int altitude)
+{
+	twilightAltRad  = ((double) altitude)/Rad2Deg ;
+	twilightAltDeg = altitude;
+	configChanged = true;
+}
+
+void Observability::setHorizonAltitude(int altitude)
+{
+	horizonAltitude = ((double) altitude)/Rad2Deg ;
+	horizonAltDeg = altitude;
+	configChanged = true;
+}
+
+
+void Observability::showReport(bool b)
+{
+	flagShowReport = b;
 }
 
 
=== modified file 'plugins/Observability/src/Observability.hpp'
--- plugins/Observability/src/Observability.hpp	2013-09-11 09:43:19 +0000
+++ plugins/Observability/src/Observability.hpp	2014-04-04 19:38:38 +0000
@@ -30,10 +30,23 @@
 class StelButton;
 class ObservabilityDialog;
 
+//! Main class of the %Observability Analysis plug-in.
+//! It provides an observability report for the currently selected object,
+//! or for the point in the center of the screen if no object is selected.
+//! The output is drawn directly onto the viewport. The color and font size can
+//! be selected by the user from the plug-in's configuration window.
+//! @see ObservabilityDialog
+//! @todo Find a way to (optionally) put the report in the upper left corner
+//! infobox.
+//! @todo Decide whether to use flags or separate getters/setters to communicate
+//! with the configuration window; if using flags, implement them properly w Qt.
+//! @todo Handle re-loading of the Solar System at runtime.
+//! @todo For each suspicious member variable, check if it can't be actually
+//! a local variable.
 class Observability : public StelModule
 {
 	Q_OBJECT
-	Q_PROPERTY(bool enabled READ getEnableObservability WRITE enableObservability)
+	Q_PROPERTY(bool flagShowReport READ isShownReport WRITE showReport)
 public:
 	Observability();
 	virtual ~Observability();
@@ -42,39 +55,14 @@
 	virtual void draw(StelCore* core);
 	virtual double getCallOrder(StelModuleActionName actionName) const;
 
-
 	//! Implement this to tell the main Stellarium GUI that there is a GUI element to configure this plugin.
 	virtual bool configureGui(bool show=true);
 
 
-	//! Set up the plugin with default values.
-	void restoreDefaults(void);
-	void restoreDefaultConfigIni(void);
-
-	//! Read (or re-read) settings from the main config file.  This will be called from init and also
-	//! when restoring defaults (i.e. from the configuration dialog / restore defaults button).
-	void readSettingsFromConfig(void);
-
-	//! Save the settings to the main configuration file.
-	void saveSettingsToConfig(void);
-
-	//! Set which output is shown.
-	//! @param output is the index of the output (e.g., 1 for today's ephemeris, 5 for Full Moon).
-	//! @param show is a boolean (true to show the output; false to hide it).
-	void setShow(int output, bool show);
-
-	//! Set the font colors. Color is (0,1,2) for (R,G,B):
-	void setFontColor(int Color, int Value);
-
-	//! Set the font size:
-	void setFontSize(int);
-
-	//! Set the Sun altitude at twilight:
-	void setSunAltitude(int);
-
-	//! Set the Sun altitude at twilight:
-	void setHorizAltitude(int);
-
+	//! Read (or re-read) settings from the main config file.
+	//! Default values are provided for all settings.
+	//! Called in init() and resetConfiguration().
+	void loadConfiguration();
 
 	//! get Show Flags from current configuration:
 	bool getShowFlags(int);
@@ -85,55 +73,107 @@
 	//! get current font size:
 	int getFontSize(void);
 
-	//! get current Sun altitude at twilight:
-	int getSunAltitude(void);
-
-	//! get current Horizon altitude:
-	int getHorizAltitude(void);
-
-	bool getEnableObservability() const {return flagShowObservability;}
+	//! Get the user-defined Sun altitude at twilight.
+	//! @returns A value in degrees.
+	int getTwilightAltitude();
+
+	//! Get the user-defined altitude of the visual horizon.
+	int getHorizonAltitude();
+
+	bool isShownReport() const {return flagShowReport;}
 public slots:
-//! Set whether observability will execute or not:
-	void enableObservability(bool b);
-
+	//! Restore and reload the default plug-in settings.
+	void resetConfiguration();
+	//! Save the plug-in's configuration to the main configuration file.
+	void saveConfiguration();
+	
+	//! @name Fields displayed in the observability report.
+	//! @{
+	
+	//! Display today's events (rise, set and transit times).
+	void enableTodayField(bool enabled = true);
+	//! Display acronychal and cosmical rising/setting.
+	void enableAcroCosField(bool enabled = true);
+	//! Display nights when the object is above the horizon after darkness.
+	void enableGoodNightsField(bool enabled = true);
+	//! Display when selected object is in opposition.
+	void enableOppositionField(bool enabled = true);
+	//! Display date of the full moon.
+	//! Has any effect only if the Moon is selected.
+	void enableFullMoonField(bool enabled = true);
+	//! @}
+	
+	
+	//! Set the color of the font used to display the report.
+	//! Applies only to what is drawn on the viewport.
+	//! @param color Color vector in Stellarium's RGB format.
+	void setFontColor(const Vec3f& color);
+	//! Set the size of the font used to display the report.
+	//! Applies only to what is drawn on the viewport.
+	void setFontSize(int size);
+
+	//! Set the angular altitude below the horizon of the Sun at twilight.
+	//! This determines the boundaries of day/night for observation purposes.
+	//! @param altitude An angle in degrees; as this is altitude below
+	//! the horizon, it should be negative.
+	//! @note If you want the slider in the configuration dialog to be inverted,
+	//! you can use the @c invertedAppearance property of QSlider.
+	//! @todo Check if parameter is in the acceptable range?
+	void setTwilightAltitude(int altitude);
+
+	//! Set the angular altitude of the visual horizon.
+	//! @param altitude An angle in degrees.
+	//! @todo Check if parameter is in the acceptable range?
+	void setHorizonAltitude(int altitude);
+	
+	//! Controls whether an observability report will be displayed.
+	void showReport(bool b);
+
+	
 private slots:
+	//! Retranslates the user-visible strings when the language is changed. 
 	void updateMessageText();
 
+	
 private:
-
-
-//! Stuff for the configuration GUI:
+	//! Configuration window.
 	ObservabilityDialog* configDialog;
-	QByteArray normalStyleSheet;
-	QByteArray nightStyleSheet;
 
 	void setDateFormat(bool b) { dmyFormat=b; }
 	bool getDateFormat(void) { return dmyFormat; }
 
 //! Computes the Hour Angle (culmination=0h) in absolute value (from 0h to 12h).
+//! @todo The hour angle of what, exactly? --BM
 //! @param latitude latitude of the observer (in radians).
 //! @param elevation elevation angle of the object (horizon=0) in radians.
 //! @param declination declination of the object in radians. 
-	virtual double HourAngle(double latitude,double elevation,double declination);
+	double calculateHourAngle(double latitude,
+	                          double elevation,
+	                          double declination);
 
 //! Computes the Hour Angle for a given Right Ascension and Sidereal Time.
 //! @param RA right ascension (hours).
 //! @param ST sidereal time (degrees).
-	virtual double HourAngle2(double RA, double ST);
+	double HourAngle2(double RA, double ST);
 
-//! Solves Moon/Sun/Planet Rise/Set/Transit times for the current Julian day. This function updates the variables MoonRise, MoonSet, MoonCulm. Returns success status.
-//! @param Kind is 1 for Sun, 2 for Moon, 3 for Solar-System planet.
-	virtual bool SolarSystemSolve(StelCore* core, int Kind);
+//! Solves Moon/Sun/Planet Rise/Set/Transit times for the current Julian day.
+//! This function updates the variables MoonRise, MoonSet, MoonCulm.
+//! Returns success status.
+//! @param[in] bodyType is 1 for Sun, 2 for Moon, 3 for Solar System object.
+	bool calculateSolarSystemEvents(StelCore* core, int bodyType);
 
 //! Finds the heliacal rise/set dates of the year for the currently-selected object.
-//! @param Rise day of year of the Acronycal rise.
-//! @param Set day of year of the Acronycal set.
-//! @param Rise2 day of year of the Cosmical rise.
-//! @param Set2 day of year of the Cosmical set.
-	virtual int CheckAcro(int &Rise, int &Set, int &Rise2, int &Set2);
-
-
-//! computes the Sun or Moon coordinates at a given Julian date.
+//! @param[out] acroRise day of year of the Acronycal rise.
+//! @param[out] acroSet day of year of the Acronycal set.
+//! @param[out] cosRise day of year of the Cosmical rise.
+//! @param[out] cosSet day of year of the Cosmical set.
+//! @returns 0 if no dates found, 1 if acronycal dates exist,
+//! 2 if cosmical dates exist, and 3 if both are found.
+	int calculateAcroCos(int& acroRise, int& acroSet,
+	                     int& cosRise, int& cosSet);
+
+
+//! Computes the Sun or Moon coordinates at a given Julian date.
 //! @param core the stellarium core.
 //! @param JD double for the Julian date.
 //! @param RASun right ascension of the Sun (in hours).
@@ -142,7 +182,10 @@
 //! @param DecMoon idem for the Moon.
 //! @param EclLon is the module of the vector product of Heliocentric Ecliptic Coordinates of Sun and Moon (projected over the Ecliptic plane). Useful to derive the dates of Full Moon.
 //! @param getBack controls whether Earth and Moon must be returned to their original positions after computation.
-	virtual void getSunMoonCoords(StelCore* core, double JD, double &RASun, double &DecSun, double &RAMoon, double &DecMoon, double &EclLon, bool getBack);
+	void getSunMoonCoords(StelCore* core, double jd,
+	                      double& raSun, double& decSun,
+	                      double& raMoon, double& decMoon,
+	                      double& eclLon, bool getBack);
 
 
 //! computes the selected-planet coordinates at a given Julian date.
@@ -151,73 +194,103 @@
 //! @param RA right ascension of the planet (in hours).
 //! @param Dec declination of the planet (in radians).
 //! @param getBack controls whether the planet must be returned to its original positions after computation.
-	virtual void getPlanetCoords(StelCore* core, double JD, double &RA, double &Dec, bool getBack);
+	void getPlanetCoords(StelCore* core, double JD, double &RA, double &Dec, bool getBack);
 
-//! Comptues the Earth-Moon distance (in AU) at a given Julian date. The parameters are similar to those of getSunMoonCoords or getPlanetCoords.
-	virtual void getMoonDistance(StelCore* core, double JD, double &Distance, bool getBack);
+//! Comptues the Earth-Moon distance (in AU) at a given Julian date.
+//! The parameters are similar to those of getSunMoonCoords or getPlanetCoords.
+	void getMoonDistance(StelCore* core,
+	                     double jd,
+	                     double& distance,
+	                     bool getBack);
 
 //! Returns the angular separation (in radians) between two points.
 //! @param RA1 right ascension of point 1 (in hours)
 //! @param Dec1 declination of point 1 (in radians)
 //! @param RA2 idem for point 2
 //! @param Dec2 idem for point 2
-	virtual double Lambda(double RA1, double Dec1, double RA2, double Dec2);
+	double Lambda(double RA1, double Dec1, double RA2, double Dec2);
 
 //! Converts a time span in hours (given as double) in hh:mm:ss (integers).
 //! @param t time span (double, in hours).
 //! @param h hour (integer).
 //! @param m minute (integer).
 //! @param s second (integer).
-	virtual void double2hms(double t, int &h,int &m,int &s);
+	void double2hms(double t, int &h,int &m,int &s);
 
 //! Just returns the sign of a double;
-	virtual double sign(double d);
-
-//! Returns a string of date (e.g. "25 Apr") from a Day of Year (integer).
-//! @param DoY Day of the year.
-	virtual QString CalenDate(int DoY);
-
-//! Returns a string of range dates (e.g. "25 Apr - 10 May") from a two Days of Year (integer).
-//! @param fDoY first Day of the year.
-//! @param sDoY second Day of the year.
-	virtual QString RangeCalenDates(int fDoY, int sDoY);
+	double sign(double d);
+
+//! Get a date string ("25 Apr") from an ordinal date (Xth day of the year).
+//! @param dayNumber The ordinal number of a day of the year. (For example,
+//! 25 April is the 115 or 116 day of the year.)
+//! @todo Determine the exact format - leap year handling, etc.
+	QString formatAsDate(int dayNumber);
+
+//! Get a date range string ("25 Apr - 10 May") from two ordinal dates.
+//! @see formatAsDate()
+//! @param startDay number of the first day in the period.
+//! @param endDay number of the last day in the period.
+	QString formatAsDateRange(int startDay, int endDay);
 
 //! Just subtracts/adds 24h to a RA (or HA), to make it fall within 0-24h.
 //! @param RA right ascension (in hours).
-	virtual double toUnsignedRA(double RA);
+	double toUnsignedRA(double RA);
 
-//! Computes the RA, Dec and Rise/Set Sid. times of the selected planet for each day of the current year.
+//! Prepare arrays with data for the selected object for each day of the year.
+//! Computes the RA, Dec and rise/set sidereal times of the selected planet
+//! for each day of the current year.
 //! @param core the current Stellarium core.
-	virtual void PlanetRADec(StelCore *core);
+	void updatePlanetData(StelCore* core);
 
 //! Computes the Sun's RA and Dec for each day of a given year.
 //! @param core current Stellarium core.
-	virtual void SunRADec(StelCore* core);
+	void updateSunData(StelCore* core);
 
 //! Computes the Sun's Sid. Times at astronomical twilight (for each year's day)
-	virtual void SunHTwi();
-
-//! Just convert the Vec3d named TempLoc into RA/Dec:
-	virtual void toRADec(Vec3d TempLoc, double &RA, double &Dec);
-
-//! Vector to store the Julian Dates for the current year:
+	void updateSunH();
+
+	//! Convert an equatorial position vector to RA/Dec.
+	void toRADec(Vec3d vec3d, double& ra, double& dec);
+
+	//! Table containing the Julian Dates of the days of the current year.
 	double yearJD[366];
 
-//! Check if a source is observable during a given date:
-//! @aparm i the day of the year.
-	virtual bool CheckRise(int i);
+//! Check if a source is observable during a given date.
+//! @param i the day of the year.
+	bool CheckRise(int day);
 
 //! Some useful constants and variables(almost self-explanatory).
-	double Rad2Deg, Rad2Hr, AstroTwiAlti, UA, TFrac, JDsec, Jan1stJD, halfpi, MoonT, nextFullMoon, prevFullMoon, RefFullMoon, GMTShift, MoonPerilune,RefracHoriz,HorizAlti;
+	double Rad2Deg, Rad2Hr, UA, TFrac, JDsec, Jan1stJD, halfpi, MoonT, nextFullMoon, prevFullMoon, RefFullMoon, GMTShift, MoonPerilune;
+	
+	//! User-defined angular altitude of astronomical twilight in radians.
+	//! See setTwilightAltitude() and getTwilightAltitude().
+	double twilightAltRad;
+	//! User-defined angular altitude of astronomical twilight in degrees.
+	//! See setTwilightAltitude() and getTwilightAltitude().
+	int twilightAltDeg;
+	
+	//! Geometric altitude at refraction-corrected horizon.
+	double refractedHorizonAlt;
+	//! User-defined angular altitude of the visual horizon in radians.
+	double horizonAltitude;
+	//! User-defined angular altitude of the visual horizon in degrees.
+	int horizonAltDeg;
 
 //! RA, Dec, observer latitude, object's elevation, and Hour Angle at horizon.
 	double selRA, selDec, mylat, mylon, alti, horizH, culmAlt, myJD;
 
 //! Vectors to store Sun's RA, Dec, and Sid. Time at twilight and rise/set.
-	double SunRA[366], SunDec[366], SunSidT[4][366];
+	double sunRA[366];
+	double sunDec[366];
+	//! Sidereal time of the Sun at twilight and rise/set through the year.
+	double sunSidT[4][366];
 
 //! Vectors to store planet's RA, Dec, and Sid. Time at rise/set.
-	double ObjectRA[366], ObjectDec[366], ObjectH0[366], ObjectSidT[2][366];
+	double objectRA[366]; 
+	double objectDec[366];
+	double objectH0[366];
+	//! Table of the sidereal time of the object's rising/setting. 
+	double objectSidT[2][366];
 
 //! Rise/Set/Transit times for the Moon at current day:
 	double MoonRise, MoonSet, MoonCulm, lastJDMoon;
@@ -226,7 +299,7 @@
 	Vec3d EarthPos[366];
 
 //! Position of the observer relative to the Earth Center or other coordinates:
-	Vec3d ObserverLoc, Pos0, Pos1, Pos2, RotObserver; //, Pos3;
+	Vec3d ObserverLoc, Pos1, Pos2, RotObserver; //, Pos3;
 
 //! Matrix to transform coordinates for Sun/Moon ephemeris:
 	Mat4d LocTrans;
@@ -237,44 +310,65 @@
 	Planet* myPlanet;
 
 
-//! Current simulation year and number of days in the year.;
-	int currYear, nDays, iAltitude, iHorizAltitude;
+	//! Current simulation year.
+	int curYear;
+	//! Days in the current year (366 on leap years).
+	int nDays;
 
-//! Useful auxiliary strings, to help checking changes in source/observer. Also to store results that must survive between iterations.
-	QString selName, bestNight, ObsRange, objname, AcroCos;
+	//! Untranslated name of the currently selected object.
+	//! Used to check if the selection has changed.
+	QString selName;
+	//! Cached copy of the "best night" line in the report.
+	QString lineBestNight;
+	//! Cached copy of the line reporting when the target is observable.
+	QString lineObservableRange;
+	//! Cached copy of the line reporting the acronical/cosmical rise and set.
+	QString lineAcroCos;
 
 //! Strings to save ephemeris Times:
 	QString RiseTime, SetTime, CulmTime;
 
-//! Just the names of the months.
-	QString months[12];
+	//! Just the names of the months.
+	QStringList monthNames;
 
-//! Using for storage date format [i18n]
+	//! Using for storage date format [i18n]
 	bool dmyFormat;
 
 //! Equatorial and local coordinates of currently-selected source.
 	Vec3d EquPos, LocPos;
 
 //! Some booleans to check the kind of source selected and the kind of output to produce.
-	bool isStar,isMoon,isSun,isScreen, raised, configChanged, souChanged;
-	int LastObject;
+	bool isStar, isMoon, isSun, isScreen;
 
-//! Some booleans to select the kind of output.
+	//! This really shouldn't be handled like this...
+	bool hasRisen;
+	bool configChanged;
+	bool souChanged;
+	//! The last object type for which calculateSolarSystemEvents() was called.
+	int lastType;
+	
+	//! @name Flags controlling report contents.
+	//! @{
 	bool show_AcroCos, show_Good_Nights, show_Best_Night, show_Today, show_FullMoon; //, show_Crescent, show_SuperMoon;
+	//! @}
 
-//! Parameters for the graphics (i.e., font, icons, etc.):
+	//! @name GUI elements
+	//! @{
+	//! Parameters for the graphics.
 	QFont font;
 	Vec3f fontColor;
-	bool flagShowObservability;
+	bool flagShowReport;
 	int fontSize;
-	QPixmap* OnIcon;
-	QPixmap* OffIcon;
-	QPixmap* GlowIcon;
-	StelButton* toolbarButton;
+	StelButton* button;
+	//! @}
 
+	//! @name Cached translated GUI strings.
+	//! @todo Decide whether to keep translation caching.
+	//! @{
 	QString msgSetsAt, msgRoseAt, msgSetAt, msgRisesAt, msgCircumpolar, msgNoRise, msgCulminatesAt, msgCulminatedAt, msgH, msgM, msgS;
-	QString msgSrcNotObs, msgNoACRise, msgGreatElong, msgLargSSep, msgAtDeg, msgNone, msgAcroRise, msgNoAcroRise, msgCosmRise, msgNoCosmRise;
+	QString msgSrcNotObs, msgNoACRise, msgGreatElong, msgLargSSep, msgNone, msgAcroRise, msgNoAcroRise, msgCosmRise, msgNoCosmRise;
 	QString msgWholeYear, msgNotObs, msgAboveHoriz, msgToday, msgThisYear, msgPrevFullMoon, msgNextFullMoon;
+	//! @}
 
 };
 
 
=== modified file 'plugins/Observability/src/gui/ObservabilityDialog.cpp'
--- plugins/Observability/src/gui/ObservabilityDialog.cpp	2014-03-01 15:42:49 +0000
+++ plugins/Observability/src/gui/ObservabilityDialog.cpp	2014-04-04 19:38:38 +0000
@@ -52,6 +52,7 @@
 	{
 		ui->retranslateUi(dialog);
 		setAboutHtml();
+		updateControls(); // Also re-translate the dynamic slider labels
 	}
 }
 
@@ -60,27 +61,55 @@
 {
 	ui->setupUi(dialog);
 	ui->tabs->setCurrentIndex(0);
-	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
+	connect(&StelApp::getInstance(),
+	        SIGNAL(languageChanged()), this, SLOT(retranslate()));
 
+	Observability* plugin = GETSTELMODULE(Observability);
+	
 	// Settings:
-	connect(ui->Today, SIGNAL(stateChanged(int)), this, SLOT(setTodayFlag(int)));
-	connect(ui->AcroCos, SIGNAL(stateChanged(int)), this, SLOT(setAcroCosFlag(int)));
-	connect(ui->Opposition, SIGNAL(stateChanged(int)), this, SLOT(setOppositionFlag(int)));
-	connect(ui->Goods, SIGNAL(stateChanged(int)), this, SLOT(setGoodDatesFlag(int)));
-	connect(ui->FullMoon, SIGNAL(stateChanged(int)), this, SLOT(setFullMoonFlag(int)));
-//	connect(ui->Crescent, SIGNAL(stateChanged(int)), this, SLOT(setCrescentMoonFlag(int)));
-//	connect(ui->SuperMoon, SIGNAL(stateChanged(int)), this, SLOT(setSuperMoonFlag(int)));
+	
+	// clicked() is called only when the user makes an input,
+	// so we avoid an endless loop when setting the value in updateControls().
+	connect(ui->todayCheckBox, SIGNAL(clicked(bool)),
+	        plugin, SLOT(enableTodayField(bool)));
+	connect(ui->acroCosCheckBox, SIGNAL(clicked(bool)),
+	        plugin, SLOT(enableAcroCosField(bool)));
+	connect(ui->oppositionCheckBox, SIGNAL(clicked(bool)),
+	        plugin, SLOT(enableOppositionField(bool)));
+	connect(ui->goodNightsCheckBox, SIGNAL(clicked(bool)),
+	        plugin, SLOT(enableGoodNightsField(bool)));
+	connect(ui->fullMoonCheckBox, SIGNAL(clicked(bool)),
+	        plugin, SLOT(enableFullMoonField(bool)));
 
-	connect(ui->Red, SIGNAL(sliderMoved(int)), this, SLOT(setRed(int)));
-	connect(ui->Green, SIGNAL(sliderMoved(int)), this, SLOT(setGreen(int)));
-	connect(ui->Blue, SIGNAL(sliderMoved(int)), this, SLOT(setBlue(int)));
-	connect(ui->fontSize, SIGNAL(sliderMoved(int)), this, SLOT(setSize(int)));
-	connect(ui->SunAltitude, SIGNAL(sliderMoved(int)), this, SLOT(setAltitude(int)));
-	connect(ui->HorizAltitude, SIGNAL(sliderMoved(int)), this, SLOT(setHorizon(int)));
+	connect(ui->redSlider, SIGNAL(sliderMoved(int)),
+	        this, SLOT(setColor()));
+	connect(ui->greenSlider, SIGNAL(sliderMoved(int)),
+	        this, SLOT(setColor()));
+	connect(ui->blueSlider, SIGNAL(sliderMoved(int)),
+	        this, SLOT(setColor()));
+	
+	// Isn't valueChanged() better? But then we'll have to block
+	// signlas when settting the slider values.
+	connect(ui->fontSize, SIGNAL(sliderMoved(int)),
+	        plugin, SLOT(setFontSize(int)));
+	connect(ui->sunAltitudeSlider, SIGNAL(sliderMoved(int)),
+	        plugin, SLOT(setTwilightAltitude(int)));
+	connect(ui->sunAltitudeSlider, SIGNAL(sliderMoved(int)),
+	        this, SLOT(updateAltitudeLabel(int)));
+	connect(ui->horizonAltitudeSlider, SIGNAL(sliderMoved(int)),
+	        plugin, SLOT(setHorizonAltitude(int)));
+	connect(ui->horizonAltitudeSlider, SIGNAL(sliderMoved(int)),
+	        this, SLOT(updateHorizonLabel(int)));
 
 	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
-	connect(ui->restoreDefaultsButton, SIGNAL(clicked()), this, SLOT(restoreDefaults()));
-	connect(ui->saveSettingsButton, SIGNAL(clicked()), this, SLOT(saveSettings()));
+	connect(ui->restoreDefaultsButton, SIGNAL(clicked()),
+	        plugin, SLOT(resetConfiguration()));
+	// TODO: The plug-in should emit a signal when settings are changed.
+	// This works, because slots are called in the order they were connected.
+	connect(ui->restoreDefaultsButton, SIGNAL(clicked()),
+	        this, SLOT(updateControls()));
+	connect(ui->saveSettingsButton, SIGNAL(clicked()),
+	        plugin, SLOT(saveConfiguration()));
 
 	// About tab
 	setAboutHtml();
@@ -88,8 +117,7 @@
 	Q_ASSERT(gui);
 	ui->aboutTextBrowser->document()->setDefaultStyleSheet(QString(gui->getStelStyle().htmlStyleSheet));
 
-	updateGuiFromSettings();
-
+	updateControls();
 }
 
 void ObservabilityDialog::setAboutHtml(void)
@@ -118,121 +146,59 @@
 	ui->aboutTextBrowser->setHtml(html);
 }
 
-
-void ObservabilityDialog::restoreDefaults(void)
-{
-	qDebug() << "Observability::restoreDefaults";
-	GETSTELMODULE(Observability)->restoreDefaults();
-	GETSTELMODULE(Observability)->readSettingsFromConfig();
-	updateGuiFromSettings();
-}
-
-void ObservabilityDialog::updateGuiFromSettings(void)
-{
-	ui->Today->setChecked(GETSTELMODULE(Observability)->getShowFlags(1));
-	ui->AcroCos->setChecked(GETSTELMODULE(Observability)->getShowFlags(2));
-	ui->Goods->setChecked(GETSTELMODULE(Observability)->getShowFlags(3));
-	ui->Opposition->setChecked(GETSTELMODULE(Observability)->getShowFlags(4));
-	ui->FullMoon->setChecked(GETSTELMODULE(Observability)->getShowFlags(5));
+void ObservabilityDialog::updateControls()
+{
+	Observability* plugin = GETSTELMODULE(Observability);
+	
+	ui->todayCheckBox->setChecked(plugin->getShowFlags(1));
+	ui->acroCosCheckBox->setChecked(plugin->getShowFlags(2));
+	ui->goodNightsCheckBox->setChecked(plugin->getShowFlags(3));
+	ui->oppositionCheckBox->setChecked(plugin->getShowFlags(4));
+	ui->fullMoonCheckBox->setChecked(plugin->getShowFlags(5));
 //	ui->Crescent->setChecked(GETSTELMODULE(Observability)->getShowFlags(6));
 //	ui->SuperMoon->setChecked(GETSTELMODULE(Observability)->getShowFlags(7));
 
-	Vec3f currFont = GETSTELMODULE(Observability)->getFontColor();
-	int Rv = (int)(100.*currFont[0]);
-	int Gv = (int)(100.*currFont[1]);
-	int Bv = (int)(100.*currFont[2]);
-	ui->Red->setValue(Rv);
-	ui->Green->setValue(Gv);
-	ui->Blue->setValue(Bv);
-	ui->fontSize->setValue(GETSTELMODULE(Observability)->getFontSize());
-	int SAlti = GETSTELMODULE(Observability)->getSunAltitude();
-	ui->SunAltitude->setValue(SAlti);
-	ui->AltiText->setText(QString("%1 -%2 %3").arg(q_("Sun altitude at twilight:")).arg(SAlti).arg(q_("deg.")));
-
-	SAlti = GETSTELMODULE(Observability)->getHorizAltitude();
-	ui->HorizAltitude->setValue(SAlti);
-	ui->HorizText->setText(QString("%1 %2 %3").arg(q_("Horizon altitude:")).arg(SAlti).arg(q_("deg.")));
-
-}
-
-void ObservabilityDialog::saveSettings(void)
-{
-	GETSTELMODULE(Observability)->saveSettingsToConfig();
-}
-
-void ObservabilityDialog::setTodayFlag(int checkState)
-{
-	bool b = checkState != Qt::Unchecked;
-	GETSTELMODULE(Observability)->setShow(1,b);
-}
-
-void ObservabilityDialog::setAcroCosFlag(int checkState)
-{
-	bool b = checkState != Qt::Unchecked;
-	GETSTELMODULE(Observability)->setShow(2,b);
-}
-
-void ObservabilityDialog::setGoodDatesFlag(int checkState)
-{
-	bool b = checkState != Qt::Unchecked;
-	GETSTELMODULE(Observability)->setShow(3,b);
-}
-
-void ObservabilityDialog::setOppositionFlag(int checkState)
-{
-	bool b = checkState != Qt::Unchecked;
-	GETSTELMODULE(Observability)->setShow(4,b);
-}
-
-void ObservabilityDialog::setFullMoonFlag(int checkState)
-{
-	bool b = checkState != Qt::Unchecked;
-	GETSTELMODULE(Observability)->setShow(5,b);
-}
-
-//void ObservabilityDialog::setCrescentMoonFlag(int checkState)
-//{
-//	bool b = checkState != Qt::Unchecked;
-//	GETSTELMODULE(Observability)->setShow(6,b);
-//}
-
-//void ObservabilityDialog::setSuperMoonFlag(int checkState)
-//{
-//	bool b = checkState != Qt::Unchecked;
-//	GETSTELMODULE(Observability)->setShow(7,b);
-//}
-
-void ObservabilityDialog::setRed(int Value)
-{
-	GETSTELMODULE(Observability)->setFontColor(0,Value);
-}
-
-void ObservabilityDialog::setGreen(int Value)
-{
-	GETSTELMODULE(Observability)->setFontColor(1,Value);
-}
-
-void ObservabilityDialog::setBlue(int Value)
-{
-	GETSTELMODULE(Observability)->setFontColor(2,Value);
-}
-
-void ObservabilityDialog::setSize(int Value)
-{
-	GETSTELMODULE(Observability)->setFontSize(Value);
-}
-
-void ObservabilityDialog::setAltitude(int Value)
-{
-	ui->AltiText->setText(QString("%1 -%2 %3").arg(q_("Sun altitude at twilight:")).arg(Value).arg(q_("deg.")));
-	GETSTELMODULE(Observability)->setSunAltitude(Value);
-}
-
-
-void ObservabilityDialog::setHorizon(int Value)
-{
-	ui->HorizText->setText(QString("%1 %2 %3").arg(q_("Horizon altitude:")).arg(Value).arg(q_("deg.")));
-	GETSTELMODULE(Observability)->setHorizAltitude(Value);
+	Vec3f fontColor = plugin->getFontColor();
+	int red = (int)(100.*fontColor[0]);
+	int green = (int)(100.*fontColor[1]);
+	int blue = (int)(100.*fontColor[2]);
+	ui->redSlider->setValue(red);
+	ui->greenSlider->setValue(green);
+	ui->blueSlider->setValue(blue);
+
+	ui->fontSize->setValue(plugin->getFontSize());
+	int sunAltitude = plugin->getTwilightAltitude();
+	ui->sunAltitudeSlider->setValue(sunAltitude);
+	updateAltitudeLabel(sunAltitude);
+	int horizonAltitude = plugin->getHorizonAltitude();
+	ui->horizonAltitudeSlider->setValue(horizonAltitude);
+	updateHorizonLabel(horizonAltitude);
+}
+
+void ObservabilityDialog::setColor()
+{
+	int red = ui->redSlider->value();
+	int green = ui->greenSlider->value();
+	int blue = ui->blueSlider->value();
+
+	float fRed = (float)(red) / 100.;
+	float fGreen = (float)(green) / 100.;
+	float fBlue = (float)(blue) / 100.;
+	
+	Vec3f color(fRed, fGreen, fBlue);
+	GETSTELMODULE(Observability)->setFontColor(color);
+}
+
+void ObservabilityDialog::updateAltitudeLabel(int altitude)
+{
+	// This allows translators to use their own conventions for degree signs.
+	ui->sunAltitudeLabel->setText(q_("Sun altitude at twilight: %1 deg.").arg(altitude));
+}
+
+void ObservabilityDialog::updateHorizonLabel(int horizon)
+{
+	// This allows translators to use their own conventions for degree signs.
+	ui->horizonAltitudeLabel->setText(q_("Horizon altitude: %1 deg.").arg(horizon));
 }
 
 
 
=== modified file 'plugins/Observability/src/gui/ObservabilityDialog.hpp'
--- plugins/Observability/src/gui/ObservabilityDialog.hpp	2013-01-17 13:17:38 +0000
+++ plugins/Observability/src/gui/ObservabilityDialog.hpp	2014-04-04 19:38:38 +0000
@@ -27,6 +27,8 @@
 
 class Ui_ObservabilityDialog;
 
+//! Configuration window of the %Observability Analysis plug-in.
+//! @see Observability
 class ObservabilityDialog : public StelDialog
 {
 	Q_OBJECT
@@ -43,28 +45,18 @@
 	void retranslate();
 
 private slots:
-	void setTodayFlag(int);