mhu/gds-render
1
0
Fork 0
Code Issues 4 Pull Requests Releases 8 Wiki Activity

Merge branch 'dev' into python-renderer

Browse Source
This commit is contained in:
Mario Hüttel 2020-04-19 03:00:22 +02:00
commit 1fac7d7721
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gds-utils/gds-parser.c
View File

@ -80,6 +80,7 @@ enum gds_record {
STRANS = 0x1A01, STRANS = 0x1A01,
BOX = 0x2D00, BOX = 0x2D00,
LAYER = 0x0D02, LAYER = 0x0D02,
DATATYPE = 0x0E02,
WIDTH = 0x0F03, WIDTH = 0x0F03,
PATHTYPE = 0x2102, PATHTYPE = 0x2102,
COLROW = 0x1302, COLROW = 0x1302,
@ -867,6 +868,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
case LIBNAME: case LIBNAME:
case SNAME: case SNAME:
case LAYER: case LAYER:
case DATATYPE:
case STRNAME: case STRNAME:
break; break;
default: default:
@ -1003,6 +1005,16 @@ int parse_gds_from_file(const char *filename, GList **library_list)
} }
GDS_INF("\t\tAdded layer %d\n", (int)current_graphics->layer); GDS_INF("\t\tAdded layer %d\n", (int)current_graphics->layer);
break; break;
case DATATYPE:
if (!current_graphics) {
GDS_WARN("Datatype has to be defined inside graphics object. Probably unknown object. Implement it yourself!");
break;
}
current_graphics->datatype = gds_convert_signed_int16(workbuff);
if (current_graphics->datatype < 0)
GDS_WARN("Datatype negative!");
GDS_INF("\t\tAdded datatype %d\n", (int)current_graphics->datatype);
break;
case MAG: case MAG:
if (rec_data_length != 8) { if (rec_data_length != 8) {
GDS_WARN("Magnification is not an 8 byte real. Results may be wrong"); GDS_WARN("Magnification is not an 8 byte real. Results may be wrong");

2
include/gds-render/gds-utils/gds-types.h
View File

@ -101,7 +101,7 @@ struct gds_graphics {
enum path_type path_render_type; /**< @brief Line cap */ enum path_type path_render_type; /**< @brief Line cap */
int width_absolute; /**< @brief Width. Not used for objects other than paths */ int width_absolute; /**< @brief Width. Not used for objects other than paths */
int16_t layer; /**< @brief Layer the graphic object is on */ int16_t layer; /**< @brief Layer the graphic object is on */
uint16_t datatype; int16_t datatype; /**< @brief Data type of graphic object */
}; };
/** /**