Disable prints in GDS renderer. Wrote documentation

CMakeLists.txt

@@ -2,22 +2,23 @@ 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)
 
-include_directories(${GLIB_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS})
-link_directories(${GLIB_LINK_DIRS} ${GTK3_LINK_DIRS})
+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("layer-widget" LAYER_SOURCES)
+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)
-set(SOURCE "main.c" "layer-selector.c")
-
+aux_source_directory("cairo-output" CAIRO_SOURCES)
+set(SOURCE "main.c" "layer-selector.c" "mapping-parser.c" "command-line.c" "main-window.c")
 
 set(SOURCE
   ${SOURCE}
@@ -25,6 +26,7 @@ set(SOURCE
   ${RENDERER_SOURCES}
   ${PARSER_SOURCES}
   ${LATEX_SOURCES}
+  ${CAIRO_SOURCES}
 )
 
 add_compile_options(-Wall)
@@ -32,5 +34,5 @@ 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} m)
+target_link_libraries(${PROJECT_NAME} ${GLIB_LDFLAGS} ${GTK3_LDFLAGS} ${CAIRO_LDFLAGS} m)
 

cairo-output/cairo-output.c

@@ -0,0 +1,282 @@
+/*
+ * 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 cairo-output.c
+  * @brief Output renderer for Cairo PDF export
+  * @author Mario Hüttel <mario.huettel@gmx.net>
+  */
+
+/** @addtogroup Cairo-Renderer
+ *  @{
+ */
+
+#include "cairo-output.h"
+#include <math.h>
+#include <stdlib.h>
+#include <cairo.h>
+#include <cairo-pdf.h>
+
+/**
+ * @brief The cairo_layer struct
+ * Each rendered layer is represented by this struct.
+ */
+struct cairo_layer {
+		cairo_t *cr; /**< @brief cairo context for layer*/
+		cairo_surface_t *rec; /**< @brief Recording surface to hold the layer */
+		struct layer_info *linfo; /**< @brief Reference to layer information */
+};
+
+/**
+ * @brief Revert the last transformation on all layers
+ * @param layers Pointer to #cairo_layer structures
+ */
+static void revert_inherited_transform(struct cairo_layer *layers)
+{
+	int i;
+
+	for (i = 0; i < MAX_LAYERS; i++) {
+		if (layers[i].cr == NULL)
+			continue;
+		cairo_restore(layers[i].cr);
+	}
+}
+
+/**
+ * @brief Applies transformation to all layers
+ * @param layers Array of layers
+ * @param origin Origin translation
+ * @param magnification Scaling
+ * @param flipping Mirror image on x-axis before rotating
+ * @param rotation Rotattion in degrees
+ * @param scale Scale the image down by. Only used for sclaing origin coordinates. Not applied to layer.
+ */
+static void apply_inherited_transform_to_all_layers(struct cairo_layer *layers,
+						    const struct gds_point *origin,
+						    double magnification,
+						    gboolean flipping,
+						    double rotation,
+						    double scale)
+{
+	int i;
+	cairo_t *temp_layer_cr;
+
+	for (i = 0; i < MAX_LAYERS; i++) {
+		temp_layer_cr = layers[i].cr;
+		if (temp_layer_cr == NULL)
+			continue;
+
+		/* Save the state and apply transformation */
+		cairo_save(temp_layer_cr);
+		cairo_translate(temp_layer_cr, (double)origin->x/scale, (double)origin->y/scale);
+		cairo_rotate(temp_layer_cr, M_PI*rotation/180.0);
+		cairo_scale(temp_layer_cr, magnification,
+			    (flipping == TRUE ? -magnification : magnification));
+	}
+}
+
+/**
+ * @brief render_cell Render a cell with its sub-cells
+ * @param cell Cell to render
+ * @param layers Cell will be rendered into these layers
+ * @param scale sclae image down by this factor
+ */
+static void render_cell(struct gds_cell *cell, struct cairo_layer *layers, double scale)
+{
+	GList *instance_list;
+	struct gds_cell *temp_cell;
+	struct gds_cell_instance *cell_instance;
+	GList *gfx_list;
+	struct gds_graphics *gfx;
+	GList *vertex_list;
+	struct gds_point *vertex;
+	cairo_t *cr;
+
+	/* Render child cells */
+	for (instance_list = cell->child_cells; instance_list != NULL; instance_list = instance_list->next) {
+		cell_instance = (struct gds_cell_instance *)instance_list->data;
+		if ((temp_cell = cell_instance->cell_ref) != NULL) {
+			apply_inherited_transform_to_all_layers(layers,
+								&cell_instance->origin,
+								cell_instance->magnification,
+								cell_instance->flipped,
+								cell_instance->angle,
+								scale);
+			render_cell(temp_cell, layers, scale);
+			revert_inherited_transform(layers);
+		}
+	}
+
+	/* Render graphics */
+	for (gfx_list = cell->graphic_objs; gfx_list != NULL; gfx_list = gfx_list->next) {
+		gfx = (struct gds_graphics *)gfx_list->data;
+
+		/* Get layer renderer */
+		if (gfx->layer >= MAX_LAYERS)
+			continue;
+		if ((cr = layers[gfx->layer].cr) == NULL)
+			continue;
+
+		/* Apply settings */
+		cairo_set_line_width(cr, (gfx->width_absolute ? gfx->width_absolute/scale : 1));
+
+		switch (gfx->path_render_type) {
+		case PATH_FLUSH:
+			cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT);
+			break;
+		case PATH_ROUNDED:
+			cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND);
+			break;
+		case PATH_SQUARED:
+			cairo_set_line_cap(cr, CAIRO_LINE_CAP_SQUARE);
+			break;
+		}
+
+		/* Add vertices */
+		for (vertex_list = gfx->vertices; vertex_list != NULL; vertex_list = vertex_list->next) {
+			vertex = (struct gds_point *)vertex_list->data;
+
+			/* If first point -> move to, else line to */
+			if (vertex_list->prev == NULL)
+				cairo_move_to(cr, vertex->x/scale, vertex->y/scale);
+			else
+				cairo_line_to(cr, vertex->x/scale, vertex->y/scale);
+
+		}
+
+		/* Create graphics object */
+		switch (gfx->gfx_type) {
+		case GRAPHIC_PATH:
+			cairo_stroke(cr);
+			break;
+		case GRAPHIC_BOX:
+		case GRAPHIC_POLYGON:
+			cairo_set_line_width(cr, 0.1/scale);
+			cairo_close_path(cr);
+			cairo_stroke_preserve(cr); // Prevent graphic glitches
+			cairo_fill(cr);
+			break;
+		}
+
+	}
+
+}
+
+void cairo_render_cell_to_pdf(struct gds_cell *cell, GList *layer_infos, char *pdf_file, double scale)
+{
+	cairo_surface_t *pdf_surface;
+	cairo_t *pdf_cr;
+	struct layer_info *linfo;
+	struct cairo_layer *layers;
+	struct cairo_layer *lay;
+	GList *info_list;
+	int i;
+	double rec_x0, rec_y0, rec_width, rec_height;
+	double xmin = INT32_MAX, xmax = INT32_MIN, ymin = INT32_MAX, ymax = INT32_MIN;
+
+	layers = (struct cairo_layer *)calloc(MAX_LAYERS, sizeof(struct cairo_layer));
+
+	/* Clear layers */
+	for (i = 0; i < MAX_LAYERS; i++) {
+		layers[i].cr = NULL;
+		layers[i].rec = NULL;
+	}
+
+	/* Create recording surface for each layer */
+	for (info_list = layer_infos; info_list != NULL; info_list = g_list_next(info_list)) {
+		linfo = (struct layer_info *)info_list->data;
+		if (linfo->layer < MAX_LAYERS) {
+			lay = &(layers[(unsigned int)linfo->layer]);
+			lay->linfo = linfo;
+			lay->rec = cairo_recording_surface_create(CAIRO_CONTENT_COLOR_ALPHA,
+								  NULL);
+			lay->cr = cairo_create(layers[(unsigned int)linfo->layer].rec);
+			cairo_scale(lay->cr, 1, -1); // Fix coordinate system
+			cairo_set_source_rgb(lay->cr, linfo->color.red, linfo->color.green, linfo->color.blue);
+		} else {
+			printf("Layer number (%d) too high!\n", linfo->layer);
+			goto ret_clear_layers;
+		}
+	}
+
+
+	render_cell(cell, layers, scale);
+
+	/* get size of image and top left coordinate */
+	for (info_list = layer_infos; info_list != NULL; info_list = g_list_next(info_list)) {
+		linfo = (struct layer_info *)info_list->data;
+
+		if (linfo->layer >= MAX_LAYERS) {
+			printf("Layer outside of Spec.\n");
+			continue;
+		}
+
+		/* Print size */
+		cairo_recording_surface_ink_extents(layers[linfo->layer].rec, &rec_x0, &rec_y0,
+				&rec_width, &rec_height);
+		printf("Size of layer %d: %lf -- %lf\n", linfo->layer,
+		       rec_width, rec_height);
+
+		/* update bounding box */
+		xmin = MIN(xmin, rec_x0);
+		xmax = MAX(xmax, rec_x0);
+		ymin = MIN(ymin, rec_y0);
+		ymax = MAX(ymax, rec_y0);
+		xmin = MIN(xmin, rec_x0+rec_width);
+		xmax = MAX(xmax, rec_x0+rec_width);
+		ymin = MIN(ymin, rec_y0+rec_height);
+		ymax = MAX(ymax, rec_y0+rec_height);
+
+	}
+
+	printf("Bounding box: (%lf,%lf) -- (%lf,%lf)\n", xmin, ymin, xmax, ymax);
+
+	pdf_surface = cairo_pdf_surface_create(pdf_file, xmax-xmin, ymax-ymin);
+	pdf_cr = cairo_create(pdf_surface);
+
+	/* Write layers to PDF */
+	for (info_list = layer_infos; info_list != NULL; info_list = g_list_next(info_list)) {
+		linfo = (struct layer_info *)info_list->data;
+
+		if (linfo->layer >= MAX_LAYERS) {
+			printf("Layer outside of Spec.\n");
+			continue;
+		}
+
+		cairo_set_source_surface(pdf_cr, layers[linfo->layer].rec, -xmin, -ymin);
+		cairo_paint_with_alpha(pdf_cr, linfo->color.alpha);
+	}
+
+	cairo_show_page(pdf_cr);
+	cairo_destroy(pdf_cr);
+	cairo_surface_destroy(pdf_surface);
+
+ret_clear_layers:
+	for (i = 0; i < MAX_LAYERS; i++) {
+		lay = &layers[i];
+		if(lay->cr) {
+			cairo_destroy(lay->cr);
+			cairo_surface_destroy(lay->rec);
+		}
+	}
+	free(layers);
+
+	printf("cairo export finished. It might still be buggy!\n");
+}
+
+/** @} */

cairo-output/cairo-output.h

@@ -0,0 +1,47 @@
+/*
+ * 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 cairo-output.h
+ * @brief Header File for Cairo output renderer
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+#ifndef __CAIRO_OUTPUT_H__
+#define __CAIRO_OUTPUT_H__
+
+#include "../layer-selector.h"
+#include "../gds-parser/gds-types.h"
+
+/** @addtogroup Cairo-Renderer
+ *  @{
+ */
+
+#define MAX_LAYERS (300) /**< \brief Maximum layer count the output renderer can process. Typically GDS only specifies up to 255 layers.*/
+
+/**
+ * @brief Render \p cell to a PDF file specified by \p pdf_file
+ * @param cell Toplevel cell to render
+ * @param layer_infos List of layer information. Specifies color and layer stacking
+ * @param pdf_file Output file
+ * @param scale Scale the output image down by \p scale
+ */
+void cairo_render_cell_to_pdf(struct gds_cell *cell, GList *layer_infos, char *pdf_file, double scale);
+
+/** @} */
+
+#endif /* __CAIRO_OUTPUT_H__ */

