command-line.c

@@ -56,7 +56,7 @@ static int create_renderers(char **renderers,
 			    char **output_file_names,
 			    gboolean tex_layers,
 			    gboolean tex_standalone,
-			    const struct external_renderer_params *ext_params,
+			    const char *so_path,
 			    GList **renderer_list,
 			    LayerSettings *layer_settings)
 {
@@ -100,11 +100,11 @@ static int create_renderers(char **renderers,
 		} else if (!strcmp(current_renderer, "svg")) {
 			output_renderer = GDS_RENDER_OUTPUT_RENDERER(cairo_renderer_new_svg());
 		} else if (!strcmp(current_renderer, "ext")) {
-			if (!ext_params->so_path) {
+			if (!so_path) {
 				fprintf(stderr, _("Please specify shared object for external renderer. Will ignore this renderer.\n"));
 				continue;
 			}
-			output_renderer = GDS_RENDER_OUTPUT_RENDERER(external_renderer_new_with_so(ext_params->so_path));
+			output_renderer = GDS_RENDER_OUTPUT_RENDERER(external_renderer_new_with_so(so_path));
 		} else {
 			continue;
 		}
@@ -138,7 +138,7 @@ int command_line_convert_gds(const char *gds_name,
 			      char **renderers,
 			      char **output_file_names,
 			      const char *layer_file,
-			      struct external_renderer_params *ext_param,
+			      const char *so_path,
 			      gboolean tex_standalone,
 			      gboolean tex_layers,
 			      double scale)
@@ -165,7 +165,7 @@ int command_line_convert_gds(const char *gds_name,
 
 	/* Create renderers */
 	if (create_renderers(renderers, output_file_names, tex_layers, tex_standalone,
-			     ext_param, &renderer_list, layer_sett))
+			     so_path, &renderer_list, layer_sett))
 		goto ret_destroy_layer_mapping;
 
 

include/gds-render/command-line.h

@@ -33,21 +33,6 @@
 
 #include <glib.h>
 
-/**
- * @brief External renderer paramameters to command line renderer
- */
-struct external_renderer_params {
-	/**
-	 * @brief Path to shared object
-	 */
-	char *so_path;
-
-	/**
-	 * @brief Command line parameters given
-	 */
-	char *cli_params;
-};
-
 /**
  * @brief Convert GDS according to command line parameters
  * @param gds_name Path to GDS File
@@ -55,7 +40,7 @@ struct external_renderer_params {
  * @param renderers Renderer ids
  * @param output_file_names Output file names
  * @param layer_file Layer mapping file
- * @param ext_params Settings for external library renderer
+ * @param so_path Shared object
  * @param tex_standalone Standalone TeX
  * @param tex_layers TeX OCR layers
  * @param scale Scale value
@@ -66,7 +51,7 @@ int command_line_convert_gds(const char *gds_name,
 			     char **renderers,
 			     char **output_file_names,
 			     const char *layer_file,
-			     struct external_renderer_params *ext_param,
+			     const char *so_path,
 			     gboolean tex_standalone,
 			     gboolean tex_layers,
 			     double scale);

main.c

@@ -23,6 +23,8 @@
  * @author Mario Hüttel <mario.huettel@gmx.net>
  */
 
+
+
 #include <stdio.h>
 #include <gtk/gtk.h>
 #include <glib.h>
@@ -263,12 +265,9 @@ int main(int argc, char **argv)
 	gchar *cellname = NULL;
 	gchar **renderer_args = NULL;
 	gboolean version = FALSE, pdf_standalone = FALSE, pdf_layers = FALSE;
+	gchar *custom_library_path = NULL;
 	int scale = 1000;
 	int app_status = 0;
-	struct external_renderer_params so_render_params;
-
-	so_render_params.so_path = NULL;
-	so_render_params.cli_params = NULL;
 
 	bindtextdomain(GETTEXT_PACKAGE, LOCALEDATADIR "/locale");
 	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
@@ -285,11 +284,9 @@ int main(int argc, char **argv)
 		{"cell", 'c', 0, G_OPTION_ARG_STRING, &cellname, _("Cell to render"), "NAME" },
 		{"tex-standalone", 'a', 0, G_OPTION_ARG_NONE, &pdf_standalone, _("Create standalone TeX"), NULL },
 		{"tex-layers", 'l', 0, G_OPTION_ARG_NONE, &pdf_layers, _("Create PDF Layers (OCG)"), NULL },
-		{"custom-render-lib", 'P', 0, G_OPTION_ARG_FILENAME, &so_render_params.so_path,
+		{"custom-render-lib", 'P', 0, G_OPTION_ARG_FILENAME, &custom_library_path, 
-			_("Path to a custom shared object, that implements the necessary rendering functions"), "PATH"},
+			"Path to a custom shared object, that implements the necessary rendering functions", "PATH"},
-		{"render-lib-params", 'W', 0, G_OPTION_ARG_STRING, &so_render_params.cli_params,
+		{NULL}
-			_("Argument string passed to render lib"), NULL},
-		{NULL, 0, 0, 0, NULL, NULL, NULL}
 	};
 
 	context = g_option_context_new(_(" FILE - Convert GDS file <FILE> to graphic"));
