From 595430993252adf48bb2cdf2e5ea1b90a1ab86a8 Mon Sep 17 00:00:00 2001 From: mvglasow Date: Fri, 6 Nov 2015 17:14:33 +0100 Subject: Add:port_android:OSD button and command to show Android menu Signed-off-by: mvglasow --- .../android/src/org/navitproject/navit/Navit.java | 10 ++ .../src/org/navitproject/navit/NavitGraphics.java | 20 ++++ navit/attr_def.h | 1 + navit/graphics/android/graphics_android.c | 101 ++++++++++++++++- navit/osd/core/osd_core.c | 6 +- navit/xpm/Makefile.am | 1 + navit/xpm/gui_android_menu.svg | 120 +++++++++++++++++++++ navit/xslt/android.xslt | 1 + navit/xslt/osd_android.xslt | 8 ++ navit/xslt/osd_minimum.xslt | 2 +- 10 files changed, 267 insertions(+), 3 deletions(-) create mode 100644 navit/xpm/gui_android_menu.svg create mode 100644 navit/xslt/osd_android.xslt diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java index 90fcbe5eb..5449a3431 100644 --- a/navit/android/src/org/navitproject/navit/Navit.java +++ b/navit/android/src/org/navitproject/navit/Navit.java @@ -590,6 +590,16 @@ public class Navit extends Activity break; } } + + /** + * @brief Shows the Options menu. + * + * Calling this method has the same effect as pressing the hardware Menu button, where present, or touching + * the overflow button in the Action bar. + */ + public void showMenu() { + openOptionsMenu(); + } void setDestination(float latitude, float longitude, String address) { Toast.makeText( getApplicationContext(),getString(R.string.address_search_set_destination) + "\n" + address, Toast.LENGTH_LONG).show(); //TRANS diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java index 728b49878..08f4fbe3e 100644 --- a/navit/android/src/org/navitproject/navit/NavitGraphics.java +++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java @@ -32,6 +32,7 @@ import android.graphics.Paint; import android.graphics.Path; import android.graphics.PointF; import android.graphics.Rect; +import android.os.Build; import android.os.Handler; import android.os.Message; import android.util.FloatMath; @@ -41,6 +42,7 @@ import android.view.KeyEvent; import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; +import android.view.ViewConfiguration; import android.view.inputmethod.InputMethodManager; import android.widget.RelativeLayout; @@ -792,6 +794,24 @@ public class NavitGraphics private int SizeChangedCallbackID, ButtonCallbackID, MotionCallbackID, KeypressCallbackID; // private int count; + /** + * @brief Returns whether the device has a hardware menu button. + * + * Only Android versions starting with ICS (API version 14) support the API call to detect the presence of a + * Menu button. On earlier Android versions, the following assumptions will be made: On API levels up to 10, + * this method will always return {@code true}, as these Android versions relied on devices having a physical + * Menu button. On API levels 11 through 13 (Honeycomb releases), this method will always return + * {@code false}, as Honeycomb was a tablet-only release and did not require devices to have a Menu button. + */ + public boolean hasMenuButton() { + if (Build.VERSION.SDK_INT <= 10) + return true; + else if (Build.VERSION.SDK_INT <= 13) + return false; + else + return ViewConfiguration.get(activity.getApplication()).hasPermanentMenuKey(); + } + public void setSizeChangedCallback(int id) { SizeChangedCallbackID = id; diff --git a/navit/attr_def.h b/navit/attr_def.h index 2b945226c..b8217f4a7 100644 --- a/navit/attr_def.h +++ b/navit/attr_def.h @@ -253,6 +253,7 @@ ATTR(persistent) ATTR(waypoints_flag) /* toggle for "set as destination" to switch between start a new route or add */ ATTR(no_warning_if_map_file_missing) ATTR(duplicate) +ATTR(has_menu_button) ATTR2(0x0002ffff,type_int_end) ATTR2(0x00030000,type_string_begin) ATTR(type) diff --git a/navit/graphics/android/graphics_android.c b/navit/graphics/android/graphics_android.c index a543252ce..efde8358a 100644 --- a/navit/graphics/android/graphics_android.c +++ b/navit/graphics/android/graphics_android.c @@ -25,6 +25,8 @@ #include "point.h" #include "graphics.h" #include "color.h" +#include "item.h" +#include "xmlconfig.h" #include "plugin.h" #include "event.h" #include "debug.h" @@ -549,6 +551,19 @@ set_activity(jobject graphics) return 1; } +/** + * @brief Initializes a new Android graphics instance. + * + * This initializes a new Android graphics instance, which can either be the main view or an overlay. + * + * @param ret The new graphics instance + * @param parent The graphics instance that contains the new instance ({@code NULL} for the main view) + * @param p The position of the overlay in its parent ({@code NULL} for the main view) + * @param w The width of the overlay (0 for the main view) + * @param h The height of the overlay (0 for the main view) + * @param wraparound (0 for the main view) + * @param use_camera Whether to use the camera (0 for overlays) + */ static int graphics_android_init(struct graphics_priv *ret, struct graphics_priv *parent, struct point *pnt, int w, int h, int wraparound, int use_camera) { @@ -686,7 +701,7 @@ graphics_android_init(struct graphics_priv *ret, struct graphics_priv *parent, s } static jclass NavitClass; -static jmethodID Navit_disableSuspend, Navit_exit, Navit_fullscreen, Navit_runOptionsItem; +static jmethodID Navit_disableSuspend, Navit_exit, Navit_fullscreen, Navit_runOptionsItem, Navit_showMenu; static int graphics_android_fullscreen(struct window *win, int on) @@ -702,6 +717,17 @@ graphics_android_disable_suspend(struct window *win) (*jnienv)->CallVoidMethod(jnienv, android_activity, Navit_disableSuspend); } +/** + * @brief Runs an item from the Android menu. + * + * This is a callback function which implements multiple API functions. + * + * @param this The {@code graohics_prov} structure + * @param function The API function which was called + * @param in Parameters to pass to the API function + * @param out Points to a buffer which will receive a pointer to the output of the command + * @param valid + */ static void graphics_android_cmd_runMenuItem(struct graphics_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) { @@ -717,18 +743,57 @@ graphics_android_cmd_runMenuItem(struct graphics_priv *this, char *function, str (*jnienv)->CallVoidMethod(jnienv, android_activity, Navit_runOptionsItem, ncmd); } +/** + * @brief Shows the Android menu. + * + * This is the callback function associated with the {@code menu()} API function. + * + * @param this The {@code graohics_prov} structure + * @param function The API function which was called + * @param in Parameters to pass to the API function + * @param out Points to a buffer which will receive a pointer to the output of the command + * @param valid + */ +static void +graphics_android_cmd_menu(struct graphics_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) +{ + dbg(lvl_debug, "enter\n"); + (*jnienv)->CallVoidMethod(jnienv, android_activity, Navit_showMenu); +} + +/** + * The command table. Each entry consists of an API function name and the callback function which implements + * this command. + */ static struct command_table commands[] = { {"map_download_dialog",command_cast(graphics_android_cmd_runMenuItem)}, {"set_map_location",command_cast(graphics_android_cmd_runMenuItem)}, {"backup_restore_dialog",command_cast(graphics_android_cmd_runMenuItem)}, + {"menu", command_cast(graphics_android_cmd_menu)}, }; +/** + * @brief Creates a new Android graphics instance. + * + * This method is called when the graphics plugin is initialized. It creates the main view, i.e. the map view. + * Unless overlay mode is enabled, it also holds any OSD items. + * + * @param nav The navit instance. + * @param meth The methods for the new graphics instance + * @param attrs The attributes for the new graphics instance + * @param cbl The callback list for the new graphics instance + * + * @return The new graphics instance + */ static struct graphics_priv * graphics_android_new(struct navit *nav, struct graphics_methods *meth, struct attr **attrs, struct callback_list *cbl) { struct graphics_priv *ret; struct attr *attr; int use_camera=0; + jmethodID cid; + + dbg(lvl_debug, "enter\n"); if (!event_request_system("android","graphics_android")) return NULL; ret=g_new0(struct graphics_priv, 1); @@ -746,6 +811,22 @@ graphics_android_new(struct navit *nav, struct graphics_methods *meth, struct at } image_cache_hash = g_hash_table_new(g_str_hash, g_str_equal); if (graphics_android_init(ret, NULL, NULL, 0, 0, 0, use_camera)) { + cid = (*jnienv)->GetMethodID(jnienv, ret->NavitGraphicsClass, "hasMenuButton", "()Z"); + if (cid != NULL) { + attr = g_new0(struct attr, 1); + attr->type = attr_has_menu_button; + attr->u.num = (*jnienv)->CallBooleanMethod(jnienv, ret->NavitGraphics, cid); + + /* + * Although the attribute refers to information obtained by the graphics plugin, we are storing it + * with the navit object: the object is easier to access from anywhere in the program, and ultimately + * it refers to a configuration value affecting all of Navit, thus users are likely to look for it in + * the navit object (as the fact that graphics also handles input devices is not immedately obvious). + */ + navit_object_set_attr((struct navit_object *) nav, attr); + dbg(lvl_debug, "attr_has_menu_button=%d\n", attr->u.num); + g_free(attr); + } dbg(lvl_debug,"returning %p\n",ret); return ret; } else { @@ -754,6 +835,21 @@ graphics_android_new(struct navit *nav, struct graphics_methods *meth, struct at } } +/** + * @brief Creates a new overlay + * + * This method creates a graphics instance for a new overlay. If overlay mode is enabled, a separate overlay is + * created for each OSD item. + * + * @param gr The parent graphics instance, i.e. the one which will contain the overlay. + * @param meth The methods for the new graphics instance + * @param p The position of the overlay in its parent + * @param w The width of the overlay + * @param h The height of the overlay + * @param wraparound + * + * @return The graphics instance for the new overlay + */ static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound) { @@ -971,6 +1067,9 @@ event_android_new(struct event_methods *meth) Navit_runOptionsItem = (*jnienv)->GetMethodID(jnienv, NavitClass, "runOptionsItem", "(I)V"); if (Navit_runOptionsItem == NULL) return NULL; + Navit_showMenu = (*jnienv)->GetMethodID(jnienv, NavitClass, "showMenu", "()V"); + if (Navit_showMenu == NULL) + return NULL; dbg(lvl_debug,"ok\n"); *meth=event_android_methods; diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c index 56bcd2325..8166e54a2 100644 --- a/navit/osd/core/osd_core.c +++ b/navit/osd/core/osd_core.c @@ -1414,6 +1414,9 @@ osd_compass_new(struct navit *nav, struct osd_methods *meth, struct osd_button { int use_overlay; + /* FIXME: do we need navit_init_cb? It is set in two places but never read. + * osd_button_new sets it to osd_button_init (init callback), and + * osd_button_init sets it to osd_std_click (click callback). */ struct callback *draw_cb,*navit_init_cb; struct graphics_image *img; char *src_dir,*src; @@ -1513,7 +1516,7 @@ osd_button_icon_path(struct osd_button *this_, char *src) { if (!this_->src_dir) return graphics_icon_path(src); - return g_strdup_printf("%s%s%s",this_->src_dir, G_DIR_SEPARATOR_S, src); + return g_strdup_printf("%s%s%s", this_->src_dir, G_DIR_SEPARATOR_S, src); } int @@ -2003,6 +2006,7 @@ osd_nav_next_turn_new(struct navit *nav, struct osd_methods *meth, struct nav_toggle_announcer { int w,h; + /* FIXME this is actually the click callback, which is set once but never read. Do we need this? */ struct callback *navit_init_cb; char *icon_src; int icon_h, icon_w, active, last_state; diff --git a/navit/xpm/Makefile.am b/navit/xpm/Makefile.am index 2ba0d3a5c..40b7cc851 100644 --- a/navit/xpm/Makefile.am +++ b/navit/xpm/Makefile.am @@ -56,6 +56,7 @@ image_DATA += nav_right_2_32.xpm svgs = gui_about.svg svgs += gui_actions.svg svgs += gui_active.svg +svgs += gui_android_menu.svg svgs += gui_bookmark.svg svgs += gui_formerdests.svg svgs += gui_display.svg diff --git a/navit/xpm/gui_android_menu.svg b/navit/xpm/gui_android_menu.svg new file mode 100644 index 000000000..b47eae076 --- /dev/null +++ b/navit/xpm/gui_android_menu.svg @@ -0,0 +1,120 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/navit/xslt/android.xslt b/navit/xslt/android.xslt index 28b9d8245..29802fee2 100644 --- a/navit/xslt/android.xslt +++ b/navit/xslt/android.xslt @@ -9,6 +9,7 @@ + diff --git a/navit/xslt/osd_android.xslt b/navit/xslt/osd_android.xslt new file mode 100644 index 000000000..c5f4afb4d --- /dev/null +++ b/navit/xslt/osd_android.xslt @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/navit/xslt/osd_minimum.xslt b/navit/xslt/osd_minimum.xslt index cda88dc88..5b42769f4 100644 --- a/navit/xslt/osd_minimum.xslt +++ b/navit/xslt/osd_minimum.xslt @@ -18,7 +18,7 @@ - + -- cgit v1.2.1 From 719cabfa36380f855f8b68d29d849d4d3c3c2869 Mon Sep 17 00:00:00 2001 From: mvglasow Date: Sun, 8 Nov 2015 13:03:02 +0100 Subject: Refactor:osd_core:Document osd_button_adjust_sizes() --- navit/osd/core/osd_core.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c index 8166e54a2..4754cc392 100644 --- a/navit/osd/core/osd_core.c +++ b/navit/osd/core/osd_core.c @@ -1423,6 +1423,20 @@ struct osd_button { }; +/** + * @brief Adjusts width and height of an OSD item to fit the image it displays. + * + * A width or height of 0%, stored in relative attributes as {@code ATTR_REL_RELSHIFT}, is used as a flag + * indicating that the respective dimension is unset, i.e. determined by the dimensions of its image. + * + * If this is the case for height and/or width, the respective dimension will be updated to fit the image. + * + * Note that this method is used by several OSD items, notably {@code osd_image}, {@code osd_button} and + * {@code osd_android_menu}. + * + * @param opc The OSD item + * @param img The image displayed by the item + */ static void osd_button_adjust_sizes(struct osd_priv_common *opc, struct graphics_image *img) { -- cgit v1.2.1 From 7c59b3cbf0b8cce38164f63ad666eab60b7fe183 Mon Sep 17 00:00:00 2001 From: mvglasow Date: Sun, 8 Nov 2015 14:48:34 +0100 Subject: Add:port_android:Remove ActionBar as it is no longer needed Signed-off-by: mvglasow --- navit/android/src/org/navitproject/navit/Navit.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java index 5449a3431..a117ccd6d 100644 --- a/navit/android/src/org/navitproject/navit/Navit.java +++ b/navit/android/src/org/navitproject/navit/Navit.java @@ -246,6 +246,8 @@ public class Navit extends Activity super.onCreate(savedInstanceState); if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB) this.requestWindowFeature(Window.FEATURE_NO_TITLE); + else + this.getActionBar().hide(); dialogs = new NavitDialogs(this); @@ -700,25 +702,17 @@ public class Navit extends Activity NavitDestroy(); } - public void fullscreen(int fullscreen) - { - if(fullscreen != 0) - { + public void fullscreen(int fullscreen) { + if(fullscreen != 0) { getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN); - if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) - this.getActionBar().hide(); } - else - { + else { getWindow().addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN); getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); - if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) - this.getActionBar().show(); } } - public void disableSuspend() { wl.acquire(); -- cgit v1.2.1 From 03d7a5cd76b87cfac18967d2560a82a9c12cdbf3 Mon Sep 17 00:00:00 2001 From: Pierre GRANDIN Date: Thu, 31 Dec 2015 03:32:27 -0800 Subject: Adding a androix/x86 build script --- ci/build_android_x86.sh | 3 +++ circle.yml | 1 + 2 files changed, 4 insertions(+) create mode 100644 ci/build_android_x86.sh diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh new file mode 100644 index 000000000..5e1dde1fb --- /dev/null +++ b/ci/build_android_x86.sh @@ -0,0 +1,3 @@ +mkdir android-x86 && cd android-x86 +cmake -DCMAKE_TOOLCHAIN_FILE=Toolchain/i686-android.cmake -DANDROID_API_VERSION=9 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1 +make || exit -1 diff --git a/circle.yml b/circle.yml index 419899bd0..7bd8ac1c8 100644 --- a/circle.yml +++ b/circle.yml @@ -30,6 +30,7 @@ dependencies: - sudo apt-get install lib32stdc++6 - sudo apt-get install lib32z1 - bash ci/build_android.sh + - bash ci/build_android_x86.sh # Windows build - sudo apt-get install mingw32 mingw32-binutils mingw32-runtime - sudo apt-get install default-jdk nsis -- cgit v1.2.1 From 9b3bcb5d62984978a31a3b52fd6d297fc72a4a74 Mon Sep 17 00:00:00 2001 From: jandegr Date: Thu, 31 Dec 2015 13:01:06 +0100 Subject: Update build_android_x86.sh --- ci/build_android_x86.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index 5e1dde1fb..4a45edae8 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -1,3 +1,3 @@ mkdir android-x86 && cd android-x86 -cmake -DCMAKE_TOOLCHAIN_FILE=Toolchain/i686-android.cmake -DANDROID_API_VERSION=9 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1 +cmake -DCMAKE_TOOLCHAIN_FILE=Toolchain/i686-android.cmake -DANDROID_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1 make || exit -1 -- cgit v1.2.1 From 4d5f50931b14f7b965f6259fb7a13e484eb371d6 Mon Sep 17 00:00:00 2001 From: jandegr Date: Thu, 31 Dec 2015 13:03:30 +0100 Subject: Update build_android_x86.sh --- ci/build_android_x86.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index 4a45edae8..6d2a5ed7d 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -1,3 +1,3 @@ mkdir android-x86 && cd android-x86 -cmake -DCMAKE_TOOLCHAIN_FILE=Toolchain/i686-android.cmake -DANDROID_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1 +cmake -DCMAKE_TOOLCHAIN_FILE=Toolchain/i686-android.cmake -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1 make || exit -1 -- cgit v1.2.1 From ca74f662e79691b9f572bd74b55c35af30ee0d35 Mon Sep 17 00:00:00 2001 From: jandegr Date: Thu, 31 Dec 2015 13:05:25 +0100 Subject: Update build_android_x86.sh --- ci/build_android_x86.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index 6d2a5ed7d..a709fe53b 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -1,3 +1,3 @@ mkdir android-x86 && cd android-x86 -cmake -DCMAKE_TOOLCHAIN_FILE=Toolchain/i686-android.cmake -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1 +cmake -DCMAKE_TOOLCHAIN_FILE=Toolchain/i686-android.cmake -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1 make || exit -1 -- cgit v1.2.1 From 2f5d2a0131d429cadc07efdda92939148b86b777 Mon Sep 17 00:00:00 2001 From: jandegr Date: Thu, 31 Dec 2015 13:12:42 +0100 Subject: Update circle.yml --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 7bd8ac1c8..40b6be826 100644 --- a/circle.yml +++ b/circle.yml @@ -24,7 +24,7 @@ dependencies: - cp bin/po/navit.pot $CIRCLE_ARTIFACTS/ - "[ $CIRCLE_PROJECT_USERNAME != navit-gps ] || curl \"https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -H \"$lp_cookie\" -H \"Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -F file=@bin/po/navit.pot | grep title" # Android build - - sudo apt-get install gettext +# - sudo apt-get install gettext - sudo apt-get install libsaxonb-java # for aapt - sudo apt-get install lib32stdc++6 -- cgit v1.2.1 From cddbdcd447b14cb2092f8f99d75f52d7c86b8e3e Mon Sep 17 00:00:00 2001 From: jandegr Date: Thu, 31 Dec 2015 13:46:25 +0100 Subject: Update build_android_x86.sh --- ci/build_android_x86.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index a709fe53b..c91e5c0b8 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -1,3 +1,8 @@ +export START_PATH=~/ +export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/" +export CMAKE_FILE=$SOURCE_PATH"/Toolchain/i686-android.cmake" + + mkdir android-x86 && cd android-x86 -cmake -DCMAKE_TOOLCHAIN_FILE=Toolchain/i686-android.cmake -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1 +cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1 make || exit -1 -- cgit v1.2.1 From 3de77b1c8df00801dda9801527de0c0f36cc0b96 Mon Sep 17 00:00:00 2001 From: jandegr Date: Thu, 31 Dec 2015 15:20:20 +0100 Subject: Update i686-android.cmake --- Toolchain/i686-android.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Toolchain/i686-android.cmake b/Toolchain/i686-android.cmake index 94c6197e5..b060ed38e 100755 --- a/Toolchain/i686-android.cmake +++ b/Toolchain/i686-android.cmake @@ -5,8 +5,8 @@ set(ANDROID_API_VERSION 9 CACHE STRING "Andriod API Version") set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Andriod NDK API Version") set(ANDROID_ARCH "x86" CACHE STRING "Android architecture") -find_program(CMAKE_C_COMPILER NAMES i686-android-linux-gcc i686-android-linux-gcc.exe) -find_program(CMAKE_CXX_COMPILER NAMES i686-android-linux-g++ i686-android-linux-g++.exe) +find_program(CMAKE_C_COMPILER NAMES i686-linux-android-gcc i686-linux-android-gcc.exe) +find_program(CMAKE_CXX_COMPILER NAMES i686-linux-android-g++ i686-linux-android-g++.exe) set(PKG_CONFIG_EXECUTABLE "i686-android-pkg-config") get_filename_component(COMPILER_PATH ${CMAKE_C_COMPILER} PATH) -- cgit v1.2.1 From da791ce5080703ad473aa4034a4ad401254f3238 Mon Sep 17 00:00:00 2001 From: jandegr Date: Thu, 31 Dec 2015 15:52:11 +0100 Subject: Update build_android_x86.sh --- ci/build_android_x86.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index c91e5c0b8..ed7fe42ed 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -1,7 +1,11 @@ export START_PATH=~/ export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/" export CMAKE_FILE=$SOURCE_PATH"/Toolchain/i686-android.cmake" - +export ANDROID_NDK="/usr/local/android-ndk/" +export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/x86-4.9/prebuilt/linux-x86_64/bin" +export ANDROID_SDK="/usr/local/android-sdk-linux/" +export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools" +export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_PLATFORM_TOOLS:$PATH mkdir android-x86 && cd android-x86 cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1 -- cgit v1.2.1 From e9931f16dbafacf2b2ae29fb681f83c7811ab776 Mon Sep 17 00:00:00 2001 From: Pierre GRANDIN Date: Thu, 31 Dec 2015 07:32:40 -0800 Subject: trac-1064 render OSM shop=mall as poi_mall --- navit/maptool/osm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c index 37c0e7626..a8baac6d1 100644 --- a/navit/maptool/osm.c +++ b/navit/maptool/osm.c @@ -519,6 +519,7 @@ static char *attrmap={ "? shop=photo poi_shop_photo\n" "? shop=shoes poi_shop_shoes\n" "? shop=supermarket poi_shopping\n" + "? shop=mall poi_mall\n" "? sport=10pin poi_bowling\n" "? sport=baseball poi_baseball\n" "? sport=basketball poi_basketball\n" -- cgit v1.2.1 From 2ae3c4ba85e9d1bc6cbd28dc92ed443d810aa40c Mon Sep 17 00:00:00 2001 From: Pierre GRANDIN Date: Thu, 31 Dec 2015 08:16:02 -0800 Subject: Applying patch from trac-832 --- cmake/navit_macros.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/navit_macros.cmake b/cmake/navit_macros.cmake index d1b4359fb..3baf5c9ed 100644 --- a/cmake/navit_macros.cmake +++ b/cmake/navit_macros.cmake @@ -15,9 +15,9 @@ macro(set_with_reason VARIABLE REASON ENABLE) if (DEFINED ${VARIABLE}_REASON AND NOT ${VARIABLE}_REASON STREQUAL "User defined") set(${VARIABLE} ${ENABLE} CACHE BOOL "feature switch" FORCE) set(${VARIABLE}_REASON ${REASON}) - string(REPLACE "/" "_" VARIABLE_NAMES ${VARIABLE}) - set(${VARIABLE_NAMES}_LIBS ${ARGN}) endif() + string(REPLACE "/" "_" VARIABLE_NAMES ${VARIABLE}) + set(${VARIABLE_NAMES}_LIBS ${ARGN}) set(${VARIABLE}_AUTODETECTED_VALUE ${ENABLE} CACHE INTERNAL "value autodetected by build script") endmacro() -- cgit v1.2.1 From 9ec259e4895a64ea4b1f1a40f13b8af7bf45624a Mon Sep 17 00:00:00 2001 From: jandegr Date: Fri, 1 Jan 2016 19:10:35 +0100 Subject: Update i686-android.cmake --- Toolchain/i686-android.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Toolchain/i686-android.cmake b/Toolchain/i686-android.cmake index b060ed38e..2b6e8a177 100755 --- a/Toolchain/i686-android.cmake +++ b/Toolchain/i686-android.cmake @@ -16,7 +16,7 @@ set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Andriod set(NDK_ARCH_DIR "${ANDROID_NDK}/platforms/android-${ANDROID_NDK_API_VERSION}/arch-x86") set(CMAKE_FIND_ROOT_PATH ${NDK_ARCH_DIR}) -set(CMAKE_REQUIRED_FLAGS "-nostdlib -lc -ldl -lgcc -L${NDK_ARCH_DIR}/usr/lib") +set(CMAKE_REQUIRED_FLAGS "-ldl --sysroot=${NDK_ARCH_DIR} ${EXTRA_COMPILER_FLAGS}") set(CMAKE_REQUIRED_INCLUDES "${NDK_ARCH_DIR}/usr/include") set(NAVIT_COMPILE_FLAGS "-I${NDK_ARCH_DIR}/usr/include -g -D_GNU_SOURCE -DANDROID -fno-short-enums ${CMAKE_REQUIRED_FLAGS}") -- cgit v1.2.1 From 98f8cf8a5473ca02a7ac6735c15dfdf8bd065b38 Mon Sep 17 00:00:00 2001 From: jandegr Date: Fri, 1 Jan 2016 19:19:25 +0100 Subject: Update build_android_x86.sh --- ci/build_android_x86.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index ed7fe42ed..695556e07 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -8,5 +8,20 @@ export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools" export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_PLATFORM_TOOLS:$PATH mkdir android-x86 && cd android-x86 + +android list targets + cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1 make || exit -1 + +if [[ "${CIRCLE_BRANCH}" == "master" ]]; then + make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-x86-release-unsigned.apk || exit 1 +else + make apkg && mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-x86-debug.apk || exit 1 +fi + +#cp ~/android-build/navit/*.xml $CIRCLE_ARTIFACTS/android/ + +echo +echo "Build leftovers :" +ls navit/android/bin/ -- cgit v1.2.1 From 7ba00da4223f80d2e714d1a233c2edfa2f702589 Mon Sep 17 00:00:00 2001 From: jandegr Date: Fri, 1 Jan 2016 19:37:43 +0100 Subject: Update circle.yml --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 40b6be826..7bd8ac1c8 100644 --- a/circle.yml +++ b/circle.yml @@ -24,7 +24,7 @@ dependencies: - cp bin/po/navit.pot $CIRCLE_ARTIFACTS/ - "[ $CIRCLE_PROJECT_USERNAME != navit-gps ] || curl \"https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -H \"$lp_cookie\" -H \"Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -F file=@bin/po/navit.pot | grep title" # Android build -# - sudo apt-get install gettext + - sudo apt-get install gettext - sudo apt-get install libsaxonb-java # for aapt - sudo apt-get install lib32stdc++6 -- cgit v1.2.1 From ffac5ae13d25d2c40fca5fbde418916aa4c5217f Mon Sep 17 00:00:00 2001 From: jandegr Date: Fri, 1 Jan 2016 19:59:35 +0100 Subject: Update circle.yml --- circle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/circle.yml b/circle.yml index 7bd8ac1c8..76e41196b 100644 --- a/circle.yml +++ b/circle.yml @@ -42,6 +42,8 @@ dependencies: - cp win32/*.exe $CIRCLE_ARTIFACTS/ # For python testing with junit reporting - sudo pip install junit-xml +# + - ls -la $CIRCLE_ARTIFACTS test: post: - sed -i -e 's@name="Local GPS" profilename="car" enabled="yes" active="1"@name="Local GPS" profilename="car" enabled="no" active="0"@' navit.xml: -- cgit v1.2.1 From 5b059191b8f8be55d9a3686906322b741054a0f7 Mon Sep 17 00:00:00 2001 From: Michael Dankov Date: Sat, 2 Jan 2016 02:08:41 +0300 Subject: Fix:core:Crash in country_search_new Properly handle coutry search by attr_country_id to fix crash in internal gui when there's a gps fix and a map supporting attr_country_id such as Reiseplaner is active. Fixes #1337. --- navit/country.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/navit/country.c b/navit/country.c index 52f471e17..7d13e69e7 100644 --- a/navit/country.c +++ b/navit/country.c @@ -362,9 +362,10 @@ country_search_new(struct attr *search, int partial) { struct country_search *ret=g_new(struct country_search, 1); ret->search=*search; - ret->search.u.str=linguistics_casefold(ret->search.u.str); - if (search->type != attr_country_id) + if (search->type != attr_country_id) { + ret->search.u.str=linguistics_casefold(ret->search.u.str); ret->len=strlen(ret->search.u.str); + } else ret->len=0; ret->partial=partial; -- cgit v1.2.1 From 24aa15c11b78ffedb69f6873695c01d8d78a4e70 Mon Sep 17 00:00:00 2001 From: Michael Dankov Date: Sat, 2 Jan 2016 02:51:34 +0300 Subject: Fix:ci:Do not hang on multiline git comments --- ci/update_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/update_version.sh b/ci/update_version.sh index ea1d70d71..2c6f37948 100644 --- a/ci/update_version.sh +++ b/ci/update_version.sh @@ -2,7 +2,7 @@ if [ -z "$CIRCLE_BUILD_NUM" -o "$CIRCLE_PROJECT_USERNAME" != "navit-gps" ] ; the exit fi -if ! git log -n 1 --oneline ; then +if ! git log -n 1 --oneline --no-pager ; then echo "This script should be run from the versioned directory" exit 1 fi -- cgit v1.2.1 From e356b96df3f6810e4b3943a3c6402c6efb801a36 Mon Sep 17 00:00:00 2001 From: Michael Dankov Date: Sat, 2 Jan 2016 03:06:55 +0300 Subject: Fix:ci:properly format git command --- ci/update_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/update_version.sh b/ci/update_version.sh index 2c6f37948..b34b0da73 100644 --- a/ci/update_version.sh +++ b/ci/update_version.sh @@ -2,7 +2,7 @@ if [ -z "$CIRCLE_BUILD_NUM" -o "$CIRCLE_PROJECT_USERNAME" != "navit-gps" ] ; the exit fi -if ! git log -n 1 --oneline --no-pager ; then +if ! git --no-pager log -n 1 ; then echo "This script should be run from the versioned directory" exit 1 fi -- cgit v1.2.1 From 8f453447bce25ab184378980d43d731f2a8f1685 Mon Sep 17 00:00:00 2001 From: Michael Dankov Date: Sat, 2 Jan 2016 21:39:32 +0300 Subject: Fix:build:Fetch android app version from tags. Use value queried by cmake/version.cmake for circle ci builds instead of guessing it from circleci environment variables, which are properly set only for navit-gps organization builds. Related to #1336. --- ci/build_android.sh | 3 --- navit/android/CMakeLists.txt | 1 - 2 files changed, 4 deletions(-) diff --git a/ci/build_android.sh b/ci/build_android.sh index 553a1aaf1..6525541ba 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -43,9 +43,6 @@ mkdir -p $BUILD_PATH cd $BUILD_PATH export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH android list targets -# The value comes from ( last_svn_rev - max_build_id ) at the time of the git migration -svn_rev=$(( 5658 + $CIRCLE_BUILD_NUM )) -sed -i -e "s/ANDROID_VERSION_INT=\"0\"/ANDROID_VERSION_INT=\"${svn_rev}\"/g" ~/navit/navit/android/CMakeLists.txt mkdir $CIRCLE_ARTIFACTS/android/ cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/android/ diff --git a/navit/android/CMakeLists.txt b/navit/android/CMakeLists.txt index cd842be06..ca3bdbfa4 100644 --- a/navit/android/CMakeLists.txt +++ b/navit/android/CMakeLists.txt @@ -30,7 +30,6 @@ if (ANDROID) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml.cmake COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml.cmake -D DST=${CMAKE_CURRENT_BINARY_DIR}/AndroidManifest.xml - -D ANDROID_VERSION_INT="0" -D NAME=ANDROID_VERSION_INT -D ANDROID_VERSION_NAME=${PACKAGE_STRING} -D ANDROID_API_VERSION=${ANDROID_API_VERSION} -- cgit v1.2.1 From 0452e62350cea5da64eb7206b1a7eb4521cc2073 Mon Sep 17 00:00:00 2001 From: Pierre GRANDIN Date: Sun, 3 Jan 2016 02:33:07 -0800 Subject: Updated Catalan translation from launchpad --- po/ca.po.in | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/po/ca.po.in b/po/ca.po.in index 1e3295650..da8d5c12a 100644 --- a/po/ca.po.in +++ b/po/ca.po.in @@ -1,5 +1,5 @@ # Catalan translations for navit -# Copyright (C) 2006-2015 The Navit Team +# Copyright (C) 2006-2016 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Ferran Roig https://launchpad.net/~ferro9 @@ -12,14 +12,15 @@ # beamspot https://launchpad.net/~benrouravkg # juliwoodbcn https://launchpad.net/~julianlozano # kualsevol https://launchpad.net/~ojuanv +# pataquets https://launchpad.net/~pataquets # peremayol@gmail.com https://launchpad.net/~peremayol msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2015-07-19 03:57+0000\n" -"Last-Translator: Sergi Gomis \n" +"PO-Revision-Date: 2016-01-01 20:32+0000\n" +"Last-Translator: pataquets \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -272,22 +273,22 @@ msgstr "a la sortida" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format msgid "then continue straight%1$s" -msgstr "" +msgstr "després continueu tot recte%1$s" #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format msgid "Continue straight %1$s%2$s%3$s" -msgstr "" +msgstr "Continueu tot recte %1$s%2$s%3$s" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format msgid "then keep right%1$s" -msgstr "" +msgstr "després manteniu-vos a la dreta%1$s" #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format msgid "Keep right %1$s%2$s%3$s" -msgstr "" +msgstr "Manteniu-vos a la dreta %1$s%2$s%3$s" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format @@ -1472,7 +1473,7 @@ msgstr "" #. Safe cast: attr_generic_set_attr does not modify its parameter. msgid "Unnamed vehicle" -msgstr "" +msgstr "Vehicle sense nom" msgid "Failed to write bookmarks file" msgstr "" @@ -1630,16 +1631,16 @@ msgid "Data" msgstr "Dades" msgid "Pharmacy" -msgstr "" +msgstr "Farmàcia" msgid "Restaurant" -msgstr "" +msgstr "Restaurant" msgid "Restaurant. Fast food" msgstr "" msgid "Hotel" -msgstr "" +msgstr "Hotel" msgid "Car parking" msgstr "" @@ -1651,10 +1652,10 @@ msgid "Bank" msgstr "" msgid "Hospital" -msgstr "" +msgstr "Hospital" msgid "Cinema" -msgstr "" +msgstr "Cinema" msgid "Train station" msgstr "" @@ -1663,7 +1664,7 @@ msgid "School" msgstr "" msgid "Police" -msgstr "" +msgstr "Comissaria de Policia" msgid "Justice" msgstr "Jutjats" @@ -1697,7 +1698,7 @@ msgid "POI search" msgstr "" msgid "Select a category" -msgstr "" +msgstr "Seleccioneu una categoria" msgid "Select a distance to look for (km)" msgstr "" -- cgit v1.2.1 From 21aee700b3c07d62d0bc2604818e597dc2d96011 Mon Sep 17 00:00:00 2001 From: Pierre Grandin Date: Mon, 4 Jan 2016 11:12:54 +0100 Subject: Archive the xpms from the linux build on CI --- ci/build_linux.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/build_linux.sh b/ci/build_linux.sh index a85540e47..9d2b9add0 100644 --- a/ci/build_linux.sh +++ b/ci/build_linux.sh @@ -17,4 +17,5 @@ else mkdir bin && cd bin cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n|| exit -1 make || exit -1 + cp -r navit/xpm $CIRCLE_ARTIFACTS fi -- cgit v1.2.1 From dd6bf1368ca94cbd8fc0d7693c0aea44d365bf7a Mon Sep 17 00:00:00 2001 From: Pierre Grandin Date: Mon, 4 Jan 2016 11:33:45 +0100 Subject: Archive the xpms from the linux build on CI --- ci/build_linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build_linux.sh b/ci/build_linux.sh index 9d2b9add0..4f90d5d98 100644 --- a/ci/build_linux.sh +++ b/ci/build_linux.sh @@ -17,5 +17,5 @@ else mkdir bin && cd bin cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n|| exit -1 make || exit -1 - cp -r navit/xpm $CIRCLE_ARTIFACTS fi +cp -r navit/xpm $CIRCLE_ARTIFACTS -- cgit v1.2.1 From b7d8ec97f64c3b5423649788023d45dcebd2cd81 Mon Sep 17 00:00:00 2001 From: Stefan Wildemann Date: Sat, 21 Nov 2015 17:18:45 +0100 Subject: fix:osd: Make osd "Button" accept h and w props --- navit/osd/core/osd_core.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c index cd19aeb55..4c90cf7ea 100644 --- a/navit/osd/core/osd_core.c +++ b/navit/osd/core/osd_core.c @@ -1457,7 +1457,7 @@ osd_button_draw(struct osd_priv_common *opc, struct navit *nav) if (this->use_overlay) { struct graphics_image *img; - img=graphics_image_new(opc->osd_item.gr, this->src); + img=graphics_image_new_scaled(opc->osd_item.gr, this->src, opc->osd_item.w, opc->osd_item.h); osd_button_adjust_sizes(opc, img); p.x=(opc->osd_item.w-img->width)/2; p.y=(opc->osd_item.h-img->height)/2; @@ -1467,7 +1467,7 @@ osd_button_draw(struct osd_priv_common *opc, struct navit *nav) } else { struct graphics *gra; gra = navit_get_graphics(nav); - this->img = graphics_image_new(gra, this->src); + this->img = graphics_image_new_scaled(gra, this->src, opc->osd_item.w, opc->osd_item.h); if (!this->img) { dbg(lvl_warning, "failed to load '%s'\n", this->src); @@ -1494,18 +1494,27 @@ osd_button_init(struct osd_priv_common *opc, struct navit *nav) struct osd_button *this = (struct osd_button *)opc->data; struct graphics *gra = navit_get_graphics(nav); + + /* translate properties to real size */ + osd_std_calculate_sizes(&opc->osd_item, navit_get_width(nav), navit_get_height(nav)); + dbg(lvl_debug, "enter\n"); - this->img = graphics_image_new(gra, this->src); + dbg(lvl_debug, "Get: %s, %d, %d, %d, %d\n", this->src, opc->osd_item.rel_w, opc->osd_item.rel_h, opc->osd_item.w, opc->osd_item.h); + this->img = graphics_image_new_scaled(gra, this->src, opc->osd_item.w, opc->osd_item.h); if (!this->img) { dbg(lvl_warning, "failed to load '%s'\n", this->src); return; } + else + { + dbg(lvl_debug,"Got %s: %d, %d\n", this->src, this->img->width, this->img->height); + } osd_button_adjust_sizes(opc, this->img); if (this->use_overlay) { struct graphics_image *img; struct point p; osd_set_std_graphic(nav, &opc->osd_item, (struct osd_priv *)opc); - img=graphics_image_new(opc->osd_item.gr, this->src); + img=graphics_image_new_scaled(opc->osd_item.gr, this->src, opc->osd_item.w, opc->osd_item.h); p.x=(opc->osd_item.w-this->img->width)/2; p.y=(opc->osd_item.h-this->img->height)/2; osd_fill_with_bgcolor(&opc->osd_item); @@ -1550,7 +1559,7 @@ osd_button_set_attr(struct osd_priv_common *opc, struct attr* attr) } nav = opc->osd_item.navit; gra = navit_get_graphics(nav); - this_->img = graphics_image_new(gra, this_->src); + this_->img = graphics_image_new_scaled(gra, this_->src, opc->osd_item.w, opc->osd_item.h); if (!this_->img) { dbg(lvl_warning, "failed to load '%s'\n", this_->src); return 0; -- cgit v1.2.1 From 973cba574582138838ea8a95448d4647a12563a7 Mon Sep 17 00:00:00 2001 From: Stefan Wildemann Date: Wed, 6 Jan 2016 11:07:12 +0100 Subject: fix:osd: Convert zero button size to magic indicator size -1 --- navit/osd/core/osd_core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c index 4c90cf7ea..922947ab3 100644 --- a/navit/osd/core/osd_core.c +++ b/navit/osd/core/osd_core.c @@ -1497,7 +1497,12 @@ osd_button_init(struct osd_priv_common *opc, struct navit *nav) /* translate properties to real size */ osd_std_calculate_sizes(&opc->osd_item, navit_get_width(nav), navit_get_height(nav)); - + /* most graphics plugins cannot accept w=0 or h=0. They require special w=-1 or h=-1 for "no size"*/ + if((opc->osd_item.w <= 0) || (opc->osd_item.h <=0)) + { + opc->osd_item.w = -1; + opc->osd_item.h = -1; + } dbg(lvl_debug, "enter\n"); dbg(lvl_debug, "Get: %s, %d, %d, %d, %d\n", this->src, opc->osd_item.rel_w, opc->osd_item.rel_h, opc->osd_item.w, opc->osd_item.h); this->img = graphics_image_new_scaled(gra, this->src, opc->osd_item.w, opc->osd_item.h); -- cgit v1.2.1 From 98ad3fdcff2a1cfd925bfb711b55a96be06a3ab7 Mon Sep 17 00:00:00 2001 From: Sebastian Leske Date: Mon, 28 Dec 2015 18:56:22 +0100 Subject: Refactor:core:Remove out-ifdefed code --- navit/graphics.c | 98 ++------------------------------------------------------ 1 file changed, 2 insertions(+), 96 deletions(-) diff --git a/navit/graphics.c b/navit/graphics.c index 97b1c0f69..113c19999 100644 --- a/navit/graphics.c +++ b/navit/graphics.c @@ -871,9 +871,6 @@ struct graphics_image * graphics_image_new_scaled_rotated(struct graphics *gra, newheight=h; name=g_strndup(pathi,s-pathi); -#if 0 - if (!strstr(name,"test.zip")) -#endif image_new_helper(gra, this_, pathi, name, newwidth, newheight, rotate, 0); if (!this_->priv && strstr(pathi, ".zip/")) image_new_helper(gra, this_, pathi, name, newwidth, newheight, rotate, 1); @@ -1075,56 +1072,6 @@ graphics_background_gc(struct graphics *this_, struct graphics_gc *gc) #include "popup.h" #include - -#if 0 -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## -static void popup_view_html(struct popup_item *item, char *file) -{ - char command[1024]; - sprintf(command,"firefox %s", file); - system(command); -} - -struct transformatin *tg; -enum projection pg; - -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## -static void graphics_popup(struct display_list *list, struct popup_item **popup) -{ - struct item *item; - struct attr attr; - struct map_rect *mr; - struct coord c; - struct popup_item *curr_item,*last=NULL; - item=list->data; - mr=map_rect_new(item->map, NULL, NULL, 0); - printf("id hi=0x%x lo=0x%x\n", item->id_hi, item->id_lo); - item=map_rect_get_item_byid(mr, item->id_hi, item->id_lo); - if (item) { - if (item_attr_get(item, attr_name, &attr)) { - curr_item=popup_item_new_text(popup,attr.u.str,1); - if (item_attr_get(item, attr_info_html, &attr)) { - popup_item_new_func(&last,"HTML Info",1, popup_view_html, g_strdup(attr.u.str)); - } - if (item_attr_get(item, attr_price_html, &attr)) { - popup_item_new_func(&last,"HTML Preis",2, popup_view_html, g_strdup(attr.u.str)); - } - curr_item->submenu=last; - } - } - map_rect_destroy(mr); -} -#endif - - /** * FIXME * @param <> @@ -1252,9 +1199,6 @@ static void label_line(struct graphics *gra, struct graphics_gc *fg, struct grap y+=dx*thm/l/64; p_t.x=x; p_t.y=y; -#if 0 - dbg(lvl_debug,"display_text: '%s', %d, %d, %d, %d %d\n", label, x, y, dx*0x10000/l, dy*0x10000/l, l); -#endif if (x < gra->r.rl.x && x + tl > gra->r.lu.x && y + tl > gra->r.lu.y && y - tl < gra->r.rl.y) gra->meth.draw_text(gra->priv, fg->priv, bg?bg->priv:NULL, font->priv, label, &p_t, dx*0x10000/l, dy*0x10000/l); } @@ -1310,12 +1254,6 @@ intersection(struct point * a1, int adx, int ady, struct point * b1, int bdx, in a = -a; b = -b; } -#if 0 - if (a < 0 || b < 0) - return 0; - if (a > n || b > n) - return 0; -#endif if (n == 0) return 0; res->x = a1->x + a * adx / n; @@ -1397,10 +1335,6 @@ static void draw_circle(struct point *pnt, int diameter, int scale, int start, int len, struct point *res, int *pos, int dir) { struct circle *c; - -#if 0 - dbg(lvl_debug,"diameter=%d start=%d len=%d pos=%d dir=%d\n", diameter, start, len, *pos, dir); -#endif int count=64; int end=start+len; int i,step; @@ -1521,32 +1455,6 @@ int_sqrt(unsigned int n) return p; } -#if 0 -static void -debug_line(struct graphics *gra, struct graphics_gc *gc, struct point *pnt, int dx, int dy) -{ - struct point p[2]; - p[0]=p[1]=*pnt; - p[1].x+=dx; - p[1].y+=dy; - gra->meth.draw_lines(gra->priv, gc->priv, p, 2); -} - -static void -debug_point(struct graphics *gra, struct graphics_gc *gc, struct point *pnt, int s) -{ - struct point p[4]; - p[0]=p[1]=p[2]=*pnt; - p[0].x-=s; - p[0].y+=s; - p[1].x+=s; - p[1].y+=s; - p[2].y-=s; - p[3]=p[0]; - gra->meth.draw_lines(gra->priv, gc->priv, p, 4); -} -#endif - struct draw_polyline_shape { int wi; int step; @@ -2104,7 +2012,6 @@ displayitem_draw(struct displayitem *di, void *dummy, struct display_context *dc struct element *e=dc->e; struct graphics_image *img=dc->img; struct point p; - struct coord *c; char *path; while (di) { @@ -2121,7 +2028,6 @@ displayitem_draw(struct displayitem *di, void *dummy, struct display_context *dc count=limit_count(di->c, count); if (dc->type == type_poly_water_tiled) mindist=0; - c=di->c; #if 0 if (dc->e->type == element_polygon) { int max=1000; @@ -2135,9 +2041,9 @@ displayitem_draw(struct displayitem *di, void *dummy, struct display_context *dc } #endif if (dc->e->type == element_polyline) - count=transform(dc->trans, dc->pro, c, pa, count, mindist, e->u.polyline.width, width); + count=transform(dc->trans, dc->pro, di->c, pa, count, mindist, e->u.polyline.width, width); else - count=transform(dc->trans, dc->pro, c, pa, count, mindist, 0, NULL); + count=transform(dc->trans, dc->pro, di->c, pa, count, mindist, 0, NULL); switch (e->type) { case element_polygon: graphics_draw_polygon_clipped(gra, gc, pa, count); -- cgit v1.2.1 From 1ed20676e743a789c7c37e279252f74ce5cb42d3 Mon Sep 17 00:00:00 2001 From: Sebastian Leske Date: Wed, 30 Dec 2015 13:23:52 +0100 Subject: Refactor:core:Fix GCC warning about uninitialized data.dangerous_goods --- navit/route.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/navit/route.c b/navit/route.c index 37d1282a8..3fdc38964 100644 --- a/navit/route.c +++ b/navit/route.c @@ -2831,11 +2831,12 @@ static void route_graph_clone_segment(struct route_graph *this, struct route_graph_segment *s, struct route_graph_point *start, struct route_graph_point *end, int flags) { struct route_graph_segment_data data; - data.flags=s->data.flags|flags; - data.offset=1; - data.maxspeed=-1; data.item=&s->data.item; + data.offset=1; + data.flags=s->data.flags|flags; data.len=s->data.len+1; + data.maxspeed=-1; + data.dangerous_goods=0; if (s->data.flags & AF_SPEED_LIMIT) data.maxspeed=RSD_MAXSPEED(&s->data); if (s->data.flags & AF_SEGMENTED) -- cgit v1.2.1 From ede80ecab5d0187b2902d9b9a2a934bc8ca841f2 Mon Sep 17 00:00:00 2001 From: Pierre GRANDIN Date: Sat, 9 Jan 2016 09:54:29 -0800 Subject: Updated Lithuanian translation from launchpad --- po/lt.po.in | 139 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 76 insertions(+), 63 deletions(-) diff --git a/po/lt.po.in b/po/lt.po.in index 9913f8fb4..65993977d 100644 --- a/po/lt.po.in +++ b/po/lt.po.in @@ -1,5 +1,5 @@ # Lithuanian translations for navit -# Copyright (C) 2006-2015 The Navit Team +# Copyright (C) 2006-2016 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Aidas Kasparas https://launchpad.net/~a-kasparas @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2015-07-19 03:59+0000\n" -"Last-Translator: Michael von Glasow \n" +"PO-Revision-Date: 2016-01-04 21:40+0000\n" +"Last-Translator: Aidas Kasparas \n" "Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1449,11 +1449,11 @@ msgstr "" #. We have not found an existing config file from all possibilities msgid "No config file navit.xml, navit.xml.local found\n" -msgstr "" +msgstr "Konfiguracijos failai navit.xml, navit.xml.local nerasti\n" #, c-format msgid "Error parsing config file '%s': %s\n" -msgstr "" +msgstr "Klaida konfiguracijos faile '%s': %s\n" #, c-format msgid "Using config file '%s'\n" @@ -1461,7 +1461,7 @@ msgstr "Naudojamas konfigūracijos failas „%s”\n" #, c-format msgid "Error: No configuration found in config file '%s'\n" -msgstr "" +msgstr "Klaida: Konfigūracija nerasta faile '%s'\n" msgid "" "Internal initialization failed, exiting. Check previous error messages.\n" @@ -1642,7 +1642,7 @@ msgid "Hotel" msgstr "Viešbutis" msgid "Car parking" -msgstr "" +msgstr "Stovėjimo aikštelė" msgid "Fuel station" msgstr "Degalinė" @@ -1858,13 +1858,13 @@ msgid "Download %s" msgstr "Atsisiųsti %s" msgid "Map Download" -msgstr "" +msgstr "Žemėlapio parsiuntimas" msgid "Active" msgstr "Aktyvus" msgid "Download Enabled" -msgstr "" +msgstr "Parsiuntimas leidžiamas" msgid "Download completely" msgstr "" @@ -2010,14 +2010,14 @@ msgstr "Grįžti į maršrutą!" #. warning told msgid "Look out! Camera!" -msgstr "" +msgstr "Dėmesio! Kamera!" #. warning told msgid "Please decrease your speed" msgstr "Prašom sumažinti greitį" msgid "partial match" -msgstr "" +msgstr "dalinis sutapimas" #. Android resource: @strings/address_search_button msgid "Search" @@ -2032,7 +2032,7 @@ msgid "Route to here" msgstr "Maršrutas iki čia" msgid "Map data (c) OpenStreetMap contributors, ODBL" -msgstr "" +msgstr "Žemėlapio duomenys (c) OpenStreetMap pagalbininkai, ODBL" msgid "" "Current map location %s is not available\n" @@ -2047,6 +2047,8 @@ msgid "" "Sorry, we currently do not support maps above 3.8G on Android, please select " "a smaller one." msgstr "" +"Atleiskite, bet šiuo metu didesni nei 3,8GB žemėlapiai Androide nepalaikomi, " +"pasirinkite mažesnį žemėlapį." msgid "Cancel" msgstr "" @@ -2058,21 +2060,23 @@ msgid "" "New location set to %s\n" "Restart Navit to apply the changes." msgstr "" +"Nauja vieta nustatyta į %s\n" +"Perstartuokite Navit, kad pakeitimai įsigaliotų." msgid "Whole Planet" msgstr "" msgid "Africa" -msgstr "" +msgstr "Afrika" msgid "Canary Islands" -msgstr "" +msgstr "Kanarų salos" msgid "Asia" -msgstr "" +msgstr "Azija" msgid "Korea" -msgstr "" +msgstr "Korėja" msgid "Taiwan" msgstr "" @@ -2081,25 +2085,25 @@ msgid "UAE+Other" msgstr "" msgid "Oceania" -msgstr "" +msgstr "Okeanija" msgid "Tasmania" -msgstr "" +msgstr "Tasmanija" msgid "Victoria" -msgstr "" +msgstr "Viktorija" msgid "New South Wales" -msgstr "" +msgstr "Naujasis Pietų Velsas" msgid "Europe" -msgstr "" +msgstr "Europa" msgid "Western Europe" -msgstr "" +msgstr "Vakarų Europa" msgid "Azores" -msgstr "" +msgstr "Azorai" msgid "BeNeLux" msgstr "" @@ -2120,7 +2124,7 @@ msgid "Bourgogne" msgstr "" msgid "Bretagne" -msgstr "" +msgstr "Bretanė" msgid "Centre" msgstr "" @@ -2198,16 +2202,16 @@ msgid "Unterfranken" msgstr "" msgid "Berlin" -msgstr "" +msgstr "Berlynas" msgid "Brandenburg" -msgstr "" +msgstr "Brandenburgas" msgid "Bremen" -msgstr "" +msgstr "Brėmenas" msgid "Hamburg" -msgstr "" +msgstr "Hamburgas" msgid "Hessen" msgstr "" @@ -2240,16 +2244,16 @@ msgid "Thueringen" msgstr "" msgid "Mallorca" -msgstr "" +msgstr "Maljorka" msgid "Galicia" msgstr "" msgid "Scandinavia" -msgstr "" +msgstr "Skandinavija" msgid "England" -msgstr "" +msgstr "Anglija" msgid "Buckinghamshire" msgstr "" @@ -2258,19 +2262,19 @@ msgid "Cambridgeshire" msgstr "" msgid "Cumbria" -msgstr "" +msgstr "Kambrija" msgid "East yorkshire with hull" msgstr "" msgid "Essex" -msgstr "" +msgstr "Eseksas" msgid "Herefordshire" msgstr "" msgid "Kent" -msgstr "" +msgstr "Kentas" msgid "Lancashire" msgstr "" @@ -2279,7 +2283,7 @@ msgid "Leicestershire" msgstr "" msgid "Norfolk" -msgstr "" +msgstr "Norfolkas" msgid "Nottinghamshire" msgstr "Notingemšyras" @@ -2309,31 +2313,31 @@ msgid "Scotland" msgstr "Škotija" msgid "Wales" -msgstr "" +msgstr "Velsas" msgid "Crete" -msgstr "" +msgstr "Kreta" msgid "North America" -msgstr "" +msgstr "Šiaurės Amerika" msgid "Alaska" -msgstr "" +msgstr "Aliaska" msgid "Hawaii" -msgstr "" +msgstr "Havajai" msgid "USA" -msgstr "" +msgstr "JAV" msgid " (except Alaska and Hawaii)" -msgstr "" +msgstr " (išskyrus Aliaską ir Havajus)" msgid "Midwest" msgstr "" msgid "Michigan" -msgstr "" +msgstr "Mičiganas" msgid "Ohio" msgstr "" @@ -2354,28 +2358,28 @@ msgid "South" msgstr "" msgid "Arkansas" -msgstr "" +msgstr "Arkanzasas" msgid "District of Columbia" -msgstr "" +msgstr "Kolumbijos apygarda" msgid "Florida" -msgstr "" +msgstr "Florida" msgid "Louisiana" -msgstr "" +msgstr "Luiziana" msgid "Maryland" msgstr "" msgid "Mississippi" -msgstr "" +msgstr "Misisipė" msgid "Oklahoma" -msgstr "" +msgstr "Oklahoma" msgid "Texas" -msgstr "" +msgstr "Teksasas" msgid "Virginia" msgstr "Virdžinija" @@ -2420,7 +2424,7 @@ msgid "South+Middle America" msgstr "" msgid "Guyane Francaise" -msgstr "" +msgstr "Prancūzų gvinėja" msgid "downloading" msgstr "siunčiama" @@ -2437,13 +2441,13 @@ msgid "Not enough free space" msgstr "Nepakanka laisvos vietos" msgid "Error downloading map!" -msgstr "" +msgstr "Klaida parsiunčiant žemėlapį!" msgid "Error writing map!" -msgstr "" +msgstr "Klaida įrašant žemėlapį!" msgid "Map download aborted!" -msgstr "" +msgstr "Žemėlapio parsiuntimas nutrauktas!" #. Android resource: @strings/map_download_eta msgid "ETA" @@ -2527,13 +2531,13 @@ msgid "Satellite Status" msgstr "Palydovų būsena" msgid "NMEA Data" -msgstr "" +msgstr "NMEA duomenys" msgid "car_shortest" msgstr "Automobilis (trumpiausias maršrutas)" msgid "car_avoid_tolls" -msgstr "" +msgstr "D" msgid "car_pedantic" msgstr "" @@ -2572,6 +2576,15 @@ msgid "" "\n" "Enjoy Navit!" msgstr "" +"Dėkui, kad suinstaliavote Navit!\n" +"\n" +"Pradėkite pasirinkdami „Parsiųsti žemėlapius“ pagrindiniame meniu. Dėmesio: " +"Žemėlapių failai gali būti dideli (>50MB) -- rekomenduojame naudoti WiFi " +"ryšį.\n" +"\n" +"Žemėlapių duomenys: (c) OpenStreetMap pagalbininkai\n" +"\n" +"Sėkmės naudojant Navit!" #. Android resource: @strings/initial_info_box_OK msgid "OK" @@ -2603,7 +2616,7 @@ msgstr "Išeiti iš Navit" #. Android resource: @strings/optionsmenu_backup_restore msgid "Backup / Restore" -msgstr "" +msgstr "Atsarginė kopija / Atstatymas" #. Android resource: @strings/optionsmenu_set_map_location msgid "Set map location" @@ -2619,11 +2632,11 @@ msgstr "Siunčiama:" #. Android resource: @strings/map_download_download_error msgid "Error downloading map." -msgstr "" +msgstr "Klaida parsiunčiant žemėlapį." #. Android resource: @strings/map_download_download_aborted msgid "Map download aborted" -msgstr "" +msgstr "Žemėlapio parsiuntimas nutrauktas" #. Android resource: @strings/map_no_fix msgid "No location. Reopen after location fix." @@ -2643,7 +2656,7 @@ msgstr "Įveskite tikslą" #. Android resource: @strings/address_partial_match msgid "Match partial address" -msgstr "" +msgstr "Dalinis adreso sutapimas" #. Android resource: @strings/address_search_searching msgid "Searching..." @@ -2655,7 +2668,7 @@ msgstr "Adresas nerastas" #. Android resource: @strings/address_search_getting_results msgid "Getting search results" -msgstr "" +msgstr "Gaunami paieškos rezultatai" #. Android resource: @strings/address_search_loading_results msgid "Loading search results" @@ -2695,7 +2708,7 @@ msgstr "" #. Android resource: @strings/backup_failed msgid "Backup failed" -msgstr "" +msgstr "Nepavyko padaryti atsarginės kopijos" #. Android resource: @strings/no_backup_found msgid "No backup found" @@ -2703,7 +2716,7 @@ msgstr "Nerasta atsarginių kopijų" #. Android resource: @strings/failed_to_restore msgid "Failed to restore" -msgstr "" +msgstr "Nepavyko atstatyti" #. Android resource: @strings/backup_successful msgid "Backup successful" -- cgit v1.2.1 From e2f4719fc5d5dee162e3576e70d5ac8abe630e7f Mon Sep 17 00:00:00 2001 From: Pierre GRANDIN Date: Sat, 9 Jan 2016 10:47:18 -0800 Subject: Updated Hungarian translation from launchpad --- po/hu.po.in | 224 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 118 insertions(+), 106 deletions(-) diff --git a/po/hu.po.in b/po/hu.po.in index e658e77c0..a7237f69c 100644 --- a/po/hu.po.in +++ b/po/hu.po.in @@ -1,5 +1,5 @@ # Hungarian translations for navit -# Copyright (C) 2006-2015 The Navit Team +# Copyright (C) 2006-2016 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Bernath Marci https://launchpad.net/~bernath-marci @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2015-07-19 03:58+0000\n" -"Last-Translator: György Balló \n" +"PO-Revision-Date: 2016-01-04 19:56+0000\n" +"Last-Translator: Nagy Attila \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -191,7 +191,7 @@ msgstr "Amint lehet, fordujon meg" #. TRANSLATORS: the argument is the destination to follow #, c-format msgid "towards %s" -msgstr "" +msgstr "%s irányába" #, c-format msgid "Follow the road for the next %s" @@ -203,10 +203,10 @@ msgstr "Hajtson be a körforgalomba hamarosan." #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" -msgstr "" +msgstr "Hajtson be a körforgalomba %s múlva" msgid "then enter the roundabout" -msgstr "" +msgstr "majd hajtson be a körforgalomba" #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format @@ -251,19 +251,19 @@ msgstr "" #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format msgid "Take exit %1$s %2$s %3$s" -msgstr "" +msgstr "%3$s múlva hajtson ki %2$s a %1$s kihajtón" #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format msgid "Take the exit %1$s %2$s%3$s" -msgstr "" +msgstr "%2$s múlva hajtson ki %1$s %3$s irányába" #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" msgid "at interchange" -msgstr "" +msgstr "a csomópontnál" msgid "at exit" -msgstr "" +msgstr "a kijáratnál" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format @@ -550,7 +550,7 @@ msgstr "Bolívia" #. 535 msgid "Bonaire, Sint Eustatius and Saba" -msgstr "" +msgstr "Karib tengeri Bonaire, Sint Eustatius és Saba" #. 076 msgid "Brazil" @@ -642,7 +642,7 @@ msgstr "Zöldfoki-szigetek" #. 531 msgid "Curacao" -msgstr "" +msgstr "Curacao" #. 162 msgid "Christmas Island" @@ -1274,7 +1274,7 @@ msgstr "Salvador" #. 534 msgid "Sint Maarten (Dutch part)" -msgstr "" +msgstr "Sint Maarten (Holland rész)" #. 760 msgid "Syrian Arab Republic" @@ -1442,6 +1442,16 @@ msgid "" "\t-h: print this usage info and exit.\n" "\t-v: print the version and exit.\n" msgstr "" +"navit használata:\n" +"navit [opciók] [konfigurációs fájl]\n" +"\t-c : a használata konfigurációs fájlként az alapértelmezett " +"helyett\n" +"\t-d : a globális hibakeresési kimenet szintjét -re állítja (0=hiba, " +"1=figyelmeztetés, 2=információ, 3=hibakeresés)\n" +"\tA konfigurációs állománybeli beállítások ennek ellenére érvényre jutnak " +"amennyiben nagyobb értéket állítanak be.\n" +"\t-h: jelen használati információ megjelenítése és kilépés.\n" +"\t-v: verzióinformáció megjelenítése és kilépés.\n" #. We have not found an existing config file from all possibilities msgid "No config file navit.xml, navit.xml.local found\n" @@ -1457,7 +1467,7 @@ msgstr "A következő konfigurációs állomány használata: %s\n" #, c-format msgid "Error: No configuration found in config file '%s'\n" -msgstr "" +msgstr "Hiba: Nem található konfigurációs beállítás a fájlban '%s'\n" msgid "" "Internal initialization failed, exiting. Check previous error messages.\n" @@ -1580,10 +1590,10 @@ msgid "Opens address search dialog" msgstr "Címkeresés" msgid "_POI search" -msgstr "" +msgstr "_POI keresés" msgid "Opens POI search dialog" -msgstr "" +msgstr "POI keresés megnyitása" msgid "_Stop Navigation" msgstr "Navigálás vége" @@ -1628,49 +1638,49 @@ msgid "Data" msgstr "Adat" msgid "Pharmacy" -msgstr "" +msgstr "Gyógyszertár" msgid "Restaurant" -msgstr "" +msgstr "Étterem" msgid "Restaurant. Fast food" -msgstr "" +msgstr "Étterem. Gyorsétterem" msgid "Hotel" -msgstr "" +msgstr "Szálloda" msgid "Car parking" -msgstr "" +msgstr "Parkoló" msgid "Fuel station" msgstr "" msgid "Bank" -msgstr "" +msgstr "Bank" msgid "Hospital" -msgstr "" +msgstr "Kórház" msgid "Cinema" -msgstr "" +msgstr "Mozi" msgid "Train station" -msgstr "" +msgstr "Vasútállomás" msgid "School" -msgstr "" +msgstr "Iskola" msgid "Police" -msgstr "" +msgstr "Rendőrség" msgid "Justice" -msgstr "" +msgstr "Bíróság" msgid "Taxi" -msgstr "" +msgstr "Taxi" msgid "Shopping" -msgstr "" +msgstr "Bevásárlás" msgid "Distance from screen center (km)" msgstr "" @@ -1692,31 +1702,31 @@ msgid "Set next visit to %ld, %ld \n" msgstr "" msgid "POI search" -msgstr "" +msgstr "POI keresés" msgid "Select a category" -msgstr "" +msgstr "Válasszon egy kategóriát" msgid "Select a distance to look for (km)" -msgstr "" +msgstr "Válasszon keresési távolságot (km)" msgid "Select a POI" -msgstr "" +msgstr "POI kiválasztása" msgid " " -msgstr "" +msgstr " " msgid "Category" -msgstr "" +msgstr "Kategória" msgid "Direction" -msgstr "" +msgstr "Irány" msgid "Distance(m)" -msgstr "" +msgstr "Távolság (km)" msgid "Name" -msgstr "" +msgstr "Név:" msgid "Visit Before" msgstr "" @@ -2045,6 +2055,8 @@ msgid "" "Sorry, we currently do not support maps above 3.8G on Android, please select " "a smaller one." msgstr "" +"Jelenleg Androidon a 3.8GB-nál nagyobb térképek nem támogatottak, kérem " +"válasszon egy kisebbet." msgid "Cancel" msgstr "Mégse" @@ -2130,7 +2142,7 @@ msgid "Corse" msgstr "Korzika" msgid "Franche-Comte" -msgstr "" +msgstr "Franche-Comté" msgid "Haute-Normandie" msgstr "Felső-Normandia" @@ -2166,7 +2178,7 @@ msgid "Provence-Alpes-Cote-d-Azur" msgstr "Provence-Alpes-Cote-d-Azur" msgid "Rhone-Alpes" -msgstr "" +msgstr "Rhone-Alpes" msgid "Baden-Wuerttemberg" msgstr "Baden-Württemberg" @@ -2175,25 +2187,25 @@ msgid "Bayern" msgstr "Bajorország" msgid "Mittelfranken" -msgstr "" +msgstr "Közép-Frankföld" msgid "Niederbayern" msgstr "Niederbayern" msgid "Oberbayern" -msgstr "" +msgstr "Felső-Bajorország" msgid "Oberfranken" -msgstr "" +msgstr "Felső-Frankföld" msgid "Oberpfalz" -msgstr "" +msgstr "Felső-Pfalz" msgid "Schwaben" -msgstr "" +msgstr "Svábföld" msgid "Unterfranken" -msgstr "" +msgstr "Alsó-Frankföld" msgid "Berlin" msgstr "Berlin" @@ -2208,40 +2220,40 @@ msgid "Hamburg" msgstr "Hamburg" msgid "Hessen" -msgstr "" +msgstr "Hessen" msgid "Mecklenburg-Vorpommern" -msgstr "" +msgstr "Mecklenburg-Előpomeránia" msgid "Niedersachsen" msgstr "Alsó-Szászország" msgid "Nordrhein-westfalen" -msgstr "" +msgstr "Észak-Rajna-Vesztfália" msgid "Rheinland-Pfalz" -msgstr "" +msgstr "Rajna-vidék-Pfalz" msgid "Saarland" msgstr "Saar-vidék" msgid "Sachsen-Anhalt" -msgstr "" +msgstr "Szász-Anhalt" msgid "Sachsen" msgstr "Szászország" msgid "Schleswig-Holstein" -msgstr "" +msgstr "Schleswig-Holstein" msgid "Thueringen" msgstr "Türingia" msgid "Mallorca" -msgstr "" +msgstr "Mallorca" msgid "Galicia" -msgstr "" +msgstr "Galicia" msgid "Scandinavia" msgstr "Skandinávia" @@ -2250,67 +2262,67 @@ msgid "England" msgstr "Anglia" msgid "Buckinghamshire" -msgstr "" +msgstr "Buckinghamshire" msgid "Cambridgeshire" -msgstr "" +msgstr "Cambridgeshire" msgid "Cumbria" -msgstr "" +msgstr "Cumbria" msgid "East yorkshire with hull" -msgstr "" +msgstr "East Yorkshire, Hull" msgid "Essex" -msgstr "" +msgstr "Essex" msgid "Herefordshire" -msgstr "" +msgstr "Herefordshire" msgid "Kent" -msgstr "" +msgstr "Kent" msgid "Lancashire" -msgstr "" +msgstr "Lancashire" msgid "Leicestershire" -msgstr "" +msgstr "Leicestershire" msgid "Norfolk" -msgstr "" +msgstr "Norfolk" msgid "Nottinghamshire" -msgstr "" +msgstr "Nottinghamshire" msgid "Oxfordshire" -msgstr "" +msgstr "Oxfordshire" msgid "Shropshire" -msgstr "" +msgstr "Shropshire" msgid "Somerset" -msgstr "" +msgstr "Somerset" msgid "South yorkshire" -msgstr "" +msgstr "South yorkshire" msgid "Suffolk" -msgstr "" +msgstr "Suffolk" msgid "Surrey" -msgstr "" +msgstr "Surrey" msgid "Wiltshire" -msgstr "" +msgstr "Wiltshire" msgid "Scotland" -msgstr "" +msgstr "Skócia" msgid "Wales" -msgstr "" +msgstr "Wales" msgid "Crete" -msgstr "" +msgstr "Kréta" msgid "North America" msgstr "Észak-Amerika" @@ -2319,7 +2331,7 @@ msgid "Alaska" msgstr "Alaszka" msgid "Hawaii" -msgstr "" +msgstr "Hawaii" msgid "USA" msgstr "Amerikai Egyesült Államok" @@ -2328,97 +2340,97 @@ msgid " (except Alaska and Hawaii)" msgstr " (kivéve Alaszka és Hawaii)" msgid "Midwest" -msgstr "" +msgstr "Midwest" msgid "Michigan" -msgstr "" +msgstr "Michigan" msgid "Ohio" -msgstr "" +msgstr "Ohio" msgid "Northeast" msgstr "" msgid "Massachusetts" -msgstr "" +msgstr "Massachusetts" msgid "Vermont" -msgstr "" +msgstr "Vermont" msgid "Pacific" msgstr "" msgid "South" -msgstr "" +msgstr "Dél" msgid "Arkansas" -msgstr "" +msgstr "Arkansas" msgid "District of Columbia" -msgstr "" +msgstr "District of Columbia" msgid "Florida" -msgstr "" +msgstr "Florida" msgid "Louisiana" -msgstr "" +msgstr "Louisiana" msgid "Maryland" -msgstr "" +msgstr "Maryland" msgid "Mississippi" -msgstr "" +msgstr "Mississippi" msgid "Oklahoma" -msgstr "" +msgstr "Oklahoma" msgid "Texas" -msgstr "" +msgstr "Texas" msgid "Virginia" -msgstr "" +msgstr "Virginia" msgid "West Virginia" -msgstr "" +msgstr "Nyugat-Virginia" msgid "West" -msgstr "" +msgstr "Nyugat" msgid "Arizona" -msgstr "" +msgstr "Arizona" msgid "California" -msgstr "" +msgstr "California" msgid "Colorado" -msgstr "" +msgstr "Colorado" msgid "Idaho" -msgstr "" +msgstr "Idaho" msgid "Montana" -msgstr "" +msgstr "Montana" msgid "New Mexico" -msgstr "" +msgstr "New Mexico" msgid "Nevada" -msgstr "" +msgstr "Nevada" msgid "Oregon" -msgstr "" +msgstr "Oregon" msgid "Utah" -msgstr "" +msgstr "Utah" msgid "Washington State" -msgstr "" +msgstr "Washington Állam" msgid "South+Middle America" msgstr "Dél és Közép-Amerika" msgid "Guyane Francaise" -msgstr "" +msgstr "Francia Guyana" msgid "downloading" msgstr "letöltés" @@ -2428,7 +2440,7 @@ msgid "ready" msgstr "kész" msgid "Media selected for map storage is not available" -msgstr "" +msgstr "A térkép tárolására kijelölt hordozó nem elérhető" #. Android resource: @strings/map_download_not_enough_free_space msgid "Not enough free space" -- cgit v1.2.1 From 59f741f634cab4529867e4296276337f03fa8b87 Mon Sep 17 00:00:00 2001 From: Sebastian Leske Date: Fri, 8 Jan 2016 08:35:03 +0100 Subject: Fix:core:Exit if GUI or graphics init / connection fails. If the initialization of GUI or graphics plugin or connecting the two fails, exit immediately. In that state we cannot reliably continue running, plus there's probably no point anyway. --- navit/graphics/android/graphics_android.c | 2 -- navit/graphics/sdl/graphics_sdl.c | 4 +--- navit/navit.c | 16 ++++++++-------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/navit/graphics/android/graphics_android.c b/navit/graphics/android/graphics_android.c index efde8358a..696ee6b3c 100644 --- a/navit/graphics/android/graphics_android.c +++ b/navit/graphics/android/graphics_android.c @@ -34,8 +34,6 @@ #include "android.h" #include "command.h" -int dummy; - struct graphics_priv { jclass NavitGraphicsClass; jmethodID NavitGraphics_draw_polyline, NavitGraphics_draw_polygon, NavitGraphics_draw_rectangle, diff --git a/navit/graphics/sdl/graphics_sdl.c b/navit/graphics/sdl/graphics_sdl.c index e5d9f7872..886aacd3d 100644 --- a/navit/graphics/sdl/graphics_sdl.c +++ b/navit/graphics/sdl/graphics_sdl.c @@ -96,8 +96,6 @@ struct graphics_priv { /* */ }; -static int dummy; - #ifdef USE_WEBOS # define WEBOS_KEY_SHIFT 0x130 # define WEBOS_KEY_SYM 0x131 @@ -875,7 +873,7 @@ get_data(struct graphics_priv *this, char const *type) win->disable_suspend=NULL; return win; } else { - return &dummy; + return NULL; } } diff --git a/navit/navit.c b/navit/navit.c index b130ed967..27426fe17 100644 --- a/navit/navit.c +++ b/navit/navit.c @@ -2041,22 +2041,22 @@ navit_init(struct navit *this_) dbg(lvl_info,"enter gui %p graphics %p\n",this_->gui,this_->gra); if (!this_->gui && !(this_->flags & 2)) { - dbg(lvl_error,"Warning: No GUI available.\n"); - return; + dbg(lvl_error,"FATAL: No GUI available.\n"); + exit(1); } if (!this_->gra && !(this_->flags & 1)) { - dbg(lvl_error,"Warning: No graphics subsystem available.\n"); - return; + dbg(lvl_error,"FATAL: No graphics subsystem available.\n"); + exit(1); } dbg(lvl_info,"Connecting gui to graphics\n"); if (this_->gui && this_->gra && gui_set_graphics(this_->gui, this_->gra)) { struct attr attr_type_gui, attr_type_graphics; gui_get_attr(this_->gui, attr_type, &attr_type_gui, NULL); graphics_get_attr(this_->gra, attr_type, &attr_type_graphics, NULL); - dbg(lvl_error,"failed to connect graphics '%s' to gui '%s'\n", attr_type_graphics.u.str, attr_type_gui.u.str); - dbg(lvl_error," Please see http://wiki.navit-project.org/index.php/Failed_to_connect_graphics_to_gui\n"); - dbg(lvl_error," for explanations and solutions\n"); - return; + dbg(lvl_error,"FATAL: Failed to connect graphics '%s' to gui '%s'\n", attr_type_graphics.u.str, attr_type_gui.u.str); + dbg(lvl_error,"Please see http://wiki.navit-project.org/index.php/Failed_to_connect_graphics_to_gui " + "for explanations and solutions\n"); + exit(1); } if (this_->speech && this_->navigation) { struct attr speech; -- cgit v1.2.1 From e38b33546d2f7ee631b7da603c8fa894034c435e Mon Sep 17 00:00:00 2001 From: mvglasow Date: Tue, 19 Jan 2016 20:25:12 +0100 Subject: Refactor:core:Document window.h Signed-off-by: mvglasow --- navit/window.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/navit/window.h b/navit/window.h index b2e2acb7a..706bea798 100644 --- a/navit/window.h +++ b/navit/window.h @@ -17,8 +17,11 @@ * Boston, MA 02110-1301, USA. */ +/** + * Describes the Navit application window or equivalent. + */ struct window { - void *priv; - int (*fullscreen)(struct window *win, int on); - void (*disable_suspend)(struct window *win); + void *priv; /**< Private data of the graphics implementation */ + int (*fullscreen)(struct window *win, int on); /**< Method to toggle fullscreen mode */ + void (*disable_suspend)(struct window *win); /**< Method to disable suspend mode or screen savers */ }; -- cgit v1.2.1 From 86df00e1313d5b0351452f0e0ee7a7750fd06223 Mon Sep 17 00:00:00 2001 From: mvglasow Date: Wed, 20 Jan 2016 13:47:49 +0100 Subject: Refactor:osd:Minor documentation improvements Signed-off-by: mvglasow --- navit/osd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/navit/osd.c b/navit/osd.c index 26e8952ee..a5530c0d7 100644 --- a/navit/osd.c +++ b/navit/osd.c @@ -196,7 +196,9 @@ osd_std_calculate_sizes(struct osd_item *item, int w, int h) * @brief Recalculates the size and position of an OSD item and * triggers a redraw of the item. * - * @param item + * This is a callback function that can be stored in the `resize_cb` member of an OSD item. + * + * @param item The OSD item to resize and redraw * @param priv * @param w Available screen width in pixels (the width that corresponds to * 100%) -- cgit v1.2.1 From 6585dd2d01f7458e90aec7ee4dd19f82a95f8b4e Mon Sep 17 00:00:00 2001 From: mvglasow Date: Thu, 21 Jan 2016 13:17:03 +0100 Subject: Refactor:osd:Document osd_set_std_graphic Signed-off-by: mvglasow --- navit/osd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/navit/osd.c b/navit/osd.c index a5530c0d7..38371f6cd 100644 --- a/navit/osd.c +++ b/navit/osd.c @@ -395,6 +395,16 @@ osd_set_keypress(struct navit *nav, struct osd_item *item) } } +/** + * @brief Sets up the graphics for an item. + * + * This method creates a new graphics overlay for an item and initializes its attributes (colors, font + * and callbacks for resize and key events). + * + * @param nav The navit object + * @param item The OSD item + * @param priv The `struct osd_priv` for the OSD item + */ void osd_set_std_graphic(struct navit *nav, struct osd_item *item, struct osd_priv *priv) { -- cgit v1.2.1 From 41ea9f0d7e752facaac046977387ad35547e2cb7 Mon Sep 17 00:00:00 2001 From: Sebastian Leske Date: Tue, 12 Jan 2016 08:29:00 +0100 Subject: Refactor:core:Fix Doxygen comments; @code only for code blocks. --- navit/navigation.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/navit/navigation.c b/navit/navigation.c index ba9b5aaeb..849bc7630 100644 --- a/navit/navigation.c +++ b/navit/navigation.c @@ -46,6 +46,10 @@ /* #define DEBUG */ +/** @file + * + * Generates navigation messages for a calculated route. + */ static int roundabout_extra_length=50; /* TODO: find out if this is being used elsewhere and, if so, move this definition somewhere more generic */ @@ -86,7 +90,7 @@ static int turn_2_limit = 45; static int sharp_turn_limit = 110; /** Minimum absolute delta for a U turn. - * Maneuvers whose absolute delta is less than this (but at least {@code min_turn_limit}) will always be announced as turns. + * Maneuvers whose absolute delta is less than this (but at least #min_turn_limit) will always be announced as turns. * Note that, depending on other conditions, even maneuvers whose delta exceeds the threshold may still be announced as (sharp) turns. */ static int u_turn_limit = 165; @@ -204,14 +208,14 @@ int distances[]={1,2,3,4,5,10,25,50,75,100,150,200,250,300,400,500,750,-1}; /** Merging into a motorway-like road, direction undefined. * This value is not intended to be set directly but can be used for - * comparisons, e.g. {@code merge_or_exit & mex_merge}. */ + * comparisons, e.g. `merge_or_exit & mex_merge`. */ #define mex_merge 1 /** Exiting from a motorway-like road, direction undefined. * This should only be used for ramps leading to a non-motorway road. - * For interchanges, use {@code mex_interchange} instead. + * For interchanges, use #mex_interchange instead. * This value is not intended to be set directly but can be used for - * comparisons, e.g. {@code merge_or_exit & mex_exit}. */ + * comparisons, e.g. `merge_or_exit & mex_merge`. */ #define mex_exit 2 /** Motorway-like road splits in two. @@ -222,14 +226,14 @@ int distances[]={1,2,3,4,5,10,25,50,75,100,150,200,250,300,400,500,750,-1}; #define mex_merge_right 9 /** Exiting from a motorway-like road to the right. - * See {@code mex_exit} for usage. */ + * @see mex_exit for usage */ #define mex_exit_right 10 /** Merging into a motorway-like road to the left (coming from the right) */ #define mex_merge_left 17 /** Exiting from a motorway-like road to the left. - * See {@code mex_exit} for usage. */ + * @see mex_exit for usage */ #define mex_exit_left 18 /** -- cgit v1.2.1 From 8114a28fcfbc99c052be44117b3d121262a1560c Mon Sep 17 00:00:00 2001 From: Sebastian Leske Date: Tue, 12 Jan 2016 08:37:37 +0100 Subject: Refactor:core:Update Doxyfile to Doxygen 1.8.9.1 --- navit/Doxyfile | 2582 ++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 1869 insertions(+), 713 deletions(-) diff --git a/navit/Doxyfile b/navit/Doxyfile index e21675546..b7e049301 100644 --- a/navit/Doxyfile +++ b/navit/Doxyfile @@ -1,1228 +1,2384 @@ -# Doxyfile 1.4.4 +# Doxyfile 1.8.9.1 # This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project +# doxygen (www.doxygen.org) for a project. # -# All text after a hash (#) is considered a comment and will be ignored +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single 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 (" ") +# 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 #--------------------------------------------------------------------------- -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. +# 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. +# The default value is: UTF-8. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. PROJECT_NAME = navit -# 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. +# 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 = 0.0 -# 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. +# 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 a logo or an 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) path +# into which the generated documentation will be written. 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. +# 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 causes +# performance problems for the file system. +# The default value is: NO. 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: -# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, -# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, -# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, -# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, -# Swedish, and Ukrainian. +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = 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. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, +# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), +# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, +# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, +# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, +# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, +# Ukrainian and Vietnamese. +# The default value is: English. OUTPUT_LANGUAGE = English -# This tag can be used to specify the encoding used in the generated output. -# The encoding is not always determined by the language that is chosen, -# but also whether or not the output is meant for Windows or non-Windows users. -# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES -# forces the Windows encoding (this is the default for the Windows binary), -# whereas setting the tag to NO uses a Unix-style encoding (the default for -# all platforms other than Windows). - -USE_WINDOWS_ENCODING = NO - -# 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. +# If the BRIEF_MEMBER_DESC tag is set to YES, 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. +# The default value is: YES. 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 +# If the REPEAT_BRIEF tag is set to YES, 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. +# The default value is: YES. 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" +# 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 and the. -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = -# 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 +# 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. +# The default value is: NO. 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 +# 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. +# The default value is: NO. 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. +# If the FULL_PATH_NAMES tag is set to YES, 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 +# The default value is: YES. 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. +# 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 can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. -STRIP_FROM_PATH = +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. +# 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 list of include paths that are normally passed to the compiler +# using the -I flag. -STRIP_FROM_INC_PATH = +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 is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. 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 the Qt-style comments (thus requiring an -# explicit @brief command for a brief description. +# 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-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. JAVADOC_AUTOBRIEF = NO -# 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. +# 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 Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. -MULTILINE_CPP_IS_BRIEF = NO +QT_AUTOBRIEF = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. +# 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 behavior. 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 behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. -DETAILS_AT_TOP = NO +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. +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. INHERIT_DOCS = 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 - -# 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. +# 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. +# The default value is: NO. 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. +# 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. +# Minimum value: 1, maximum value: 16, default value: 4. TAB_SIZE = 8 -# 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. +# This tag can be used to specify a number of aliases that act 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. -ALIASES = +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. +# 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. +# The default value is: NO. OPTIMIZE_OUTPUT_FOR_C = YES -# 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. +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. OPTIMIZE_OUTPUT_JAVA = 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. +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. + +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. +# The default value is: NO. + +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, +# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: +# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: +# Fortran. In the later case the parser tries to guess whether the code is fixed +# or free formatted code, this is the default for Fortran type files), VHDL. 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: For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If the MARKDOWN_SUPPORT tag is enabled 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. +# The default value is: YES. + +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 putting a % sign in front of the word or +# globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. + +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); +# versus func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. +# The default value is: NO. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. +# The default value is: NO. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# http://www.riverbankcomputing.co.uk/software/sip/intro) 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. +# The default value is: NO. + +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 will make +# doxygen to 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. +# The default value is: YES. + +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. +# The default value is: NO. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES 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. +# The default value is: YES. 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). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef 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, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT tag 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. +# The default value is: NO. + +TYPEDEF_HIDES_STRUCT = NO + +# 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 appears 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. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. + +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 +# 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 respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. EXTRACT_ALL = NO -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. +# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will +# be included in the documentation. +# The default value is: NO. EXTRACT_PRIVATE = NO -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. +# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal +# scope will be included in the documentation. +# The default value is: NO. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be +# included in the documentation. +# The default value is: NO. EXTRACT_STATIC = NO -# 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. +# 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. Does not have any effect +# for Java sources. +# The default value is: YES. 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. +# This flag is only useful for Objective-C code. If 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, only methods in the interface are +# included. +# The default value is: NO. EXTRACT_LOCAL_METHODS = 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. +# 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 namespace +# are hidden. +# The default value is: NO. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO 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. +# The default value is: NO. 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. +# 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, these classes will be included in the various overviews. This option +# has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. 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. +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# (class|struct|union) declarations. If set to NO, these declarations will be +# included in the documentation. +# The default value is: NO. 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. +# 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, these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. 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. +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. 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 +# 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. +# The default value is: system dependent. CASE_SENSE_NAMES = YES -# 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. +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES, the +# scope will be hidden. +# The default value is: NO. 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. +# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will +# append additional text to a page's title, such as Class Reference. If set to +# YES the compound reference will be hidden. +# The default value is: NO. + +HIDE_COMPOUND_REFERENCE= NO + +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. SHOW_INCLUDE_FILES = YES -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. +# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each +# grouped member an include statement to the documentation, telling the reader +# which file to include in order to use the member. +# The default value is: NO. + +SHOW_GROUPED_MEMB_INC = NO + +# 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. +# The default value is: NO. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. 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. +# If the SORT_MEMBER_DOCS tag is set to YES 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. +# The default value is: YES. 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. +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. +# The default value is: NO. SORT_BRIEF_DOCS = 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. +# 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 constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: 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 group names will +# appear in their defined order. +# The default value is: NO. + +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 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. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. SORT_BY_SCOPE_NAME = 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. +# 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. +# The default value is: NO. + +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. +# The default value is: YES. 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. +# 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. +# The default value is: YES. 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. +# 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. +# The default value is: YES. 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. +# 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. +# The default value is: YES. GENERATE_DEPRECATEDLIST= YES -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if ... \endif and \cond +# ... \endcond blocks. -ENABLED_SECTIONS = +ENABLED_SECTIONS = -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define 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 defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have 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 value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. 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 +# 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. +# The default value is: YES. SHOW_USED_FILES = YES -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is 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 value is: YES. -SHOW_DIRECTORIES = YES +SHOW_FILES = 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 , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the progam writes to standard output -# is used as the file version. See the manual for examples. +# 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 value is: YES. -FILE_VERSION_FILTER = +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. For an example see the documentation. + +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. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This 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. See also \cite for info how to create references. + +CITE_BIB_FILES = #--------------------------------------------------------------------------- -# configuration options related to warning and progress messages +# 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. +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. 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. +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. 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. +# If the WARN_IF_UNDOCUMENTED tag 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. +# The default value is: YES. 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. +# If the WARN_IF_DOC_ERROR tag 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. +# The default value is: YES. WARN_IF_DOC_ERROR = YES -# This WARN_NO_PARAMDOC option can be abled 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. +# This 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, doxygen will only warn about wrong or incomplete +# parameter documentation, but not about the absence of documentation. +# The default value is: NO. 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) +# 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) +# The default value is: $file:$line: $text. 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. +# 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 standard +# error (stderr). -WARN_LOGFILE = +WARN_LOGFILE = #--------------------------------------------------------------------------- -# configuration options related to the input files +# 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. +# The INPUT tag is 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. +# Note: If this tag is empty the current directory is searched. + +INPUT = -INPUT = +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# possible encodings. +# The default value is: 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++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm +INPUT_ENCODING = UTF-8 -FILE_PATTERNS = +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard patterns (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++, *.java, *.ii, +# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, +# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, +# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, +# *.qsf, *.as and *.js. -# 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. +FILE_PATTERNS = + +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. RECURSIVE = YES -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a +# 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 = +EXCLUDE = -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded +# 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. +# The default value is: NO. 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/* +# 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 +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* -EXCLUDE_PATTERNS = +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). +# 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 = +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. +# 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 = +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. +# 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. +# The default value is: NO. 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). +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). -IMAGE_PATH = +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 , where -# is the value of the INPUT_FILTER tag, and 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. +# 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: +# +# +# +# where is the value of the INPUT_FILTER tag, and 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. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. -INPUT_FILTER = +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, INPUT_FILTER -# is applied to all files. +# 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 information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. -FILTER_PATTERNS = +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). +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. 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 tag requires that the tag FILTER_SOURCE_FILES is set to YES. + +FILTER_SOURCE_PATTERNS = + +# If the USE_MDFILE_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 to reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = + #--------------------------------------------------------------------------- -# configuration options related to source browsing +# 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. +# 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 that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. SOURCE_BROWSER = NO -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# classes and enums directly into the documentation. +# The default value is: NO. 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 and C++ comments will always remain visible. +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. STRIP_CODE_COMMENTS = YES -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented -# functions referencing it will be listed. +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# function all documented functions referencing it will be listed. +# The default value is: NO. REFERENCED_BY_RELATION = YES -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities -# called/used by that function will be listed. +# 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. +# The default value is: NO. REFERENCES_RELATION = 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. +# If the REFERENCES_LINK_SOURCE tag is set to YES 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. +# The default value is: YES. + +REFERENCES_LINK_SOURCE = YES + +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = 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. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the config file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. 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. +# If the VERBATIM_HEADERS tag is set the YES 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. +# See also: Section \class. +# The default value is: YES. VERBATIM_HEADERS = YES +# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the +# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the +# cost of reduced performance. This can be particularly helpful with template +# rich C++ code for which doxygen's built-in parser lacks the necessary type +# information. +# Note: The availability of this option depends on whether or not doxygen was +# compiled with the --with-libclang option. +# The default value is: NO. + +CLANG_ASSISTED_PARSING = NO + +# If clang assisted parsing is enabled you can provide the compiler with command +# line options that you would normally use when invoking the compiler. Note that +# the include paths will already be set by doxygen for the files and directories +# specified with INPUT and INCLUDE_PATH. +# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. + +CLANG_OPTIONS = + #--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index +# 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. +# 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. +# The default value is: YES. ALPHABETICAL_INDEX = NO -# 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]) +# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in +# which the alphabetical index list will be split. +# Minimum value: 1, maximum value: 20, default value: 5. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. 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. +# 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 a prefix (or a list of prefixes) that should be ignored +# while generating the index headers. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- -# configuration options related to the HTML output +# Configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. +# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output +# The default value is: YES. 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. +# 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. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. 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. +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. 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 +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a # standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. + +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. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_STYLESHEET = + +# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# cascading style sheets that are 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 therefore more robust against future updates. +# Doxygen will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). For an example see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +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. +# This tag requires that the tag GENERATE_HTML is set to YES. + +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. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. + +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. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +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. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. + +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 YES can help to show when doxygen was last run and thus if the +# documentation is up to date. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_TIMESTAMP = NO + +# 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. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +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. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +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 (see: http://developer.apple.com/tools/xcode/), 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. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_DOCSET = NO + +# This tag determines the name of the docset 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. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# 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. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# The DOCSET_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. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on +# Windows. +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_HTMLHELP = NO -HTML_HEADER = +# 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. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. -# 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. +CHM_FILE = -HTML_FOOTER = +# 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. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. -# 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 the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! +HHC_LOCATION = -HTML_STYLESHEET = +# 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). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. +GENERATE_CHI = NO -HTML_ALIGN_MEMBERS = YES +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. -# 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 compressed HTML help file (.chm) -# of the generated HTML documentation. +CHM_INDEX_ENCODING = -GENERATE_HTMLHELP = NO +# 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. Furthermore it +# enables the Previous and Next buttons. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. -# 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. +BINARY_TOC = NO -CHM_FILE = +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. -# 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. +TOC_EXPAND = NO -HHC_LOCATION = +# 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. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +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. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. + +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 Qt Help Project / Virtual +# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- +# folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_VIRTUAL_FOLDER = doc + +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_SECT_FILTER_ATTRS = + +# 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. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they 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. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +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. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. -# 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). +DISABLE_INDEX = NO -GENERATE_CHI = 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. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can +# further fine-tune the look of the index. As an example, the default style +# sheet generated by doxygen has an example that shows how to put an image at +# the root of the tree instead of the PROJECT_NAME. Since the tree basically has +# the same information as the tab index, you could consider setting +# DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. -# 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. +GENERATE_TREEVIEW = YES -BINARY_TOC = NO +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values 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. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. -# 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. +ENUM_VALUES_PER_LINE = 4 -TOC_EXPAND = NO +# 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. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. +TREEVIEW_WIDTH = 250 -DISABLE_INDEX = NO +# If 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. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. +EXT_LINKS_IN_WINDOW = NO -ENUM_VALUES_PER_LINE = 4 +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. 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. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. -# If the GENERATE_TREEVIEW tag 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 (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. +FORMULA_FONTSIZE = 10 -GENERATE_TREEVIEW = YES +# 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 directory before the changes have effect. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +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 pre-rendered 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. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +USE_MATHJAX = NO + +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. See the MathJax site (see: +# http://docs.mathjax.org/en/latest/output.html) for more details. +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility), NativeMML (i.e. MathML) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. + +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. +# The default value is: http://cdn.mathjax.org/mathjax/latest. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest + +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_CODEFILE = + +# 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. It is possible to +# search using the keyboard; to jump to the search box use + S +# (what the is depends on the OS and browser, but it is typically +# , /