mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-09-05 17:44:55 -06:00
-Geom/Draw: fixed empty outline for circular mark
.Geom/Ctrl: new drag & drop modes in PlotterCtrl (automatic zoom & pan) git-svn-id: svn://ultimatepp.org/upp/trunk@2750 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
parent
d87dc9aa10
commit
90e309e714
4 changed files with 92 additions and 41 deletions
|
|
@ -1947,18 +1947,22 @@ One<MarkTool::Marker> MarkTool::Nabla(int size, Color color, Color outline, int
|
|||
class CircleMarker : public AreaMarker
|
||||
{
|
||||
public:
|
||||
CircleMarker(int size, Color color, Color outline, int outline_width)
|
||||
: AreaMarker(size, color, outline, outline_width) {}
|
||||
CircleMarker(int size, Color color, Color outline, int outline_width);
|
||||
|
||||
virtual void Paint(Draw& draw, const Vector<Point>& pt);
|
||||
};
|
||||
|
||||
CircleMarker::CircleMarker(int size, Color color, Color outline, int outline_width)
|
||||
: AreaMarker(size, color, Nvl(outline, color), IsNull(outline) ? 0 : outline_width)
|
||||
{
|
||||
}
|
||||
|
||||
void CircleMarker::Paint(Draw& draw, const Vector<Point>& pt)
|
||||
{
|
||||
int half = size >> 1;
|
||||
for(int t = 0; t < pt.GetCount(); t++)
|
||||
draw.DrawEllipse(RectC(pt[t].x - half, pt[t].y - half, size, size),
|
||||
color, outline_width, outline);
|
||||
color, outline_width, Nvl(outline, color));
|
||||
}
|
||||
|
||||
One<MarkTool::Marker> MarkTool::Circle(int size, Color color, Color outline, int outline_width)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue