Merge branch 'master' into dev

This commit is contained in:
Mario Hüttel 2019-03-05 21:48:26 +01:00
commit e76f2cbb9d
5 changed files with 12 additions and 10 deletions

View File

@ -4,5 +4,5 @@
* @defgroup trigonometric Trigonometric Helper Functions * @defgroup trigonometric Trigonometric Helper Functions
* *
* The trigonometric helper function are used to calculate bounding boxes * The trigonometric helper function are used to calculate bounding boxes
* @warning Code is incomplete. Please double check the functionality! * @warning Code is incomplete. Please double check for functionality!
*/ */

View File

@ -36,7 +36,8 @@
/** /**
* @brief function name expected to be found in external library. * @brief function name expected to be found in external library.
* @detail The function has to be defined as follows: *
* The function has to be defined as follows:
* @code * @code
* int function_name(gds_cell *toplevel, GList *layer_info_list, char *output_file_name) * int function_name(gds_cell *toplevel, GList *layer_info_list, char *output_file_name)
* @endcode * @endcode

View File

@ -40,7 +40,7 @@ enum cell_store_columns {
CELL_SEL_CELL_ERROR_STATE, /**< Used for cell color and selectability */ CELL_SEL_CELL_ERROR_STATE, /**< Used for cell color and selectability */
CELL_SEL_MODDATE, CELL_SEL_MODDATE,
CELL_SEL_ACCESSDATE, CELL_SEL_ACCESSDATE,
CELL_SEL_COLUMN_COUNT /**< Not a column. Used to determine count of coumns **/ CELL_SEL_COLUMN_COUNT /**< @brief Not a column. Used to determine count of columns */
}; };
struct tree_stores { struct tree_stores {

View File

@ -180,10 +180,11 @@ void bounding_box_update_point(union bounding_box *destination, conv_generic_to_
} }
/** /**
* @brief bounding_box_apply_transform * @brief Apply transformations onto bounding box.
* @param scale scaling factor * @param scale Scaling factor
* @param rotation roation of bounding box around the origin in degrees (counterclockwise) * @param rotation_deg Roation of bounding box around the origin in degrees (counterclockwise)
* @param box bounding box the operations should be applied to * @param flip_at_x Flip the boundig box on the x axis before rotating.
* @param box Bounding box the operations should be applied to.
*/ */
void bounding_box_apply_transform(double scale, double rotation_deg, bool flip_at_x, union bounding_box *box) void bounding_box_apply_transform(double scale, double rotation_deg, bool flip_at_x, union bounding_box *box)
{ {

View File

@ -38,9 +38,9 @@ static void convert_gds_point_to_2d_vector(struct gds_point *pt, struct vector_2
} }
/** /**
* @brief update_box_with_gfx * @brief Update the given bounding box with the bounding box of a graphics element.
* @param box * @param box box to update
* @param gfx_list * @param gfx Graphics element
*/ */
static void update_box_with_gfx(union bounding_box *box, struct gds_graphics *gfx) static void update_box_with_gfx(union bounding_box *box, struct gds_graphics *gfx)
{ {