Commit 2e3e49a8 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 25541 - Контуры автофигуры не поворачиваются для безцветной автофигуры

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57608 954022d7-b5bf-4e40-9824-e11837661b57
parent 6ed0d584
...@@ -82,7 +82,6 @@ function XYAdjustmentTrack(originalShape, adjIndex) ...@@ -82,7 +82,6 @@ function XYAdjustmentTrack(originalShape, adjIndex)
this.refY = _ref_y; this.refY = _ref_y;
} }
} }
this.overlayObject = new OverlayObject(this.geometry, originalShape.extX, originalShape.extY, originalShape.brush, originalShape.pen, originalShape.transform); this.overlayObject = new OverlayObject(this.geometry, originalShape.extX, originalShape.extY, originalShape.brush, originalShape.pen, originalShape.transform);
...@@ -285,12 +284,6 @@ function PolarAdjustmentTrack(originalShape, adjIndex) ...@@ -285,12 +284,6 @@ function PolarAdjustmentTrack(originalShape, adjIndex)
this.track = function(posX, posY) this.track = function(posX, posY)
{ {
var _temp_x = posX - this.xLT;
var _temp_y = posY - this.yLT;
var _sin = this.sin;
var _cos = this.cos;
var invert_transform = this.originalShape.invertTransform; var invert_transform = this.originalShape.invertTransform;
var _relative_x = invert_transform.TransformPointX(posX, posY); var _relative_x = invert_transform.TransformPointX(posX, posY);
var _relative_y = invert_transform.TransformPointY(posX, posY); var _relative_y = invert_transform.TransformPointY(posX, posY);
......
"use strict"; "use strict";
function NewShapeTrack(presetGeom, startX, startY, theme, master, layout, slide, pageIndex) function NewShapeTrack(presetGeom, startX, startY, theme, master, layout, slide, pageIndex)
{ {
this.presetGeom = presetGeom; this.presetGeom = presetGeom;
......
"use strict"; "use strict";
function OverlayObject(geometry, extX, extY, brush, pen, transform) function OverlayObject(geometry, extX, extY, brush, pen, transform )
//({check_bounds: function(){},brush: this.originalShape.brush, pen: this.originalShape.pen, ext:{cx:this.originalShape.absExtX, cy:this.originalShape.absExtY}, geometry: this.geometry, TransformMatrix: this.originalShape.transform}) //({check_bounds: function(){},brush: this.originalShape.brush, pen: this.originalShape.pen, ext:{cx:this.originalShape.absExtX, cy:this.originalShape.absExtY}, geometry: this.geometry, TransformMatrix: this.originalShape.transform})
{ {
this.geometry = geometry; this.geometry = geometry;
this.ext = {}; this.ext = {};
this.ext.cx = extX; this.ext.cx = extX;
this.ext.cy = extY; this.ext.cy = extY;
this.brush = brush;
this.pen = pen; var _brush, _pen;
if((!brush || !brush.fill || brush.fill.type === FILL_TYPE_NOFILL) &&
(!pen || !pen.Fill || !pen.Fill || !pen.Fill.fill || pen.Fill.fill.type === FILL_TYPE_NOFILL || pen.w === 0))
{
var penBrush = CreatePenBrushForChartTrack();
_brush = penBrush.brush;
_pen = penBrush.pen;
}
else
{
_brush = brush;
_pen = pen;
}
this.brush = _brush;
this.pen = _pen;
this.TransformMatrix = transform; this.TransformMatrix = transform;
this.shapeDrawer = new CShapeDrawer(); this.shapeDrawer = new CShapeDrawer();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment