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

Fix #19: Renderers are now implemented as objects. Implementation of asynchronous functionality can begin. Feature needs further testing to be considered stable

Browse Source
This commit is contained in:
Mario Hüttel 2019-08-20 19:05:14 +02:00
parent 92506485e0
commit 85f037ce59
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gds-render-gui.c
View File

@ -37,8 +37,8 @@
#include <gds-render/widgets/activity-bar.h> #include <gds-render/widgets/activity-bar.h>
#include <gds-render/cell-selector/tree-store.h> #include <gds-render/cell-selector/tree-store.h>
#include <gds-render/cell-selector/lib-cell-renderer.h> #include <gds-render/cell-selector/lib-cell-renderer.h>
//#include <gds-render/output-renderers/latex-output.h> #include <gds-render/output-renderers/latex-renderer.h>
//#include <gds-render/output-renderers/cairo-output.h> #include <gds-render/output-renderers/cairo-renderer.h>
#include <gds-render/widgets/conv-settings-dialog.h> #include <gds-render/widgets/conv-settings-dialog.h>
#include <gds-render/geometric/cell-geometrics.h> #include <gds-render/geometric/cell-geometrics.h>
#include <gds-render/version.h> #include <gds-render/version.h>
@ -267,7 +267,6 @@ static void on_convert_clicked(gpointer button, gpointer user)
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *model; GtkTreeModel *model;
struct gds_cell *cell_to_render; struct gds_cell *cell_to_render;
FILE *output_file;
GtkWidget *dialog; GtkWidget *dialog;
RendererSettingsDialog *settings; RendererSettingsDialog *settings;
GtkFileFilter *filter; GtkFileFilter *filter;
@ -276,6 +275,8 @@ static void on_convert_clicked(gpointer button, gpointer user)
union bounding_box cell_box; union bounding_box cell_box;
unsigned int height, width; unsigned int height, width;
struct render_settings *sett; struct render_settings *sett;
LayerSettings *layer_settings;
GdsOutputRenderer *render_engine;
self = RENDERER_GUI(user); self = RENDERER_GUI(user);
@ -295,7 +296,7 @@ static void on_convert_clicked(gpointer button, gpointer user)
return; return;
/* Get layers that are rendered */ /* Get layers that are rendered */
//layer_list = layer_selector_export_rendered_layer_info(self->layer_selector); layer_settings = layer_selector_export_rendered_layer_info(self->layer_selector);
/* Calculate cell size in DB units */ /* Calculate cell size in DB units */
bounding_box_prepare_empty(&cell_box); bounding_box_prepare_empty(&cell_box);
@ -358,31 +359,35 @@ static void on_convert_clicked(gpointer button, gpointer user)
switch (sett->renderer) { switch (sett->renderer) {
case RENDERER_LATEX_TIKZ: case RENDERER_LATEX_TIKZ:
output_file = fopen(file_name, "w"); render_engine =
/*latex_render_cell_to_code(cell_to_render, layer_list, output_file, sett->scale, GDS_RENDER_OUTPUT_RENDERER(latex_renderer_new_with_options(sett->tex_pdf_layers,
sett->tex_pdf_layers, sett->tex_standalone); sett->tex_standalone));
*/fclose(output_file);
break; break;
case RENDERER_CAIROGRAPHICS_SVG: case RENDERER_CAIROGRAPHICS_SVG:
render_engine = GDS_RENDER_OUTPUT_RENDERER(cairo_renderer_new_svg());
break;
case RENDERER_CAIROGRAPHICS_PDF: case RENDERER_CAIROGRAPHICS_PDF:
/*cairo_render_cell_to_vector_file(cell_to_render, layer_list, render_engine = GDS_RENDER_OUTPUT_RENDERER(cairo_renderer_new_pdf());
(sett->renderer == RENDERER_CAIROGRAPHICS_PDF break;
? file_name
: NULL),
(sett->renderer == RENDERER_CAIROGRAPHICS_SVG
? file_name
: NULL),
sett->scale);
*/break;
} }
if (render_engine) {
gds_output_renderer_set_output_file(render_engine, file_name);
gds_output_renderer_set_layer_settings(render_engine, layer_settings);
/* TODO: Replace this with asynchronous rendering. However, this fixes issue #19 */
gds_output_renderer_render_output(render_engine, cell_to_render, sett->scale);
g_object_unref(render_engine);
}
g_free(file_name); g_free(file_name);
} else { } else {
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
} }
ret_layer_destroy: ret_layer_destroy:
; g_object_unref(layer_settings);
// g_list_free_full(layer_list, (GDestroyNotify)layer_info_delete_struct);
} }
/** /**