command-line.c

@@ -39,117 +39,58 @@
 #include <gds-render/output-renderers/external-renderer.h>
 #include <gds-render/gds-utils/gds-tree-checker.h>
 
-static int string_array_count(char **string_array)
+/**
+ * @brief Delete layer_info and free nem element.
+ *
+ * Like delete_layer_info_struct() but also frees layer_info::name
+ * @param info
+ * @warning This function must not be used if the layer_info::name field references the internal storage strings if e.g. an entry field
+ */
+static void delete_layer_info_with_name(struct layer_info *info)
 {
-	int count = 0;
+	if (info) {
-
+		if (info->name)
-	if (!string_array)
+			g_free(info->name);
-		return 0;
+		free(info);
-
+	}
-	for (; *string_array; string_array++) {
-		count++;
 }
 
-	return count;
+static void check_renderers_and_output_files()
-}
-
-static int create_renderers(char **renderers,
-			    char **output_file_names,
-			    gboolean tex_layers,
-			    gboolean tex_standalone,
-			    const char *so_path,
-			    GList **renderer_list,
-			    LayerSettings *layer_settings)
 {
-	char **renderer_iter;
-	char *current_renderer;
-	int idx;
-	char *current_out_file;
-	int count_render, count_out;
-	GdsOutputRenderer *output_renderer;
 
-	if (!renderer_list)
-		return -1;
-
-	if (!renderers || !output_file_names) {
-		fprintf(stderr, "Please specify renderers and file names\n");
-		return -1;
 }
 
-	count_render = string_array_count(renderers);
+void command_line_convert_gds(const char *gds_name,
-	count_out = string_array_count(output_file_names);
-	if (count_render != count_out) {
-		fprintf(stderr, "Count of renderers %d does not match count of output file names %d\n",
-			count_render, count_out);
-		return -1;
-	}
-
-	/* Parse cmd line parameters */
-	for (renderer_iter = renderers, idx = 0; *renderer_iter; renderer_iter++, idx++) {
-		current_renderer = *renderer_iter;
-		current_out_file = output_file_names[idx];
-
-		/* File valid ? */
-		if (!current_out_file || !current_out_file[0])
-			continue;
-
-		if (!strcmp(current_renderer, "tikz")) {
-			output_renderer = GDS_RENDER_OUTPUT_RENDERER(latex_renderer_new_with_options(tex_layers,
-												     tex_standalone));
-		} else if (!strcmp(current_renderer, "pdf")) {
-			output_renderer = GDS_RENDER_OUTPUT_RENDERER(cairo_renderer_new_pdf());
-		} else if (!strcmp(current_renderer, "svg")) {
-			output_renderer = GDS_RENDER_OUTPUT_RENDERER(cairo_renderer_new_svg());
-		} else if (!strcmp(current_renderer, "ext")) {
-			if (!so_path)
-				continue;
-			output_renderer = GDS_RENDER_OUTPUT_RENDERER(external_renderer_new_with_so(so_path));
-		} else {
-			continue;
-		}
-
-		gds_output_renderer_set_output_file(output_renderer, current_out_file);
-		gds_output_renderer_set_layer_settings(output_renderer, layer_settings);
-		*renderer_list = g_list_append(*renderer_list, output_renderer);
-	}
-
-	return 0;
-}
-
-int command_line_convert_gds(const char *gds_name,
 			      const char *cell_name,
-			      char **renderers,
+			      const char * const *renderers,
-			      char **output_file_names,
+			      const char * const *output_file_names,
 			      const char *layer_file,
-			      const char *so_path,
+			      const char *so_path)
-			      gboolean tex_standalone,
-			      gboolean tex_layers,
-			      double scale)
 {
-	int ret = -1;
 	GList *libs = NULL;
 	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;
-	GList *renderer_list = NULL;
+	struct layer_info *linfo_temp;
-	GList *list_iter;
 	struct gds_library *first_lib;
 	struct gds_cell *toplevel_cell = NULL, *temp_cell;
-	LayerSettings *layer_sett;
+	GdsOutputRenderer *output_renderer;
-	GdsOutputRenderer *current_renderer;
+	gboolean tex_layers = FALSE, tex_standalone = FALSE;
 
 	/* Check if parameters are valid */
 	if (!gds_name || !cell_name || !output_file_names || !layer_file || !renderers) {
 		printf("Probably missing argument. Check --help option\n");
-		return -2;
+		return;
 	}
 
-	/* Load layer_settings */
-	layer_sett = layer_settings_new();
-	layer_settings_load_from_csv(layer_sett, layer_file);
-
-	/* Create renderers */
-	if (create_renderers(renderers, output_file_names, tex_layers, tex_standalone, so_path, &renderer_list, layer_sett))
-		goto ret_destroy_layer_mapping;
 
 
 	/* Load GDS */
@@ -158,15 +99,45 @@ int command_line_convert_gds(const char *gds_name,
 	if (res)
 		goto ret_destroy_library_list;
 
+	file = g_file_new_for_path(layer_file);
+	stream = g_file_read(file, NULL, NULL);
+
+	if (!stream) {
+		printf("Layer mapping not readable!\n");
+		goto ret_destroy_file;
+	}
+	dstream = g_data_input_stream_new(G_INPUT_STREAM(stream));
+	i = 0;
+	do {
+		res = mapping_parser_load_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_layer_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_renderers;
+		goto ret_clear_layer_list;
 
 	first_lib = (struct gds_library *)libs->data;
 	if (!first_lib) {
 		fprintf(stderr, "No library in library list. This should not happen.\n");
-		/* This is safe. Library destruction can handle an empty list element */
+		goto ret_clear_layer_list;
-		goto ret_destroy_library_list;
 	}
 
 	for (cell_list = first_lib->cells; cell_list != NULL; cell_list = g_list_next(cell_list)) {
@@ -179,21 +150,21 @@ int command_line_convert_gds(const char *gds_name,
 
 	if (!toplevel_cell) {
 		printf("Couldn't find cell in first library!\n");
-		goto ret_destroy_library_list;
+		goto ret_clear_layer_list;
 	}
 
 	/* Check if cell passes vital checks */
 	res = gds_tree_check_reference_loops(toplevel_cell->parent_library);
 	if (res < 0) {
 		fprintf(stderr, "Checking library %s failed.\n", first_lib->name);
-		goto ret_destroy_library_list;
+		goto ret_clear_layer_list;
 	} else if (res > 0) {
 		fprintf(stderr, "%d reference loops found.\n", res);
 
 		/* do further checking if the specified cell and/or its subcells are affected */
 		if (toplevel_cell->checks.affected_by_reference_loop == 1) {
 			fprintf(stderr, "Cell is affected by reference loop. Abort!\n");
-			goto ret_destroy_library_list;
+			goto ret_clear_layer_list;
 		}
 	}
 
@@ -204,21 +175,22 @@ int command_line_convert_gds(const char *gds_name,
 	 * Deal with it.
 	 */
 
-	/* Execute all rendererer instances */
-	for (list_iter = renderer_list; list_iter; list_iter = list_iter->next) {
-		current_renderer = GDS_RENDER_OUTPUT_RENDERER(list_iter->data);
-		gds_output_renderer_render_output(current_renderer, toplevel_cell, scale);
-	}
 
+	/* Render */
+
+
+
+	/* Render end */
+ret_clear_layer_list:
+	g_list_free_full(layer_info_list, (GDestroyNotify)delete_layer_info_with_name);
+
+	g_object_unref(dstream);
+	g_object_unref(stream);
+ret_destroy_file:
+	g_object_unref(file);
+	/* Delete all allocated libraries */
 ret_destroy_library_list:
 	clear_lib_list(&libs);
-ret_clear_renderers:
-	for (list_iter = renderer_list; list_iter; list_iter = list_iter->next) {
-		g_object_unref(list_iter->data);
-	}
-ret_destroy_layer_mapping:
-	g_object_unref(layer_sett);
-	return ret;
 }
 
 /** @} */

include/gds-render/command-line.h

@@ -40,21 +40,14 @@
  * @param renderers Renderer ids
  * @param output_file_names Output file names
  * @param layer_file Layer mapping file
- * @param so_path Shared object
+ * @param so_path Shared object path
- * @param tex_standalone Standalone TeX
- * @param tec_layers TeX OCR layers
- * @param scale Scale value
- * @return Error code, 0 if successful
  */
-int command_line_convert_gds(const char *gds_name,
+void command_line_convert_gds(const char *gds_name,
 			      const char *cell_name,
-			      char **renderers,
+			      const char * const *renderers,
-			      char **output_file_names,
+			      const char * const *output_file_names,
 			      const char *layer_file,
-			      const char *so_path,
+			      const char *so_path);
-			     gboolean tex_standalone,
-			     gboolean tex_layers,
-			     double scale);
 
 #endif /* _COMMAND_LINE_H_ */
 

layer/layer-info.c

@@ -179,6 +179,7 @@ static void layer_settings_gen_csv_line(GString *string, struct layer_info *linf
 int layer_settings_to_csv(LayerSettings *settings, const char *path)
 {
 	GFile *file;
+	int i;
 	GOutputStream *w_fstream;
 	GString *string;
 	GList *info_iter;

main.c

@@ -240,6 +240,7 @@ int main(int argc, char **argv)
 	GError *error = NULL;
 	GOptionContext *context;
 	gchar *gds_name;
+	gchar *basename;
 	gchar **output_paths = NULL;
 	gchar *mappingname = NULL;
 	gchar *cellname = NULL;
@@ -291,15 +292,14 @@ int main(int argc, char **argv)
 			printf("Ignored argument: %s", argv[i]);
 		}
 
-		app_status =
+
-			command_line_convert_gds(gds_name, cellname, renderer_args, output_paths, mappingname,
-						 custom_library_path, pdf_standalone, pdf_layers, scale);
 
 	} else {
 		app_status = start_gui(argc, argv);
 	}
 
 ret_status:
+
 	/* If necessary, free command line parameters */
 	if (output_paths)
 		g_strfreev(output_paths);
@@ -309,7 +309,7 @@ ret_status:
 		g_free(mappingname);
 	if (cellname)
 		free(cellname);
-	if (custom_library_path)
+	if (custom_library_path);
 		free(custom_library_path);
 
 	return app_status;