Skip to content

Commit 3812886

Browse files
authored
Merge pull request #3478 from phillc54/phillc54/conv_rectangle
qtplasmac: misshaped conversational rectangle
2 parents 7218711 + affd991 commit 3812886

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

lib/python/plasmac/rectangle.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -341,12 +341,8 @@ def preview(Conv, fTmp, fNgc, fNgcBkp,
341341
else:
342342
outTmp.write(f'G00 X{xS:.6f} Y{yS:.6f}\n')
343343
outTmp.write('M03 $0 S1\n')
344-
if radius1:
345-
x1 = xS + ((xLT - (radius1 - radius2)) / 2) * math.cos(angle + left)
346-
y1 = yS + ((xLT - (radius1 - radius2)) / 2) * math.sin(angle + left)
347-
else:
348-
x1 = xS - (width / 2)
349-
y1 = yS
344+
x1 = xS + ((xLT - (radius1 - radius2)) / 2) * math.cos(angle + left)
345+
y1 = yS + ((xLT - (radius1 - radius2)) / 2) * math.sin(angle + left)
350346
outTmp.write(f'G01 X{x1:.6f} Y{y1:.6f}\n')
351347
if radius1:
352348
if styleR1 == 'intRadius':

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '008.065'
1+
VERSION = '008.066'
22
LCNCVER = '2.10'
33

44
'''

share/qtvcp/screens/qtplasmac/versions.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ <h2>QtPlasmaC Version History - LinuxCNC 2.10</h2>
2626
</table>
2727
<br>
2828
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
29+
<br><b><u>008.066 2025 June 19</u></b>
30+
<ul style="margin:0;">
31+
<li>fix misshaped conversational internal angled rectangles</li>
32+
</ul>
33+
2934
<br><b><u>008.065 2025 June 06</u></b>
3035
<ul style="margin:0;">
3136
<li>start conversational shapes at origin</li>

0 commit comments

Comments
 (0)