Update doxygen color

Remove old search and implement new search using filtering.
Tree storage modified to use combination struct
2019-02-05 20:54:29 +01:00 · 2019-02-05 20:38:52 +01:00 · 2019-02-05 19:45:02 +01:00 · 2019-02-04 21:52:50 +01:00 · 2019-02-04 20:02:10 +01:00 · 2019-02-03 22:50:34 +01:00
27 changed files with 719 additions and 239 deletions
--- a/.buildconfig
+++ b/.buildconfig
@@ -1,10 +0,0 @@
-[default]
-name=Default
-runtime=host
-config-opts=
-run-opts=
-prefix=/home/mari/.cache/gnome-builder/install/gds-render/host
-app-id=
-postbuild=
-prebuild=
-default=true
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,5 @@ Thumbs.db
 *.exe

 *.user
+*.user*
+*.buildconfig
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,25 +1,25 @@
+project(gds-render)
+
 cmake_minimum_required(VERSION 2.8)
 find_package(PkgConfig REQUIRED)
 pkg_search_module(GLIB REQUIRED glib-2.0)
 pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
 pkg_check_modules(CAIRO REQUIRED cairo)

-project(gds-render)
-
 add_subdirectory(glade)
+add_subdirectory(doxygen)

 include_directories(${GLIB_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS})
 link_directories(${GLIB_LINK_DIRS} ${GTK3_LINK_DIRS} ${CAIRO_LINK_DIRS})
 add_definitions(${GLIB2_CFLAGS_OTHER})

-
 aux_source_directory("widgets" LAYER_SOURCES)
 aux_source_directory("tree-renderer" RENDERER_SOURCES)
 aux_source_directory("gds-parser" PARSER_SOURCES)
 aux_source_directory("latex-output" LATEX_SOURCES)
 aux_source_directory("cairo-output" CAIRO_SOURCES)
 aux_source_directory("trigonometric" TRIG_SOURCES)
-set(SOURCE "main.c" "layer-selector.c" "mapping-parser.c" "command-line.c" "main-window.c")
+set(SOURCE "main.c" "layer-selector.c" "mapping-parser.c" "command-line.c" "main-window.c" "external-renderer.c")

 set(SOURCE
  ${SOURCE}
@@ -36,6 +36,6 @@ add_compile_options(-Wall)
 add_executable(${PROJECT_NAME} ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/glade/resources.c)
 add_dependencies(${PROJECT_NAME} glib-resources)
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/glade/resources.c PROPERTIES GENERATED 1)
-target_link_libraries(${PROJECT_NAME} ${GLIB_LDFLAGS} ${GTK3_LDFLAGS} ${CAIRO_LDFLAGS} m)
+target_link_libraries(${PROJECT_NAME} ${GLIB_LDFLAGS} ${GTK3_LDFLAGS} ${CAIRO_LDFLAGS} m ${CMAKE_DL_LIBS})
 install (TARGETS ${PROJECT_NAME} DESTINATION bin)

--- a/README.MD
+++ b/README.MD
@@ -0,0 +1,21 @@
+# GDS-Render
+
+This software is a rendering programm for GDS2 layout files.
+The GDS2 format is mainly used in integrated circuit development.
+This program allows the conversion of a GDS file to a vector graphics file.
+
+## Output Formats
+* Export GDS Layout to LaTeX (using TikZ).
+* Export to PDF (Cairographics).
+
+# Features
+Note: Due to various size limitations of both TikZ and the PDF export, the layout might not render correctly. In this case adjust the scale value. A higher scale value scales down your design.
+
+* Configurable layer stack-up.
+* Layer colors configurable as ARGB color values.
+* Command line interface.
+* ~~Awesome~~ Somehow usable GUI.
+
+# License and Other Stuff
+* Free software (GPLv2 _only_)
+* Coded in plain C using GTK+3.0, Glib2, and Cairographics
--- a/cairo-output/cairo-output.h
+++ b/cairo-output/cairo-output.h
@@ -35,7 +35,7 @@

 /**
 * @brief Render \p cell to a PDF file specified by \p pdf_file
- * @param cell Toplevel cell to render
+ * @param cell Toplevel cell to @ref Cairo-Renderer
 * @param layer_infos List of layer information. Specifies color and layer stacking
 * @param pdf_file PDF output file. Set to NULL if no PDF file has to be generated
 * @param svg_file SVG output file. Set to NULL if no SVG file has to be generated
--- a/command-line.c
+++ b/command-line.c
@@ -34,6 +34,7 @@
 #include "mapping-parser.h"
 #include "cairo-output/cairo-output.h"
 #include "latex-output/latex-output.h"
+#include "external-renderer.h"

 /**
 * @brief Delete layer_info and free nem element.
@@ -52,7 +53,7 @@ static void delete_layer_info_with_name(struct layer_info *info)

 void command_line_convert_gds(char *gds_name, char *pdf_name, char *tex_name, gboolean pdf, gboolean tex,
 			      char *layer_file, char *cell_name, double scale, gboolean pdf_layers,
-			      gboolean pdf_standalone, gboolean svg, char *svg_name)
+			      gboolean pdf_standalone, gboolean svg, char *svg_name, char *so_name, char *so_out_file)
 {
 	GList *libs = NULL;
 	FILE *tex_file;
@@ -71,7 +72,7 @@ void command_line_convert_gds(char *gds_name, char *pdf_name, char *tex_name, gb
 	struct gds_cell *toplevel_cell = NULL, *temp_cell;

 	/* Check if parameters are valid */
-	if (!gds_name || ! pdf_name || !tex_name || !layer_file || !cell_name) {
+	if (!gds_name || (!pdf_name && pdf)  || (!tex_name && tex) || !layer_file || !cell_name) {
 		printf("Probably missing argument. Check --help option\n");
 		return;
 	}
@@ -144,6 +145,16 @@ void command_line_convert_gds(char *gds_name, char *pdf_name, char *tex_name, gb
 		fclose(tex_file);
 	}

+	if (so_name && so_out_file) {
+		if (strlen(so_name) == 0 || strlen(so_out_file) == 0)
+			goto ret_clear_list;
+
+		/* Render output using external renderer */
+		printf("Invoking external renderer!\n");
+		external_renderer_render_cell(toplevel_cell, layer_info_list, so_out_file, so_name);
+		printf("External renderer finished!\n");
+	}
+
 ret_clear_list:
 	g_list_free_full(layer_info_list, (GDestroyNotify)delete_layer_info_with_name);

--- a/command-line.h
+++ b/command-line.h
@@ -18,7 +18,7 @@
 */

 /**
- * @file command-line.c
+ * @file command-line.h
 * @brief Render according to command line parameters
 * @author Mario Hüttel <mario.huettel@gmx.net>
 */
@@ -45,11 +45,13 @@
 * @param pdf_layers TikZ creates OCG layers
 * @param pdf_standalone LaTeX document is standalone7
 * @param svg Render to SVG file
+ * @param so_name Path to shared object of custom renderer
+ * @param so_out_file Output file path for custom renderer
 * @param svg_name SVG file name
 */
 void command_line_convert_gds(char *gds_name, char *pdf_name, char *tex_name, gboolean pdf, gboolean tex,
 			      char *layer_file, char *cell_name, double scale, gboolean pdf_layers,
-			      gboolean pdf_standalone, gboolean svg, char *svg_name);
+			      gboolean pdf_standalone, gboolean svg, char *svg_name, char *so_name, char *so_out_file);

 #endif /* _COMMAND_LINE_H_ */

--- a/doxygen/CMakeLists.txt
+++ b/doxygen/CMakeLists.txt
@@ -0,0 +1,10 @@
+find_package(Doxygen)
+if (DOXYGEN_FOUND)
+ 	add_custom_target(doxygen
+		COMMAND ./build-doxygen.sh "${PROJECT_BINARY_DIR}"
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+		COMMENT "Generating documentation with Doxygen")
+		
+else (DOXYGEN_FOUND)
+  message("Doxygen need to be installed to generate the doxygen documentation")
+endif (DOXYGEN_FOUND)
--- a/doxygen/Doxyconfig
+++ b/doxygen/Doxyconfig
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.14
+# Doxyfile 1.8.15

 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -17,10 +17,10 @@
 # Project related configuration options
 #---------------------------------------------------------------------------

-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See
+# This tag specifies the encoding used for all characters in the configuration
+# 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
 # https://www.gnu.org/software/libiconv/ for the list of possible encodings.
 # The default value is: UTF-8.

@@ -38,13 +38,13 @@ PROJECT_NAME           = GDS-Render
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 
+PROJECT_NUMBER         = $(PROJECT_NUMBER)

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.

-PROJECT_BRIEF          = 
+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
@@ -58,7 +58,7 @@ PROJECT_LOGO           = ../icon/gds-render.svg
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.

-OUTPUT_DIRECTORY       = ./output
+OUTPUT_DIRECTORY       = $(OUTPUT_DIRECTORY)

 # 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
@@ -93,6 +93,14 @@ ALLOW_UNICODE_NAMES    = NO

 OUTPUT_LANGUAGE        = English

+# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all generated output in the proper direction.
+# Possible values are: None, LTR, RTL and Context.
+# The default value is: None.
+
+OUTPUT_TEXT_DIRECTION  = None
+
 # 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.
@@ -162,7 +170,7 @@ FULL_PATH_NAMES        = NO
 # 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
@@ -171,7 +179,7 @@ STRIP_FROM_PATH        =
 # 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
@@ -238,14 +246,18 @@ TAB_SIZE               = 4
 # "Side Effects:". You can put \n's in the value part of an alias to insert
 # newlines (in the resulting output). You can put ^^ in the value part of an
 # alias to insert a newline as if a physical newline was in the original file.
+# When you need a literal { or } or , in the value part of an alias you have to
+# escape them by means of a backslash (\), this can lead to conflicts with the
+# commands \{ and \} for these it is advised to use the version @{ and @} or use
+# a double escape (\\{ and \\})

-ALIASES                = 
+ALIASES                =

 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding "class=itcl::class"
 # will allow you to use the command class in the itcl::class meaning.

-TCL_SUBST              = 
+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
@@ -275,28 +287,37 @@ OPTIMIZE_FOR_FORTRAN   = NO

 OPTIMIZE_OUTPUT_VHDL   = NO

+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_SLICE  = 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.
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# 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, tcl. 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      = 
+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.
+# documentation. See https://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.
@@ -649,7 +670,7 @@ GENERATE_DEPRECATEDLIST= YES
 # sections, marked by \if <section_label> ... \endif and \cond <section_label>
 # ... \endcond blocks.

-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =

 # 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
@@ -691,7 +712,7 @@ SHOW_NAMESPACES        = YES
 # by doxygen. Whatever the program writes to standard output is used as the file
 # version. For an example see the documentation.

-FILE_VERSION_FILTER    = 
+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
@@ -704,7 +725,7 @@ FILE_VERSION_FILTER    =
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
 # tag is left empty.

-LAYOUT_FILE            = 
+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
@@ -714,7 +735,7 @@ LAYOUT_FILE            =
 # 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         = 
+CITE_BIB_FILES         =

 #---------------------------------------------------------------------------
 # Configuration options related to warning and progress messages
@@ -754,7 +775,8 @@ WARN_IF_DOC_ERROR      = YES
 # 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.
+# parameter documentation, but not about the absence of documentation. If
+# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
 # The default value is: NO.

 WARN_NO_PARAMDOC       = NO
@@ -779,7 +801,7 @@ WARN_FORMAT            = "$file:$line: $text"
 # 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
@@ -814,7 +836,7 @@ INPUT_ENCODING         = UTF-8
 # *.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, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.

 FILE_PATTERNS          = *.c \
                         *.cc \
@@ -874,7 +896,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.

-EXCLUDE                = 
+EXCLUDE                =

 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -890,7 +912,7 @@ EXCLUDE_SYMLINKS       = NO
 # 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       = 
+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
@@ -901,13 +923,13 @@ EXCLUDE_PATTERNS       =
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories use the pattern */test/*

-EXCLUDE_SYMBOLS        = 
+EXCLUDE_SYMBOLS        =

 # The EXAMPLE_PATH tag can be used to specify one or more files or directories
 # that contain example code fragments that are included (see the \include
 # command).

-EXAMPLE_PATH           = 
+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
@@ -948,7 +970,7 @@ IMAGE_PATH             = images
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # properly processed by doxygen.

-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
@@ -961,7 +983,7 @@ INPUT_FILTER           =
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # properly processed by doxygen.

-FILTER_PATTERNS        = 
+FILTER_PATTERNS        =

 # 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
@@ -976,14 +998,14 @@ FILTER_SOURCE_FILES    = NO
 # *.ext= (so without naming a filter).
 # This tag requires that the tag FILTER_SOURCE_FILES is set to YES.

-FILTER_SOURCE_PATTERNS = 
+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 = 
+USE_MDFILE_AS_MAINPAGE =

 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
@@ -1012,7 +1034,7 @@ INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS    = YES

 # If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
+# entity all documented functions referencing it will be listed.
 # The default value is: NO.

 REFERENCED_BY_RELATION = NO
@@ -1049,7 +1071,7 @@ SOURCE_TOOLTIPS        = YES
 #
 # To use it do the following:
 # - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
 # - Make sure the INPUT points to the root of the source tree
 # - Run doxygen as normal
 #
@@ -1095,7 +1117,7 @@ COLS_IN_ALPHA_INDEX    = 5
 # 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
@@ -1139,7 +1161,7 @@ HTML_FILE_EXTENSION    = .html
 # of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.

-HTML_HEADER            = 
+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
@@ -1149,7 +1171,7 @@ HTML_HEADER            =
 # that doxygen normally uses.
 # This tag requires that the tag GENERATE_HTML is set to YES.

-HTML_FOOTER            = 
+HTML_FOOTER            =

 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
 # sheet that is used by each HTML page. It can be used to fine-tune the look of
@@ -1161,7 +1183,7 @@ HTML_FOOTER            =
 # obsolete.
 # This tag requires that the tag GENERATE_HTML is set to YES.

-HTML_STYLESHEET        = 
+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
@@ -1174,7 +1196,7 @@ HTML_STYLESHEET        =
 # list). For an example see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.

-HTML_EXTRA_STYLESHEET  = 
+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
@@ -1184,7 +1206,7 @@ HTML_EXTRA_STYLESHEET  =
 # 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       = 
+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
@@ -1195,7 +1217,7 @@ HTML_EXTRA_FILES       =
 # 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
+HTML_COLORSTYLE_HUE    = 49

 # 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
@@ -1203,7 +1225,7 @@ HTML_COLORSTYLE_HUE    = 220
 # 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
+HTML_COLORSTYLE_SAT    = 155

 # The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
 # luminance component of the colors in the HTML output. Values below 100
@@ -1214,7 +1236,7 @@ HTML_COLORSTYLE_SAT    = 100
 # 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
+HTML_COLORSTYLE_GAMMA  = 240

 # 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
@@ -1259,13 +1281,13 @@ 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: https://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# environment (see: https://developer.apple.com/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 https://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.

@@ -1304,7 +1326,7 @@ 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
+# (see: https://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
@@ -1324,7 +1346,7 @@ GENERATE_HTMLHELP      = NO
 # written to the html output directory.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.

-CHM_FILE               = 
+CHM_FILE               =

 # 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,
@@ -1332,7 +1354,7 @@ CHM_FILE               =
 # The file has to be specified with full path.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.

-HHC_LOCATION           = 
+HHC_LOCATION           =

 # 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).
@@ -1345,7 +1367,7 @@ GENERATE_CHI           = NO
 # and project file content.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.

-CHM_INDEX_ENCODING     = 
+CHM_INDEX_ENCODING     =

 # 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
@@ -1376,11 +1398,11 @@ GENERATE_QHP           = NO
 # the HTML output folder.
 # This tag requires that the tag GENERATE_QHP is set to YES.

-QCH_FILE               = 
+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://doc.qt.io/qt-4.8/qthelpproject.html#namespace).
+# (see: http://doc.qt.io/archives/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.

@@ -1388,7 +1410,8 @@ 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://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders).
+# Folders (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
+# folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.

@@ -1396,31 +1419,33 @@ 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://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
+# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
+# filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.

-QHP_CUST_FILTER_NAME   = 
+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://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
+# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
+# filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.

-QHP_CUST_FILTER_ATTRS  = 
+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://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes).
+# http://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.

-QHP_SECT_FILTER_ATTRS  = 
+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           = 
+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
@@ -1468,7 +1493,7 @@ DISABLE_INDEX          = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.

-GENERATE_TREEVIEW      = NO
+GENERATE_TREEVIEW      = YES

 # 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.
@@ -1523,7 +1548,7 @@ FORMULA_TRANSPARENT    = YES
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.

-USE_MATHJAX            = NO
+USE_MATHJAX            = YES

 # When MathJax is enabled you can set the default output format to be used for
 # the MathJax output. See the MathJax site (see:
@@ -1543,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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 https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/.
+# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
 # This tag requires that the tag USE_MATHJAX is set to YES.

 MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/
@@ -1553,7 +1578,7 @@ MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
 # This tag requires that the tag USE_MATHJAX is set to YES.

-MATHJAX_EXTENSIONS     = 
+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
@@ -1561,7 +1586,7 @@ MATHJAX_EXTENSIONS     =
 # example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.

-MATHJAX_CODEFILE       = 
+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
@@ -1621,7 +1646,7 @@ EXTERNAL_SEARCH        = NO
 # Searching" for details.
 # This tag requires that the tag SEARCHENGINE is set to YES.

-SEARCHENGINE_URL       = 
+SEARCHENGINE_URL       =

 # When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
 # search data is written to a file for indexing by an external tool. With the
@@ -1637,7 +1662,7 @@ SEARCHDATA_FILE        = searchdata.xml
 # projects and redirect the results back to the right project.
 # This tag requires that the tag SEARCHENGINE is set to YES.

-EXTERNAL_SEARCH_ID     = 
+EXTERNAL_SEARCH_ID     =

 # The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
 # projects other than the one defined by this configuration file, but that are
@@ -1647,7 +1672,7 @@ EXTERNAL_SEARCH_ID     =
 # EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
 # This tag requires that the tag SEARCHENGINE is set to YES.

-EXTRA_SEARCH_MAPPINGS  = 
+EXTRA_SEARCH_MAPPINGS  =

 #---------------------------------------------------------------------------
 # Configuration options related to the LaTeX output
@@ -1669,21 +1694,34 @@ LATEX_OUTPUT           = latex
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked.
 #
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
 # This tag requires that the tag GENERATE_LATEX is set to YES.

 LATEX_CMD_NAME         = latex

 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
 # index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
 # The default file is: makeindex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.

 MAKEINDEX_CMD_NAME     = makeindex

+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: \makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_MAKEINDEX_CMD    = \makeindex
+
 # If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
@@ -1711,7 +1749,7 @@ PAPER_TYPE             = a4
 # If left blank no extra packages will be included.
 # This tag requires that the tag GENERATE_LATEX is set to YES.

-EXTRA_PACKAGES         = 
+EXTRA_PACKAGES         =

 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
 # generated LaTeX document. The header should contain everything until the first
@@ -1727,7 +1765,7 @@ EXTRA_PACKAGES         =
 # to HTML_HEADER.
 # This tag requires that the tag GENERATE_LATEX is set to YES.

-LATEX_HEADER           = 
+LATEX_HEADER           =

 # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
 # generated LaTeX document. The footer should contain everything after the last
@@ -1738,7 +1776,7 @@ LATEX_HEADER           =
 # Note: Only use a user-defined footer if you know what you are doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.

-LATEX_FOOTER           = 
+LATEX_FOOTER           =

 # The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
 # LaTeX style sheets that are included after the standard style sheets created
@@ -1749,7 +1787,7 @@ LATEX_FOOTER           =
 # list).
 # This tag requires that the tag GENERATE_LATEX is set to YES.

-LATEX_EXTRA_STYLESHEET = 
+LATEX_EXTRA_STYLESHEET =

 # The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the LATEX_OUTPUT output
@@ -1757,7 +1795,7 @@ LATEX_EXTRA_STYLESHEET =
 # markers available.
 # This tag requires that the tag GENERATE_LATEX is set to YES.

-LATEX_EXTRA_FILES      = 
+LATEX_EXTRA_FILES      =

 # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
 # prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
@@ -1800,7 +1838,7 @@ LATEX_HIDE_INDICES     = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.

-LATEX_SOURCE_CODE      = NO
+LATEX_SOURCE_CODE      = YES

 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
@@ -1818,6 +1856,14 @@ LATEX_BIB_STYLE        = plain

 LATEX_TIMESTAMP        = NO

+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EMOJI_DIRECTORY  =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -1857,22 +1903,22 @@ COMPACT_RTF            = NO

 RTF_HYPERLINKS         = NO

-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
 #
 # See also section "Doxygen usage" for information on how to generate the
 # default style sheet that doxygen normally uses.
 # This tag requires that the tag GENERATE_RTF is set to YES.

-RTF_STYLESHEET_FILE    = 
+RTF_STYLESHEET_FILE    =

 # Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.

-RTF_EXTENSIONS_FILE    = 
+RTF_EXTENSIONS_FILE    =

 # If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
 # with syntax highlighting in the RTF output.
@@ -1917,7 +1963,7 @@ MAN_EXTENSION          = .3
 # MAN_EXTENSION with the initial . removed.
 # This tag requires that the tag GENERATE_MAN is set to YES.

-MAN_SUBDIR             = 
+MAN_SUBDIR             =

 # If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
 # will generate one additional man file for each entity documented in the real
@@ -1955,6 +2001,13 @@ XML_OUTPUT             = xml

 XML_PROGRAMLISTING     = YES

+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_NS_MEMB_FILE_SCOPE = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
@@ -2030,7 +2083,7 @@ PERLMOD_PRETTY         = YES
 # overwrite each other's variables.
 # This tag requires that the tag GENERATE_PERLMOD is set to YES.

-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =

 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
@@ -2071,7 +2124,7 @@ SEARCH_INCLUDES        = YES
 # preprocessor.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.

-INCLUDE_PATH           = 
+INCLUDE_PATH           =

 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
@@ -2079,7 +2132,7 @@ INCLUDE_PATH           =
 # used.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  =

 # The PREDEFINED tag can be used to specify one or more macro names that are
 # defined before the preprocessor is started (similar to the -D option of e.g.
@@ -2089,7 +2142,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-PREDEFINED             = 
+PREDEFINED             =

 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
@@ -2098,7 +2151,7 @@ PREDEFINED             =
 # definition found in the source code.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      =

 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
 # remove all references to function-like macros that are alone on a line, have
@@ -2127,13 +2180,13 @@ SKIP_FUNCTION_MACROS   = YES
 # the path). If a tag file is not located in the directory in which doxygen is
 # run, you must also specify the path to the tagfile here.

-TAGFILES               = 
+TAGFILES               =

 # When a file name is specified after GENERATE_TAGFILE, doxygen will create a
 # tag file that is based on the input files it reads. See section "Linking to
 # external documentation" for more information about the usage of tag files.

-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       =

 # If the ALLEXTERNALS tag is set to YES, all external class will be listed in
 # the class index. If set to NO, only the inherited external classes will be
@@ -2182,14 +2235,14 @@ CLASS_DIAGRAMS         = NO
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.

-MSCGEN_PATH            = 
+MSCGEN_PATH            =

 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 # DIA_PATH tag allows you to specify the directory where the dia binary resides.
 # If left empty dia is assumed to be found in the default search path.

-DIA_PATH               = 
+DIA_PATH               =

 # If set to YES the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
@@ -2238,7 +2291,7 @@ DOT_FONTSIZE           = 10
 # the path where dot can find it using this tag.
 # This tag requires that the tag HAVE_DOT is set to YES.

-DOT_FONTPATH           = 
+DOT_FONTPATH           =

 # If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
 # each documented class showing the direct and indirect inheritance relations.
@@ -2382,26 +2435,26 @@ INTERACTIVE_SVG        = NO
 # found. If left blank, it is assumed the dot tool can be found in the path.
 # This tag requires that the tag HAVE_DOT is set to YES.

-DOT_PATH               = 
+DOT_PATH               =

 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the \dotfile
 # command).
 # This tag requires that the tag HAVE_DOT is set to YES.

-DOTFILE_DIRS           = 
+DOTFILE_DIRS           =

 # The MSCFILE_DIRS tag can be used to specify one or more directories that
 # contain msc files that are included in the documentation (see the \mscfile
 # command).

-MSCFILE_DIRS           = 
+MSCFILE_DIRS           =

 # The DIAFILE_DIRS tag can be used to specify one or more directories that
 # contain dia files that are included in the documentation (see the \diafile
 # command).

-DIAFILE_DIRS           = 
+DIAFILE_DIRS           =

 # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
 # path where java can find the plantuml.jar file. If left blank, it is assumed
@@ -2409,17 +2462,17 @@ DIAFILE_DIRS           =
 # generate a warning when it encounters a \startuml command in this case and
 # will not generate output for the diagram.

-PLANTUML_JAR_PATH      = 
+PLANTUML_JAR_PATH      =

 # When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
 # configuration file for plantuml.

-PLANTUML_CFG_FILE      = 
+PLANTUML_CFG_FILE      =

 # When using plantuml, the specified paths are searched for files specified by
 # the !include statement in a plantuml block.

-PLANTUML_INCLUDE_PATH  = 
+PLANTUML_INCLUDE_PATH  =

 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
 # that will be shown in the graph. If the number of nodes in a graph becomes
--- a/doxygen/build-doxygen.sh
+++ b/doxygen/build-doxygen.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null && pwd )"
+  SOURCE="$(readlink "$SOURCE")"
+  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null && pwd )"
+cd "$DIR"
+
+export PROJECT_NUMBER=`git describe --tags`
+
+if [ $# != 1 ]; then
+	export OUTPUT_DIRECTORY="./output"
+else
+	export OUTPUT_DIRECTORY="$1"
+fi
+
+doxygen Doxyconfig
--- a/doxygen/lmf-spec.dox
+++ b/doxygen/lmf-spec.dox
@@ -5,7 +5,7 @@ File Format
 -----------

 The layer mapping file contains information on how to render the layers.
-The information is stored in CSV format.
+The information is stored in CSV format -- *True CSV*; not that rubbish with semicolons that Excel calls CSV.

 Each line representing a layer consists of following fields:

--- a/doxygen/trigonometric.dox
+++ b/doxygen/trigonometric.dox
@@ -0,0 +1,8 @@
+/* This file only contains help information for doxygen */
+
+/**
+ * @defgroup trigonometric Trigonometric Helper Functions
+ * @description The trigonometric helper function will be used in future releases to pcalculate bounding boxes
+ * @note Currently not in use!
+ * @warning Code is incomplete. DO NOT USE!
+ */
--- a/doxygen/usage.dox
+++ b/doxygen/usage.dox
@@ -3,23 +3,28 @@
@section cmd Command Line Interface
 To use the application on the command line check 'gds-render --help'.

-Application options:
-  -t, --tikz                Output TikZ code
-  -p, --pdf                 Output PDF document
-  -s, --scale=<SCALE>       Divide output coordinates by <SCALE>
-  -o, --tex-output=PATH     Optional path for TeX file
-  -O, --pdf-output=PATH     Optional path for PDF file
-  -m, --mapping=PATH        Path for Layer Mapping File (see @ref lmf-spec)
-  -c, --cell=NAME           Cell to render
-  -a, --tex-standalone      Configure TeX Code standalone
-  -l, --tex-layers          configure TeX code to create PDF Layers (OCG)
+Application Options:
+-  -t, --tikz                         Output TikZ code
+-  -p, --pdf                          Output PDF document
+-  -s, --scale=<SCALE>                Divide output coordinates by <SCALE>
+-  -o, --tex-output=PATH              Optional path for TeX file
+-  -O, --pdf-output=PATH              Optional path for PDF file
+-  -m, --mapping=PATH                 Path for Layer Mapping File
+-  -c, --cell=NAME                    Cell to render
+-  -a, --tex-standalone               Create standalone PDF
+-  -l, --tex-layers                   Create PDF Layers (OCG)
+-  -P, --custom-render-lib=PATH       Path to a custom shared object, that implements the render_cell_to_file function
+-  -e, --external-lib-output=PATH     Output path for external render library
+-  --display=DISPLAY                  X display to use
+

@section gui Graphical User Interface

 The graphical user interface (GUI) can be used to open GDS Files, configure the layer rendering (colors, order, transparency etc.), and convert cells.

-It is possible to export the layer configurations so theycan be used later on. Even in the @ref cmd 
+It is possible to export the layer configurations so they can be used later on. Even in the @ref cmd 

@image html gui.svg
+@image latex gui.pdf

 */
--- a/external-renderer.c
+++ b/external-renderer.c
@@ -0,0 +1,70 @@
+/*
+ * GDSII-Converter
+ * Copyright (C) 2018  Mario Hüttel <mario.huettel@gmx.net>
+ *
+ * This file is part of GDSII-Converter.
+ *
+ * GDSII-Converter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * GDSII-Converter is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GDSII-Converter.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @file external-renderer.c
+ * @brief This file implements the dynamic library loading for the external rendering feature
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
+/**
+ * @addtogroup MainApplication
+ * @{
+ */
+
+#include "external-renderer.h"
+#include <dlfcn.h>
+#include <stdio.h>
+
+int external_renderer_render_cell(struct gds_cell *toplevel_cell, GList *layer_info_list, char *output_file, char *so_path)
+{
+	int (*so_render_func)(struct gds_cell *, GList *, char *) = NULL;
+	void *so_handle = NULL;
+	char *error_msg;
+	int ret = 0;
+
+	/* Check parameter sanity */
+	if (!output_file || !so_path || !toplevel_cell || !layer_info_list) {
+		return -3000;
+	}
+
+	/* Load shared object */
+	so_handle = dlopen(so_path, RTLD_LAZY);
+	if (!so_handle) {
+		printf("Could not load external library '%s'\nDetailed error is:\n%s\n", so_path, dlerror());
+		return -2000;
+	}
+
+	/* Load symbol from library */
+	so_render_func = (int (*)(struct gds_cell *, GList *, char *))dlsym(so_handle, EXTERNAL_LIBRARY_FUNCTION);
+	if ((error_msg = dlerror()) != NULL) {
+		printf("Rendering function not found in library:\n%s\n", error_msg);
+		goto ret_close_so_handle;
+	}
+
+	/* Execute */
+	if (so_render_func)
+		so_render_func(toplevel_cell, layer_info_list, output_file);
+
+ret_close_so_handle:
+	dlclose(so_handle);
+	return ret;
+}
+
+/** @} */
--- a/external-renderer.h
+++ b/external-renderer.h
@@ -0,0 +1,58 @@
+/*
+ * GDSII-Converter
+ * Copyright (C) 2018  Mario Hüttel <mario.huettel@gmx.net>
+ *
+ * This file is part of GDSII-Converter.
+ *
+ * GDSII-Converter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * GDSII-Converter is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GDSII-Converter.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @file external-renderer.h
+ * @brief Render according to command line parameters
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
+/**
+ * @addtogroup MainApplication
+ * @{
+ */
+
+#ifndef _EXTERNAL_RENDERER_H_
+#define _EXTERNAL_RENDERER_H_
+
+#include "gds-parser/gds-types.h"
+#include <glib.h>
+
+/**
+ * @brief function name expected to be found in external library.
+ * @detail The function has to be defined as follows:
+ * @code
+ * int function_name(gds_cell *toplevel, GList *layer_info_list, char *output_file_name)
+ * @endcode
+ */
+#define EXTERNAL_LIBRARY_FUNCTION "render_cell_to_file"
+
+/**
+ * @brief external_renderer_render_cell
+ * @param toplevel_cell The toplevel cell to render
+ * @param layer_info_list The layer information. Contains #layer_info elements
+ * @param output_file Output file
+ * @param so_path Path to the shared object file containing #EXTERNAL_LIBRARY_FUNCTION
+ * @return 0 on success
+ */
+int external_renderer_render_cell(struct gds_cell *toplevel_cell, GList *layer_info_list, char *output_file, char *so_path);
+
+#endif /* _EXTERNAL_RENDERER_H_ */
+
+/** @} */
--- a/gds-parser/gds-parser.h
+++ b/gds-parser/gds-parser.h
@@ -39,7 +39,7 @@
 int parse_gds_from_file(const char *filename, GList **library_array);
 /**
 * @brief Deletes all libraries including cells, references etc.
- * @param Pointer to a list of #gds_library. Is set to NULL after completion.
+ * @param library_list Pointer to a list of #gds_library. Is set to NULL after completion.
 * @return 0
 */
 int clear_lib_list(GList **library_list);
--- a/glade/main.glade
+++ b/glade/main.glade
@@ -82,19 +82,48 @@
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <child>
-          <object class="GtkScrolledWindow">
+          <object class="GtkBox">
            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="shadow_type">in</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
            <child>
-              <object class="GtkTreeView" id="cell-tree">
+              <object class="GtkSearchEntry" id="cell-search">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection"/>
+                <property name="primary_icon_name">edit-find-symbolic</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <object class="GtkTreeView" id="cell-tree">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="headers_clickable">False</property>
+                    <property name="enable_search">False</property>
+                    <property name="enable_grid_lines">both</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection"/>
+                    </child>
+                  </object>
                </child>
              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
            </child>
          </object>
          <packing>
--- a/layer-selector.c
+++ b/layer-selector.c
@@ -18,7 +18,7 @@
 */

 /**
- * @file layer-selection.c
+ * @file layer-selector.c
 * @brief Implementation of the layer selector
 * @author Mario Hüttel <mario.huettel@gmx.net>
 */
@@ -321,6 +321,7 @@ static void load_mapping_clicked(GtkWidget *button, gpointer user_data)
 */
 static void create_csv_line(LayerElement *layer_element, char *line_buffer, size_t max_len)
 {
+	int i;
 	GString *string;
 	gboolean export;
 	const gchar *name;
@@ -336,9 +337,19 @@ static void create_csv_line(LayerElement *layer_element, char *line_buffer, size
 	layer_element_get_color(layer_element, &color);

 	/* print values to line */
-	g_string_printf(string, "%d,%lf,%lf,%lf,%lf,%d,%s\n",
+	g_string_printf(string, "%d:%lf:%lf:%lf:%lf:%d:%s\n",
 			layer, color.red, color.green,
 			color.blue, color.alpha, (export == TRUE ? 1 : 0), name);
+	/* Fix broken locale settings */
+	for (i = 0; string->str[i]; i++) {
+		if (string->str[i] == ',')
+			string->str[i] = '.';
+	}
+
+	for (i = 0; string->str[i]; i++) {
+		if (string->str[i] == ':')
+			string->str[i] = ',';
+	}

 	if (string->len > (max_len-1)) {
 		printf("Layer Definition too long. Please shorten Layer Name!!\n");
--- a/main-window.c
+++ b/main-window.c
@@ -45,6 +45,7 @@ struct open_button_data {
 	GList **list_ptr;
 	GtkTreeStore *cell_store;
 	GtkListBox *layer_box;
+	GtkSearchEntry *search_entry;
 };

 /**
@@ -112,6 +113,7 @@ static void on_load_gds(gpointer button, gpointer user)
 	char *filename;
 	GString *mod_date;
 	GString *acc_date;
+	GdkRGBA cell_text_color;

 	open_dialog = gtk_file_chooser_dialog_new("Open GDSII File", ptr->main_window, GTK_FILE_CHOOSER_ACTION_OPEN,
 						  "Cancel", GTK_RESPONSE_CANCEL, "Open GDSII", GTK_RESPONSE_ACCEPT, NULL);
@@ -172,10 +174,20 @@ static void on_load_gds(gpointer button, gpointer user)
 				mod_date = generate_string_from_date(&gds_c->mod_time);
 				acc_date = generate_string_from_date(&gds_c->access_time);

+				cell_text_color.alpha = 1;
+				cell_text_color.red = (double)61.0/(double)255.0;
+				cell_text_color.green = (double)152.0/(double)255.0;
+				cell_text_color.blue = 0.0;
+
+				/* Add cell to tree store model
+				 * CELL_SEL_CELL_COLOR will always be green,
+				 * because no cell cehcker is implemented, yet.
+				 */
 				gtk_tree_store_set (store, &celliter,
 						    CELL_SEL_CELL, gds_c,
 						    CELL_SEL_MODDATE, mod_date->str,
 						    CELL_SEL_ACCESSDATE, acc_date->str,
+						    CELL_SEL_CELL_COLOR, &cell_text_color, // TODO: implement cell checker
 						    -1);

 				/* Delete GStrings including string data. */
@@ -325,23 +337,23 @@ GtkWindow *create_main_window()
 {
 	GtkBuilder *main_builder;
 	GtkTreeView *cell_tree;
-	GtkTreeStore *cell_store;
 	GtkWidget *listbox;
 	GtkWidget *conv_button;
+	GtkWidget *search_entry;
 	static GList *gds_libs;
 	static struct open_button_data open_data;
 	static struct convert_button_data conv_data;
+	struct tree_stores *cell_selector_stores;

 	main_builder = gtk_builder_new_from_resource("/main.glade");
 	gtk_builder_connect_signals(main_builder, NULL);

-
-
 	cell_tree = GTK_TREE_VIEW(gtk_builder_get_object(main_builder, "cell-tree"));
-	cell_store = setup_cell_selector(cell_tree);
+	search_entry = GTK_WIDGET(gtk_builder_get_object(main_builder, "cell-search"));
+	open_data.search_entry = GTK_SEARCH_ENTRY(search_entry);
+	cell_selector_stores = setup_cell_selector(cell_tree, GTK_ENTRY(search_entry));

-
-	open_data.cell_store = cell_store;
+	open_data.cell_store = cell_selector_stores->base_store;
 	open_data.list_ptr = &gds_libs;
 	open_data.main_window = GTK_WINDOW(gtk_builder_get_object(main_builder, "main-window"));
 	g_signal_connect(GTK_WIDGET(gtk_builder_get_object(main_builder, "button-load-gds")),
@@ -371,6 +383,8 @@ GtkWindow *create_main_window()
 	g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(cell_tree)), "changed",
 			 G_CALLBACK(cell_selection_changed), conv_button);

+	g_object_unref(main_builder);
+
 	return (conv_data.main_window);
 }

--- a/main.c
+++ b/main.c
@@ -22,16 +22,19 @@
 #include <glib.h>
 #include "main-window.h"
 #include "command-line.h"
+#include "external-renderer.h"

 struct application_data {
 	GtkApplication *app;
 	GtkWindow *main_window;
 };

-
 static void app_quit(GSimpleAction *action, GVariant *parameter, gpointer user_data)
 {
 	struct application_data *appdata = (struct application_data *)user_data;
+	(void)action;
+	(void)parameter;
+
 	gtk_widget_destroy(GTK_WIDGET(appdata->main_window));
 }

@@ -40,6 +43,8 @@ static void app_about(GSimpleAction *action, GVariant *parameter, gpointer user_
 	GtkBuilder *builder;
 	GtkDialog *dialog;
 	struct application_data *appdata = (struct application_data *)user_data;
+	(void)action;
+	(void)parameter;

 	builder = gtk_builder_new_from_resource("/about.glade");
 	dialog = GTK_DIALOG(gtk_builder_get_object(builder, "about-dialog"));
@@ -50,7 +55,7 @@ static void app_about(GSimpleAction *action, GVariant *parameter, gpointer user_
 	g_object_unref(builder);
 }

-const GActionEntry app_actions[] = {
+const static GActionEntry app_actions[] = {
 	{ "quit", app_quit },
 	{ "about", app_about }
 };
@@ -78,10 +83,7 @@ static int start_gui(int argc, char **argv)

 	gapp = gtk_application_new("de.shimatta.gds-render", G_APPLICATION_FLAGS_NONE);
 	g_application_register(G_APPLICATION(gapp), NULL, NULL);
-	//g_action_map_add_action_entries(G_ACTION_MAP(gapp), app_actions, G_N_ELEMENTS(app_actions), &appdata);
-	g_signal_connect (gapp, "activate", G_CALLBACK(gapp_activate), &appdata);
-
-
+	g_signal_connect(gapp, "activate", G_CALLBACK(gapp_activate), &appdata);

 	menu = g_menu_new();
 	m_quit = g_menu_new();
@@ -90,7 +92,8 @@ static int start_gui(int argc, char **argv)
 	g_menu_append(m_about, "About", "app.about");
 	g_menu_append_section(menu, NULL, G_MENU_MODEL(m_about));
 	g_menu_append_section(menu, NULL, G_MENU_MODEL(m_quit));
-	g_action_map_add_action_entries(G_ACTION_MAP(gapp), app_actions, G_N_ELEMENTS(app_actions), &appdata);
+	g_action_map_add_action_entries(G_ACTION_MAP(gapp), app_actions,
+					G_N_ELEMENTS(app_actions), &appdata);
 	gtk_application_set_app_menu(GTK_APPLICATION(gapp), G_MENU_MODEL(menu));

 	g_object_unref(m_quit);
@@ -98,8 +101,8 @@ static int start_gui(int argc, char **argv)
 	g_object_unref(menu);


-	app_status = g_application_run (G_APPLICATION(gapp), argc, argv);
-	g_object_unref (gapp);
+	app_status = g_application_run(G_APPLICATION(gapp), argc, argv);
+	g_object_unref(gapp);

 	return app_status;
 }
@@ -112,34 +115,36 @@ int main(int argc, char **argv)
 	gchar *basename;
 	gchar *pdfname = NULL, *texname = NULL, *mappingname = NULL, *cellname = NULL, *svgname = NULL;
 	gboolean tikz = FALSE, pdf = FALSE, pdf_layers = FALSE, pdf_standalone = FALSE, svg = FALSE;
+	gchar *custom_library_path = NULL;
+	gchar *custom_library_file_name = NULL;
 	int scale = 1000;
 	int app_status;

-
-	GOptionEntry entries[] =
-	{
-	  { "tikz", 't', 0, G_OPTION_ARG_NONE, &tikz, "Output TikZ code", NULL },
-	  { "pdf", 'p', 0, G_OPTION_ARG_NONE, &pdf, "Output PDF document", NULL },
-	  //{ "svg", 'S', 0, G_OPTION_ARG_NONE, &svg, "Output SVG image", NULL },
-	  { "scale", 's', 0, G_OPTION_ARG_INT, &scale, "Divide output coordinates by <SCALE>", "<SCALE>" },
-	  { "tex-output", 'o', 0, G_OPTION_ARG_FILENAME, &texname, "Optional path for TeX file", "PATH" },
-	  { "pdf-output", 'O', 0, G_OPTION_ARG_FILENAME, &pdfname, "Optional path for PDF file", "PATH" },
-	  //{ "svg-output", 0, 0, G_OPTION_ARG_FILENAME, &svgname, "Optional path for PDF file", "PATH"},
-	  { "mapping", 'm', 0, G_OPTION_ARG_FILENAME, &mappingname, "Path for Layer Mapping File", "PATH" },
-	  { "cell", 'c', 0, G_OPTION_ARG_STRING, &cellname, "Cell to render", "NAME" },
-	  { "tex-standalone", 'a', 0, G_OPTION_ARG_NONE, &pdf_standalone, "Create standalone PDF", NULL },
-	  { "tex-layers", 'l', 0, G_OPTION_ARG_NONE, &pdf_layers, "Create PDF Layers (OCG)", NULL },
+	GOptionEntry entries[] = {
+	  {"tikz", 't', 0, G_OPTION_ARG_NONE, &tikz, "Output TikZ code", NULL },
+	  {"pdf", 'p', 0, G_OPTION_ARG_NONE, &pdf, "Output PDF document", NULL },
+	  //{"svg", 'S', 0, G_OPTION_ARG_NONE, &svg, "Output SVG image", NULL },
+	  {"scale", 's', 0, G_OPTION_ARG_INT, &scale, "Divide output coordinates by <SCALE>", "<SCALE>" },
+	  {"tex-output", 'o', 0, G_OPTION_ARG_FILENAME, &texname, "Optional path for TeX file", "PATH" },
+	  {"pdf-output", 'O', 0, G_OPTION_ARG_FILENAME, &pdfname, "Optional path for PDF file", "PATH" },
+	  //{"svg-output", 0, 0, G_OPTION_ARG_FILENAME, &svgname, "Optional path for PDF file", "PATH"},
+	  {"mapping", 'm', 0, G_OPTION_ARG_FILENAME, &mappingname, "Path for Layer Mapping File", "PATH" },
+	  {"cell", 'c', 0, G_OPTION_ARG_STRING, &cellname, "Cell to render", "NAME" },
+	  {"tex-standalone", 'a', 0, G_OPTION_ARG_NONE, &pdf_standalone, "Create standalone PDF", NULL },
+	  {"tex-layers", 'l', 0, G_OPTION_ARG_NONE, &pdf_layers, "Create PDF Layers (OCG)", NULL },
+	  {"custom-render-lib", 'P', 0, G_OPTION_ARG_FILENAME, &custom_library_path, "Path to a custom shared object, that implements the " EXTERNAL_LIBRARY_FUNCTION " function", "PATH"},
+	  {"external-lib-output", 'e', 0, G_OPTION_ARG_FILENAME, &custom_library_file_name, "Output path for external render library", "PATH"},
 	  { NULL }
 	};

 	context = g_option_context_new(" FILE - Convert GDS file <FILE> to graphic");
 	g_option_context_add_main_entries(context, entries, NULL);
 	g_option_context_add_group(context, gtk_get_option_group(TRUE));
-	if (!g_option_context_parse (context, &argc, &argv, &error))
-	    {
-	      g_print ("Option parsing failed: %s\n", error->message);
-	      exit(1);
-	    }
+
+	if (!g_option_context_parse(context, &argc, &argv, &error)) {
+		g_print("Option parsing failed: %s\n", error->message);
+		exit(1);
+	}

 	if (argc >= 2) {
 		if (scale < 1) {
@@ -148,9 +153,8 @@ int main(int argc, char **argv)
 		}

 		/* No format selected */
-		if (!(tikz || pdf || svg)) {
+		if (!(tikz || pdf || svg))
 			tikz = TRUE;
-		}

 		/* Get gds name */
 		gds_name = argv[1];
@@ -158,21 +162,19 @@ int main(int argc, char **argv)
 		/* Check if PDF/TeX names are supplied. if not generate */
 		basename = g_path_get_basename(gds_name);

-		if (!texname) {
+		if (!texname)
 			texname = g_strdup_printf("./%s.tex", basename);
-		}

-		if (!pdfname) {
+		if (!pdfname)
 			pdfname = g_strdup_printf("./%s.pdf", basename);
-		}

-		if (!pdfname) {
+		if (!pdfname)
 			pdfname = g_strdup_printf("./%s.svg", basename);
-		}

-
-		command_line_convert_gds(gds_name, pdfname, texname, pdf, tikz, mappingname, cellname,
-					 (double)scale, pdf_layers, pdf_standalone, svg, svgname);
+		command_line_convert_gds(gds_name, pdfname, texname, pdf, tikz,
+					mappingname, cellname, (double)scale,
+					pdf_layers, pdf_standalone, svg, svgname,
+					custom_library_path, custom_library_file_name);
 		/* Clean up */
 		g_free(pdfname);
 		g_free(texname);
--- a/tree-renderer/tree-store.c
+++ b/tree-renderer/tree-store.c
@@ -60,53 +60,95 @@ static gboolean tree_sel_func(GtkTreeSelection *selection,
 		return FALSE;
 }

+/**
+ * @brief cell_store_filter_visible_func Decides whether an element of the tree model @p model is visible.
+ * @param model Tree model
+ * @param iter Current element / iter in Model to check
+ * @param data Data. Set to static stores variable
+ * @return TRUE if visible, else FALSE
+ * @note TODO: Maybe implement Damerau-Levenshtein distance matching
+ */
+static gboolean cell_store_filter_visible_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+	struct tree_stores *stores = (struct tree_stores *)data;
+	struct gds_cell *cell;
+	struct gds_library *lib;
+	gboolean result = FALSE;
+	const char *search_string;
+
+	if (!model || !iter || !stores)
+		goto exit_filter;
+
+	gtk_tree_model_get(model, iter, CELL_SEL_CELL, &cell, CELL_SEL_LIBRARY, &lib, -1);
+
+	if (lib) {
+		result = TRUE;
+		goto exit_filter;
+	}
+
+	if (!cell)
+		goto exit_filter;
+
+	search_string = gtk_entry_get_text(stores->search_entry);
+
+	/* Show all, if field is empty */
+	if (!strlen(search_string))
+		result = TRUE;
+
+	if (strstr(cell->name, search_string))
+		result = TRUE;
+
+	gtk_tree_view_expand_all(stores->base_tree_view);
+
+exit_filter:
+	return result;
+}
+
+static void change_filter(GtkWidget *entry, gpointer data)
+{
+	struct tree_stores *stores = (struct tree_stores *)data;
+	gtk_tree_model_filter_refilter(stores->filter);
+}
+
 /**
 * @brief Setup a GtkTreeView with the necessary columns
 * @param view Tree view to set up
- * @return TreeStore for storing data inside the GtkTreeView
+ * @param search_entry Entry field for search
+ * @return Tree stores for storing data inside the GtkTreeView
 */
-GtkTreeStore *setup_cell_selector(GtkTreeView* view)
+struct tree_stores *setup_cell_selector(GtkTreeView* view, GtkEntry *search_entry)
 {
-	GtkTreeStore *cell_store;
-
+	static struct tree_stores stores;
 	GtkCellRenderer *render_dates;
 	GtkCellRenderer *render_cell;
 	GtkCellRenderer *render_lib;
 	GtkTreeViewColumn *column;
-	GdkRGBA cell_text_color;
-	GValue val = G_VALUE_INIT;

-	cell_store = gtk_tree_store_new(CELL_SEL_COLUMN_COUNT, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING);
-	gtk_tree_view_set_model(view, GTK_TREE_MODEL(cell_store));
+	stores.base_tree_view = view;
+	stores.search_entry = search_entry;
+
+	stores.base_store = gtk_tree_store_new(CELL_SEL_COLUMN_COUNT, G_TYPE_POINTER, G_TYPE_POINTER, GDK_TYPE_RGBA, G_TYPE_STRING, G_TYPE_STRING);
+
+	/* Searching */
+	if (search_entry) {
+		stores.filter = GTK_TREE_MODEL_FILTER(gtk_tree_model_filter_new(GTK_TREE_MODEL(stores.base_store), NULL));
+		gtk_tree_model_filter_set_visible_func (stores.filter,
+								(GtkTreeModelFilterVisibleFunc)cell_store_filter_visible_func,
+								 &stores, NULL);
+		g_signal_connect(GTK_SEARCH_ENTRY(search_entry), "search-changed", G_CALLBACK(change_filter), &stores);
+	}
+
+	gtk_tree_view_set_model(view, GTK_TREE_MODEL(stores.filter));

 	render_dates = gtk_cell_renderer_text_new();
 	render_cell = lib_cell_renderer_new();
 	render_lib = lib_cell_renderer_new();

-	/* Set foreground color for cell column */
-	cell_text_color.alpha = 1;
-	cell_text_color.red = (double)61.0/(double)255.0;
-	cell_text_color.green = (double)152.0/(double)255.0;
-	cell_text_color.blue = 0.0;
-
-	g_value_init(&val, G_TYPE_BOOLEAN);
-	g_value_set_boolean(&val, TRUE);
-	g_object_set_property(G_OBJECT(render_cell), "foreground-set", &val);
-	g_value_unset(&val);
-
-	g_value_init(&val, GDK_TYPE_RGBA);
-	g_value_set_boxed(&val, &cell_text_color);
-	g_object_set_property(G_OBJECT(render_cell), "foreground-rgba", &val);
-	g_value_unset(&val);
-
-
-
-
 	column = gtk_tree_view_column_new_with_attributes("Library", render_lib, "gds-lib", CELL_SEL_LIBRARY, NULL);
 	gtk_tree_view_append_column(view, column);

 	/* Cell color: #3D9801 */
-	column = gtk_tree_view_column_new_with_attributes("Cell", render_cell, "gds-cell", CELL_SEL_CELL, NULL);
+	column = gtk_tree_view_column_new_with_attributes("Cell", render_cell, "gds-cell", CELL_SEL_CELL, "foreground-rgba", CELL_SEL_CELL_COLOR, NULL);
 	gtk_tree_view_append_column(view, column);

 	column = gtk_tree_view_column_new_with_attributes("Mod. Date", render_dates, "text", CELL_SEL_MODDATE, NULL);
@@ -119,6 +161,6 @@ GtkTreeStore *setup_cell_selector(GtkTreeView* view)
 	 * This prevents selecting a library */
 	gtk_tree_selection_set_select_function(gtk_tree_view_get_selection(view), tree_sel_func, NULL, NULL);

-	return cell_store;
+	return &stores;
 }
 /** @} */
--- a/tree-renderer/tree-store.h
+++ b/tree-renderer/tree-store.h
@@ -37,12 +37,20 @@
 enum cell_store_columns {
        CELL_SEL_LIBRARY = 0,
        CELL_SEL_CELL,
+	CELL_SEL_CELL_COLOR, /**< Cell column color */
        CELL_SEL_MODDATE,
        CELL_SEL_ACCESSDATE,
 	CELL_SEL_COLUMN_COUNT /**< Not a column. Used to determine count of coumns **/
 };

-GtkTreeStore *setup_cell_selector(GtkTreeView* view);
+struct tree_stores {
+		GtkTreeView *base_tree_view;
+		GtkTreeStore *base_store;
+		GtkTreeModelFilter *filter;
+		GtkEntry *search_entry;
+};
+
+struct tree_stores *setup_cell_selector(GtkTreeView* view, GtkEntry *search_entry);

 #endif /* __TREE_STORE_H__ */

--- a/trigonometric/bounding-box.c
+++ b/trigonometric/bounding-box.c
@@ -23,11 +23,18 @@
 * @author Mario Hüttel <mario.huettel@gmx.net>
 */

+/**
+ * @addtogroup trigonometric
+ * @{
+ */
+
 #include <stdio.h>
 #include "bounding-box.h"
+#include <math.h>

 #define MIN(a,b) (((a) < (b)) ? (a) : (b)) /**< @brief Return smaller number */
 #define MAX(a,b) (((a) > (b)) ? (a) : (b)) /**< @brief Return bigger number */
+#define ABS_DBL(a) ((a) < 0 ? -(a) : (a))

 void bounding_box_calculate_polygon(GList *vertices, conv_generic_to_vector_2d_t conv_func, union bounding_box *box)
 {
@@ -41,7 +48,10 @@ void bounding_box_calculate_polygon(GList *vertices, conv_generic_to_vector_2d_t

 	for (list_item = vertices; list_item != NULL; list_item = g_list_next(list_item)) {
 		/* Convert generic vertex to vector_2d */
-		conv_func((void *)list_item->data, &temp_vec);
+		if (conv_func)
+			conv_func((void *)list_item->data, &temp_vec);
+		else
+			vector_2d_copy(&temp_vec, (struct vector_2d *)list_item->data);

 		/* Update bounding coordinates with vertex */
 		xmin = MIN(xmin, temp_vec.x);
@@ -79,3 +89,58 @@ void bounding_box_prepare_empty(union bounding_box *box)
 	box->vectors.upper_right.x = DBL_MIN;
 	box->vectors.upper_right.y = DBL_MIN;
 }
+
+static void calculate_path_miter_points(struct vector_2d *a, struct vector_2d *b, struct vector_2d *c,
+					struct vector_2d *m1, struct vector_2d *m2, double width)
+{
+	double angle, angle_sin, u;
+	struct vector_2d ba, bc, u_vec, v_vec, ba_norm;
+
+	if (!a || !b || !c || !m1 || !m2)
+		return;
+
+	vector_2d_subtract(&ba, a, b);
+	vector_2d_subtract(&bc, c, b);
+
+	angle = vector_2d_calculate_angle_between(&ba, &bc);
+
+	if (ABS_DBL(angle) < 0.05 || ABS_DBL(angle - M_PI) < 0.1) {
+		/* Specail cases Don*/
+		vector_2d_copy(&ba_norm, &ba);
+		vector_2d_rotate(&ba_norm, DEG2RAD(90));
+		vector_2d_normalize(&ba_norm);
+		vector_2d_scale(&ba_norm, width/2.0);
+		vector_2d_add(m1, b, &ba_norm);
+		vector_2d_subtract(m2, b, &ba_norm);
+		return;
+	}
+	angle_sin = sin(angle);
+	u = width/(2*angle_sin);
+
+	vector_2d_copy(&u_vec, &ba);
+	vector_2d_copy(&v_vec, &bc);
+	vector_2d_normalize(&u_vec);
+	vector_2d_normalize(&v_vec);
+	vector_2d_scale(&u_vec, u);
+	vector_2d_scale(&v_vec, u);
+
+	vector_2d_copy(m1, b);
+	vector_2d_add(m1, m1, &u_vec);
+	vector_2d_add(m1, m1, &v_vec);
+
+	vector_2d_copy(m2, b);
+	vector_2d_subtract(m2, m2, &u_vec);
+	vector_2d_subtract(m2, m2, &v_vec);
+}
+
+void bounding_box_calculate_path_box(GList *vertices, conv_generic_to_vector_2d_t conv_func, union bounding_box *box)
+{
+
+}
+
+void bounding_box_update_point(union bounding_box *destination, conv_generic_to_vector_2d_t conv_func, void *pt)
+{
+
+}
+
+/** @} */
--- a/trigonometric/bounding-box.h
+++ b/trigonometric/bounding-box.h
@@ -23,17 +23,23 @@
 * @author Mario Hüttel <mario.huettel@gmx.net>
 */

+/**
+ * @addtogroup trigonometric
+ * @{
+ */
+
 #ifndef _BOUNDING_BOX_H_
 #define _BOUNDING_BOX_H_
 #include <glib.h>
 #include "vector-operations.h"

 union bounding_box {
-    struct _vectors {
-	struct vector_2d lower_left;
-	struct vector_2d upper_right;
-    } vectors;
-    struct vector_2d vector_array[2];
+	/** Coordinate System is (y up | x right) */
+	struct _vectors {
+		struct vector_2d lower_left;
+		struct vector_2d upper_right;
+	} vectors;
+	struct vector_2d vector_array[2];
 };

 typedef void (*conv_generic_to_vector_2d_t)(void *, struct vector_2d *);
@@ -41,5 +47,8 @@ typedef void (*conv_generic_to_vector_2d_t)(void *, struct vector_2d *);
 void bounding_box_calculate_polygon(GList *vertices, conv_generic_to_vector_2d_t conv_func, union bounding_box *box);
 void bounding_box_update_box(union bounding_box *destination, union bounding_box *update);
 void bounding_box_prepare_empty(union bounding_box *box);
+void bounding_box_update_point(union bounding_box *destination, conv_generic_to_vector_2d_t conv_func, void *pt);

 #endif /* _BOUNDING_BOX_H_ */
+
+/** @} */
--- a/trigonometric/vector-operations.c
+++ b/trigonometric/vector-operations.c
@@ -23,10 +23,17 @@
 * @author Mario Hüttel <mario.huettel@gmx.net>
 */

+/**
+ * @addtogroup trigonometric
+ * @{
+ */
+
 #include "vector-operations.h"
 #include <math.h>
 #include <stdlib.h>

+#define ABS_DBL(a) ((a) < 0 ? -(a) : (a))
+
 double vector_2d_scalar_multipy(struct vector_2d *a, struct vector_2d *b)
 {
 	if (a && b)
@@ -35,7 +42,7 @@ double vector_2d_scalar_multipy(struct vector_2d *a, struct vector_2d *b)
 		return 0.0;
 }

-void vector_2d_normaize(struct vector_2d *vec)
+void vector_2d_normalize(struct vector_2d *vec)
 {
 	double len;
 	if (!vec)
@@ -56,14 +63,14 @@ void vector_2d_rotate(struct vector_2d *vec, double angle)
 	sin_val = sin(angle);
 	cos_val = cos(angle);

-	vecor_2d_copy(&temp, vec);
+	vector_2d_copy(&temp, vec);

 	/* Apply rotation matrix */
 	vec->x = (cos_val * temp.x) - (sin_val * temp.y);
 	vec->y = (sin_val * temp.x) + (cos_val * temp.y);
 }

-struct vector_2d *vecor_2d_copy(struct vector_2d *opt_res, struct vector_2d *vec)
+struct vector_2d *vector_2d_copy(struct vector_2d *opt_res, struct vector_2d *vec)
 {
 	struct vector_2d *res;

@@ -112,3 +119,32 @@ double vector_2d_abs(struct vector_2d *vec)
 	}
 	return len;
 }
+
+double vector_2d_calculate_angle_between(struct vector_2d *a, struct vector_2d *b)
+{
+	double cos_angle;
+
+	if (!a || !b)
+		return 0.0;
+
+	cos_angle = ABS_DBL(vector_2d_scalar_multipy(a, b)) / (vector_2d_abs(a) * vector_2d_abs(b));
+	return acos(cos_angle);
+}
+
+void vector_2d_subtract(struct vector_2d *res, struct vector_2d *a, struct vector_2d *b)
+{
+	if (res && a && b) {
+		res->x = a->x - b->x;
+		res->y = a->y - b->y;
+	}
+}
+
+void vector_2d_add(struct vector_2d *res, struct vector_2d *a, struct vector_2d *b)
+{
+	if (res && a && b) {
+		res->x = a->x +b->x;
+		res->y = a->y + b->y;
+	}
+}
+
+/** @} */
--- a/trigonometric/vector-operations.h
+++ b/trigonometric/vector-operations.h
@@ -23,22 +23,36 @@
 * @author Mario Hüttel <mario.huettel@gmx.net>
 */

+/**
+ * @addtogroup trigonometric
+ * @{
+ */
+
+
 #ifndef _VECTOR_OPERATIONS_H_
 #define _VECTOR_OPERATIONS_H_

+#include <math.h>
+
 struct vector_2d {
    double x;
    double y;
 };

+#define DEG2RAD(a) ((a)*M_PI/180.0)

 double vector_2d_scalar_multipy(struct vector_2d *a, struct vector_2d *b);
 void vector_2d_normalize(struct vector_2d *vec);
-void vecor_2d_rotate(struct vector_2d *vec, double angle);
-struct vector_2d *vecor_2d_copy(struct vector_2d *opt_res, struct vector_2d *vec);
+void vector_2d_rotate(struct vector_2d *vec, double angle);
+struct vector_2d *vector_2d_copy(struct vector_2d *opt_res, struct vector_2d *vec);
 struct vector_2d *vector_2d_alloc(void);
 void vector_2d_free(struct vector_2d *vec);
 void vector_2d_scale(struct vector_2d *vec, double scale);
 double vector_2d_abs(struct vector_2d *vec);
+double vector_2d_calculate_angle_between(struct vector_2d *a, struct vector_2d *b);
+void vector_2d_subtract(struct vector_2d *res, struct vector_2d *a, struct vector_2d *b);
+void vector_2d_add(struct vector_2d *res, struct vector_2d *a, struct vector_2d *b);

 #endif /* _VECTOR_OPERATIONS_H_ */
+
+/** @} */
--- a/widgets/conv-settings-dialog.c
+++ b/widgets/conv-settings-dialog.c
@@ -112,10 +112,10 @@ RendererSettingsDialog *renderer_settings_dialog_new(GtkWindow *parent)

 void renderer_settings_dialog_get_settings(RendererSettingsDialog *dialog, struct render_settings *settings)
 {
-	GList *radio_buttons;
-	GList *temp_button_list;
-	GtkToggleButton *temp_button = NULL;
-
+	/*GList *radio_buttons;
+	 *GList *temp_button_list;
+	 *GtkToggleButton *temp_button = NULL;
+	 */
 	if (!settings || !dialog)
 		return;
 	settings->scale = gtk_range_get_value(GTK_RANGE(dialog->scale));
Author	SHA1	Message	Date
Mario Hüttel	c28da2ab71	Update doxygen color	2019-02-05 20:54:29 +01:00
Mario Hüttel	6937d24699	Remove old search and implement new search using filtering.	2019-02-05 20:38:52 +01:00
Mario Hüttel	1d67424bc9	Tree storage modified to use combination struct	2019-02-05 19:45:02 +01:00
Mario Hüttel	c7ffcf68ed	Add readme	2019-02-04 21:52:50 +01:00
Mario Hüttel	8306c34292	Implement first draft of cell search	2019-02-04 20:02:10 +01:00
Mario Hüttel	9f2544ee94	fix double 0 in layer mapping	2019-02-03 22:50:34 +01:00
Mario Hüttel	1f281119df	Fix the better solution. This makes it an even better solution	2019-02-03 22:47:54 +01:00
Mario Hüttel	bdb06c4d6e	Fix segfault and implement better cough fix for locale problems	2019-02-03 22:44:03 +01:00
Mario Hüttel	1fa2d75abd	Fix broken layer mapping if locale is different than english	2019-02-03 22:29:06 +01:00
Mario Hüttel	a3be13bc7c	Update doyygen look	2018-12-15 00:21:01 +01:00
Mario Hüttel	4cc519a661	Update usage page	2018-12-15 00:13:01 +01:00
Mario Hüttel	f3968bee48	fix file tag in doxygen header	2018-12-15 00:08:37 +01:00
Mario Hüttel	f54ff7ded6	Add support for external shared object renderer	2018-12-15 00:05:34 +01:00
Mario Hüttel	f025a0233d	fix doxygen header	2018-12-15 00:04:53 +01:00
Mario Hüttel	bbdc6c9049	remove unused variable warnings	2018-12-15 00:03:40 +01:00
Mario Hüttel	03a5aea335	Edit Doxygen config. Add image to latex output	2018-12-11 00:19:25 +01:00
Mario Hüttel	3e1a4c7d92	Fixed style and warnings	2018-12-11 00:06:27 +01:00
Mario Hüttel	fc6756b1fb	Add doxygen to build system	2018-12-10 23:53:57 +01:00
Mario Hüttel	d7293de1dc	Fix doxygen foo	2018-12-10 23:37:00 +01:00
Mario Hüttel	37c21ced04	Fix typo	2018-12-10 21:30:07 +01:00
Mario Hüttel	179dfa0724	Add description to bounding box	2018-12-10 21:28:43 +01:00
Mario Hüttel	3c1f4f9c97	Doxygen Docu	2018-12-10 21:24:52 +01:00
Mario Hüttel	d4ba826474	Update doxygen	2018-12-10 19:36:00 +01:00
Mario Hüttel	8b1626c111	Revert previous commit, fix typos	2018-12-10 19:23:54 +01:00
Mario Hüttel	2a860ab949	Update doxygen	2018-12-10 19:16:07 +01:00
Mario Hüttel	eaf692e046	Add .buildconfig to gitignore	2018-12-06 23:05:56 +01:00
Mario Hüttel	2fe6358815	remove buildconfig	2018-12-06 23:05:19 +01:00
Mario Hüttel	e8b7bd65ac	Add static to global variable	2018-09-22 23:32:22 +02:00
Mario Hüttel	d69082a676	Fix CmakeLists File. Project command has to be first to prevent errors	2018-09-22 23:29:31 +02:00
Mario Hüttel	b6ea48ba47	Merge branch 'master' of git.shimatta.de:mhu/gds-render	2018-08-24 16:15:42 +02:00
Mario Hüttel	cf7e4ccad0	trigonometric operations added	2018-08-24 16:15:36 +02:00