ScatterCtrl: Added LinkedWith()

git-svn-id: svn://ultimatepp.org/upp/trunk@7124 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2014-04-01 19:33:08 +00:00
parent c7fa14d69c
commit 0a25c8afff
2 changed files with 8 additions and 4 deletions

View file

@ -438,7 +438,7 @@ ScatterCtrl::ScatterCtrl() : offset(10,12), copyRatio(1)
lastRefresh_ms = Null;
maxRefresh_ms = 500;
highlighting = false;
ShowInfo().ShowContextMenu().ShowPropertiesDlg();
ShowInfo().ShowContextMenu().ShowPropertiesDlg();
}
END_UPP_NAMESPACE

View file

@ -62,7 +62,11 @@ ctrl ScatterCtrl {
textsize = GetTextSize(.SetTitle, .SetTitleFont);
if(.SetTitle == "")
textsize.cy = 0;
w.DrawRect(.SetPlotAreaLeftMargin-1, .SetPlotAreaTopMargin - 1 + textsize.cy, sz.cx - (.SetPlotAreaLeftMargin + .SetPlotAreaRightMargin) + 2, - (.SetPlotAreaTopMargin + .SetPlotAreaBottomMargin) + 2 - textsize.cy + sz.cy, :Gray);
w.DrawRect(.SetPlotAreaLeftMargin - 1,
.SetPlotAreaTopMargin - 1 + textsize.cy,
sz.cx - (.SetPlotAreaLeftMargin + .SetPlotAreaRightMargin) + 2,
- (.SetPlotAreaTopMargin + .SetPlotAreaBottomMargin) + 2 - textsize.cy + sz.cy,
:Gray);
aw = 6;
if(.SetAxisWidth >= 6)
aw = .SetAxisWidth;
@ -73,9 +77,9 @@ ctrl ScatterCtrl {
.SetAxisColor);
gx0 = .SetPlotAreaLeftMargin;
gy0 = .SetPlotAreaTopMargin + textsize.cy;
gy0 = .SetPlotAreaTopMargin + textsize.cy + 1;
gwidth = sz.cx - (.SetPlotAreaLeftMargin + .SetPlotAreaRightMargin);
gheight = sz.cy - (.SetPlotAreaTopMargin + .SetPlotAreaBottomMargin) - textsize.cy;
gheight = sz.cy - (.SetPlotAreaTopMargin + .SetPlotAreaBottomMargin) - textsize.cy - 1;
w.DrawRect(gx0, gy0, gwidth, gheight, .SetPlotAreaColor);
w.DrawLine(gx0, gy0 + gheight, gx0 + gwidth*0.25, gy0 + gheight*0.5, 2, :SLtRed);