@@ -323,7 +320,7 @@ int main(int argc, char **argv)
 
 		app_status =
 			command_line_convert_gds(gds_name, cellname, renderer_args, output_paths, mappingname,
-						 &so_render_params, pdf_standalone, pdf_layers, scale);
+						 custom_library_path, pdf_standalone, pdf_layers, scale);
 
 	} else {
 		app_status = start_gui(argc, argv);
@@ -342,10 +339,8 @@ ret_status:
 		g_free(mappingname);
 	if (cellname)
 		free(cellname);
-	if (so_render_params.so_path)
+	if (custom_library_path)
-		free(so_render_params.so_path);
+		free(custom_library_path);
-	if (so_render_params.cli_params)
-		g_free(so_render_params.cli_params);
 
 	return app_status;
 }

translations/pot/command-line.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-15 20:32+0100\n"
+"POT-Creation-Date: 2019-10-25 20:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

translations/pot/gds-render-gui.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-15 20:32+0100\n"
+"POT-Creation-Date: 2019-10-25 20:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,34 +17,34 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gds-render-gui.c:275
+#: ../gds-render-gui.c:273
 msgid "Acc. Date"
 msgstr ""
 
-#: ../gds-render-gui.c:318
+#: ../gds-render-gui.c:314
 msgid "Cancel"
 msgstr ""
 
-#: ../gds-render-gui.c:268
+#: ../gds-render-gui.c:266
 msgid "Cell"
 msgstr ""
 
-#: ../gds-render-gui.c:326
+#: ../gds-render-gui.c:322
 msgid "GDSII-Files"
 msgstr ""
 
-#: ../gds-render-gui.c:265
+#: ../gds-render-gui.c:263
 msgid "Library"
 msgstr ""
 
-#: ../gds-render-gui.c:272
+#: ../gds-render-gui.c:270
 msgid "Mod. Date"
 msgstr ""
 
-#: ../gds-render-gui.c:319
+#: ../gds-render-gui.c:315
 msgid "Open GDSII"
 msgstr ""
 
-#: ../gds-render-gui.c:316
+#: ../gds-render-gui.c:312
 msgid "Open GDSII File"
 msgstr ""

translations/pot/main.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-15 20:32+0100\n"
+"POT-Creation-Date: 2019-10-25 20:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../main.c:97
+#: ../main.c:99
 #, c-format
 msgid ""
 "\n"
@@ -25,27 +25,23 @@ msgid ""
 "Full git commit: %s"
 msgstr ""
 
-#: ../main.c:293
+#: ../main.c:289
 msgid " FILE - Convert GDS file <FILE> to graphic"
 msgstr ""
 
-#: ../main.c:221
+#: ../main.c:223
 msgid "About"
 msgstr ""
 
-#: ../main.c:289
+#: ../main.c:282
-msgid "Argument string passed to render lib"
-msgstr ""
-
-#: ../main.c:283
 msgid "Cell to render"
 msgstr ""
 
-#: ../main.c:285
+#: ../main.c:284
 msgid "Create PDF Layers (OCG)"
 msgstr ""
 
