mhu/gds-render
1
0
Fork 0
Code Issues 4 Pull Requests Releases 8 Wiki Activity

command line progress

Browse Source
This commit is contained in:
Mario Hüttel 2018-07-23 20:17:18 +02:00
parent c60afedd6c
commit b25f147707
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
command-line.c
View File

@ -21,13 +21,29 @@
#include "gds-parser/gds-parser.h" #include "gds-parser/gds-parser.h"
#include "mapping-parser.h" #include "mapping-parser.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) void command_line_convert_gds(char *gds_name, char *pdf_name, char *tex_name, gboolean pdf, gboolean tex, char *layer_file)
{ {
GList *libs = NULL; GList *libs = NULL;
int res; int res;
GFile *file; GFile *file;
int i;
GFileInputStream *stream; GFileInputStream *stream;
GDataInputStream *dstream; GDataInputStream *dstream;
gboolean layer_export;
GdkRGBA layer_color;
int layer;
char *layer_name;
GList *layer_info_list = NULL;
struct layer_info *linfo_temp;
/* Check if parameters are valid */ /* Check if parameters are valid */
if (!gds_name || ! pdf_name || !tex_name || !layer_file) { if (!gds_name || ! pdf_name || !tex_name || !layer_file) {
@ -48,8 +64,28 @@ void command_line_convert_gds(char *gds_name, char *pdf_name, char *tex_name, gb
goto destroy_file; goto destroy_file;
dstream = g_data_input_stream_new(G_INPUT_STREAM(stream)); 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) {
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);
ret_clear_list:
g_list_free_full(layer_info_list, (GDestroyNotify)delete_layer_info_with_name);
g_object_unref(dstream); g_object_unref(dstream);
g_object_unref(stream); g_object_unref(stream);

1
main.c
View File

@ -136,6 +136,7 @@ int main(int argc, char **argv)
if (argc >= 2) { if (argc >= 2) {
command_line_convert_gds(NULL, pdfname, texname, pdf, tikz, mappingname); command_line_convert_gds(NULL, pdfname, texname, pdf, tikz, mappingname);
app_status = 0;
} else { } else {
app_status = start_gui(argc, argv); app_status = start_gui(argc, argv);
} }