command-line.c

@@ -0,0 +1,137 @@
+/*
+ * 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/>.
+ */
+
+#include <stdio.h>
+#include "command-line.h"
+#include "gds-parser/gds-parser.h"
+#include "mapping-parser.h"
+#include "cairo-output/cairo-output.h"
+#include "latex-output/latex-output.h"
+
+static void delete_layer_info_with_name(struct layer_info *info)
+{
+	if (info) {
+		if (info->name)
+			g_free(info->name);
+		free(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)
+{
+	GList *libs = NULL;
+	FILE *tex_file;
+	int res;
+	GFile *file;
+	int i;
+	GFileInputStream *stream;
+	GDataInputStream *dstream;
+	gboolean layer_export;
+	GdkRGBA layer_color;
+	int layer;
+	char *layer_name;
+	GList *layer_info_list = NULL;
+	GList *cell_list;
+	struct layer_info *linfo_temp;
+	struct gds_cell *toplevel_cell = NULL, *temp_cell;
+
+	/* Check if parameters are valid */
+	if (!gds_name || ! pdf_name || !tex_name || !layer_file || !cell_name) {
+		printf("Probably missing argument. Check --help option\n");
+		return;
+	}
+
+	/* Load GDS */
+	clear_lib_list(&libs);
+	res = parse_gds_from_file(gds_name, &libs);
+	if (res)
+		return;
+
+	file = g_file_new_for_path(layer_file);
+	stream = g_file_read(file, NULL, NULL);
+
+	if (!stream) {
+		printf("Layer mapping not readable!\n");
+		goto destroy_file;
+	}
+	dstream = g_data_input_stream_new(G_INPUT_STREAM(stream));
+	i = 0;
+	do {
+		res = load_csv_line(dstream, &layer_export, &layer_name, &layer, &layer_color);
+		if (res == 0) {
+			if (!layer_export)
+				continue;
+			linfo_temp = (struct layer_info *)malloc(sizeof(struct layer_info));
+			if (!linfo_temp) {
+				printf("Out of memory\n");
+				goto ret_clear_list;
+			}
+			linfo_temp->color.alpha = layer_color.alpha;
+			linfo_temp->color.red = layer_color.red;
+			linfo_temp->color.green = layer_color.green;
+			linfo_temp->color.blue = layer_color.blue;
+			linfo_temp->name = layer_name;
+			linfo_temp->stacked_position = i++;
+			linfo_temp->layer = layer;
+			layer_info_list = g_list_append(layer_info_list, (gpointer)linfo_temp);
+		}
+	} while(res >= 0);
+
+
+	/* find_cell in first library. */
+	if (!libs)
+		goto ret_clear_list;
+
+	for (cell_list = ((struct gds_library *)libs->data)->cells; cell_list != NULL; cell_list = g_list_next(cell_list)) {
+		temp_cell = (struct gds_cell *)cell_list->data;
+		if (!strcmp(temp_cell->name, cell_name)) {
+			toplevel_cell = temp_cell;
+			break;
+		}
+	}
+
+	if (!toplevel_cell) {
+		printf("Couldn't find cell in first library!\n");
+		goto ret_clear_list;
+	}
+
+	/* Render outputs */
+	if (pdf == TRUE) {
+		cairo_render_cell_to_pdf(toplevel_cell, layer_info_list, pdf_name, scale);
+	}
+
+	if (tex == TRUE) {
+		tex_file = fopen(tex_name, "w");
+		if (!tex_file)
+			goto ret_clear_list;
+		latex_render_cell_to_code(toplevel_cell, layer_info_list, tex_file, scale, pdf_layers, pdf_standalone);
+		fclose(tex_file);
+	}
+
+ret_clear_list:
+	g_list_free_full(layer_info_list, (GDestroyNotify)delete_layer_info_with_name);
+
+	g_object_unref(dstream);
+	g_object_unref(stream);
+destroy_file:
+	g_object_unref(file);
+
+
+}

command-line.h

@@ -0,0 +1,27 @@
+/*
+ * 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 _COMMAND_LINE_H_
+#define _COMMAND_LINE_H_
+#include <glib.h>
+
+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);
+
+#endif /* _COMMAND_LINE_H_ */

doxygen/main-application.h

@@ -0,0 +1,6 @@
+/* This file only contains help information for doxygen */
+
+/**
+ * @defgroup MainApplication Main Application
+ *
+ */

doxygen/output/.gitignore

@@ -0,0 +1,3 @@
+*
+*/
+!.gitignore

gds-parser/gds-parser.c

@@ -18,14 +18,27 @@
  */
 
 /*
+
+ */
+
+
+/**
+ * @file gds_parser.h
+ * @brief Header file for the GDS-Parser
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ *
  * What's missing? - A lot:
- * Support for Boxes
  * Support for 4 Byte real
  * Support for pathtypes
  * Support for datatypes (only layer so far)
  * etc...
  */
 
+/**
+ * @addtogroup GDS-Parser
+ * @{
+ */
+
 
 #include "gds-parser.h"
 #include <stdlib.h>
@@ -33,11 +46,17 @@
 #include <string.h>
 #include <stdbool.h>
 #include <math.h>
+#include <cairo.h>
 
-#define GDS_ERROR(fmt, ...) printf("[PARSE_ERROR] " fmt "\n", ##__VA_ARGS__)
-#define GDS_WARN(fmt, ...) printf("[PARSE_WARNING] " fmt "\n", ##__VA_ARGS__)
+#define GDS_ERROR(fmt, ...) printf("[PARSE_ERROR] " fmt "\n", ##__VA_ARGS__) /**< @brief Print GDS error*/
+#define GDS_WARN(fmt, ...) printf("[PARSE_WARNING] " fmt "\n", ##__VA_ARGS__) /**< @brief Print GDS warning */
 
-enum record {
+#if GDS_PRINT_DEBUG_INFOS
+	#define GDS_INF(fmt, ...) printf(fmt, ##__VA_ARGS__) /**< @brief standard printf. But cna be disabled in code */
+#else
+	#define GDS_INF(fmt, ...)
+#endif
+enum gds_record {
 	INVALID = 0x0000,
 	HEADER = 0x0002,
 	BGNLIB = 0x0102,
@@ -62,6 +81,13 @@ enum record {
 	PATHTYPE = 0x2102
 };
 
+/**
+ * @brief Name cell reference
+ * @param cell_inst Cell reference
+ * @param bytes Length of name
+ * @param data Name
+ * @return 0 if successful
+ */
 static int name_cell_ref(struct gds_cell_instance *cell_inst,
 			 unsigned int bytes, char *data)
 {
@@ -72,7 +98,7 @@ static int name_cell_ref(struct gds_cell_instance *cell_inst,
 		return -1;
 	}
 	data[bytes] = 0; // Append '0'
-	len = strlen(data);
+	len = (int)strlen(data);
 	if (len > CELL_NAME_MAX-1) {
 		GDS_ERROR("Cell name '%s' too long: %d\n", data, len);
 		return -1;
@@ -80,11 +106,16 @@ static int name_cell_ref(struct gds_cell_instance *cell_inst,
 
 	/* else: */
 	strcpy(cell_inst->ref_name, data);
-	printf("\tCell referenced: %s\n", cell_inst->ref_name);
+	GDS_INF("\tCell referenced: %s\n", cell_inst->ref_name);
 
 	return 0;
 }
 
+/**
+ * @brief Convert GDS 8-byte real to double
+ * @param data 8 Byte GDS real
+ * @return result
+ */
 static double gds_convert_double(const char *data)
 {
 	bool sign_bit;
@@ -125,6 +156,11 @@ static double gds_convert_double(const char *data)
 	return ret_val;
 }
 
+/**
+ * @brief Convert GDS INT32 to int
+ * @param data Buffer containing the int
+ * @return result
+ */
 static signed int gds_convert_signed_int(const char *data)
 {
 	int ret;
@@ -141,6 +177,11 @@ static signed int gds_convert_signed_int(const char *data)
 	return ret;
 }
 
+/**
+ * @brief Convert GDS INT16 to int16
+ * @param data Buffer containing the INT16
+ * @return result
+ */
 static int16_t gds_convert_signed_int16(const char *data)
 {
 	if (!data) {
@@ -151,6 +192,11 @@ static int16_t gds_convert_signed_int16(const char *data)
 			(((int16_t)(data[1]) & 0xFF) <<  0));
 }
 
+/**
+ * @brief Convert GDS UINT16 String to uint16
+ * @param data Buffer containing the uint16
+ * @return result
+ */
 static uint16_t gds_convert_unsigend_int16(const char *data)
 {
 	if (!data) {
@@ -161,6 +207,12 @@ static uint16_t gds_convert_unsigend_int16(const char *data)
 			(((uint16_t)(data[1]) & 0xFF) <<  0));
 }
 
+/**
+ * @brief Append library to list
+ * @param curr_list List containing gds_library elements. May be NULL.
+ * @param library_ptr Return of newly created library.
+ * @return Newly created list pointer
+ */
 static GList *append_library(GList *curr_list, struct gds_library **library_ptr)
 {
 	struct gds_library *lib;
@@ -179,6 +231,13 @@ static GList *append_library(GList *curr_list, struct gds_library **library_ptr)
 	return g_list_append(curr_list, lib);
 }
 
+/**
+ * @brief Append graphics to list
+ * @param curr_list List containing gds_graphics elements. May be NULL
+ * @param type Type of graphics
+ * @param graphics_ptr newly created graphic is written here
+ * @return new list pointer
+ */
 static GList *append_graphics(GList *curr_list, enum graphics_type type,
 			      struct gds_graphics **graphics_ptr)
 {
@@ -201,6 +260,13 @@ static GList *append_graphics(GList *curr_list, enum graphics_type type,
 	return g_list_append(curr_list, gfx);
 }
 
+/**
+ * @brief Appends vertext List
+ * @param curr_list List containing gds_point elements. May be NULL.
+ * @param x x-coordinate of new point
+ * @param y y-coordinate of new point
+ * @return new Pointer to List.
+ */
 static GList *append_vertex(GList *curr_list, int x, int y)
 {
 	struct gds_point *vertex;
@@ -214,6 +280,14 @@ static GList *append_vertex(GList *curr_list, int x, int y)
 	return g_list_append(curr_list, vertex);
 }
 
+/**
+ * @brief append_cell Append a gds_cell to a list
+ *
+ * Usage similar to append_cell_ref().
+ * @param curr_list List containing gds_cell elements. May be NULL
+ * @param cell_ptr newly created cell
+ * @return new pointer to list
+ */
 static GList *append_cell(GList *curr_list, struct gds_cell **cell_ptr)
 {
 	struct gds_cell *cell;
@@ -232,6 +306,14 @@ static GList *append_cell(GList *curr_list, struct gds_cell **cell_ptr)
 	return g_list_append(curr_list, cell);
 }
 
+/**
+ * @brief Append a cell reference to the reference GList.
+ *
+ * Appends a new gds_cell_instance to \p curr_list and returns the new element via \p instance_ptr
+ * @param curr_list List of gds_cell_instance elements. May be NULL
+ * @param instance_ptr newly created element
+ * @return new GList pointer
+ */
 static GList *append_cell_ref(GList *curr_list, struct gds_cell_instance **instance_ptr)
 {
 	struct gds_cell_instance *inst;
@@ -253,6 +335,13 @@ static GList *append_cell_ref(GList *curr_list, struct gds_cell_instance **insta
 	return g_list_append(curr_list, inst);
 }
 
+/**
+ * @brief Name a gds_library
+ * @param current_library Library to name
+ * @param bytes Lenght of name
+ * @param data Name
+ * @return 0 if successful
+ */
 static int name_library(struct gds_library *current_library,
 			unsigned int bytes, char *data)
 {
@@ -264,18 +353,26 @@ static int name_library(struct gds_library *current_library,
 	}
 
 	data[bytes] = 0; // Append '0'
-	len = strlen(data);
+	len = (int)strlen(data);
 	if (len > CELL_NAME_MAX-1) {
 		GDS_ERROR("Library name '%s' too long: %d\n", data, len);
 		return -1;
 	}
 
 	strcpy(current_library->name, data);
-	printf("Named library: %s\n", current_library->name);
+	GDS_INF("Named library: %s\n", current_library->name);
 
 	return 0;
 }
 
+/**
+ * @brief Names a gds_cell
+ * @param cell Cell to name
+ * @param bytes Length of name
+ * @param data Name
+ * @param lib Library in which \p cell is located
+ * @return 0 id successful
+ */
 static int name_cell(struct gds_cell *cell, unsigned int bytes,
 		     char *data, struct gds_library *lib)
 {
@@ -293,7 +390,7 @@ static int name_cell(struct gds_cell *cell, unsigned int bytes,
 	}
 
 	strcpy(cell->name, data);
-	printf("Named cell: %s\n", cell->name);
+	GDS_INF("Named cell: %s\n", cell->name);
 
 	/* Append cell name to lib's list of names */
 	lib->cell_names = g_list_append(lib->cell_names, cell->name);
@@ -301,15 +398,21 @@ static int name_cell(struct gds_cell *cell, unsigned int bytes,
 	return 0;
 }
 
-
-void parse_reference_list(gpointer gcell_ref, gpointer glibrary)
+/**
+ * @brief Search for cell reference \p gcell_ref in \p glibrary
+ *
+ * Search cell referenced by \p gcell_ref inside \p glibrary and update gds_cell_instance::cell_ref with found #gds_cell
+ * @param gcell_ref gpointer cast of struct gds_cell_instance *
+ * @param glibrary gpointer cast of struct gds_library *
+ */
+static void parse_reference_list(gpointer gcell_ref, gpointer glibrary)
 {
 	struct gds_cell_instance *inst = (struct gds_cell_instance *)gcell_ref;
 	struct gds_library *lib = (struct gds_library *)glibrary;
 	GList *cell_item;
 	struct gds_cell *cell;
 
-	printf("\t\t\tReference: %s: ", inst->ref_name);
+	GDS_INF("\t\t\tReference: %s: ", inst->ref_name);
 	/* Find cell */
 	for (cell_item = lib->cells; cell_item != NULL;
 	     cell_item = cell_item->next) {
@@ -317,37 +420,57 @@ void parse_reference_list(gpointer gcell_ref, gpointer glibrary)
 		cell = (struct gds_cell *)cell_item->data;
 		/* Check if cell is found */
 		if (!strcmp(cell->name, inst->ref_name)) {
-			printf("found\n");
+			GDS_INF("found\n");
 			/* update reference link */
 			inst->cell_ref = cell;
 			return;
 		}
 	}
 
-	printf("MISSING!\n");
+	GDS_INF("MISSING!\n");
 	GDS_WARN("referenced cell could not be found in library");
 }
 
-void scan_cell_reference_dependencies(gpointer gcell, gpointer library)
+/**
+ * @brief Scans cell references inside cell
+ This function searches all the references in \p gcell and updates the gds_cell_instance::cell_ref field in each instance
+ * @param gcell pointer cast of #gds_cell *
+ * @param library Library where the cell references are searched in
+ */
+static void scan_cell_reference_dependencies(gpointer gcell, gpointer library)
 {
 	struct gds_cell *cell = (struct gds_cell *)gcell;
 
-	printf("\tScanning cell: %s\n", cell->name);
+	GDS_INF("\tScanning cell: %s\n", cell->name);
 
 	/* Scan all library references */
 	g_list_foreach(cell->child_cells, parse_reference_list, library);
 
 }
 
-void scan_library_references(gpointer library_list_item, gpointer user)
+/**
+ * @brief Scans library's cell references
+ *
+ * This function searches all the references between cells and updates the gds_cell_instance::cell_ref field in each instance
+ * @param library_list_item List containing #gds_library elements
+ * @param user not used
+ */
+static void scan_library_references(gpointer library_list_item, gpointer user)
 {
 	struct gds_library *lib = (struct gds_library *)library_list_item;
 
-	printf("Scanning Library: %s\n", lib->name);
+	GDS_INF("Scanning Library: %s\n", lib->name);
 	g_list_foreach(lib->cells, scan_cell_reference_dependencies, lib);
 }
 
-void gds_parse_date(const char *buffer, int length, struct gds_time_field *mod_date, struct gds_time_field *access_date)
+/**
+ * @brief gds_parse_date
+ * @param buffer Buffer that contains the GDS Date field
+ * @param length Length of \p buffer
+ * @param mod_date Modification Date
+ * @param access_date Last Access Date
+ */
+static void gds_parse_date(const char *buffer, int length, struct gds_time_field *mod_date, struct gds_time_field *access_date)
 {
 
 	struct gds_time_field *temp_date;
@@ -389,7 +512,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 	int run = 1;
 	FILE *gds_file = NULL;
 	uint16_t rec_data_length;
-	enum record rec_type;
+	enum gds_record rec_type;
 	struct gds_library *current_lib = NULL;
 	struct gds_cell *current_cell = NULL;
 	struct gds_graphics *current_graphics = NULL;
@@ -465,7 +588,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 				break;
 
 			}
-			printf("Entering Lib\n");
+			GDS_INF("Entering Lib\n");
 			break;
 		case ENDLIB:
 			if (current_lib == NULL) {
@@ -481,7 +604,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 				break;
 			}
 			current_lib = NULL;
-			printf("Leaving Library\n");
+			GDS_INF("Leaving Library\n");
 			break;
 		case BGNSTR:
 			current_lib->cells = append_cell(current_lib->cells, &current_cell);
@@ -490,7 +613,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 				run = -3;
 				break;
 			}
-			printf("Entering Cell\n");
+			GDS_INF("Entering Cell\n");
 			break;
 		case ENDSTR:
 			if (current_cell == NULL) {
@@ -505,23 +628,24 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 				break;
 			}
 			current_cell = NULL;
-			printf("Leaving Cell\n");
+			GDS_INF("Leaving Cell\n");
 			break;
-			//case BOX:
+		case BOX:
 		case BOUNDARY:
 			if (current_cell == NULL) {
-				GDS_ERROR("Boundary outside of cell");
+				GDS_ERROR("Boundary/Box outside of cell");
 				run = -3;
 				break;
 			}
 			current_cell->graphic_objs = append_graphics(current_cell->graphic_objs,
-								     GRAPHIC_POLYGON, &current_graphics);
+								     (rec_type == BOUNDARY ? GRAPHIC_POLYGON : GRAPHIC_BOX),
+								     &current_graphics);
 			if (current_cell->graphic_objs == NULL) {
 				GDS_ERROR("Memory allocation failed");
 				run = -4;
 				break;
 			}
-			printf("\tEntering boundary\n");
+			GDS_INF("\tEntering boundary/Box\n");
 			break;
 		case SREF:
 			if (current_cell == NULL) {
@@ -537,7 +661,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 				break;
 			}
 
-			printf("\tEntering reference\n");
+			GDS_INF("\tEntering reference\n");
 			break;
 		case PATH:
 			if (current_cell == NULL) {
@@ -552,16 +676,16 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 				run = -4;
 				break;
 			}
-			printf("\tEntering Path\n");
+			GDS_INF("\tEntering Path\n");
 			break;
 		case ENDEL:
 			if (current_graphics != NULL) {
 
-				printf("\tLeaving %s\n", (current_graphics->gfx_type == GRAPHIC_POLYGON ? "boundary" : "path"));
+				GDS_INF("\tLeaving %s\n", (current_graphics->gfx_type == GRAPHIC_POLYGON ? "boundary" : "path"));
 				current_graphics = NULL;
 			}
 			if (current_s_reference != NULL) {
-				printf("\tLeaving Reference\n");
+				GDS_INF("\tLeaving Reference\n");
 				current_s_reference = NULL;
 			}
 			break;
@@ -575,6 +699,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 			}
 
 			break;
+
 		case MAG:
 			break;
 		case ANGLE:
@@ -625,17 +750,17 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 			gds_parse_date(workbuff, read, &current_cell->mod_time, &current_cell->access_time);
 			break;
 		case LIBNAME:
-			name_library(current_lib, read, workbuff);
+			name_library(current_lib, (unsigned int)read, workbuff);
 			break;
 		case STRNAME:
-			name_cell(current_cell, read, workbuff, current_lib);
+			name_cell(current_cell, (unsigned int)read, workbuff, current_lib);
 			break;
 		case XY:
 			if (current_s_reference) {
 				/* Get origin of reference */
 				current_s_reference->origin.x = gds_convert_signed_int(workbuff);
 				current_s_reference->origin.y = gds_convert_signed_int(&workbuff[4]);
-				printf("\t\tSet origin to: %d/%d\n", current_s_reference->origin.x,
+				GDS_INF("\t\tSet origin to: %d/%d\n", current_s_reference->origin.x,
 				       current_s_reference->origin.y);
 			} else if (current_graphics) {
 				for (i = 0; i < read/8; i++) {
@@ -643,7 +768,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 					y = gds_convert_signed_int(&workbuff[i*8+4]);
 					current_graphics->vertices =
 							append_vertex(current_graphics->vertices, x, y);
-					printf("\t\tSet coordinate: %d/%d\n", x, y);
+					GDS_INF("\t\tSet coordinate: %d/%d\n", x, y);
 
 				}
 			}
@@ -674,7 +799,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 			if (current_graphics->layer < 0) {
 				GDS_WARN("Layer negative!\n");
 			}
-			printf("\t\tAdded layer %d\n", (int)current_graphics->layer);
+			GDS_INF("\t\tAdded layer %d\n", (int)current_graphics->layer);
 			break;
 		case MAG:
 			if (rec_data_length != 8) {
@@ -687,7 +812,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 			}
 			if (current_s_reference != NULL) {
 				current_s_reference->magnification = gds_convert_double(workbuff);
-				printf("\t\tMagnification defined: %lf\n", current_s_reference->magnification);
+				GDS_INF("\t\tMagnification defined: %lf\n", current_s_reference->magnification);
 			}
 			break;
 		case ANGLE:
@@ -701,7 +826,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 			}
 			if (current_s_reference != NULL) {
 				current_s_reference->angle = gds_convert_double(workbuff);
-				printf("\t\tAngle defined: %lf\n", current_s_reference->angle);
+				GDS_INF("\t\tAngle defined: %lf\n", current_s_reference->angle);
 			}
 			break;
 		case PATHTYPE:
@@ -711,7 +836,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 			}
 			if (current_graphics->gfx_type == GRAPHIC_PATH) {
 				current_graphics->path_render_type = (int)gds_convert_signed_int16(workbuff);
-				printf("\t\tPathtype: %d\n", current_graphics->path_render_type);
+				GDS_INF("\t\tPathtype: %d\n", current_graphics->path_render_type);
 			} else {
 				GDS_WARN("Path type defined inside non-path graphics object. Ignoring");
 			}
@@ -729,6 +854,9 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 		g_list_foreach(lib_list, scan_library_references, NULL);
 	}
 
+
+
+
 	*library_list = lib_list;
 
 	free(workbuff);
@@ -736,22 +864,38 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 	return run;
 }
 
+/**
+ * @brief delete_cell_inst_element
+ * @param cell_inst
+ */
 static void delete_cell_inst_element(struct gds_cell_instance *cell_inst)
 {
 	free(cell_inst);
 }
 
+/**
+ * @brief delete_vertex
+ * @param vertex
+ */
 static void delete_vertex(struct gds_point *vertex)
 {
 	free(vertex);
 }
 
+/**
+ * @brief delete_graphics_obj
+ * @param gfx
+ */
 static void delete_graphics_obj(struct gds_graphics *gfx)
 {
 	g_list_free_full(gfx->vertices, (GDestroyNotify)delete_vertex);
 	free(gfx);
 }
 
+/**
+ * @brief delete_cell_element
+ * @param cell
+ */
 static void delete_cell_element(struct gds_cell *cell)
 {
 	g_list_free_full(cell->child_cells, (GDestroyNotify)delete_cell_inst_element);
@@ -759,6 +903,10 @@ static void delete_cell_element(struct gds_cell *cell)
 	free(cell);
 }
 
+/**
+ * @brief delete_library_element
+ * @param lib
+ */
 static void delete_library_element(struct gds_library *lib)
 {
 	g_list_free(lib->cell_names);
@@ -774,3 +922,5 @@ int clear_lib_list(GList **library_list)
 	*library_list = NULL;
 	return 0;
 }
+
+/** @} */

gds-parser/gds-parser.h

@@ -17,13 +17,33 @@
  * along with GDSII-Converter.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * @file gds_parser.h
+ * @brief Header file for the GDS-Parser
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
+/**
+ * @addtogroup GDS-Parser
+ * @{
+ */
+
 #ifndef __GDSPARSE_H__
 #define __GDSPARSE_H__
 
 #include <glib.h>
 #include "gds-types.h"
 
+#define GDS_PRINT_DEBUG_INFOS (0) /**< @brief 1: Print infos, 0: Don't print */
+
 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.
+ * @return 0
+ */
 int clear_lib_list(GList **library_list);
 
+/** @} */
+
 #endif /* __GDSPARSE_H__ */

gds-parser/gds-types.h

@@ -1,61 +1,123 @@
+/*
+ * 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 gds-types.h
+ * @brief Defines types and macros used by the GDS-Parser
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
+/**
+  * @addtogroup GDS-Parser
+  * @{
+  */
+
 #ifndef __GDS_TYPES_H__
 #define __GDS_TYPES_H__
 
 #include <stdint.h>
 #include <glib.h>
 
-#define CELL_NAME_MAX (100)
+#define CELL_NAME_MAX (100) /**< @brief Maximum length of a gds_cell::name or a gds_library::name */
+#define MIN(a,b) (((a) < (b)) ? (a) : (b)) /**< @brief Find return smaller number */
+#define MAX(a,b) (((a) > (b)) ? (a) : (b)) /**< @brief Find return bigger number */
 
-enum graphics_type {GRAPHIC_PATH = 0, GRAPHIC_POLYGON = 1};
-enum path_type {PATH_FLUSH = 0, PATH_ROUNDED = 1, PATH_SQUARED = 2};
-
-struct gds_time_field {
-		uint16_t year;
-		uint16_t month;
-		uint16_t day;
-		uint16_t hour;
-		uint16_t minute;
-		uint16_t second;
+/** @brief Types of graphic objects */
+enum graphics_type
+{
+		    GRAPHIC_PATH = 0, /**< @brief Path. Esentially a line */
+		    GRAPHIC_POLYGON = 1, /**< @brief An arbitrary polygon */
+		    GRAPHIC_BOX = 2 /**< @brief A rectangle. @warning Implementation in renderers might be buggy!*/
 };
 
+/**
+ * @brief Defines the line caps of a path
+ */
+enum path_type {PATH_FLUSH = 0, PATH_ROUNDED = 1, PATH_SQUARED = 2}; /**< Path line caps */
+
+/**
+ * @brief A point in the 2D plane. Sometimes references as vertex
+ */
 struct gds_point {
-		int x;
-		int y;
+	int x;
+	int y;
 };
 
+/**
+ * @brief Date information for cells and libraries
+ */
+struct gds_time_field {
+	uint16_t year;
+	uint16_t month;
+	uint16_t day;
+	uint16_t hour;
+	uint16_t minute;
+	uint16_t second;
+};
+
+/**
+ * @brief A GDS graphics object
+ */
 struct gds_graphics {
-		enum graphics_type gfx_type;
-		GList *vertices;
-		enum path_type path_render_type;
-		int width_absolute;
-		int16_t layer;
-		uint16_t datatype;
+	enum graphics_type gfx_type; /**< \brief Type of graphic */
+	GList *vertices; /**< @brief List of #gds_point */
+	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;
 };
 
+/**
+ * @brief This represents an instanc of a cell inside another cell
+ */
 struct gds_cell_instance {
-		char ref_name[CELL_NAME_MAX];
-		struct gds_cell *cell_ref;
-		struct gds_point origin;
-		int flipped;
-		double angle;
-		double magnification;
+	char ref_name[CELL_NAME_MAX]; /**< @brief Name of referenced cell */
+	struct gds_cell *cell_ref; /**< @brief Referenced gds_cell structure */
+	struct gds_point origin; /**< @brief Origin */
+	int flipped; /**< @brief Mirrored on x-axis before rotation */
+	double angle; /**< @brief Angle of rotation (counter clockwise) in degrees */
+	double magnification; /**< @brief magnification */
 };
 
+/**
+ * @brief A Cell inside a gds_library
+ */
 struct gds_cell {
-		char name[CELL_NAME_MAX];
-		struct gds_time_field mod_time;
-		struct gds_time_field access_time;
-		GList *child_cells;
-		GList *graphic_objs;
+	char name[CELL_NAME_MAX];
+	struct gds_time_field mod_time;
+	struct gds_time_field access_time;
+	GList *child_cells; /**< @brief List of #gds_cell_instance elements */
+	GList *graphic_objs; /**< @brief List of #gds_graphics */
 };
 
+/**
+ * @brief GDS Toplevel library
+ */
 struct gds_library {
-		char name[CELL_NAME_MAX];
-		struct gds_time_field mod_time;
-		struct gds_time_field access_time;
-		double unit_to_meters;
-		GList *cells;
-		GList *cell_names;
+	char name[CELL_NAME_MAX];
+	struct gds_time_field mod_time;
+	struct gds_time_field access_time;
+	double unit_to_meters;  /**< @warning not yet implemented */
+	GList *cells; /**< List of #gds_cell that contains all cells in this library*/
+	GList *cell_names /**< List of strings that contains all cell names */;
 };
 
+/** @} */
+
 #endif /* __GDS_TYPES_H__ */

glade/CMakeLists.txt

@@ -1,8 +1,6 @@
 add_custom_target(glib-resources DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/resources.c)
 add_custom_command(DEPENDS
-                         ${CMAKE_CURRENT_SOURCE_DIR}/resources.xml
-			 ${CMAKE_CURRENT_SOURCE_DIR}/main.glade
-			 ${CMAKE_CURRENT_SOURCE_DIR}/layer-widget.glade
+                         ${CMAKE_CURRENT_SOURCE_DIR}/*.glade
 		   OUTPUT
 			${CMAKE_CURRENT_BINARY_DIR}/resources.c
 		   COMMAND 

glade/about.glade

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkAboutDialog" id="about-dialog">
+    <property name="can_focus">False</property>
+    <property name="type_hint">dialog</property>
+    <property name="program_name">GDS-Render Tool </property>
+    <property name="comments" translatable="yes">Tool for rendering GDS(II) layout files into LaTeX/TikZ code or directly into a PDF file</property>
+    <property name="website">https://git.shimatta.de/mhu/gds-render</property>
+    <property name="website_label" translatable="yes">Git Repository</property>
+    <property name="authors">Mario Hüttel &lt;mario.huettel@gmx.net&gt;</property>
+    <property name="logo_icon_name">applications-graphics</property>
+    <property name="license_type">gpl-2-0-only</property>
+    <child>
+      <placeholder/>
+    </child>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

glade/dialog.glade

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">1</property>
+    <property name="upper">3000</property>
+    <property name="value">1000</property>
+    <property name="step_increment">10</property>
+    <property name="page_increment">1000</property>
+  </object>
+  <object class="GtkBox" id="dialog-box">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkRadioButton" id="latex-radio">
+        <property name="label" translatable="yes">Generate LaTeX/TikZ output</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">False</property>
+        <property name="active">True</property>
+        <property name="draw_indicator">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkRadioButton" id="cairo-radio">
+        <property name="label" translatable="yes">Render PDF using Cairographics</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">False</property>
+        <property name="active">True</property>
+        <property name="draw_indicator">True</property>
+        <property name="group">latex-radio</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkScale" id="dialog-scale">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="adjustment">adjustment1</property>
+        <property name="round_digits">0</property>
+        <property name="digits">0</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkCheckButton" id="standalone-check">
+        <property name="label" translatable="yes">Configure LaTeX as standalone document</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">False</property>
+        <property name="draw_indicator">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkCheckButton" id="layer-check">
+        <property name="label" translatable="yes">Generate PDF Layers</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">False</property>
+        <property name="draw_indicator">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">4</property>
+      </packing>
+    </child>
+  </object>
+</interface>

glade/main.glade

@@ -4,7 +4,6 @@
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow" id="main-window">
     <property name="height_request">250</property>
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child type="titlebar">
       <object class="GtkHeaderBar">
@@ -35,7 +34,7 @@
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <style>
-              <class name="destructive-action"/>
+              <class name="suggested-action"/>
             </style>
           </object>
           <packing>

glade/resources.xml

@@ -2,7 +2,9 @@
 <gresources>
   <gresource prefix="/">
     <file compressed="true">main.glade</file>
+    <file compressed="true">about.glade</file>
     <file>layer-widget.glade</file>
+    <file>dialog.glade</file>
   </gresource>
 </gresources>
 

latex-output/latex-output.c

@@ -17,11 +17,35 @@
  * along with GDSII-Converter.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * @file latex-output.c
+ * @brief LaTeX output renderer
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
 #include "latex-output.h"
 #include <math.h>
 
+/**
+ * @addtogroup LaTeX-Renderer
+ * @{
+ */
+
+/** @brief Writes a GString \p buffer to the fixed file tex_file */
 #define WRITEOUT_BUFFER(buff) fwrite((buff)->str, sizeof(char), (buff)->len, tex_file)
 
+/**
+ * @brief Write the layer declarration to TeX file
+ *
+ * This writes the declaration of the layers and the mapping in which order
+ * the layers shall be rendered by TikZ. Layers are written in the order they are
+ * positioned inside the \p layer_infos list.
+ *
+ * @param tex_file TeX-File to write to
+ * @param layer_infos List containing layer_info structs.
+ * @param buffer
+ * @note  The field layer_info::stacked_position is ignored. Stack depends on list order.
+ */
 static void write_layer_definitions(FILE *tex_file, GList *layer_infos, GString *buffer)
 {
 	GList *list;
@@ -53,11 +77,30 @@ static void write_layer_definitions(FILE *tex_file, GList *layer_infos, GString
 }
 
 /**
- * @brief write_layer_env
- * @param tex_file
- * @param layer
- * @param buffer
- * @return TRUE if layer is placeable
+ * @brief Write layer Envirmonment
+ *
+ * If the requested layer shall be rendered, this code writes the necessary code
+ * to open the layer. It also returns the color the layer shall be rendered in.
+ *
+ * The followingenvironments are generated:
+ *
+ * @code{.tex}
+ * \begin{pgfonlayer}{<layer>}
+ * % If pdf layers shall be used also this is enabled:
+ * \begin{scope}[ocg={ref=<layer>, status=visible,name={<Layer Name>}}]
+ * @endcode
+ *
+ *
+ * If the layer shall not be rendered, FALSE is returned and the color is not filled in and
+ * the cod eis not written to the file.
+ *
+ * @param tex_file TeX file to write to
+ * @param color Return of the layer's color
+ * @param layer Requested layer number
+ * @param linfo Layer information list containing layer_info structs
+ * @param buffer Some working buffer
+ * @return TRUE, if the layer shall be rendered.
+ * @note The opened environments have to be closed afterwards
  */
 static gboolean write_layer_env(FILE *tex_file, GdkRGBA *color, int layer, GList *linfo, GString *buffer)
 {
@@ -80,8 +123,18 @@ static gboolean write_layer_env(FILE *tex_file, GdkRGBA *color, int layer, GList
 	return FALSE;
 }
 
-
-static void generate_graphics(FILE *tex_file, GList *graphics, GList *linfo, GString *buffer)
+/**
+ * @brief Writes a graphics object to the specified tex_file
+ *
+ * This function opens the layer, writes a graphics object and closes the layer
+ *
+ * @param tex_file File to write to
+ * @param graphics Object to render
+ * @param linfo Layer information
+ * @param buffer Working buffer
+ * @param scale Scale abject down by this value
+ */
+static void generate_graphics(FILE *tex_file, GList *graphics, GList *linfo, GString *buffer, double scale)
 {
 	GList *temp;
 	GList *temp_vertex;
@@ -95,19 +148,19 @@ static void generate_graphics(FILE *tex_file, GList *graphics, GList *linfo, GSt
 		if (write_layer_env(tex_file, &color, (int)gfx->layer, linfo, buffer) == TRUE) {
 
 			/* Layer is defined => create graphics */
-			if (gfx->gfx_type == GRAPHIC_POLYGON) {
+			if (gfx->gfx_type == GRAPHIC_POLYGON || gfx->gfx_type == GRAPHIC_BOX ) {
 				g_string_printf(buffer, "\\draw[line width=0.00001 pt, draw={c%d}, fill={c%d}, fill opacity={%lf}] ",
 						gfx->layer, gfx->layer, color.alpha);
 				WRITEOUT_BUFFER(buffer);
 				/* Append vertices */
 				for (temp_vertex = gfx->vertices; temp_vertex != NULL; temp_vertex = temp_vertex->next) {
 					pt = (struct gds_point *)temp_vertex->data;
-					g_string_printf(buffer, "(%lf pt, %lf pt) -- ", ((double)pt->x)/1000.0, ((double)pt->y)/1000.0);
+					g_string_printf(buffer, "(%lf pt, %lf pt) -- ", ((double)pt->x)/scale, ((double)pt->y)/scale);
 					WRITEOUT_BUFFER(buffer);
 				}
 				g_string_printf(buffer, "cycle;\n");
 				WRITEOUT_BUFFER(buffer);
-			} else if(gfx->gfx_type == GRAPHIC_PATH) {
+			} else if (gfx->gfx_type == GRAPHIC_PATH) {
 
 				if (g_list_length(gfx->vertices) < 2) {
 					printf("Cannot write path with less than 2 points\n");
@@ -116,11 +169,11 @@ static void generate_graphics(FILE *tex_file, GList *graphics, GList *linfo, GSt
 
 				if (gfx->path_render_type < 0 || gfx->path_render_type > 2) {
 					printf("Path type unrecognized. Setting to 'flushed'\n");
-					gfx->path_render_type = 0;
+					gfx->path_render_type = PATH_FLUSH;
 				}
 
 				g_string_printf(buffer, "\\draw[line width=%lf pt, draw={c%d}, opacity={%lf}, cap=%s] ",
-						gfx->width_absolute/1000.0, gfx->layer, color.alpha,
+						gfx->width_absolute/scale, gfx->layer, color.alpha,
 						line_caps[gfx->path_render_type]);
 				WRITEOUT_BUFFER(buffer);
 
@@ -128,8 +181,8 @@ static void generate_graphics(FILE *tex_file, GList *graphics, GList *linfo, GSt
 				for (temp_vertex = gfx->vertices; temp_vertex != NULL; temp_vertex = temp_vertex->next) {
 					pt = (struct gds_point *)temp_vertex->data;
 					g_string_printf(buffer, "(%lf pt, %lf pt)%s",
-							((double)pt->x)/1000.0,
-							((double)pt->y)/1000.0,
+							((double)pt->x)/scale,
+							((double)pt->y)/scale,
 							(temp_vertex->next ? " -- " : ""));
 					WRITEOUT_BUFFER(buffer);
 				}
@@ -144,32 +197,44 @@ static void generate_graphics(FILE *tex_file, GList *graphics, GList *linfo, GSt
 	} /* For graphics */
 }
 
-
-static void render_cell(struct gds_cell *cell, GList *layer_infos, FILE *tex_file, GString *buffer)
+/**
+ * @brief Render cell to file
+ * @param cell Cell to render
+ * @param layer_infos Layer information
+ * @param tex_file File to write to
+ * @param buffer Working buffer
+ * @param scale Scale output down by this value
+ */
+static void render_cell(struct gds_cell *cell, GList *layer_infos, FILE *tex_file, GString *buffer, double scale)
 {
 
 	GList *list_child;
 	struct gds_cell_instance *inst;
 
 	/* Draw polygons of current cell */
-	generate_graphics(tex_file, cell->graphic_objs, layer_infos, buffer);
+	generate_graphics(tex_file, cell->graphic_objs, layer_infos, buffer, scale);
 
 	/* Draw polygons of childs */
 	for (list_child = cell->child_cells; list_child != NULL; list_child = list_child->next) {
 		inst = (struct gds_cell_instance *)list_child->data;
+
+		/* Abort if cell has no reference */
+		if (!inst->cell_ref)
+			continue;
+
 		/* generate translation scope */
 		g_string_printf(buffer, "\\begin{scope}[shift={(%lf pt,%lf pt)}]\n",
-				((double)inst->origin.x)/1000.0,((double)inst->origin.y)/1000.0);
+				((double)inst->origin.x)/scale,((double)inst->origin.y)/scale);
 		WRITEOUT_BUFFER(buffer);
 
 		g_string_printf(buffer, "\\begin{scope}[rotate=%lf]\n", inst->angle);
 		WRITEOUT_BUFFER(buffer);
 
-		g_string_printf(buffer, "\\begin{scope}[yscale=%s]\n", (inst->flipped ? "-1" : "1"));
+		g_string_printf(buffer, "\\begin{scope}[yscale=%lf, xscale=%lf]\n", (inst->flipped ? -1*inst->magnification : inst->magnification),
+				inst->magnification);
 		WRITEOUT_BUFFER(buffer);
 
-		if (inst->cell_ref)
-			render_cell(inst->cell_ref, layer_infos, tex_file, buffer);
+		render_cell(inst->cell_ref, layer_infos, tex_file, buffer, scale);
 
 		g_string_printf(buffer, "\\end{scope}\n");
 		WRITEOUT_BUFFER(buffer);
@@ -183,7 +248,8 @@ static void render_cell(struct gds_cell *cell, GList *layer_infos, FILE *tex_fil
 
 }
 
-void render_cell_to_code(struct gds_cell *cell, GList *layer_infos, FILE *tex_file)
+void latex_render_cell_to_code(struct gds_cell *cell, GList *layer_infos, FILE *tex_file, double scale,
+			       gboolean create_pdf_layers, gboolean standalone_document)
 {
 	GString *working_line;
 
@@ -195,9 +261,11 @@ void render_cell_to_code(struct gds_cell *cell, GList *layer_infos, FILE *tex_fi
 	working_line = g_string_new_len(NULL, LATEX_LINE_BUFFER_KB*1024);
 
 	/* standalone foo */
-	g_string_printf(working_line, "\\newif\\iftestmode\n\\testmodefalse %% Change to true for standalone rendering\n");
+	g_string_printf(working_line, "\\newif\\iftestmode\n\\testmode%s\n",
+			(standalone_document ? "true" : "false"));
 	WRITEOUT_BUFFER(working_line);
-	g_string_printf(working_line, "\\newif\\ifcreatepdflayers\n\\createpdflayersfalse %% Change to true for Embedded layers in PDF output\n");
+	g_string_printf(working_line, "\\newif\\ifcreatepdflayers\n\\createpdflayers%s\n",
+			(create_pdf_layers ? "true" : "false"));
 	WRITEOUT_BUFFER(working_line);
 	g_string_printf(working_line, "\\iftestmode\n");
 	WRITEOUT_BUFFER(working_line);
@@ -214,7 +282,7 @@ void render_cell_to_code(struct gds_cell *cell, GList *layer_infos, FILE *tex_fi
 	WRITEOUT_BUFFER(working_line);
 
 	/* Generate graphics output */
-	render_cell(cell, layer_infos, tex_file, working_line);
+	render_cell(cell, layer_infos, tex_file, working_line, scale);
 
 
 	g_string_printf(working_line, "\\end{tikzpicture}\n");
@@ -230,3 +298,5 @@ void render_cell_to_code(struct gds_cell *cell, GList *layer_infos, FILE *tex_fi
 	fflush(tex_file);
 	g_string_free(working_line, TRUE);
 }
+
+/** @} */

latex-output/latex-output.h

@@ -17,16 +17,39 @@
  * along with GDSII-Converter.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * @file latex-output.h
+ * @brief LaTeX output renderer
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
 #ifndef __LATEX_OUTPUT_H__
 #define __LATEX_OUTPUT_H__
 
+/**
+ * @addtogroup LaTeX-Renderer
+ * @{
+ */
+
 #include "../gds-parser/gds-types.h"
 #include <glib.h>
 #include <stdio.h>
-#include "../layer-selector.h"
+#include "../mapping-parser.h"
 
-#define LATEX_LINE_BUFFER_KB (10)
+#define LATEX_LINE_BUFFER_KB (10) /**< @brief Buffer for LaTeX Code line in KiB */
 
-void render_cell_to_code(struct gds_cell *cell, GList *layer_infos, FILE *tex_file);
+/**
+ * @brief Render \p cell to LateX/TikZ code
+ * @param cell Cell to render
+ * @param layer_infos Layer information
+ * @param tex_file Already opened file to write data in
+ * @param scale Scale image down by this value
+ * @param create_pdf_layers Optional content groups used
+ * @param standalone_document document can be compiled standalone
+ */
+void latex_render_cell_to_code(struct gds_cell *cell, GList *layer_infos, FILE *tex_file, double scale,
+			       gboolean create_pdf_layers, gboolean standalone_document);
+
+/** @} */
 
 #endif /* __LATEX_OUTPUT_H__ */

layer-selector.c

@@ -19,7 +19,7 @@
 
 #include "layer-selector.h"
 #include "gds-parser/gds-parser.h"
-#include "layer-widget/layer-element.h"
+#include "widgets/layer-element.h"
 #include <glib.h>
 #include <string.h>
 #include <stdio.h>
@@ -170,79 +170,6 @@ void generate_layer_widgets(GtkListBox *listbox, GList *libs)
 	gtk_widget_set_sensitive(global_save_button, TRUE);
 }
 
-/**
- * @brief load_csv_line
- * @param file
- * @param export
- * @param name
- * @param layer
- * @param color
- * @param opacity
- * @return 0 if succesfull, 1 if line was malformatted or parameters are broken, -1 if file end
- */
-static int load_csv_line(GDataInputStream *stream, gboolean *export, char **name, int *layer, GdkRGBA *color)
-{
-	int ret;
-	gsize len;
-	gchar *line;
-	GRegex *regex;
-	GMatchInfo *mi;
-	char *match;
-
-	if ((!export) || (!name) || (!layer) || (!color)) {
-		ret = 1;
-		goto ret_direct;
-	}
-
-	regex = g_regex_new("^(?<layer>[0-9]+),(?<r>[0-9\\.]+),(?<g>[0-9\\.]+),(?<b>[0-9\\.]+),(?<a>[0-9\\.]+),(?<export>[01]),(?<name>.*)$", 0, 0, NULL);
-
-	line = g_data_input_stream_read_line(stream, &len, NULL, NULL);
-	if (!line) {
-		ret = -1;
-		goto destroy_regex;
-	}
-
-	/* Match line in CSV */
-	g_regex_match(regex, line, 0, &mi);
-	if (g_match_info_matches(mi)) {
-		/* Line is valid */
-		match = g_match_info_fetch_named(mi, "layer");
-		*layer = (int)g_ascii_strtoll(match, NULL, 10);
-		g_free(match);
-		match = g_match_info_fetch_named(mi, "r");
-		color->red = g_ascii_strtod(match, NULL);
-		g_free(match);
-		match = g_match_info_fetch_named(mi, "g");
-		color->green = g_ascii_strtod(match, NULL);
-		g_free(match);
-		match = g_match_info_fetch_named(mi, "b");
-		color->blue = g_ascii_strtod(match, NULL);
-		g_free(match);
-		match = g_match_info_fetch_named(mi, "a");
-		color->alpha = g_ascii_strtod(match, NULL);
-		g_free(match);
-		match = g_match_info_fetch_named(mi, "export");
-		*export = ((!strcmp(match, "1")) ? TRUE : FALSE);
-		g_free(match);
-		match = g_match_info_fetch_named(mi, "name");
-		*name = match;
-
-		ret = 0;
-	} else {
-		/* Line is malformatted */
-		printf("Could not recognize line in CSV as valid entry: %s\n", line);
-		ret = 1;
-	}
-
-	g_match_info_free(mi);
-	g_free(line);
-destroy_regex:
-	g_regex_unref(regex);
-ret_direct:
-	return ret;
-
-}
-
 static LayerElement *find_layer_element_in_list(GList *el_list, int layer)
 {
 	LayerElement *ret = NULL;

layer-selector.h

@@ -22,14 +22,7 @@
 
 #include <gtk/gtk.h>
 #include <glib.h>
-
-struct layer_info
-{
-	int layer;
-	char *name;
-	int stacked_position; ///< Lower is bottom, higher is top
-	GdkRGBA color;
-};
+#include "mapping-parser.h"
 
 void generate_layer_widgets(GtkListBox *listbox, GList *libs);
 void setup_load_mapping_callback(GtkWidget *button, GtkWindow *main_window);

main-window.c

@@ -0,0 +1,316 @@
+/*
+ * 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/>.
+ */
+
+#include "main-window.h"
+#include <stdio.h>
+#include "gds-parser/gds-parser.h"
+#include <gtk/gtk.h>
+#include "layer-selector.h"
+#include "tree-renderer/tree-store.h"
+#include "latex-output/latex-output.h"
+#include "widgets/conv-settings-dialog.h"
+#include "cairo-output/cairo-output.h"
+
+struct open_button_data {
+	GtkWindow *main_window;
+	GList **list_ptr;
+	GtkTreeStore *cell_store;
+	GtkListBox *layer_box;
+};
+
+struct convert_button_data {
+	GtkTreeView *tree_view;
+	GtkWindow *main_window;
+};
+
+static gboolean on_window_close(gpointer window, gpointer user)
+{
+	gtk_widget_destroy(GTK_WIDGET(window));
+	return TRUE;
+}
+
+static GString *generate_string_from_date(struct gds_time_field *date)
+{
+	GString *str;
+
+	str = g_string_new_len(NULL, 50);
+	g_string_printf(str, "%02u.%02u.%u - %02u:%02u",
+			(unsigned int)date->day,
+			(unsigned int)date->month,
+			(unsigned int)date->year,
+			(unsigned int)date->hour,
+			(unsigned int)date->minute);
+	return str;
+}
+
+
+static void on_load_gds(gpointer button, gpointer user)
+{
+	GList *cell;
+	GtkTreeIter libiter;
+	GtkTreeIter celliter;
+	GList *lib;
+	struct gds_library *gds_lib;
+	struct gds_cell *gds_c;
+	struct open_button_data *ptr = (struct open_button_data *)user;
+	GtkTreeStore *store = ptr->cell_store;
+	GtkWidget *open_dialog;
+	GtkFileChooser *file_chooser;
+	GtkFileFilter *filter;
+	GtkStyleContext *button_style;
+	gint dialog_result;
+	int gds_result;
+	char *filename;
+	GString *mod_date;
+	GString *acc_date;
+
+	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);
+	file_chooser = GTK_FILE_CHOOSER(open_dialog);
+	/* Add GDS II Filter */
+	filter = gtk_file_filter_new();
+	gtk_file_filter_add_pattern(filter, "*.gds");
+	gtk_file_filter_set_name(filter, "GDSII-Files");
+	gtk_file_chooser_add_filter(file_chooser, filter);
+
+	dialog_result = gtk_dialog_run(GTK_DIALOG(open_dialog));
+
+	if (dialog_result == GTK_RESPONSE_ACCEPT) {
+
+		/* Get File name */
+		filename = gtk_file_chooser_get_filename(file_chooser);
+
+		gtk_tree_store_clear(store);
+		clear_lib_list(ptr->list_ptr);
+
+		/* Parse new GDSII file */
+		gds_result = parse_gds_from_file(filename, ptr->list_ptr);
+
+		/* Delete file name afterwards */
+		g_free(filename);
+		if (gds_result)
+			goto end_destroy;
+
+		/* remove suggested action from Open button */
+		button_style = gtk_widget_get_style_context(GTK_WIDGET(button));
+		gtk_style_context_remove_class(button_style, "suggested-action");
+
+		for (lib = *(ptr->list_ptr); lib != NULL; lib = lib->next) {
+			gds_lib = (struct gds_library *)lib->data;
+			/* Create top level iter */
+			gtk_tree_store_append (store, &libiter, NULL);
+
+			/* Convert dates to String */
+			mod_date = generate_string_from_date(&gds_lib->mod_time);
+			acc_date = generate_string_from_date(&gds_lib->access_time);
+
+			gtk_tree_store_set (store, &libiter,
+					    CELL_SEL_LIBRARY, gds_lib,
+					    CELL_SEL_MODDATE, mod_date->str,
+					    CELL_SEL_ACCESSDATE, acc_date->str,
+					    -1);
+
+			/* Delete GStrings including string data. */
+			/* Cell store copies String type data items */
+			g_string_free(mod_date, TRUE);
+			g_string_free(acc_date, TRUE);
+
+			for (cell = gds_lib->cells; cell != NULL; cell = cell->next) {
+				gds_c = (struct gds_cell *)cell->data;
+				gtk_tree_store_append (store, &celliter, &libiter);
+
+				/* Convert dates to String */
+				mod_date = generate_string_from_date(&gds_c->mod_time);
+				acc_date = generate_string_from_date(&gds_c->access_time);
+
+				gtk_tree_store_set (store, &celliter,
+						    CELL_SEL_CELL, gds_c,
+						    CELL_SEL_MODDATE, mod_date->str,
+						    CELL_SEL_ACCESSDATE, acc_date->str,
+						    -1);
+
+				/* Delete GStrings including string data. */
+				/* Cell store copies String type data items */
+				g_string_free(mod_date, TRUE);
+				g_string_free(acc_date, TRUE);
+			}
+		}
+
+		/* Create Layers in Layer Box */
+		generate_layer_widgets(ptr->layer_box, *(ptr->list_ptr));
+	}
+
+end_destroy:
+	/* Destroy dialog and filter */
+	gtk_widget_destroy(open_dialog);
+}
+
+static void on_convert_clicked(gpointer button, gpointer user)
+{
+	static struct render_settings sett = {
+		.scale = 1000.0f,
+				.renderer = RENDERER_LATEX_TIKZ,
+	};
+	struct convert_button_data *data = (struct convert_button_data *)user;
+	GtkTreeSelection *selection;
+	GtkTreeIter iter;
+	GtkTreeModel *model;
+	GList *layer_list;
+	struct gds_cell *cell_to_render;
+	FILE *output_file;
+	GtkWidget *dialog;
+	RendererSettingsDialog *settings;
+	GtkFileFilter *filter;
+	gint res;
+	char *file_name;
+
+	/* Get selected cell */
+	selection = gtk_tree_view_get_selection(data->tree_view);
+	if (gtk_tree_selection_get_selected(selection, &model, &iter) == FALSE)
+		return;
+
+	gtk_tree_model_get(model, &iter, CELL_SEL_CELL, &cell_to_render, -1);
+
+	if (!cell_to_render)
+		return;
+
+	/* Get layers that are rendered */
+	layer_list = export_rendered_layer_info();
+
+	settings = renderer_settings_dialog_new(GTK_WINDOW(data->main_window));
+	renderer_settings_dialog_set_settings(settings, &sett);
+	res = gtk_dialog_run(GTK_DIALOG(settings));
+	if (res == GTK_RESPONSE_OK) {
+		renderer_settings_dialog_get_settings(settings, &sett);
+		gtk_widget_destroy(GTK_WIDGET(settings));
+	} else {
+		gtk_widget_destroy(GTK_WIDGET(settings));
+		goto ret_layer_destroy;
+	}
+
+
+
+	/* save file dialog */
+	dialog = gtk_file_chooser_dialog_new((sett.renderer == RENDERER_LATEX_TIKZ
+					      ? "Save LaTeX File" : "Save PDF"),
+					     GTK_WINDOW(data->main_window), GTK_FILE_CHOOSER_ACTION_SAVE,
+					     "Cancel", GTK_RESPONSE_CANCEL, "Save", GTK_RESPONSE_ACCEPT, NULL);
+	/* Set file filter according to settings */
+	filter = gtk_file_filter_new();
+	if (sett.renderer == RENDERER_LATEX_TIKZ) {
+		gtk_file_filter_add_pattern(filter, "*.tex");
+		gtk_file_filter_set_name(filter, "LaTeX-Files");
+	} else {
+		gtk_file_filter_add_pattern(filter, "*.pdf");
+		gtk_file_filter_set_name(filter, "PDF-Files");
+	}
+	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
+
+	res = gtk_dialog_run(GTK_DIALOG(dialog));
+	if (res == GTK_RESPONSE_ACCEPT) {
+		file_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+		gtk_widget_destroy(dialog);
+
+		switch (sett.renderer) {
+		case RENDERER_LATEX_TIKZ:
+			output_file = fopen(file_name, "w");
+			latex_render_cell_to_code(cell_to_render, layer_list, output_file, sett.scale,
+						  sett.tex_pdf_layers, sett.tex_standalone);
+			fclose(output_file);
+			break;
+		case RENDERER_CAIROGRAPHICS:
+			cairo_render_cell_to_pdf(cell_to_render, layer_list, file_name, sett.scale);
+			break;
+		}
+		g_free(file_name);
+
+	} else {
+		gtk_widget_destroy(dialog);
+	}
+ret_layer_destroy:
+	g_list_free_full(layer_list, (GDestroyNotify)delete_layer_info_struct);
+}
+
+/* This function activates/deactivates the convert button depending on whether
+ * a cell is selected for conversion or not */
+static void cell_selection_changed(GtkTreeSelection *sel, GtkWidget *convert_button)
+{
+	GtkTreeModel *model = NULL;
+	GtkTreeIter iter;
+
+	if (gtk_tree_selection_get_selected(sel, &model, &iter)) {
+		/* Node selected. Show button */
+		gtk_widget_set_sensitive(convert_button, TRUE);
+	} else {
+		gtk_widget_set_sensitive(convert_button, FALSE);
+	}
+}
+
+GtkWindow *create_main_window()
+{
+	GtkBuilder *main_builder;
+	GtkTreeView *cell_tree;
+	GtkTreeStore *cell_store;
+	GtkWidget *listbox;
+	GtkWidget *conv_button;
+	static GList *gds_libs;
+	static struct open_button_data open_data;
+	static struct convert_button_data conv_data;
+
+	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);
+
+
+	open_data.cell_store = cell_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")),
+			 "clicked", G_CALLBACK(on_load_gds), (gpointer)&open_data);
+
+	/* Connect delete-event */
+	g_signal_connect(GTK_WIDGET(open_data.main_window), "delete-event",
+			 G_CALLBACK(on_window_close), NULL);
+
+	/* Connect Convert button */
+	conv_data.tree_view = cell_tree;
+	conv_data.main_window = open_data.main_window;
+
+	conv_button = GTK_WIDGET(gtk_builder_get_object(main_builder, "convert-button"));
+	g_signal_connect(conv_button, "clicked", G_CALLBACK(on_convert_clicked), &conv_data);
+
+	listbox = GTK_WIDGET(gtk_builder_get_object(main_builder, "layer-list"));
+	open_data.layer_box = GTK_LIST_BOX(listbox);
+
+	/* Set buttons fpr layer mapping GUI */
+	setup_load_mapping_callback(GTK_WIDGET(gtk_builder_get_object(main_builder, "button-load-mapping")),
+				    open_data.main_window);
+	setup_save_mapping_callback(GTK_WIDGET(gtk_builder_get_object(main_builder, "button-save-mapping")),
+				    open_data.main_window);
+
+	/* Callback for selection change of cell selector */
+	g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(cell_tree)), "changed",
+			 G_CALLBACK(cell_selection_changed), conv_button);
+
+	return (conv_data.main_window);
+}

main-window.h

@@ -0,0 +1,27 @@
+/*
+ * 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 _MAIN_WINDOW_H_
+#define _MAIN_WINDOW_H_
+
+#include <gtk/gtk.h>
+
+GtkWindow *create_main_window();
+
+#endif /* _MAIN_WINDOW_H_ */

main.c

@@ -18,260 +18,166 @@
  */
 
 #include <stdio.h>
-#include "gds-parser/gds-parser.h"
 #include <gtk/gtk.h>
-#include "layer-widget/layer-element.h"
-#include "layer-selector.h"
-#include "tree-renderer/tree-store.h"
-#include "latex-output/latex-output.h"
+#include <glib.h>
+#include "main-window.h"
+#include "command-line.h"
 
-struct open_button_data {
-	GtkWindow *main_window;
-	GList **list_ptr;
-	GtkTreeStore *cell_store;
-	GtkListBox *layer_box;
-};
-
-struct convert_button_data {
-	GtkTreeView *tree_view;
+struct application_data {
+	GtkApplication *app;
 	GtkWindow *main_window;
 };
 
-gboolean on_window_close(gpointer window, gpointer user)
+
+static void app_quit(GSimpleAction *action, GVariant *parameter, gpointer user_data)
 {
-	gtk_widget_destroy(GTK_WIDGET(window));
-	gtk_main_quit();
-	return TRUE;
+	struct application_data *appdata = (struct application_data *)user_data;
+	gtk_widget_destroy(GTK_WIDGET(appdata->main_window));
 }
 
-static GString *generate_string_from_date(struct gds_time_field *date)
+static void app_about(GSimpleAction *action, GVariant *parameter, gpointer user_data)
 {
-	GString *str;
+	GtkBuilder *builder;
+	GtkDialog *dialog;
+	struct application_data *appdata = (struct application_data *)user_data;
 
-	str = g_string_new_len(NULL, 50);
-	g_string_printf(str, "%02u.%02u.%u - %02u:%02u",
-			(unsigned int)date->day,
-			(unsigned int)date->month,
-			(unsigned int)date->year,
-			(unsigned int)date->hour,
-			(unsigned int)date->minute);
-	return str;
+	builder = gtk_builder_new_from_resource("/about.glade");
+	dialog = GTK_DIALOG(gtk_builder_get_object(builder, "about-dialog"));
+	gtk_window_set_transient_for(GTK_WINDOW(dialog), appdata->main_window);
+	gtk_dialog_run(dialog);
+
+	gtk_widget_destroy(GTK_WIDGET(dialog));
+	g_object_unref(builder);
 }
 
-void on_load_gds(gpointer button, gpointer user)
+const GActionEntry app_actions[] = {
+	{ "quit", app_quit },
+	{ "about", app_about }
+};
+
+static void gapp_activate(GApplication *app, gpointer user_data)
 {
-	GList *cell;
-	GtkTreeIter libiter;
-	GtkTreeIter celliter;
-	GList *lib;
-	struct gds_library *gds_lib;
-	struct gds_cell *gds_c;
-	struct open_button_data *ptr = (struct open_button_data *)user;
-	GtkTreeStore *store = ptr->cell_store;
-	GtkWidget *open_dialog;
-	GtkFileChooser *file_chooser;
-	GtkFileFilter *filter;
-	GtkStyleContext *button_style;
-	gint dialog_result;
-	int gds_result;
-	char *filename;
-	GString *mod_date;
-	GString *acc_date;
+	GtkWindow *main_window;
+	struct application_data *appdata = (struct application_data *)user_data;
 
-	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);
-	file_chooser = GTK_FILE_CHOOSER(open_dialog);
-	/* Add GDS II Filter */
-	filter = gtk_file_filter_new();
-	gtk_file_filter_add_pattern(filter, "*.gds");
-	gtk_file_filter_set_name(filter, "GDSII-Files");
-	gtk_file_chooser_add_filter(file_chooser, filter);
-
-	dialog_result = gtk_dialog_run(GTK_DIALOG(open_dialog));
-
-	if (dialog_result == GTK_RESPONSE_ACCEPT) {
-
-		/* Get File name */
-		filename = gtk_file_chooser_get_filename(file_chooser);
-
-		gtk_tree_store_clear(store);
-		clear_lib_list(ptr->list_ptr);
-
-		/* Parse new GDSII file */
-		gds_result = parse_gds_from_file(filename, ptr->list_ptr);
-
-		/* Delete file name afterwards */
-		g_free(filename);
-		if (gds_result)
-			goto end_destroy;
-
-		/* remove suggested action from Open button */
-		button_style = gtk_widget_get_style_context(GTK_WIDGET(button));
-		gtk_style_context_remove_class(button_style, "suggested-action");
-
-		for (lib = *(ptr->list_ptr); lib != NULL; lib = lib->next) {
-			gds_lib = (struct gds_library *)lib->data;
-			/* Create top level iter */
-			gtk_tree_store_append (store, &libiter, NULL);
-
-			/* Convert dates to String */
-			mod_date = generate_string_from_date(&gds_lib->mod_time);
-			acc_date = generate_string_from_date(&gds_lib->access_time);
-
-			gtk_tree_store_set (store, &libiter,
-					    CELL_SEL_LIBRARY, gds_lib,
-					    CELL_SEL_MODDATE, mod_date->str,
-					    CELL_SEL_ACCESSDATE, acc_date->str,
-					    -1);
-
-			/* Delete GStrings including string data. */
-			/* Cell store copies String type data items */
-			g_string_free(mod_date, TRUE);
-			g_string_free(acc_date, TRUE);
-
-			for (cell = gds_lib->cells; cell != NULL; cell = cell->next) {
-				gds_c = (struct gds_cell *)cell->data;
-				gtk_tree_store_append (store, &celliter, &libiter);
-
-				/* Convert dates to String */
-				mod_date = generate_string_from_date(&gds_c->mod_time);
-				acc_date = generate_string_from_date(&gds_c->access_time);
-
-				gtk_tree_store_set (store, &celliter,
-						    CELL_SEL_CELL, gds_c,
-						    CELL_SEL_MODDATE, mod_date->str,
-						    CELL_SEL_ACCESSDATE, acc_date->str,
-						    -1);
-
-				/* Delete GStrings including string data. */
-				/* Cell store copies String type data items */
-				g_string_free(mod_date, TRUE);
-				g_string_free(acc_date, TRUE);
-			}
-		}
-
-		/* Create Layers in Layer Box */
-		generate_layer_widgets(ptr->layer_box, *(ptr->list_ptr));
-	}
-
-end_destroy:
-	/* Destroy dialog and filter */
-	gtk_widget_destroy(open_dialog);
+	main_window = create_main_window();
+	appdata->main_window = main_window;
+	gtk_application_add_window(GTK_APPLICATION(app), main_window);
+	gtk_widget_show(GTK_WIDGET(main_window));
 }
 
-static void on_convert_clicked(gpointer button, gpointer user)
+static int start_gui(int argc, char **argv)
 {
-	struct convert_button_data *data = (struct convert_button_data *)user;
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-	GtkTreeModel *model;
-	GList *layer_list;
-	struct gds_cell *cell_to_render;
-	FILE *tex_file;
-	GtkWidget *dialog;
-	gint res;
-	char *file_name;
 
-	/* Get selected cell */
-	selection = gtk_tree_view_get_selection(data->tree_view);
-	if (gtk_tree_selection_get_selected(selection, &model, &iter) == FALSE)
-		return;
+	GtkApplication *gapp;
+	int app_status;
+	static struct application_data appdata;
+	GMenu *menu;
+	GMenu *m_quit;
+	GMenu *m_about;
 
-	gtk_tree_model_get(model, &iter, CELL_SEL_CELL, &cell_to_render, -1);
+	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);
 
-	if (!cell_to_render)
-		return;
 
-	/* Get layers that are rendered */
-	layer_list = export_rendered_layer_info();
 
-	/* save file dialog */
-	dialog = gtk_file_chooser_dialog_new("Save TeX File", GTK_WINDOW(data->main_window), GTK_FILE_CHOOSER_ACTION_SAVE,
-					     "Cancel", GTK_RESPONSE_CANCEL, "Save", GTK_RESPONSE_ACCEPT, NULL);
-	res = gtk_dialog_run(GTK_DIALOG(dialog));
-	if (res == GTK_RESPONSE_ACCEPT) {
-		file_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-		tex_file = fopen(file_name, "w");
-		g_free(file_name);
-		gtk_widget_destroy(dialog);
-		render_cell_to_code(cell_to_render, layer_list, tex_file);
-		fclose(tex_file);
-	} else {
-		gtk_widget_destroy(dialog);
-	}
+	menu = g_menu_new();
+	m_quit = g_menu_new();
+	m_about = g_menu_new();
+	g_menu_append(m_quit, "Quit", "app.quit");
+	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);
+	gtk_application_set_app_menu(GTK_APPLICATION(gapp), G_MENU_MODEL(menu));
 
-	g_list_free_full(layer_list, (GDestroyNotify)delete_layer_info_struct);
-}
+	g_object_unref(m_quit);
+	g_object_unref(m_about);
+	g_object_unref(menu);
 
-/* This function activates/deactivates the convert button depending on whether
- * a cell is selected for conversion or not */
-static void cell_selection_changed(GtkTreeSelection *sel, GtkWidget *convert_button)
-{
-	GtkTreeModel *model = NULL;
-	GtkTreeIter iter;
 
-	if (gtk_tree_selection_get_selected(sel, &model, &iter)) {
-		/* Node selected. Show button */
-		gtk_widget_set_sensitive(convert_button, TRUE);
-	} else {
-		gtk_widget_set_sensitive(convert_button, FALSE);
-	}
+	app_status = g_application_run (G_APPLICATION(gapp), argc, argv);
+	g_object_unref (gapp);
+
+	return app_status;
 }
 
 int main(int argc, char **argv)
 {
-	GtkBuilder *main_builder;
-	GList *gds_libs = NULL;
-	GtkTreeView *cell_tree;
-	GtkTreeStore *cell_store;
-	GtkWidget *conv_button;
-	GtkWidget *listbox;
-
-	struct open_button_data open_data;
-	struct convert_button_data conv_data;
-
-	gtk_init(&argc, &argv);
-
-	main_builder = gtk_builder_new_from_resource("/main.glade");
-	gtk_builder_connect_signals(main_builder, NULL);
+	GError *error = NULL;
+	GOptionContext *context;
+	gchar *gds_name;
+	gchar *basename;
+	gchar *pdfname = NULL, *texname = NULL, *mappingname = NULL, *cellname = NULL;
+	gboolean tikz = FALSE, pdf = FALSE, pdf_layers = FALSE, pdf_standalone = FALSE;
+	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 },
+	  { "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" },
+	  { "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 },
+	  { NULL }
+	};
 
-	cell_tree = (GtkTreeView *)gtk_builder_get_object(main_builder, "cell-tree");
-	cell_store = setup_cell_selector(cell_tree);
+	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 (argc >= 2) {
+		if (scale < 1) {
+			printf("Scale < 1 not allowed. Setting to 1\n");
+			scale = 1;
+		}
+
+		/* No format selected */
+		if (!(tikz || pdf)) {
+			tikz = TRUE;
+		}
+
+		/* Get gds name */
+		gds_name = argv[1];
+
+		/* Check if PDF/TeX names are supplied. if not generate */
+		basename = g_path_get_basename(gds_name);
+
+		if (!texname) {
+			texname = g_strdup_printf("./%s.tex", basename);
+		}
+
+		if (!pdfname) {
+			pdfname = g_strdup_printf("./%s.pdf", basename);
+		}
+
+		command_line_convert_gds(gds_name, pdfname, texname, pdf, tikz, mappingname, cellname,
+					 (double)scale, pdf_layers, pdf_standalone);
+		/* Clean up */
+		g_free(pdfname);
+		g_free(texname);
+		if (mappingname)
+			g_free(mappingname);
+		if (cellname)
+			g_free(cellname);
+		app_status = 0;
+	} else {
+		app_status = start_gui(argc, argv);
+	}
 
 
-	open_data.cell_store = cell_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")),
-			 "clicked", G_CALLBACK(on_load_gds), (gpointer)&open_data);
-
-	/* Connect delete-event */
-	g_signal_connect(GTK_WIDGET(open_data.main_window), "delete-event", G_CALLBACK(on_window_close), NULL);
-	
-
-	/* Connect Convert button */
-	conv_data.tree_view = cell_tree;
-	conv_data.main_window = open_data.main_window;
-
-	conv_button = GTK_WIDGET(gtk_builder_get_object(main_builder, "convert-button"));
-	g_signal_connect(conv_button, "clicked", G_CALLBACK(on_convert_clicked), &conv_data);
-
-	listbox = GTK_WIDGET(gtk_builder_get_object(main_builder, "layer-list"));
-	open_data.layer_box = GTK_LIST_BOX(listbox);
-
-	/* Set buttons fpr layer mapping GUI */
-	setup_load_mapping_callback(GTK_WIDGET(gtk_builder_get_object(main_builder, "button-load-mapping")),
-				    open_data.main_window);
-	setup_save_mapping_callback(GTK_WIDGET(gtk_builder_get_object(main_builder, "button-save-mapping")),
-				    open_data.main_window);
-
-	/* Callback for selection change of cell selector */
-	g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(cell_tree)), "changed",
-			 G_CALLBACK(cell_selection_changed), conv_button);
-
-	gtk_main();
-
-	return 0;
+	return app_status;
 }

mapping-parser.c

@@ -0,0 +1,98 @@
+/*
+ *
+ * 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 mapping-parser.c
+ * @brief Function to read a mapping file line and parse it.
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
+/**
+ * @addtogroup MainApplication
+ * @{
+ */
+
+#include "mapping-parser.h"
+
+int load_csv_line(GDataInputStream *stream, gboolean *export, char **name, int *layer, GdkRGBA *color)
+{
+	int ret;
+	gsize len;
+	gchar *line;
+	GRegex *regex;
+	GMatchInfo *mi;
+	char *match;
+
+	if ((!export) || (!name) || (!layer) || (!color)) {
+		ret = 1;
+		goto ret_direct;
+	}
+
+	regex = g_regex_new("^(?<layer>[0-9]+),(?<r>[0-9\\.]+),(?<g>[0-9\\.]+),(?<b>[0-9\\.]+),(?<a>[0-9\\.]+),(?<export>[01]),(?<name>.*)$", 0, 0, NULL);
+
+	line = g_data_input_stream_read_line(stream, &len, NULL, NULL);
+	if (!line) {
+		ret = -1;
+		goto destroy_regex;
+	}
+
+	/* Match line in CSV */
+	g_regex_match(regex, line, 0, &mi);
+	if (g_match_info_matches(mi)) {
+		/* Line is valid */
+		match = g_match_info_fetch_named(mi, "layer");
+		*layer = (int)g_ascii_strtoll(match, NULL, 10);
+		g_free(match);
+		match = g_match_info_fetch_named(mi, "r");
+		color->red = g_ascii_strtod(match, NULL);
+		g_free(match);
+		match = g_match_info_fetch_named(mi, "g");
+		color->green = g_ascii_strtod(match, NULL);
+		g_free(match);
+		match = g_match_info_fetch_named(mi, "b");
+		color->blue = g_ascii_strtod(match, NULL);
+		g_free(match);
+		match = g_match_info_fetch_named(mi, "a");
+		color->alpha = g_ascii_strtod(match, NULL);
+		g_free(match);
+		match = g_match_info_fetch_named(mi, "export");
+		*export = ((!strcmp(match, "1")) ? TRUE : FALSE);
+		g_free(match);
+		match = g_match_info_fetch_named(mi, "name");
+		*name = match;
+
+		ret = 0;
+	} else {
+		/* Line is malformatted */
+		printf("Could not recognize line in CSV as valid entry: %s\n", line);
+		ret = 1;
+	}
+
+	g_match_info_free(mi);
+	g_free(line);
+destroy_regex:
+	g_regex_unref(regex);
+ret_direct:
+	return ret;
+
+}
+
+/** @} */
+

mapping-parser.h

@@ -0,0 +1,62 @@
+/*
+ * 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 mapping-parser.h
+ * @brief Function to read a mapping file line and parse it.
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
+#ifndef __MAPPING_PARSER_H__
+#define __MAPPING_PARSER_H__
+
+/**
+ * @addtogroup MainApplication
+ * @{
+ */
+
+#include <gtk/gtk.h>
+
+/**
+ * @brief Layer information.
+ *
+ * This structs contains information on how to render a layer
+ */
+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
+	GdkRGBA color; /**< @brief RGBA color used to render this layer */
+};
+
+/**
+ * @brief Load a line from \p stream and parse try to parse it as layer information
+ * @param stream Input data stream
+ * @param export Layer shall be exported
+ * @param name Layer name. Free returned pointer after using.
+ * @param layer Layer number
+ * @param color RGBA color.
+ * @return 1 if malformatted line, 0 if parsing was successful and parameters are valid, -1 if file end
+ */
+int load_csv_line(GDataInputStream *stream, gboolean *export, char **name, int *layer, GdkRGBA *color);
+
+/** @} */
+
+#endif /* __MAPPING_PARSER_H__ */

widgets/conv-settings-dialog.c

@@ -0,0 +1,128 @@
+/*
+ * 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/>.
+ */
+
+#include "conv-settings-dialog.h"
+
+struct  _RendererSettingsDialog {
+		GtkDialog parent;
+		/* Private loot */
+		GtkWidget *radio_latex;
+		GtkWidget *radio_cairo;
+		GtkWidget *scale;
+		GtkWidget *layer_check;
+		GtkWidget *standalone_check;
+};
+
+G_DEFINE_TYPE(RendererSettingsDialog, renderer_settings_dialog, GTK_TYPE_DIALOG)
+
+
+
+static void renderer_settings_dialog_class_init(RendererSettingsDialogClass *klass)
+{
+	/*  No special code needed. Child cells are destroyed automatically due to reference counter */
+	return;
+}
+
+static void show_tex_options(RendererSettingsDialog *self)
+{
+	gtk_widget_show(self->layer_check);
+	gtk_widget_show(self->standalone_check);
+
+}
+
+static void hide_tex_options(RendererSettingsDialog *self)
+{
+	gtk_widget_hide(self->layer_check);
+	gtk_widget_hide(self->standalone_check);
+}
+
+static void latex_render_callback(GtkToggleButton *radio, RendererSettingsDialog *dialog)
+{
+	if (gtk_toggle_button_get_active(radio))
+		show_tex_options(dialog);
+	else
+		hide_tex_options(dialog);
+}
+
+static void renderer_settings_dialog_init(RendererSettingsDialog *self)
+{
+	GtkBuilder *builder;
+	GtkWidget *box;
+	GtkDialog *dialog;
+
+
+	dialog = &(self->parent);
+
+	builder = gtk_builder_new_from_resource("/dialog.glade");
+	box = GTK_WIDGET(gtk_builder_get_object(builder, "dialog-box"));
+	self->radio_latex = GTK_WIDGET(gtk_builder_get_object(builder, "latex-radio"));
+	self->radio_cairo = GTK_WIDGET(gtk_builder_get_object(builder, "cairo-radio"));
+	self->scale = GTK_WIDGET(gtk_builder_get_object(builder, "dialog-scale"));
+	self->standalone_check = GTK_WIDGET(gtk_builder_get_object(builder, "standalone-check"));
+	self->layer_check = GTK_WIDGET(gtk_builder_get_object(builder, "layer-check"));
+
+	gtk_dialog_add_buttons(dialog, "Cancel", GTK_RESPONSE_CANCEL, "OK", GTK_RESPONSE_OK, NULL);
+	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(dialog)), box);
+	gtk_window_set_title(GTK_WINDOW(self), "Renderer Settings");
+
+	g_signal_connect(self->radio_latex, "toggled", G_CALLBACK(latex_render_callback), (gpointer)self);
+
+	g_object_unref(builder);
+}
+
+RendererSettingsDialog *renderer_settings_dialog_new(GtkWindow *parent)
+{
+	RendererSettingsDialog *res;
+
+	res = RENDERER_SETTINGS_DIALOG(g_object_new(RENDERER_TYPE_SETTINGS_DIALOG, NULL));
+	if (res && parent) {
+		gtk_window_set_transient_for(GTK_WINDOW(res), parent);
+	}
+	return res;
+}
+
+void renderer_settings_dialog_get_settings(RendererSettingsDialog *dialog, struct render_settings *settings)
+{
+	if (!settings || !dialog)
+		return;
+	settings->scale = gtk_range_get_value(GTK_RANGE(dialog->scale));
+	settings->renderer = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->radio_latex)) == TRUE ? RENDERER_LATEX_TIKZ : RENDERER_CAIROGRAPHICS);
+	settings->tex_pdf_layers = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->layer_check));
+	settings->tex_standalone = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->standalone_check));
+}
+void renderer_settings_dialog_set_settings(RendererSettingsDialog *dialog, struct render_settings *settings)
+{
+	if (!settings || !dialog)
+		return;
+
+	gtk_range_set_value(GTK_RANGE(dialog->scale), settings->scale);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->layer_check), settings->tex_pdf_layers);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->standalone_check), settings->tex_standalone);
+
+	switch (settings->renderer) {
+	case RENDERER_LATEX_TIKZ:
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->radio_latex), TRUE);
+		show_tex_options(dialog);
+		break;
+	case RENDERER_CAIROGRAPHICS:
+		hide_tex_options(dialog);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->radio_cairo), TRUE);
+		break;
+	}
+}

widgets/conv-settings-dialog.h

@@ -0,0 +1,48 @@
+/*
+ * 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 __CONV_SETTINGS_DIALOG_H__
+#define __CONV_SETTINGS_DIALOG_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+enum output_renderer {RENDERER_LATEX_TIKZ, RENDERER_CAIROGRAPHICS};
+
+G_DECLARE_FINAL_TYPE(RendererSettingsDialog, renderer_settings_dialog, RENDERER, SETTINGS_DIALOG, GtkDialog)
+
+RendererSettingsDialog *renderer_settings_dialog_new(GtkWindow *parent);
+
+#define RENDERER_TYPE_SETTINGS_DIALOG (renderer_settings_dialog_get_type())
+
+struct render_settings {
+	double scale;
+	enum output_renderer renderer;
+	gboolean tex_pdf_layers;
+	gboolean tex_standalone;
+};
+
+G_END_DECLS
+
+
+void renderer_settings_dialog_set_settings(RendererSettingsDialog *dialog, struct render_settings *settings);
+void renderer_settings_dialog_get_settings(RendererSettingsDialog *dialog, struct render_settings *settings);
+
+#endif /* __CONV_SETTINGS_DIALOG_H__ */

widgets/layer-element.h

@@ -38,12 +38,12 @@ typedef struct _LayerElementPriv {
 	GtkCheckButton *export;
 } LayerElementPriv;
 
-typedef struct _LayerElement {
+struct _LayerElement {
 	/* Inheritance */
 	GtkListBoxRow parent;
 	/* Custom Elements */
 	LayerElementPriv priv;
-} LayerElement;
+};
 
 GtkWidget *layer_element_new(void);