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

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

parent 2346c1e1
......@@ -1558,7 +1558,7 @@ CShapeDrawer.prototype =
if (_max_delta > 0.001)
{
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;
}
}
......@@ -1584,7 +1584,7 @@ CShapeDrawer.prototype =
if (_max_delta > 0.001)
{
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;
}
}
......
......@@ -3895,35 +3895,39 @@ EndArrow.prototype =
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)
return size * 3;
switch (this.w)
var _ret = 3 * size;
if (null != this.w)
{
case LineEndSize.Large:
return 5 * size;
case LineEndSize.Small:
return 2 * size;
default:
break;
switch (this.w)
{
case LineEndSize.Large:
_ret = 5 * size;
case LineEndSize.Small:
_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)
return size * 3;
switch (this.len)
var _ret = 3 * size;
if (null != this.w)
{
case LineEndSize.Large:
return 5 * size;
case LineEndSize.Small:
return 2 * size;
default:
break;
switch (this.w)
{
case LineEndSize.Large:
_ret = 5 * size;
case LineEndSize.Small:
_ret = 2 * size;
default:
break;
}
}
return 3 * size;
return Math.max(_ret, _max ? _max : 7);
},
getObjectType: function()
......
......@@ -1558,7 +1558,7 @@ CShapeDrawer.prototype =
if (_max_delta > 0.001)
{
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;
}
}
......@@ -1584,7 +1584,7 @@ CShapeDrawer.prototype =
if (_max_delta > 0.001)
{
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;
}
}
......
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