Add checks to cell structure

gds-parser/gds-parser.c

@@ -17,11 +17,6 @@
  * along with GDSII-Converter.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
-
- */
-
-
 /**
  * @file gds-parser.c
  * @brief Implementation of the GDS-Parser
@@ -35,7 +30,7 @@
  */
 
 /**
- * @addtogroup GDS-Parser
+ * @addtogroup GDS-Utilities
  * @{
  */
 

gds-parser/gds-parser.h

@@ -24,7 +24,7 @@
  */
 
 /**
- * @addtogroup GDS-Parser
+ * @addtogroup GDS-Utilities
  * @{
  */
 

gds-parser/gds-tree-checker.c

@@ -0,0 +1,48 @@
+/*
+ * GDSII-Converter
+ * Copyright (C) 2019  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 gds-tree-checker.c
+ * @brief Checking functions of a cell tree
+ *
+ * This file contains cehcking functions for the GDS cell tree.
+ * These functions include checks if all child references could be resolved,
+ * and if the cell tree contains loops.
+ *
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
+/**
+ * @addtogroup GDS-Utilities
+ * @{
+ */
+
+#include "gds-tree-checker.h"
+
+int gds_tree_check_cell_references(struct gds_library *lib)
+{
+	return 0;
+}
+
+int gds_tree_check_reference_loops(struct gds_library *lib)
+{
+	return 0;
+}
+
+/** @} */

gds-parser/gds-tree-checker.h

@@ -0,0 +1,55 @@
+/*
+ * GDSII-Converter
+ * Copyright (C) 2019  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 gds-tree-checker.h
+ * @brief Checking functions of a cell tree (Header)
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
+/**
+ * @addtogroup GDS-Utilities
+ * @{
+ */
+
+#ifndef _GDS_TREE_CHECKER_H_
+#define _GDS_TREE_CHECKER_H_
+
+#include "gds-types.h"
+
+/**
+ * @brief gds_tree_check_cell_references checks if all child cell references can be resolved in the given library
+ * @param lib The GDS library to check
+ * @return less than 0 if an error occured during processing; 0 if all child cells could be resolved;
+ *         greater than zero if the processing was successful but not all cell references could be resolved.
+ *         In this case the number of unresolved references is returned
+ */
+int gds_tree_check_cell_references(struct gds_library *lib);
+
+/**
+ * @brief gds_tree_check_reference_loops checks if the given library contains reference loops
+ * @param lib GDS library
+ * @return negative if an error occured, zero if there are no reference loops, else a positive number representing the number
+ *         of affected cells
+ */
+int gds_tree_check_reference_loops(struct gds_library *lib);
+
+#endif /* _GDS_TREE_CHECKER_H_ */
+
+/** @} */

gds-parser/gds-types.h

@@ -24,7 +24,7 @@
  */
 
 /**
-  * @addtogroup GDS-Parser
+  * @addtogroup GDS-Utilities
   * @{
   */
 
@@ -35,6 +35,8 @@
 #include <glib.h>
 
 #define CELL_NAME_MAX (100) /**< @brief Maximum length of a gds_cell::name or a gds_library::name */
+
+/* Maybe use the macros that ship with the compiler? */
 #define MIN(a,b) (((a) < (b)) ? (a) : (b)) /**< @brief Return smaller number */
 #define MAX(a,b) (((a) > (b)) ? (a) : (b)) /**< @brief Return bigger number */
 
@@ -59,6 +61,21 @@ struct gds_point {
 	int y;
 };
 
+/**
+ * @brief Stores the result of the cell checks.
+ */
+struct gds_cell_checks {
+	int unresolved_child_count; /**< @brief Number of unresolved cell instances inside this cell */
+	int affected_by_reference_loop; /**< @brief 1 if the cell is affected by a reference loop and therefore not renderable */
+	/**
+	 * @brief For the internal use of the checker.
+	 * @warning Do not use this structure and its contents!
+	 */
+	struct _check_internals {
+		int marker;
+	} _internal;
+};
+
 /**
  * @brief Date information for cells and libraries
  */
@@ -105,6 +122,7 @@ struct gds_cell {
 	GList *child_cells; /**< @brief List of #gds_cell_instance elements */
 	GList *graphic_objs; /**< @brief List of #gds_graphics */
 	struct gds_library *parent_library; /**< @brief Pointer to parent library */
+	struct gds_cell_checks checks; /**< @brief Checking results */
 };
 
 /**

trigonometric/cell-trigonometrics.c

@@ -94,14 +94,16 @@ void calculate_cell_bounding_box(union bounding_box *box, struct gds_cell *cell)
 	}
 
 	/* Update bounding box with boxes of subcells */
-	for (sub_cell_list = cell->child_cells; sub_cell_list != NULL; sub_cell_list = sub_cell_list->next) {
+	for (sub_cell_list = cell->child_cells; sub_cell_list != NULL;
+						sub_cell_list = sub_cell_list->next) {
 		sub_cell = (struct gds_cell_instance *)sub_cell_list->data;
 		bounding_box_prepare_empty(&temp_box);
 		/* Recursion Woohoo!!  This dies if your GDS is faulty and contains a reference loop */
 		calculate_cell_bounding_box(&temp_box, sub_cell->cell_ref);
 
 		/* Apply transformations */
-		bounding_box_apply_transform(ABS(sub_cell->magnification), sub_cell->angle, sub_cell->flipped, &temp_box);
+		bounding_box_apply_transform(ABS(sub_cell->magnification), sub_cell->angle,
+					     sub_cell->flipped, &temp_box);
 
 		/* Move bounding box to origin */
 		temp_box.vectors.lower_left.x += sub_cell->origin.x;