Issue #19: Add LayerSettings Class
* Remove Command line and GUI rendering code * Add LayerSettings Class with all options * Prepare to remove mapping parser. Is now integrated in LayerSettings * Adopt all renderers to check if the supplied layer_info struct has to be rendered. Further todos: * Implement correct command line parsing. * Implement Layerselector and GUI to use new LayerSettings class
This commit is contained in:
@@ -31,38 +31,123 @@
|
||||
*/
|
||||
|
||||
#include <gds-render/output-renderers/gds-output-renderer.h>
|
||||
#include <gds-render/layer/layer-info.h>
|
||||
|
||||
typedef struct {
|
||||
gpointer padding[12];
|
||||
gchar *output_file;
|
||||
LayerSettings *layer_settings;
|
||||
gpointer padding[11];
|
||||
} GdsOutputRendererPrivate;
|
||||
|
||||
enum {
|
||||
PROP_OUTPUT_FILE = 1,
|
||||
PROP_LAYER_SETTINGS,
|
||||
N_PROPERTIES
|
||||
};
|
||||
|
||||
G_DEFINE_TYPE_WITH_PRIVATE(GdsOutputRenderer, gds_output_renderer, G_TYPE_OBJECT)
|
||||
|
||||
static int gds_output_renderer_render_dummy(GdsOutputRenderer *renderer,
|
||||
struct gds_cell *cell,
|
||||
GList *layer_infos,
|
||||
const char *output_file,
|
||||
double scale)
|
||||
{
|
||||
(void)renderer;
|
||||
(void)cell;
|
||||
(void)layer_infos;
|
||||
(void)output_file;
|
||||
(void)scale;
|
||||
|
||||
g_warning("Output renderer does not define a render_output function!");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void gds_output_renderer_dispose(GObject *self_obj)
|
||||
{
|
||||
GdsOutputRenderer *renderer = GDS_RENDER_OUTPUT_RENDERER(self_obj);
|
||||
GdsOutputRendererPrivate *priv;
|
||||
|
||||
priv = gds_output_renderer_get_instance_private(renderer);
|
||||
if (priv->output_file)
|
||||
g_free(priv->output_file);
|
||||
|
||||
g_clear_object(&priv->layer_settings);
|
||||
|
||||
/* Chain up to parent class */
|
||||
G_OBJECT_CLASS(gds_output_renderer_parent_class)->dispose(self_obj);
|
||||
}
|
||||
|
||||
static void gds_output_renderer_get_property(GObject *obj, guint property_id, GValue *value, GParamSpec *pspec)
|
||||
{
|
||||
GdsOutputRenderer *self = GDS_RENDER_OUTPUT_RENDERER(obj);
|
||||
GdsOutputRendererPrivate *priv;
|
||||
|
||||
priv = gds_output_renderer_get_instance_private(self);
|
||||
|
||||
switch (property_id) {
|
||||
case PROP_OUTPUT_FILE:
|
||||
g_value_set_string(value, priv->output_file);
|
||||
break;
|
||||
case PROP_LAYER_SETTINGS:
|
||||
g_value_set_object(value, priv->layer_settings);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, property_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void gds_output_renderer_set_property(GObject *obj, guint property_id, const GValue *value, GParamSpec *pspec)
|
||||
{
|
||||
GdsOutputRenderer *self = GDS_RENDER_OUTPUT_RENDERER(obj);
|
||||
GdsOutputRendererPrivate *priv;
|
||||
|
||||
priv = gds_output_renderer_get_instance_private(self);
|
||||
|
||||
switch (property_id) {
|
||||
case PROP_OUTPUT_FILE:
|
||||
if (priv->output_file)
|
||||
g_free(priv->output_file);
|
||||
priv->output_file = g_strdup(g_value_get_string(value));
|
||||
break;
|
||||
case PROP_LAYER_SETTINGS:
|
||||
g_clear_object(&priv->layer_settings);
|
||||
priv->layer_settings = g_value_get_object(value);
|
||||
g_object_ref(priv->layer_settings);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, property_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static GParamSpec *gds_output_renderer_properties[N_PROPERTIES] = {NULL};
|
||||
|
||||
static void gds_output_renderer_class_init(GdsOutputRendererClass *klass)
|
||||
{
|
||||
GObjectClass *oclass = G_OBJECT_CLASS(klass);
|
||||
|
||||
klass->render_output = gds_output_renderer_render_dummy;
|
||||
|
||||
oclass->dispose = gds_output_renderer_dispose;
|
||||
oclass->set_property = gds_output_renderer_set_property;
|
||||
oclass->get_property = gds_output_renderer_get_property;
|
||||
|
||||
/* Setup properties */
|
||||
gds_output_renderer_properties[PROP_OUTPUT_FILE] =
|
||||
g_param_spec_string("output-file", "output file", "Output file for renderer",
|
||||
NULL, G_PARAM_READWRITE);
|
||||
gds_output_renderer_properties[PROP_LAYER_SETTINGS] =
|
||||
g_param_spec_object("layer-settings", "Layer Settings object",
|
||||
"Object containing the layer rendering information",
|
||||
GDS_RENDER_TYPE_LAYER_SETTINGS, G_PARAM_READWRITE);
|
||||
g_object_class_install_properties(oclass, N_PROPERTIES, gds_output_renderer_properties);
|
||||
}
|
||||
|
||||
void gds_output_renderer_init(GdsOutputRenderer *self)
|
||||
{
|
||||
(void)self;
|
||||
GdsOutputRendererPrivate *priv;
|
||||
|
||||
priv = gds_output_renderer_get_instance_private(self);
|
||||
|
||||
priv->output_file = NULL;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -71,17 +156,69 @@ GdsOutputRenderer *gds_output_renderer_new()
|
||||
return GDS_RENDER_OUTPUT_RENDERER(g_object_new(GDS_RENDER_TYPE_OUTPUT_RENDERER, NULL));
|
||||
}
|
||||
|
||||
int gds_output_renderer_render_output(GdsOutputRenderer *renderer, struct gds_cell *cell, GList *layer_infos, const char *output_file, double scale)
|
||||
GdsOutputRenderer *gds_output_renderer_new_with_props(const char *output_file, LayerSettings *layer_settings)
|
||||
{
|
||||
return GDS_RENDER_OUTPUT_RENDERER(g_object_new(GDS_RENDER_TYPE_OUTPUT_RENDERER,
|
||||
"layer-settings", layer_settings,
|
||||
"output-file", output_file,
|
||||
NULL));
|
||||
}
|
||||
|
||||
void gds_output_renderer_set_output_file(GdsOutputRenderer *renderer, const gchar *file_name)
|
||||
{
|
||||
g_return_if_fail(GDS_RENDER_IS_OUTPUT_RENDERER(renderer));
|
||||
|
||||
/* Check if the filename is actually filled */
|
||||
if (!file_name || !file_name[0])
|
||||
return;
|
||||
g_object_set(renderer, "output-file", file_name, NULL);
|
||||
}
|
||||
|
||||
const char *gds_output_renderer_get_output_file(GdsOutputRenderer *renderer)
|
||||
{
|
||||
const char *file = NULL;
|
||||
|
||||
g_object_get(renderer, "output-file", &file, NULL);
|
||||
return file;
|
||||
}
|
||||
|
||||
LayerSettings *gds_output_renderer_get_layer_settings(GdsOutputRenderer *renderer)
|
||||
{
|
||||
LayerSettings *ret = NULL;
|
||||
|
||||
g_object_get(renderer, "layer-settings", &ret, NULL);
|
||||
return ret;
|
||||
}
|
||||
|
||||
void gds_output_renderer_set_layer_settings(GdsOutputRenderer *renderer, LayerSettings *settings)
|
||||
{
|
||||
g_return_if_fail(GDS_RENDER_IS_LAYER_SETTINGS(settings));
|
||||
|
||||
g_object_set(renderer, "layer_settings", settings, NULL);
|
||||
}
|
||||
|
||||
int gds_output_renderer_render_output(GdsOutputRenderer *renderer, struct gds_cell *cell, double scale)
|
||||
{
|
||||
GdsOutputRendererClass *klass;
|
||||
GdsOutputRendererPrivate *priv = gds_output_renderer_get_instance_private(renderer);
|
||||
|
||||
if (GDS_RENDER_IS_OUTPUT_RENDERER(renderer) == FALSE) {
|
||||
g_error("Output Renderer not valid.");
|
||||
return GDS_OUTPUT_RENDERER_GEN_ERR;
|
||||
}
|
||||
|
||||
if (!cell || !layer_infos || !output_file) {
|
||||
g_error("Output renderer called with insufficient parameters.");
|
||||
if (!priv->output_file || !priv->output_file[0]) {
|
||||
g_error("No/invalid output file set.");
|
||||
return GDS_OUTPUT_RENDERER_GEN_ERR;
|
||||
}
|
||||
|
||||
if (!priv->layer_settings) {
|
||||
g_error("No layer specification supplied.");
|
||||
return GDS_OUTPUT_RENDERER_GEN_ERR;
|
||||
}
|
||||
|
||||
if (!cell) {
|
||||
g_error("Output renderer called without cell to render.");
|
||||
return GDS_OUTPUT_RENDERER_PARAM_ERR;
|
||||
}
|
||||
|
||||
@@ -91,7 +228,7 @@ int gds_output_renderer_render_output(GdsOutputRenderer *renderer, struct gds_ce
|
||||
return GDS_OUTPUT_RENDERER_GEN_ERR;
|
||||
}
|
||||
|
||||
return klass->render_output(renderer, cell, layer_infos, output_file, scale);
|
||||
return klass->render_output(renderer, cell, scale);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user