small cleanup, disable slope variable for non-lines

emilykl · emilykl · commit 4a3a7ae5dd7f · 2023-03-31T18:22:47.000-04:00
diff --git a/src/components/shapes/label_texttemplate.js b/src/components/shapes/label_texttemplate.js
@@ -34,17 +34,11 @@ function dyFn(shape, xa, ya) {
 }
 
 function widthFn(shape, xa) {
-    return Math.abs(
-        d2l(shape.x1, xa) -
-        d2l(shape.x0, xa)
-    );
+    return Math.abs(dxFn(shape, xa));
 }
 
 function heightFn(shape, xa, ya) {
-    return Math.abs(
-        d2l(shape.y1, ya) -
-        d2l(shape.y0, ya)
-    );
+    return Math.abs(dyFn(shape, xa, ya));
 }
 
 function lengthFn(shape, xa, ya) {
@@ -66,7 +60,7 @@ function ycenterFn(shape, xa, ya) {
 }
 
 function slopeFn(shape, xa, ya) {
-    return (
+    return (shape.type !== 'line') ? undefined : (
         (d2l(shape.y1, ya) - d2l(shape.y0, ya)) /
         (d2l(shape.x1, xa) - d2l(shape.x0, xa))
     );

Original file line number	Diff line number	Diff line change
`@@ -34,17 +34,11 @@ function dyFn(shape, xa, ya) {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`function widthFn(shape, xa) {`
`37`		`- return Math.abs(`
`38`		`- d2l(shape.x1, xa) -`
`39`		`- d2l(shape.x0, xa)`
`40`		`- );`
	`37`	`+ return Math.abs(dxFn(shape, xa));`
`41`	`38`	`}`
`42`	`39`
`43`	`40`	`function heightFn(shape, xa, ya) {`
`44`		`- return Math.abs(`
`45`		`- d2l(shape.y1, ya) -`
`46`		`- d2l(shape.y0, ya)`
`47`		`- );`
	`41`	`+ return Math.abs(dyFn(shape, xa, ya));`
`48`	`42`	`}`
`49`	`43`
`50`	`44`	`function lengthFn(shape, xa, ya) {`
`@@ -66,7 +60,7 @@ function ycenterFn(shape, xa, ya) {`
`66`	`60`	`}`
`67`	`61`
`68`	`62`	`function slopeFn(shape, xa, ya) {`
`69`		`- return (`
	`63`	`+ return (shape.type !== 'line') ? undefined : (`
`70`	`64`	`(d2l(shape.y1, ya) - d2l(shape.y0, ya)) /`
`71`	`65`	`(d2l(shape.x1, xa) - d2l(shape.x0, xa))`
`72`	`66`	`);`