- Library code update
- project update (added Eigen) git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@94 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
@@ -436,9 +436,7 @@ void Path::addRectangle (const float x, const float y,
|
||||
data.elements [numElements++] = closeSubPathMarker;
|
||||
}
|
||||
|
||||
void Path::addRoundedRectangle (const float x, const float y,
|
||||
const float w, const float h,
|
||||
float csx, float csy)
|
||||
void Path::addRoundedRectangle (float x, float y, float w, float h, float csx, float csy)
|
||||
{
|
||||
addRoundedRectangle (x, y, w, h, csx, csy, true, true, true, true);
|
||||
}
|
||||
@@ -498,9 +496,7 @@ void Path::addRoundedRectangle (const float x, const float y, const float w, con
|
||||
closeSubPath();
|
||||
}
|
||||
|
||||
void Path::addRoundedRectangle (const float x, const float y,
|
||||
const float w, const float h,
|
||||
float cs)
|
||||
void Path::addRoundedRectangle (float x, float y, float w, float h, float cs)
|
||||
{
|
||||
addRoundedRectangle (x, y, w, h, cs, cs);
|
||||
}
|
||||
@@ -527,15 +523,19 @@ void Path::addQuadrilateral (const float x1, const float y1,
|
||||
closeSubPath();
|
||||
}
|
||||
|
||||
void Path::addEllipse (const float x, const float y,
|
||||
const float w, const float h)
|
||||
void Path::addEllipse (float x, float y, float w, float h)
|
||||
{
|
||||
const float hw = w * 0.5f;
|
||||
addEllipse (Rectangle<float> (x, y, w, h));
|
||||
}
|
||||
|
||||
void Path::addEllipse (Rectangle<float> area)
|
||||
{
|
||||
const float hw = area.getWidth() * 0.5f;
|
||||
const float hw55 = hw * 0.55f;
|
||||
const float hh = h * 0.5f;
|
||||
const float hh = area.getHeight() * 0.5f;
|
||||
const float hh55 = hh * 0.55f;
|
||||
const float cx = x + hw;
|
||||
const float cy = y + hh;
|
||||
const float cx = area.getX() + hw;
|
||||
const float cy = area.getY() + hh;
|
||||
|
||||
startNewSubPath (cx, cy - hh);
|
||||
cubicTo (cx + hw55, cy - hh, cx + hw, cy - hh55, cx + hw, cy);
|
||||
|
||||
Reference in New Issue
Block a user