Compare commits

..

No commits in common. "4c0df5638638f5f18bc3b9aa7c60a74b307a05cb" and "67f9d9b4ee228bc14bbb55c3ae463c6f3d5f4cb0" have entirely different histories.

15 changed files with 13 additions and 18 deletions

View File

@ -16,7 +16,7 @@ add_definitions(${GLIB2_CFLAGS_OTHER})
aux_source_directory("widgets" LAYER_SOURCES) aux_source_directory("widgets" LAYER_SOURCES)
aux_source_directory("tree-renderer" RENDERER_SOURCES) aux_source_directory("tree-renderer" RENDERER_SOURCES)
aux_source_directory("gds-utils" GDS_SOURCES) aux_source_directory("gds-parser" PARSER_SOURCES)
aux_source_directory("latex-output" LATEX_SOURCES) aux_source_directory("latex-output" LATEX_SOURCES)
aux_source_directory("cairo-output" CAIRO_SOURCES) aux_source_directory("cairo-output" CAIRO_SOURCES)
aux_source_directory("trigonometric" TRIG_SOURCES) aux_source_directory("trigonometric" TRIG_SOURCES)
@ -27,7 +27,7 @@ set(SOURCE
${SOURCE} ${SOURCE}
${LAYER_SOURCES} ${LAYER_SOURCES}
${RENDERER_SOURCES} ${RENDERER_SOURCES}
${GDS_SOURCES} ${PARSER_SOURCES}
${LATEX_SOURCES} ${LATEX_SOURCES}
${CAIRO_SOURCES} ${CAIRO_SOURCES}
${TRIG_SOURCES} ${TRIG_SOURCES}

View File

@ -25,7 +25,7 @@
#define __CAIRO_OUTPUT_H__ #define __CAIRO_OUTPUT_H__
#include "../layer/layer-info.h" #include "../layer/layer-info.h"
#include "../gds-utils/gds-types.h" #include "../gds-parser/gds-types.h"
/** @addtogroup Cairo-Renderer /** @addtogroup Cairo-Renderer
* @{ * @{

View File

@ -30,13 +30,13 @@
#include <stdio.h> #include <stdio.h>
#include "command-line.h" #include "command-line.h"
#include "gds-utils/gds-parser.h" #include "gds-parser/gds-parser.h"
#include "mapping-parser.h" #include "mapping-parser.h"
#include "layer/layer-info.h" #include "layer/layer-info.h"
#include "cairo-output/cairo-output.h" #include "cairo-output/cairo-output.h"
#include "latex-output/latex-output.h" #include "latex-output/latex-output.h"
#include "external-renderer.h" #include "external-renderer.h"
#include "gds-utils/gds-tree-checker.h" #include "gds-parser/gds-tree-checker.h"
/** /**
* @brief Delete layer_info and free nem element. * @brief Delete layer_info and free nem element.

View File

@ -31,7 +31,7 @@
#ifndef _EXTERNAL_RENDERER_H_ #ifndef _EXTERNAL_RENDERER_H_
#define _EXTERNAL_RENDERER_H_ #define _EXTERNAL_RENDERER_H_
#include "gds-utils/gds-types.h" #include "gds-parser/gds-types.h"
#include <glib.h> #include <glib.h>
/** /**

View File

@ -29,7 +29,7 @@
#include "gds-render-gui.h" #include "gds-render-gui.h"
#include <stdio.h> #include <stdio.h>
#include "gds-utils/gds-parser.h" #include "gds-parser/gds-parser.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "layer/layer-selector.h" #include "layer/layer-selector.h"
#include "tree-renderer/tree-store.h" #include "tree-renderer/tree-store.h"
@ -39,7 +39,7 @@
#include "trigonometric/cell-trigonometrics.h" #include "trigonometric/cell-trigonometrics.h"
#include "version/version.h" #include "version/version.h"
#include "tree-renderer/lib-cell-renderer.h" #include "tree-renderer/lib-cell-renderer.h"
#include "gds-utils/gds-tree-checker.h" #include "gds-parser/gds-tree-checker.h"
enum gds_render_gui_signal_sig_ids {SIGNAL_WINDOW_CLOSED = 0, SIGNAL_COUNT}; enum gds_render_gui_signal_sig_ids {SIGNAL_WINDOW_CLOSED = 0, SIGNAL_COUNT};

View File

@ -31,7 +31,7 @@
* @{ * @{
*/ */
#include "../gds-utils/gds-types.h" #include "../gds-parser/gds-types.h"
#include <glib.h> #include <glib.h>
#include <stdio.h> #include <stdio.h>
#include "../layer/layer-info.h" #include "../layer/layer-info.h"

View File

@ -30,7 +30,7 @@
#include "layer-selector.h" #include "layer-selector.h"
#include "layer-info.h" #include "layer-info.h"
#include "../gds-utils/gds-parser.h" #include "../gds-parser/gds-parser.h"
#include "../widgets/layer-element.h" #include "../widgets/layer-element.h"
#include "../mapping-parser.h" #include "../mapping-parser.h"
#include <glib.h> #include <glib.h>

View File

@ -18,7 +18,7 @@
*/ */
#include "lib-cell-renderer.h" #include "lib-cell-renderer.h"
#include "../gds-utils/gds-types.h" #include "../gds-parser/gds-types.h"
G_DEFINE_TYPE(LibCellRenderer, lib_cell_renderer, GTK_TYPE_CELL_RENDERER_TEXT) G_DEFINE_TYPE(LibCellRenderer, lib_cell_renderer, GTK_TYPE_CELL_RENDERER_TEXT)

View File

@ -30,7 +30,7 @@
#include "tree-store.h" #include "tree-store.h"
#include "lib-cell-renderer.h" #include "lib-cell-renderer.h"
#include "../gds-utils/gds-types.h" #include "../gds-parser/gds-types.h"
/** /**
* @brief this function olny allows cells to be selected * @brief this function olny allows cells to be selected
@ -51,9 +51,6 @@ static gboolean tree_sel_func(GtkTreeSelection *selection,
struct gds_cell *cell; struct gds_cell *cell;
unsigned int error_level; unsigned int error_level;
gboolean ret = FALSE; gboolean ret = FALSE;
(void)selection;
(void)path_currently_selected;
(void)data;
gtk_tree_model_get_iter(model, &iter, path); gtk_tree_model_get_iter(model, &iter, path);
gtk_tree_model_get(model, &iter, CELL_SEL_CELL, &cell, CELL_SEL_CELL_ERROR_STATE, &error_level, -1); gtk_tree_model_get(model, &iter, CELL_SEL_CELL, &cell, CELL_SEL_CELL_ERROR_STATE, &error_level, -1);
@ -115,8 +112,6 @@ exit_filter:
static void change_filter(GtkWidget *entry, gpointer data) static void change_filter(GtkWidget *entry, gpointer data)
{ {
struct tree_stores *stores = (struct tree_stores *)data; struct tree_stores *stores = (struct tree_stores *)data;
(void)entry;
gtk_tree_model_filter_refilter(stores->filter); gtk_tree_model_filter_refilter(stores->filter);
} }

View File

@ -32,7 +32,7 @@
#define _CELL_TRIGONOMETRICS_H_ #define _CELL_TRIGONOMETRICS_H_
#include "bounding-box.h" #include "bounding-box.h"
#include "../gds-utils/gds-types.h" #include "../gds-parser/gds-types.h"
/** /**
* @brief calculate_cell_bounding_box Calculate bounding box of gds cell * @brief calculate_cell_bounding_box Calculate bounding box of gds cell