Merge branch 'refs/heads/master' into minorFixes_7.1

3 files changed, 60 insertions, 49 deletions

diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index 4995c2cb..28a99956 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -669,53 +669,33 @@ exports.Circle = Object.create(GeomObj, {
                 mat[5] = yScale;
 
                 // set up the stroke style
-                ctx.beginPath();
-                ctx.lineWidth   = lineWidth;
-                if (this._strokeColor) {
-                    if(this._strokeColor.gradientMode) {
-                        if(this._strokeColor.gradientMode === "radial") {
-                            gradient = ctx.createRadialGradient(xCtr, yCtr, 0,
-                                                                xCtr, yCtr, 0.5*Math.max(this._height, this._width));
-                        } else {
-                            gradient = ctx.createLinearGradient(0, this._height/2, this._width, this._height/2);
-                        }
-                        colors = this._strokeColor.color;
-
-                        len = colors.length;
-
-                        for(j=0; j<len; j++) {
-                            position = colors[j].position/100;
-                            cs = colors[j].value;
-                            gradient.addColorStop(position, "rgba(" + cs.r + "," + cs.g + "," + cs.b + "," + cs.a + ")");
-                        }
-
-                        ctx.strokeStyle = gradient;
+                if(lineWidth > 0) {
+                    ctx.beginPath();
+                    ctx.lineWidth   = lineWidth;
+                    if (this._strokeColor) {
+                        if(this._strokeColor.gradientMode) {
+                            if(this._strokeColor.gradientMode === "radial") {
+                                gradient = ctx.createRadialGradient(xCtr, yCtr, 0,
+                                                                    xCtr, yCtr, 0.5*Math.max(this._height, this._width));
+                            } else {
+                                gradient = ctx.createLinearGradient(0, this._height/2, this._width, this._height/2);
+                            }
+                            colors = this._strokeColor.color;
 
-                    } else {
-                        c = "rgba(" + 255*this._strokeColor[0] + "," + 255*this._strokeColor[1] + "," + 255*this._strokeColor[2] + "," + this._strokeColor[3] + ")";
-                        ctx.strokeStyle = c;
-                    }
-                    // draw the stroke
-                    p = MathUtils.transformPoint( bezPts[0],   mat );
-                    ctx.moveTo( p[0],  p[1] );
-                    index = 1;
-                    while (index < n) {
-                        var p0   = MathUtils.transformPoint( bezPts[index],  mat );
-                        var p1 = MathUtils.transformPoint( bezPts[index+1],  mat );
+                            len = colors.length;
 
-                        var x0 = p0[0],  y0 = p0[1],
-                            x1 = p1[0],  y1 = p1[1];
-                        ctx.quadraticCurveTo( x0,  y0,  x1, y1 );
-                        index += 2;
-                    }
+                            for(j=0; j<len; j++) {
+                                position = colors[j].position/100;
+                                cs = colors[j].value;
+                                gradient.addColorStop(position, "rgba(" + cs.r + "," + cs.g + "," + cs.b + "," + cs.a + ")");
+                            }
 
-                    if (MathUtils.fpSign(innerRad) > 0) {
-                        // calculate the stroke matrix
-                        xScale = 0.5*innerRad*this._width  - 0.5*lineWidth;
-                        yScale = 0.5*innerRad*this._height - 0.5*lineWidth;
-                        mat[0] = xScale;
-                        mat[5] = yScale;
+                            ctx.strokeStyle = gradient;
 
+                        } else {
+                            c = "rgba(" + 255*this._strokeColor[0] + "," + 255*this._strokeColor[1] + "," + 255*this._strokeColor[2] + "," + this._strokeColor[3] + ")";
+                            ctx.strokeStyle = c;
+                        }
                         // draw the stroke
                         p = MathUtils.transformPoint( bezPts[0],   mat );
                         ctx.moveTo( p[0],  p[1] );
@@ -729,10 +709,32 @@ exports.Circle = Object.create(GeomObj, {
                             ctx.quadraticCurveTo( x0,  y0,  x1, y1 );
                             index += 2;
                         }
-                    }
 
-                    // render the stroke
-                    ctx.stroke();
+                        if (MathUtils.fpSign(innerRad) > 0) {
+                            // calculate the stroke matrix
+                            xScale = 0.5*innerRad*this._width  - 0.5*lineWidth;
+                            yScale = 0.5*innerRad*this._height - 0.5*lineWidth;
+                            mat[0] = xScale;
+                            mat[5] = yScale;
+
+                            // draw the stroke
+                            p = MathUtils.transformPoint( bezPts[0],   mat );
+                            ctx.moveTo( p[0],  p[1] );
+                            index = 1;
+                            while (index < n) {
+                                var p0   = MathUtils.transformPoint( bezPts[index],  mat );
+                                var p1 = MathUtils.transformPoint( bezPts[index+1],  mat );
+
+                                var x0 = p0[0],  y0 = p0[1],
+                                    x1 = p1[0],  y1 = p1[1];
+                                ctx.quadraticCurveTo( x0,  y0,  x1, y1 );
+                                index += 2;
+                            }
+                        }
+
+                        // render the stroke
+                        ctx.stroke();
+                    }
                 }
             }
         }
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index eec4f6d9..df65ee86 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -537,6 +537,15 @@ exports.Line = Object.create(GeomObj, {
                     ctx.strokeStyle = c;
                 }
 
+                var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
+                viewUtils.pushViewportObj( world.getCanvas() );
+                var cop = viewUtils.getCenterOfProjection();
+                viewUtils.popViewportObj();
+                var xCtr = cop[0] + this._xOffset,                  yCtr = cop[1] - this._yOffset;
+                var xLeft = xCtr - 0.5*this.getWidth(),             yTop = yCtr - 0.5*this.getHeight();
+                var xDist = cop[0] - xLeft,                         yDist = cop[1] - yTop;
+                var xOff = 0.5*world.getViewportWidth() - xDist,    yOff  = 0.5*world.getViewportHeight() - yDist;
+
                 // get the points
                 var p0,  p1;
                 if(this._slope === "vertical") {
@@ -554,8 +563,8 @@ exports.Line = Object.create(GeomObj, {
                 }
 
                 // draw the line
-                ctx.moveTo( p0[0],  p0[1] );
-                ctx.lineTo( p1[0],  p1[1] );
+                ctx.moveTo( p0[0]+xOff,  p0[1]+yOff );
+                ctx.lineTo( p1[0]+xOff,  p1[1]+yOff );
                 ctx.stroke();
             }
         }
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index f3db92af..b34a97ab 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -603,7 +603,7 @@ exports.Rectangle = Object.create(GeomObj, {
 
             // render the stroke
             ctx.beginPath();
-            if (this._strokeColor) {
+            if (this._strokeColor && (lw > 0)) {
                 inset = Math.ceil( 0.5*lw ) - 0.5;
 
                 if(this._strokeColor.gradientMode) {