luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modified the "element" command so that coordinates may be given in 

physical units (e.g., um).
This commit is contained in:
Tim Edwards 2022-09-01 17:58:30 -04:00
parent 5d51e10fb9
commit 4afc476d92
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.319 8.3.320

36
commands/CmdE.c
View File

@ -361,10 +361,8 @@ CmdElement(w, cmd)
return; return;
} }
} }
if (!StrIsInt(cmd->tx_argv[5])) goto badusage; area.r_xbot = cmdParseCoord(w, cmd->tx_argv[5], FALSE, TRUE);
area.r_xbot = atoi(cmd->tx_argv[5]); area.r_ybot = cmdParseCoord(w, cmd->tx_argv[6], FALSE, FALSE);
if (!StrIsInt(cmd->tx_argv[6])) goto badusage;
area.r_ybot = atoi(cmd->tx_argv[6]);
switch (type) switch (type)
{ {
@ -375,10 +373,8 @@ CmdElement(w, cmd)
cmdElementType[ELEMENT_LINE]); cmdElementType[ELEMENT_LINE]);
return; return;
} }
if (!StrIsInt(cmd->tx_argv[7])) goto badusage; area.r_xtop = cmdParseCoord(w, cmd->tx_argv[7], FALSE, TRUE);
area.r_xtop = atoi(cmd->tx_argv[7]); area.r_ytop = cmdParseCoord(w, cmd->tx_argv[8], FALSE, FALSE);
if (!StrIsInt(cmd->tx_argv[8])) goto badusage;
area.r_ytop = atoi(cmd->tx_argv[8]);
DBWElementAddLine(w, cmd->tx_argv[3], &area, def, style); DBWElementAddLine(w, cmd->tx_argv[3], &area, def, style);
break; break;
case ELEMENT_RECT: case ELEMENT_RECT:
@ -388,10 +384,8 @@ CmdElement(w, cmd)
cmdElementType[ELEMENT_RECT]); cmdElementType[ELEMENT_RECT]);
return; return;
} }
if (!StrIsInt(cmd->tx_argv[7])) goto badusage; area.r_xtop = cmdParseCoord(w, cmd->tx_argv[7], FALSE, TRUE);
area.r_xtop = atoi(cmd->tx_argv[7]); area.r_ytop = cmdParseCoord(w, cmd->tx_argv[8], FALSE, FALSE);
if (!StrIsInt(cmd->tx_argv[8])) goto badusage;
area.r_ytop = atoi(cmd->tx_argv[8]);
DBWElementAddRect(w, cmd->tx_argv[3], &area, def, style); DBWElementAddRect(w, cmd->tx_argv[3], &area, def, style);
break; break;
case ELEMENT_TEXT: case ELEMENT_TEXT:
@ -505,21 +499,19 @@ CmdElement(w, cmd)
if (cmd->tx_argc >= 6) if (cmd->tx_argc >= 6)
{ {
if (!StrIsInt(cmd->tx_argv[4]) || crect.r_xbot = cmdParseCoord(w, cmd->tx_argv[4],
!StrIsInt(cmd->tx_argv[5])) FALSE, TRUE);
goto badrect; crect.r_ybot = cmdParseCoord(w, cmd->tx_argv[5],
crect.r_xbot = atoi(cmd->tx_argv[4]); FALSE, FALSE);
crect.r_ybot = atoi(cmd->tx_argv[5]);
crect.r_xtop = crect.r_xbot; /* placeholder */ crect.r_xtop = crect.r_xbot; /* placeholder */
crect.r_ytop = crect.r_ybot; /* placeholder */ crect.r_ytop = crect.r_ybot; /* placeholder */
} }
if (cmd->tx_argc == 8) if (cmd->tx_argc == 8)
{ {
if (!StrIsInt(cmd->tx_argv[6]) || crect.r_xtop = cmdParseCoord(w, cmd->tx_argv[6],
!StrIsInt(cmd->tx_argv[7])) FALSE, TRUE);
goto badrect; crect.r_ytop = cmdParseCoord(w, cmd->tx_argv[7],
crect.r_xtop = atoi(cmd->tx_argv[6]); FALSE, FALSE);
crect.r_ytop = atoi(cmd->tx_argv[7]);
} }
if (cmd->tx_argc == 6 || cmd->tx_argc == 8) if (cmd->tx_argc == 6 || cmd->tx_argc == 8)