-#: ../main.c:284
+#: ../main.c:283
 msgid "Create standalone TeX"
 msgstr ""
 
@@ -53,40 +49,34 @@ msgstr ""
 msgid "Divide output coordinates by <SCALE>"
 msgstr ""
 
-#: ../main.c:320
+#: ../main.c:314
 #, c-format
 msgid "Ignored argument: %s"
 msgstr ""
 
-#: ../main.c:116
+#: ../main.c:118
 #, c-format
 msgid "Logo could not be displayed: %s\n"
 msgstr ""
 
-#: ../main.c:298
+#: ../main.c:294
 #, c-format
 msgid "Option parsing failed: %s\n"
 msgstr ""
 
-#: ../main.c:281
+#: ../main.c:280
 msgid "Output file path. Can be used multiple times."
 msgstr ""
 
-#: ../main.c:282
+#: ../main.c:281
 msgid "Path for Layer Mapping File"
 msgstr ""
 
-#: ../main.c:287
+#: ../main.c:277
-msgid ""
-"Path to a custom shared object, that implements the necessary rendering "
-"functions"
-msgstr ""
-
-#: ../main.c:276
 msgid "Print version"
 msgstr ""
 
-#: ../main.c:220
+#: ../main.c:222
 msgid "Quit"
 msgstr ""
 
@@ -94,19 +84,19 @@ msgstr ""
 msgid "Renderer to use. Can be used multiple times."
 msgstr ""
 
-#: ../main.c:311
+#: ../main.c:305
 #, c-format
 msgid "Scale < 1 not allowed. Setting to 1\n"
 msgstr ""
 
-#: ../main.c:213
+#: ../main.c:215
 #, c-format
 msgid ""
 "There is already an open instance. Will open second window in that "
 "instance.\n"
 msgstr ""
 
-#: ../main.c:245
+#: ../main.c:247
 #, c-format
 msgid ""
 "This is gds-render, version: %s\n"
@@ -114,7 +104,7 @@ msgid ""
 "For a list of supported commands execute with --help option.\n"
 msgstr ""
 
-#: ../main.c:96
+#: ../main.c:98
 msgid ""
 "gds-render is a free tool for rendering GDS2 layout files into vector "
 "graphics."

translations/pot/po/de/gds-render-gui.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gds-render VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-15 20:32+0100\n"
+"POT-Creation-Date: 2019-10-22 23:02+0200\n"
 "PO-Revision-Date: 2019-10-18 23:10+0200\n"
 "Last-Translator:  <mario.huettel@gmx.net>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -17,34 +17,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gds-render-gui.c:275
+#: ../gds-render-gui.c:273
 msgid "Acc. Date"
 msgstr "Zugr. Datum"
 
-#: ../gds-render-gui.c:318
+#: ../gds-render-gui.c:314
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: ../gds-render-gui.c:268
+#: ../gds-render-gui.c:266
 msgid "Cell"
 msgstr "Zelle"
 
-#: ../gds-render-gui.c:326
+#: ../gds-render-gui.c:322
 msgid "GDSII-Files"
 msgstr "GDSII-Dateiem"
 
-#: ../gds-render-gui.c:265
+#: ../gds-render-gui.c:263
 msgid "Library"
 msgstr "Bibliothek"
 
-#: ../gds-render-gui.c:272
+#: ../gds-render-gui.c:270
 msgid "Mod. Date"
 msgstr "Mod. Datum"
 
-#: ../gds-render-gui.c:319
+#: ../gds-render-gui.c:315
 msgid "Open GDSII"
 msgstr "GDSII öffnen"
 
-#: ../gds-render-gui.c:316
+#: ../gds-render-gui.c:312
 msgid "Open GDSII File"
 msgstr "GDSII Datei öffnen"

translations/pot/po/de/main.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gds-render VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-15 20:32+0100\n"
+"POT-Creation-Date: 2019-10-18 23:03+0200\n"
 "PO-Revision-Date: 2019-10-18 20:49+0200\n"
 "Last-Translator:  <mario.huettel@gmx.net>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../main.c:97
+#: ../main.c:99
 #, c-format
 msgid ""
 "\n"
@@ -28,27 +28,23 @@ msgstr ""
 "\n"
 "Vollständige git Commit-ID %s"
 
-#: ../main.c:293
+#: ../main.c:289
 msgid " FILE - Convert GDS file <FILE> to graphic"
 msgstr "Datei -- Konvertiere GDS Datei <Datei> zu Vektorgrafik"
 
-#: ../main.c:221
+#: ../main.c:223
 msgid "About"
 msgstr "Über"
 
-#: ../main.c:289
+#: ../main.c:282
-msgid "Argument string passed to render lib"
-msgstr "Argumente, die an externe Render-Bibliothek weitergegeben werden sollen"
-
-#: ../main.c:283
 msgid "Cell to render"
 msgstr "Zu konvertierende Zelle"
 
-#: ../main.c:285
+#: ../main.c:284
 msgid "Create PDF Layers (OCG)"
 msgstr "Generiere PDF Layer (OCG)"
 
-#: ../main.c:284
+#: ../main.c:283
 msgid "Create standalone TeX"
 msgstr "Generiere alleinstehendes TeX"
 
@@ -56,41 +52,34 @@ msgstr "Generiere alleinstehendes TeX"
 msgid "Divide output coordinates by <SCALE>"
 msgstr "Skaliere Ausgabekoordinaten um Faktor <SCALE> herab"
 
-#: ../main.c:320
+#: ../main.c:314
 #, c-format
 msgid "Ignored argument: %s"
 msgstr "Ignoriertes Argument: %s"
 
-#: ../main.c:116
+#: ../main.c:118
 #, c-format
 msgid "Logo could not be displayed: %s\n"
 msgstr "Logo konnte nicht angezeigt werden: %s\n"
 
-#: ../main.c:298
+#: ../main.c:294
 #, c-format
 msgid "Option parsing failed: %s\n"
 msgstr "Übergabeparameterkonvertierung fehlgeschlagen: %s\n"
 
-#: ../main.c:281
+#: ../main.c:280
 msgid "Output file path. Can be used multiple times."
 msgstr "Ausgabedatei. Kann mehrfach angegeben werden."
 
-#: ../main.c:282
+#: ../main.c:281
 msgid "Path for Layer Mapping File"
 msgstr "Pfad zur \"Layer Mapping\"-Datei"
 
-#: ../main.c:287
+#: ../main.c:277
-msgid ""
-"Path to a custom shared object, that implements the necessary rendering "
-"functions"
-msgstr ""
-"Pfad zu einer Programmbibliothek, die die notwendigen Renderingfunktionen bereitstellt"
-
-#: ../main.c:276
 msgid "Print version"
 msgstr "Programmversion aufgeben"
 
-#: ../main.c:220
+#: ../main.c:222
 msgid "Quit"
 msgstr "Beenden"
 
@@ -98,12 +87,12 @@ msgstr "Beenden"
 msgid "Renderer to use. Can be used multiple times."
 msgstr "Gewünschter Renderer. Kann mehrfach angegeben werden."
 
-#: ../main.c:311
+#: ../main.c:305
 #, c-format
 msgid "Scale < 1 not allowed. Setting to 1\n"
 msgstr "Skalierung < 1 nicht erlaubt. Rückfallwert 1 benutzt.\n"
 
-#: ../main.c:213
+#: ../main.c:215
 #, c-format
 msgid ""
 "There is already an open instance. Will open second window in that "
@@ -112,7 +101,7 @@ msgstr ""
 "Es is bereits eine Instanz dieses Programms geöffnet. Ein weiteres Fenster "
 "in dieser wird geöffnet.\n"
 
-#: ../main.c:245
+#: ../main.c:247
 #, c-format
 msgid ""
 "This is gds-render, version: %s\n"
@@ -124,7 +113,7 @@ msgstr ""
 "Um eine Liste der unterstützten Befehle zu erhalten, bitte mit der Option --"
 "help ausführen.\n"
 
-#: ../main.c:96
+#: ../main.c:98
 msgid ""
 "gds-render is a free tool for rendering GDS2 layout files into vector "
 "graphics."

translations/pot/widgets_activity-bar.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-15 20:32+0100\n"
+"POT-Creation-Date: 2019-10-25 20:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"