Skip to content

Revert mcdis-prefixes for polygon / polyhedron (had side-effects) #2453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
willend merged 1 commit into from
May 8, 2026
+5 −5
Merged

Revert mcdis-prefixes for polygon / polyhedron (had side-effects) #2453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions common/lib/share/mccode-r.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
}
*/
Expand Down
4 changes: 2 additions & 2 deletions tools/Python/mccodelib/instrparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading