diff --git a/common/lib/share/mccode-r.c b/common/lib/share/mccode-r.c index 835d20b45..68c357a35 100644 --- a/common/lib/share/mccode-r.c +++ b/common/lib/share/mccode-r.c @@ -3101,7 +3101,7 @@ void mcdis_sphere(double x, double y, double z, double r){ /* POLYHEDRON IMPLEMENTATION*/ void mcdis_polyhedron(char *vertices_faces){ - printf("MCDISPLAY: mcdispolyhedron %s\n", vertices_faces); + printf("MCDISPLAY: polyhedron %s\n", vertices_faces); } /* POLYGON IMPLEMENTATION */ @@ -3219,9 +3219,9 @@ void mcdis_polygon(int count, ...){ /* END NEW POLYGON IMPLEMENTATION*/ /* -void mcdis_polygon(double x1, double y1, double z1, +void polygon(double x1, double y1, double z1, double x2, double y2, double z2){ - printf("MCDISPLAY: mcdispolygon(2,%g,%g,%g,%g,%g,%g)\n", + printf("MCDISPLAY: polygon(2,%g,%g,%g,%g,%g,%g)\n", x1,y1,z1,x2,y2,z2); } */ diff --git a/tools/Python/mccodelib/instrparser.py b/tools/Python/mccodelib/instrparser.py index 49007b863..91f99058d 100644 --- a/tools/Python/mccodelib/instrparser.py +++ b/tools/Python/mccodelib/instrparser.py @@ -46,8 +46,8 @@ def __init__(self, data=None, debug=False): 'mcdisdisc' : 'DRAWCALL', 'mcdisannulus' : 'DRAWCALL', 'mcdisnew_circle' : 'DRAWCALL', - 'mcdispolygon' : 'DRAWCALL', - 'mcdispolyhedron' : 'DRAWCALL', + 'polygon' : 'DRAWCALL', + 'polyhedron' : 'DRAWCALL', 'MANTID_PIXEL': 'MANTID_PIXEL',