Commit 4681623b authored by Oleg Korshul's avatar Oleg Korshul

увеличен минимальный размер стрелок на концах

parent 2346c1e1
...@@ -1558,7 +1558,7 @@ CShapeDrawer.prototype = ...@@ -1558,7 +1558,7 @@ CShapeDrawer.prototype =
if (_max_delta > 0.001) if (_max_delta > 0.001)
{ {
this.Graphics.ArrayPoints = null; this.Graphics.ArrayPoints = null;
DrawLineEnd(_x1, _y1, _x2, _y2, this.Ln.headEnd.type, this.Ln.headEnd.GetWidth(_pen_w), this.Ln.headEnd.GetLen(_pen_w), this, trans1); DrawLineEnd(_x1, _y1, _x2, _y2, this.Ln.headEnd.type, this.Ln.headEnd.GetWidth(_pen_w, 7 / g_dKoef_mm_to_pix), this.Ln.headEnd.GetLen(_pen_w, 7 / g_dKoef_mm_to_pix), this, trans1);
this.Graphics.ArrayPoints = arr; this.Graphics.ArrayPoints = arr;
} }
} }
...@@ -1584,7 +1584,7 @@ CShapeDrawer.prototype = ...@@ -1584,7 +1584,7 @@ CShapeDrawer.prototype =
if (_max_delta > 0.001) if (_max_delta > 0.001)
{ {
this.Graphics.ArrayPoints = null; this.Graphics.ArrayPoints = null;
DrawLineEnd(_x1, _y1, _x2, _y2, this.Ln.tailEnd.type, this.Ln.tailEnd.GetWidth(_pen_w), this.Ln.tailEnd.GetLen(_pen_w), this, trans1); DrawLineEnd(_x1, _y1, _x2, _y2, this.Ln.tailEnd.type, this.Ln.tailEnd.GetWidth(_pen_w, 7 / g_dKoef_mm_to_pix), this.Ln.tailEnd.GetLen(_pen_w, 7 / g_dKoef_mm_to_pix), this, trans1);
this.Graphics.ArrayPoints = arr; this.Graphics.ArrayPoints = arr;
} }
} }
......
...@@ -3895,35 +3895,39 @@ EndArrow.prototype = ...@@ -3895,35 +3895,39 @@ EndArrow.prototype =
return arrow && arrow.type == this.type && arrow.len == this.len && arrow.w == this.w; return arrow && arrow.type == this.type && arrow.len == this.len && arrow.w == this.w;
}, },
GetWidth: function(size) GetWidth: function(size, _max)
{ {
if (null == this.w) var _ret = 3 * size;
return size * 3; if (null != this.w)
switch (this.w)
{ {
case LineEndSize.Large: switch (this.w)
return 5 * size; {
case LineEndSize.Small: case LineEndSize.Large:
return 2 * size; _ret = 5 * size;
default: case LineEndSize.Small:
break; _ret = 2 * size;
default:
break;
}
} }
return 3 * size; return Math.max(_ret, _max ? _max : 7);
}, },
GetLen: function(size) GetLen: function(size, _max)
{ {
if (null == this.len) var _ret = 3 * size;
return size * 3; if (null != this.w)
switch (this.len)
{ {
case LineEndSize.Large: switch (this.w)
return 5 * size; {
case LineEndSize.Small: case LineEndSize.Large:
return 2 * size; _ret = 5 * size;
default: case LineEndSize.Small:
break; _ret = 2 * size;
default:
break;
}
} }
return 3 * size; return Math.max(_ret, _max ? _max : 7);
}, },
getObjectType: function() getObjectType: function()
......
...@@ -1558,7 +1558,7 @@ CShapeDrawer.prototype = ...@@ -1558,7 +1558,7 @@ CShapeDrawer.prototype =
if (_max_delta > 0.001) if (_max_delta > 0.001)
{ {
this.Graphics.ArrayPoints = null; this.Graphics.ArrayPoints = null;
DrawLineEnd(_x1, _y1, _x2, _y2, this.Ln.headEnd.type, this.Ln.headEnd.GetWidth(_pen_w), this.Ln.headEnd.GetLen(_pen_w), this, trans1); DrawLineEnd(_x1, _y1, _x2, _y2, this.Ln.headEnd.type, this.Ln.headEnd.GetWidth(_pen_w, 7 / g_dKoef_mm_to_pix), this.Ln.headEnd.GetLen(_pen_w, 7 / g_dKoef_mm_to_pix), this, trans1);
this.Graphics.ArrayPoints = arr; this.Graphics.ArrayPoints = arr;
} }
} }
...@@ -1584,7 +1584,7 @@ CShapeDrawer.prototype = ...@@ -1584,7 +1584,7 @@ CShapeDrawer.prototype =
if (_max_delta > 0.001) if (_max_delta > 0.001)
{ {
this.Graphics.ArrayPoints = null; this.Graphics.ArrayPoints = null;
DrawLineEnd(_x1, _y1, _x2, _y2, this.Ln.tailEnd.type, this.Ln.tailEnd.GetWidth(_pen_w), this.Ln.tailEnd.GetLen(_pen_w), this, trans1); DrawLineEnd(_x1, _y1, _x2, _y2, this.Ln.tailEnd.type, this.Ln.tailEnd.GetWidth(_pen_w, 7 / g_dKoef_mm_to_pix), this.Ln.tailEnd.GetLen(_pen_w, 7 / g_dKoef_mm_to_pix), this, trans1);
this.Graphics.ArrayPoints = arr; this.Graphics.ArrayPoints = arr;
} }
} }
......
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