Merge pull request 'Merge new features and minor fixes for v1.2.1 release' (#43) from dev into master

Reviewed-on: #43

.github/workflows/cmake.yml

@@ -0,0 +1,37 @@
+name: CMake
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    
+    - name: Install system dependencies
+      if: runner.os == 'Linux'
+      run: |
+        sudo apt-get update
+        sudo apt-get -y install libgtk-3-dev gettext
+
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+    - name: Build
+      # Build your program with the given configuration
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

AUR/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Mario Hüttel <mario (dot) huettel (!) gmx (dot) net>
 
 pkgname=gds-render
-pkgver=20191020.403.448de30
+pkgver=v1.2_10_g00d02b8
 pkgrel=1
 pkgdesc="Conversion tool for converting GDS layout files into TikZ Code and PDF"
 arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@ sha1sums=('SKIP')
 
 pkgver () {
 	_date=`date +"%Y%m%d"`
-	cd "${srcdir}/${pkgname}-git"
+	cd "${srcdir}/${pkgname}-git/version"
-	echo "$_date.$(git rev-list --count master).$(git rev-parse --short master)"
+	echo "$(echo "$(sh ./generate-version-string.sh)" | sed 's/-/_/g')"
 }
 
 build () {

CMakeLists.txt

@@ -33,8 +33,6 @@ pkg_check_modules(CAIRO REQUIRED cairo)
 include_directories(${GLIB_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include)
 add_subdirectory(plugins)
 
-add_compile_options(-Wall -Wextra -Wold-style-declaration -Wuninitialized -Wmaybe-uninitialized -Wunused-parameter)
-
 IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
         message("${Yellow}Debug mode for translations used!${ColorReset}")
 	add_definitions(-DGETTEXT_PACKAGE=\"gds-render\" -DLOCALEDATADIR=\"${CMAKE_CURRENT_BINARY_DIR}/translations/output\")
@@ -44,13 +42,7 @@ else(CMAKE_BUILD_TYPE STREQUAL "Debug")
 	add_definitions(-DGETTEXT_PACKAGE=\"gds-render\" -DLOCALEDATADIR=\"/usr/share\")
 ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
 
-add_subdirectory(resources)
-add_subdirectory(doxygen)
-add_subdirectory(translations)
-add_subdirectory(version)
 
-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("cell-selector" CELL_SELECTOR_SOURCES)
@@ -74,15 +66,29 @@ set(SOURCE_GENERATED
   ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c
 )
 
+link_directories(${GLIB_LINK_DIRS} ${GTK3_LINK_DIRS} ${CAIRO_LINK_DIRS})
 SET_SOURCE_FILES_PROPERTIES(${SOURCE_GENERATED} PROPERTIES GENERATED 1)
 
+add_subdirectory(test)
+
+add_compile_options(-Wall -Wextra -Wold-style-declaration -Wuninitialized -Wmaybe-uninitialized -Wunused-parameter)
+
+add_subdirectory(resources)
+add_subdirectory(doxygen)
+add_subdirectory(translations)
+add_subdirectory(version)
+
+link_directories(${GLIB_LINK_DIRS} ${GTK3_LINK_DIRS} ${CAIRO_LINK_DIRS})
+add_definitions(${GLIB2_CFLAGS_OTHER})
+
 add_executable(${PROJECT_NAME} ${SOURCE} ${SOURCE_GENERATED})
 add_dependencies(${PROJECT_NAME} glib-resources)
 add_dependencies(${PROJECT_NAME} version)
 add_dependencies(${PROJECT_NAME} translations)
 
-target_link_libraries(${PROJECT_NAME} ${GLIB_LDFLAGS} ${GTK3_LDFLAGS} ${CAIRO_LDFLAGS} m version ${CMAKE_DL_LIBS})
 install (TARGETS ${PROJECT_NAME} 
 	RUNTIME	
 		DESTINATION bin
 	)
+target_link_libraries(${PROJECT_NAME} ${GLIB_LDFLAGS} ${GTK3_LDFLAGS} ${CAIRO_LDFLAGS} m version ${CMAKE_DL_LIBS})
+

README.MD

@@ -1,5 +1,7 @@
 # GDS-Render Readme
 
+[![CMake](https://github.com/0mhu/gds-render/actions/workflows/cmake.yml/badge.svg?branch=master)](https://github.com/0mhu/gds-render/actions/workflows/cmake.yml)
+
 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.

cell-selector/lib-cell-renderer.c

@@ -88,11 +88,13 @@ static void lib_cell_renderer_set_property(GObject      *object,
 		g_value_init(&val, G_TYPE_STRING);
 		g_value_set_string(&val, ((struct gds_library *)g_value_get_pointer(value))->name);
 		g_object_set_property(object, "text", &val);
+		g_value_unset(&val);
 		break;
 	case PROP_CELL:
 		g_value_init(&val, G_TYPE_STRING);
 		g_value_set_string(&val, ((struct gds_cell *)g_value_get_pointer(value))->name);
 		g_object_set_property(object, "text", &val);
+		g_value_unset(&val);
 		break;
 	case PROP_ERROR_LEVEL:
 		/* Set cell color according to error level */
@@ -100,6 +102,7 @@ static void lib_cell_renderer_set_property(GObject      *object,
 		convert_error_level_to_color(&color, g_value_get_uint(value));
 		g_value_set_boxed(&val, &color);
 		g_object_set_property(object, "foreground-rgba", &val);
+		g_value_unset(&val);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);

doxygen/Doxyconfig

@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.17
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -309,7 +309,7 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # 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,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
 # 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
@@ -535,8 +535,8 @@ HIDE_UNDOC_MEMBERS     = 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, these declarations will be
+# declarations. If set to NO, these declarations will be included in the
-# included in the documentation.
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -851,8 +851,10 @@ INPUT_ENCODING         = UTF-8
 # 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, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f, *.for, *.tcl, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.c \
                          *.cc \
@@ -928,7 +930,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       = */test/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -1265,9 +1267,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1555,8 +1557,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://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
@@ -1626,7 +1634,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing

doxygen/compilation.dox

@@ -30,7 +30,7 @@ Development is done with the following library versions:
 
 | Cairographics | GLib2      | GTK3      |
 | ------------- | ---------- | --------- |
-| 1.17.3        | 2.60.6-1   | 3.24.10-1 |
+| 1.17.2        | 2.64.2     | 3.24.18   |
 
 @section comp-instr Compilation Instructions
 @subsection linux-build General Linux Build Instruction
@@ -47,7 +47,7 @@ Once cmake has finished, type
  make
 @endcode
 to build the program and 
-
+ 
 @code
  make documentation
 @endcode
@@ -59,7 +59,7 @@ The subfolder 'AUR' contains a PKGBUILD file to build an Archlinux/Pacman packag
 
 @subsection comp-warnings Compiler Warnings
 
-The compiler will throw the following warnings. Compiled with GCC 8.2.1.
+The compiler will throw the following warnings. Compiled with GCC 9.3.0.
 
 | Warning | Assessment |
 | ------- | ---------- |

doxygen/versioning.dox

@@ -5,7 +5,7 @@
 The version number of this application consists of a given version in the format of 'v1.0'.
 Where the first number indicates a major release and the second number indicates minor changes.
 
-Versions, including release candidates and path-levels, are tagged in git.
+Versions, including release candidates and patch-levels, are tagged in git.
 
 @subsection rc Release Candidates
 Release candidates are software versions that seem stable and functional to become a new version but testing is not fully finished. These versions are marked with an '-rcX', where X is the number of the release candidate.

gds-render-gui.c

@@ -187,7 +187,8 @@ static gboolean cell_store_filter_visible_func(GtkTreeModel *model, GtkTreeIter
 
 	gtk_tree_model_get(model, iter, CELL_SEL_CELL, &cell, CELL_SEL_LIBRARY, &lib, -1);
 
-	if (lib) {
+    /* Show always, if this is a pure lib entry */
+    if (lib && !cell) {
 		result = TRUE;
 		goto exit_filter;
 	}
@@ -690,19 +691,13 @@ static void on_select_all_layers_clicked(GtkWidget *button, gpointer user_data)
 	layer_selector_select_all_layers(gui->layer_selector, TRUE);
 }
 
-static void auto_naming_clicked(GtkWidget *button, gpointer user_data)
+static gboolean auto_naming_ask_for_override(GdsRenderGui *gui)
 {
-	GdsRenderGui *gui;
 	GtkDialog *dialog;
-	gboolean overwrite;
+	gint dialog_result;
-	int dialog_result;
+	gboolean overwrite = FALSE;
-	(void)button;
 
-	gui = RENDERER_GUI(user_data);
+	g_return_val_if_fail(RENDERER_IS_GUI(gui), FALSE);
-
-	/* Don't do anything if the selector is empty. */
-	if (!layer_selector_contains_elements(gui->layer_selector))
-		return;
 
 	/* Ask for overwrite */
 	dialog = GTK_DIALOG(gtk_message_dialog_new(gui->main_window, GTK_DIALOG_USE_HEADER_BAR, GTK_MESSAGE_QUESTION,
@@ -719,6 +714,25 @@ static void auto_naming_clicked(GtkWidget *button, gpointer user_data)
 	}
 	gtk_widget_destroy(GTK_WIDGET(dialog));
 
+	return overwrite;
+}
+
+static void auto_naming_clicked(GtkWidget *button, gpointer user_data)
+{
+	GdsRenderGui *gui;
+	gboolean overwrite = FALSE;
+	(void)button;
+
+	gui = RENDERER_GUI(user_data);
+
+	/* Don't do anything if the selector is empty. */
+	if (!layer_selector_contains_elements(gui->layer_selector))
+		return;
+
+	/* Ask, if names shall be overwritten, if they are not empty */
+	if (layer_selector_num_of_named_elements(gui->layer_selector) > 0)
+		overwrite = auto_naming_ask_for_override(gui);
+
 	layer_selector_auto_name_layers(gui->layer_selector, overwrite);
 }
 

gds-utils/gds-parser.c

@@ -80,6 +80,7 @@ enum gds_record {
 	STRANS = 0x1A01,
 	BOX = 0x2D00,
 	LAYER = 0x0D02,
+	DATATYPE = 0x0E02,
 	WIDTH = 0x0F03,
 	PATHTYPE = 0x2102,
 	COLROW = 0x1302,
@@ -867,6 +868,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 		case LIBNAME:
 		case SNAME:
 		case LAYER:
+		case DATATYPE:
 		case STRNAME:
 			break;
 		default:
@@ -1003,6 +1005,16 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 			}
 			GDS_INF("\t\tAdded layer %d\n", (int)current_graphics->layer);
 			break;
+		case DATATYPE:
+			if (!current_graphics) {
+				GDS_WARN("Datatype has to be defined inside graphics object. Probably unknown object. Implement it yourself!");
+				break;
+			}
+			current_graphics->datatype = gds_convert_signed_int16(workbuff);
+			if (current_graphics->datatype < 0)
+				GDS_WARN("Datatype negative!");
+			GDS_INF("\t\tAdded datatype %d\n", (int)current_graphics->datatype);
+			break;
 		case MAG:
 			if (rec_data_length != 8) {
 				GDS_WARN("Magnification is not an 8 byte real. Results may be wrong");

geometric/bounding-box.c

@@ -37,7 +37,7 @@
 #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)
+void bounding_box_calculate_from_polygon(GList *vertices, conv_generic_to_vector_2d_t conv_func, union bounding_box *box)
 {
 	double xmin = DBL_MAX, xmax = -DBL_MAX, ymin = DBL_MAX, ymax = -DBL_MAX;
 	struct vector_2d temp_vec;
@@ -68,7 +68,7 @@ void bounding_box_calculate_polygon(GList *vertices, conv_generic_to_vector_2d_t
 	box->vectors.upper_right.y = ymax;
 }
 
-void bounding_box_update_box(union bounding_box *destination, union bounding_box *update)
+void bounding_box_update_with_box(union bounding_box *destination, union bounding_box *update)
 {
 	if (!destination || !update)
 		return;
@@ -151,8 +151,6 @@ void bounding_box_update_with_path(GList *vertices, double thickness,
 	GList *vertex_iterator;
 	struct vector_2d pt;
 
-	/* printf("Warning! Function %s not yet implemented correctly!\n", __func__); */
-
 	if (!vertices || !box)
 		return;
 
@@ -173,7 +171,7 @@ void bounding_box_update_with_path(GList *vertices, double thickness,
 	}
 }
 
-void bounding_box_update_point(union bounding_box *destination, conv_generic_to_vector_2d_t conv_func, void *pt)
+void bounding_box_update_with_point(union bounding_box *destination, conv_generic_to_vector_2d_t conv_func, void *pt)
 {
 	struct vector_2d point;
 
@@ -224,7 +222,7 @@ void bounding_box_apply_transform(double scale, double rotation_deg, bool flip_a
 		vector_2d_rotate(&input_points[i], rotation_deg * M_PI / 180.0);
 		vector_2d_scale(&input_points[i], scale);
 
-		bounding_box_update_point(box, NULL, &input_points[i]);
+		bounding_box_update_with_point(box, NULL, &input_points[i]);
 	}
 }
 

geometric/cell-geometrics.c

@@ -53,7 +53,7 @@ static void update_box_with_gfx(union bounding_box *box, struct gds_graphics *gf
 	case GRAPHIC_BOX:
 		/* Expected fallthrough */
 	case GRAPHIC_POLYGON:
-		bounding_box_calculate_polygon(gfx->vertices,
+		bounding_box_calculate_from_polygon(gfx->vertices,
 							(conv_generic_to_vector_2d_t)&convert_gds_point_to_2d_vector,
 							&current_box);
 		break;
@@ -74,7 +74,7 @@ static void update_box_with_gfx(union bounding_box *box, struct gds_graphics *gf
 	}
 
 	/* Update box with results */
-	bounding_box_update_box(box, &current_box);
+	bounding_box_update_with_box(box, &current_box);
 }
 
 void calculate_cell_bounding_box(union bounding_box *box, struct gds_cell *cell)
@@ -113,7 +113,7 @@ void calculate_cell_bounding_box(union bounding_box *box, struct gds_cell *cell)
 		temp_box.vectors.upper_right.y += sub_cell->origin.y;
 
 		/* update the parent's box */
-		bounding_box_update_box(box, &temp_box);
+		bounding_box_update_with_box(box, &temp_box);
 	}
 }
 

geometric/vector-operations.c

@@ -65,7 +65,7 @@ void vector_2d_rotate(struct vector_2d *vec, double angle)
 	sin_val = sin(angle);
 	cos_val = cos(angle);
 
-	vector_2d_copy(&temp, vec);
+	(void)vector_2d_copy(&temp, vec);
 
 	/* Apply rotation matrix */
 	vec->x = (cos_val * temp.x) - (sin_val * temp.y);

include/gds-render/gds-utils/gds-types.h

@@ -101,7 +101,7 @@ struct gds_graphics {
 	enum path_type path_render_type; /**< @brief Line cap */
 	int width_absolute; /**< @brief Width. Not used for objects other than paths */
 	int16_t layer; /**< @brief Layer the graphic object is on */
-	uint16_t datatype;
+	int16_t datatype; /**< @brief Data type of graphic object */
 };
 
 /**

include/gds-render/geometric/bounding-box.h

@@ -35,15 +35,44 @@
 #include <gds-render/geometric/vector-operations.h>
 #include <stdbool.h>
 
+/**
+ * @brief Union describing a bounding box
+ *
+ * Two ways of accessing a bounding box are possible.
+ *
+ * Either, use the "named" vectors struct to specifically access the points
+ * @code
+ * 	lower_left = box.vectors.lower_left;
+ * 	upper right = box.vectors.upper_right;
+ * @endcode
+ *
+ * or use the iterable vector array:
+ * @code
+ * 	for (i = 0; i < 2; i++)
+ * 		box.vector_array[i] = points[i];
+ * @endcode
+ */
 union bounding_box {
-	/** Coordinate System is (y up | x right) */
+	/**
+	 * @brief Location vectors of upper right and lower left bounding box points
+	 * @note Coordinate System is (y up | x right)
+	 */
 	struct _vectors {
+		/** @brief Lower left point of the bounding box */
 		struct vector_2d lower_left;
+		/** @brief Upper right point of the bounding box */
 		struct vector_2d upper_right;
 	} vectors;
+	/**
+	 * @brief Array of vectors representing a bounding box
+	 * @note This is more convenient for iterating
+	 */
 	struct vector_2d vector_array[2];
 };
 
+/*
+ * @brief Pointer to a function that takes any pointer and converts this object to a vector_2d struct
+ */
 typedef void (*conv_generic_to_vector_2d_t)(void *, struct vector_2d *);
 
 /**
@@ -52,14 +81,14 @@ typedef void (*conv_generic_to_vector_2d_t)(void *, struct vector_2d *);
  * @param conv_func Conversion function to convert vertices to vector_2d structs.
  * @param box Box to write to. This box is not updated! All previous data is discarded
  */
-void bounding_box_calculate_polygon(GList *vertices, conv_generic_to_vector_2d_t conv_func, union bounding_box *box);
+void bounding_box_calculate_from_polygon(GList *vertices, conv_generic_to_vector_2d_t conv_func, union bounding_box *box);
 
 /**
  * @brief Update an exisitng bounding box with another one.
  * @param destination Target box to update
  * @param update Box to update the target with
  */
-void bounding_box_update_box(union bounding_box *destination, union bounding_box *update);
+void bounding_box_update_with_box(union bounding_box *destination, union bounding_box *update);
 
 /**
  * @brief Prepare an empty bounding box.
@@ -76,7 +105,7 @@ void bounding_box_prepare_empty(union bounding_box *box);
  * @param conv_func Conversion function to convert \p pt to a vector_2d. May be NULL
  * @param pt Point to update bounding box with
  */
-void bounding_box_update_point(union bounding_box *destination, conv_generic_to_vector_2d_t conv_func, void *pt);
+void bounding_box_update_with_point(union bounding_box *destination, conv_generic_to_vector_2d_t conv_func, void *pt);
 
 /**
  * @brief Return all four corner points of a bounding box
@@ -102,7 +131,7 @@ void bounding_box_get_all_points(struct vector_2d *points, union bounding_box *b
  * @param rotation_deg Rotation of bounding box around the origin in degrees (counterclockwise)
  * @param flip_at_x Flip the boundig box on the x axis before rotating.
  * @param box Bounding box the operations should be applied to.
- * @note Keep in mind, that this bounding boxy is actually the bounding box of the rotated boundig box and not the object itself.
+ * @note Keep in mind, that this bounding box is actually the bounding box of the rotated boundig box and not the object itself.
  *       It might be too big.
  */
 void bounding_box_apply_transform(double scale, double rotation_deg, bool flip_at_x, union bounding_box *box);
@@ -113,6 +142,9 @@ void bounding_box_apply_transform(double scale, double rotation_deg, bool flip_a
  * @param thickness Thisckness of the path
  * @param conv_func Conversion function for vertices to vector_2d structs
  * @param box Bounding box to write results in.
+ * @warning This function is not yet implemented correctly. Miter points of paths are not taken into account.
+ *		If a path is the outmost object of your cell _and_ it is not parallel to one of the coordinate axes,
+ *		the calculated bounding box size might be off. In other cases it should be reasonable close to the real bounding box.
  */
 void bounding_box_update_with_path(GList *vertices, double thickness, conv_generic_to_vector_2d_t conv_func, union bounding_box *box);
 

include/gds-render/geometric/cell-geometrics.h

@@ -35,10 +35,17 @@
 #include <gds-render/gds-utils/gds-types.h>
 
 /**
- * @brief calculate_cell_bounding_box Calculate bounding box of gds cell
+ * @brief Calculate bounding box of a gds cell.
- * @param box Resulting boundig box. Will be uüdated and not overwritten
+ *
+ * This function updates a given bounding box with the dimensions of a
+ * gds_cell. Please note that the handling of path miter points is not complete yet.
+ * If a path object is the outmost object of your cell at any edge,
+ * the resulting bounding box might be the wrong size. The devistion from the real size
+ * is guaranteed to be within the width of the path object.
+ *
+ * @param box Resulting boundig box. Will be updated and not overwritten
  * @param cell Toplevel cell
- * @warning Path handling not yet implemented correctly.
+ * @warning Handling of Path graphic objects not yet implemented correctly.
  */
 void calculate_cell_bounding_box(union bounding_box *box, struct gds_cell *cell);
 

include/gds-render/layer/layer-selector.h

@@ -130,6 +130,13 @@ void layer_selector_auto_name_layers(LayerSelector *layer_selector, gboolean ove
  */
 gboolean layer_selector_contains_elements(LayerSelector *layer_selector);
 
+/**
+ * @brief Get number of layer elements that are named
+ * @param[in] layer_selector Layer selector
+ * @return Number of layers with a name != NULL or != ""
+ */
+size_t layer_selector_num_of_named_elements(LayerSelector *layer_selector);
+
 G_END_DECLS
 
 #endif /* __LAYER_SELECTOR_H__ */

include/gds-render/layer/layer-settings.h

@@ -41,7 +41,7 @@ struct layer_info
 {
 	int layer; /**< @brief Layer number */
 	char *name; /**< @brief Layer name. */
-	int stacked_position; ///< @brief Position of layer in output @warning This parameter is not used by any renderer so far @note Lower is bottom, higher is top
+	int stacked_position; /**< @brief Position of layer in output @warning This parameter is not used by any renderer so far @note Lower is bottom, higher is top */
 	GdkRGBA color; /**< @brief RGBA color used to render this layer */
 	int render; /**< @brief true: Render to output */
 };

include/gds-render/output-renderers/cairo-renderer.h

@@ -38,7 +38,7 @@ G_DECLARE_FINAL_TYPE(CairoRenderer, cairo_renderer, GDS_RENDER, CAIRO_RENDERER,
 
 #define GDS_RENDER_TYPE_CAIRO_RENDERER (cairo_renderer_get_type())
 
-#define MAX_LAYERS (300) /**< \brief Maximum layer count the output renderer can process. Typically GDS only specifies up to 255 layers.*/
+#define MAX_LAYERS (5000) /**< \brief Maximum layer count the output renderer can process. Typically GDS only specifies up to 255 layers.*/
 
 /**
  * @brief Create new CairoRenderer for SVG output

include/gds-render/output-renderers/external-renderer-interfaces.h

@@ -1,3 +1,22 @@
+/*
+ * 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/>.
+ */
+
 #ifndef __EXTERNAL_RENDERER_INTERFACES_H__
 #define __EXTERNAL_RENDERER_INTERFACES_H__
 

layer/color-palette.c

@@ -238,6 +238,7 @@ static void color_palette_dispose(GObject *gobj)
 	if (palette->color_array) {
 		palette->color_array_length = 0;
 		free(palette->color_array);
+		palette->color_array = NULL;
 	}
 
 	/* Chain up to parent class */

layer/layer-selector.c

@@ -822,12 +822,10 @@ void layer_selector_auto_color_layers(LayerSelector *layer_selector, ColorPalett
 	unsigned int color_count;
 	GdkRGBA color;
 
-	if (GDS_RENDER_IS_COLOR_PALETTE(palette) == FALSE || LAYER_IS_SELECTOR(layer_selector) == FALSE)
+	g_return_if_fail(GDS_RENDER_IS_COLOR_PALETTE(palette));
-		return;
+	g_return_if_fail(LAYER_IS_SELECTOR(layer_selector));
-	if (global_alpha <= 0)
+	g_return_if_fail(global_alpha > 0);
-		return;
+	g_return_if_fail(GTK_IS_LIST_BOX(layer_selector->list_box));
-	if (GTK_IS_LIST_BOX(layer_selector->list_box) == FALSE)
-		return;
 
 	le_list = gtk_container_get_children(GTK_CONTAINER(layer_selector->list_box));
 
@@ -898,4 +896,31 @@ gboolean layer_selector_contains_elements(LayerSelector *layer_selector)
 	return (layer_element_list ? TRUE : FALSE);
 }
 
+size_t layer_selector_num_of_named_elements(LayerSelector *layer_selector)
+{
+	GList *le_list;
+	GList *le_list_ptr;
+	LayerElement *le;
+	const char *layer_name;
+	size_t count = 0U;
+
+	g_return_val_if_fail(LAYER_IS_SELECTOR(layer_selector), 0U);
+
+	le_list = gtk_container_get_children(GTK_CONTAINER(layer_selector->list_box));
+
+	for (le_list_ptr = le_list; le_list_ptr != NULL; le_list_ptr = g_list_next(le_list_ptr)) {
+		le = LAYER_ELEMENT(le_list_ptr->data);
+		if (!le)
+			continue;
+		layer_name = layer_element_get_name(le);
+
+		if (layer_name && *layer_name) {
+			/* Layer name is not empty. Count it */
+			count++;
+		}
+	}
+
+	return count;
+}
+
 /** @} */

output-renderers/cairo-renderer.c

@@ -275,12 +275,20 @@ static int cairo_renderer_render_cell_to_vector_file(GdsOutputRenderer *renderer
 		goto ret_parent;
 	}
 
-	/* Close stdin and (stdout and stderr may live on) */
+	/* We are now in a separate process just for rendering the output image.
+     * You may print a log message to the activity bar of the gui by writing a line
+     * teminated with '\n' to comm_pipe[1]. This will be handled by the parent process.
+     * Directly calling the update function 
+     *     gds_output_renderer_update_async_progress()
+     * does not have any effect because this is a separate process.
+     */
+  
+	/*
+     * Close stdin and (stdout and stderr may live on)
+     */
 	close(0);
-	//close(1);
 	close(comm_pipe[0]);
 
-
 	layers = (struct cairo_layer *)calloc(MAX_LAYERS, sizeof(struct cairo_layer));
 
 	/* Clear layers */
@@ -363,8 +371,6 @@ static int cairo_renderer_render_cell_to_vector_file(GdsOutputRenderer *renderer
 	for (info_list = layer_infos; info_list != NULL; info_list = g_list_next(info_list)) {
 		linfo = (struct layer_info *)info_list->data;
 
-		dprintf(comm_pipe[1], _("Exporting layer %d to file\n"), linfo->layer);
-
 		if (linfo->layer >= MAX_LAYERS) {
 			printf(_("Layer outside of spec.\n"));
 			continue;
@@ -373,6 +379,8 @@ static int cairo_renderer_render_cell_to_vector_file(GdsOutputRenderer *renderer
 		if (!linfo->render)
 			continue;
 
+		dprintf(comm_pipe[1], _("Exporting layer %d to file\n"), linfo->layer);
+
 		if (pdf_file && pdf_cr) {
 			cairo_set_source_surface(pdf_cr, layers[linfo->layer].rec, -xmin, -ymin);
 			cairo_paint_with_alpha(pdf_cr, linfo->color.alpha);

output-renderers/gds-output-renderer.c

@@ -100,6 +100,11 @@ static void gds_output_renderer_dispose(GObject *self_obj)
 	if (priv->output_file)
 		g_free(priv->output_file);
 
+	if (priv->idle_function_parameters.status_message) {
+		g_free(priv->idle_function_parameters.status_message);
+		priv->idle_function_parameters.status_message = NULL;
+	}
+
 	g_clear_object(&priv->layer_settings);
 
 	/* Chain up to parent class */

output-renderers/latex-renderer.c

@@ -370,7 +370,7 @@ static int latex_renderer_render_output(GdsOutputRenderer *renderer,
 						l_renderer->pdf_layers, l_renderer->tex_standalone, renderer);
 		fclose(tex_file);
 	} else {
-		g_error(_("Could not open LaTeX output file"));
+        g_warning(_("Could not open LaTeX output file"));
 	}
 
 	if (settings)

resources/layer-widget.glade

@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">1</property>
     <property name="value">1</property>
-    <property name="step_increment">0.01</property>
+    <property name="step-increment">0.01</property>
-    <property name="page_increment">0.10000000000000001</property>
+    <property name="page-increment">0.10</property>
   </object>
   <object class="GtkBox" id="box">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="spacing">3</property>
     <child>
       <object class="GtkEventBox" id="event-box">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
-            <property name="stock">gtk-justify-fill</property>
+            <property name="icon-name">open-menu-symbolic</property>
           </object>
         </child>
       </object>
@@ -33,7 +33,7 @@
     <child>
       <object class="GtkLabel" id="layer">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">label</property>
       </object>
       <packing>
@@ -45,9 +45,9 @@
     <child>
       <object class="GtkColorButton" id="color">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can-focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="receives-default">True</property>
-        <property name="use_alpha">True</property>
+        <property name="use-alpha">True</property>
         <property name="title" translatable="yes">Select Layer Color and Opacity</property>
         <property name="rgba">rgb(0,0,0)</property>
       </object>
@@ -61,9 +61,9 @@
       <object class="GtkCheckButton" id="export">
         <property name="label" translatable="yes">Export Layer</property>
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can-focus">True</property>
-        <property name="receives_default">False</property>
+        <property name="receives-default">False</property>
-        <property name="draw_indicator">True</property>
+        <property name="draw-indicator">True</property>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -74,7 +74,7 @@
     <child>
       <object class="GtkEntry" id="entry">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can-focus">True</property>
       </object>
       <packing>
         <property name="expand">True</property>

resources/main.glade

@@ -1,145 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkImage" id="auto-name-img">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
-    <property name="stock">gtk-edit</property>
+    <property name="icon-name">format-text-rich-symbolic</property>
   </object>
   <object class="GtkImage" id="color-img">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
-    <property name="stock">gtk-select-color</property>
+    <property name="icon-name">color-select-symbolic</property>
-  </object>
-  <object class="GtkImage" id="load-mapping-img">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-open</property>
-  </object>
-  <object class="GtkImage" id="save-mapping-img">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="tooltip_text" translatable="yes">Save the current layer configuration to CSV</property>
-    <property name="stock">gtk-save-as</property>
   </object>
   <object class="GtkImage" id="select-all-img">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
-    <property name="stock">gtk-apply</property>
+    <property name="icon-name">emblem-ok-symbolic</property>
   </object>
   <object class="GtkImage" id="sort-down-img">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
-    <property name="stock">gtk-sort-ascending</property>
+    <property name="icon-name">view-sort-descending-symbolic</property>
   </object>
   <object class="GtkImage" id="sort-up-img">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
-    <property name="stock">gtk-sort-descending</property>
+    <property name="icon-name">view-sort-ascending-symbolic</property>
   </object>
   <object class="GtkWindow" id="main-window">
-    <property name="height_request">250</property>
+    <property name="height-request">250</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
-    <property name="icon_name">gds-render</property>
+    <property name="icon-name">gds-render</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="header-bar">
-        <property name="name">header</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="title" translatable="yes">GDS-Render</property>
-        <property name="show_close_button">True</property>
-        <child>
-          <object class="GtkButton" id="button-load-gds">
-            <property name="label">gtk-open</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Open GDS2 Database</property>
-            <property name="use_stock">True</property>
-            <property name="always_show_image">True</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button-load-mapping">
-            <property name="label" translatable="yes">Load Mapping</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Load the current layer configuration from CSV</property>
-            <property name="image">load-mapping-img</property>
-            <property name="always_show_image">True</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="button-save-mapping">
-            <property name="label" translatable="yes">Save Mapping</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="image">save-mapping-img</property>
-            <property name="always_show_image">True</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="convert-button">
-            <property name="label">gtk-convert</property>
-            <property name="name">button-convert</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Convert selected cell</property>
-            <property name="use_stock">True</property>
-            <property name="always_show_image">True</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
-          </object>
-          <packing>
-            <property name="position">3</property>
-          </packing>
-        </child>
-      </object>
-    </child>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkSearchEntry" id="cell-search">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
-                    <property name="primary_icon_name">edit-find-symbolic</property>
+                    <property name="primary-icon-name">edit-find-symbolic</property>
-                    <property name="primary_icon_activatable">False</property>
+                    <property name="primary-icon-activatable">False</property>
-                    <property name="primary_icon_sensitive">False</property>
+                    <property name="primary-icon-sensitive">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -150,15 +62,15 @@
                 <child>
                   <object class="GtkScrolledWindow">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
-                    <property name="hscrollbar_policy">never</property>
+                    <property name="hscrollbar-policy">never</property>
-                    <property name="shadow_type">in</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="can-focus">True</property>
-                        <property name="enable_search">False</property>
+                        <property name="enable-search">False</property>
-                        <property name="enable_grid_lines">both</property>
+                        <property name="enable-grid-lines">both</property>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection"/>
                         </child>
@@ -181,20 +93,20 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <child>
                       <object class="GtkButton" id="button-up-sort">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can-focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="receives-default">True</property>
-                        <property name="tooltip_text" translatable="yes">Sort layers ascending</property>
+                        <property name="tooltip-text" translatable="yes">Sort layers ascending</property>
                         <property name="image">sort-up-img</property>
-                        <property name="always_show_image">True</property>
+                        <property name="always-show-image">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -205,11 +117,11 @@
                     <child>
                       <object class="GtkButton" id="button-down-sort">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can-focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="receives-default">True</property>
-                        <property name="tooltip_text" translatable="yes">Sort layers descending</property>
+                        <property name="tooltip-text" translatable="yes">Sort layers descending</property>
                         <property name="image">sort-down-img</property>
-                        <property name="always_show_image">True</property>
+                        <property name="always-show-image">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -220,11 +132,11 @@
                     <child>
                       <object class="GtkButton" id="auto-color-button">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can-focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="receives-default">True</property>
-                        <property name="tooltip_text" translatable="yes">Automatically color layers</property>
+                        <property name="tooltip-text" translatable="yes">Automatically color layers</property>
                         <property name="image">color-img</property>
-                        <property name="always_show_image">True</property>
+                        <property name="always-show-image">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -235,11 +147,11 @@
                     <child>
                       <object class="GtkButton" id="button-select-all">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can-focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="receives-default">True</property>
-                        <property name="tooltip_text" translatable="yes">Select all layers for export</property>
+                        <property name="tooltip-text" translatable="yes">Select all layers for export</property>
                         <property name="image">select-all-img</property>
-                        <property name="always_show_image">True</property>
+                        <property name="always-show-image">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -250,11 +162,11 @@
                     <child>
                       <object class="GtkButton" id="button-auto-name">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can-focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="receives-default">True</property>
-                        <property name="tooltip_text" translatable="yes">Automatically name layers</property>
+                        <property name="tooltip-text" translatable="yes">Automatically name layers</property>
                         <property name="image">auto-name-img</property>
-                        <property name="always_show_image">True</property>
+                        <property name="always-show-image">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -272,19 +184,19 @@
                 <child>
                   <object class="GtkScrolledWindow">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
-                    <property name="margin_top">1</property>
+                    <property name="margin-top">1</property>
-                    <property name="hscrollbar_policy">never</property>
+                    <property name="hscrollbar-policy">never</property>
-                    <property name="shadow_type">in</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkViewport">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <child>
                           <object class="GtkListBox" id="layer-list">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
-                            <property name="selection_mode">none</property>
+                            <property name="selection-mode">none</property>
                           </object>
                         </child>
                       </object>
@@ -313,7 +225,7 @@
         <child>
           <object class="GtkBox" id="activity-bar">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -327,5 +239,75 @@
         </child>
       </object>
     </child>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="header-bar">
+        <property name="name">header</property>
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="title" translatable="yes">GDS-Render</property>
+        <property name="show-close-button">True</property>
+        <child>
+          <object class="GtkButton" id="button-load-gds">
+            <property name="label">Open GDS</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="tooltip-text" translatable="yes">Open GDS2 Database</property>
+            <style>
+              <class name="suggested-action"/>
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="button-load-mapping">
+            <property name="label" translatable="yes">Load Mapping</property>
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="tooltip-text" translatable="yes">Load the current layer configuration from CSV</property>
+            <style>
+              <class name="suggested-action"/>
+            </style>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="button-save-mapping">
+            <property name="label" translatable="yes">Save Mapping</property>
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <style>
+              <class name="suggested-action"/>
+            </style>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="convert-button">
+            <property name="label">Convert Cell</property>
+            <property name="name">button-convert</property>
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="tooltip-text" translatable="yes">Convert selected cell</property>
+            <property name="always-show-image">True</property>
+            <style>
+              <class name="suggested-action"/>
+            </style>
+          </object>
+          <packing>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+    </child>
   </object>
 </interface>

test/CMakeLists.txt

@@ -0,0 +1,41 @@
+project(gds-render-test)
+
+add_custom_target(test "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}" "-r compact" "-s" DEPENDS ${PROJECT_NAME})
+
+if(NOT WIN32)
+  string(ASCII 27 Esc)
+  set(ColorReset "${Esc}[m")
+  set(ColorBold  "${Esc}[1m")
+  set(Red         "${Esc}[31m")
+  set(Green       "${Esc}[32m")
+  set(Yellow      "${Esc}[33m")
+  set(Blue        "${Esc}[34m")
+  set(Magenta     "${Esc}[35m")
+  set(Cyan        "${Esc}[36m")
+  set(White       "${Esc}[37m")
+  set(BoldRed     "${Esc}[1;31m")
+  set(BoldGreen   "${Esc}[1;32m")
+  set(BoldYellow  "${Esc}[1;33m")
+  set(BoldBlue    "${Esc}[1;34m")
+  set(BoldMagenta "${Esc}[1;35m")
+  set(BoldCyan    "${Esc}[1;36m")
+  set(BoldWhite   "${Esc}[1;37m")
+endif()
+
+cmake_minimum_required(VERSION 2.8)
+find_package(PkgConfig REQUIRED)
+
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/catch-framework")
+
+aux_source_directory("geometric" GEOMETRIC_TEST_SOURCES)
+set(TEST_SOURCES
+	${GEOMETRIC_TEST_SOURCES}
+)
+
+set(DUT_SOURCES
+	"../geometric/vector-operations.c"
+)
+
+add_executable(${PROJECT_NAME} EXCLUDE_FROM_ALL "test-main.cpp" ${TEST_SOURCES} ${DUT_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${GLIB_LDFLAGS} ${GTK3_LDFLAGS} ${CAIRO_LDFLAGS} m version ${CMAKE_DL_LIBS})
+

test/geometric/vector-operations.cpp

@@ -0,0 +1,160 @@
+#include <catch.hpp>
+#include <limits>
+
+extern "C" {
+#include <gds-render/geometric/vector-operations.h>
+}
+
+TEST_CASE("geometric/vector-operations/vector_2d_add", "[GEOMETRIC]")
+{
+	struct vector_2d res;
+	struct vector_2d a;
+	struct vector_2d b;
+
+	a.x = 1;
+	a.y = 2;
+
+	b.x = 2;
+	b.y = 6;
+
+	vector_2d_add(&res, &a, &b);
+
+	REQUIRE(res.x == Approx(a.x + b.x));
+	REQUIRE(res.y == Approx(a.y + b.y));
+}
+
+TEST_CASE("geometric/vector-operations/vector_2d_calculate_angle_between", "[GEOMETRIC]")
+{
+	double angle;
+	struct vector_2d a;
+	struct vector_2d b;
+
+	a.x = 1;
+	a.y = 0;
+
+	b.x = 0;
+	b.y = 1;
+
+	angle = vector_2d_calculate_angle_between(&a, &a);
+	REQUIRE(angle == Approx(0.0));
+
+	angle = vector_2d_calculate_angle_between(&a, &b);
+	REQUIRE(angle == Approx(90.0 / 180.0 * M_PI));
+}
+
+TEST_CASE("geometric/vector-operations/vector_2d_subtract", "[GEOMETRIC]")
+{
+	struct vector_2d res;
+	struct vector_2d a;
+	struct vector_2d b;
+
+	a.x = 1;
+	a.y = 2;
+
+	b.x = 2;
+	b.y = 6;
+
+	vector_2d_subtract(&res, &a, &b);
+
+	REQUIRE(res.x == Approx(a.x - b.x));
+	REQUIRE(res.y == Approx(a.y - b.y));
+}
+
+TEST_CASE("geometric/vector-operations/vector_2d_abs", "[GEOMETRIC]")
+{
+	struct vector_2d c;
+	struct vector_2d a;
+	struct vector_2d b;
+	double a_len, b_len, c_len;
+
+	a.x = 1;
+	a.y = 0;
+
+	b.x = 0;
+	b.y = 2;
+
+	c.x = 3;
+	c.y = 4;
+
+	a_len = vector_2d_abs(&a);
+	b_len = vector_2d_abs(&b);
+	c_len = vector_2d_abs(&c);
+
+	REQUIRE(a_len == Approx(1.0));
+	REQUIRE(b_len == Approx(2.0));
+	REQUIRE(c_len == Approx(5.0));
+}
+
+TEST_CASE("geometric/vector-operations/vector_2d_scalar_multipy", "[GEOMETRIC]")
+{
+	struct vector_2d c;
+	struct vector_2d a;
+	struct vector_2d b;
+	double mult;
+
+	a.x = 1;
+	a.y = 0;
+	b.x = 0;
+	b.y = 2;
+	mult = vector_2d_scalar_multipy(&a, &b);
+	REQUIRE(mult == Approx(0.0));
+	
+	a.x = 1;
+	a.y = 1;
+	b.x = 1;
+	b.y = 1;
+	mult = vector_2d_scalar_multipy(&a, &b);
+	REQUIRE(mult == Approx(2.0));	
+}
+
+TEST_CASE("geometric/vector-operations/vector_2d_normalize", "[GEOMETRIC]")
+{
+	struct vector_2d a;
+
+	a.x = 1;
+	a.y = 0;
+	vector_2d_normalize(&a);
+	REQUIRE(a.x == Approx(1.0));
+	REQUIRE(a.y == Approx(0.0));
+
+	a.x = 1;
+	a.y = -1;
+	vector_2d_normalize(&a);
+	REQUIRE(a.x == Approx(1.0/sqrt(2)));
+	REQUIRE(a.y == Approx(-1.0/sqrt(2)));
+}
+
+TEST_CASE("geometric/vector-operations/vector_2d_rotate", "[GEOMETRIC]")
+{
+	struct vector_2d a;
+
+	a.x = 1;
+	a.y = 0;
+	vector_2d_rotate(&a, M_PI/2);
+	REQUIRE(a.x == Approx(0.0).scale(0.001));
+	REQUIRE(a.y == Approx(1.0));
+
+	a.x = 0;
+	a.y = 1;
+	vector_2d_rotate(&a, -M_PI/2);
+	vector_2d_rotate(&a, M_PI);
+	REQUIRE(a.x == Approx(-1.0));
+	REQUIRE(a.y == Approx(0.0).scale(0.001));
+}
+
+TEST_CASE("geometric/vector-operations/vector_2d_scale", "[GEOMETRIC]")
+{
+	struct vector_2d a;
+
+	a.x = 1;
+	a.y = 0;
+	vector_2d_scale(&a, 2.0);
+	REQUIRE(a.x == Approx(2.0));
+	REQUIRE(a.y == Approx(0.0));
+
+	a.x = 1;
+	a.y = -3;
+	vector_2d_scale(&a, 0.5);
+	REQUIRE(a.x == Approx(0.5));
+	REQUIRE(a.y == Approx(-1.5));
+}

test/test-main.cpp

@@ -0,0 +1,2 @@
+#define CATCH_CONFIG_MAIN
+#include "catch-framework/catch.hpp"