Merge pull request 'issue/47-add-vertex-count-to-gui' (#48) from issue/47-add-vertex-count-to-gui into dev
Reviewed-on: #48
This commit is contained in:
commit
8b1f667819
106
cell-selector/cell-statistics-renderer.c
Normal file
106
cell-selector/cell-statistics-renderer.c
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
/*
|
||||||
|
* GDSII-Converter
|
||||||
|
* Copyright (C) 2022 Mario Hüttel <mario.huettel@gmx.net>
|
||||||
|
*
|
||||||
|
* This file is part of GDSII-Converter.
|
||||||
|
*
|
||||||
|
* GDSII-Converter is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* GDSII-Converter is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with GDSII-Converter. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @file cell-statistics-renderer.c
|
||||||
|
* @brief CellStatisticsRenderer GObject Class
|
||||||
|
* @author Mario Hüttel <mario.huettel@gmx.net>
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @addtogroup CellStatisticsRenderer
|
||||||
|
* @{
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <gds-render/cell-selector/cell-statistics-renderer.h>
|
||||||
|
|
||||||
|
G_DEFINE_TYPE(CellStatisticsRenderer, cell_statistics_renderer, GTK_TYPE_CELL_RENDERER_TEXT)
|
||||||
|
|
||||||
|
enum {
|
||||||
|
PROP_CELL_STAT = 1,
|
||||||
|
PROP_COUNT
|
||||||
|
};
|
||||||
|
|
||||||
|
static void cell_statistics_renderer_set_property(GObject *object,
|
||||||
|
guint param_id,
|
||||||
|
const GValue *value,
|
||||||
|
GParamSpec *pspec)
|
||||||
|
{
|
||||||
|
GValue val = G_VALUE_INIT;
|
||||||
|
GString *string;
|
||||||
|
const struct gds_cell_statistics *cell_stat;
|
||||||
|
|
||||||
|
switch (param_id) {
|
||||||
|
case PROP_CELL_STAT:
|
||||||
|
cell_stat = (const struct gds_cell_statistics *)g_value_get_pointer(value);
|
||||||
|
g_value_init(&val, G_TYPE_STRING);
|
||||||
|
string = g_string_new_len("", 5);
|
||||||
|
if (cell_stat)
|
||||||
|
g_string_printf(string, "%zu (%zu) | %zu (%zu)", cell_stat->total_vertex_count,
|
||||||
|
cell_stat->vertex_count, cell_stat->total_gfx_count, cell_stat->gfx_count);
|
||||||
|
g_value_set_string(&val, string->str);
|
||||||
|
g_object_set_property(object, "text", &val);
|
||||||
|
g_value_unset(&val);
|
||||||
|
g_string_free(string, TRUE);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void cell_statistics_renderer_get_property(GObject *object,
|
||||||
|
guint param_id,
|
||||||
|
GValue *value,
|
||||||
|
GParamSpec *pspec)
|
||||||
|
{
|
||||||
|
(void)value;
|
||||||
|
|
||||||
|
switch (param_id) {
|
||||||
|
default:
|
||||||
|
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static GParamSpec *properties[PROP_COUNT];
|
||||||
|
|
||||||
|
void cell_statistics_renderer_class_init(CellStatisticsRendererClass *klass)
|
||||||
|
{
|
||||||
|
GObjectClass *oclass = G_OBJECT_CLASS(klass);
|
||||||
|
|
||||||
|
oclass->set_property = cell_statistics_renderer_set_property;
|
||||||
|
oclass->get_property = cell_statistics_renderer_get_property;
|
||||||
|
|
||||||
|
properties[PROP_CELL_STAT] = g_param_spec_pointer("cell-stat", "cell-stat",
|
||||||
|
"Cell statistics", G_PARAM_WRITABLE);
|
||||||
|
g_object_class_install_properties(oclass, PROP_COUNT, properties);
|
||||||
|
}
|
||||||
|
|
||||||
|
void cell_statistics_renderer_init(CellStatisticsRenderer *self)
|
||||||
|
{
|
||||||
|
(void)self;
|
||||||
|
}
|
||||||
|
|
||||||
|
GtkCellRenderer *cell_statistics_renderer_new(void)
|
||||||
|
{
|
||||||
|
return GTK_CELL_RENDERER(g_object_new(TYPE_GDS_RENDER_CELL_STAT_RENDERER, NULL));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @} */
|
102
command-line.c
102
command-line.c
@ -300,78 +300,89 @@ static void print_simple_stat(GList *lib_stat_list)
|
|||||||
int indentation_level = 0;
|
int indentation_level = 0;
|
||||||
GList *lib_iter;
|
GList *lib_iter;
|
||||||
GList *cell_iter;
|
GList *cell_iter;
|
||||||
const struct gds_lib_statistics *lib_stats;
|
const struct gds_library *lib;
|
||||||
const struct gds_cell_statistics *cell_stats;
|
const struct gds_cell *cell;
|
||||||
|
const struct gds_lib_statistics *lib_stat;
|
||||||
|
const struct gds_cell_statistics *cell_stat;
|
||||||
|
|
||||||
for (lib_iter = lib_stat_list; lib_iter; lib_iter = g_list_next(lib_iter)) {
|
for (lib_iter = lib_stat_list; lib_iter; lib_iter = g_list_next(lib_iter)) {
|
||||||
lib_stats = (const struct gds_lib_statistics *)lib_iter->data;
|
lib = (const struct gds_library *)lib_iter->data;
|
||||||
printf_indented(indentation_level, "Library %s\n", lib_stats->library->name);
|
lib_stat = &lib->stats;
|
||||||
|
printf_indented(indentation_level, "Library %s\n", lib->name);
|
||||||
indentation_level++;
|
indentation_level++;
|
||||||
|
|
||||||
for (cell_iter = lib_stats->cell_statistics; cell_iter; cell_iter = g_list_next(cell_iter)) {
|
for (cell_iter = lib->cells; cell_iter; cell_iter = g_list_next(cell_iter)) {
|
||||||
cell_stats = (const struct gds_cell_statistics *)cell_iter->data;
|
cell = (const struct gds_cell *)cell_iter->data;
|
||||||
printf_indented(indentation_level, "Cell %s\n", cell_stats->cell->name);
|
cell_stat = &cell->stats;
|
||||||
|
printf_indented(indentation_level, "Cell %s\n", cell->name);
|
||||||
indentation_level++;
|
indentation_level++;
|
||||||
printf_indented(indentation_level, "Reference count: %zu\n", cell_stats->reference_count);
|
printf_indented(indentation_level, "Reference count: %zu\n", cell_stat->reference_count);
|
||||||
printf_indented(indentation_level, "Graphics count: %zu\n", cell_stats->gfx_count);
|
printf_indented(indentation_level, "Graphics count: %zu\n", cell_stat->gfx_count);
|
||||||
printf_indented(indentation_level, "Vertex count: %zu\n", cell_stats->vertex_count);
|
printf_indented(indentation_level, "Total Graphics count: %zu\n", cell_stat->total_gfx_count);
|
||||||
|
printf_indented(indentation_level, "Vertex count: %zu\n", cell_stat->vertex_count);
|
||||||
|
printf_indented(indentation_level, "Total Vertex count: %zu\n", cell_stat->total_vertex_count);
|
||||||
printf_indented(indentation_level, "Unresolved children: %d\n",
|
printf_indented(indentation_level, "Unresolved children: %d\n",
|
||||||
cell_stats->cell->checks.unresolved_child_count);
|
cell->checks.unresolved_child_count);
|
||||||
printf_indented(indentation_level, "Reference loop: %s\n",
|
printf_indented(indentation_level, "Reference loop: %s\n",
|
||||||
cell_stats->cell->checks.affected_by_reference_loop ? "yes" : "no");
|
cell->checks.affected_by_reference_loop ? "yes" : "no");
|
||||||
|
|
||||||
indentation_level--;
|
indentation_level--;
|
||||||
}
|
}
|
||||||
printf_indented(indentation_level, "Cell count: %zu\n", lib_stats->cell_count);
|
printf_indented(indentation_level, "Cell count: %zu\n", lib_stat->cell_count);
|
||||||
printf_indented(indentation_level, "Reference count: %zu\n", lib_stats->reference_count);
|
printf_indented(indentation_level, "Reference count: %zu\n", lib_stat->reference_count);
|
||||||
printf_indented(indentation_level, "Graphics count: %zu\n", lib_stats->gfx_count);
|
printf_indented(indentation_level, "Graphics count: %zu\n", lib_stat->gfx_count);
|
||||||
printf_indented(indentation_level, "Vertex count: %zu\n", lib_stats->vertex_count);
|
printf_indented(indentation_level, "Vertex count: %zu\n", lib_stat->vertex_count);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void table_stat_create_cell_row(struct gds_cell *cell, ft_table_t *tab)
|
||||||
|
{
|
||||||
|
ft_printf_ln(tab, "%s|%s|%zu|%zu|%zu|%zu|%zu|%d|%s",
|
||||||
|
cell->parent_library->name,
|
||||||
|
cell->name,
|
||||||
|
cell->stats.gfx_count,
|
||||||
|
cell->stats.total_gfx_count,
|
||||||
|
cell->stats.vertex_count,
|
||||||
|
cell->stats.total_vertex_count,
|
||||||
|
cell->stats.reference_count,
|
||||||
|
cell->checks.unresolved_child_count,
|
||||||
|
cell->checks.affected_by_reference_loop ? "yes" : "no");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void print_table_stat(GList *lib_stat_list)
|
static void table_stat_table_for_lib(struct gds_library *lib, ft_table_t *tab)
|
||||||
|
{
|
||||||
|
ft_printf_ln(tab, "%s|%zu|%zu|-|%zu|-|%zu|-|-",
|
||||||
|
lib->name,
|
||||||
|
lib->stats.cell_count,
|
||||||
|
lib->stats.gfx_count,
|
||||||
|
lib->stats.vertex_count,
|
||||||
|
lib->stats.reference_count);
|
||||||
|
g_list_foreach(lib->cells, (GFunc)table_stat_create_cell_row, tab);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void print_table_stat(GList *lib_list)
|
||||||
{
|
{
|
||||||
ft_table_t *table;
|
ft_table_t *table;
|
||||||
GList *lib_stat_iter;
|
|
||||||
GList *cell_stat_iter;
|
|
||||||
const struct gds_lib_statistics *lib_stats;
|
|
||||||
const struct gds_cell_statistics *cell_stats;
|
|
||||||
|
|
||||||
table = ft_create_table();
|
table = ft_create_table();
|
||||||
|
|
||||||
ft_set_cell_prop(table, 0, FT_ANY_COLUMN, FT_CPROP_ROW_TYPE, FT_ROW_HEADER);
|
ft_set_cell_prop(table, 0, FT_ANY_COLUMN, FT_CPROP_ROW_TYPE, FT_ROW_HEADER);
|
||||||
|
ft_write_ln(table, "Library", "Cell", "GFX", "GFX+", "Vertices", "Vertices+", "Refs", "Unresolved Refs", "Loops");
|
||||||
|
|
||||||
ft_set_cell_prop(table, 0, FT_ANY_COLUMN, FT_CPROP_ROW_TYPE, FT_ROW_HEADER);
|
g_list_foreach(lib_list, (GFunc)table_stat_table_for_lib, table);
|
||||||
ft_write_ln(table, "Library", "Cell", "GFX", "Vertices", "Refs", "Unresolved Refs", "Loops");
|
|
||||||
for (lib_stat_iter = lib_stat_list; lib_stat_iter; lib_stat_iter = g_list_next(lib_stat_iter)) {
|
|
||||||
lib_stats = (const struct gds_lib_statistics *)lib_stat_iter->data;
|
|
||||||
ft_printf_ln(table, "%s|%zu|%zu|%zu|%zu|-|-", lib_stats->library->name, lib_stats->cell_count,
|
|
||||||
lib_stats->gfx_count, lib_stats->vertex_count, lib_stats->reference_count);
|
|
||||||
for (cell_stat_iter = lib_stats->cell_statistics; cell_stat_iter;
|
|
||||||
cell_stat_iter = g_list_next(cell_stat_iter)) {
|
|
||||||
cell_stats = (const struct gds_cell_statistics *)cell_stat_iter->data;
|
|
||||||
ft_printf_ln(table, "%s|%s|%zu|%zu|%zu|%d|%d", lib_stats->library->name, cell_stats->cell->name,
|
|
||||||
cell_stats->gfx_count, cell_stats->vertex_count, cell_stats->reference_count,
|
|
||||||
cell_stats->cell->checks.unresolved_child_count,
|
|
||||||
cell_stats->cell->checks.affected_by_reference_loop);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
printf("%s\n", ft_to_string(table));
|
printf("%s\n", ft_to_string(table));
|
||||||
ft_destroy_table(table);
|
ft_destroy_table(table);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void print_statistics(enum analysis_format format, GList *lib_stat_list)
|
static void print_statistics(enum analysis_format format, GList *lib_list)
|
||||||
{
|
{
|
||||||
switch (format) {
|
switch (format) {
|
||||||
case ANA_FORMAT_PRETTY:
|
case ANA_FORMAT_PRETTY:
|
||||||
print_table_stat(lib_stat_list);
|
print_table_stat(lib_list);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
print_simple_stat(lib_stat_list);
|
print_simple_stat(lib_list);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -402,7 +413,6 @@ int command_line_analyze_lib(const char *format, const char *gds_name)
|
|||||||
int res;
|
int res;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
GList *lib_iter;
|
GList *lib_iter;
|
||||||
GList *lib_stat_list = NULL;
|
|
||||||
|
|
||||||
g_return_val_if_fail(gds_name, -1002);
|
g_return_val_if_fail(gds_name, -1002);
|
||||||
|
|
||||||
@ -446,14 +456,8 @@ int command_line_analyze_lib(const char *format, const char *gds_name)
|
|||||||
goto return_clear_libs;
|
goto return_clear_libs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
print_statistics(fmt, lib_list);
|
||||||
|
|
||||||
gds_statistics_calc_library(lib_list, &lib_stat_list);
|
|
||||||
|
|
||||||
print_statistics(fmt, lib_stat_list);
|
|
||||||
|
|
||||||
/* Clean up the whole mess */
|
|
||||||
|
|
||||||
gds_statistics_free_lib_stat_list(&lib_stat_list);
|
|
||||||
return_clear_libs:
|
return_clear_libs:
|
||||||
clear_lib_list(&lib_list);
|
clear_lib_list(&lib_list);
|
||||||
return_val:
|
return_val:
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
#include <gds-render/layer/layer-selector.h>
|
#include <gds-render/layer/layer-selector.h>
|
||||||
#include <gds-render/widgets/activity-bar.h>
|
#include <gds-render/widgets/activity-bar.h>
|
||||||
#include <gds-render/cell-selector/lib-cell-renderer.h>
|
#include <gds-render/cell-selector/lib-cell-renderer.h>
|
||||||
|
#include <gds-render/cell-selector/cell-statistics-renderer.h>
|
||||||
#include <gds-render/output-renderers/latex-renderer.h>
|
#include <gds-render/output-renderers/latex-renderer.h>
|
||||||
#include <gds-render/output-renderers/cairo-renderer.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>
|
||||||
@ -48,6 +49,7 @@ enum cell_store_columns {
|
|||||||
CELL_SEL_LIBRARY = 0,
|
CELL_SEL_LIBRARY = 0,
|
||||||
CELL_SEL_CELL,
|
CELL_SEL_CELL,
|
||||||
CELL_SEL_CELL_ERROR_STATE, /**< Used for cell color and selectability */
|
CELL_SEL_CELL_ERROR_STATE, /**< Used for cell color and selectability */
|
||||||
|
CELL_SEL_STAT,
|
||||||
CELL_SEL_COLUMN_COUNT /**< @brief Not a column. Used to determine count of columns */
|
CELL_SEL_COLUMN_COUNT /**< @brief Not a column. Used to determine count of columns */
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -219,10 +221,11 @@ int gds_render_gui_setup_cell_selector(GdsRenderGui *self)
|
|||||||
{
|
{
|
||||||
GtkCellRenderer *render_cell;
|
GtkCellRenderer *render_cell;
|
||||||
GtkCellRenderer *render_lib;
|
GtkCellRenderer *render_lib;
|
||||||
|
GtkCellRenderer *render_vertex_count;
|
||||||
GtkTreeViewColumn *column;
|
GtkTreeViewColumn *column;
|
||||||
|
|
||||||
self->cell_tree_store = gtk_tree_store_new(CELL_SEL_COLUMN_COUNT, G_TYPE_POINTER,
|
self->cell_tree_store = gtk_tree_store_new(CELL_SEL_COLUMN_COUNT, G_TYPE_POINTER,
|
||||||
G_TYPE_POINTER, G_TYPE_UINT);
|
G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_POINTER);
|
||||||
|
|
||||||
/* Searching */
|
/* Searching */
|
||||||
self->cell_filter = GTK_TREE_MODEL_FILTER(
|
self->cell_filter = GTK_TREE_MODEL_FILTER(
|
||||||
@ -238,6 +241,7 @@ int gds_render_gui_setup_cell_selector(GdsRenderGui *self)
|
|||||||
|
|
||||||
render_cell = lib_cell_renderer_new();
|
render_cell = lib_cell_renderer_new();
|
||||||
render_lib = lib_cell_renderer_new();
|
render_lib = lib_cell_renderer_new();
|
||||||
|
render_vertex_count = cell_statistics_renderer_new();
|
||||||
|
|
||||||
column = gtk_tree_view_column_new_with_attributes(_("Library"), render_lib, "gds-lib", CELL_SEL_LIBRARY, NULL);
|
column = gtk_tree_view_column_new_with_attributes(_("Library"), render_lib, "gds-lib", CELL_SEL_LIBRARY, NULL);
|
||||||
gtk_tree_view_append_column(self->cell_tree_view, column);
|
gtk_tree_view_append_column(self->cell_tree_view, column);
|
||||||
@ -246,6 +250,10 @@ int gds_render_gui_setup_cell_selector(GdsRenderGui *self)
|
|||||||
"error-level", CELL_SEL_CELL_ERROR_STATE, NULL);
|
"error-level", CELL_SEL_CELL_ERROR_STATE, NULL);
|
||||||
gtk_tree_view_append_column(self->cell_tree_view, column);
|
gtk_tree_view_append_column(self->cell_tree_view, column);
|
||||||
|
|
||||||
|
column = gtk_tree_view_column_new_with_attributes(_("Vertex | GFX Count"), render_vertex_count, "cell-stat", CELL_SEL_STAT,
|
||||||
|
NULL);
|
||||||
|
gtk_tree_view_append_column(self->cell_tree_view, column);
|
||||||
|
|
||||||
/* Callback for selection
|
/* Callback for selection
|
||||||
* This prevents selecting a library
|
* This prevents selecting a library
|
||||||
*/
|
*/
|
||||||
@ -255,6 +263,10 @@ int gds_render_gui_setup_cell_selector(GdsRenderGui *self)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const struct gds_cell_statistics cc = {
|
||||||
|
.vertex_count = 12,
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Callback function of Load GDS button
|
* @brief Callback function of Load GDS button
|
||||||
* @param button
|
* @param button
|
||||||
@ -353,6 +365,7 @@ static void on_load_gds(gpointer button, gpointer user)
|
|||||||
CELL_SEL_CELL, gds_c,
|
CELL_SEL_CELL, gds_c,
|
||||||
CELL_SEL_CELL_ERROR_STATE, cell_error_level,
|
CELL_SEL_CELL_ERROR_STATE, cell_error_level,
|
||||||
CELL_SEL_LIBRARY, gds_c->parent_library,
|
CELL_SEL_LIBRARY, gds_c->parent_library,
|
||||||
|
CELL_SEL_STAT, &gds_c->stats,
|
||||||
-1);
|
-1);
|
||||||
} /* for cells */
|
} /* for cells */
|
||||||
} /* for libraries */
|
} /* for libraries */
|
||||||
|
@ -43,6 +43,7 @@
|
|||||||
#include <glib/gi18n.h>
|
#include <glib/gi18n.h>
|
||||||
|
|
||||||
#include <gds-render/gds-utils/gds-parser.h>
|
#include <gds-render/gds-utils/gds-parser.h>
|
||||||
|
#include <gds-render/gds-utils/gds-statistics.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Default units assumed for library.
|
* @brief Default units assumed for library.
|
||||||
@ -279,8 +280,13 @@ static GList *append_library(GList *curr_list, const struct gds_library_parsing_
|
|||||||
lib->cell_names = NULL;
|
lib->cell_names = NULL;
|
||||||
/* Copy the settings into the library */
|
/* Copy the settings into the library */
|
||||||
memcpy(&lib->parsing_opts, opts, sizeof(struct gds_library_parsing_opts));
|
memcpy(&lib->parsing_opts, opts, sizeof(struct gds_library_parsing_opts));
|
||||||
} else
|
lib->stats.cell_count = 0;
|
||||||
|
lib->stats.gfx_count = 0;
|
||||||
|
lib->stats.reference_count = 0;
|
||||||
|
lib->stats.vertex_count = 0;
|
||||||
|
} else {
|
||||||
return NULL;
|
return NULL;
|
||||||
|
}
|
||||||
if (library_ptr)
|
if (library_ptr)
|
||||||
*library_ptr = lib;
|
*library_ptr = lib;
|
||||||
|
|
||||||
@ -356,6 +362,10 @@ static GList *append_cell(GList *curr_list, struct gds_cell **cell_ptr)
|
|||||||
cell->parent_library = NULL;
|
cell->parent_library = NULL;
|
||||||
cell->checks.unresolved_child_count = GDS_CELL_CHECK_NOT_RUN;
|
cell->checks.unresolved_child_count = GDS_CELL_CHECK_NOT_RUN;
|
||||||
cell->checks.affected_by_reference_loop = GDS_CELL_CHECK_NOT_RUN;
|
cell->checks.affected_by_reference_loop = GDS_CELL_CHECK_NOT_RUN;
|
||||||
|
cell->stats.reference_count = 0;
|
||||||
|
cell->stats.total_vertex_count = 0;
|
||||||
|
cell->stats.gfx_count = 0;
|
||||||
|
cell->stats.vertex_count = 0;
|
||||||
} else
|
} else
|
||||||
return NULL;
|
return NULL;
|
||||||
/* return cell */
|
/* return cell */
|
||||||
@ -605,6 +615,15 @@ static void scan_library_references(gpointer library_list_item, gpointer user)
|
|||||||
g_list_foreach(lib->cells, scan_cell_references_and_polygons, lib);
|
g_list_foreach(lib->cells, scan_cell_references_and_polygons, lib);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void calc_library_stats(gpointer library_list_item, gpointer user)
|
||||||
|
{
|
||||||
|
struct gds_library *lib = (struct gds_library *)library_list_item;
|
||||||
|
(void)user;
|
||||||
|
|
||||||
|
GDS_INF("Calculating stats for Library: %s\n", lib->name);
|
||||||
|
gds_statistics_calc_cummulative_counts_in_lib(lib);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief gds_parse_date
|
* @brief gds_parse_date
|
||||||
* @param buffer Buffer that contains the GDS Date field
|
* @param buffer Buffer that contains the GDS Date field
|
||||||
@ -686,6 +705,7 @@ static void convert_aref_to_sref(struct gds_cell_array_instance *aref, struct gd
|
|||||||
for (row = 0; row < aref->rows; row++) {
|
for (row = 0; row < aref->rows; row++) {
|
||||||
/* Create new instance for this row/column and configure data */
|
/* Create new instance for this row/column and configure data */
|
||||||
container_cell->child_cells = append_cell_ref(container_cell->child_cells, &sref_inst);
|
container_cell->child_cells = append_cell_ref(container_cell->child_cells, &sref_inst);
|
||||||
|
container_cell->stats.reference_count++;
|
||||||
if (!sref_inst) {
|
if (!sref_inst) {
|
||||||
GDS_ERROR("Appending cell ref failed!");
|
GDS_ERROR("Appending cell ref failed!");
|
||||||
continue;
|
continue;
|
||||||
@ -867,6 +887,7 @@ int parse_gds_from_file(const char *filename, GList **library_list,
|
|||||||
}
|
}
|
||||||
current_cell->child_cells = append_cell_ref(current_cell->child_cells,
|
current_cell->child_cells = append_cell_ref(current_cell->child_cells,
|
||||||
¤t_s_reference);
|
¤t_s_reference);
|
||||||
|
current_cell->stats.reference_count++;
|
||||||
if (current_cell->child_cells == NULL) {
|
if (current_cell->child_cells == NULL) {
|
||||||
GDS_ERROR("Memory allocation failed");
|
GDS_ERROR("Memory allocation failed");
|
||||||
run = -4;
|
run = -4;
|
||||||
@ -896,6 +917,9 @@ int parse_gds_from_file(const char *filename, GList **library_list,
|
|||||||
: (current_graphics->gfx_type == GRAPHIC_PATH ? "path"
|
: (current_graphics->gfx_type == GRAPHIC_PATH ? "path"
|
||||||
: "box")));
|
: "box")));
|
||||||
current_graphics = NULL;
|
current_graphics = NULL;
|
||||||
|
if (current_cell) {
|
||||||
|
current_cell->stats.gfx_count++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (current_s_reference != NULL) {
|
if (current_s_reference != NULL) {
|
||||||
GDS_INF("\tLeaving Reference\n");
|
GDS_INF("\tLeaving Reference\n");
|
||||||
@ -1045,7 +1069,9 @@ int parse_gds_from_file(const char *filename, GList **library_list,
|
|||||||
current_graphics->vertices =
|
current_graphics->vertices =
|
||||||
append_vertex(current_graphics->vertices, x, y);
|
append_vertex(current_graphics->vertices, x, y);
|
||||||
GDS_INF("\t\tSet coordinate: %d/%d\n", x, y);
|
GDS_INF("\t\tSet coordinate: %d/%d\n", x, y);
|
||||||
|
if (current_cell) {
|
||||||
|
current_cell->stats.vertex_count++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else if (current_a_reference) {
|
} else if (current_a_reference) {
|
||||||
for (i = 0; i < 3; i++) {
|
for (i = 0; i < 3; i++) {
|
||||||
@ -1161,8 +1187,13 @@ int parse_gds_from_file(const char *filename, GList **library_list,
|
|||||||
if (!run) {
|
if (!run) {
|
||||||
/* Iterate and find references to cells */
|
/* Iterate and find references to cells */
|
||||||
g_list_foreach(lib_list, scan_library_references, NULL);
|
g_list_foreach(lib_list, scan_library_references, NULL);
|
||||||
|
|
||||||
|
/* Calculate lib stats and cummulative total counts */
|
||||||
|
g_list_foreach(lib_list, calc_library_stats, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
*library_list = lib_list;
|
*library_list = lib_list;
|
||||||
|
|
||||||
free(workbuff);
|
free(workbuff);
|
||||||
|
@ -32,105 +32,61 @@
|
|||||||
* @{
|
* @{
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void gds_statistics_calc_cell(const struct gds_cell *cell, struct gds_cell_statistics *stat)
|
#define MAX_RECURSION_DEPTH (1024)
|
||||||
|
|
||||||
|
static void calculate_vertex_gfx_count_cell(struct gds_cell *cell, unsigned int recursion_depth)
|
||||||
|
{
|
||||||
|
GList *cell_iter;
|
||||||
|
struct gds_cell_instance *cell_ref;
|
||||||
|
struct gds_cell *sub_cell;
|
||||||
|
|
||||||
|
g_return_if_fail(cell);
|
||||||
|
|
||||||
|
/* Check if cell has already been calculated */
|
||||||
|
if (cell->stats.total_gfx_count && cell->stats.total_vertex_count) {
|
||||||
|
/* Return. This cell and all of its subcells have been calculated */
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Update with own vertex / GFX count */
|
||||||
|
cell->stats.total_vertex_count = cell->stats.vertex_count;
|
||||||
|
cell->stats.total_gfx_count = cell->stats.gfx_count;
|
||||||
|
|
||||||
|
/* Do not analyze further, if maximum recursion depth is reached */
|
||||||
|
if (!recursion_depth)
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (cell_iter = cell->child_cells; cell_iter; cell_iter = g_list_next(cell_iter)) {
|
||||||
|
/* Scan all subcells recursively, if there are any */
|
||||||
|
|
||||||
|
cell_ref = (struct gds_cell_instance *)cell_iter->data;
|
||||||
|
sub_cell = (struct gds_cell *)cell_ref->cell_ref;
|
||||||
|
|
||||||
|
calculate_vertex_gfx_count_cell(sub_cell, recursion_depth - 1);
|
||||||
|
|
||||||
|
/* Increment count */
|
||||||
|
cell->stats.total_vertex_count += sub_cell->stats.total_vertex_count;
|
||||||
|
cell->stats.total_gfx_count += sub_cell->stats.total_vertex_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void gds_statistics_calc_cummulative_counts_in_lib(struct gds_library *lib)
|
||||||
{
|
{
|
||||||
GList *iter;
|
|
||||||
GList *vertex_iter;
|
|
||||||
struct gds_graphics *gfx;
|
|
||||||
|
|
||||||
if (!stat) {
|
|
||||||
fprintf(stderr, "Internal pointer error.\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
stat->cell = NULL;
|
|
||||||
stat->gfx_count = 0;
|
|
||||||
stat->reference_count = 0;
|
|
||||||
stat->vertex_count = 0;
|
|
||||||
|
|
||||||
if (!cell) {
|
|
||||||
fprintf(stderr, "Internal pointer error.\n");
|
|
||||||
return;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
stat->cell = cell;
|
|
||||||
|
|
||||||
/* Sum up references */
|
|
||||||
for (iter = cell->child_cells; iter; iter = g_list_next(iter))
|
|
||||||
stat->reference_count++;
|
|
||||||
|
|
||||||
/* Sum up graphics objects and vertices */
|
|
||||||
for (iter = cell->graphic_objs; iter; iter = g_list_next(iter)) {
|
|
||||||
gfx = (struct gds_graphics *)iter->data;
|
|
||||||
stat->gfx_count++;
|
|
||||||
for (vertex_iter = gfx->vertices; vertex_iter; vertex_iter = g_list_next(vertex_iter)) {
|
|
||||||
stat->vertex_count++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void gds_statistics_calc_library(GList *library_list, GList **lib_stat_list)
|
|
||||||
{
|
|
||||||
|
|
||||||
GList *lib_iter;
|
|
||||||
GList *cell_iter;
|
GList *cell_iter;
|
||||||
struct gds_lib_statistics *lib_stats;
|
|
||||||
struct gds_cell_statistics *cell_stats;
|
|
||||||
struct gds_library *gds_lib;
|
|
||||||
struct gds_cell *cell;
|
struct gds_cell *cell;
|
||||||
|
|
||||||
/* Go through each library/cell and generate statistics */
|
g_return_if_fail(lib);
|
||||||
for (lib_iter = library_list; lib_iter; lib_iter = g_list_next(lib_iter)) {
|
|
||||||
gds_lib = (struct gds_library *)lib_iter->data;
|
|
||||||
lib_stats = (struct gds_lib_statistics *)malloc(sizeof(struct gds_lib_statistics));
|
|
||||||
if (!lib_stats) {
|
|
||||||
g_error("Failed allocating memory");
|
|
||||||
}
|
|
||||||
|
|
||||||
lib_stats->library = gds_lib;
|
for (cell_iter = lib->cells; cell_iter; cell_iter = g_list_next(cell_iter)) {
|
||||||
lib_stats->gfx_count = 0;
|
|
||||||
lib_stats->cell_count = 0;
|
|
||||||
lib_stats->reference_count = 0;
|
|
||||||
lib_stats->vertex_count = 0;
|
|
||||||
lib_stats->cell_statistics = NULL;
|
|
||||||
|
|
||||||
for (cell_iter = gds_lib->cells; cell_iter; cell_iter = g_list_next(cell_iter)) {
|
|
||||||
cell = (struct gds_cell *)cell_iter->data;
|
cell = (struct gds_cell *)cell_iter->data;
|
||||||
cell_stats = (struct gds_cell_statistics *)malloc(sizeof(struct gds_cell_statistics));
|
calculate_vertex_gfx_count_cell(cell, MAX_RECURSION_DEPTH);
|
||||||
lib_stats->cell_count++;
|
lib->stats.vertex_count += cell->stats.vertex_count;
|
||||||
gds_statistics_calc_cell(cell, cell_stats);
|
lib->stats.cell_count++;
|
||||||
lib_stats->gfx_count += cell_stats->gfx_count;
|
lib->stats.gfx_count += cell->stats.gfx_count;
|
||||||
lib_stats->reference_count += cell_stats->reference_count;
|
lib->stats.reference_count += cell->stats.reference_count;
|
||||||
lib_stats->vertex_count += cell_stats->vertex_count;
|
|
||||||
lib_stats->cell_statistics = g_list_append(lib_stats->cell_statistics, cell_stats);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
*lib_stat_list = g_list_append(*lib_stat_list, lib_stats);
|
|
||||||
} /* for lib */
|
|
||||||
}
|
|
||||||
|
|
||||||
static void free_stat_object(gpointer stat_obj)
|
|
||||||
{
|
|
||||||
if (stat_obj)
|
|
||||||
free(stat_obj);
|
|
||||||
}
|
|
||||||
|
|
||||||
void gds_statistics_free_lib_stat_list(GList **lib_stat_list)
|
|
||||||
{
|
|
||||||
GList *lib_iter;
|
|
||||||
struct gds_lib_statistics *lib_stats;
|
|
||||||
|
|
||||||
g_return_if_fail(lib_stat_list);
|
|
||||||
g_return_if_fail(*lib_stat_list);
|
|
||||||
|
|
||||||
for (lib_iter = *lib_stat_list; lib_iter; lib_iter = g_list_next(lib_iter)) {
|
|
||||||
lib_stats = (struct gds_lib_statistics *) lib_iter->data;
|
|
||||||
g_list_free_full(lib_stats->cell_statistics,
|
|
||||||
free_stat_object);
|
|
||||||
}
|
|
||||||
g_list_free_full(*lib_stat_list, free_stat_object);
|
|
||||||
*lib_stat_list = NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
56
include/gds-render/cell-selector/cell-statistics-renderer.h
Normal file
56
include/gds-render/cell-selector/cell-statistics-renderer.h
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
/*
|
||||||
|
* GDSII-Converter
|
||||||
|
* Copyright (C) 2022 Mario Hüttel <mario.huettel@gmx.net>
|
||||||
|
*
|
||||||
|
* This file is part of GDSII-Converter.
|
||||||
|
*
|
||||||
|
* GDSII-Converter is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* GDSII-Converter is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with GDSII-Converter. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @file cell-statistics-renderer.h
|
||||||
|
* @brief Header file for the CellStatisticsRenderer GObject Class
|
||||||
|
* @author Mario Hüttel <mario.huettel@gmx.net>
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @addtogroup CellStatisticsRenderer
|
||||||
|
* @{
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _CELL_STATISTICS_RENDERER_H_
|
||||||
|
#define _CELL_STATISTICS_RENDERER_H_
|
||||||
|
|
||||||
|
#include <gtk/gtk.h>
|
||||||
|
#include <gds-render/gds-utils/gds-statistics.h>
|
||||||
|
|
||||||
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
|
G_DECLARE_FINAL_TYPE(CellStatisticsRenderer, cell_statistics_renderer, GDS_RENDER, CELL_STAT_RENDERER, GtkCellRendererText)
|
||||||
|
#define TYPE_GDS_RENDER_CELL_STAT_RENDERER (cell_statistics_renderer_get_type())
|
||||||
|
|
||||||
|
typedef struct _CellStatisticsRenderer {
|
||||||
|
GtkCellRendererText super;
|
||||||
|
} CellStatisticsRenderer;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief New Cell statistics renderer
|
||||||
|
* @return GObject
|
||||||
|
*/
|
||||||
|
GtkCellRenderer *cell_statistics_renderer_new(void);
|
||||||
|
|
||||||
|
G_END_DECLS
|
||||||
|
|
||||||
|
#endif /* _CELL_STATISTICS_RENDERER_H_ */
|
||||||
|
|
||||||
|
/** @} */
|
@ -35,43 +35,7 @@
|
|||||||
|
|
||||||
#include <gds-render/gds-utils/gds-types.h>
|
#include <gds-render/gds-utils/gds-types.h>
|
||||||
|
|
||||||
struct gds_cell_statistics {
|
void gds_statistics_calc_cummulative_counts_in_lib(struct gds_library *lib);
|
||||||
size_t gfx_count;
|
|
||||||
size_t vertex_count;
|
|
||||||
size_t reference_count;
|
|
||||||
const struct gds_cell *cell;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct gds_lib_statistics {
|
|
||||||
size_t gfx_count;
|
|
||||||
size_t vertex_count;
|
|
||||||
size_t reference_count;
|
|
||||||
size_t cell_count;
|
|
||||||
GList *cell_statistics;
|
|
||||||
const struct gds_library *library;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Calculate statistics of a single cell
|
|
||||||
* @param[in] cell GDS cell
|
|
||||||
* @param[out] stat Statistics output
|
|
||||||
*/
|
|
||||||
void gds_statistics_calc_cell(const struct gds_cell *cell,
|
|
||||||
struct gds_cell_statistics *stat);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Calc statistic information for library
|
|
||||||
* @param[in] library_list List containing all libraries
|
|
||||||
* @param[in,out] lib_stat_list Statistic list
|
|
||||||
*/
|
|
||||||
void gds_statistics_calc_library(GList * library_list,
|
|
||||||
GList ** lib_stat_list);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Free library statistics GList
|
|
||||||
* @param[in,out] lib_stat_list List to free
|
|
||||||
*/
|
|
||||||
void gds_statistics_free_lib_stat_list(GList ** lib_stat_list);
|
|
||||||
|
|
||||||
/** @} */
|
/** @} */
|
||||||
|
|
||||||
|
@ -65,6 +65,22 @@ struct gds_point {
|
|||||||
int y;
|
int y;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct gds_cell_statistics {
|
||||||
|
size_t gfx_count;
|
||||||
|
size_t vertex_count;
|
||||||
|
size_t total_vertex_count;
|
||||||
|
size_t total_gfx_count;
|
||||||
|
size_t reference_count;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct gds_lib_statistics {
|
||||||
|
size_t gfx_count;
|
||||||
|
size_t vertex_count;
|
||||||
|
size_t reference_count;
|
||||||
|
size_t cell_count;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Stores the result of the cell checks.
|
* @brief Stores the result of the cell checks.
|
||||||
*/
|
*/
|
||||||
@ -127,6 +143,7 @@ struct gds_cell {
|
|||||||
GList *graphic_objs; /**< @brief List of #gds_graphics */
|
GList *graphic_objs; /**< @brief List of #gds_graphics */
|
||||||
struct gds_library *parent_library; /**< @brief Pointer to parent library */
|
struct gds_library *parent_library; /**< @brief Pointer to parent library */
|
||||||
struct gds_cell_checks checks; /**< @brief Checking results */
|
struct gds_cell_checks checks; /**< @brief Checking results */
|
||||||
|
struct gds_cell_statistics stats; /**< @brief Optional statistic info */
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -147,8 +164,10 @@ struct gds_library {
|
|||||||
double unit_in_meters; /**< Length of a database unit in meters */
|
double unit_in_meters; /**< Length of a database unit in meters */
|
||||||
GList *cells; /**< List of #gds_cell that contains all cells in this library*/
|
GList *cells; /**< List of #gds_cell that contains all cells in this library*/
|
||||||
GList *cell_names /**< List of strings that contains all cell names */;
|
GList *cell_names /**< List of strings that contains all cell names */;
|
||||||
|
struct gds_lib_statistics stats;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/** @} */
|
/** @} */
|
||||||
|
|
||||||
#endif /* __GDS_TYPES_H__ */
|
#endif /* __GDS_TYPES_H__ */
|
||||||
|
Loading…
Reference in New Issue
Block a user